Merge tag 'u-boot-rockchip-20191110' of https://gitlab.denx.de/u-boot/custodians...

- Add support for rockchip pmic rk805,rk809, rk816, rk817
- Add rk3399 board Leez support
- Fix bug in rk3328 ram driver
- Adapt SPL to support ATF bl31 with entry at 0x40000
- Fix the u8 type comparision with '-1'.
- Fix checkpatch warning for multi blank line and review signature.

diff --combined arch/arm/dts/Makefile
index 89ab8001ce7968cb213da2f6ba596c46600a864a,b90eb255953f6131edea239c2481694f87a7d6a7..5a64fcc5a79191896913436669469cf1467347f8
--- 1/arch/arm/dts/Makefile
--- 2/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -111,6 -111,7 +111,7 @@@ dtb-$(CONFIG_ROCKCHIP_RK3399) += 
        rk3399-khadas-edge.dtb \
        rk3399-khadas-edge-captain.dtb \
        rk3399-khadas-edge-v.dtb \
+       rk3399-leez-p710.dtb \
        rk3399-nanopc-t4.dtb \
        rk3399-nanopi-m4.dtb \
        rk3399-nanopi-neo4.dtb \
@@@ -834,8 -835,6 +835,8 @@@ dtb-$(CONFIG_TARGET_VEXPRESS_CA5X2) += 
  dtb-$(CONFIG_TARGET_VEXPRESS_CA9X4) += vexpress-v2p-ca9.dtb
  dtb-$(CONFIG_TARGET_VEXPRESS_CA15_TC2) += vexpress-v2p-ca15_a7.dtb
  
 +dtb-$(CONFIG_TARGET_DURIAN) += phytium-durian.dtb
 +
  targets += $(dtb-y)
  
  # Add any required device tree compiler flags here

diff --combined configs/chromebook_bob_defconfig
index 06225495a9e3c4b1bc62a41035053d9e52f169c6,b6e31a4c4997db1ea9dce1410c7390c44d507d15..55c5320b12dcad4a395bde634299586ba66c33a6
--- 1/configs/chromebook_bob_defconfig
--- 2/configs/chromebook_bob_defconfig
+++ b/configs/chromebook_bob_defconfig
@@@ -8,7 -8,6 +8,6 @@@ CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x400
  # CONFIG_SPL_MMC_SUPPORT is not set
  CONFIG_TARGET_CHROMEBOOK_BOB=y
  CONFIG_NR_DRAM_BANKS=1
- CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEBUG_UART_BASE=0xff1a0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
@@@ -28,6 -27,7 +27,6 @@@ CONFIG_CMD_GPIO=
  CONFIG_CMD_GPT=y
  CONFIG_CMD_I2C=y
  CONFIG_CMD_MMC=y
 -CONFIG_CMD_SF=y
  CONFIG_CMD_SF_TEST=y
  CONFIG_CMD_SPI=y
  CONFIG_CMD_USB=y
@@@ -53,6 -53,7 +52,6 @@@ CONFIG_MMC_DW=
  CONFIG_MMC_DW_ROCKCHIP=y
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_ROCKCHIP=y
 -CONFIG_SPI_FLASH=y
  CONFIG_SF_DEFAULT_SPEED=20000000
  CONFIG_SPI_FLASH_GIGADEVICE=y
  CONFIG_DM_ETH=y

diff --combined configs/evb-rk3328_defconfig
index e22356cd6bea3503017ece653ab96f9f5a808b60,a4405a6a9ddad39ee762dc1238ff9cf8087d43ab..ec5d0b7114f09898731045dd4e72d8252a482e18
--- 1/configs/evb-rk3328_defconfig
--- 2/configs/evb-rk3328_defconfig
+++ b/configs/evb-rk3328_defconfig
@@@ -3,7 -3,6 +3,6 @@@ CONFIG_ARCH_ROCKCHIP=
  CONFIG_SYS_TEXT_BASE=0x00200000
  CONFIG_ROCKCHIP_RK3328=y
  CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
- CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x40000
  CONFIG_TPL_LIBCOMMON_SUPPORT=y
  CONFIG_TPL_LIBGENERIC_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@@ -55,6 -54,7 +54,6 @@@ CONFIG_ROCKCHIP_GPIO=
  CONFIG_SYS_I2C_ROCKCHIP=y
  CONFIG_MMC_DW=y
  CONFIG_MMC_DW_ROCKCHIP=y
 -CONFIG_SPI_FLASH=y
  CONFIG_SF_DEFAULT_SPEED=20000000
  CONFIG_DM_ETH=y
  CONFIG_ETH_DESIGNWARE=y

