Fix eMMC not detected in SPL when booting from SPI NOR

packages/u-boot-radxa-rk3588/debian/patches/0001-arch-arm-mach-rockchip-fix-srctree-path.patch

@@ -1,15 +1,15 @@
-From 29e6eb21bba28df0a56b553e7a58f0aa5f5d3767 Mon Sep 17 00:00:00 2001
+From 79a3001f3ea10e63ddd3886cc446f293d866541c Mon Sep 17 00:00:00 2001
 From: Joshua Riek <jjriek@verizon.net>
 Date: Sun, 23 Apr 2023 10:26:00 -0400
-Subject: [PATCH 01/18] arch: arm: mach-rockchip: fix srctree path
+Subject: [PATCH 01/14] 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 be7d46d8f71..c0afc1ade31 100755
+index 9639a06e1cc..dcf75092410 100755
 --- a/arch/arm/mach-rockchip/fit_nodes.sh
 +++ b/arch/arm/mach-rockchip/fit_nodes.sh
 @@ -6,7 +6,7 @@

packages/u-boot-radxa-rk3588/debian/patches/0002-board-rockchip-Add-the-Mixtile-Core-3588E.patch

@@ -1,12 +1,12 @@
-From cfc27760e3a4719091cf0ca6320e33dbb4036a13 Mon Sep 17 00:00:00 2001
+From d27e1e2d2b4d5ba2af2a92dced12f400def100cc Mon Sep 17 00:00:00 2001
 From: Joshua Riek <jjriek@verizon.net>
 Date: Sun, 17 Dec 2023 09:41:43 -0500
-Subject: [PATCH 04/18] board: rockchip: Add the Mixtile Core 3588E
+Subject: [PATCH 02/14] board: rockchip: Add the Mixtile Core 3588E
 
 ---
  arch/arm/dts/rk3588-mixtile-core3588e.dts  |  60 ++++++
- configs/mixtile-core3588e-rk3588_defconfig | 233 +++++++++++++++++++++
- 2 files changed, 293 insertions(+)
+ configs/mixtile-core3588e-rk3588_defconfig | 236 +++++++++++++++++++++
+ 2 files changed, 296 insertions(+)
  create mode 100644 arch/arm/dts/rk3588-mixtile-core3588e.dts
  create mode 100644 configs/mixtile-core3588e-rk3588_defconfig
 
@@ -78,10 +78,10 @@ index 00000000000..7b1f46aa686
 +};
 diff --git a/configs/mixtile-core3588e-rk3588_defconfig b/configs/mixtile-core3588e-rk3588_defconfig
 new file mode 100644
-index 00000000000..40b7e151998
+index 00000000000..e455b0b5dca
 --- /dev/null
 +++ b/configs/mixtile-core3588e-rk3588_defconfig
-@@ -0,0 +1,233 @@
+@@ -0,0 +1,236 @@
 +CONFIG_ARM=y
 +CONFIG_ARCH_ROCKCHIP=y
 +CONFIG_SPL_GPIO_SUPPORT=y
@@ -90,12 +90,15 @@ index 00000000000..40b7e151998
 +CONFIG_SYS_MALLOC_F_LEN=0x80000
 +CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.sh"
 +CONFIG_ROCKCHIP_RK3588=y
++CONFIG_ROCKCHIP_BOOTDEV="mmc 0"
++
 +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_ROCKCHIP_EMMC_IOMUX=y
 +CONFIG_SPL_SERIAL_SUPPORT=y
 +CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 +CONFIG_TARGET_EVB_RK3588=y

packages/u-boot-radxa-rk3588/debian/patches/0003-add-the-nanopir6-and-nanopct6.patch → packages/u-boot-radxa-rk3588/debian/patches/0003-board-rockchip-Add-support-for-the-NanoPi-R6-and-Nan.patch

@@ -1,16 +1,17 @@
-From dcb5869fb2de8448986ac1fc132a2e7699268aed Mon Sep 17 00:00:00 2001
+From 9460a1533d54414b87580f88ee9e6a67d741e1fd Mon Sep 17 00:00:00 2001
 From: Joshua Riek <jjriek@verizon.net>
 Date: Sun, 25 Jun 2023 14:45:56 -0400
-Subject: [PATCH 05/18] add the nanopir6 and nanopct6
+Subject: [PATCH 03/14] board: rockchip: Add support for the NanoPi R6 and
+ NanoPC T6
 
 ---
  arch/arm/dts/rk3588-nanopc-t6.dts    | 197 ++++++++++++++++++++++++
  arch/arm/dts/rk3588s-nanopi-r6c.dts  | 177 ++++++++++++++++++++++
