diff --git a/package/boot/uboot-sunxi/patches/260-sunxi-add-USB-support-and-PopStick-support.patch b/package/boot/uboot-sunxi/patches/260-sunxi-add-USB-support-and-PopStick-support.patch
deleted file mode 100644
index ecc2eb2d2..000000000
--- a/package/boot/uboot-sunxi/patches/260-sunxi-add-USB-support-and-PopStick-support.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 08d194d881e10e09cba7551da8079734d89ed16d Mon Sep 17 00:00:00 2001
-From: Icenowy Zheng <uwu@icenowy.me>
-Date: Thu, 16 Jun 2022 00:28:41 +0800
-Subject: [PATCH 1/2] add USB support and PopStick support
-
-Signed-off-by: Icenowy Zheng <uwu@icenowy.me>
----
- arch/arm/dts/Makefile                        |  3 +-
- arch/arm/dts/suniv-f1c100s-licheepi-nano.dts | 16 ++++
- arch/arm/dts/suniv-f1c100s.dtsi              | 26 ++++++
- arch/arm/dts/suniv-f1c200s-popstick.dts      | 89 ++++++++++++++++++++
- drivers/phy/allwinner/phy-sun4i-usb.c        | 14 +++
- drivers/usb/musb-new/sunxi.c                 |  6 ++
- 6 files changed, 153 insertions(+), 1 deletion(-)
- create mode 100644 arch/arm/dts/suniv-f1c200s-popstick.dts
-
---- a/arch/arm/dts/Makefile
-+++ b/arch/arm/dts/Makefile
-@@ -647,7 +647,8 @@ dtb-$(CONFIG_STM32H7) += stm32h743i-disc
- 	stm32h750i-art-pi.dtb
- 
- dtb-$(CONFIG_MACH_SUNIV) += \
--	suniv-f1c100s-licheepi-nano.dtb
-+	suniv-f1c100s-licheepi-nano.dtb \
-+	suniv-f1c200s-popstick.dtb
- dtb-$(CONFIG_MACH_SUN4I) += \
- 	sun4i-a10-a1000.dtb \
- 	sun4i-a10-ba10-tvbox.dtb \
---- /dev/null
-+++ b/arch/arm/dts/suniv-f1c200s-popstick.dts
-@@ -0,0 +1,89 @@
-+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-+/*
-+ * Copyright 2022 Icenowy Zheng <uwu@icenowy.me>
-+ */
-+
-+/dts-v1/;
-+#include "suniv-f1c100s.dtsi"
-+
-+#include <dt-bindings/gpio/gpio.h>
-+
-+/ {
-+	model = "Popcorn Computer PopStick";
-+	compatible = "sourceparts,popstick", "allwinner,suniv-f1c200s",
-+		     "allwinner,suniv-f1c100s";
-+
-+	aliases {
-+		mmc0 = &mmc0;
-+		serial0 = &uart0;
-+		spi0 = &spi0;
-+	};
-+
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
-+	reg_vcc3v3: vcc3v3 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc3v3";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+	};
-+};
-+
-+&mmc0 {
-+	broken-cd;
-+	bus-width = <4>;
-+	disable-wp;
-+	status = "okay";
-+	vmmc-supply = <&reg_vcc3v3>;
-+};
-+
-+&spi0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&spi0_pc_pins>;
-+	status = "okay";
-+
-+	flash@0 {
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		compatible = "spi-nand";
-+		reg = <0>;
-+		spi-max-frequency = <1000000>;
-+
-+		partitions {
-+			compatible = "fixed-partitions";
-+			#address-cells = <1>;
-+			#size-cells = <1>;
-+	
-+			partition@0 {
-+				label = "u-boot-with-spl";
-+				reg = <0x0 0x100000>;
-+			};
-+
-+			ubi@100000 {
-+				label = "ubi";
-+				reg = <0x100000 0x7f00000>;
-+			};
-+		};
-+	};
-+};
-+
-+&otg_sram {
-+	status = "okay";
-+};
-+
-+&uart0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart0_pe_pins>;
-+	status = "okay";
-+};
-+
-+&usb_otg {
-+	dr_mode = "peripheral";
-+	status = "okay";
-+};
-+
-+&usbphy {
-+	status = "okay";
-+};
diff --git a/package/boot/uboot-sunxi/patches/261-sunxi-add-popstick-defconfig.patch b/package/boot/uboot-sunxi/patches/261-sunxi-add-popstick-defconfig.patch
deleted file mode 100644
index 7fa9264b9..000000000
--- a/package/boot/uboot-sunxi/patches/261-sunxi-add-popstick-defconfig.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 0d263e1071ee3f63d2047a8bb9af4434f1cd4bb1 Mon Sep 17 00:00:00 2001
-From: Icenowy Zheng <uwu@icenowy.me>
-Date: Thu, 16 Jun 2022 09:46:42 +0800
-Subject: [PATCH 2/2] HACK for UBI env and add defconfig
-
----
- board/sunxi/board.c        |  1 +
- configs/popstick_defconfig | 37 +++++++++++++++++++++++++++++++++++++
- 2 files changed, 38 insertions(+)
- create mode 100644 configs/popstick_defconfig
-
---- a/board/sunxi/board.c
-+++ b/board/sunxi/board.c
-@@ -135,6 +135,7 @@ void i2c_init_board(void)
-  */
- enum env_location env_get_location(enum env_operation op, int prio)
- {
-+	return prio ? ENVL_UNKNOWN : ENVL_UBI;
- 	if (prio > 1)
- 		return ENVL_UNKNOWN;
- 
---- /dev/null
-+++ b/configs/popstick_defconfig
-@@ -0,0 +1,37 @@
-+CONFIG_ARM=y
-+CONFIG_SKIP_LOWLEVEL_INIT_ONLY=y
-+CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y
-+CONFIG_ARCH_SUNXI=y
-+CONFIG_ENV_SIZE=0x1f000
-+CONFIG_DEFAULT_DEVICE_TREE="suniv-f1c200s-popstick"
-+CONFIG_SPL=y
-+CONFIG_MACH_SUNIV=y
-+CONFIG_DRAM_CLK=156
-+CONFIG_DRAM_ZQ=0
-+# CONFIG_VIDEO_SUNXI is not set
-+CONFIG_SPL_SPI_SUNXI=y
-+CONFIG_SPL_SPI_SUNXI_NAND=y
-+CONFIG_SPL_SPI_SUNXI_NAND_ASSUMED_PAGESIZE=0x800
-+# CONFIG_ANDROID_BOOT_IMAGE is not set
-+CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
-+CONFIG_CMD_MTD=y
-+# CONFIG_CMD_SF is not set
-+CONFIG_CMD_MTDPARTS=y
-+CONFIG_CMD_UBI=y
-+# CONFIG_ENV_IS_IN_FAT is not set
-+# CONFIG_ENV_IS_IN_SPI_FLASH is not set
-+CONFIG_ENV_IS_IN_UBI=y
-+CONFIG_ENV_UBI_PART="ubi"
-+CONFIG_ENV_UBI_VOLUME="env"
-+# CONFIG_NET is not set
-+CONFIG_MTD=y
-+CONFIG_DM_MTD=y
-+CONFIG_MTD_SPI_NAND=y
-+# CONFIG_SPI_FLASH is not set
-+CONFIG_SF_DEFAULT_SPEED=25000000
-+# CONFIG_UBI_SILENCE_MSG is not set
-+CONFIG_PHY_SUN4I_USB=y
-+CONFIG_SPI=y
-+CONFIG_USB_MUSB_GADGET=y
-+CONFIG_USB_FUNCTION_SDP=y
-+# CONFIG_UBIFS_SILENCE_MSG is not set