diff --combined configs/evb-rk3399_defconfig
index 859474266bc80a512a3fac3d24fe8821aa75c05a,c1d7d613a9e70652b49b6cb1a5cb59f09c107440..2c6901309880714ecd0da824f28d73ac25e39106
--- 1/configs/evb-rk3399_defconfig
--- 2/configs/evb-rk3399_defconfig
+++ b/configs/evb-rk3399_defconfig
@@@ -2,9 -2,7 +2,7 @@@ CONFIG_ARM=
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_SYS_TEXT_BASE=0x00200000
  CONFIG_ROCKCHIP_RK3399=y
- CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
  CONFIG_NR_DRAM_BANKS=1
- CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_DEBUG_UART=y
@@@ -18,6 -16,7 +16,6 @@@ CONFIG_TPL=
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
 -CONFIG_CMD_SF=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_TIME=y

diff --combined configs/ficus-rk3399_defconfig
index 6e34402d26a6b844989f81810137d42365be276c,0dcc9a760d68daeae661897522bb16ad108f8b89..e475395a1d0070eed1ace39035348d0932cc6757
--- 1/configs/ficus-rk3399_defconfig
--- 2/configs/ficus-rk3399_defconfig
+++ b/configs/ficus-rk3399_defconfig
@@@ -4,7 -4,6 +4,6 @@@ CONFIG_SYS_TEXT_BASE=0x0020000
  CONFIG_ROCKCHIP_RK3399=y
  CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000
  CONFIG_TARGET_ROCK960_RK3399=y
- CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_DEBUG_UART=y
@@@ -17,6 -16,7 +16,6 @@@ CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
 -CONFIG_CMD_SF=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_TIME=y

diff --combined configs/firefly-rk3288_defconfig
index dbacb833e9f5756bcd75948a4b254771f90374cf,64a83a17f29deef2b9b3c542177331ce6290adf3..87f7294afb2222afbe8a7556e33e57c4bcd1acd8
--- 1/configs/firefly-rk3288_defconfig
--- 2/configs/firefly-rk3288_defconfig
+++ b/configs/firefly-rk3288_defconfig
@@@ -1,15 -1,14 +1,14 @@@
  CONFIG_ARM=y
  CONFIG_ARCH_ROCKCHIP=y
- CONFIG_SYS_TEXT_BASE=0x00000000
+ CONFIG_SYS_TEXT_BASE=0x01000000
  CONFIG_ROCKCHIP_RK3288=y
- CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
  CONFIG_TARGET_FIREFLY_RK3288=y
  CONFIG_NR_DRAM_BANKS=1
+ CONFIG_SPL_SIZE_LIMIT=262144
  CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEBUG_UART_BASE=0xff690000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_DEBUG_UART=y
- CONFIG_SPL_TEXT_BASE=0xff704000
  # CONFIG_ANDROID_BOOT_IMAGE is not set
  CONFIG_USE_PREBOOT=y
  CONFIG_SILENT_CONSOLE=y
@@@ -22,6 -21,7 +21,6 @@@ CONFIG_CMD_GPIO=
  CONFIG_CMD_GPT=y
  CONFIG_CMD_I2C=y
  CONFIG_CMD_MMC=y
 -CONFIG_CMD_SF=y
  CONFIG_CMD_SPI=y
  CONFIG_CMD_USB=y
  CONFIG_CMD_USB_MASS_STORAGE=y
@@@ -55,6 -55,7 +54,6 @@@ CONFIG_LED=
  CONFIG_LED_GPIO=y
  CONFIG_MMC_DW=y
  CONFIG_MMC_DW_ROCKCHIP=y
 -CONFIG_SPI_FLASH=y
  CONFIG_SF_DEFAULT_SPEED=20000000
  CONFIG_DM_ETH=y
  CONFIG_ETH_DESIGNWARE=y