- arch/arm/dts/rk3588s-nanopi-r6s.dts  | 125 ++++++++++++++++
- configs/nanopc-t6-rk3588_defconfig   | 215 +++++++++++++++++++++++++++
- configs/nanopi-r6c-rk3588s_defconfig | 215 +++++++++++++++++++++++++++
- configs/nanopi-r6s-rk3588s_defconfig | 215 +++++++++++++++++++++++++++
- 6 files changed, 1144 insertions(+)
+ arch/arm/dts/rk3588s-nanopi-r6s.dts  | 125 +++++++++++++++
+ configs/nanopc-t6-rk3588_defconfig   | 217 +++++++++++++++++++++++++++
+ configs/nanopi-r6c-rk3588s_defconfig | 217 +++++++++++++++++++++++++++
+ configs/nanopi-r6s-rk3588s_defconfig | 217 +++++++++++++++++++++++++++
+ 6 files changed, 1150 insertions(+)
  create mode 100644 arch/arm/dts/rk3588-nanopc-t6.dts
  create mode 100644 arch/arm/dts/rk3588s-nanopi-r6c.dts
  create mode 100644 arch/arm/dts/rk3588s-nanopi-r6s.dts
@@ -537,10 +538,10 @@ index 00000000000..ac300cd42fc
 +};
 diff --git a/configs/nanopc-t6-rk3588_defconfig b/configs/nanopc-t6-rk3588_defconfig
 new file mode 100644
-index 00000000000..6e95a773da3
+index 00000000000..1d216cb1dda
 --- /dev/null
 +++ b/configs/nanopc-t6-rk3588_defconfig
-@@ -0,0 +1,215 @@
+@@ -0,0 +1,217 @@
 +CONFIG_ARM=y
 +CONFIG_ARM_CPU_SUSPEND=y
 +CONFIG_ARCH_ROCKCHIP=y
@@ -550,13 +551,15 @@ index 00000000000..6e95a773da3
 +CONFIG_SYS_MALLOC_F_LEN=0x80000
 +CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.sh"
 +CONFIG_ROCKCHIP_RK3588=y
++CONFIG_ROCKCHIP_BOOTDEV="mmc 0"
 +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_ROCKCHIP_EMMC_IOMUX=y
 +CONFIG_LOADER_INI="RK3588MINIALL.ini"
 +CONFIG_TRUST_INI="RK3588TRUST.ini"
 +CONFIG_SPL_SERIAL_SUPPORT=y
@@ -758,10 +761,10 @@ index 00000000000..6e95a773da3
 +CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
 diff --git a/configs/nanopi-r6c-rk3588s_defconfig b/configs/nanopi-r6c-rk3588s_defconfig
 new file mode 100644
-index 00000000000..e18f90f17e7
+index 00000000000..a9b5fa79bf9
 --- /dev/null
 +++ b/configs/nanopi-r6c-rk3588s_defconfig
-@@ -0,0 +1,215 @@
+@@ -0,0 +1,217 @@
 +CONFIG_ARM=y
 +CONFIG_ARM_CPU_SUSPEND=y
 +CONFIG_ARCH_ROCKCHIP=y
@@ -771,13 +774,15 @@ index 00000000000..e18f90f17e7
 +CONFIG_SYS_MALLOC_F_LEN=0x80000
 +CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.sh"
 +CONFIG_ROCKCHIP_RK3588=y
++CONFIG_ROCKCHIP_BOOTDEV="mmc 0"
 +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_ROCKCHIP_EMMC_IOMUX=y
 +CONFIG_LOADER_INI="RK3588MINIALL.ini"
 +CONFIG_TRUST_INI="RK3588TRUST.ini"
 +CONFIG_SPL_SERIAL_SUPPORT=y
@@ -980,10 +985,10 @@ index 00000000000..e18f90f17e7
 \ No newline at end of file
 diff --git a/configs/nanopi-r6s-rk3588s_defconfig b/configs/nanopi-r6s-rk3588s_defconfig
 new file mode 100644
-index 00000000000..6ea51fe01cb
+index 00000000000..6c5c891e7fd
 --- /dev/null
 +++ b/configs/nanopi-r6s-rk3588s_defconfig
-@@ -0,0 +1,215 @@
+@@ -0,0 +1,217 @@
 +CONFIG_ARM=y
 +CONFIG_ARM_CPU_SUSPEND=y
 +CONFIG_ARCH_ROCKCHIP=y
