mixtile-blade3: u-boot: join rockchip-rk3588's default u-boot-radxa-rk35xx scheme

- rebased 3 patches - moved null patches for dts & defconfigs to `dt` / `defconfig` dirs - don't rename defconfigs: those are shared with Joshua Riek (ubuntu-rockchip) - defconfigs re-saved
2024-07-07 23:28:45 +02:00 · 2024-07-07 23:28:45 +02:00 · 0347745a34
commit 0347745a34
parent 8f6cd263d6
15 changed files with 635 additions and 1075 deletions
--- a/config/boards/mixtile-blade3.csc
+++ b/config/boards/mixtile-blade3.csc
@ -4,21 +4,16 @@ declare -g BOARDFAMILY="rockchip-rk3588"
 declare -g BOARD_MAINTAINER="rpardini"
 declare -g KERNEL_TARGET="vendor,edge"
 declare -g BOOT_FDT_FILE="rockchip/rk3588-blade3-v101-linux.dtb" # Included in https://github.com/armbian/linux-rockchip/pull/64 # has a hook to change it for edge below
-
-declare -g BOOT_SCENARIO="spl-blobs" # so we don't depend on defconfig naming convention
-declare -g BOOT_SOC="rk3588"         # so we don't depend on defconfig naming convention
-declare -g BOOTCONFIG="blade3_defconfig"
+declare -g BOOT_SCENARIO="spl-blobs"                             # so we don't depend on defconfig naming convention
+declare -g BOOT_SOC="rk3588"                                     # so we don't depend on defconfig naming convention
+declare -g BOOTCONFIG="blade3_defconfig"                         # there is also blade3_sata_defconfig available
 declare -g IMAGE_PARTITION_TABLE="gpt"
 declare -g UEFI_EDK2_BOARD_ID="blade3" # This _only_ used for uefi-edk2-rk3588 extension