diff --combined configs/firefly-rk3399_defconfig
index 166bf9d027a992e34a601116740471f4f951eed1,ba57fbd527877d92155f7c4443790e3c4f0b32c9..50fd8b5b6ea2e11aba35fdc7230de1c5473bf582
--- 1/configs/firefly-rk3399_defconfig
--- 2/configs/firefly-rk3399_defconfig
+++ b/configs/firefly-rk3399_defconfig
@@@ -2,9 -2,7 +2,7 @@@ CONFIG_ARM=
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_SYS_TEXT_BASE=0x00200000
  CONFIG_ROCKCHIP_RK3399=y
- CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
  CONFIG_NR_DRAM_BANKS=1
- CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_DEBUG_UART=y
@@@ -18,6 -16,7 +16,6 @@@ CONFIG_TPL=
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
 -CONFIG_CMD_SF=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_TIME=y

diff --combined configs/khadas-edge-captain-rk3399_defconfig
index 56fa583e581ea1bf87f8490da48623838c542bf5,80d92e1aad326ab78e70323db45d76b694e03fc4..4d9184cfd8648923b209c7f857cbaf0d011fd3ed
--- 1/configs/khadas-edge-captain-rk3399_defconfig
--- 2/configs/khadas-edge-captain-rk3399_defconfig
+++ b/configs/khadas-edge-captain-rk3399_defconfig
@@@ -2,9 -2,7 +2,7 @@@ CONFIG_ARM=
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_SYS_TEXT_BASE=0x00200000
  CONFIG_ROCKCHIP_RK3399=y
- CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
  CONFIG_NR_DRAM_BANKS=1
- CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_DEBUG_UART=y
@@@ -19,6 -17,7 +17,6 @@@ CONFIG_SYS_PROMPT="kedge# 
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
 -CONFIG_CMD_SF=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_TIME=y

diff --combined configs/khadas-edge-rk3399_defconfig
index e5620664363531c0a8a66de59f9cb678766ab0a3,9ba25b7d57c574c63d5dbeef0559d674fc0bddd9..94747ea015f249c51a6335286b993e19f5e7840e
--- 1/configs/khadas-edge-rk3399_defconfig
--- 2/configs/khadas-edge-rk3399_defconfig
+++ b/configs/khadas-edge-rk3399_defconfig
@@@ -2,9 -2,7 +2,7 @@@ CONFIG_ARM=
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_SYS_TEXT_BASE=0x00200000
  CONFIG_ROCKCHIP_RK3399=y
- CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
  CONFIG_NR_DRAM_BANKS=1
- CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_DEBUG_UART=y
@@@ -19,6 -17,7 +17,6 @@@ CONFIG_SYS_PROMPT="kedge# 
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
 -CONFIG_CMD_SF=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_TIME=y

diff --combined configs/khadas-edge-v-rk3399_defconfig
index 4ffe3a6e4051330b4f55ff15d61b985e485d8eb7,424dec1fbacb135c14437252bcf2fd32e50a9a61..a908941aaa6bddb6253b26c349c0843c46d85555
--- 1/configs/khadas-edge-v-rk3399_defconfig
--- 2/configs/khadas-edge-v-rk3399_defconfig
+++ b/configs/khadas-edge-v-rk3399_defconfig
@@@ -2,9 -2,7 +2,7 @@@ CONFIG_ARM=
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_SYS_TEXT_BASE=0x00200000
  CONFIG_ROCKCHIP_RK3399=y
- CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
  CONFIG_NR_DRAM_BANKS=1
- CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_DEBUG_UART=y
@@@ -19,6 -17,7 +17,6 @@@ CONFIG_SYS_PROMPT="kedge# 
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
 -CONFIG_CMD_SF=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_TIME=y

diff --combined configs/nanopc-t4-rk3399_defconfig
index 48dfc7dcd2e4469e76af95613e9ad51b64dda82b,ae09273a48669f3ab18870b893396213fd330649..48f8aa86b938073063621ad397a31f661e40d34e
--- 1/configs/nanopc-t4-rk3399_defconfig
--- 2/configs/nanopc-t4-rk3399_defconfig
+++ b/configs/nanopc-t4-rk3399_defconfig
@@@ -2,9 -2,7 +2,7 @@@ CONFIG_ARM=
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_SYS_TEXT_BASE=0x00200000
  CONFIG_ROCKCHIP_RK3399=y
- CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
  CONFIG_NR_DRAM_BANKS=1
- CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_DEBUG_UART=y
@@@ -18,6 -16,7 +16,6 @@@ CONFIG_TPL=
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
 -CONFIG_CMD_SF=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_TIME=y