@@ -993,13 +998,15 @@ index 00000000000..6ea51fe01cb
 +CONFIG_SYS_MALLOC_F_LEN=0x80000
 +CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.sh"
 +CONFIG_ROCKCHIP_RK3588=y
++CONFIG_ROCKCHIP_BOOTDEV="mmc 0"
 +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_ROCKCHIP_EMMC_IOMUX=y
 +CONFIG_LOADER_INI="RK3588MINIALL.ini"
 +CONFIG_TRUST_INI="RK3588TRUST.ini"
 +CONFIG_SPL_SERIAL_SUPPORT=y

packages/u-boot-radxa-rk3588/debian/patches/0004-add-the-lubancat4.patch

@@ -1,7 +1,7 @@
-From 59677773b576ee194529e688fac9d7dbe729b6a4 Mon Sep 17 00:00:00 2001
+From 59153bb46418d5ca7559fea0d9e40c9d2672834d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=E4=BA=91=E5=B9=95?= <cancet@embedfire.com>
 Date: Fri, 25 Aug 2023 01:59:30 +0000
-Subject: [PATCH 06/18] add the lubancat4
+Subject: [PATCH 04/14] add the lubancat4
 
 ---
  arch/arm/dts/rk3588s-lubancat-4.dts  | 193 ++++++++++++++++++++++

packages/u-boot-radxa-rk3588/debian/patches/0005-add-the-indiedroid-nova.patch

@@ -1,7 +1,7 @@
-From 8cb782cbce6ac18093a39f779bda39dcfc434c8e Mon Sep 17 00:00:00 2001
+From cc244b4336d76e3287160dde54fc28d8200addec Mon Sep 17 00:00:00 2001
 From: Joshua Riek <jjriek@verizon.net>
 Date: Sat, 23 Dec 2023 12:47:15 -0500
-Subject: [PATCH 07/18] add the indiedroid nova
+Subject: [PATCH 05/14] add the indiedroid nova
 
 ---
  arch/arm/dts/rk3588s-indiedroid-nova.dts  | 330 ++++++++++++++++++++++

packages/u-boot-radxa-rk3588/debian/patches/0006-add-defconfig-and-dts-of-armsom-w3.patch

@@ -1,12 +1,12 @@
-From 86334392a9439420fe12191f472f6b495c0c0ced Mon Sep 17 00:00:00 2001
+From e054026f17dafcdcdf7d7dfd08d5d06a979c61a6 Mon Sep 17 00:00:00 2001
 From: zhouxp <645006021@qq.com>
 Date: Tue, 19 Dec 2023 15:44:30 +0800
-Subject: [PATCH 08/18] add defconfig and dts of armsom-w3
+Subject: [PATCH 06/14] add defconfig and dts of armsom-w3
 
 ---
  arch/arm/dts/rk3588-armsom-w3.dts  |  88 ++++++++++++
- configs/armsom-w3-rk3588_defconfig | 214 +++++++++++++++++++++++++++++
- 2 files changed, 302 insertions(+)
+ configs/armsom-w3-rk3588_defconfig | 216 +++++++++++++++++++++++++++++
+ 2 files changed, 304 insertions(+)
  create mode 100755 arch/arm/dts/rk3588-armsom-w3.dts
  create mode 100755 configs/armsom-w3-rk3588_defconfig
 
@@ -106,10 +106,10 @@ index 00000000000..26ec15e75de
 +};
 diff --git a/configs/armsom-w3-rk3588_defconfig b/configs/armsom-w3-rk3588_defconfig
 new file mode 100755
-index 00000000000..9f1ae340b21
+index 00000000000..1aa7217ad62
 --- /dev/null
 +++ b/configs/armsom-w3-rk3588_defconfig
-@@ -0,0 +1,214 @@
+@@ -0,0 +1,216 @@
 +CONFIG_ARM=y
 +CONFIG_ARM_CPU_SUSPEND=y
 +CONFIG_ARCH_ROCKCHIP=y
@@ -119,12 +119,14 @@ index 00000000000..9f1ae340b21
 +CONFIG_SYS_MALLOC_F_LEN=0x80000
 +CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.sh"
 +CONFIG_ROCKCHIP_RK3588=y
++CONFIG_ROCKCHIP_BOOTDEV="mmc 0"
 +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_ROCKCHIP_EMMC_IOMUX=y
 +CONFIG_LOADER_INI="RK3588MINIALL.ini"
 +CONFIG_TRUST_INI="RK3588TRUST.ini"
 +CONFIG_SPL_SERIAL_SUPPORT=y