-function post_family_config__uboot_mixtile() {
-	display_alert "$BOARD" "Configuring Mixtile u-boot" "info"
-	declare -g BOOTSOURCE='https://github.com/radxa/u-boot.git'
-	declare -g BOOTBRANCH='branch:next-dev-v2024.03'
-	declare -g OVERLAY_PREFIX='rockchip-rk3588'
-	declare -g BOOTDIR="u-boot-${BOARD}"                   # do not share u-boot directory
-	declare -g BOOTPATCHDIR="legacy/u-boot-mixtile-rk3588" # Few patches in there; defconfig & PD hacks
-	declare -g BOOTDELAY=1                                 # build injects this into u-boot config. we can then get into UMS mode and avoid the whole rockusb/rkdeveloptool thing
+# Vendor u-boot; use the default family (rockchip-rk3588) u-boot. See config/sources/families/rockchip-rk3588.conf
+function post_family_config__vendor_uboot_mekotronics() {
+	display_alert "$BOARD" "Configuring $BOARD vendor u-boot" "info"
+	declare -g BOOTDELAY=1 # build injects this into u-boot config. we can then get into UMS mode and avoid the whole rockusb/rkdeveloptool thing
 }

 function post_family_config_branch_edge__different_dtb_for_edge() {
--- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0001-Add-Blade-3-defines.patch
+++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0001-Add-Blade-3-defines.patch
@ -1,300 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Martin Liu <martin@focalcrest.com>
-Date: Wed, 15 Jun 2022 15:37:09 +0800
-Subject: Add Blade 3 defines
-
---
- arch/arm/dts/rk3588-blade3.dts |  50 +++
- configs/blade3_defconfig       | 225 ++++++++++
- 2 files changed, 275 insertions(+)
-
-diff --git a/arch/arm/dts/rk3588-blade3.dts b/arch/arm/dts/rk3588-blade3.dts
-new file mode 100644
-index 000000000000..111111111111
--- /dev/null
-+++ b/arch/arm/dts/rk3588-blade3.dts
-@@ -0,0 +1,50 @@
-+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-+/*
-+ * Copyright (c) 2022 Mixtile Limited
-+ *
-+ */
-+
-+/dts-v1/;
-+
-+#include "rk3588.dtsi"
-+#include "rk3588-u-boot.dtsi"
-+#include <dt-bindings/input/input.h>
-+
-+/ {
-+	model = "Mixtile Blade 3";
-+	compatible = "mixtile,blade3", "rockchip,rk3588";
-+
-+	vbus5v0_typec1: vbus5v0-typec1 {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vbus5v0_typec1";
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+	};
-+};
-+
-+&i2c1 {
-+	status = "okay";
-+
-+	clock-frequency = <400000>;
-+	i2c-scl-rising-time-ns = <160>;
-+	i2c-scl-falling-time-ns = <30>;
-+
-+	usbc1: fusb302@22 {
-+		compatible = "fcs,fusb302";
-+		reg = <0x22>;
-+		interrupt-parent = <&gpio0>;
-+		interrupts = <RK_PC6 IRQ_TYPE_LEVEL_LOW>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&usbc1_int>;
-+		vbus-supply = <&vbus5v0_typec1>;
-+		status = "okay";
-+	};
-+};
-+
-+&pinctrl {
-+	usb-typec {
-+		usbc1_int: usbc1-int {
-+			rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
-+		};
-+	};
-+};
-diff --git a/configs/blade3_defconfig b/configs/blade3_defconfig
-new file mode 100644
-index 000000000000..111111111111
--- /dev/null
-+++ b/configs/blade3_defconfig
-@@ -0,0 +1,225 @@
-+CONFIG_ARM=y
-+CONFIG_ARCH_ROCKCHIP=y
-+CONFIG_SPL_GPIO_SUPPORT=y
-+CONFIG_SPL_LIBCOMMON_SUPPORT=y
-+CONFIG_SPL_LIBGENERIC_SUPPORT=y
-+CONFIG_SYS_MALLOC_F_LEN=0x80000
-+CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.sh"
-+CONFIG_ROCKCHIP_RK3588=y
-+CONFIG_ROCKCHIP_FIT_IMAGE=y
-+CONFIG_ROCKCHIP_HWID_DTB=y
-+CONFIG_ROCKCHIP_VENDOR_PARTITION=y
-+CONFIG_USING_KERNEL_DTB_V2=y
-+CONFIG_ROCKCHIP_FIT_IMAGE_PACK=y
-+CONFIG_ROCKCHIP_NEW_IDB=y
-+CONFIG_LOADER_INI="RK3588MINIALL.ini"
-+CONFIG_TRUST_INI="RK3588TRUST.ini"
-+CONFIG_SPL_SERIAL_SUPPORT=y
-+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
-+CONFIG_TARGET_EVB_RK3588=y
-+CONFIG_SPL_LIBDISK_SUPPORT=y
-+CONFIG_SPL_SPI_FLASH_SUPPORT=y
-+CONFIG_SPL_SPI_SUPPORT=y
-+CONFIG_DEFAULT_DEVICE_TREE="rk3588-blade3"
-+CONFIG_DEBUG_UART=y
-+CONFIG_FIT=y
-+CONFIG_FIT_IMAGE_POST_PROCESS=y
-+CONFIG_FIT_HW_CRYPTO=y
-+CONFIG_SPL_LOAD_FIT=y
-+CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
-+CONFIG_SPL_FIT_HW_CRYPTO=y
-+# CONFIG_SPL_SYS_DCACHE_OFF is not set
-+CONFIG_BOOTDELAY=0
-+CONFIG_SYS_CONSOLE_INFO_QUIET=y
-+# CONFIG_DISPLAY_CPUINFO is not set
-+CONFIG_ANDROID_BOOTLOADER=y
-+CONFIG_ANDROID_AVB=y
-+CONFIG_ANDROID_BOOT_IMAGE_HASH=y
-+CONFIG_SPL_BOARD_INIT=y
-+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
-+# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
-+CONFIG_SPL_SEPARATE_BSS=y
-+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
-+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=0x1
-+CONFIG_SPL_MMC_WRITE=y
-+CONFIG_SPL_MTD_SUPPORT=y
-+CONFIG_SPL_ATF=y
-+CONFIG_FASTBOOT_BUF_ADDR=0xc00800
-+CONFIG_FASTBOOT_BUF_SIZE=0x04000000
-+CONFIG_FASTBOOT_FLASH=y
-+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
-+CONFIG_CMD_BOOTZ=y
-+CONFIG_CMD_DTIMG=y
-+# CONFIG_CMD_ELF is not set
-+# CONFIG_CMD_IMI is not set
-+# CONFIG_CMD_IMLS is not set
-+# CONFIG_CMD_XIMG is not set
-+# CONFIG_CMD_LZMADEC is not set
-+# CONFIG_CMD_UNZIP is not set
-+# CONFIG_CMD_FLASH is not set
-+# CONFIG_CMD_FPGA is not set
-+CONFIG_CMD_GPT=y
-+# CONFIG_CMD_LOADB is not set
-+# CONFIG_CMD_LOADS is not set
-+CONFIG_CMD_BOOT_ANDROID=y
-+CONFIG_CMD_MMC=y
-+CONFIG_CMD_SF=y
-+CONFIG_CMD_SPI=y
-+CONFIG_CMD_USB=y
-+CONFIG_CMD_USB_MASS_STORAGE=y
-+# CONFIG_CMD_ITEST is not set
-+# CONFIG_CMD_SETEXPR is not set
-+CONFIG_CMD_TFTPPUT=y
-+CONFIG_CMD_TFTP_BOOTM=y
-+CONFIG_CMD_TFTP_FLASH=y
-+# CONFIG_CMD_MISC is not set
-+CONFIG_CMD_MTD_BLK=y
-+# CONFIG_SPL_DOS_PARTITION is not set
-+# CONFIG_ISO_PARTITION is not set
-+CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64
-+CONFIG_SPL_OF_CONTROL=y
-+CONFIG_SPL_DTB_MINIMUM=y
-+CONFIG_OF_LIVE=y
-+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
-+CONFIG_OF_U_BOOT_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
-+# CONFIG_NET_TFTP_VARS is not set
-+CONFIG_REGMAP=y
-+CONFIG_SPL_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_SPL_SYSCON=y
-+# CONFIG_SARADC_ROCKCHIP is not set
-+CONFIG_SARADC_ROCKCHIP_V2=y
-+CONFIG_CLK=y
-+CONFIG_SPL_CLK=y
-+CONFIG_CLK_SCMI=y
-+CONFIG_SPL_CLK_SCMI=y
-+CONFIG_DM_CRYPTO=y
-+CONFIG_SPL_DM_CRYPTO=y
-+CONFIG_ROCKCHIP_CRYPTO_V2=y
-+CONFIG_SPL_ROCKCHIP_CRYPTO_V2=y
-+CONFIG_DM_RNG=y
-+CONFIG_RNG_ROCKCHIP=y
-+CONFIG_SCMI_FIRMWARE=y
-+CONFIG_SPL_SCMI_FIRMWARE=y
-+CONFIG_ROCKCHIP_GPIO=y
-+CONFIG_ROCKCHIP_GPIO_V2=y
-+CONFIG_SYS_I2C_ROCKCHIP=y
-+CONFIG_DM_KEY=y
-+CONFIG_RK8XX_PWRKEY=y
-+CONFIG_ADC_KEY=y
-+CONFIG_MISC=y
-+CONFIG_SPL_MISC=y
-+CONFIG_MISC_DECOMPRESS=y
-+CONFIG_SPL_MISC_DECOMPRESS=y
-+CONFIG_ROCKCHIP_HW_DECOMPRESS=y
-+CONFIG_SPL_ROCKCHIP_HW_DECOMPRESS=y
-+CONFIG_SPL_ROCKCHIP_SECURE_OTP=y
-+CONFIG_MMC_DW=y
-+CONFIG_MMC_DW_ROCKCHIP=y
-+CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_SDMA=y
-+CONFIG_MMC_SDHCI_ROCKCHIP=y
-+CONFIG_MTD=y
-+CONFIG_MTD_BLK=y
-+CONFIG_MTD_DEVICE=y
-+CONFIG_NAND=y
-+CONFIG_MTD_SPI_NAND=y
-+CONFIG_SPI_FLASH=y
-+CONFIG_SF_DEFAULT_SPEED=80000000
-+CONFIG_SPI_FLASH_EON=y
-+CONFIG_SPI_FLASH_GIGADEVICE=y
-+CONFIG_SPI_FLASH_MACRONIX=y
-+CONFIG_SPI_FLASH_SST=y
-+CONFIG_SPI_FLASH_WINBOND=y
-+CONFIG_SPI_FLASH_XMC=y
-+CONFIG_SPI_FLASH_XTX=y
-+CONFIG_SPI_FLASH_MTD=y
-+CONFIG_DM_ETH=y
-+CONFIG_DM_ETH_PHY=y
-+CONFIG_DWC_ETH_QOS=y
-+CONFIG_GMAC_ROCKCHIP=y
-+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
-+CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=y
-+CONFIG_PHY_ROCKCHIP_USBDP=y
-+CONFIG_PINCTRL=y
-+CONFIG_SPL_PINCTRL=y
-+CONFIG_DM_FUEL_GAUGE=y
-+CONFIG_POWER_FG_CW201X=y
-+CONFIG_DM_PMIC=y
-+CONFIG_PMIC_SPI_RK8XX=y
-+CONFIG_DM_POWER_DELIVERY=y
-+CONFIG_TYPEC_TCPM=y
-+CONFIG_TYPEC_TCPCI=y
-+CONFIG_TYPEC_HUSB311=y
-+CONFIG_TYPEC_FUSB302=y
-+CONFIG_REGULATOR_PWM=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_REGULATOR_RK860X=y
-+CONFIG_REGULATOR_RK806=y
-+CONFIG_CHARGER_BQ25700=y
-+CONFIG_CHARGER_BQ25890=y
-+CONFIG_DM_CHARGE_DISPLAY=y
-+CONFIG_CHARGE_ANIMATION=y
-+CONFIG_PWM_ROCKCHIP=y
-+CONFIG_RAM=y
-+CONFIG_SPL_RAM=y
-+CONFIG_TPL_RAM=y
-+CONFIG_DM_RAMDISK=y
-+CONFIG_RAMDISK_RO=y
-+CONFIG_ROCKCHIP_SDRAM_COMMON=y
-+CONFIG_ROCKCHIP_TPL_INIT_DRAM_TYPE=0
-+CONFIG_DM_RESET=y
-+CONFIG_SPL_DM_RESET=y
-+CONFIG_SPL_RESET_ROCKCHIP=y
-+CONFIG_BAUDRATE=1500000
-+CONFIG_DEBUG_UART_BASE=0xFEB50000
-+CONFIG_DEBUG_UART_CLOCK=24000000
-+CONFIG_DEBUG_UART_SHIFT=2
-+CONFIG_ROCKCHIP_SPI=y
-+CONFIG_ROCKCHIP_SFC=y
-+CONFIG_SYSRESET=y
-+CONFIG_USB=y
-+CONFIG_USB_XHCI_HCD=y
-+CONFIG_USB_XHCI_DWC3=y
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_USB_EHCI_GENERIC=y
-+CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_OHCI_GENERIC=y
-+CONFIG_USB_DWC3=y
-+CONFIG_USB_DWC3_GADGET=y
-+CONFIG_USB_DWC3_GENERIC=y
-+CONFIG_USB_STORAGE=y
-+CONFIG_USB_GADGET=y
-+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
-+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
-+CONFIG_USB_GADGET_PRODUCT_NUM=0x350a
-+CONFIG_USB_GADGET_DOWNLOAD=y
-+CONFIG_DM_VIDEO=y
-+CONFIG_DISPLAY=y
-+CONFIG_DRM_ROCKCHIP=y
-+CONFIG_DRM_ROCKCHIP_DW_HDMI_QP=y
-+CONFIG_DRM_ROCKCHIP_DW_MIPI_DSI2=y
-+CONFIG_DRM_ROCKCHIP_ANALOGIX_DP=y
-+CONFIG_DRM_ROCKCHIP_DW_DP=y
-+CONFIG_DRM_ROCKCHIP_SAMSUNG_MIPI_DCPHY=y
-+CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX_HDMI=y
-+CONFIG_USE_TINY_PRINTF=y
-+CONFIG_LIB_RAND=y
-+CONFIG_SPL_TINY_MEMSET=y
-+CONFIG_RSA=y
-+CONFIG_SPL_RSA=y
-+CONFIG_RSA_N_SIZE=0x200
-+CONFIG_RSA_E_SIZE=0x10
-+CONFIG_RSA_C_SIZE=0x20
-+CONFIG_LZ4=y
-+CONFIG_ERRNO_STR=y
-+# CONFIG_EFI_LOADER is not set
-+CONFIG_AVB_LIBAVB=y
-+CONFIG_AVB_LIBAVB_AB=y
-+CONFIG_AVB_LIBAVB_ATX=y
-+CONFIG_AVB_LIBAVB_USER=y
-+CONFIG_RK_AVB_LIBAVB_USER=y
-+CONFIG_OPTEE_CLIENT=y
-+CONFIG_OPTEE_V2=y
-+CONFIG_OPTEE_ALWAYS_USE_SECURITY_PARTITION=y
-- 
-Armbian
-
--- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0005-add-device-tree-with-sata-support.patch
+++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0005-add-device-tree-with-sata-support.patch
@ -1,277 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Joshua Riek <jjriek@verizon.net>
-Date: Wed, 26 Jul 2023 23:14:06 -0400
-Subject: add device tree with sata support
-
---
- arch/arm/dts/rk3588-blade3-sata.dts |  27 ++
- configs/blade3_sata_defconfig       | 225 ++++++++++
- 2 files changed, 252 insertions(+)
-
-diff --git a/arch/arm/dts/rk3588-blade3-sata.dts b/arch/arm/dts/rk3588-blade3-sata.dts
-new file mode 100644
-index 000000000000..111111111111
--- /dev/null
-+++ b/arch/arm/dts/rk3588-blade3-sata.dts
-@@ -0,0 +1,27 @@
-+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-+/*
-+ * Copyright (c) 2022 Mixtile Limited
-+ *
-+ */
-+
-+/dts-v1/;
-+
-+#include "rk3588-blade3.dts"
-+
-+&sata2 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&sata2_reset>;
-+	status = "okay";
-+};
-+
-+&combphy2_psu {
-+	status = "okay";
-+};
-+
-+&pinctrl {
-+	sdmmc {
-+		sata2_reset: sata2-reset {
-+			rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
-+		};
-+	};
-+};
-diff --git a/configs/blade3_sata_defconfig b/configs/blade3_sata_defconfig
-new file mode 100644
-index 000000000000..111111111111
--- /dev/null
-+++ b/configs/blade3_sata_defconfig
-@@ -0,0 +1,225 @@
-+CONFIG_ARM=y
-+CONFIG_ARCH_ROCKCHIP=y
-+CONFIG_SPL_GPIO_SUPPORT=y
-+CONFIG_SPL_LIBCOMMON_SUPPORT=y
-+CONFIG_SPL_LIBGENERIC_SUPPORT=y
-+CONFIG_SYS_MALLOC_F_LEN=0x80000
-+CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.sh"
-+CONFIG_ROCKCHIP_RK3588=y
-+CONFIG_ROCKCHIP_FIT_IMAGE=y
-+CONFIG_ROCKCHIP_HWID_DTB=y
-+CONFIG_ROCKCHIP_VENDOR_PARTITION=y
-+CONFIG_USING_KERNEL_DTB_V2=y
-+CONFIG_ROCKCHIP_FIT_IMAGE_PACK=y
-+CONFIG_ROCKCHIP_NEW_IDB=y
-+CONFIG_LOADER_INI="RK3588MINIALL.ini"
-+CONFIG_TRUST_INI="RK3588TRUST.ini"
-+CONFIG_SPL_SERIAL_SUPPORT=y
-+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
-+CONFIG_TARGET_EVB_RK3588=y
-+CONFIG_SPL_LIBDISK_SUPPORT=y
-+CONFIG_SPL_SPI_FLASH_SUPPORT=y
-+CONFIG_SPL_SPI_SUPPORT=y
-+CONFIG_DEFAULT_DEVICE_TREE="rk3588-blade3-sata"
-+CONFIG_DEBUG_UART=y
-+CONFIG_FIT=y
-+CONFIG_FIT_IMAGE_POST_PROCESS=y
-+CONFIG_FIT_HW_CRYPTO=y
-+CONFIG_SPL_LOAD_FIT=y
-+CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
-+CONFIG_SPL_FIT_HW_CRYPTO=y
-+# CONFIG_SPL_SYS_DCACHE_OFF is not set
-+CONFIG_BOOTDELAY=0
-+CONFIG_SYS_CONSOLE_INFO_QUIET=y
-+# CONFIG_DISPLAY_CPUINFO is not set
-+CONFIG_ANDROID_BOOTLOADER=y
-+CONFIG_ANDROID_AVB=y
-+CONFIG_ANDROID_BOOT_IMAGE_HASH=y
-+CONFIG_SPL_BOARD_INIT=y
-+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
-+# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
-+CONFIG_SPL_SEPARATE_BSS=y
-+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
-+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=0x1
-+CONFIG_SPL_MMC_WRITE=y
-+CONFIG_SPL_MTD_SUPPORT=y
-+CONFIG_SPL_ATF=y
-+CONFIG_FASTBOOT_BUF_ADDR=0xc00800
-+CONFIG_FASTBOOT_BUF_SIZE=0x04000000
-+CONFIG_FASTBOOT_FLASH=y
-+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
-+CONFIG_CMD_BOOTZ=y
-+CONFIG_CMD_DTIMG=y
-+# CONFIG_CMD_ELF is not set
-+# CONFIG_CMD_IMI is not set
-+# CONFIG_CMD_IMLS is not set
-+# CONFIG_CMD_XIMG is not set
-+# CONFIG_CMD_LZMADEC is not set
-+# CONFIG_CMD_UNZIP is not set
-+# CONFIG_CMD_FLASH is not set
-+# CONFIG_CMD_FPGA is not set
-+CONFIG_CMD_GPT=y
-+# CONFIG_CMD_LOADB is not set
-+# CONFIG_CMD_LOADS is not set
-+CONFIG_CMD_BOOT_ANDROID=y
-+CONFIG_CMD_MMC=y
-+CONFIG_CMD_SF=y
-+CONFIG_CMD_SPI=y
-+CONFIG_CMD_USB=y
-+CONFIG_CMD_USB_MASS_STORAGE=y
-+# CONFIG_CMD_ITEST is not set
-+# CONFIG_CMD_SETEXPR is not set
-+CONFIG_CMD_TFTPPUT=y
-+CONFIG_CMD_TFTP_BOOTM=y
-+CONFIG_CMD_TFTP_FLASH=y
-+# CONFIG_CMD_MISC is not set
-+CONFIG_CMD_MTD_BLK=y
-+# CONFIG_SPL_DOS_PARTITION is not set
-+# CONFIG_ISO_PARTITION is not set
-+CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64
-+CONFIG_SPL_OF_CONTROL=y
-+CONFIG_SPL_DTB_MINIMUM=y
-+CONFIG_OF_LIVE=y
-+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
-+CONFIG_OF_U_BOOT_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
-+# CONFIG_NET_TFTP_VARS is not set
-+CONFIG_REGMAP=y
-+CONFIG_SPL_REGMAP=y
-+CONFIG_SYSCON=y
-+CONFIG_SPL_SYSCON=y
-+# CONFIG_SARADC_ROCKCHIP is not set
-+CONFIG_SARADC_ROCKCHIP_V2=y
-+CONFIG_CLK=y
-+CONFIG_SPL_CLK=y
-+CONFIG_CLK_SCMI=y
-+CONFIG_SPL_CLK_SCMI=y
-+CONFIG_DM_CRYPTO=y
-+CONFIG_SPL_DM_CRYPTO=y
-+CONFIG_ROCKCHIP_CRYPTO_V2=y
-+CONFIG_SPL_ROCKCHIP_CRYPTO_V2=y
-+CONFIG_DM_RNG=y
-+CONFIG_RNG_ROCKCHIP=y
-+CONFIG_SCMI_FIRMWARE=y
-+CONFIG_SPL_SCMI_FIRMWARE=y
-+CONFIG_ROCKCHIP_GPIO=y
-+CONFIG_ROCKCHIP_GPIO_V2=y
-+CONFIG_SYS_I2C_ROCKCHIP=y
-+CONFIG_DM_KEY=y
-+CONFIG_RK8XX_PWRKEY=y
-+CONFIG_ADC_KEY=y
-+CONFIG_MISC=y
-+CONFIG_SPL_MISC=y
-+CONFIG_MISC_DECOMPRESS=y
-+CONFIG_SPL_MISC_DECOMPRESS=y
-+CONFIG_ROCKCHIP_HW_DECOMPRESS=y
-+CONFIG_SPL_ROCKCHIP_HW_DECOMPRESS=y
-+CONFIG_SPL_ROCKCHIP_SECURE_OTP=y
-+CONFIG_MMC_DW=y
-+CONFIG_MMC_DW_ROCKCHIP=y
-+CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_SDMA=y
-+CONFIG_MMC_SDHCI_ROCKCHIP=y
-+CONFIG_MTD=y
-+CONFIG_MTD_BLK=y
-+CONFIG_MTD_DEVICE=y
-+CONFIG_NAND=y
-+CONFIG_MTD_SPI_NAND=y
-+CONFIG_SPI_FLASH=y
-+CONFIG_SF_DEFAULT_SPEED=80000000
-+CONFIG_SPI_FLASH_EON=y
-+CONFIG_SPI_FLASH_GIGADEVICE=y
-+CONFIG_SPI_FLASH_MACRONIX=y
-+CONFIG_SPI_FLASH_SST=y
-+CONFIG_SPI_FLASH_WINBOND=y
-+CONFIG_SPI_FLASH_XMC=y
-+CONFIG_SPI_FLASH_XTX=y
-+CONFIG_SPI_FLASH_MTD=y
-+CONFIG_DM_ETH=y
-+CONFIG_DM_ETH_PHY=y
-+CONFIG_DWC_ETH_QOS=y
-+CONFIG_GMAC_ROCKCHIP=y
-+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
-+CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=y
-+CONFIG_PHY_ROCKCHIP_USBDP=y
-+CONFIG_PINCTRL=y
-+CONFIG_SPL_PINCTRL=y
-+CONFIG_DM_FUEL_GAUGE=y
-+CONFIG_POWER_FG_CW201X=y
-+CONFIG_DM_PMIC=y
-+CONFIG_PMIC_SPI_RK8XX=y
-+CONFIG_DM_POWER_DELIVERY=y
-+CONFIG_TYPEC_TCPM=y
-+CONFIG_TYPEC_TCPCI=y
-+CONFIG_TYPEC_HUSB311=y
-+CONFIG_TYPEC_FUSB302=y
-+CONFIG_REGULATOR_PWM=y
-+CONFIG_DM_REGULATOR_FIXED=y
-+CONFIG_DM_REGULATOR_GPIO=y
-+CONFIG_REGULATOR_RK860X=y
-+CONFIG_REGULATOR_RK806=y
-+CONFIG_CHARGER_BQ25700=y
-+CONFIG_CHARGER_BQ25890=y
-+CONFIG_DM_CHARGE_DISPLAY=y
-+CONFIG_CHARGE_ANIMATION=y
-+CONFIG_PWM_ROCKCHIP=y
-+CONFIG_RAM=y
-+CONFIG_SPL_RAM=y
-+CONFIG_TPL_RAM=y
-+CONFIG_DM_RAMDISK=y
-+CONFIG_RAMDISK_RO=y
-+CONFIG_ROCKCHIP_SDRAM_COMMON=y
-+CONFIG_ROCKCHIP_TPL_INIT_DRAM_TYPE=0
-+CONFIG_DM_RESET=y
-+CONFIG_SPL_DM_RESET=y
-+CONFIG_SPL_RESET_ROCKCHIP=y
-+CONFIG_BAUDRATE=1500000
-+CONFIG_DEBUG_UART_BASE=0xFEB50000
-+CONFIG_DEBUG_UART_CLOCK=24000000
-+CONFIG_DEBUG_UART_SHIFT=2
-+CONFIG_ROCKCHIP_SPI=y
-+CONFIG_ROCKCHIP_SFC=y
-+CONFIG_SYSRESET=y
-+CONFIG_USB=y
-+CONFIG_USB_XHCI_HCD=y
-+CONFIG_USB_XHCI_DWC3=y
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_USB_EHCI_GENERIC=y
-+CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_OHCI_GENERIC=y
-+CONFIG_USB_DWC3=y
-+CONFIG_USB_DWC3_GADGET=y
-+CONFIG_USB_DWC3_GENERIC=y
-+CONFIG_USB_STORAGE=y
-+CONFIG_USB_GADGET=y
-+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
-+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
-+CONFIG_USB_GADGET_PRODUCT_NUM=0x350a
-+CONFIG_USB_GADGET_DOWNLOAD=y
-+CONFIG_DM_VIDEO=y
-+CONFIG_DISPLAY=y
-+CONFIG_DRM_ROCKCHIP=y
-+CONFIG_DRM_ROCKCHIP_DW_HDMI_QP=y
-+CONFIG_DRM_ROCKCHIP_DW_MIPI_DSI2=y
-+CONFIG_DRM_ROCKCHIP_ANALOGIX_DP=y
-+CONFIG_DRM_ROCKCHIP_DW_DP=y
-+CONFIG_DRM_ROCKCHIP_SAMSUNG_MIPI_DCPHY=y
-+CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX_HDMI=y
-+CONFIG_USE_TINY_PRINTF=y
-+CONFIG_LIB_RAND=y
-+CONFIG_SPL_TINY_MEMSET=y
-+CONFIG_RSA=y
-+CONFIG_SPL_RSA=y
-+CONFIG_RSA_N_SIZE=0x200
-+CONFIG_RSA_E_SIZE=0x10
-+CONFIG_RSA_C_SIZE=0x20
-+CONFIG_LZ4=y
-+CONFIG_ERRNO_STR=y
-+# CONFIG_EFI_LOADER is not set
-+CONFIG_AVB_LIBAVB=y
-+CONFIG_AVB_LIBAVB_AB=y
-+CONFIG_AVB_LIBAVB_ATX=y
-+CONFIG_AVB_LIBAVB_USER=y
-+CONFIG_RK_AVB_LIBAVB_USER=y
-+CONFIG_OPTEE_CLIENT=y
-+CONFIG_OPTEE_V2=y
-+CONFIG_OPTEE_ALWAYS_USE_SECURITY_PARTITION=y
-- 
-Armbian
-
--- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0006-disable-optee-in-defconfig.patch
+++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0006-disable-optee-in-defconfig.patch
@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ricardo Pardini <ricardo@pardini.net>
-Date: Tue, 4 Jul 2023 18:07:52 +0000
-Subject: disable optee in defconfig
-
-Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
---
- configs/blade3_defconfig      | 5 +----
- configs/blade3_sata_defconfig | 5 +----
- 2 files changed, 2 insertions(+), 8 deletions(-)
-
-diff --git a/configs/blade3_defconfig b/configs/blade3_defconfig
-index 111111111111..222222222222 100644
--- a/configs/blade3_defconfig
-+++ b/configs/blade3_defconfig
-@@ -200,8 +200,8 @@ CONFIG_DISPLAY=y
- CONFIG_DRM_ROCKCHIP=y
- CONFIG_DRM_ROCKCHIP_DW_HDMI_QP=y
- CONFIG_DRM_ROCKCHIP_DW_MIPI_DSI2=y
-CONFIG_DRM_ROCKCHIP_ANALOGIX_DP=y
- CONFIG_DRM_ROCKCHIP_DW_DP=y
-+CONFIG_DRM_ROCKCHIP_ANALOGIX_DP=y
- CONFIG_DRM_ROCKCHIP_SAMSUNG_MIPI_DCPHY=y
- CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX_HDMI=y
- CONFIG_USE_TINY_PRINTF=y
-@@ -220,6 +220,3 @@ CONFIG_AVB_LIBAVB_AB=y
- CONFIG_AVB_LIBAVB_ATX=y
- CONFIG_AVB_LIBAVB_USER=y
- CONFIG_RK_AVB_LIBAVB_USER=y
-CONFIG_OPTEE_CLIENT=y
-CONFIG_OPTEE_V2=y
-CONFIG_OPTEE_ALWAYS_USE_SECURITY_PARTITION=y
-diff --git a/configs/blade3_sata_defconfig b/configs/blade3_sata_defconfig
-index 111111111111..222222222222 100644
--- a/configs/blade3_sata_defconfig
-+++ b/configs/blade3_sata_defconfig
-@@ -200,8 +200,8 @@ CONFIG_DISPLAY=y
- CONFIG_DRM_ROCKCHIP=y
- CONFIG_DRM_ROCKCHIP_DW_HDMI_QP=y
- CONFIG_DRM_ROCKCHIP_DW_MIPI_DSI2=y
-CONFIG_DRM_ROCKCHIP_ANALOGIX_DP=y
- CONFIG_DRM_ROCKCHIP_DW_DP=y
-+CONFIG_DRM_ROCKCHIP_ANALOGIX_DP=y
- CONFIG_DRM_ROCKCHIP_SAMSUNG_MIPI_DCPHY=y
- CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX_HDMI=y
- CONFIG_USE_TINY_PRINTF=y
-@@ -220,6 +220,3 @@ CONFIG_AVB_LIBAVB_AB=y
- CONFIG_AVB_LIBAVB_ATX=y
- CONFIG_AVB_LIBAVB_USER=y
- CONFIG_RK_AVB_LIBAVB_USER=y
-CONFIG_OPTEE_CLIENT=y
-CONFIG_OPTEE_V2=y
-CONFIG_OPTEE_ALWAYS_USE_SECURITY_PARTITION=y
-- 
-Armbian
-
--- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0007-mixtile-blade3-enable-OTP-in-defconfig.patch
+++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0007-mixtile-blade3-enable-OTP-in-defconfig.patch
@ -1,31 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ricardo Pardini <ricardo@pardini.net>
-Date: Tue, 4 Jul 2023 18:07:52 +0000
-Subject: mixtile-blade3: enable OTP in defconfig
-
---
- configs/blade3_defconfig      | 1 +
- configs/blade3_sata_defconfig | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/configs/blade3_defconfig b/configs/blade3_defconfig
-index 111111111111..222222222222 100644
--- a/configs/blade3_defconfig
-+++ b/configs/blade3_defconfig
-@@ -220,3 +220,4 @@ CONFIG_AVB_LIBAVB_AB=y
- CONFIG_AVB_LIBAVB_ATX=y
- CONFIG_AVB_LIBAVB_USER=y
- CONFIG_RK_AVB_LIBAVB_USER=y
-+CONFIG_ROCKCHIP_OTP=y
-diff --git a/configs/blade3_sata_defconfig b/configs/blade3_sata_defconfig
-index 111111111111..222222222222 100644
--- a/configs/blade3_sata_defconfig
-+++ b/configs/blade3_sata_defconfig
-@@ -220,3 +220,4 @@ CONFIG_AVB_LIBAVB_AB=y
- CONFIG_AVB_LIBAVB_ATX=y
- CONFIG_AVB_LIBAVB_USER=y
- CONFIG_RK_AVB_LIBAVB_USER=y
-+CONFIG_ROCKCHIP_OTP=y
-- 
-Armbian
-
--- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0008-enable-nvme-pci-and-scsi-in-the-defconfig.patch
+++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0008-enable-nvme-pci-and-scsi-in-the-defconfig.patch
@ -1,93 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Joshua Riek <jjriek@verizon.net>
-Date: Wed, 26 Jul 2023 23:42:01 -0400
-Subject: enable nvme, pci, and scsi in the defconfig
-
---
- configs/blade3_defconfig      | 18 +++++++++-
- configs/blade3_sata_defconfig | 18 +++++++++-
- 2 files changed, 34 insertions(+), 2 deletions(-)
-
-diff --git a/configs/blade3_defconfig b/configs/blade3_defconfig
-index 111111111111..222222222222 100644
--- a/configs/blade3_defconfig
-+++ b/configs/blade3_defconfig
-@@ -29,7 +29,7 @@ CONFIG_SPL_LOAD_FIT=y
- CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
- CONFIG_SPL_FIT_HW_CRYPTO=y
- # CONFIG_SPL_SYS_DCACHE_OFF is not set
-CONFIG_BOOTDELAY=0
-+CONFIG_BOOTDELAY=1
- CONFIG_SYS_CONSOLE_INFO_QUIET=y
- # CONFIG_DISPLAY_CPUINFO is not set
- CONFIG_ANDROID_BOOTLOADER=y
-@@ -138,6 +138,13 @@ CONFIG_DM_ETH=y
- CONFIG_DM_ETH_PHY=y
- CONFIG_DWC_ETH_QOS=y
- CONFIG_GMAC_ROCKCHIP=y
-+CONFIG_NVME=y
-+CONFIG_CMD_NVME=y
-+CONFIG_PCI=y
-+CONFIG_CMD_PCI=y
-+CONFIG_DM_PCI=y
-+CONFIG_DM_PCI_COMPAT=y
-+CONFIG_PCIE_DW_ROCKCHIP=y
- CONFIG_PHY_ROCKCHIP_INNO_USB2=y
- CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=y
- CONFIG_PHY_ROCKCHIP_USBDP=y
-@@ -221,3 +228,12 @@ CONFIG_AVB_LIBAVB_ATX=y
- CONFIG_AVB_LIBAVB_USER=y
- CONFIG_RK_AVB_LIBAVB_USER=y
- CONFIG_ROCKCHIP_OTP=y
-+CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
-+CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y
-+CONFIG_AHCI=y
-+CONFIG_CMD_SCSI=y
-+CONFIG_DM_SCSI=y
-+CONFIG_DWC_AHCI=y
-+CONFIG_LIBATA=y
-+CONFIG_SCSI_AHCI=y
-+CONFIG_SCSI=y
-diff --git a/configs/blade3_sata_defconfig b/configs/blade3_sata_defconfig
-index 111111111111..222222222222 100644
--- a/configs/blade3_sata_defconfig
-+++ b/configs/blade3_sata_defconfig
-@@ -29,7 +29,7 @@ CONFIG_SPL_LOAD_FIT=y
- CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
- CONFIG_SPL_FIT_HW_CRYPTO=y
- # CONFIG_SPL_SYS_DCACHE_OFF is not set
-CONFIG_BOOTDELAY=0
-+CONFIG_BOOTDELAY=1
- CONFIG_SYS_CONSOLE_INFO_QUIET=y
- # CONFIG_DISPLAY_CPUINFO is not set
- CONFIG_ANDROID_BOOTLOADER=y
-@@ -138,6 +138,13 @@ CONFIG_DM_ETH=y
- CONFIG_DM_ETH_PHY=y
- CONFIG_DWC_ETH_QOS=y
- CONFIG_GMAC_ROCKCHIP=y
-+CONFIG_NVME=y
-+CONFIG_CMD_NVME=y
-+CONFIG_PCI=y
-+CONFIG_CMD_PCI=y
-+CONFIG_DM_PCI=y
-+CONFIG_DM_PCI_COMPAT=y
-+CONFIG_PCIE_DW_ROCKCHIP=y
- CONFIG_PHY_ROCKCHIP_INNO_USB2=y
- CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=y
- CONFIG_PHY_ROCKCHIP_USBDP=y
-@@ -221,3 +228,12 @@ CONFIG_AVB_LIBAVB_ATX=y
- CONFIG_AVB_LIBAVB_USER=y
- CONFIG_RK_AVB_LIBAVB_USER=y
- CONFIG_ROCKCHIP_OTP=y
-+CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
-+CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y
-+CONFIG_AHCI=y
-+CONFIG_CMD_SCSI=y
-+CONFIG_DM_SCSI=y
-+CONFIG_DWC_AHCI=y
-+CONFIG_LIBATA=y
-+CONFIG_SCSI_AHCI=y
-+CONFIG_SCSI=y
-- 
-Armbian
-
--- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0010-blade3-enable-pcie3x4.patch
+++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0010-blade3-enable-pcie3x4.patch
@ -1,267 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ricardo Pardini <ricardo@pardini.net>
-Date: Tue, 10 Oct 2023 22:13:28 +0200
-Subject: blade3: enable pcie3x4
-
---
- arch/arm/dts/rk3588-blade3.dts | 75 +++++++++-
- configs/blade3_defconfig       | 40 ++---
- 2 files changed, 95 insertions(+), 20 deletions(-)
-
-diff --git a/arch/arm/dts/rk3588-blade3.dts b/arch/arm/dts/rk3588-blade3.dts
-index 111111111111..222222222222 100644
--- a/arch/arm/dts/rk3588-blade3.dts
-+++ b/arch/arm/dts/rk3588-blade3.dts
-@@ -5,7 +5,6 @@
-  */
- 
- /dts-v1/;
-
- #include "rk3588.dtsi"
- #include "rk3588-u-boot.dtsi"
- #include <dt-bindings/input/input.h>
-@@ -14,6 +13,43 @@
- 	model = "Mixtile Blade 3";
- 	compatible = "mixtile,blade3", "rockchip,rk3588";
- 
-+	vcc12v_dcin: vcc12v-dcin {
-+		u-boot,dm-pre-reloc;
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc12v_dcin";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <12000000>;
-+		regulator-max-microvolt = <12000000>;
-+	};
-+
-+	vcc5v0_sys: vcc5v0-sys {
-+		u-boot,dm-pre-reloc;
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc5v0_sys";
-+		regulator-always-on;
-+		regulator-boot-on;
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		vin-supply = <&vcc12v_dcin>;
-+	};
-+
-+	vcc3v3_pcie30: vcc3v3-pcie30 {
-+		u-boot,dm-pre-reloc;
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc3v3_pcie30";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		enable-active-high;
-+		gpio = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>;
-+		regulator-boot-on;
-+		regulator-always-on;
-+		startup-delay-us = <5000>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&vcc3v3_pcie30_en>;
-+		vin-supply = <&vcc12v_dcin>;
-+	};
-+
- 	vbus5v0_typec1: vbus5v0-typec1 {
- 		compatible = "regulator-fixed";
- 		regulator-name = "vbus5v0_typec1";
-@@ -22,6 +58,33 @@
- 	};
- };
- 
-+&pcie3x4 {
-+	u-boot,dm-pre-reloc;
-+	vpcie3v3-supply = <&vcc3v3_pcie30>;
-+	reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
-+	status = "okay";
-+};
-+
-+&pcie30phy {
-+	u-boot,dm-pre-reloc;
-+	status = "okay";
-+};
-+
-+&combphy0_ps {
-+	u-boot,dm-pre-reloc;
-+	status = "okay";
-+};
-+
-+&combphy1_ps {
-+	u-boot,dm-pre-reloc;
-+	status = "okay";
-+};
-+
-+&combphy2_psu {
-+	u-boot,dm-pre-reloc;
-+	status = "okay";
-+};
-+
- &i2c1 {
- 	status = "okay";
- 
-@@ -47,4 +110,14 @@
- 			rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
- 		};
- 	};
-+
-+	pcie {
-+		u-boot,dm-spl;
-+		vcc3v3_pcie30_en: vcc3v3-pcie30-en {
-+			u-boot,dm-spl;
-+			rockchip,pins = <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>;
-+		};
-+	
-+	};
- };
-+
-diff --git a/configs/blade3_defconfig b/configs/blade3_defconfig
-index 111111111111..222222222222 100644
--- a/configs/blade3_defconfig
-+++ b/configs/blade3_defconfig
-@@ -6,14 +6,14 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
- CONFIG_SYS_MALLOC_F_LEN=0x80000
- CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.sh"
- CONFIG_ROCKCHIP_RK3588=y
-+CONFIG_ROCKCHIP_USB_BOOT=y
- CONFIG_ROCKCHIP_FIT_IMAGE=y
- CONFIG_ROCKCHIP_HWID_DTB=y
- CONFIG_ROCKCHIP_VENDOR_PARTITION=y
- CONFIG_USING_KERNEL_DTB_V2=y
- CONFIG_ROCKCHIP_FIT_IMAGE_PACK=y
- CONFIG_ROCKCHIP_NEW_IDB=y
-CONFIG_LOADER_INI="RK3588MINIALL.ini"
-CONFIG_TRUST_INI="RK3588TRUST.ini"
-+CONFIG_PSTORE=y
- CONFIG_SPL_SERIAL_SUPPORT=y
- CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
- CONFIG_TARGET_EVB_RK3588=y
-@@ -63,6 +63,7 @@ CONFIG_CMD_GPT=y
- # CONFIG_CMD_LOADS is not set
- CONFIG_CMD_BOOT_ANDROID=y
- CONFIG_CMD_MMC=y
-+CONFIG_CMD_PCI=y
- CONFIG_CMD_SF=y
- CONFIG_CMD_SPI=y
- CONFIG_CMD_USB=y
-@@ -81,7 +82,6 @@ CONFIG_SPL_OF_CONTROL=y
- CONFIG_SPL_DTB_MINIMUM=y
- CONFIG_OF_LIVE=y
- CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
-CONFIG_OF_U_BOOT_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
- # CONFIG_NET_TFTP_VARS is not set
- CONFIG_REGMAP=y
- CONFIG_SPL_REGMAP=y
-@@ -101,9 +101,11 @@ CONFIG_DM_RNG=y
- CONFIG_RNG_ROCKCHIP=y
- CONFIG_SCMI_FIRMWARE=y
- CONFIG_SPL_SCMI_FIRMWARE=y
-+CONFIG_GPIO_HOG=y
- CONFIG_ROCKCHIP_GPIO=y
- CONFIG_ROCKCHIP_GPIO_V2=y
- CONFIG_SYS_I2C_ROCKCHIP=y
-+CONFIG_I2C_MUX=y
- CONFIG_DM_KEY=y
- CONFIG_RK8XX_PWRKEY=y
- CONFIG_ADC_KEY=y
-@@ -111,6 +113,7 @@ CONFIG_MISC=y
- CONFIG_SPL_MISC=y
- CONFIG_MISC_DECOMPRESS=y
- CONFIG_SPL_MISC_DECOMPRESS=y
-+CONFIG_ROCKCHIP_OTP=y
- CONFIG_ROCKCHIP_HW_DECOMPRESS=y
- CONFIG_SPL_ROCKCHIP_HW_DECOMPRESS=y
- CONFIG_SPL_ROCKCHIP_SECURE_OTP=y
-@@ -134,24 +137,27 @@ CONFIG_SPI_FLASH_WINBOND=y
- CONFIG_SPI_FLASH_XMC=y
- CONFIG_SPI_FLASH_XTX=y
- CONFIG_SPI_FLASH_MTD=y
-+CONFIG_PHY_REALTEK=y
- CONFIG_DM_ETH=y
- CONFIG_DM_ETH_PHY=y
- CONFIG_DWC_ETH_QOS=y
-+CONFIG_RGMII=y
- CONFIG_GMAC_ROCKCHIP=y
- CONFIG_NVME=y
-CONFIG_CMD_NVME=y
- CONFIG_PCI=y
-CONFIG_CMD_PCI=y
- CONFIG_DM_PCI=y
- CONFIG_DM_PCI_COMPAT=y
- CONFIG_PCIE_DW_ROCKCHIP=y
-CONFIG_PHY_ROCKCHIP_INNO_USB2=y
-+CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
-+CONFIG_PHY_ROCKCHIP_NANENG_USB2=y
- CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=y
-CONFIG_PHY_ROCKCHIP_USBDP=y
-+CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y
-+CONFIG_PHY_ROCKCHIP_TYPEC=y
- CONFIG_PINCTRL=y
- CONFIG_SPL_PINCTRL=y
- CONFIG_DM_FUEL_GAUGE=y
- CONFIG_POWER_FG_CW201X=y
-+CONFIG_POWER_FG_CW221X=y
- CONFIG_DM_PMIC=y
- CONFIG_PMIC_SPI_RK8XX=y
- CONFIG_DM_POWER_DELIVERY=y
-@@ -166,6 +172,8 @@ CONFIG_REGULATOR_RK860X=y
- CONFIG_REGULATOR_RK806=y
- CONFIG_CHARGER_BQ25700=y
- CONFIG_CHARGER_BQ25890=y
-+CONFIG_CHARGER_SC8551=y
-+CONFIG_CHARGER_SGM41542=y
- CONFIG_DM_CHARGE_DISPLAY=y
- CONFIG_CHARGE_ANIMATION=y
- CONFIG_PWM_ROCKCHIP=y
-@@ -174,8 +182,6 @@ CONFIG_SPL_RAM=y
- CONFIG_TPL_RAM=y
- CONFIG_DM_RAMDISK=y
- CONFIG_RAMDISK_RO=y
-CONFIG_ROCKCHIP_SDRAM_COMMON=y
-CONFIG_ROCKCHIP_TPL_INIT_DRAM_TYPE=0
- CONFIG_DM_RESET=y
- CONFIG_SPL_DM_RESET=y
- CONFIG_SPL_RESET_ROCKCHIP=y
-@@ -189,6 +195,7 @@ CONFIG_SYSRESET=y
- CONFIG_USB=y
- CONFIG_USB_XHCI_HCD=y
- CONFIG_USB_XHCI_DWC3=y
-+CONFIG_USB_XHCI_PCI=y
- CONFIG_USB_EHCI_HCD=y
- CONFIG_USB_EHCI_GENERIC=y
- CONFIG_USB_OHCI_HCD=y
-@@ -205,6 +212,9 @@ CONFIG_USB_GADGET_DOWNLOAD=y
- CONFIG_DM_VIDEO=y
- CONFIG_DISPLAY=y
- CONFIG_DRM_ROCKCHIP=y
-+CONFIG_DRM_MAXIM_MAX96745=y
-+CONFIG_DRM_MAXIM_MAX96755F=y
-+CONFIG_DRM_ROHM_BU18XL82=y
- CONFIG_DRM_ROCKCHIP_DW_HDMI_QP=y
- CONFIG_DRM_ROCKCHIP_DW_MIPI_DSI2=y
- CONFIG_DRM_ROCKCHIP_DW_DP=y
-@@ -219,7 +229,9 @@ CONFIG_SPL_RSA=y
- CONFIG_RSA_N_SIZE=0x200
- CONFIG_RSA_E_SIZE=0x10
- CONFIG_RSA_C_SIZE=0x20
-+CONFIG_XBC=y
- CONFIG_LZ4=y
-+CONFIG_LZMA=y
- CONFIG_ERRNO_STR=y
- # CONFIG_EFI_LOADER is not set
- CONFIG_AVB_LIBAVB=y
-@@ -227,13 +239,3 @@ CONFIG_AVB_LIBAVB_AB=y
- CONFIG_AVB_LIBAVB_ATX=y
- CONFIG_AVB_LIBAVB_USER=y
- CONFIG_RK_AVB_LIBAVB_USER=y
-CONFIG_ROCKCHIP_OTP=y
-CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
-CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y
-CONFIG_AHCI=y
-CONFIG_CMD_SCSI=y
-CONFIG_DM_SCSI=y
-CONFIG_DWC_AHCI=y
-CONFIG_LIBATA=y
-CONFIG_SCSI_AHCI=y
-CONFIG_SCSI=y
-- 
-Armbian
-
--- a/patch/u-boot/legacy/u-boot-mixtile-rk3588/0011-arch-arm-mach-rockchip-fix-srctree-path.patch
+++ b/patch/u-boot/legacy/u-boot-mixtile-rk3588/0011-arch-arm-mach-rockchip-fix-srctree-path.patch
@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Joshua Riek <jjriek@verizon.net>
-Date: Sun, 23 Apr 2023 10:26:00 -0400
-Subject: arch: arm: mach-rockchip: fix srctree path
-
---
- arch/arm/mach-rockchip/fit_nodes.sh    | 2 +-
- arch/arm/mach-rockchip/make_fit_atf.sh | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-rockchip/fit_nodes.sh b/arch/arm/mach-rockchip/fit_nodes.sh
-index 111111111111..222222222222 100755
--- a/arch/arm/mach-rockchip/fit_nodes.sh
-+++ b/arch/arm/mach-rockchip/fit_nodes.sh
-@@ -6,7 +6,7 @@
- #
- 
- # Process args and auto set variables
-source ./${srctree}/arch/arm/mach-rockchip/fit_args.sh
-+source ${srctree}/arch/arm/mach-rockchip/fit_args.sh
- rm -f ${srctree}/*.digest ${srctree}/*.bin.gz ${srctree}/bl31_0x*.bin
- 
- # Periph register
-diff --git a/arch/arm/mach-rockchip/make_fit_atf.sh b/arch/arm/mach-rockchip/make_fit_atf.sh
-index 111111111111..222222222222 100755
--- a/arch/arm/mach-rockchip/make_fit_atf.sh
-+++ b/arch/arm/mach-rockchip/make_fit_atf.sh
-@@ -5,7 +5,7 @@
- # SPDX-License-Identifier:     GPL-2.0+
- #
- 
-source ./${srctree}/arch/arm/mach-rockchip/fit_nodes.sh
-+source ${srctree}/arch/arm/mach-rockchip/fit_nodes.sh
- 
- gen_header
- gen_uboot_node
-- 
-Armbian
-
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mixtile-blade3/5000-Fixed-restart-issues-with-pd-adapter.patch
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mixtile-blade3/5000-Fixed-restart-issues-with-pd-adapter.patch
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mixtile-blade3/5001-fix-power_delivery-driver-affects-adb-to-enter-loader-mode.patch
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mixtile-blade3/5001-fix-power_delivery-driver-affects-adb-to-enter-loader-mode.patch
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mixtile-blade3/5002-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging-adapted-for-Mixtile.patch
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mixtile-blade3/5002-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging-adapted-for-Mixtile.patch
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/blade3_defconfig
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/blade3_defconfig
@ -0,0 +1,242 @@
+CONFIG_ARM=y
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_SPL_GPIO_SUPPORT=y
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_SYS_MALLOC_F_LEN=0x80000
+CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.sh"
+CONFIG_ROCKCHIP_RK3588=y
+CONFIG_ROCKCHIP_USB_BOOT=y
+CONFIG_ROCKCHIP_FIT_IMAGE=y
+CONFIG_ROCKCHIP_HWID_DTB=y
+CONFIG_ROCKCHIP_VENDOR_PARTITION=y
+CONFIG_USING_KERNEL_DTB_V2=y
+CONFIG_ROCKCHIP_FIT_IMAGE_PACK=y
+CONFIG_ROCKCHIP_NEW_IDB=y
+CONFIG_PSTORE=y
+CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_TARGET_EVB_RK3588=y
+CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_DEFAULT_DEVICE_TREE="rk3588-blade3"
+CONFIG_DEBUG_UART=y
+CONFIG_LOCALVERSION="-armbian"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_FIT=y
+CONFIG_FIT_IMAGE_POST_PROCESS=y
+CONFIG_FIT_HW_CRYPTO=y
+CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
+CONFIG_SPL_FIT_HW_CRYPTO=y
+# CONFIG_SPL_SYS_DCACHE_OFF is not set
+CONFIG_BOOTDELAY=1
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
+# CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_ANDROID_BOOTLOADER=y
+CONFIG_ANDROID_AVB=y
+CONFIG_ANDROID_BOOT_IMAGE_HASH=y
+CONFIG_SPL_BOARD_INIT=y
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
+CONFIG_SPL_SEPARATE_BSS=y
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=0x1
+CONFIG_SPL_MMC_WRITE=y
+CONFIG_SPL_MTD_SUPPORT=y
+CONFIG_SPL_ATF=y
+CONFIG_FASTBOOT_BUF_ADDR=0xc00800
+CONFIG_FASTBOOT_BUF_SIZE=0x04000000
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_DTIMG=y
+# CONFIG_CMD_ELF is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_LZMADEC is not set
+# CONFIG_CMD_UNZIP is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+CONFIG_CMD_GPT=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+CONFIG_CMD_BOOT_ANDROID=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_PCI=y
+CONFIG_CMD_SF=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_TFTPPUT=y
+CONFIG_CMD_TFTP_BOOTM=y
+CONFIG_CMD_TFTP_FLASH=y
+# CONFIG_CMD_MISC is not set
+CONFIG_CMD_MTD_BLK=y
+# CONFIG_SPL_DOS_PARTITION is not set
+# CONFIG_ISO_PARTITION is not set
+CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_SPL_DTB_MINIMUM=y
+CONFIG_OF_LIVE=y
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+# CONFIG_NET_TFTP_VARS is not set
+CONFIG_REGMAP=y
+CONFIG_SPL_REGMAP=y
+CONFIG_SYSCON=y
+CONFIG_SPL_SYSCON=y
+# CONFIG_SARADC_ROCKCHIP is not set
+CONFIG_SARADC_ROCKCHIP_V2=y
+CONFIG_CLK=y
+CONFIG_SPL_CLK=y
+CONFIG_CLK_SCMI=y
+CONFIG_SPL_CLK_SCMI=y
+CONFIG_DM_CRYPTO=y
+CONFIG_SPL_DM_CRYPTO=y
+CONFIG_ROCKCHIP_CRYPTO_V2=y
+CONFIG_SPL_ROCKCHIP_CRYPTO_V2=y
+CONFIG_DM_RNG=y
+CONFIG_RNG_ROCKCHIP=y
+CONFIG_SCMI_FIRMWARE=y
+CONFIG_SPL_SCMI_FIRMWARE=y
+CONFIG_GPIO_HOG=y
+CONFIG_ROCKCHIP_GPIO=y
+CONFIG_ROCKCHIP_GPIO_V2=y
+CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_I2C_MUX=y
+CONFIG_DM_KEY=y
+CONFIG_RK8XX_PWRKEY=y
+CONFIG_ADC_KEY=y
+CONFIG_MISC=y
+CONFIG_SPL_MISC=y
+CONFIG_MISC_DECOMPRESS=y
+CONFIG_SPL_MISC_DECOMPRESS=y
+CONFIG_ROCKCHIP_OTP=y
+CONFIG_ROCKCHIP_HW_DECOMPRESS=y
+CONFIG_SPL_ROCKCHIP_HW_DECOMPRESS=y
+CONFIG_SPL_ROCKCHIP_SECURE_OTP=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_SDMA=y
+CONFIG_MMC_SDHCI_ROCKCHIP=y
+CONFIG_MTD=y
+CONFIG_MTD_BLK=y
+CONFIG_MTD_DEVICE=y
+CONFIG_NAND=y
+CONFIG_MTD_SPI_NAND=y
+CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=80000000
+CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_FLASH_XMC=y
+CONFIG_SPI_FLASH_XTX=y
+CONFIG_SPI_FLASH_MTD=y
+CONFIG_PHY_REALTEK=y
+CONFIG_DM_ETH=y
+CONFIG_DM_ETH_PHY=y
+CONFIG_DWC_ETH_QOS=y
+CONFIG_RGMII=y
+CONFIG_GMAC_ROCKCHIP=y
+CONFIG_NVME=y
+CONFIG_PCI=y
+CONFIG_DM_PCI=y
+CONFIG_DM_PCI_COMPAT=y
+CONFIG_PCIE_DW_ROCKCHIP=y
+CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
+CONFIG_PHY_ROCKCHIP_NANENG_USB2=y
+CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=y
+CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y
+CONFIG_PHY_ROCKCHIP_TYPEC=y
+CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
+CONFIG_DM_FUEL_GAUGE=y
+CONFIG_POWER_FG_CW201X=y
+CONFIG_POWER_FG_CW221X=y
+CONFIG_DM_PMIC=y
+CONFIG_PMIC_SPI_RK8XX=y
+CONFIG_DM_POWER_DELIVERY=y
+CONFIG_TYPEC_TCPM=y
+CONFIG_TYPEC_TCPCI=y
+CONFIG_TYPEC_HUSB311=y
+CONFIG_TYPEC_FUSB302=y
+CONFIG_REGULATOR_PWM=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_REGULATOR_RK860X=y
+CONFIG_CHARGER_BQ25700=y
+CONFIG_CHARGER_BQ25890=y
+CONFIG_CHARGER_SC8551=y
+CONFIG_CHARGER_SGM41542=y
+CONFIG_DM_CHARGE_DISPLAY=y
+CONFIG_CHARGE_ANIMATION=y
+CONFIG_PWM_ROCKCHIP=y
+CONFIG_RAM=y
+CONFIG_SPL_RAM=y
+CONFIG_TPL_RAM=y
+CONFIG_DM_RAMDISK=y
+CONFIG_RAMDISK_RO=y
+CONFIG_DM_RESET=y
+CONFIG_SPL_DM_RESET=y
+CONFIG_SPL_RESET_ROCKCHIP=y
+CONFIG_BAUDRATE=1500000
+CONFIG_DEBUG_UART_BASE=0xFEB50000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_ROCKCHIP_SPI=y
+CONFIG_ROCKCHIP_SFC=y
+CONFIG_SYSRESET=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_XHCI_PCI=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_GENERIC=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_GENERIC=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
+CONFIG_USB_DWC3_GENERIC=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
+CONFIG_USB_GADGET_PRODUCT_NUM=0x350a
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_DM_VIDEO=y
+CONFIG_DISPLAY=y
+CONFIG_DRM_ROCKCHIP=y
+CONFIG_DRM_MAXIM_MAX96745=y
+CONFIG_DRM_MAXIM_MAX96755F=y
+CONFIG_DRM_ROHM_BU18XL82=y
+CONFIG_DRM_ROCKCHIP_DW_HDMI_QP=y
+CONFIG_DRM_ROCKCHIP_DW_MIPI_DSI2=y
+CONFIG_DRM_ROCKCHIP_DW_DP=y
+CONFIG_DRM_ROCKCHIP_ANALOGIX_DP=y
+CONFIG_DRM_ROCKCHIP_SAMSUNG_MIPI_DCPHY=y
+CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX_HDMI=y
+CONFIG_USE_TINY_PRINTF=y
+CONFIG_LIB_RAND=y
+CONFIG_SPL_TINY_MEMSET=y
+CONFIG_RSA=y
+CONFIG_SPL_RSA=y
+CONFIG_RSA_N_SIZE=0x200
+CONFIG_RSA_E_SIZE=0x10
+CONFIG_RSA_C_SIZE=0x20
+CONFIG_XBC=y
+CONFIG_LZ4=y
+CONFIG_LZMA=y
+CONFIG_ERRNO_STR=y
+# CONFIG_EFI_LOADER is not set
+CONFIG_AVB_LIBAVB=y
+CONFIG_AVB_LIBAVB_AB=y
+CONFIG_AVB_LIBAVB_ATX=y
+CONFIG_AVB_LIBAVB_USER=y
+CONFIG_RK_AVB_LIBAVB_USER=y
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/blade3_sata_defconfig
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/blade3_sata_defconfig
@ -0,0 +1,236 @@
+CONFIG_ARM=y
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_SPL_GPIO_SUPPORT=y
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_SYS_MALLOC_F_LEN=0x80000
+CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.sh"
+CONFIG_ROCKCHIP_RK3588=y
+CONFIG_ROCKCHIP_FIT_IMAGE=y
+CONFIG_ROCKCHIP_HWID_DTB=y
+CONFIG_ROCKCHIP_VENDOR_PARTITION=y
+CONFIG_USING_KERNEL_DTB_V2=y
+CONFIG_ROCKCHIP_FIT_IMAGE_PACK=y
+CONFIG_ROCKCHIP_NEW_IDB=y
+CONFIG_LOADER_INI="RK3588MINIALL.ini"
+CONFIG_TRUST_INI="RK3588TRUST.ini"
+CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_TARGET_EVB_RK3588=y
+CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_DEFAULT_DEVICE_TREE="rk3588-blade3-sata"
+CONFIG_DEBUG_UART=y
+CONFIG_AHCI=y
+CONFIG_LOCALVERSION="-armbian"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_FIT=y
+CONFIG_FIT_IMAGE_POST_PROCESS=y
+CONFIG_FIT_HW_CRYPTO=y
+CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
+CONFIG_SPL_FIT_HW_CRYPTO=y
+# CONFIG_SPL_SYS_DCACHE_OFF is not set
+CONFIG_BOOTDELAY=1
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
+# CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_ANDROID_BOOTLOADER=y
+CONFIG_ANDROID_AVB=y
+CONFIG_ANDROID_BOOT_IMAGE_HASH=y
+CONFIG_SPL_BOARD_INIT=y
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set
+CONFIG_SPL_SEPARATE_BSS=y
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=0x1
+CONFIG_SPL_MMC_WRITE=y
+CONFIG_SPL_MTD_SUPPORT=y
+CONFIG_SPL_ATF=y
+CONFIG_FASTBOOT_BUF_ADDR=0xc00800
+CONFIG_FASTBOOT_BUF_SIZE=0x04000000
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_DTIMG=y
+# CONFIG_CMD_ELF is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_LZMADEC is not set
+# CONFIG_CMD_UNZIP is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+CONFIG_CMD_GPT=y
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+CONFIG_CMD_BOOT_ANDROID=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_PCI=y
+CONFIG_CMD_SF=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_TFTPPUT=y
+CONFIG_CMD_TFTP_BOOTM=y
+CONFIG_CMD_TFTP_FLASH=y
+# CONFIG_CMD_MISC is not set
+CONFIG_CMD_MTD_BLK=y
+# CONFIG_SPL_DOS_PARTITION is not set
+# CONFIG_ISO_PARTITION is not set
+CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_SPL_DTB_MINIMUM=y
+CONFIG_OF_LIVE=y
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_U_BOOT_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+# CONFIG_NET_TFTP_VARS is not set
+CONFIG_REGMAP=y
+CONFIG_SPL_REGMAP=y
+CONFIG_SYSCON=y
+CONFIG_SPL_SYSCON=y
+# CONFIG_SARADC_ROCKCHIP is not set
+CONFIG_SARADC_ROCKCHIP_V2=y
+CONFIG_DWC_AHCI=y
+CONFIG_CLK=y
+CONFIG_SPL_CLK=y
+CONFIG_CLK_SCMI=y
+CONFIG_SPL_CLK_SCMI=y
+CONFIG_DM_CRYPTO=y
+CONFIG_SPL_DM_CRYPTO=y
+CONFIG_ROCKCHIP_CRYPTO_V2=y
+CONFIG_SPL_ROCKCHIP_CRYPTO_V2=y
+CONFIG_DM_RNG=y
+CONFIG_RNG_ROCKCHIP=y
+CONFIG_SCMI_FIRMWARE=y
+CONFIG_SPL_SCMI_FIRMWARE=y
+CONFIG_ROCKCHIP_GPIO=y
+CONFIG_ROCKCHIP_GPIO_V2=y
+CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_DM_KEY=y
+CONFIG_RK8XX_PWRKEY=y
+CONFIG_ADC_KEY=y
+CONFIG_MISC=y
+CONFIG_SPL_MISC=y
+CONFIG_MISC_DECOMPRESS=y
+CONFIG_SPL_MISC_DECOMPRESS=y
+CONFIG_ROCKCHIP_OTP=y
+CONFIG_ROCKCHIP_HW_DECOMPRESS=y
+CONFIG_SPL_ROCKCHIP_HW_DECOMPRESS=y
+CONFIG_SPL_ROCKCHIP_SECURE_OTP=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_SDMA=y
+CONFIG_MMC_SDHCI_ROCKCHIP=y
+CONFIG_MTD=y
+CONFIG_MTD_BLK=y
+CONFIG_MTD_DEVICE=y
+CONFIG_NAND=y
+CONFIG_MTD_SPI_NAND=y
+CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_SPEED=80000000
+CONFIG_SPI_FLASH_EON=y
+CONFIG_SPI_FLASH_GIGADEVICE=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_SPI_FLASH_XMC=y
+CONFIG_SPI_FLASH_XTX=y
+CONFIG_SPI_FLASH_MTD=y
+CONFIG_DM_ETH=y
+CONFIG_DM_ETH_PHY=y
+CONFIG_DWC_ETH_QOS=y
+CONFIG_GMAC_ROCKCHIP=y
+CONFIG_NVME=y
+CONFIG_PCI=y
+CONFIG_DM_PCI=y
+CONFIG_DM_PCI_COMPAT=y
+CONFIG_PCIE_DW_ROCKCHIP=y
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
+CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
+CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=y
+CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y
+CONFIG_PHY_ROCKCHIP_USBDP=y
+CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
+CONFIG_DM_FUEL_GAUGE=y
+CONFIG_POWER_FG_CW201X=y
+CONFIG_DM_PMIC=y
+CONFIG_PMIC_SPI_RK8XX=y
+CONFIG_DM_POWER_DELIVERY=y
+CONFIG_TYPEC_TCPM=y
+CONFIG_TYPEC_TCPCI=y
+CONFIG_TYPEC_HUSB311=y
+CONFIG_TYPEC_FUSB302=y
+CONFIG_REGULATOR_PWM=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_REGULATOR_RK860X=y
+CONFIG_CHARGER_BQ25700=y
+CONFIG_CHARGER_BQ25890=y
+CONFIG_DM_CHARGE_DISPLAY=y
+CONFIG_CHARGE_ANIMATION=y
+CONFIG_PWM_ROCKCHIP=y
+CONFIG_RAM=y
+CONFIG_SPL_RAM=y
+CONFIG_TPL_RAM=y
+CONFIG_DM_RAMDISK=y
+CONFIG_RAMDISK_RO=y
+CONFIG_ROCKCHIP_SDRAM_COMMON=y
+CONFIG_ROCKCHIP_TPL_INIT_DRAM_TYPE=0
+CONFIG_DM_RESET=y
+CONFIG_SPL_DM_RESET=y
+CONFIG_SPL_RESET_ROCKCHIP=y
+CONFIG_SCSI=y
+CONFIG_DM_SCSI=y
+CONFIG_BAUDRATE=1500000
+CONFIG_DEBUG_UART_BASE=0xFEB50000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_ROCKCHIP_SPI=y
+CONFIG_ROCKCHIP_SFC=y
+CONFIG_SYSRESET=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_GENERIC=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_GENERIC=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
+CONFIG_USB_DWC3_GENERIC=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Rockchip"
+CONFIG_USB_GADGET_VENDOR_NUM=0x2207
+CONFIG_USB_GADGET_PRODUCT_NUM=0x350a
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_DM_VIDEO=y
+CONFIG_DISPLAY=y
+CONFIG_DRM_ROCKCHIP=y
+CONFIG_DRM_ROCKCHIP_DW_HDMI_QP=y
+CONFIG_DRM_ROCKCHIP_DW_MIPI_DSI2=y
+CONFIG_DRM_ROCKCHIP_DW_DP=y
+CONFIG_DRM_ROCKCHIP_ANALOGIX_DP=y
+CONFIG_DRM_ROCKCHIP_SAMSUNG_MIPI_DCPHY=y
+CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX_HDMI=y
+CONFIG_USE_TINY_PRINTF=y
+CONFIG_LIB_RAND=y
+CONFIG_SPL_TINY_MEMSET=y
+CONFIG_RSA=y
+CONFIG_SPL_RSA=y
+CONFIG_RSA_N_SIZE=0x200
+CONFIG_RSA_E_SIZE=0x10
+CONFIG_RSA_C_SIZE=0x20
+CONFIG_LZ4=y
+CONFIG_ERRNO_STR=y
+# CONFIG_EFI_LOADER is not set
+CONFIG_AVB_LIBAVB=y
+CONFIG_AVB_LIBAVB_AB=y
+CONFIG_AVB_LIBAVB_ATX=y
+CONFIG_AVB_LIBAVB_USER=y
+CONFIG_RK_AVB_LIBAVB_USER=y
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-blade3-sata.dts
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-blade3-sata.dts
@ -0,0 +1,27 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2022 Mixtile Limited
+ *
+ */
+
+/dts-v1/;
+
+#include "rk3588-blade3.dts"
+
+&sata2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&sata2_reset>;
+	status = "okay";
+};
+
+&combphy2_psu {
+	status = "okay";
+};
+
+&pinctrl {
+	sdmmc {
+		sata2_reset: sata2-reset {
+			rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+};
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-blade3.dts
+++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-blade3.dts
@ -0,0 +1,123 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2022 Mixtile Limited
+ *
+ */
+
+/dts-v1/;
+#include "rk3588.dtsi"
+#include "rk3588-u-boot.dtsi"
+#include <dt-bindings/input/input.h>
+
+/ {
+	model = "Mixtile Blade 3";
+	compatible = "mixtile,blade3", "rockchip,rk3588";
+
+	vcc12v_dcin: vcc12v-dcin {
+		u-boot,dm-pre-reloc;
+		compatible = "regulator-fixed";
+		regulator-name = "vcc12v_dcin";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <12000000>;
+		regulator-max-microvolt = <12000000>;
+	};
+
+	vcc5v0_sys: vcc5v0-sys {
+		u-boot,dm-pre-reloc;
+		compatible = "regulator-fixed";
+		regulator-name = "vcc5v0_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&vcc12v_dcin>;
+	};
+
+	vcc3v3_pcie30: vcc3v3-pcie30 {
+		u-boot,dm-pre-reloc;
+		compatible = "regulator-fixed";
+		regulator-name = "vcc3v3_pcie30";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		enable-active-high;
+		gpio = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>;
+		regulator-boot-on;
+		regulator-always-on;
+		startup-delay-us = <5000>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&vcc3v3_pcie30_en>;
+		vin-supply = <&vcc12v_dcin>;
+	};
+
+	vbus5v0_typec1: vbus5v0-typec1 {
+		compatible = "regulator-fixed";
+		regulator-name = "vbus5v0_typec1";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+	};
+};
+
+&pcie3x4 {
+	u-boot,dm-pre-reloc;
+	vpcie3v3-supply = <&vcc3v3_pcie30>;
+	reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
+	status = "okay";
+};
+
+&pcie30phy {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+};
+
+&combphy0_ps {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+};
+
+&combphy1_ps {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+};
+
+&combphy2_psu {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+};
+
+&i2c1 {
+	status = "okay";
+
+	clock-frequency = <400000>;
+	i2c-scl-rising-time-ns = <160>;
+	i2c-scl-falling-time-ns = <30>;
+
+	usbc1: fusb302@22 {
+		compatible = "fcs,fusb302";
+		reg = <0x22>;
+		interrupt-parent = <&gpio0>;
+		interrupts = <RK_PC6 IRQ_TYPE_LEVEL_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&usbc1_int>;
+		vbus-supply = <&vbus5v0_typec1>;
+		status = "okay";
+	};
+};
+
+&pinctrl {
+	usb-typec {
+		usbc1_int: usbc1-int {
+			rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	};
+
+	pcie {
+		u-boot,dm-spl;
+		vcc3v3_pcie30_en: vcc3v3-pcie30-en {
+			u-boot,dm-spl;
+			rockchip,pins = <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+	
+	};
+};
+