diff --combined configs/nanopi-m4-rk3399_defconfig
index fb54cbeda684e742559e295535d0700b64bb1380,e1a61e5a57463a8b1c09936aa12186162229ec9c..95bd46ffd1307a6eac51693bd9c64a8a57614920
--- 1/configs/nanopi-m4-rk3399_defconfig
--- 2/configs/nanopi-m4-rk3399_defconfig
+++ b/configs/nanopi-m4-rk3399_defconfig
@@@ -2,9 -2,7 +2,7 @@@ CONFIG_ARM=
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_SYS_TEXT_BASE=0x00200000
  CONFIG_ROCKCHIP_RK3399=y
- CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
  CONFIG_NR_DRAM_BANKS=1
- CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_DEBUG_UART=y
@@@ -18,6 -16,7 +16,6 @@@ CONFIG_TPL=
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
 -CONFIG_CMD_SF=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_TIME=y

diff --combined configs/nanopi-neo4-rk3399_defconfig
index 6631d5366ec1778d6d31dfb54fa38aa3b74c8980,c3a592d8fe9d0ed36442bcd0ca0c65373fa9b0a4..8b15ddcadfb1bc5810fee4b12a745b185d675778
--- 1/configs/nanopi-neo4-rk3399_defconfig
--- 2/configs/nanopi-neo4-rk3399_defconfig
+++ b/configs/nanopi-neo4-rk3399_defconfig
@@@ -2,9 -2,7 +2,7 @@@ CONFIG_ARM=
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_SYS_TEXT_BASE=0x00200000
  CONFIG_ROCKCHIP_RK3399=y
- CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
  CONFIG_NR_DRAM_BANKS=1
- CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_DEBUG_UART=y
@@@ -18,6 -16,7 +16,6 @@@ CONFIG_TPL=
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
 -CONFIG_CMD_SF=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_TIME=y

diff --combined configs/orangepi-rk3399_defconfig
index 0e8676d69c147517054c3063622a123a62556b76,296fd5f0a0f192a6fce537b715455296626ed287..b7f8d47e0de7e432c3acf1309f388a1ed56a4fba
--- 1/configs/orangepi-rk3399_defconfig
--- 2/configs/orangepi-rk3399_defconfig
+++ b/configs/orangepi-rk3399_defconfig
@@@ -2,9 -2,7 +2,7 @@@ CONFIG_ARM=
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_SYS_TEXT_BASE=0x00200000
  CONFIG_ROCKCHIP_RK3399=y
- CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
  CONFIG_NR_DRAM_BANKS=1
- CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_DEBUG_UART=y
@@@ -18,6 -16,7 +16,6 @@@ CONFIG_TPL=
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
 -CONFIG_CMD_SF=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_TIME=y

diff --combined configs/puma-rk3399_defconfig
index 6ba88a37812642154a944efbc3aa4e8c8ae88081,351b0ea3d0da6b00fd08329eb9c26ce07f8bfb2e..f2a70c4206b12a3935b2f020f60931beb7b00d69
--- 1/configs/puma-rk3399_defconfig
--- 2/configs/puma-rk3399_defconfig
+++ b/configs/puma-rk3399_defconfig
@@@ -6,7 -6,6 +6,6 @@@ CONFIG_ROCKCHIP_RK3399=
  CONFIG_ROCKCHIP_BOOT_MODE_REG=0x0
  CONFIG_TARGET_PUMA_RK3399=y
  CONFIG_NR_DRAM_BANKS=1
- CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEBUG_UART_BASE=0xFF180000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_SPL_SPI_FLASH_SUPPORT=y
@@@ -30,6 -29,7 +29,6 @@@ CONFIG_CMD_BOOTZ=
  CONFIG_CMD_GPT=y
  CONFIG_CMD_I2C=y
  CONFIG_CMD_MMC=y
 -CONFIG_CMD_SF=y
  CONFIG_CMD_SPI=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
@@@ -52,6 -52,7 +51,6 @@@ CONFIG_MMC_DW_ROCKCHIP=
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_SDMA=y
  CONFIG_MMC_SDHCI_ROCKCHIP=y
 -CONFIG_SPI_FLASH=y
  CONFIG_SF_DEFAULT_SPEED=20000000
  CONFIG_SPI_FLASH_GIGADEVICE=y
  CONFIG_SPI_FLASH_WINBOND=y