packages/u-boot-radxa-rk3588/debian/patches/0007-add-defconfig-and-dts-of-armsom-sige7.patch

@@ -1,12 +1,12 @@
-From f682135e5c753a440eebb6ca126465be4a04144a Mon Sep 17 00:00:00 2001
+From c1f69a2f3442a6200bbde56d2147aded3d6ee96e Mon Sep 17 00:00:00 2001
 From: zhouxp <645006021@qq.com>
 Date: Tue, 19 Dec 2023 15:46:42 +0800
-Subject: [PATCH 09/18] add defconfig and dts of armsom-sige7
+Subject: [PATCH 07/14] add defconfig and dts of armsom-sige7
 
 ---
  arch/arm/dts/rk3588-armsom-sige7.dts  |  88 +++++++++++
- configs/armsom-sige7-rk3588_defconfig | 214 ++++++++++++++++++++++++++
- 2 files changed, 302 insertions(+)
+ configs/armsom-sige7-rk3588_defconfig | 216 ++++++++++++++++++++++++++
+ 2 files changed, 304 insertions(+)
  create mode 100755 arch/arm/dts/rk3588-armsom-sige7.dts
  create mode 100755 configs/armsom-sige7-rk3588_defconfig
 
@@ -106,10 +106,10 @@ index 00000000000..36183d0415e
 +};
 diff --git a/configs/armsom-sige7-rk3588_defconfig b/configs/armsom-sige7-rk3588_defconfig
 new file mode 100755
-index 00000000000..e8ef4232daa
+index 00000000000..98944df4587
 --- /dev/null
 +++ b/configs/armsom-sige7-rk3588_defconfig
-@@ -0,0 +1,214 @@
+@@ -0,0 +1,216 @@
 +CONFIG_ARM=y
 +CONFIG_ARM_CPU_SUSPEND=y
 +CONFIG_ARCH_ROCKCHIP=y
@@ -119,12 +119,14 @@ index 00000000000..e8ef4232daa
 +CONFIG_SYS_MALLOC_F_LEN=0x80000
 +CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.sh"
 +CONFIG_ROCKCHIP_RK3588=y
++CONFIG_ROCKCHIP_BOOTDEV="mmc 0"
 +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_ROCKCHIP_EMMC_IOMUX=y
 +CONFIG_LOADER_INI="RK3588MINIALL.ini"
 +CONFIG_TRUST_INI="RK3588TRUST.ini"
 +CONFIG_SPL_SERIAL_SUPPORT=y

packages/u-boot-radxa-rk3588/debian/patches/0008-board-add-roc-rk3588s-pc-support.patch

@@ -1,7 +1,7 @@
-From c94ad49ab38e58ae425357c8f7dd9ab4792220c7 Mon Sep 17 00:00:00 2001
+From 68a88168a42b9cdf7d1092ed85e4dee49a423e02 Mon Sep 17 00:00:00 2001
 From: zouxf <zxf@t-chip.com.cn>
 Date: Thu, 30 Nov 2023 17:38:34 +0800
-Subject: [PATCH 10/18] board: add roc-rk3588s-pc support
+Subject: [PATCH 08/14] board: add roc-rk3588s-pc support
 
 ---
  arch/arm/dts/rk3588s-roc-pc.dts               | 261 ++++++++++++++++++

packages/u-boot-radxa-rk3588/debian/patches/0009-fix-gcc13-compile-error.patch

@@ -1,7 +1,7 @@
-From b421d7708eaa1299a1f89e236fdecaabf6ab3732 Mon Sep 17 00:00:00 2001
+From 4e4bf7efb9af1630dcb2e01ccef555aef3764c8d Mon Sep 17 00:00:00 2001
 From: Joshua Riek <jjriek@verizon.net>
 Date: Sun, 11 Feb 2024 20:56:22 -0500
-Subject: [PATCH 11/18] fix gcc13 compile error
+Subject: [PATCH 09/14] fix gcc13 compile error
 
 ---
  arch/arm/mach-rockchip/decode_bl31.py | 2 +-

packages/u-boot-radxa-rk3588/debian/patches/0010-fix-noble-compile-error.patch

@@ -1,17 +1,17 @@
-From a2068631f1903a2fc256f32ab44bff89ea5018ce Mon Sep 17 00:00:00 2001
+From a4416b8aea053d1b3d6cd466ceccc9661e296ac7 Mon Sep 17 00:00:00 2001
 From: Joshua Riek <jjriek@verizon.net>
 Date: Fri, 23 Feb 2024 13:54:20 -1000
-Subject: [PATCH 12/18] fix noble compile error
+Subject: [PATCH 10/14] fix noble compile error
 
 ---
  Makefile | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/Makefile b/Makefile
-index 590fd4c1f2c..427cb75c6c1 100644
+index 1012b065ad7..a44402263c9 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -389,6 +389,9 @@ export RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o    \
+@@ -396,6 +396,9 @@ export RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o    \
  			  -prune -o
  export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
  			 --exclude CVS --exclude .pc --exclude .hg --exclude .git

packages/u-boot-radxa-rk3588/debian/patches/0011-enable-armsom-sige7-early-PD-negotiation.patch

@@ -1,7 +1,7 @@
-From 6e19b9004b7307f684b4192413a3afafba71c9c5 Mon Sep 17 00:00:00 2001
+From 749a5c7a492caa2da772d4a3867f2eac46b578a0 Mon Sep 17 00:00:00 2001
 From: Joshua Riek <jjriek@verizon.net>
 Date: Sun, 14 Apr 2024 23:07:55 -0400
-Subject: [PATCH 13/18] enable armsom-sige7 early PD negotiation
+Subject: [PATCH 11/14] enable armsom-sige7 early PD negotiation
 
 ---
  arch/arm/dts/rk3588-armsom-sige7.dts          | 73 +++++++++++++++++++
@@ -207,10 +207,10 @@ index 00000000000..81c50899441
 +}
 +#endif
 diff --git a/configs/armsom-sige7-rk3588_defconfig b/configs/armsom-sige7-rk3588_defconfig
-index e8ef4232daa..9874807e575 100755
+index 98944df4587..68304000220 100755
 --- a/configs/armsom-sige7-rk3588_defconfig
 +++ b/configs/armsom-sige7-rk3588_defconfig
-@@ -17,7 +17,7 @@ CONFIG_LOADER_INI="RK3588MINIALL.ini"
+@@ -19,7 +19,7 @@ CONFIG_LOADER_INI="RK3588MINIALL.ini"
  CONFIG_TRUST_INI="RK3588TRUST.ini"
  CONFIG_SPL_SERIAL_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@ -219,7 +219,7 @@ index e8ef4232daa..9874807e575 100755
  CONFIG_SPL_LIBDISK_SUPPORT=y
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
  CONFIG_SPL_SPI_SUPPORT=y
-@@ -31,8 +31,6 @@ CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
+@@ -33,8 +33,6 @@ CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
  CONFIG_SPL_FIT_HW_CRYPTO=y
  # CONFIG_SPL_SYS_DCACHE_OFF is not set
  CONFIG_BOOTDELAY=0
@@ -228,23 +228,23 @@ index e8ef4232daa..9874807e575 100755
  # CONFIG_DISPLAY_CPUINFO is not set
  CONFIG_ANDROID_BOOTLOADER=y
  CONFIG_ANDROID_AVB=y
-@@ -84,6 +82,7 @@ CONFIG_SPL_OF_CONTROL=y
+@@ -86,6 +84,7 @@ 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="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
-@@ -106,6 +105,7 @@ CONFIG_SPL_SCMI_FIRMWARE=y
+@@ -108,6 +107,7 @@ CONFIG_SPL_SCMI_FIRMWARE=y
  CONFIG_ROCKCHIP_GPIO=y
  CONFIG_ROCKCHIP_GPIO_V2=y
  CONFIG_SYS_I2C_ROCKCHIP=y
 +CONFIG_I2C_MUX=y
  CONFIG_DM_KEY=y
  CONFIG_ADC_KEY=y
  CONFIG_MISC=y
-@@ -152,6 +152,11 @@ CONFIG_PINCTRL=y
+@@ -154,6 +154,11 @@ CONFIG_PINCTRL=y
  CONFIG_SPL_PINCTRL=y
  CONFIG_DM_PMIC=y
  CONFIG_PMIC_SPI_RK8XX=y
@@ -256,7 +256,7 @@ index e8ef4232daa..9874807e575 100755
  CONFIG_REGULATOR_PWM=y
  CONFIG_DM_REGULATOR_FIXED=y
  CONFIG_DM_REGULATOR_GPIO=y
-@@ -212,3 +217,5 @@ CONFIG_AVB_LIBAVB_AB=y
+@@ -214,3 +219,5 @@ CONFIG_AVB_LIBAVB_AB=y
  CONFIG_AVB_LIBAVB_ATX=y
  CONFIG_AVB_LIBAVB_USER=y
  CONFIG_RK_AVB_LIBAVB_USER=y