diff --combined configs/roc-rk3399-pc_defconfig
index 67b061572f2662594dfe5e0dca324717fa99bc79,809f5222368ee5524d320ba9440d6548413b3e81..5799328fbc4069db62b9f72029ca36d83348e80a
--- 1/configs/roc-rk3399-pc_defconfig
--- 2/configs/roc-rk3399-pc_defconfig
+++ b/configs/roc-rk3399-pc_defconfig
@@@ -2,9 -2,7 +2,7 @@@ CONFIG_ARM=
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_SYS_TEXT_BASE=0x00200000
  CONFIG_ROCKCHIP_RK3399=y
- CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
  CONFIG_NR_DRAM_BANKS=1
- CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_DEBUG_UART=y
@@@ -18,6 -16,7 +16,6 @@@ CONFIG_TPL=
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
 -CONFIG_CMD_SF=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_TIME=y

diff --combined configs/rock-pi-4-rk3399_defconfig
index 01afd206c7234532f6ff78477b96fcad075ee3ea,f4bb3818cea190d35eed8aafe828810c3b5045d2..ffb82994ead522c20231ef10ecfc56376f6f565c
--- 1/configs/rock-pi-4-rk3399_defconfig
--- 2/configs/rock-pi-4-rk3399_defconfig
+++ b/configs/rock-pi-4-rk3399_defconfig
@@@ -2,9 -2,7 +2,7 @@@ CONFIG_ARM=
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_SYS_TEXT_BASE=0x00200000
  CONFIG_ROCKCHIP_RK3399=y
- CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
  CONFIG_NR_DRAM_BANKS=1
- CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_DEBUG_UART=y
@@@ -19,6 -17,7 +17,6 @@@ CONFIG_TPL=
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
 -CONFIG_CMD_SF=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_TIME=y

diff --combined configs/rock64-rk3328_defconfig
index 51d8648e10effd0e45753bec02c194c30fb46c34,3b3ac96cc0f305ec6a4bd88269b7fc32f9c77a29..430bed00a337f09c274136bb12437bef6167ec14
--- 1/configs/rock64-rk3328_defconfig
--- 2/configs/rock64-rk3328_defconfig
+++ b/configs/rock64-rk3328_defconfig
@@@ -3,7 -3,6 +3,6 @@@ CONFIG_ARCH_ROCKCHIP=
  CONFIG_SYS_TEXT_BASE=0x00200000
  CONFIG_ROCKCHIP_RK3328=y
  CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
- CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x40000
  CONFIG_TPL_LIBCOMMON_SUPPORT=y
  CONFIG_TPL_LIBGENERIC_SUPPORT=y
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@@ -29,6 -28,7 +28,6 @@@ CONFIG_SPL_ATF_NO_PLATFORM_PARAM=
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
 -CONFIG_CMD_SF=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_TIME=y
@@@ -57,6 -57,7 +56,6 @@@ CONFIG_ROCKCHIP_GPIO=
  CONFIG_SYS_I2C_ROCKCHIP=y
  CONFIG_MMC_DW=y
  CONFIG_MMC_DW_ROCKCHIP=y
 -CONFIG_SPI_FLASH=y
  CONFIG_SF_DEFAULT_SPEED=20000000
  CONFIG_DM_ETH=y
  CONFIG_ETH_DESIGNWARE=y

diff --combined configs/rockpro64-rk3399_defconfig
index 8a4542de0096b1b490f96b10fe9e9832d1c858b6,68f0dca7b2c2eb0fc291a209060e3c2a7a26cb15..423148b1a56e493e58e160e264a36276269c07f3
--- 1/configs/rockpro64-rk3399_defconfig
--- 2/configs/rockpro64-rk3399_defconfig
+++ b/configs/rockpro64-rk3399_defconfig
@@@ -2,9 -2,7 +2,7 @@@ CONFIG_ARM=
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_SYS_TEXT_BASE=0x00200000
  CONFIG_ROCKCHIP_RK3399=y
- CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
  CONFIG_NR_DRAM_BANKS=1
- CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_DEBUG_UART=y
@@@ -19,6 -17,7 +17,6 @@@ CONFIG_TPL=
  CONFIG_CMD_BOOTZ=y
  CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
 -CONFIG_CMD_SF=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_TIME=y