Skip to contentSkip to conversation

Convert CONFIG_USB_OHCI_NEW et al to Kconfig

PATCH In review Tom Rini 5 participants 30 messages Jun 25, 2022 – Jul 7, 2022 Page 1 of 2

Subsystems (30)
Network drivers Arm (32-bit) x86 USB +26 more subsystems
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/20 Convert CONFIG_USB_OHCI_NEW et al to Kconfig

This converts the following to Kconfig:
CONFIG_SYS_OHCI_SWAP_REG_ACCESS
CONFIG_SYS_USB_OHCI_CPU_INIT
CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS
CONFIG_SYS_USB_OHCI_SLOT_NAME
CONFIG_USB_ATMEL
CONFIG_USB_ATMEL_CLK_SEL_PLLB
CONFIG_USB_ATMEL_CLK_SEL_UPLL
CONFIG_USB_OHCI_LPC32XX
CONFIG_USB_OHCI_NEW

---
 arch/arm/include/asm/arch-lpc32xx/config.h    |  4 --
 configs/at91sam9260ek_dataflash_cs0_defconfig |  3 ++
 configs/at91sam9260ek_dataflash_cs1_defconfig |  3 ++
 configs/at91sam9260ek_nandflash_defconfig     |  3 ++
 configs/at91sam9261ek_dataflash_cs0_defconfig |  3 ++
 configs/at91sam9261ek_dataflash_cs3_defconfig |  3 ++
 configs/at91sam9261ek_nandflash_defconfig     |  3 ++
 configs/at91sam9263ek_dataflash_cs0_defconfig |  3 ++
 configs/at91sam9263ek_dataflash_defconfig     |  3 ++
 configs/at91sam9263ek_nandflash_defconfig     |  3 ++
 configs/at91sam9263ek_norflash_boot_defconfig |  3 ++
 configs/at91sam9263ek_norflash_defconfig      |  3 ++
 configs/at91sam9g10ek_dataflash_cs0_defconfig |  3 ++
 configs/at91sam9g10ek_dataflash_cs3_defconfig |  3 ++
 configs/at91sam9g10ek_nandflash_defconfig     |  3 ++
 configs/at91sam9g20ek_2mmc_defconfig          |  3 ++
 .../at91sam9g20ek_2mmc_nandflash_defconfig    |  3 ++
 configs/at91sam9g20ek_dataflash_cs0_defconfig |  3 ++
 configs/at91sam9g20ek_dataflash_cs1_defconfig |  3 ++
 configs/at91sam9g20ek_nandflash_defconfig     |  3 ++
 configs/at91sam9xeek_dataflash_cs0_defconfig  |  3 ++
 configs/at91sam9xeek_dataflash_cs1_defconfig  |  3 ++
 configs/at91sam9xeek_nandflash_defconfig      |  3 ++
 configs/axs103_defconfig                      |  1 +
 configs/chromebook_bob_defconfig              |  1 +
 configs/chromebook_kevin_defconfig            |  1 +
 configs/comtrend_ar5315u_ram_defconfig        |  2 +
 configs/comtrend_ar5387un_ram_defconfig       |  2 +
 configs/comtrend_ct5361_ram_defconfig         |  2 +
 configs/comtrend_vr3032u_ram_defconfig        |  2 +
 configs/comtrend_wap5813n_ram_defconfig       |  2 +
 configs/da850evm_defconfig                    |  1 +
 configs/da850evm_direct_nor_defconfig         |  1 +
 configs/da850evm_nand_defconfig               |  1 +
 configs/devkit3250_defconfig                  |  3 ++
 configs/elgin-rv1108_defconfig                |  1 +
 configs/evb-rk3128_defconfig                  |  1 +
 configs/evb-rk3328_defconfig                  |  1 +
 configs/evb-rv1108_defconfig                  |  1 +
 configs/hsdk_4xd_defconfig                    |  1 +
 configs/hsdk_defconfig                        |  1 +
 configs/huawei_hg556a_ram_defconfig           |  2 +
 configs/khadas-edge-captain-rk3399_defconfig  |  1 +
 configs/khadas-edge-rk3399_defconfig          |  1 +
 configs/khadas-edge-v-rk3399_defconfig        |  1 +
 configs/nanopi-r2s-rk3328_defconfig           |  1 +
 configs/netgear_dgnd3700v2_ram_defconfig      |  2 +
 configs/omapl138_lcdk_defconfig               |  1 +
 configs/pinebook-pro-rk3399_defconfig         |  1 +
 configs/pm9261_defconfig                      |  3 ++
 configs/pm9263_defconfig                      |  3 ++
 configs/roc-cc-rk3328_defconfig               |  1 +
 configs/rock-pi-e-rk3328_defconfig            |  1 +
 configs/rock64-rk3328_defconfig               |  1 +
 configs/rock960-rk3399_defconfig              |  1 +
 configs/rockpro64-rk3399_defconfig            |  1 +
 configs/sama5d3_xplained_mmc_defconfig        |  3 ++
 configs/sama5d3_xplained_nandflash_defconfig  |  3 ++
 configs/sfr_nb4-ser_ram_defconfig             |  2 +
 configs/smartweb_defconfig                    |  2 +
 configs/socrates_defconfig                    |  2 +
 configs/stih410-b2260_defconfig               |  1 +
 configs/taurus_defconfig                      |  2 +
 configs/vexpress_aemv8a_juno_defconfig        |  1 +
 drivers/usb/host/Kconfig                      | 44 +++++++++++++++++++
 drivers/usb/host/ohci-at91.c                  |  5 ---
 drivers/usb/host/ohci-generic.c               |  4 --
 drivers/usb/host/ohci.h                       |  2 +-
 include/configs/at91sam9260ek.h               |  6 ---
 include/configs/at91sam9261ek.h               | 10 -----
 include/configs/at91sam9263ek.h               |  6 ---
 include/configs/at91sam9n12ek.h               |  6 ---
 include/configs/at91sam9x5ek.h                |  6 ---
 include/configs/axs10x.h                      |  2 -
 include/configs/bmips_bcm6318.h               |  7 ---
 include/configs/bmips_bcm63268.h              |  7 ---
 include/configs/bmips_bcm6328.h               |  7 ---
 include/configs/bmips_bcm6348.h               |  7 ---
 include/configs/bmips_bcm6358.h               |  7 ---
 include/configs/bmips_bcm6362.h               |  7 ---
 include/configs/bmips_bcm6368.h               |  7 ---
 include/configs/da850evm.h                    |  4 --
 include/configs/devkit3250.h                  |  1 -
 include/configs/ethernut5.h                   |  6 ---
 include/configs/evb_rk3399.h                  |  3 --
 include/configs/gru.h                         |  3 --
 include/configs/hsdk-4xd.h                    |  6 ---
 include/configs/hsdk.h                        |  6 ---
 include/configs/omapl138_lcdk.h               |  6 ---
 include/configs/pinebook-pro-rk3399.h         |  3 --
 include/configs/pm9261.h                      |  6 ---
 include/configs/pm9263.h                      |  6 ---
 include/configs/rk3128_common.h               |  3 --
 include/configs/rk3328_common.h               |  4 --
 include/configs/rock960_rk3399.h              |  3 --
 include/configs/rockpro64_rk3399.h            |  3 --
 include/configs/rv1108_common.h               |  2 -
 include/configs/sama5d3_xplained.h            |  6 ---
 include/configs/sama5d3xek.h                  |  5 ---
 include/configs/smartweb.h                    |  6 ---
 include/configs/snapper9260.h                 |  6 ---
 include/configs/socrates.h                    |  4 --
 include/configs/stih410-b2260.h               |  2 -
 include/configs/sunxi-common.h                |  5 ---
 include/configs/taurus.h                      |  6 ---
 include/configs/usb_a9263.h                   |  5 ---
 include/configs/vexpress_aemv8.h              |  5 ---
 107 files changed, 173 insertions(+), 214 deletions(-)
arch/arm/include/asm/arch-lpc32xx/config.h +0 -4
index 653792c610cb..32d68cbeb81a 100644
@@ -52,11 +52,7 @@
 
 /* USB OHCI */
 #if defined(CONFIG_USB_OHCI_LPC32XX)
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_CPU_INIT
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	1
 #define CONFIG_SYS_USB_OHCI_REGS_BASE		USB_BASE
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME		"lpc32xx-ohci"
 #endif
 
 #endif /* _LPC32XX_CONFIG_H */
configs/at91sam9260ek_dataflash_cs0_defconfig +3 -0
index 9947d1d4c670..62b467ea3097 100644
@@ -65,3 +65,6 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9260"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
configs/at91sam9260ek_dataflash_cs1_defconfig +3 -0
index 8e54f1b13358..a5ccce1eae25 100644
@@ -65,3 +65,6 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9260"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
configs/at91sam9260ek_nandflash_defconfig +3 -0
index 1badceeb2c1f..d3706d158b7d 100644
@@ -63,3 +63,6 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9260"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
configs/at91sam9261ek_dataflash_cs0_defconfig +3 -0
index 8b2f27a406ea..d479d76c79ec 100644
@@ -65,4 +65,7 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9261"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
 CONFIG_ATMEL_LCD_BGR555=y
configs/at91sam9261ek_dataflash_cs3_defconfig +3 -0
index e5350cfd6fe6..96c44e9a1628 100644
@@ -65,4 +65,7 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9261"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
 CONFIG_ATMEL_LCD_BGR555=y
configs/at91sam9261ek_nandflash_defconfig +3 -0
index 3557c4e57a67..16de51951191 100644
@@ -63,4 +63,7 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9261"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
 CONFIG_ATMEL_LCD_BGR555=y
configs/at91sam9263ek_dataflash_cs0_defconfig +3 -0
index aa69b0f97a07..e73ff8861bed 100644
@@ -68,4 +68,7 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9263"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
 CONFIG_ATMEL_LCD_BGR555=y
configs/at91sam9263ek_dataflash_defconfig +3 -0
index aa69b0f97a07..e73ff8861bed 100644
@@ -68,4 +68,7 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9263"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
 CONFIG_ATMEL_LCD_BGR555=y
configs/at91sam9263ek_nandflash_defconfig +3 -0
index f88ea5cc3dc3..184431640e66 100644
@@ -66,4 +66,7 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9263"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
 CONFIG_ATMEL_LCD_BGR555=y
configs/at91sam9263ek_norflash_boot_defconfig +3 -0
index b93eeaa2143c..7b975813928c 100644
@@ -68,4 +68,7 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9263"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
 CONFIG_ATMEL_LCD_BGR555=y
configs/at91sam9263ek_norflash_defconfig +3 -0
index eb2e13ccc09f..2c354f3b5b51 100644
@@ -69,4 +69,7 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9263"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
 CONFIG_ATMEL_LCD_BGR555=y
configs/at91sam9g10ek_dataflash_cs0_defconfig +3 -0
index 818e630ea2c5..ee4de9b67d67 100644
@@ -62,3 +62,6 @@ CONFIG_ATMEL_USART=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9261"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
configs/at91sam9g10ek_dataflash_cs3_defconfig +3 -0
index 118d778d4cfa..4a47ad128655 100644
@@ -62,3 +62,6 @@ CONFIG_ATMEL_USART=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9261"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
configs/at91sam9g10ek_nandflash_defconfig +3 -0
index bf667606a2a9..0e3d0b13140c 100644
@@ -60,3 +60,6 @@ CONFIG_ATMEL_USART=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9261"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
configs/at91sam9g20ek_2mmc_defconfig +3 -0
index d175575f7917..add019c10afd 100644
@@ -66,3 +66,6 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9260"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
configs/at91sam9g20ek_2mmc_nandflash_defconfig +3 -0
index 2ea5bbd03407..72a21c3da94d 100644
@@ -65,3 +65,6 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9260"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
configs/at91sam9g20ek_dataflash_cs0_defconfig +3 -0
index 304ee157bb7a..03b029cee8d9 100644
@@ -65,3 +65,6 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9260"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
configs/at91sam9g20ek_dataflash_cs1_defconfig +3 -0
index a93ae955a57b..1ae1b28feefd 100644
@@ -65,3 +65,6 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9260"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
configs/at91sam9g20ek_nandflash_defconfig +3 -0
index 4c51e7a3355a..77ad4b9fda2d 100644
@@ -63,3 +63,6 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9260"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
configs/at91sam9xeek_dataflash_cs0_defconfig +3 -0
index 9947d1d4c670..62b467ea3097 100644
@@ -65,3 +65,6 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9260"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
configs/at91sam9xeek_dataflash_cs1_defconfig +3 -0
index 8e54f1b13358..a5ccce1eae25 100644
@@ -65,3 +65,6 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9260"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
configs/at91sam9xeek_nandflash_defconfig +3 -0
index 1badceeb2c1f..d3706d158b7d 100644
@@ -63,3 +63,6 @@ CONFIG_DM_SPI=y
 CONFIG_TIMER=y
 CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9260"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
configs/axs103_defconfig +1 -0
index 64407655767f..0d1764958224 100644
@@ -62,5 +62,6 @@ CONFIG_DESIGNWARE_SPI=y
 CONFIG_USB=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
 CONFIG_USB_STORAGE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
configs/chromebook_bob_defconfig +1 -0
index 84fe5be19d56..938bc28a1d27 100644
@@ -102,6 +102,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
 CONFIG_USB_DWC3=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_USB_HOST_ETHER=y
configs/chromebook_kevin_defconfig +1 -0
index 669d6f570b9e..6f88002f968c 100644
@@ -103,6 +103,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
 CONFIG_USB_DWC3=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_USB_HOST_ETHER=y
configs/comtrend_ar5315u_ram_defconfig +2 -0
index 170b766089d0..36eab571eafe 100644
@@ -72,3 +72,5 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_SYS_OHCI_SWAP_REG_ACCESS=y
configs/comtrend_ar5387un_ram_defconfig +2 -0
index 599fda481aa8..68969c041386 100644
@@ -73,3 +73,5 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_SYS_OHCI_SWAP_REG_ACCESS=y
configs/comtrend_ct5361_ram_defconfig +2 -0
index b1ad57b5a56c..cb2caf454350 100644
@@ -67,4 +67,6 @@ CONFIG_BCM6345_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_SYS_OHCI_SWAP_REG_ACCESS=y
 CONFIG_WDT_BCM6345=y
configs/comtrend_vr3032u_ram_defconfig +2 -0
index d07895de9b82..138d3c84bac7 100644
@@ -72,3 +72,5 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_SYS_OHCI_SWAP_REG_ACCESS=y
configs/comtrend_wap5813n_ram_defconfig +2 -0
index ca370e66a346..b7174ff5ee34 100644
@@ -69,3 +69,5 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_SYS_OHCI_SWAP_REG_ACCESS=y
configs/da850evm_defconfig +1 -0
index de2d709a7a22..d7348298587f 100644
@@ -110,6 +110,7 @@ CONFIG_USB=y
 # CONFIG_SPL_DM_USB is not set
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_DA8XX=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=15
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_DA8XX=y
 CONFIG_USB_MUSB_PIO_ONLY=y
configs/da850evm_direct_nor_defconfig +1 -0
index 88ef772d9d50..8f6b8b9702f4 100644
@@ -88,6 +88,7 @@ CONFIG_DAVINCI_SPI=y
 CONFIG_USB=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_DA8XX=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=15
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_DA8XX=y
 CONFIG_USB_MUSB_PIO_ONLY=y
configs/da850evm_nand_defconfig +1 -0
index 052ef3070334..95b41ef32b14 100644
@@ -113,6 +113,7 @@ CONFIG_USB=y
 # CONFIG_SPL_DM_USB is not set
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_DA8XX=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=15
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_DA8XX=y
 CONFIG_USB_MUSB_PIO_ONLY=y
configs/devkit3250_defconfig +3 -0
index a0b7a2e2d36c..eae073d76ea6 100644
@@ -86,4 +86,7 @@ CONFIG_CONS_INDEX=5
 CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="lpc32xx-ohci"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
+CONFIG_USB_OHCI_LPC32XX=y
 CONFIG_OF_LIBFDT=y
configs/elgin-rv1108_defconfig +1 -0
index 2f595be1c24a..263fe3b7c8d1 100644
@@ -55,6 +55,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
 CONFIG_USB_DWC2=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_PRODUCT_NUM=0x110a
configs/evb-rk3128_defconfig +1 -0
index e0fb3f62b45c..ac38d5e78852 100644
@@ -51,6 +51,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
 CONFIG_USB_DWC2=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DWC2_OTG=y
configs/evb-rk3328_defconfig +1 -0
index 4d6d235cb125..c81437300c74 100644
@@ -99,6 +99,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
 CONFIG_USB_DWC2=y
 CONFIG_USB_DWC3=y
 # CONFIG_USB_DWC3_GADGET is not set
configs/evb-rv1108_defconfig +1 -0
index dbca68fcf300..65b76c6b36d4 100644
@@ -49,6 +49,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
 CONFIG_USB_DWC2=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_PRODUCT_NUM=0x110a
configs/hsdk_4xd_defconfig +1 -0
index 85844f7ec882..1d78c17d13b0 100644
@@ -68,6 +68,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
 CONFIG_USB_STORAGE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_PANIC_HANG=y
configs/hsdk_defconfig +1 -0
index a714d28134bf..f9823af34d4d 100644
@@ -67,6 +67,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
 CONFIG_USB_STORAGE=y
 CONFIG_USE_PRIVATE_LIBGCC=y
 CONFIG_PANIC_HANG=y
configs/huawei_hg556a_ram_defconfig +2 -0
index 1c43ae262d81..2b5a58714102 100644
@@ -69,3 +69,5 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_SYS_OHCI_SWAP_REG_ACCESS=y
configs/khadas-edge-captain-rk3399_defconfig +1 -0
index e9618e3e207a..9a0171e4a8a4 100644
@@ -65,6 +65,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_ASIX88179=y
configs/khadas-edge-rk3399_defconfig +1 -0
index 252a02b579e1..27f119931fb4 100644
@@ -64,6 +64,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_ASIX88179=y
configs/khadas-edge-v-rk3399_defconfig +1 -0
index 731fbfcab264..de2b625120aa 100644
@@ -65,6 +65,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_ASIX88179=y
configs/nanopi-r2s-rk3328_defconfig +1 -0
index 41793ca7e486..15c2e1698c20 100644
@@ -102,6 +102,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
 CONFIG_USB_DWC2=y
 CONFIG_USB_DWC3=y
 # CONFIG_USB_DWC3_GADGET is not set
configs/netgear_dgnd3700v2_ram_defconfig +2 -0
index bbfa9e13fa3c..73de5ed15b15 100644
@@ -68,3 +68,5 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_SYS_OHCI_SWAP_REG_ACCESS=y
configs/omapl138_lcdk_defconfig +1 -0
index b45f6d8564e9..28f4f95c95bd 100644
@@ -105,6 +105,7 @@ CONFIG_USB=y
 # CONFIG_SPL_DM_USB is not set
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_DA8XX=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=15
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_DA8XX=y
 CONFIG_USB_MUSB_PIO_ONLY=y
configs/pinebook-pro-rk3399_defconfig +1 -0
index 121182c55d74..af473f913672 100644
@@ -90,6 +90,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GENERIC=y
 CONFIG_USB_KEYBOARD=y
configs/pm9261_defconfig +3 -0
index c22076250bc7..6922380b0093 100644
@@ -61,6 +61,9 @@ CONFIG_ATMEL_USART=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9261"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
 CONFIG_DM_VIDEO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_ATMEL_LCD=y
configs/pm9263_defconfig +3 -0
index 1406e7f1aa4d..2b4a844d804b 100644
@@ -65,6 +65,9 @@ CONFIG_ATMEL_USART=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_SLOT_NAME="at91sam9263"
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
 CONFIG_DM_VIDEO=y
 # CONFIG_VIDEO_BPP32 is not set
 CONFIG_ATMEL_LCD=y
configs/roc-cc-rk3328_defconfig +1 -0
index ab25abc1a031..43b90c7879b7 100644
@@ -108,6 +108,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
 CONFIG_USB_DWC2=y
 CONFIG_USB_DWC3=y
 # CONFIG_USB_DWC3_GADGET is not set
configs/rock-pi-e-rk3328_defconfig +1 -0
index 1d51a267b93a..7d95e171f7f4 100644
@@ -109,6 +109,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
 CONFIG_USB_DWC2=y
 CONFIG_USB_DWC3=y
 # CONFIG_USB_DWC3_GADGET is not set
configs/rock64-rk3328_defconfig +1 -0
index 640fe558d414..bc333a5e2a6a 100644
@@ -106,6 +106,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
 CONFIG_USB_DWC2=y
 CONFIG_USB_DWC3=y
 # CONFIG_USB_DWC3_GADGET is not set
configs/rock960-rk3399_defconfig +1 -0
index 78e50dbfbcb7..bb5b2143691d 100644
@@ -74,6 +74,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
 CONFIG_USB_DWC3=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_USB_HOST_ETHER=y
configs/rockpro64-rk3399_defconfig +1 -0
index 4d2a5b32e31c..ef28fe6a937a 100644
@@ -87,6 +87,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GENERIC=y
 CONFIG_USB_KEYBOARD=y
configs/sama5d3_xplained_mmc_defconfig +3 -0
index 848326051239..486e2190b2b3 100644
@@ -104,6 +104,9 @@ CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_SPL_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
+CONFIG_USB_ATMEL_CLK_SEL_UPLL=y
 CONFIG_USB_STORAGE=y
 CONFIG_W1=y
 CONFIG_W1_GPIO=y
configs/sama5d3_xplained_nandflash_defconfig +3 -0
index f12c5d791724..184ff5ff7248 100644
@@ -107,6 +107,9 @@ CONFIG_ATMEL_PIT_TIMER=y
 CONFIG_SPL_ATMEL_PIT_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
+CONFIG_USB_ATMEL_CLK_SEL_UPLL=y
 CONFIG_USB_STORAGE=y
 CONFIG_W1=y
 CONFIG_W1_GPIO=y
configs/sfr_nb4-ser_ram_defconfig +2 -0
index 6f261882faae..df008b797f86 100644
@@ -71,3 +71,5 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_SYS_OHCI_SWAP_REG_ACCESS=y
configs/smartweb_defconfig +2 -0
index 4e05f71bf3af..84337e49e6c9 100644
@@ -92,6 +92,8 @@ CONFIG_MACB=y
 CONFIG_RMII=y
 CONFIG_ATMEL_USART=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0908
configs/socrates_defconfig +2 -0
index 28ea447ec55f..621573653785 100644
@@ -96,4 +96,6 @@ CONFIG_USB=y
 # CONFIG_USB_EHCI_HCD is not set
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_PCI=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=15
+CONFIG_SYS_OHCI_SWAP_REG_ACCESS=y
 CONFIG_USB_STORAGE=y
configs/stih410-b2260_defconfig +1 -0
index 198a0c7f9e5f..cb8c73afd474 100644
@@ -58,6 +58,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
 CONFIG_USB_DWC3=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
configs/taurus_defconfig +2 -0
index cf538d0f5f5f..3d61c7b57b59 100644
@@ -110,6 +110,8 @@ CONFIG_SPECIFY_CONSOLE_INDEX=y
 CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 # CONFIG_SPL_DM_USB is not set
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
+CONFIG_USB_ATMEL=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0908
configs/vexpress_aemv8a_juno_defconfig +1 -0
index ba8883dced55..792bcf1eb5d4 100644
@@ -35,3 +35,4 @@ CONFIG_SYS_FLASH_CFI=y
 CONFIG_DM_ETH=y
 CONFIG_PCI=y
 CONFIG_USB=y
+CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1
drivers/usb/host/Kconfig +44 -0

66 lines not on this page · raw message

drivers/usb/host/ohci-at91.c +0 -5
index 8ceabaf45c1b..9b955c1bd678 100644
@@ -5,9 +5,6 @@
  */
 
 #include <common.h>
-
-#if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT)
-
 #include <asm/arch/clk.h>
 
 int usb_cpu_init(void)
@@ -65,5 +62,3 @@ int usb_cpu_init_fail(void)
 {
 	return usb_cpu_stop();
 }
-
-#endif /* defined(CONFIG_USB_OHCI) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT) */
drivers/usb/host/ohci-generic.c +0 -4
index 163f0ef17b11..5d23058aaf6a 100644
@@ -14,10 +14,6 @@
 #include <reset.h>
 #include "ohci.h"
 
-#if !defined(CONFIG_USB_OHCI_NEW)
-# error "Generic OHCI driver requires CONFIG_USB_OHCI_NEW"
-#endif
-
 struct generic_ohci {
 	ohci_t ohci;
 	struct clk *clocks;	/* clock list */
drivers/usb/host/ohci.h +1 -1
index a38cd25eb85f..7699f2e6b15a 100644
@@ -151,7 +151,7 @@ struct ohci_hcca {
  * Maximum number of root hub ports.
  */
 #ifndef CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS
-# error "CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS undefined!"
+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
 #endif
 
 /*
include/configs/at91sam9260ek.h +0 -6
index 2c4f229d3476..ef9335c523f4 100644
@@ -53,12 +53,6 @@
 #endif
 
 /* USB */
-#define CONFIG_USB_ATMEL
-#define CONFIG_USB_ATMEL_CLK_SEL_PLLB
-#define CONFIG_USB_OHCI_NEW		1
-#define CONFIG_SYS_USB_OHCI_CPU_INIT		1
 #define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00500000	/* AT91SAM9260_UHP_BASE */
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91sam9260"
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2
 
 #endif
include/configs/at91sam9261ek.h +0 -10
index 563fff531d11..12726c10bd6d 100644
@@ -51,16 +51,6 @@
 #define CONFIG_DM9000_NO_SROM
 
 /* USB */
-#define CONFIG_USB_ATMEL
-#define CONFIG_USB_ATMEL_CLK_SEL_PLLB
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_CPU_INIT
 #define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00500000	/* AT91SAM9261_UHP_BASE */
-#ifdef CONFIG_AT91SAM9G10EK
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91sam9g10"
-#else
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91sam9261"
-#endif
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2
 
 #endif
include/configs/at91sam9263ek.h +0 -6
index c100a411b2dc..9497f055035d 100644
@@ -173,12 +173,6 @@
 #endif
 
 /* USB */
-#define CONFIG_USB_ATMEL
-#define CONFIG_USB_ATMEL_CLK_SEL_PLLB
-#define CONFIG_USB_OHCI_NEW		1
-#define CONFIG_SYS_USB_OHCI_CPU_INIT		1
 #define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00a00000	/* AT91SAM9263_UHP_BASE */
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91sam9263"
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2
 
 #endif
include/configs/at91sam9n12ek.h +0 -6
index 29affe7b5cd6..4fac0aad42c5 100644
@@ -41,13 +41,7 @@
 
 /* USB host */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_ATMEL
-#define CONFIG_USB_ATMEL_CLK_SEL_PLLB
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_CPU_INIT
 #define CONFIG_SYS_USB_OHCI_REGS_BASE	ATMEL_BASE_OHCI
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME	"at91sam9n12"
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	1
 #endif
 
 /* SPL */
include/configs/at91sam9x5ek.h +0 -6
index 6857f2e3c4a2..758a91cdaa97 100644
@@ -41,13 +41,7 @@
 /* USB */
 #ifdef CONFIG_CMD_USB
 #ifndef CONFIG_USB_EHCI_HCD
-#define CONFIG_USB_ATMEL
-#define CONFIG_USB_ATMEL_CLK_SEL_UPLL
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_CPU_INIT
 #define CONFIG_SYS_USB_OHCI_REGS_BASE		ATMEL_BASE_OHCI
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91sam9x5"
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	3
 #endif
 #endif
 
include/configs/axs10x.h +0 -2
index 7e25846e401d..3e98ce09c720 100644
@@ -39,8 +39,6 @@
 /*
  * USB 1.1 configuration
  */
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
 
 /*
  * Environment settings
include/configs/bmips_bcm6318.h +0 -7
index ad7781bd3a27..55c1d439d58b 100644
@@ -14,13 +14,6 @@
 /* RAM */
 #define CONFIG_SYS_SDRAM_BASE		0x80000000
 
-/* USB */
-#define CONFIG_SYS_OHCI_SWAP_REG_ACCESS
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
-#if defined(CONFIG_USB_OHCI_HCD)
-#define CONFIG_USB_OHCI_NEW
-#endif /* CONFIG_USB_OHCI_HCD */
-
 /* U-Boot */
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
include/configs/bmips_bcm63268.h +0 -7
index 0901f6e88ac4..f046b7e6622f 100644
@@ -14,13 +14,6 @@
 /* RAM */
 #define CONFIG_SYS_SDRAM_BASE		0x80000000
 
-/* USB */
-#define CONFIG_SYS_OHCI_SWAP_REG_ACCESS
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
-#if defined(CONFIG_USB_OHCI_HCD)
-#define CONFIG_USB_OHCI_NEW
-#endif /* CONFIG_USB_OHCI_HCD */
-
 /* U-Boot */
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
include/configs/bmips_bcm6328.h +0 -7
index 3f45f1f2550f..7e488072edc0 100644
@@ -14,13 +14,6 @@
 /* RAM */
 #define CONFIG_SYS_SDRAM_BASE		0x80000000
 
-/* USB */
-#define CONFIG_SYS_OHCI_SWAP_REG_ACCESS
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
-#if defined(CONFIG_USB_OHCI_HCD)
-#define CONFIG_USB_OHCI_NEW
-#endif /* CONFIG_USB_OHCI_HCD */
-
 /* U-Boot */
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
include/configs/bmips_bcm6348.h +0 -7
index af1c3673fbb9..f704fe26ca0d 100644
@@ -14,13 +14,6 @@
 /* RAM */
 #define CONFIG_SYS_SDRAM_BASE		0x80000000
 
-/* USB */
-#define CONFIG_SYS_OHCI_SWAP_REG_ACCESS
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
-#if defined(CONFIG_USB_OHCI_HCD)
-#define CONFIG_USB_OHCI_NEW
-#endif /* CONFIG_USB_OHCI_HCD */
-
 /* U-Boot */
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
include/configs/bmips_bcm6358.h +0 -7
index c15218fc9cb5..9aaa694cad91 100644
@@ -14,13 +14,6 @@
 /* RAM */
 #define CONFIG_SYS_SDRAM_BASE		0x80000000
 
-/* USB */
-#define CONFIG_SYS_OHCI_SWAP_REG_ACCESS
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
-#if defined(CONFIG_USB_OHCI_HCD)
-#define CONFIG_USB_OHCI_NEW
-#endif /* CONFIG_USB_OHCI_HCD */
-
 /* U-Boot */
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
include/configs/bmips_bcm6362.h +0 -7
index 0c94b2c52543..34e542544cb8 100644
@@ -14,13 +14,6 @@
 /* RAM */
 #define CONFIG_SYS_SDRAM_BASE		0x80000000
 
-/* USB */
-#define CONFIG_SYS_OHCI_SWAP_REG_ACCESS
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
-#if defined(CONFIG_USB_OHCI_HCD)
-#define CONFIG_USB_OHCI_NEW
-#endif /* CONFIG_USB_OHCI_HCD */
-
 /* U-Boot */
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
include/configs/bmips_bcm6368.h +0 -7
index 6486b7e61107..0319124a0edd 100644
@@ -14,13 +14,6 @@
 /* RAM */
 #define CONFIG_SYS_SDRAM_BASE		0x80000000
 
-/* USB */
-#define CONFIG_SYS_OHCI_SWAP_REG_ACCESS
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
-#if defined(CONFIG_USB_OHCI_HCD)
-#define CONFIG_USB_OHCI_NEW
-#endif /* CONFIG_USB_OHCI_HCD */
-
 /* U-Boot */
 
 #if defined(CONFIG_BMIPS_BOOT_RAM)
include/configs/da850evm.h +0 -4
index 1f6ac8d28adf..3db97205dab8 100644
@@ -170,10 +170,6 @@
 	"console=ttyS2,115200n8\0" \
 	"hwconfig=dsp:wake=yes"
 
-/* USB Configs */
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	15
-
 #ifdef CONFIG_SPL_BUILD
 /* defines for SPL */
 
include/configs/devkit3250.h +0 -1
index e101d1f60048..328e4958f86a 100644
@@ -55,7 +55,6 @@
 /*
  * USB
  */
-#define CONFIG_USB_OHCI_LPC32XX
 #define CONFIG_USB_ISP1301_I2C_ADDR		0x2d
 
 /*
include/configs/ethernut5.h +0 -6
index 2126731ccfc9..529b9837318f 100644
@@ -61,13 +61,7 @@
 
 /* USB */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_ATMEL
-#define CONFIG_USB_ATMEL_CLK_SEL_PLLB
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_CPU_INIT
 #define CONFIG_SYS_USB_OHCI_REGS_BASE	0x00500000
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME	"host"
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2
 #endif
 
 /* RTC */
include/configs/evb_rk3399.h +0 -3
index 492b7b4df128..b7e850370b31 100644
@@ -15,7 +15,4 @@
 
 #define SDRAM_BANK_SIZE			(2UL << 30)
 
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2
-
 #endif
include/configs/gru.h +0 -3
index b1084bb21d4d..be2dc79968c0 100644
@@ -13,7 +13,4 @@
 
 #include <configs/rk3399_common.h>
 
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2
-
 #endif
include/configs/hsdk-4xd.h +0 -6
index 7785bab7147b..03ca9281c829 100644
@@ -38,12 +38,6 @@
  * Ethernet PHY configuration
  */
 
-/*
- * USB 1.1 configuration
- */
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
-
 /*
  * Environment settings
  */
include/configs/hsdk.h +0 -6
index 6dd69ca38b42..0b8ac78e2794 100644
@@ -37,12 +37,6 @@
  * Ethernet PHY configuration
  */
 
-/*
- * USB 1.1 configuration
- */
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
-
 /*
  * Environment settings
  */
include/configs/omapl138_lcdk.h +0 -6
index a344a46a3e66..c9f5004117f2 100644
@@ -137,12 +137,6 @@
  * U-Boot general configuration
  */
 
-/*
- * USB Configs
- */
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	15
-
 /*
  * Linux Information
  */
include/configs/pinebook-pro-rk3399.h +0 -3
index d478b19917df..241dc39be008 100644
@@ -16,7 +16,4 @@
 
 #define SDRAM_BANK_SIZE			(2UL << 30)
 
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2
-
 #endif
include/configs/pm9261.h +0 -6
index bc15cdb44602..7374514698f9 100644
@@ -152,13 +152,7 @@
 #define CONFIG_SYS_MAX_FLASH_SECT		256
 
 /* USB */
-#define CONFIG_USB_ATMEL
-#define CONFIG_USB_ATMEL_CLK_SEL_PLLB
-#define CONFIG_USB_OHCI_NEW			1
-#define CONFIG_SYS_USB_OHCI_CPU_INIT		1
 #define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00500000
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91sam9261"
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2
 
 #define CONFIG_EXTRA_ENV_SETTINGS				\
 	"partition=nand0,0\0"					\
include/configs/pm9263.h +0 -6
index a0eed66b5ff1..7a6d817926c7 100644
@@ -175,13 +175,7 @@
 					 AT91_MATRIX_SCFG_SLOT_CYCLE(255))
 
 /* USB */
-#define CONFIG_USB_ATMEL
-#define CONFIG_USB_ATMEL_CLK_SEL_PLLB
-#define CONFIG_USB_OHCI_NEW			1
-#define CONFIG_SYS_USB_OHCI_CPU_INIT		1
 #define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00a00000	/* AT91SAM9263_UHP_BASE */
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91sam9263"
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2
 
 #define CONFIG_EXTRA_ENV_SETTINGS				\
 	"partition=nand0,0\0"					\
include/configs/rk3128_common.h +0 -3
index f3e0eefb9a21..d5a4ca26b048 100644
@@ -19,9 +19,6 @@
 #define CONFIG_SYS_SDRAM_BASE		0x60000000
 #define SDRAM_MAX_SIZE			0x80000000
 
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     1
-
 /* usb mass storage */
 
 #define ENV_MEM_LAYOUT_SETTINGS \
include/configs/rk3328_common.h +0 -4
index 90183579202d..165b78ff3309 100644
@@ -30,8 +30,4 @@
 	"partitions=" PARTS_DEFAULT \
 	BOOTENV
 
-/* rockchip ohci host driver */
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	1
-
 #endif
include/configs/rock960_rk3399.h +0 -3
index 2edad710284f..6099d2fa55a6 100644
@@ -14,7 +14,4 @@
 #include <configs/rk3399_common.h>
 
 #define SDRAM_BANK_SIZE			(2UL << 30)
-
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2
 #endif
include/configs/rockpro64_rk3399.h +0 -3
index 903e9df527c1..9195b9b99e41 100644
@@ -14,7 +14,4 @@
 #include <configs/rk3399_common.h>
 
 #define SDRAM_BANK_SIZE			(2UL << 30)
-
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2
 #endif
include/configs/rv1108_common.h +0 -2
index d8de9c25df2b..83c3167f38dc 100644
@@ -18,8 +18,6 @@
 #define CONFIG_SYS_SDRAM_BASE		0x60000000
 
 /* rockchip ohci host driver */
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	1
 
 #define ENV_MEM_LAYOUT_SETTINGS \
 	"scriptaddr=0x60000000\0" \
include/configs/sama5d3_xplained.h +0 -6
index a10057452fe4..22839d544a50 100644
@@ -39,13 +39,7 @@
 
 /* USB */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_ATMEL
-#define CONFIG_USB_ATMEL_CLK_SEL_UPLL
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_CPU_INIT
 #define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00600000
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME		"SAMA5D3 Xplained"
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2
 #endif
 
 /* SPL */
include/configs/sama5d3xek.h +0 -5
index f61b6e0dabc7..dc89148a0450 100644
@@ -52,12 +52,7 @@
 
 /* USB */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_ATMEL_CLK_SEL_UPLL
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_CPU_INIT
 #define CONFIG_SYS_USB_OHCI_REGS_BASE		ATMEL_BASE_OHCI
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME		"sama5d3"
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	3
 #endif
 
 /* SPL */
include/configs/smartweb.h +0 -6
index 215c31bca410..65bc3c672eed 100644
@@ -67,13 +67,7 @@
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 
 /* USB configuration */
-#define CONFIG_USB_ATMEL
-#define CONFIG_USB_ATMEL_CLK_SEL_PLLB
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_CPU_INIT
 #define CONFIG_SYS_USB_OHCI_REGS_BASE	ATMEL_UHP_BASE
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME	"at91sam9260"
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2
 
 /* USB DFU support */
 
include/configs/snapper9260.h +0 -6
index 6ff21b921687..2b7afb5d25e5 100644
@@ -38,13 +38,7 @@
 #define CONFIG_SYS_NAND_READY_PIN	AT91_PIN_PC13
 
 /* USB */
-#define CONFIG_USB_ATMEL
-#define CONFIG_USB_ATMEL_CLK_SEL_PLLB
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_CPU_INIT
 #define CONFIG_SYS_USB_OHCI_REGS_BASE	ATMEL_UHP_BASE
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME	"at91sam9260"
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2
 
 /* GPIOs and IO expander */
 #define CONFIG_PCA953X
include/configs/socrates.h +0 -4
index 6a78cb1f2648..db2826813261 100644
@@ -223,10 +223,6 @@
 /* pass open firmware flat tree */
 
 /* USB support */
-#define CONFIG_USB_OHCI_NEW		1
 #define CONFIG_PCI_OHCI			1
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	15
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME		"ohci_pci"
-#define CONFIG_SYS_OHCI_SWAP_REG_ACCESS	1
 
 #endif	/* __CONFIG_H */
include/configs/stih410-b2260.h +0 -2
index a425dad69214..1b8d38f4b52a 100644
@@ -43,8 +43,6 @@
 /* Extra Commands */
 
 /* USB Configs */
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2
 
 /* NET Configs */
 
include/configs/sunxi-common.h +0 -5
index d52552c5fe76..2bf4e58cddf7 100644
@@ -120,11 +120,6 @@
 
 /* Ethernet support */
 
-#ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
-#endif
-
 #ifdef CONFIG_ARM64
 /*
  * Boards seem to come with at least 512MB of DRAM.
include/configs/taurus.h +0 -6
index 798d72d8e26b..ab2dc3d7146b 100644
@@ -65,13 +65,7 @@
 
 /* USB */
 #if defined(CONFIG_BOARD_TAURUS)
-#define CONFIG_USB_ATMEL
-#define CONFIG_USB_ATMEL_CLK_SEL_PLLB
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_CPU_INIT
 #define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00500000
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91sam9260"
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2
 
 /* USB DFU support */
 
include/configs/usb_a9263.h +0 -5
index e432b04e9f5a..8cb8c609d052 100644
@@ -45,12 +45,7 @@
 
 /* USB */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_ATMEL
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_CPU_INIT
 #define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00a00000
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME		"at91sam9263"
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2
 #endif
 
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
include/configs/vexpress_aemv8.h +0 -5
index 14b92c095a0d..e864b3fee6ae 100644
@@ -274,11 +274,6 @@
 /* Store environment at top of flash */
 #endif
 
-#ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
-#endif
-
 #define CONFIG_SYS_FLASH_EMPTY_INFO	/* flinfo indicates empty blocks */
 #define FLASH_MAX_SECTOR_SIZE		0x00040000
 
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/20 usb: ohci-hcd: Remove some unused legacy code

At this point, the only user of ohci-hcd that also uses PCI is using DM, so we can drop CONFIG_PCI_OHCI* usage. No platforms set either of CONFIG_SYS_USB_OHCI_BOARD_INIT or CONFIG_SYS_USB_OHCI_CPU_INIT so those hooks can be removed as well.

---
 doc/README.generic_usb_ohci | 30 ------------
 drivers/usb/host/ohci-hcd.c | 93 -------------------------------------
 include/configs/socrates.h  |  3 --
 3 files changed, 126 deletions(-)
doc/README.generic_usb_ohci +0 -30
index 65b0896c7fd2..a7da4bcb836e 100644
@@ -11,18 +11,6 @@ Configuration options
 
 	CONFIG_USB_OHCI_NEW: enable the new OHCI driver
 
-	CONFIG_SYS_USB_OHCI_BOARD_INIT: call the board dependant hooks:
-
-		  - extern int board_usb_init(void);
-		  - extern int usb_board_stop(void);
-		  - extern int usb_cpu_init_fail(void);
-
-	CONFIG_SYS_USB_OHCI_CPU_INIT: call the cpu dependant hooks:
-
-		  - extern int usb_cpu_init(void);
-		  - extern int usb_cpu_stop(void);
-		  - extern int usb_cpu_init_fail(void);
-
 	CONFIG_SYS_USB_OHCI_REGS_BASE: defines the base address of the OHCI
 				registers
 
@@ -43,21 +31,3 @@ config option
 
 needs to be defined.
 
-
-PCI Controllers
-----------------
-
-You'll need to define
-
-	CONFIG_PCI_OHCI
-
-If you have several USB PCI controllers, define
-
-	CONFIG_PCI_OHCI_DEVNO: number of the OHCI device in PCI list
-
-If undefined, the first instance found in PCI space will be used.
-
-PCI Controllers need to do byte swapping on register accesses, so they
-should to define:
-
-	CONFIG_SYS_OHCI_SWAP_REG_ACCESS
drivers/usb/host/ohci-hcd.c +0 -93

142 lines not on this page · raw message

include/configs/socrates.h +0 -3
index db2826813261..5dc8d8559882 100644
@@ -222,7 +222,4 @@
 
 /* pass open firmware flat tree */
 
-/* USB support */
-#define CONFIG_PCI_OHCI			1
-
 #endif	/* __CONFIG_H */
Signature · 1 line
2.25.1
author
#2 lore raw

PATCH 3/20 usb: Remove some unused CONFIG settings

In reply to Tom Rini

On platforms that use CONFIG_USB_OHCI_NEW we do not need to set CONFIG_SYS_USB_OHCI_REGS_BASE nor CONFIG_SYS_USB_OHCI_SLOT_NAME. Drop these from platforms that we can.

---
 include/configs/at91sam9n12ek.h    | 5 -----
 include/configs/at91sam9x5ek.h     | 7 -------
 include/configs/ethernut5.h        | 5 -----
 include/configs/sama5d3_xplained.h | 5 -----
 include/configs/sama5d3xek.h       | 5 -----
 include/configs/smartweb.h         | 3 ---
 include/configs/snapper9260.h      | 3 ---
 include/configs/taurus.h           | 3 ---
 include/configs/usb_a9263.h        | 5 -----
 9 files changed, 41 deletions(-)
include/configs/at91sam9n12ek.h +0 -5
index 4fac0aad42c5..4d492988eba7 100644
@@ -39,11 +39,6 @@
 	"bootargs_nand=rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw\0"\
 	"bootargs_mmc=root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait\0"
 
-/* USB host */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_SYS_USB_OHCI_REGS_BASE	ATMEL_BASE_OHCI
-#endif
-
 /* SPL */
 
 #define CONFIG_SYS_MONITOR_LEN		(512 << 10)
include/configs/at91sam9x5ek.h +0 -7
index 758a91cdaa97..0e7665843dba 100644
@@ -38,13 +38,6 @@
 #define CONFIG_SYS_NAND_READY_PIN	AT91_PIN_PD5
 #endif
 
-/* USB */
-#ifdef CONFIG_CMD_USB
-#ifndef CONFIG_USB_EHCI_HCD
-#define CONFIG_SYS_USB_OHCI_REGS_BASE		ATMEL_BASE_OHCI
-#endif
-#endif
-
 /* SPL */
 
 #define CONFIG_SYS_MONITOR_LEN		(512 << 10)
include/configs/ethernut5.h +0 -5
index 529b9837318f..88a702f1af27 100644
@@ -59,11 +59,6 @@
 #define CONFIG_SYS_MMC_CD_PIN		AT91_PIO_PORTC, 8
 #endif
 
-/* USB */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_SYS_USB_OHCI_REGS_BASE	0x00500000
-#endif
-
 /* RTC */
 #if defined(CONFIG_CMD_DATE) || defined(CONFIG_CMD_SNTP)
 #define CONFIG_SYS_I2C_RTC_ADDR		0x51
include/configs/sama5d3_xplained.h +0 -5
index 22839d544a50..fad65cb11234 100644
@@ -37,11 +37,6 @@
 #define CONFIG_SYS_NAND_MASK_CLE	(1 << 22)
 #endif
 
-/* USB */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00600000
-#endif
-
 /* SPL */
 
 /* size of u-boot.bin to load */
include/configs/sama5d3xek.h +0 -5
index dc89148a0450..7bc3f91e77a8 100644
@@ -50,11 +50,6 @@
 #define CONFIG_SYS_NAND_MASK_CLE	(1 << 22)
 #endif
 
-/* USB */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_SYS_USB_OHCI_REGS_BASE		ATMEL_BASE_OHCI
-#endif
-
 /* SPL */
 
 #define CONFIG_SYS_MONITOR_LEN		(512 << 10)
include/configs/smartweb.h +0 -3
index 65bc3c672eed..1a3ac817fbfc 100644
@@ -66,9 +66,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 
-/* USB configuration */
-#define CONFIG_SYS_USB_OHCI_REGS_BASE	ATMEL_UHP_BASE
-
 /* USB DFU support */
 
 #define CONFIG_USB_GADGET_AT91
include/configs/snapper9260.h +0 -3
index 2b7afb5d25e5..7adb349f9a54 100644
@@ -37,9 +37,6 @@
 #define CONFIG_SYS_NAND_ENABLE_PIN	AT91_PIN_PC14
 #define CONFIG_SYS_NAND_READY_PIN	AT91_PIN_PC13
 
-/* USB */
-#define CONFIG_SYS_USB_OHCI_REGS_BASE	ATMEL_UHP_BASE
-
 /* GPIOs and IO expander */
 #define CONFIG_PCA953X
 #define CONFIG_SYS_I2C_PCA953X_ADDR	0x28
include/configs/taurus.h +0 -3
index ab2dc3d7146b..4758e23f5572 100644
@@ -63,10 +63,7 @@
 #define CONFIG_SYS_NAND_READY_PIN	AT91_PIN_PC13
 #endif
 
-/* USB */
 #if defined(CONFIG_BOARD_TAURUS)
-#define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00500000
-
 /* USB DFU support */
 
 #define CONFIG_USB_GADGET_AT91
include/configs/usb_a9263.h +0 -5
index 8cb8c609d052..e0dde1cc8365 100644
@@ -43,11 +43,6 @@
 #define CONFIG_SYS_NAND_READY_PIN		GPIO_PIN_PA(22)
 #endif
 
-/* USB */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00a00000
-#endif
-
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
 #define CONFIG_EXTRA_ENV_SETTINGS \
 
Signature · 1 line
2.25.1
author
#3 lore raw

PATCH 4/20 layerscape: Remove some unused CONFIG symbols

In reply to Tom Rini

All of these symbols are not referenced anywhere else in the code, so remove them.

---
 arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h | 4 ----
 arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h | 1 -
 arch/arm/include/asm/arch-ls102xa/config.h             | 6 +-----
 include/configs/MPC837XERDB.h                          | 1 -
 include/configs/ids8313.h                              | 1 -
 include/configs/mx6ullevk.h                            | 6 ------
 6 files changed, 1 insertion(+), 18 deletions(-)
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h +0 -4
index 4b0f554e3363..f2dbcdc8164f 100644
@@ -13,10 +13,8 @@
 
 #define CONFIG_SYS_DCSRBAR			0x20000000
 #define CONFIG_SYS_DCSR_DCFG_ADDR	(CONFIG_SYS_DCSRBAR + 0x00140000)
-#define CONFIG_SYS_DCSR_COP_CCP_ADDR	(CONFIG_SYS_DCSRBAR + 0x02008040)
 
 #define CONFIG_SYS_FSL_DDR_ADDR			(CONFIG_SYS_IMMR + 0x00080000)
-#define CONFIG_SYS_GIC400_ADDR			(CONFIG_SYS_IMMR + 0x00400000)
 #define CONFIG_SYS_IFC_ADDR			(CONFIG_SYS_IMMR + 0x00530000)
 #define SYS_FSL_QSPI_ADDR			(CONFIG_SYS_IMMR + 0x00550000)
 #define CONFIG_SYS_FSL_ESDHC_ADDR		(CONFIG_SYS_IMMR + 0x00560000)
@@ -26,9 +24,7 @@
 #define CONFIG_SYS_FSL_SCFG_ADDR		(CONFIG_SYS_IMMR + 0x00570000)
 #define CONFIG_SYS_FSL_BMAN_ADDR		(CONFIG_SYS_IMMR + 0x00890000)
 #define CONFIG_SYS_FSL_QMAN_ADDR		(CONFIG_SYS_IMMR + 0x00880000)
-#define CONFIG_SYS_FSL_FMAN_ADDR		(CONFIG_SYS_IMMR + 0x00a00000)
 #define CONFIG_SYS_FSL_SERDES_ADDR		(CONFIG_SYS_IMMR + 0x00ea0000)
-#define CONFIG_SYS_FSL_DCFG_ADDR		(CONFIG_SYS_IMMR + 0x00ee0000)
 #define CONFIG_SYS_FSL_CLK_ADDR			(CONFIG_SYS_IMMR + 0x00ee1000)
 #define CONFIG_SYS_NS16550_COM1			(CONFIG_SYS_IMMR + 0x011c0500)
 #define CONFIG_SYS_NS16550_COM2			(CONFIG_SYS_IMMR + 0x011c0600)
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h +0 -1
index 304cd7980a66..570397b3c04c 100644
@@ -52,7 +52,6 @@
 #define CONFIG_SYS_FSL_DCSR_DDR_ADDR		0x70012c000ULL
 #define CONFIG_SYS_FSL_DCSR_DDR2_ADDR		0x70012d000ULL
 #define CONFIG_SYS_FSL_DCSR_DDR3_ADDR		0x700132000ULL
-#define CONFIG_SYS_FSL_DCSR_DDR4_ADDR		0x700133000ULL
 
 #define I2C1_BASE_ADDR				(CONFIG_SYS_IMMR + 0x01000000)
 #define I2C2_BASE_ADDR				(CONFIG_SYS_IMMR + 0x01010000)
arch/arm/include/asm/arch-ls102xa/config.h +1 -5
index 796e2b218e56..e5f61ea4a6ee 100644
@@ -32,14 +32,11 @@
 #define CONFIG_SYS_FSL_RCPM_ADDR		(CONFIG_SYS_IMMR + 0x00ee2000)
 #define CONFIG_SYS_NS16550_COM1			(CONFIG_SYS_IMMR + 0x011c0500)
 #define CONFIG_SYS_NS16550_COM2			(CONFIG_SYS_IMMR + 0x011d0500)
-#define CONFIG_SYS_DCU_ADDR			(CONFIG_SYS_IMMR + 0x01ce0000)
 #define CONFIG_SYS_XHCI_USB1_ADDR		(CONFIG_SYS_IMMR + 0x02100000)
 
 #define CONFIG_SYS_FSL_SEC_OFFSET		0x00700000
 #define CONFIG_SYS_FSL_JR0_OFFSET		0x00710000
 #define CONFIG_SYS_TSEC1_OFFSET			0x01d10000
-#define CONFIG_SYS_TSEC2_OFFSET			0x01d50000
-#define CONFIG_SYS_TSEC3_OFFSET			0x01d90000
 #define CONFIG_SYS_MDIO1_OFFSET			0x01d24000
 
 #define TSEC_BASE_ADDR	(CONFIG_SYS_IMMR + CONFIG_SYS_TSEC1_OFFSET)
@@ -79,8 +76,7 @@
 #define AHCI_BASE_ADDR				(CONFIG_SYS_IMMR + 0x02200000)
 #ifdef CONFIG_DDR_SPD
 #define CONFIG_VERY_BIG_RAM
-#define CONFIG_SYS_LS1_DDR_BLOCK1_SIZE		((phys_size_t)2 << 30)
-#define CONFIG_MAX_MEM_MAPPED			CONFIG_SYS_LS1_DDR_BLOCK1_SIZE
+#define CONFIG_MAX_MEM_MAPPED			((phys_size_t)2 << 30)
 #endif
 
 #define CONFIG_SYS_FSL_IFC_BE
include/configs/MPC837XERDB.h +0 -1
index 3e4d66874df4..8517b0330f52 100644
@@ -227,7 +227,6 @@
 
 #ifdef CONFIG_TSEC2
 #define CONFIG_TSEC2_NAME		"TSEC1"
-#define CONFIG_SYS_TSEC2_OFFSET		0x25000
 #define TSEC2_PHY_ADDR			0x1c
 #define TSEC2_FLAGS			(TSEC_GIGABIT | TSEC_REDUCED)
 #define TSEC2_PHYIDX			0
include/configs/ids8313.h +0 -1
index e0994d12baf4..a8bb2090ec4a 100644
@@ -164,7 +164,6 @@
 
 #ifdef CONFIG_TSEC2
 #define CONFIG_TSEC2_NAME		"TSEC1"
-#define CONFIG_SYS_TSEC2_OFFSET	0x25000
 #define TSEC2_PHY_ADDR			0x3
 #define TSEC2_FLAGS			TSEC_GIGABIT
 #define TSEC2_PHYIDX			0
include/configs/mx6ullevk.h +0 -6
index db09db44d53c..00cc547b900c 100644
@@ -21,14 +21,8 @@
 /* MMC Configs */
 #ifdef CONFIG_FSL_USDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR	USDHC2_BASE_ADDR
-
-/* NAND pin conflicts with usdhc2 */
-#ifdef CONFIG_SYS_USE_NAND
-#define CONFIG_SYS_FSL_USDHC_NUM	1
-#else
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 #endif
-#endif
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
Signature · 1 line
2.25.1
author
#4 lore raw

PATCH 5/20 Convert CONFIG_SYS_UNIFY_CACHE to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_SYS_UNIFY_CACHE

---
 configs/M53017EVB_defconfig      | 1 +
 configs/M5329AFEE_defconfig      | 1 +
 configs/M5329BFEE_defconfig      | 1 +
 configs/M5373EVB_defconfig       | 1 +
 drivers/net/Kconfig              | 4 ++++
 include/configs/M53017EVB.h      | 2 --
 include/configs/M5329EVB.h       | 2 --
 include/configs/M5373EVB.h       | 2 --
 include/configs/astro_mcf5373l.h | 2 --
 9 files changed, 8 insertions(+), 8 deletions(-)
configs/M53017EVB_defconfig +1 -0
index 901a15d5061a..cec2520bdd78 100644
@@ -42,6 +42,7 @@ CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_DM_ETH=y
 CONFIG_MCFFEC=y
+CONFIG_SYS_UNIFY_CACHE=y
 CONFIG_MII=y
 CONFIG_MCFRTC=y
 CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
configs/M5329AFEE_defconfig +1 -0
index 0bce9d8f4229..9d55d5058e57 100644
@@ -41,6 +41,7 @@ CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_DM_ETH=y
 CONFIG_MCFFEC=y
+CONFIG_SYS_UNIFY_CACHE=y
 CONFIG_MII=y
 CONFIG_MCFRTC=y
 CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
configs/M5329BFEE_defconfig +1 -0
index efc7733b44c2..bd0cbddfb89c 100644
@@ -43,6 +43,7 @@ CONFIG_SYS_FLASH_CFI=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_DM_ETH=y
 CONFIG_MCFFEC=y
+CONFIG_SYS_UNIFY_CACHE=y
 CONFIG_MII=y
 CONFIG_MCFRTC=y
 CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
configs/M5373EVB_defconfig +1 -0
index 920a86fa9aa7..0a159eb170e2 100644
@@ -43,6 +43,7 @@ CONFIG_SYS_FLASH_CFI=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_DM_ETH=y
 CONFIG_MCFFEC=y
+CONFIG_SYS_UNIFY_CACHE=y
 CONFIG_MII=y
 CONFIG_MCFRTC=y
 CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
drivers/net/Kconfig +4 -0
index 40b5c8274e9e..cb891f5dbede 100644
@@ -409,6 +409,10 @@ config MCFFEC
 	  This driver supports the network interface units in the
 	  ColdFire family.
 
+config SYS_UNIFY_CACHE
+	depends on MCFFEC
+	bool "Invalidate icache during ethernet operations"
+
 config FSLDMAFEC
         bool "ColdFire DMA Ethernet Support"
 	depends on DM_ETH
include/configs/M53017EVB.h +0 -2
index b38260ed09aa..fd6aee127d87 100644
@@ -22,8 +22,6 @@
 
 #define CONFIG_WATCHDOG_TIMEOUT		5000
 
-#define CONFIG_SYS_UNIFY_CACHE
-
 #ifdef CONFIG_MCFFEC
 #	define CONFIG_SYS_DISCOVER_PHY
 #	define CONFIG_SYS_TX_ETH_BUFFER	8
include/configs/M5329EVB.h +0 -2
index c65f26cc091d..b7ccdd08ac4f 100644
@@ -22,8 +22,6 @@
 
 #define CONFIG_WATCHDOG_TIMEOUT	5000	/* timeout in milliseconds, max timeout is 6.71sec */
 
-#define CONFIG_SYS_UNIFY_CACHE
-
 #ifdef CONFIG_MCFFEC
 #	define CONFIG_SYS_DISCOVER_PHY
 /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
include/configs/M5373EVB.h +0 -2
index 7e45d3587979..06ee0748b930 100644
@@ -24,8 +24,6 @@
 
 #define CONFIG_WATCHDOG_TIMEOUT	3360	/* timeout in ms, max is 3.36 sec */
 
-#define CONFIG_SYS_UNIFY_CACHE
-
 #ifdef CONFIG_MCFFEC
 #	define CONFIG_SYS_DISCOVER_PHY
 /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
include/configs/astro_mcf5373l.h +0 -2
index 18e06076a4ab..a8265e961a26 100644
@@ -65,8 +65,6 @@
 #define CONFIG_SYS_CORE_SRAM_SIZE	0x8000
 #define CONFIG_SYS_CORE_SRAM		0x80000000
 
-#define CONFIG_SYS_UNIFY_CACHE
-
 /*
  * Define baudrate for UART1 (console output, tftp, ...)
  * default value of CONFIG_BAUDRATE for Sentec board: 19200 baud
Signature · 1 line
2.25.1
author
#5 lore raw

PATCH 6/20 Convert CONFIG_SYS_DISCOVER_PHY to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_SYS_DISCOVER_PHY

---
 drivers/net/Kconfig          |  5 +++++
 drivers/net/fsl_mcdmafec.c   |  8 --------
 drivers/net/mcffec.c         |  8 --------
 include/configs/M5208EVBE.h  |  9 ---------
 include/configs/M5235EVB.h   |  9 ---------
 include/configs/M5272C3.h    |  9 ---------
 include/configs/M5275EVB.h   |  9 ---------
 include/configs/M5282EVB.h   |  9 ---------
 include/configs/M53017EVB.h  |  7 -------
 include/configs/M5329EVB.h   |  9 ---------
 include/configs/M5373EVB.h   |  9 ---------
 include/configs/MCR3000.h    |  1 -
 include/configs/cobra5272.h  | 10 ----------
 include/configs/eb_cpu5282.h |  1 -
 include/configs/stmark2.h    |  8 --------
 15 files changed, 5 insertions(+), 106 deletions(-)
drivers/net/Kconfig +5 -0
index cb891f5dbede..b671e72580e2 100644
@@ -400,11 +400,14 @@ config FTGMAC100
 	  offers high-priority transmit queue for QoS and CoS
 	  applications.
 
+config SYS_DISCOVER_PHY
+	bool
 
 config MCFFEC
 	bool "ColdFire Ethernet Support"
 	depends on DM_ETH
 	select PHYLIB
+	select SYS_DISCOVER_PHY
 	help
 	  This driver supports the network interface units in the
 	  ColdFire family.
@@ -417,6 +420,7 @@ config FSLDMAFEC
         bool "ColdFire DMA Ethernet Support"
 	depends on DM_ETH
 	select PHYLIB
+	select SYS_DISCOVER_PHY
 	help
 	  This driver supports the network interface units in the
 	  ColdFire family.
@@ -732,6 +736,7 @@ config MPC8XX_FEC
 	bool "Fast Ethernet Controller on MPC8XX"
 	depends on MPC8xx
 	select MII
+	select SYS_DISCOVER_PHY
 	help
 	  This driver implements support for the Fast Ethernet Controller
 	  on MPC8XX
drivers/net/fsl_mcdmafec.c +0 -8
index e103f79305e7..6825f9e27c06 100644
@@ -243,16 +243,8 @@ static int fec_init(struct udevice *dev)
 	fecpin_setclear(info, 1);
 	fec_halt(dev);
 
-#if defined(CONFIG_CMD_MII) || defined (CONFIG_MII) || \
-	defined (CONFIG_SYS_DISCOVER_PHY)
-
 	mii_init();
 	set_fec_duplex_speed(fecp, info->dup_spd);
-#else
-#ifndef CONFIG_SYS_DISCOVER_PHY
-	set_fec_duplex_speed(fecp, (FECDUPLEX << 16) | FECSPEED);
-#endif				/* ifndef CONFIG_SYS_DISCOVER_PHY */
-#endif				/* CONFIG_CMD_MII || CONFIG_MII */
 
 	/* We use strictly polling mode only */
 	fecp->eimr = 0;
drivers/net/mcffec.c +0 -8
index cef9eecac214..4dd848932b96 100644
@@ -278,17 +278,9 @@ int mcffec_init(struct udevice *dev)
 	fecpin_setclear(info, 1);
 	fec_reset(info);
 
-#if defined(CONFIG_CMD_MII) || defined (CONFIG_MII) || \
-	defined (CONFIG_SYS_DISCOVER_PHY)
-
 	mii_init();
 
 	set_fec_duplex_speed(fecp, info->dup_spd);
-#else
-#ifndef CONFIG_SYS_DISCOVER_PHY
-	set_fec_duplex_speed(fecp, (FECDUPLEX << 16) | FECSPEED);
-#endif	/* ifndef CONFIG_SYS_DISCOVER_PHY */
-#endif	/* CONFIG_CMD_MII || CONFIG_MII */
 
 	/* We use strictly polling mode only */
 	fecp->eimr = 0;
include/configs/M5208EVBE.h +0 -9
index fec73ba3426a..14b35d7ef507 100644
@@ -17,15 +17,6 @@
 
 #define CONFIG_WATCHDOG_TIMEOUT		5000
 
-#ifdef CONFIG_MCFFEC
-#	define CONFIG_SYS_DISCOVER_PHY
-/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
-#	ifndef CONFIG_SYS_DISCOVER_PHY
-#		define FECDUPLEX	FULL
-#		define FECSPEED		_100BASET
-#	endif			/* CONFIG_SYS_DISCOVER_PHY */
-#endif
-
 /* I2C */
 
 #ifdef CONFIG_MCFFEC
include/configs/M5235EVB.h +0 -9
index ea89b03c66e3..762d1dd94b1c 100644
@@ -22,15 +22,6 @@
 
 #define CONFIG_WATCHDOG_TIMEOUT	5000	/* timeout in milliseconds, max timeout is 6.71sec */
 
-#ifdef CONFIG_MCFFEC
-#	define CONFIG_SYS_DISCOVER_PHY
-/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
-#	ifndef CONFIG_SYS_DISCOVER_PHY
-#		define FECDUPLEX	FULL
-#		define FECSPEED		_100BASET
-#	endif			/* CONFIG_SYS_DISCOVER_PHY */
-#endif
-
 /* I2C */
 #define CONFIG_SYS_I2C_PINMUX_REG	(gpio->par_qspi)
 #define CONFIG_SYS_I2C_PINMUX_CLR	~(GPIO_PAR_FECI2C_SCL_MASK | GPIO_PAR_FECI2C_SDA_MASK)
include/configs/M5272C3.h +0 -9
index 4a2b37653e08..2fa1e4356e3e 100644
@@ -31,15 +31,6 @@
 	. = DEFINED(env_offset) ? env_offset : .; \
 	env/embedded.o(.text);
 
-#ifdef CONFIG_MCFFEC
-#	define CONFIG_SYS_DISCOVER_PHY
-/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
-#	ifndef CONFIG_SYS_DISCOVER_PHY
-#		define FECDUPLEX	FULL
-#		define FECSPEED		_100BASET
-#	endif			/* CONFIG_SYS_DISCOVER_PHY */
-#endif
-
 #ifdef CONFIG_MCFFEC
 #	define CONFIG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
include/configs/M5275EVB.h +0 -9
index 5e6d0856246e..4f6fc6d8cb9f 100644
@@ -33,15 +33,6 @@
 
 /* Available command configuration */
 
-#ifdef CONFIG_MCFFEC
-#define CONFIG_SYS_DISCOVER_PHY
-/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
-#ifndef CONFIG_SYS_DISCOVER_PHY
-#define FECDUPLEX		FULL
-#define FECSPEED		_100BASET
-#endif
-#endif
-
 /* I2C */
 #define CONFIG_SYS_I2C_PINMUX_REG	(gpio_reg->par_feci2c)
 #define CONFIG_SYS_I2C_PINMUX_CLR	(0xFFF0)
include/configs/M5282EVB.h +0 -9
index bb6fbac68769..9f06f41ce11b 100644
@@ -29,15 +29,6 @@
 	. = DEFINED(env_offset) ? env_offset : .; \
 	env/embedded.o(.text*);
 
-#ifdef CONFIG_MCFFEC
-#	define CONFIG_SYS_DISCOVER_PHY
-/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
-#	ifndef CONFIG_SYS_DISCOVER_PHY
-#		define FECDUPLEX	FULL
-#		define FECSPEED		_100BASET
-#	endif			/* CONFIG_SYS_DISCOVER_PHY */
-#endif
-
 #ifdef CONFIG_MCFFEC
 #	define CONFIG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
include/configs/M53017EVB.h +0 -7
index fd6aee127d87..90b0d41078ad 100644
@@ -23,15 +23,8 @@
 #define CONFIG_WATCHDOG_TIMEOUT		5000
 
 #ifdef CONFIG_MCFFEC
-#	define CONFIG_SYS_DISCOVER_PHY
 #	define CONFIG_SYS_TX_ETH_BUFFER	8
 #	define CONFIG_SYS_FEC_BUF_USE_SRAM
-
-/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
-#	ifndef CONFIG_SYS_DISCOVER_PHY
-#		define FECDUPLEX	FULL
-#		define FECSPEED		_100BASET
-#	endif			/* CONFIG_SYS_DISCOVER_PHY */
 #endif
 
 #define CONFIG_SYS_RTC_CNT		(0x8000)
include/configs/M5329EVB.h +0 -9
index b7ccdd08ac4f..6eaa660e11fb 100644
@@ -22,15 +22,6 @@
 
 #define CONFIG_WATCHDOG_TIMEOUT	5000	/* timeout in milliseconds, max timeout is 6.71sec */
 
-#ifdef CONFIG_MCFFEC
-#	define CONFIG_SYS_DISCOVER_PHY
-/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
-#	ifndef CONFIG_SYS_DISCOVER_PHY
-#		define FECDUPLEX	FULL
-#		define FECSPEED		_100BASET
-#	endif			/* CONFIG_SYS_DISCOVER_PHY */
-#endif
-
 /* I2C */
 
 #ifdef CONFIG_MCFFEC
include/configs/M5373EVB.h +0 -9
index 06ee0748b930..2e3988f6c723 100644
@@ -24,15 +24,6 @@
 
 #define CONFIG_WATCHDOG_TIMEOUT	3360	/* timeout in ms, max is 3.36 sec */
 
-#ifdef CONFIG_MCFFEC
-#	define CONFIG_SYS_DISCOVER_PHY
-/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
-#	ifndef CONFIG_SYS_DISCOVER_PHY
-#		define FECDUPLEX	FULL
-#		define FECSPEED		_100BASET
-#	endif			/* CONFIG_SYS_DISCOVER_PHY */
-#endif
-
 /* I2C */
 
 #ifdef CONFIG_MCFFEC
include/configs/MCR3000.h +0 -1
index 01b33c77a88e..41ab86085083 100644
@@ -86,7 +86,6 @@
 /* environment is in FLASH */
 
 /* Ethernet configuration part */
-#define CONFIG_SYS_DISCOVER_PHY		1
 
 /* NAND configuration part */
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
include/configs/cobra5272.h +0 -10
index c926e6ac8ca2..dd7b6c08730c 100644
@@ -85,15 +85,6 @@
 	. = DEFINED(env_offset) ? env_offset : .; \
 	env/embedded.o(.text);
 
-#ifdef CONFIG_MCFFEC
-#	define CONFIG_SYS_DISCOVER_PHY
-/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
-#	ifndef CONFIG_SYS_DISCOVER_PHY
-#		define FECDUPLEX	FULL
-#		define FECSPEED		_100BASET
-#	endif			/* CONFIG_SYS_DISCOVER_PHY */
-#endif
-
 /*
  *-----------------------------------------------------------------------------
  * Define user parameters that have to be customized most likely
@@ -157,7 +148,6 @@ enter a valid image address in flash */
  * ---
  */
 
-#define CONFIG_SYS_DISCOVER_PHY
 #define CONFIG_SYS_ENET_BD_BASE	0x780000
 
 /*-----------------------------------------------------------------------
include/configs/eb_cpu5282.h +0 -1
index 615715750816..6e444c478922 100644
@@ -47,7 +47,6 @@
  *----------------------------------------------------------------------*/
 
 #ifdef CONFIG_MCFFEC
-#define CONFIG_SYS_DISCOVER_PHY
 #define CONFIG_OVERWRITE_ETHADDR_ONCE
 #endif
 
include/configs/stmark2.h +0 -8
index 797d9bbb4af1..d8a334868f31 100644
@@ -106,12 +106,4 @@
 #define CACR_STATUS			(CONFIG_SYS_INIT_RAM_ADDR + \
 					CONFIG_SYS_INIT_RAM_SIZE - 12)
 
-#ifdef CONFIG_MCFFEC
-#define CONFIG_SYS_DISCOVER_PHY
-/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
-#ifndef CONFIG_SYS_DISCOVER_PHY
-#define FECDUPLEX			FULL
-#define FECSPEED			_100BASET
-#endif /* CONFIG_SYS_DISCOVER_PHY */
-#endif
 #endif /* __STMARK2_CONFIG_H */
Signature · 1 line
2.25.1
author
#6 lore raw

PATCH 7/20 Convert CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS et al to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS

---
 arch/arm/mach-omap2/Kconfig       | 21 +++++++++++++++++++++
 include/configs/ti_omap4_common.h | 11 -----------
 include/configs/ti_omap5_common.h | 11 -----------
 3 files changed, 21 insertions(+), 22 deletions(-)
arch/arm/mach-omap2/Kconfig +21 -0
index 51d1db4a87b0..fa4104747673 100644
@@ -169,6 +169,27 @@ config TI_SECURE_EMIF_PROTECTED_REGION_SIZE
 	  using hardware memory firewalls. This value must be smaller than the
 	  TI_SECURE_EMIF_TOTAL_REGION_SIZE value.
 
+config SYS_AUTOMATIC_SDRAM_DETECTION
+	bool
+
+choice
+	depends on OMAP44XX || OMAP54XX
+	prompt "Static or dynamic DDR timing calculations"
+	default SYS_EMIF_PRECALCULATED_TIMING_REGS
+	help
+	  For the DDR timing information we can either dynamically determine
+	  the timings to use or use pre-determined timings (based on using the
+	  dynamic method).  Default to the static timing information.
+
+config SYS_EMIF_PRECALCULATED_TIMING_REGS
+	bool "Use precalcualted timing values"
+
+config SYS_DEFAULT_LPDDR2_TIMINGS
+	bool "Use default LPDDR2 timing values"
+	select SYS_AUTOMATIC_SDRAM_DETECTION
+
+endchoice
+
 source "arch/arm/mach-omap2/omap3/Kconfig"
 
 source "arch/arm/mach-omap2/omap4/Kconfig"
include/configs/ti_omap4_common.h +0 -11
index fcf282bc4c18..3d78972bfebb 100644
@@ -23,17 +23,6 @@
 /* Use General purpose timer 1 */
 #define CONFIG_SYS_TIMERBASE		GPT2_BASE
 
-/*
- * For the DDR timing information we can either dynamically determine
- * the timings to use or use pre-determined timings (based on using the
- * dynamic method.  Default to the static timing infomation.
- */
-#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
-#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
-#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
-#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
-#endif
-
 #include <configs/ti_armv7_omap.h>
 
 /*
include/configs/ti_omap5_common.h +0 -11
index f7f17d0f502c..a9d4cf905f8b 100644
@@ -19,17 +19,6 @@
 /* Use General purpose timer 1 */
 #define CONFIG_SYS_TIMERBASE		GPT2_BASE
 
-/*
- * For the DDR timing information we can either dynamically determine
- * the timings to use or use pre-determined timings (based on using the
- * dynamic method.  Default to the static timing infomation.
- */
-#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
-#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
-#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
-#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
-#endif
-
 #define CONFIG_PALMAS_POWER
 
 #include <linux/stringify.h>
Signature · 1 line
2.25.1
author
#7 lore raw

PATCH 8/20 Convert CONFIG_PALMAS_POWER to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_PALMAS_POWER

---
 configs/am57xx_evm_defconfig        | 1 +
 configs/am57xx_hs_evm_defconfig     | 1 +
 configs/am57xx_hs_evm_usb_defconfig | 1 +
 configs/dra7xx_evm_defconfig        | 1 +
 configs/dra7xx_hs_evm_defconfig     | 1 +
 configs/dra7xx_hs_evm_usb_defconfig | 1 +
 configs/omap5_uevm_defconfig        | 1 +
 drivers/power/Kconfig               | 4 ++++
 include/configs/ti_omap5_common.h   | 2 --
 9 files changed, 11 insertions(+), 2 deletions(-)
configs/am57xx_evm_defconfig +1 -0
index d82c66572cce..a077ef8ae24b 100644
@@ -107,6 +107,7 @@ CONFIG_DM_PMIC=y
 CONFIG_PMIC_PALMAS=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_PALMAS=y
+CONFIG_PALMAS_POWER=y
 CONFIG_DM_SCSI=y
 CONFIG_DM_SERIAL=y
 CONFIG_SPI=y
configs/am57xx_hs_evm_defconfig +1 -0
index 332091773015..e22c11d9807d 100644
@@ -97,6 +97,7 @@ CONFIG_DM_PMIC=y
 CONFIG_PMIC_PALMAS=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_PALMAS=y
+CONFIG_PALMAS_POWER=y
 CONFIG_DM_SCSI=y
 CONFIG_DM_SERIAL=y
 CONFIG_SPI=y
configs/am57xx_hs_evm_usb_defconfig +1 -0
index 014a3830df7e..fc1bc01c0629 100644
@@ -106,6 +106,7 @@ CONFIG_DM_PMIC=y
 CONFIG_PMIC_PALMAS=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_PALMAS=y
+CONFIG_PALMAS_POWER=y
 CONFIG_SCSI_AHCI_PLAT=y
 CONFIG_DM_SERIAL=y
 CONFIG_SPI=y
configs/dra7xx_evm_defconfig +1 -0
index aae84dc6adef..bd3ce11b79ff 100644
@@ -130,6 +130,7 @@ CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_DM_REGULATOR_PALMAS=y
 CONFIG_DM_REGULATOR_LP873X=y
+CONFIG_PALMAS_POWER=y
 CONFIG_DM_SCSI=y
 CONFIG_DM_SERIAL=y
 CONFIG_SPI=y
configs/dra7xx_hs_evm_defconfig +1 -0
index 51ffd2779c13..63b8f2b6fe77 100644
@@ -124,6 +124,7 @@ CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_DM_REGULATOR_PALMAS=y
 CONFIG_DM_REGULATOR_LP873X=y
+CONFIG_PALMAS_POWER=y
 CONFIG_DM_SCSI=y
 CONFIG_DM_SERIAL=y
 CONFIG_SPI=y
configs/dra7xx_hs_evm_usb_defconfig +1 -0
index 34dcdede9233..cd4b8bbce0a9 100644
@@ -113,6 +113,7 @@ CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_DM_REGULATOR_PALMAS=y
 CONFIG_DM_REGULATOR_LP873X=y
+CONFIG_PALMAS_POWER=y
 CONFIG_DM_SCSI=y
 CONFIG_DM_SERIAL=y
 CONFIG_SPI=y
configs/omap5_uevm_defconfig +1 -0
index 73d742ea1d2b..912dd91259c1 100644
@@ -54,6 +54,7 @@ CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_DM_ETH=y
+CONFIG_PALMAS_POWER=y
 CONFIG_SCSI=y
 CONFIG_SCSI_AHCI_PLAT=y
 CONFIG_CONS_INDEX=3
drivers/power/Kconfig +4 -0
index 0af53a6c67fe..bc47cf144dd0 100644
@@ -426,6 +426,10 @@ config POWER_MT6323
 	  This adds poweroff driver for mt6323
 	  this pmic is used on mt7623 / Bananapi R2
 
+config PALMAS_POWER
+	bool "Palmas power support"
+	depends on OMAP54XX
+
 config POWER_I2C
 	bool "I2C-based power control for legacy power"
 	depends on POWER_LEGACY
include/configs/ti_omap5_common.h +0 -2
index a9d4cf905f8b..24bbf9e7c2c6 100644
@@ -19,8 +19,6 @@
 /* Use General purpose timer 1 */
 #define CONFIG_SYS_TIMERBASE		GPT2_BASE
 
-#define CONFIG_PALMAS_POWER
-
 #include <linux/stringify.h>
 
 #include <asm/arch/cpu.h>
Signature · 1 line
2.25.1
author
#8 lore raw

PATCH 9/20 configs: Resync with savedefconfig

In reply to Tom Rini

Rsync all defconfig files using moveconfig.py

---
 configs/devkit8000_defconfig  |  4 +-
 configs/evb-ast2600_defconfig |  2 +-
 configs/imx8mn_evk_defconfig  |  3 --
 scripts/config_whitelist.txt  | 81 -----------------------------------
 4 files changed, 2 insertions(+), 88 deletions(-)
configs/devkit8000_defconfig +1 -3
index a5e9f614df18..ac3079447868 100644
@@ -69,11 +69,9 @@ CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_OF_TRANSLATE=y
-CONFIG_SYS_I2C_LEGACY=y
-CONFIG_SPL_SYS_I2C_LEGACY=y
+CONFIG_DM_I2C=y
 CONFIG_TWL4030_LED=y
 CONFIG_MMC_OMAP_HS=y
-CONFIG_DM_I2C=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_OMAP_ECCSCHEME_HAM1_CODE_HW=y
configs/evb-ast2600_defconfig +1 -1
index a91a53da4fc2..5c4d8426607c 100644
@@ -1,7 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_SPL_SYS_THUMB_BUILD=y
-CONFIG_SPL_LDSCRIPT="arch/arm/mach-aspeed/ast2600/u-boot-spl.lds"
 CONFIG_ARCH_ASPEED=y
 CONFIG_SYS_TEXT_BASE=0x80000000
 CONFIG_SYS_MALLOC_LEN=0x2000000
@@ -11,6 +10,7 @@ CONFIG_TARGET_EVB_AST2600=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
+CONFIG_SPL_LDSCRIPT="arch/arm/mach-aspeed/ast2600/u-boot-spl.lds"
 CONFIG_ENV_SIZE=0x10000
 CONFIG_DM_GPIO=y
 CONFIG_DEFAULT_DEVICE_TREE="ast2600-evb"
configs/imx8mn_evk_defconfig +0 -3
index 70d3d83e9a5d..6390a274e509 100644
@@ -59,9 +59,6 @@ CONFIG_CMD_FUSE=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_CMD_EXT4_WRITE=y
scripts/config_whitelist.txt +0 -81

244 lines not on this page · raw message

Signature · 1 line
2.25.1
author
#9 lore raw

PATCH 10/20 thunerx_88xx: Clean up config slightly.

In reply to Tom Rini

We don't use CONFIG_SYS_64BIT anywhere and can use CONFIG_TARGET_THUNDERX_88XX to build the device trees.

---
 arch/arm/dts/Makefile           | 2 +-
 include/configs/thunderx_88xx.h | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)
arch/arm/dts/Makefile +1 -1
index dadcfdf9add0..f592a46b3fb9 100644
@@ -412,7 +412,7 @@ dtb-$(CONFIG_AM43XX) += am437x-gp-evm.dtb am437x-sk-evm.dtb	\
 	am437x-cm-t43.dtb
 dtb-$(CONFIG_TARGET_AM3517_EVM) += am3517-evm.dtb
 dtb-$(CONFIG_TI816X) += dm8168-evm.dtb
-dtb-$(CONFIG_THUNDERX) += thunderx-88xx.dtb
+dtb-$(CONFIG_TARGET_THUNDERX_88XX) += thunderx-88xx.dtb
 
 dtb-$(CONFIG_ARCH_SOCFPGA) +=				\
 	socfpga_agilex_socdk.dtb			\
include/configs/thunderx_88xx.h +0 -4
index cc3891fd6dfd..cf2efdbe230b 100644
@@ -6,10 +6,6 @@
 #ifndef __THUNDERX_88XX_H__
 #define __THUNDERX_88XX_H__
 
-#define CONFIG_THUNDERX
-
-#define CONFIG_SYS_64BIT
-
 #define MEM_BASE			0x00500000
 
 #define CONFIG_SYS_LOWMEM_BASE		MEM_BASE
Signature · 1 line
2.25.1
author
#10 lore raw

PATCH 11/20 Convert CONFIG_SYS_83XX_DDR_USES_CS0 to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_SYS_83XX_DDR_USES_CS0

---
 README                           | 4 ----
 arch/powerpc/cpu/mpc83xx/Kconfig | 6 ++++++
 include/configs/MPC837XERDB.h    | 1 -
 3 files changed, 6 insertions(+), 5 deletions(-)
README +0 -4
index 6bdfca66d65f..efc75a3f75b9 100644
@@ -2074,10 +2074,6 @@ Low Level (hardware related) configuration options:
 - CONFIG_FSL_DDR_BIST
 		Enable built-in memory test for Freescale DDR controllers.
 
-- CONFIG_SYS_83XX_DDR_USES_CS0
-		Only for 83xx systems. If specified, then DDR should
-		be configured using CS0 and CS1 instead of CS2 and CS3.
-
 - CONFIG_RMII
 		Enable RMII mode for all FECs.
 		Note that this is a global option, we can't
arch/powerpc/cpu/mpc83xx/Kconfig +6 -0
index d1b9ae4c3c92..9a31604ba3e6 100644
@@ -11,6 +11,11 @@ config E300
 config SYS_CPU
 	default "mpc83xx"
 
+config SYS_83XX_DDR_USES_CS0
+	bool
+	help
+	  DDR should be configured using CS0 and CS1 instead of CS2 and CS3.
+
 choice
 	prompt "Target select"
 	optional
@@ -19,6 +24,7 @@ config TARGET_MPC837XERDB
 	bool "Support MPC837XERDB"
 	select ARCH_MPC837X
 	select BOARD_EARLY_INIT_F
+	select SYS_83XX_DDR_USES_CS0
 
 config TARGET_IDS8313
 	bool "Support ids8313"
include/configs/MPC837XERDB.h +0 -1
index 8517b0330f52..fc55e5c2f614 100644
@@ -61,7 +61,6 @@
  */
 #define CONFIG_SYS_SDRAM_BASE		0x00000000 /* DDR is system memory */
 #define CONFIG_SYS_DDR_SDRAM_CLK_CNTL	0x03000000
-#define CONFIG_SYS_83XX_DDR_USES_CS0
 
 #define CONFIG_SYS_DDRCDR_VALUE	(DDRCDR_DHC_EN | DDRCDR_ODT | DDRCDR_Q_DRN)
 
Signature · 1 line
2.25.1
author
#11 lore raw

PATCH 12/20 arm: Remove PXA architecture support

In reply to Tom Rini

With the last platform for this architecture removed, remove the rest of the architecture support as well.

---
 MAINTAINERS                               |    7 -
 README                                    |    7 -
 arch/arm/Kconfig                          |   14 +-
 arch/arm/Makefile                         |    2 -
 arch/arm/cpu/pxa/Makefile                 |   14 -
 arch/arm/cpu/pxa/cache.c                  |   58 -
 arch/arm/cpu/pxa/config.mk                |   18 -
 arch/arm/cpu/pxa/cpuinfo.c                |  139 --
 arch/arm/cpu/pxa/pxa2xx.c                 |  295 ---
 arch/arm/cpu/pxa/relocate.S               |   22 -
 arch/arm/cpu/pxa/start.S                  |   98 -
 arch/arm/cpu/pxa/timer.c                  |   16 -
 arch/arm/cpu/pxa/usb.c                    |   89 -
 arch/arm/include/asm/arch-pxa/bitfield.h  |  112 -
 arch/arm/include/asm/arch-pxa/config.h    |   22 -
 arch/arm/include/asm/arch-pxa/hardware.h  |   82 -
 arch/arm/include/asm/arch-pxa/pxa-regs.h  | 2635 ---------------------
 arch/arm/include/asm/arch-pxa/pxa.h       |   28 -
 arch/arm/include/asm/arch-pxa/regs-mmc.h  |  140 --
 arch/arm/include/asm/arch-pxa/regs-uart.h |   95 -
 arch/arm/include/asm/arch-pxa/regs-usb.h  |  146 --
 arch/arm/include/asm/config.h             |    2 -
 doc/develop/driver-model/serial-howto.rst |    9 -
 drivers/mmc/Kconfig                       |    8 -
 drivers/mmc/Makefile                      |    1 -
 drivers/mmc/pxa_mmc_gen.c                 |  531 -----
 drivers/serial/Kconfig                    |    6 -
 drivers/serial/Makefile                   |    1 -
 drivers/serial/serial_pxa.c               |  342 ---
 drivers/serial/usbtty.h                   |    2 -
 drivers/usb/gadget/Makefile               |    1 -
 drivers/usb/gadget/epautoconf.c           |    6 -
 drivers/usb/gadget/ether.c                |   25 +-
 drivers/usb/gadget/gadget_chips.h         |   17 -
 drivers/usb/gadget/pxa27x_udc.c           |  703 ------
 drivers/video/Makefile                    |    1 -
 drivers/video/pxa_lcd.c                   |  549 -----
 include/dm/platform_data/pxa_mmc_gen.h    |   22 -
 include/dm/platform_data/serial_pxa.h     |   40 -
 include/lcd.h                             |    4 +-
 include/pxa_lcd.h                         |   80 -
 include/usb/pxa27x_udc.h                  |   31 -
 42 files changed, 3 insertions(+), 6417 deletions(-)
 delete mode 100644 arch/arm/cpu/pxa/Makefile
 delete mode 100644 arch/arm/cpu/pxa/cache.c
 delete mode 100644 arch/arm/cpu/pxa/config.mk
 delete mode 100644 arch/arm/cpu/pxa/cpuinfo.c
 delete mode 100644 arch/arm/cpu/pxa/pxa2xx.c
 delete mode 100644 arch/arm/cpu/pxa/relocate.S
 delete mode 100644 arch/arm/cpu/pxa/start.S
 delete mode 100644 arch/arm/cpu/pxa/timer.c
 delete mode 100644 arch/arm/cpu/pxa/usb.c
 delete mode 100644 arch/arm/include/asm/arch-pxa/bitfield.h
 delete mode 100644 arch/arm/include/asm/arch-pxa/config.h
 delete mode 100644 arch/arm/include/asm/arch-pxa/hardware.h
 delete mode 100644 arch/arm/include/asm/arch-pxa/pxa-regs.h
 delete mode 100644 arch/arm/include/asm/arch-pxa/pxa.h
 delete mode 100644 arch/arm/include/asm/arch-pxa/regs-mmc.h
 delete mode 100644 arch/arm/include/asm/arch-pxa/regs-uart.h
 delete mode 100644 arch/arm/include/asm/arch-pxa/regs-usb.h
 delete mode 100644 drivers/mmc/pxa_mmc_gen.c
 delete mode 100644 drivers/serial/serial_pxa.c
 delete mode 100644 drivers/usb/gadget/pxa27x_udc.c
 delete mode 100644 drivers/video/pxa_lcd.c
 delete mode 100644 include/dm/platform_data/pxa_mmc_gen.h
 delete mode 100644 include/dm/platform_data/serial_pxa.h
 delete mode 100644 include/pxa_lcd.h
 delete mode 100644 include/usb/pxa27x_udc.h
MAINTAINERS +0 -7
index 5945ba1c7a9a..bcffa14d9af9 100644
@@ -348,13 +348,6 @@ S:	Maintained
 T:	git https://source.denx.de/u-boot/custodians/u-boot-marvell.git
 F:	drivers/serial/serial_mvebu_a3700.c
 
-ARM MARVELL PXA
-M:	Marek Vasut <[email protected]>
-S:	Maintained
-T:	git https://source.denx.de/u-boot/custodians/u-boot-pxa.git
-F:	arch/arm/cpu/pxa/
-F:	arch/arm/include/asm/arch-pxa/
-
 ARM MEDIATEK
 M:	Ryder Lee <[email protected]>
 M:	Weijie Gao <[email protected]>
README +0 -7
index efc75a3f75b9..ed8e807c8f33 100644
@@ -850,13 +850,6 @@ The following options need to be configured:
 		the appropriate value in Hz.
 
 - MMC Support:
-		The MMC controller on the Intel PXA is supported. To
-		enable this define CONFIG_MMC. The MMC can be
-		accessed from the boot prompt by mapping the device
-		to physical memory similar to flash. Command line is
-		enabled with CONFIG_CMD_MMC. The MMC driver also works with
-		the FAT fs. This is enabled with CONFIG_CMD_FAT.
-
 		CONFIG_SH_MMCIF
 		Support for Renesas on-chip MMCIF controller
 
arch/arm/Kconfig +1 -13
index 423fca27de6b..434c5e98fa36 100644
@@ -330,15 +330,6 @@ config CPU_V7R
 	select SYS_ARM_MPU
 	select SYS_CACHE_SHIFT_6
 
-config CPU_PXA
-	bool
-	select SYS_CACHE_SHIFT_5
-	imply SYS_ARM_MMU
-
-config CPU_PXA27X
-	bool
-	select CPU_PXA
-
 config CPU_SA1100
 	bool
 	select SYS_CACHE_SHIFT_5
@@ -354,7 +345,6 @@ config SYS_CPU
 	default "armv7" if CPU_V7A
 	default "armv7" if CPU_V7R
 	default "armv7m" if CPU_V7M
-	default "pxa" if CPU_PXA
 	default "sa1100" if CPU_SA1100
 	default "armv8" if ARM64
 
@@ -369,14 +359,12 @@ config SYS_ARM_ARCH
 	default 7 if CPU_V7A
 	default 7 if CPU_V7M
 	default 7 if CPU_V7R
-	default 5 if CPU_PXA
 	default 4 if CPU_SA1100
 	default 8 if ARM64
 
 choice
 	prompt "Select the ARM data write cache policy"
-	default SYS_ARM_CACHE_WRITETHROUGH if TARGET_BCMCYGNUS || \
-					      CPU_PXA || RZA1
+	default SYS_ARM_CACHE_WRITETHROUGH if TARGET_BCMCYGNUS || RZA1
 	default SYS_ARM_CACHE_WRITEBACK
 
 config SYS_ARM_CACHE_WRITEBACK
arch/arm/Makefile +0 -2
index 64c58f4c4a38..09fc31887880 100644
@@ -11,7 +11,6 @@ arch-$(CONFIG_CPU_ARM920T)	=-march=armv4t
 arch-$(CONFIG_CPU_ARM926EJS)	=-march=armv5te
 arch-$(CONFIG_CPU_ARM946ES)	=-march=armv5te
 arch-$(CONFIG_CPU_SA1100)	=-march=armv4
-arch-$(CONFIG_CPU_PXA)		=
 arch-$(CONFIG_CPU_ARM1136)	=-march=armv5t
 arch-$(CONFIG_CPU_ARM1176)	=-march=armv5t
 arch-$(CONFIG_CPU_V7A)		=$(call cc-option, -march=armv7-a, \
@@ -41,7 +40,6 @@ tune-$(CONFIG_CPU_ARM920T)	=
 tune-$(CONFIG_CPU_ARM926EJS)	=
 tune-$(CONFIG_CPU_ARM946ES)	=
 tune-$(CONFIG_CPU_SA1100)	=-mtune=strongarm1100
-tune-$(CONFIG_CPU_PXA)		=-mcpu=xscale
 tune-$(CONFIG_CPU_ARM1136)	=
 tune-$(CONFIG_CPU_ARM1176)	=
 tune-$(CONFIG_CPU_V7A)		=-mtune=generic-armv7-a
arch/arm/cpu/pxa/Makefile deleted +0 -14
deleted file mode 100644
index fab77325c799..000000000000
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, [email protected].
-
-extra-y	= start.o
-
-obj-$(CONFIG_CPU_PXA27X)	+= pxa2xx.o
-
-obj-y	+= cpuinfo.o
-obj-y	+= timer.o
-obj-y	+= usb.o
-obj-y	+= relocate.o
-obj-y	+= cache.o
arch/arm/cpu/pxa/cache.c deleted +0 -58

58 lines not on this page · raw message

arch/arm/cpu/pxa/config.mk deleted +0 -18
deleted file mode 100644
index e7b183674a2c..000000000000
@@ -1,18 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2002
-# Sysgo Real-Time Solutions, GmbH <www.elinos.com>
-# Marius Groeger <[email protected]>
-
-#
-# !WARNING!
-# The PXA's OneNAND SPL uses .text.0 and .text.1 segments to allow booting from
-# really small OneNAND memories where the mmap'd window is only 1KiB big. The
-# .text.0 contains only the bare minimum needed to load the real SPL into SRAM.
-# Add .text.0 and .text.1 into OBJFLAGS, so when the SPL is being objcopy'd,
-# they are not discarded.
-#
-
-#ifdef CONFIG_SPL_BUILD
-OBJCOPYFLAGS += -j .text.0 -j .text.1
-#endif
arch/arm/cpu/pxa/cpuinfo.c deleted +0 -139

139 lines not on this page · raw message

arch/arm/cpu/pxa/pxa2xx.c deleted +0 -295

295 lines not on this page · raw message

arch/arm/cpu/pxa/relocate.S deleted +0 -22
deleted file mode 100644
index 778cd45e9c26..000000000000
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- *  relocate - PXA270 vector relocation
- *
- *  Copyright (c) 2013  Albert ARIBAUD <[email protected]>
- */
-
-#include <linux/linkage.h>
-
-/*
- * The PXA SoC is very specific with respect to exceptions: it
- * does not provide RAM at the high vectors address (0xFFFF0000),
- * thus only the low address (0x00000000) is useable; but that is
- * in ROM, so let's avoid relocating the vectors.
- */
-	.section	.text.relocate_vectors,"ax",%progbits
-
-ENTRY(relocate_vectors)
-
-	bx	lr
-
-ENDPROC(relocate_vectors)
arch/arm/cpu/pxa/start.S deleted +0 -98

98 lines not on this page · raw message

arch/arm/cpu/pxa/timer.c deleted +0 -16
deleted file mode 100644
index 8e9d610441ee..000000000000
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Marvell PXA2xx/3xx timer driver
- *
- * Copyright (C) 2011 Marek Vasut <[email protected]>
- */
-
-#include <common.h>
-#include <init.h>
-#include <asm/io.h>
-
-int timer_init(void)
-{
-	writel(0, CONFIG_SYS_TIMER_COUNTER);
-	return 0;
-}
arch/arm/cpu/pxa/usb.c deleted +0 -89

89 lines not on this page · raw message

arch/arm/include/asm/arch-pxa/bitfield.h deleted +0 -112

112 lines not on this page · raw message

arch/arm/include/asm/arch-pxa/config.h deleted +0 -22
deleted file mode 100644
index 11effd47f5b9..000000000000
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2014 Andrew Ruder <[email protected]>
- */
-
-#ifndef _ASM_ARM_PXA_CONFIG_
-#define _ASM_ARM_PXA_CONFIG_
-
-#include <asm/arch/pxa-regs.h>
-
-/*
- * Generic timer support
- */
-#if defined(CONFIG_CPU_PXA27X) || defined(CONFIG_CPU_MONAHANS)
-#define	CONFIG_SYS_TIMER_RATE	3250000
-#else
-#error "Timer frequency unknown - please config PXA CPU type"
-#endif
-
-#define CONFIG_SYS_TIMER_COUNTER	OSCR
-
-#endif /* _ASM_ARM_PXA_CONFIG_ */
arch/arm/include/asm/arch-pxa/hardware.h deleted +0 -82

82 lines not on this page · raw message

arch/arm/include/asm/arch-pxa/pxa-regs.h deleted +0 -2635

1,958 lines not on this page · raw message

arch/arm/include/asm/arch-pxa/pxa.h deleted +0 -28
deleted file mode 100644
index 428a848e1573..000000000000

Lines of this file are not shown. View the raw message.

arch/arm/include/asm/arch-pxa/regs-mmc.h deleted +0 -140

140 lines not on this page · raw message

arch/arm/include/asm/arch-pxa/regs-uart.h deleted +0 -95

95 lines not on this page · raw message

arch/arm/include/asm/arch-pxa/regs-usb.h deleted +0 -146

146 lines not on this page · raw message

arch/arm/include/asm/config.h +0 -2
index 26f187779142..be44b7676429 100644

Lines of this file are not shown. View the raw message.

doc/develop/driver-model/serial-howto.rst +0 -9
index 8af79a90f46a..9da0e57eab69 100644

Lines of this file are not shown. View the raw message.

drivers/mmc/Kconfig +0 -8
index 9f8319c84602..0c317311f641 100644

Lines of this file are not shown. View the raw message.

drivers/mmc/Makefile +0 -1
index 962750930229..7c4243289c4d 100644

Lines of this file are not shown. View the raw message.

drivers/mmc/pxa_mmc_gen.c deleted +0 -531

531 lines not on this page · raw message

drivers/serial/Kconfig +0 -6
index 45c284a408d8..323a1da94929 100644

Lines of this file are not shown. View the raw message.

drivers/serial/Makefile +0 -1
index 51de06a78c58..eb7b8f23ee90 100644

Lines of this file are not shown. View the raw message.

drivers/serial/serial_pxa.c deleted +0 -342

342 lines not on this page · raw message

drivers/serial/usbtty.h +0 -2
index 05b3c01e5fc1..0d89fc085fb5 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/Makefile +0 -1
index d8de8efa0a4d..306dd3127f41 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/epautoconf.c +0 -6
index 01337d6511b3..bb0d2971d06b 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/ether.c +1 -24
index 430732865723..72b4f7f306ab 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/gadget_chips.h +0 -17
index 06e6a4894954..66ccd0541726 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/pxa27x_udc.c deleted +0 -703

703 lines not on this page · raw message

drivers/video/Makefile +0 -1
index 63d8dbe3c85f..7019b2639639 100644

Lines of this file are not shown. View the raw message.

drivers/video/pxa_lcd.c deleted +0 -549

549 lines not on this page · raw message

include/dm/platform_data/pxa_mmc_gen.h deleted +0 -22
deleted file mode 100644
index d15c1551f468..000000000000

Lines of this file are not shown. View the raw message.

include/dm/platform_data/serial_pxa.h deleted +0 -40
deleted file mode 100644
index e1a02aed28e0..000000000000

Lines of this file are not shown. View the raw message.

include/lcd.h +1 -3
index 7570e7ac609c..4f1806927811 100644

Lines of this file are not shown. View the raw message.

include/pxa_lcd.h deleted +0 -80

80 lines not on this page · raw message

include/usb/pxa27x_udc.h deleted +0 -31
deleted file mode 100644
index 07d14821c31d..000000000000

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.25.1

Part of the diff is not shown here. View the raw message.

Reviewed-by on v1 12/20
#12 lore raw

Re: [PATCH 12/20] arm: Remove PXA architecture support

Quoted 67 lines · Tom Rini

With the last platform for this architecture removed, remove the rest of the architecture support as well.

---
 MAINTAINERS                               |    7 -
 README                                    |    7 -
 arch/arm/Kconfig                          |   14 +-
 arch/arm/Makefile                         |    2 -
 arch/arm/cpu/pxa/Makefile                 |   14 -
 arch/arm/cpu/pxa/cache.c                  |   58 -
 arch/arm/cpu/pxa/config.mk                |   18 -
 arch/arm/cpu/pxa/cpuinfo.c                |  139 --
 arch/arm/cpu/pxa/pxa2xx.c                 |  295 ---
 arch/arm/cpu/pxa/relocate.S               |   22 -
 arch/arm/cpu/pxa/start.S                  |   98 -
 arch/arm/cpu/pxa/timer.c                  |   16 -
 arch/arm/cpu/pxa/usb.c                    |   89 -
 arch/arm/include/asm/arch-pxa/bitfield.h  |  112 -
 arch/arm/include/asm/arch-pxa/config.h    |   22 -
 arch/arm/include/asm/arch-pxa/hardware.h  |   82 -
 arch/arm/include/asm/arch-pxa/pxa-regs.h  | 2635 ---------------------
 arch/arm/include/asm/arch-pxa/pxa.h       |   28 -
 arch/arm/include/asm/arch-pxa/regs-mmc.h  |  140 --
 arch/arm/include/asm/arch-pxa/regs-uart.h |   95 -
 arch/arm/include/asm/arch-pxa/regs-usb.h  |  146 --
 arch/arm/include/asm/config.h             |    2 -
 doc/develop/driver-model/serial-howto.rst |    9 -
 drivers/mmc/Kconfig                       |    8 -
 drivers/mmc/Makefile                      |    1 -
 drivers/mmc/pxa_mmc_gen.c                 |  531 -----
 drivers/serial/Kconfig                    |    6 -
 drivers/serial/Makefile                   |    1 -
 drivers/serial/serial_pxa.c               |  342 ---
 drivers/serial/usbtty.h                   |    2 -
 drivers/usb/gadget/Makefile               |    1 -
 drivers/usb/gadget/epautoconf.c           |    6 -
 drivers/usb/gadget/ether.c                |   25 +-
 drivers/usb/gadget/gadget_chips.h         |   17 -
 drivers/usb/gadget/pxa27x_udc.c           |  703 ------
 drivers/video/Makefile                    |    1 -
 drivers/video/pxa_lcd.c                   |  549 -----
 include/dm/platform_data/pxa_mmc_gen.h    |   22 -
 include/dm/platform_data/serial_pxa.h     |   40 -
 include/lcd.h                             |    4 +-
 include/pxa_lcd.h                         |   80 -
 include/usb/pxa27x_udc.h                  |   31 -
 42 files changed, 3 insertions(+), 6417 deletions(-)
 delete mode 100644 arch/arm/cpu/pxa/Makefile
 delete mode 100644 arch/arm/cpu/pxa/cache.c
 delete mode 100644 arch/arm/cpu/pxa/config.mk
 delete mode 100644 arch/arm/cpu/pxa/cpuinfo.c
 delete mode 100644 arch/arm/cpu/pxa/pxa2xx.c
 delete mode 100644 arch/arm/cpu/pxa/relocate.S
 delete mode 100644 arch/arm/cpu/pxa/start.S
 delete mode 100644 arch/arm/cpu/pxa/timer.c
 delete mode 100644 arch/arm/cpu/pxa/usb.c
 delete mode 100644 arch/arm/include/asm/arch-pxa/bitfield.h
 delete mode 100644 arch/arm/include/asm/arch-pxa/config.h
 delete mode 100644 arch/arm/include/asm/arch-pxa/hardware.h
 delete mode 100644 arch/arm/include/asm/arch-pxa/pxa-regs.h
 delete mode 100644 arch/arm/include/asm/arch-pxa/pxa.h
 delete mode 100644 arch/arm/include/asm/arch-pxa/regs-mmc.h
 delete mode 100644 arch/arm/include/asm/arch-pxa/regs-uart.h
 delete mode 100644 arch/arm/include/asm/arch-pxa/regs-usb.h
Quoted 8 lines
 delete mode 100644 drivers/mmc/pxa_mmc_gen.c
 delete mode 100644 drivers/serial/serial_pxa.c
 delete mode 100644 drivers/usb/gadget/pxa27x_udc.c
 delete mode 100644 drivers/video/pxa_lcd.c
 delete mode 100644 include/dm/platform_data/pxa_mmc_gen.h
 delete mode 100644 include/dm/platform_data/serial_pxa.h
 delete mode 100644 include/pxa_lcd.h
 delete mode 100644 include/usb/pxa27x_udc.h
author
#13 lore raw

PATCH 13/20 Convert CONFIG_SYS_BOOK3E_HV to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_SYS_BOOK3E_HV

---
 arch/powerpc/cpu/mpc85xx/Kconfig          | 4 ++++
 configs/P2041RDB_NAND_defconfig           | 1 +
 configs/P2041RDB_SDCARD_defconfig         | 1 +
 configs/P2041RDB_SPIFLASH_defconfig       | 1 +
 configs/P2041RDB_defconfig                | 1 +
 configs/P3041DS_NAND_defconfig            | 1 +
 configs/P3041DS_SDCARD_defconfig          | 1 +
 configs/P3041DS_SPIFLASH_defconfig        | 1 +
 configs/P3041DS_defconfig                 | 1 +
 configs/P4080DS_SDCARD_defconfig          | 1 +
 configs/P4080DS_SPIFLASH_defconfig        | 1 +
 configs/P4080DS_defconfig                 | 1 +
 configs/P5040DS_NAND_defconfig            | 1 +
 configs/P5040DS_SDCARD_defconfig          | 1 +
 configs/P5040DS_SPIFLASH_defconfig        | 1 +
 configs/P5040DS_defconfig                 | 1 +
 configs/T1024RDB_NAND_defconfig           | 1 +
 configs/T1024RDB_SDCARD_defconfig         | 1 +
 configs/T1024RDB_SPIFLASH_defconfig       | 1 +
 configs/T1024RDB_defconfig                | 1 +
 configs/T1042D4RDB_NAND_defconfig         | 1 +
 configs/T1042D4RDB_SDCARD_defconfig       | 1 +
 configs/T1042D4RDB_SPIFLASH_defconfig     | 1 +
 configs/T1042D4RDB_defconfig              | 1 +
 configs/T2080QDS_NAND_defconfig           | 1 +
 configs/T2080QDS_SDCARD_defconfig         | 1 +
 configs/T2080QDS_SECURE_BOOT_defconfig    | 1 +
 configs/T2080QDS_SPIFLASH_defconfig       | 1 +
 configs/T2080QDS_SRIO_PCIE_BOOT_defconfig | 1 +
 configs/T2080QDS_defconfig                | 1 +
 configs/T2080RDB_NAND_defconfig           | 1 +
 configs/T2080RDB_SDCARD_defconfig         | 1 +
 configs/T2080RDB_SPIFLASH_defconfig       | 1 +
 configs/T2080RDB_defconfig                | 1 +
 configs/T2080RDB_revD_NAND_defconfig      | 1 +
 configs/T2080RDB_revD_SDCARD_defconfig    | 1 +
 configs/T2080RDB_revD_SPIFLASH_defconfig  | 1 +
 configs/T2080RDB_revD_defconfig           | 1 +
 configs/T4240RDB_SDCARD_defconfig         | 1 +
 configs/T4240RDB_defconfig                | 1 +
 configs/kmcent2_defconfig                 | 1 +
 include/configs/P2041RDB.h                | 1 -
 include/configs/T102xRDB.h                | 1 -
 include/configs/T104xRDB.h                | 1 -
 include/configs/T208xQDS.h                | 1 -
 include/configs/T208xRDB.h                | 1 -
 include/configs/T4240RDB.h                | 1 -
 include/configs/corenet_ds.h              | 1 -
 include/configs/kmcent2.h                 | 1 -
 49 files changed, 44 insertions(+), 8 deletions(-)
arch/powerpc/cpu/mpc85xx/Kconfig +4 -0
index e7003d3b647e..f4f5ebfe0c40 100644
@@ -1216,6 +1216,10 @@ config SYS_FSL_LBC_CLK_DIV
 config ENABLE_36BIT_PHYS
 	bool "Enable 36bit physical address space support"
 
+config SYS_BOOK3E_HV
+	bool "Category E.HV is supported"
+	depends on BOOKE
+
 config SYS_MPC85XX_NO_RESETVEC
 	bool "Discard resetvec section and move bootpg section up"
 	depends on MPC85xx
configs/P2041RDB_NAND_defconfig +1 -0
index 5063470d8547..459b9e6c5443 100644
@@ -8,6 +8,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P2041RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P2041RDB_SDCARD_defconfig +1 -0
index a64f8924dd2d..6ff6a4283069 100644
@@ -8,6 +8,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P2041RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P2041RDB_SPIFLASH_defconfig +1 -0
index f295174da527..a5872faa4741 100644
@@ -9,6 +9,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P2041RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P2041RDB_defconfig +1 -0
index e3dd1e93e323..247db8e0fef9 100644
@@ -9,6 +9,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P2041RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P3041DS_NAND_defconfig +1 -0
index 3e4cb5180ea5..91ad3ee30515 100644
@@ -8,6 +8,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P3041DS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P3041DS_SDCARD_defconfig +1 -0
index 66eb6c3f3d91..6ca91fe77ed2 100644
@@ -8,6 +8,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P3041DS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P3041DS_SPIFLASH_defconfig +1 -0
index 87c62be04f8d..13857b8208f8 100644
@@ -9,6 +9,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P3041DS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P3041DS_defconfig +1 -0
index d083c256b089..b587d525a266 100644
@@ -9,6 +9,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P3041DS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P4080DS_SDCARD_defconfig +1 -0
index ed6f3de96ec5..c88a869bc8f1 100644
@@ -8,6 +8,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P4080DS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P4080DS_SPIFLASH_defconfig +1 -0
index e77085ae3e2d..a627475420f6 100644
@@ -9,6 +9,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P4080DS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P4080DS_defconfig +1 -0
index 91aa75d9e1ce..82371ea9897b 100644
@@ -9,6 +9,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P4080DS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P5040DS_NAND_defconfig +1 -0
index 3a48362c3b52..be3d388484f5 100644
@@ -8,6 +8,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P5040DS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P5040DS_SDCARD_defconfig +1 -0
index 9aa293dc2292..4dcdb391e408 100644
@@ -8,6 +8,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P5040DS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P5040DS_SPIFLASH_defconfig +1 -0
index 6f0d51a7abfe..7620f4879a79 100644
@@ -9,6 +9,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P5040DS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P5040DS_defconfig +1 -0
index ae5f7b7ba348..68573a5c9821 100644
@@ -9,6 +9,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_P5040DS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/T1024RDB_NAND_defconfig +1 -0
index 30108b711f56..59ddb20a82e6 100644
@@ -13,6 +13,7 @@ CONFIG_SPL=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1024RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
configs/T1024RDB_SDCARD_defconfig +1 -0
index 1ff5faec9772..e92ef995520f 100644
@@ -14,6 +14,7 @@ CONFIG_SPL=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1024RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
configs/T1024RDB_SPIFLASH_defconfig +1 -0
index 62f06dd9e23a..95321ba42475 100644
@@ -16,6 +16,7 @@ CONFIG_SPL_SPI=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1024RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
configs/T1024RDB_defconfig +1 -0
index a0908ac83a78..5c30e9fe3765 100644
@@ -9,6 +9,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T1024RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/T1042D4RDB_NAND_defconfig +1 -0
index 0bfe868b3e65..260f5d7a64a7 100644
@@ -12,6 +12,7 @@ CONFIG_SPL=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1042D4RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
configs/T1042D4RDB_SDCARD_defconfig +1 -0
index e205717c79c0..99ff6fafbb90 100644
@@ -13,6 +13,7 @@ CONFIG_SPL=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1042D4RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
configs/T1042D4RDB_SPIFLASH_defconfig +1 -0
index f05e38f18775..29dca83a4d3b 100644
@@ -15,6 +15,7 @@ CONFIG_SPL_SPI=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T1042D4RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
configs/T1042D4RDB_defconfig +1 -0
index 44458015c24f..af7df9ee91c3 100644
@@ -8,6 +8,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T1042D4RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/T2080QDS_NAND_defconfig +1 -0
index f65304d1aefc..ddeffb600e8e 100644
@@ -12,6 +12,7 @@ CONFIG_SPL=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080QDS=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
configs/T2080QDS_SDCARD_defconfig +1 -0
index f5caa46bd25c..c9dfc4a7817c 100644
@@ -13,6 +13,7 @@ CONFIG_SPL=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080QDS=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
configs/T2080QDS_SECURE_BOOT_defconfig +1 -0
index fa3701eee994..5b4c74ca1e2a 100644
@@ -6,6 +6,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080QDS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_NXP_ESBC=y
 CONFIG_BOOTSCRIPT_HDR_ADDR=0xee020000
 CONFIG_PCIE1=y
configs/T2080QDS_SPIFLASH_defconfig +1 -0
index 08860ab5c402..5ac030097780 100644
@@ -15,6 +15,7 @@ CONFIG_SPL_SPI=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080QDS=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
configs/T2080QDS_SRIO_PCIE_BOOT_defconfig +1 -0
index 7a873c136013..5b0c8ccdc4e8 100644
@@ -7,6 +7,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080QDS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SRIO_PCIE_BOOT_SLAVE=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
configs/T2080QDS_defconfig +1 -0
index 7a7a5c760a05..12b31c5f1b23 100644
@@ -8,6 +8,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080QDS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/T2080RDB_NAND_defconfig +1 -0
index 0321170553ca..7d0b130dc034 100644
@@ -12,6 +12,7 @@ CONFIG_SPL=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
configs/T2080RDB_SDCARD_defconfig +1 -0
index b0b6515f1041..a74b10997570 100644
@@ -13,6 +13,7 @@ CONFIG_SPL=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
configs/T2080RDB_SPIFLASH_defconfig +1 -0
index e5a1d59cc337..ef99ce759294 100644
@@ -15,6 +15,7 @@ CONFIG_SPL_SPI=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
configs/T2080RDB_defconfig +1 -0
index b8768d5dd7fb..138032d28640 100644
@@ -8,6 +8,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/T2080RDB_revD_NAND_defconfig +1 -0
index 167069ae59a1..894d08e47f88 100644
@@ -12,6 +12,7 @@ CONFIG_SPL=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_T2080RDB_REV_D=y
configs/T2080RDB_revD_SDCARD_defconfig +1 -0
index bd126f9da9cd..72a8df6c9e55 100644
@@ -13,6 +13,7 @@ CONFIG_SPL=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_T2080RDB_REV_D=y
 CONFIG_PCIE1=y
configs/T2080RDB_revD_SPIFLASH_defconfig +1 -0
index e7ed84b855bf..a8b25b62f808 100644
@@ -15,6 +15,7 @@ CONFIG_SPL_SPI=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_T2080RDB_REV_D=y
 CONFIG_PCIE1=y
configs/T2080RDB_revD_defconfig +1 -0
index aca8704a8e93..368622de1e3d 100644
@@ -8,6 +8,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_T2080RDB_REV_D=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
configs/T4240RDB_SDCARD_defconfig +1 -0
index 514b41cd843a..0ee65e1aa1dd 100644
@@ -13,6 +13,7 @@ CONFIG_SPL=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
configs/T4240RDB_defconfig +1 -0
index 20eb620afb63..9f6398a433f8 100644
@@ -8,6 +8,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/kmcent2_defconfig +1 -0
index cd6fb9675b00..38d33c20dc99 100644
@@ -11,6 +11,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_KMCENT2=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
+CONFIG_SYS_BOOK3E_HV=y
 # CONFIG_DEEP_SLEEP is not set
 CONFIG_PCIE1=y
 CONFIG_KM_DEF_NETDEV="eth2"
include/configs/P2041RDB.h +0 -1
index e019c168434a..2dc7da621600 100644
@@ -25,7 +25,6 @@
 #endif
 
 /* High Level Configuration Options */
-#define CONFIG_SYS_BOOK3E_HV		/* Category E.HV supported */
 
 #ifndef CONFIG_RESET_VECTOR_ADDRESS
 #define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
include/configs/T102xRDB.h +0 -1
index a519b5a9355e..159002d1ed83 100644
@@ -14,7 +14,6 @@
 #include <linux/stringify.h>
 
 /* High Level Configuration Options */
-#define CONFIG_SYS_BOOK3E_HV		/* Category E.HV supported */
 
 #define CONFIG_SYS_FSL_CPC		/* Corenet Platform Cache */
 #define CONFIG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
include/configs/T104xRDB.h +0 -1
index 3a7c643cfc94..25d82db0f8e9 100644
@@ -53,7 +53,6 @@
 #endif
 
 /* High Level Configuration Options */
-#define CONFIG_SYS_BOOK3E_HV		/* Category E.HV supported */
 
 #ifndef CONFIG_RESET_VECTOR_ADDRESS
 #define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
include/configs/T208xQDS.h +0 -1
index eff22c18bb72..969e7f728feb 100644
@@ -21,7 +21,6 @@
 #endif
 
 /* High Level Configuration Options */
-#define CONFIG_SYS_BOOK3E_HV	/* Category E.HV supported */
 
 #define CONFIG_SYS_FSL_CPC	/* Corenet Platform Cache */
 #define CONFIG_SYS_NUM_CPC	CONFIG_SYS_NUM_DDR_CTLRS
include/configs/T208xRDB.h +0 -1
index ba9bfdd72f7e..098125989e95 100644
@@ -16,7 +16,6 @@
 #define CONFIG_ICS307_REFCLK_HZ 25000000  /* ICS307 ref clk freq */
 
 /* High Level Configuration Options */
-#define CONFIG_SYS_BOOK3E_HV	/* Category E.HV supported */
 
 #define CONFIG_SYS_FSL_CPC	/* Corenet Platform Cache */
 #define CONFIG_SYS_NUM_CPC	CONFIG_SYS_NUM_DDR_CTLRS
include/configs/T4240RDB.h +0 -1
index 12b479f9c773..6ec3c6a8c039 100644
@@ -34,7 +34,6 @@
 #endif /* CONFIG_RAMBOOT_PBL */
 
 /* High Level Configuration Options */
-#define CONFIG_SYS_BOOK3E_HV		/* Category E.HV supported */
 
 #ifndef CONFIG_RESET_VECTOR_ADDRESS
 #define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
include/configs/corenet_ds.h +0 -1
index 2252bf89543d..d8ad45688167 100644
@@ -28,7 +28,6 @@
 #endif
 
 /* High Level Configuration Options */
-#define CONFIG_SYS_BOOK3E_HV		/* Category E.HV supported */
 
 #ifndef CONFIG_RESET_VECTOR_ADDRESS
 #define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
include/configs/kmcent2.h +0 -1
index ed24733abf57..eafdc35c27bb 100644
@@ -133,7 +133,6 @@
 #define KM_I2C_DEBLOCK_SDA	21
 
 /* High Level Configuration Options */
-#define CONFIG_SYS_BOOK3E_HV		/* Category E.HV supported */
 #define CONFIG_FSL_CORENET		/* Freescale CoreNet platform */
 
 #define CONFIG_RESET_VECTOR_ADDRESS	0xebfffffc
Signature · 1 line
2.25.1
author
#14 lore raw

PATCH 14/20 Convert CONFIG_SYS_RAMBOOT to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_SYS_RAMBOOT

---
 arch/powerpc/cpu/mpc85xx/Kconfig | 1 +
 boot/Kconfig                     | 4 ++++
 include/configs/MPC837XERDB.h    | 6 ------
 include/configs/P1010RDB.h       | 6 ------
 include/configs/P2041RDB.h       | 4 ----
 include/configs/T102xRDB.h       | 4 ----
 include/configs/T104xRDB.h       | 4 ----
 include/configs/T208xQDS.h       | 4 ----
 include/configs/T208xRDB.h       | 4 ----
 include/configs/T4240RDB.h       | 4 ----
 include/configs/corenet_ds.h     | 4 ----
 include/configs/km/km-mpc83xx.h  | 8 --------
 include/configs/p1_p2_rdb_pc.h   | 2 --
 include/configs/qemu-ppce500.h   | 2 --
 14 files changed, 5 insertions(+), 52 deletions(-)
arch/powerpc/cpu/mpc85xx/Kconfig +1 -0
index f4f5ebfe0c40..9c5b1af8b591 100644
@@ -109,6 +109,7 @@ config TARGET_QEMU_PPCE500
 	bool "Support qemu-ppce500"
 	select ARCH_QEMU_E500
 	select PHYS_64BIT
+	select SYS_RAMBOOT
 	imply OF_HAS_PRIOR_STAGE
 
 config TARGET_T1024RDB
boot/Kconfig +4 -0
index ee0dc90e93cc..8e50eef727d9 100644
@@ -555,8 +555,12 @@ config CHROMEOS_VBOOT
 	  distinguishing between booting Chrome OS in a basic way (developer
 	  mode) and a full boot.
 
+config SYS_RAMBOOT
+	bool
+
 config RAMBOOT_PBL
 	bool "Freescale PBL(pre-boot loader) image format support"
+	select SYS_RAMBOOT
 	help
 	  Some SoCs use PBL to load RCW and/or pre-initialization instructions.
 	  For more details refer to doc/README.pblimage
include/configs/MPC837XERDB.h +0 -6
index fc55e5c2f614..b6621f9a0728 100644
@@ -126,12 +126,6 @@
  * The reserved memory
  */
 
-#if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
-#define CONFIG_SYS_RAMBOOT
-#else
-#undef	CONFIG_SYS_RAMBOOT
-#endif
-
 #define CONFIG_SYS_MONITOR_LEN	(512 * 1024) /* Reserve 512 kB for Mon */
 
 /*
include/configs/P1010RDB.h +0 -6
index aea744c826cc..b5e0e2901f0a 100644
@@ -342,12 +342,6 @@ extern unsigned long get_sdram_size(void);
 					FTIM2_GPCM_TWP(0x1f))
 #define CONFIG_SYS_CS3_FTIM3		0x0
 
-#if defined(CONFIG_RAMBOOT_SDCARD) || defined(CONFIG_RAMBOOT_SPIFLASH)
-#define CONFIG_SYS_RAMBOOT
-#else
-#undef CONFIG_SYS_RAMBOOT
-#endif
-
 #define CONFIG_SYS_INIT_RAM_LOCK
 #define CONFIG_SYS_INIT_RAM_ADDR	0xffd00000 /* stack in RAM */
 #define CONFIG_SYS_INIT_RAM_SIZE	0x00004000 /* End of used area in RAM */
include/configs/P2041RDB.h +0 -4
index 2dc7da621600..72dd39d2306e 100644
@@ -129,10 +129,6 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT	60000		/* Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT	500		/* Write Timeout (ms) */
 
-#if defined(CONFIG_RAMBOOT_PBL)
-#define CONFIG_SYS_RAMBOOT
-#endif
-
 /* Nand Flash */
 #ifdef CONFIG_NAND_FSL_ELBC
 #define CONFIG_SYS_NAND_BASE		0xffa00000
include/configs/T102xRDB.h +0 -4
index 159002d1ed83..a93e9d0b58ac 100644
@@ -287,10 +287,6 @@
 #define CONFIG_SYS_CS1_FTIM3		CONFIG_SYS_NAND_FTIM3
 #endif
 
-#if defined(CONFIG_RAMBOOT_PBL)
-#define CONFIG_SYS_RAMBOOT
-#endif
-
 #define CONFIG_HWCONFIG
 
 /* define to use L1 as initial stack */
include/configs/T104xRDB.h +0 -4
index 25d82db0f8e9..365640dffc14 100644
@@ -259,10 +259,6 @@
 #define CONFIG_SYS_CS1_FTIM3		CONFIG_SYS_NAND_FTIM3
 #endif
 
-#if defined(CONFIG_RAMBOOT_PBL)
-#define CONFIG_SYS_RAMBOOT
-#endif
-
 #define CONFIG_HWCONFIG
 
 /* define to use L1 as initial stack */
include/configs/T208xQDS.h +0 -4
index 969e7f728feb..2faec638e2dd 100644
@@ -267,10 +267,6 @@
 #define CONFIG_SYS_CS2_FTIM3		CONFIG_SYS_NAND_FTIM3
 #endif
 
-#if defined(CONFIG_RAMBOOT_PBL)
-#define CONFIG_SYS_RAMBOOT
-#endif
-
 #define CONFIG_HWCONFIG
 
 /* define to use L1 as initial stack */
include/configs/T208xRDB.h +0 -4
index 098125989e95..5ed9e1badb3b 100644
@@ -226,10 +226,6 @@
 #define CONFIG_SYS_CS1_FTIM3		CONFIG_SYS_NAND_FTIM3
 #endif
 
-#if defined(CONFIG_RAMBOOT_PBL)
-#define CONFIG_SYS_RAMBOOT
-#endif
-
 #define CONFIG_HWCONFIG
 
 /* define to use L1 as initial stack */
include/configs/T4240RDB.h +0 -4
index 6ec3c6a8c039..96e8ff4842b4 100644
@@ -321,10 +321,6 @@
 					FTIM2_GPCM_TWP(0x1f))
 #define CONFIG_SYS_CS3_FTIM3		0x0
 
-#if defined(CONFIG_RAMBOOT_PBL)
-#define CONFIG_SYS_RAMBOOT
-#endif
-
 /* I2C */
 #define I2C_MUX_PCA_ADDR_PRI		0x77 /* I2C bus multiplexer,primary */
 #define I2C_MUX_PCA_ADDR_SEC		0x76 /* I2C bus multiplexer,secondary */
include/configs/corenet_ds.h +0 -4
index d8ad45688167..66bd5cb9c0fe 100644
@@ -119,10 +119,6 @@
 #define CONFIG_SYS_FLASH_ERASE_TOUT	60000		/* Flash Erase Timeout (ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT	500		/* Flash Write Timeout (ms) */
 
-#if defined(CONFIG_RAMBOOT_PBL)
-#define CONFIG_SYS_RAMBOOT
-#endif
-
 /* Nand Flash */
 #ifdef CONFIG_NAND_FSL_ELBC
 #define CONFIG_SYS_NAND_BASE		0xffa00000
include/configs/km/km-mpc83xx.h +0 -8
index c8929814aaa9..9f76f48a5c6b 100644
@@ -25,10 +25,6 @@
  */
 #define CONFIG_SYS_FLASH_BASE		0xF0000000
 
-#if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
-#define CONFIG_SYS_RAMBOOT
-#endif
-
 /* Reserve 768 kB for Mon */
 #define CONFIG_SYS_MONITOR_LEN		(768 * 1024)
 
@@ -81,10 +77,6 @@
  * Environment
  */
 
-#ifndef CONFIG_SYS_RAMBOOT
-/* Address and size of Redundant Environment Sector	*/
-#endif /* CFG_SYS_RAMBOOT */
-
 /*
  * Environment Configuration
  */
include/configs/p1_p2_rdb_pc.h +0 -2
index 7c00f54dfd75..7410c60cbd2a 100644
@@ -423,8 +423,6 @@
 #ifdef CONFIG_TPL_BUILD
 #define SPL_ENV_ADDR		(CONFIG_SYS_INIT_L2_ADDR + (160 << 10))
 #endif
-#elif defined(CONFIG_SYS_RAMBOOT)
-#define SPL_ENV_ADDR		(CONFIG_SYS_MONITOR_BASE - 0x1000)
 #endif
 
 #define CONFIG_LOADS_ECHO		/* echo on for serial download */
include/configs/qemu-ppce500.h +0 -2
index 451ae0e1e6df..ce60a3c7421d 100644
@@ -9,8 +9,6 @@
 #ifndef __QEMU_PPCE500_H
 #define __QEMU_PPCE500_H
 
-#define CONFIG_SYS_RAMBOOT
-
 /* Needed to fill the ccsrbar pointer */
 
 /* Virtual address to CCSRBAR */
Signature · 1 line
2.25.1
author
#15 lore raw

PATCH 15/20 Convert CONFIG_SYS_FSL_CPC et al to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_SYS_FSL_CPC
CONFIG_SYS_CPC_REINIT_F

---
 README                                     | 4 ----
 arch/Kconfig.nxp                           | 1 +
 arch/powerpc/cpu/mpc85xx/Kconfig           | 9 +++++++++
 arch/powerpc/include/asm/fsl_secure_boot.h | 3 ---
 configs/P2041RDB_NAND_defconfig            | 1 +
 configs/P2041RDB_SDCARD_defconfig          | 1 +
 configs/P2041RDB_SPIFLASH_defconfig        | 1 +
 configs/P2041RDB_defconfig                 | 1 +
 configs/P3041DS_NAND_defconfig             | 1 +
 configs/P3041DS_SDCARD_defconfig           | 1 +
 configs/P3041DS_SPIFLASH_defconfig         | 1 +
 configs/P3041DS_defconfig                  | 1 +
 configs/P4080DS_SDCARD_defconfig           | 1 +
 configs/P4080DS_SPIFLASH_defconfig         | 1 +
 configs/P4080DS_defconfig                  | 1 +
 configs/P5040DS_NAND_defconfig             | 1 +
 configs/P5040DS_SDCARD_defconfig           | 1 +
 configs/P5040DS_SPIFLASH_defconfig         | 1 +
 configs/P5040DS_defconfig                  | 1 +
 configs/T1024RDB_NAND_defconfig            | 1 +
 configs/T1024RDB_SDCARD_defconfig          | 1 +
 configs/T1024RDB_SPIFLASH_defconfig        | 1 +
 configs/T1024RDB_defconfig                 | 1 +
 configs/T1042D4RDB_NAND_defconfig          | 1 +
 configs/T1042D4RDB_SDCARD_defconfig        | 1 +
 configs/T1042D4RDB_SPIFLASH_defconfig      | 1 +
 configs/T1042D4RDB_defconfig               | 1 +
 configs/T2080QDS_NAND_defconfig            | 1 +
 configs/T2080QDS_SDCARD_defconfig          | 1 +
 configs/T2080QDS_SECURE_BOOT_defconfig     | 1 +
 configs/T2080QDS_SPIFLASH_defconfig        | 1 +
 configs/T2080QDS_SRIO_PCIE_BOOT_defconfig  | 1 +
 configs/T2080QDS_defconfig                 | 1 +
 configs/T2080RDB_NAND_defconfig            | 1 +
 configs/T2080RDB_SDCARD_defconfig          | 1 +
 configs/T2080RDB_SPIFLASH_defconfig        | 1 +
 configs/T2080RDB_defconfig                 | 1 +
 configs/T2080RDB_revD_NAND_defconfig       | 1 +
 configs/T2080RDB_revD_SDCARD_defconfig     | 1 +
 configs/T2080RDB_revD_SPIFLASH_defconfig   | 1 +
 configs/T2080RDB_revD_defconfig            | 1 +
 configs/T4240RDB_SDCARD_defconfig          | 1 +
 configs/T4240RDB_defconfig                 | 1 +
 configs/kmcent2_defconfig                  | 1 +
 include/configs/P2041RDB.h                 | 1 -
 include/configs/T102xRDB.h                 | 1 -
 include/configs/T104xRDB.h                 | 1 -
 include/configs/T208xQDS.h                 | 1 -
 include/configs/T208xRDB.h                 | 1 -
 include/configs/T4240RDB.h                 | 1 -
 include/configs/corenet_ds.h               | 1 -
 include/configs/kmcent2.h                  | 1 -
 52 files changed, 50 insertions(+), 15 deletions(-)
README +0 -4
index ed8e807c8f33..dae467a4da09 100644
@@ -371,10 +371,6 @@ The following options need to be configured:
 		In this mode, a single differential clock is used to supply
 		clocks to the sysclock, ddrclock and usbclock.
 
-		CONFIG_SYS_CPC_REINIT_F
-		This CONFIG is defined when the CPC is configured as SRAM at the
-		time of U-Boot entry and is required to be re-initialized.
-
 - Generic CPU options:
 		CONFIG_SYS_BIG_ENDIAN, CONFIG_SYS_LITTLE_ENDIAN
 
arch/Kconfig.nxp +1 -0
index 5971ec5df4e6..d3ebbff43be1 100644
@@ -16,6 +16,7 @@ config CHAIN_OF_TRUST
 	select SHA_HW_ACCEL
 	select SHA_PROG_HW_ACCEL
 	select ENV_IS_NOWHERE
+	select SYS_CPC_REINIT_F if MPC85xx && !SYS_RAMBOOT
 	select CMD_EXT4 if ARM
 	select CMD_EXT4_WRITE if ARM
 	imply CMD_BLOB
arch/powerpc/cpu/mpc85xx/Kconfig +9 -0
index 9c5b1af8b591..915e28e11088 100644
@@ -1221,6 +1221,15 @@ config SYS_BOOK3E_HV
 	bool "Category E.HV is supported"
 	depends on BOOKE
 
+config SYS_CPC_REINIT_F
+	bool
+	help
+	  The CPC is configured as SRAM at the time of U-Boot entry and is
+	  required to be re-initialized.
+
+config SYS_FSL_CPC
+	bool "Corenet Platform Cache support"
+
 config SYS_MPC85XX_NO_RESETVEC
 	bool "Discard resetvec section and move bootpg section up"
 	depends on MPC85xx
arch/powerpc/include/asm/fsl_secure_boot.h +0 -3
index a96a1ac5d77e..3e707600f28f 100644
@@ -21,9 +21,6 @@
 	defined(CONFIG_TARGET_T1042D4RDB) || \
 	defined(CONFIG_TARGET_T1042RDB_PI) || \
 	defined(CONFIG_ARCH_T1024)
-#ifndef CONFIG_SYS_RAMBOOT
-#define CONFIG_SYS_CPC_REINIT_F
-#endif
 #undef CONFIG_SYS_INIT_L3_ADDR
 #define CONFIG_SYS_INIT_L3_ADDR			0xbff00000
 #endif
configs/P2041RDB_NAND_defconfig +1 -0
index 459b9e6c5443..4c453a7cd943 100644
@@ -9,6 +9,7 @@ CONFIG_TARGET_P2041RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P2041RDB_SDCARD_defconfig +1 -0
index 6ff6a4283069..b5f920b013e4 100644
@@ -9,6 +9,7 @@ CONFIG_TARGET_P2041RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P2041RDB_SPIFLASH_defconfig +1 -0
index a5872faa4741..ecf63e59c6b3 100644
@@ -10,6 +10,7 @@ CONFIG_TARGET_P2041RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P2041RDB_defconfig +1 -0
index 247db8e0fef9..e609dfcbf216 100644
@@ -10,6 +10,7 @@ CONFIG_TARGET_P2041RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P3041DS_NAND_defconfig +1 -0
index 91ad3ee30515..59fdc33ad47d 100644
@@ -9,6 +9,7 @@ CONFIG_TARGET_P3041DS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P3041DS_SDCARD_defconfig +1 -0
index 6ca91fe77ed2..17aa980518df 100644
@@ -9,6 +9,7 @@ CONFIG_TARGET_P3041DS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P3041DS_SPIFLASH_defconfig +1 -0
index 13857b8208f8..2be600a58478 100644
@@ -10,6 +10,7 @@ CONFIG_TARGET_P3041DS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P3041DS_defconfig +1 -0
index b587d525a266..f22719558fef 100644
@@ -10,6 +10,7 @@ CONFIG_TARGET_P3041DS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P4080DS_SDCARD_defconfig +1 -0
index c88a869bc8f1..2aba2228947a 100644
@@ -9,6 +9,7 @@ CONFIG_TARGET_P4080DS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P4080DS_SPIFLASH_defconfig +1 -0
index a627475420f6..9bfb0a88f11b 100644
@@ -10,6 +10,7 @@ CONFIG_TARGET_P4080DS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P4080DS_defconfig +1 -0
index 82371ea9897b..1d5f00d1c8b4 100644
@@ -10,6 +10,7 @@ CONFIG_TARGET_P4080DS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P5040DS_NAND_defconfig +1 -0
index be3d388484f5..741adc516229 100644
@@ -9,6 +9,7 @@ CONFIG_TARGET_P5040DS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P5040DS_SDCARD_defconfig +1 -0
index 4dcdb391e408..c10c94849e08 100644
@@ -9,6 +9,7 @@ CONFIG_TARGET_P5040DS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P5040DS_SPIFLASH_defconfig +1 -0
index 7620f4879a79..111ca1d4877e 100644
@@ -10,6 +10,7 @@ CONFIG_TARGET_P5040DS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/P5040DS_defconfig +1 -0
index 68573a5c9821..fd94afa762f6 100644
@@ -10,6 +10,7 @@ CONFIG_TARGET_P5040DS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/T1024RDB_NAND_defconfig +1 -0
index 59ddb20a82e6..a2648c4e526d 100644
@@ -14,6 +14,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T1024RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
configs/T1024RDB_SDCARD_defconfig +1 -0
index e92ef995520f..5cf089d99009 100644
@@ -15,6 +15,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T1024RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
configs/T1024RDB_SPIFLASH_defconfig +1 -0
index 95321ba42475..c7b2def55345 100644
@@ -17,6 +17,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T1024RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
configs/T1024RDB_defconfig +1 -0
index 5c30e9fe3765..9f1599fb6339 100644
@@ -10,6 +10,7 @@ CONFIG_TARGET_T1024RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/T1042D4RDB_NAND_defconfig +1 -0
index 260f5d7a64a7..695d752dd5e0 100644
@@ -13,6 +13,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T1042D4RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
configs/T1042D4RDB_SDCARD_defconfig +1 -0
index 99ff6fafbb90..7e925643a376 100644
@@ -14,6 +14,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T1042D4RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
configs/T1042D4RDB_SPIFLASH_defconfig +1 -0
index 29dca83a4d3b..bfae94210dab 100644
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T1042D4RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
configs/T1042D4RDB_defconfig +1 -0
index af7df9ee91c3..3063157a7f66 100644
@@ -9,6 +9,7 @@ CONFIG_TARGET_T1042D4RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/T2080QDS_NAND_defconfig +1 -0
index ddeffb600e8e..8392299c9d4b 100644
@@ -13,6 +13,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080QDS=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
configs/T2080QDS_SDCARD_defconfig +1 -0
index c9dfc4a7817c..d043c8f793d9 100644
@@ -14,6 +14,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080QDS=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
configs/T2080QDS_SECURE_BOOT_defconfig +1 -0
index 5b4c74ca1e2a..2fc4e16cfe24 100644
@@ -7,6 +7,7 @@ CONFIG_TARGET_T2080QDS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_NXP_ESBC=y
 CONFIG_BOOTSCRIPT_HDR_ADDR=0xee020000
 CONFIG_PCIE1=y
configs/T2080QDS_SPIFLASH_defconfig +1 -0
index 5ac030097780..daaccc62f3b9 100644
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080QDS=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
configs/T2080QDS_SRIO_PCIE_BOOT_defconfig +1 -0
index 5b0c8ccdc4e8..2228c64d10f1 100644
@@ -8,6 +8,7 @@ CONFIG_TARGET_T2080QDS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_SRIO_PCIE_BOOT_SLAVE=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
configs/T2080QDS_defconfig +1 -0
index 12b31c5f1b23..fbfbab84a185 100644
@@ -9,6 +9,7 @@ CONFIG_TARGET_T2080QDS=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/T2080RDB_NAND_defconfig +1 -0
index 7d0b130dc034..c6a2b6214138 100644
@@ -13,6 +13,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
configs/T2080RDB_SDCARD_defconfig +1 -0
index a74b10997570..e161f9ec623f 100644
@@ -14,6 +14,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
configs/T2080RDB_SPIFLASH_defconfig +1 -0
index ef99ce759294..b5ede3003959 100644
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
configs/T2080RDB_defconfig +1 -0
index 138032d28640..8df5b3db2904 100644
@@ -9,6 +9,7 @@ CONFIG_TARGET_T2080RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/T2080RDB_revD_NAND_defconfig +1 -0
index 894d08e47f88..1035ae8980e4 100644
@@ -13,6 +13,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_SPL_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_T2080RDB_REV_D=y
configs/T2080RDB_revD_SDCARD_defconfig +1 -0
index 72a8df6c9e55..1de3526028b1 100644
@@ -14,6 +14,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_T2080RDB_REV_D=y
 CONFIG_PCIE1=y
configs/T2080RDB_revD_SPIFLASH_defconfig +1 -0
index a8b25b62f808..af8888982bfc 100644
@@ -16,6 +16,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T2080RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_T2080RDB_REV_D=y
 CONFIG_PCIE1=y
configs/T2080RDB_revD_defconfig +1 -0
index 368622de1e3d..e4eaa75d3024 100644
@@ -9,6 +9,7 @@ CONFIG_TARGET_T2080RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_T2080RDB_REV_D=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
configs/T4240RDB_SDCARD_defconfig +1 -0
index 0ee65e1aa1dd..583b2edc4c04 100644
@@ -14,6 +14,7 @@ CONFIG_MPC85xx=y
 CONFIG_TARGET_T4240RDB=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_SYS_MPC85XX_NO_RESETVEC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
configs/T4240RDB_defconfig +1 -0
index 9f6398a433f8..c3216474c312 100644
@@ -9,6 +9,7 @@ CONFIG_TARGET_T4240RDB=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 CONFIG_PCIE1=y
 CONFIG_PCIE2=y
 CONFIG_PCIE3=y
configs/kmcent2_defconfig +1 -0
index 38d33c20dc99..bcecb88e4d10 100644
@@ -12,6 +12,7 @@ CONFIG_TARGET_KMCENT2=y
 CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
 CONFIG_ENABLE_36BIT_PHYS=y
 CONFIG_SYS_BOOK3E_HV=y
+CONFIG_SYS_FSL_CPC=y
 # CONFIG_DEEP_SLEEP is not set
 CONFIG_PCIE1=y
 CONFIG_KM_DEF_NETDEV="eth2"
include/configs/P2041RDB.h +0 -1
index 72dd39d2306e..27889e3033cf 100644
@@ -30,7 +30,6 @@
 #define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
-#define CONFIG_SYS_FSL_CPC		/* Corenet Platform Cache */
 #define CONFIG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
 
 #define CONFIG_SYS_SRIO
include/configs/T102xRDB.h +0 -1
index a93e9d0b58ac..aa80d400bd98 100644
@@ -15,7 +15,6 @@
 
 /* High Level Configuration Options */
 
-#define CONFIG_SYS_FSL_CPC		/* Corenet Platform Cache */
 #define CONFIG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
 
 #ifdef CONFIG_RAMBOOT_PBL
include/configs/T104xRDB.h +0 -1
index 365640dffc14..2fb181090b5d 100644
@@ -58,7 +58,6 @@
 #define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
-#define CONFIG_SYS_FSL_CPC		/* Corenet Platform Cache */
 #define CONFIG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
 
 /*
include/configs/T208xQDS.h +0 -1
index 2faec638e2dd..84dfc8948194 100644
@@ -22,7 +22,6 @@
 
 /* High Level Configuration Options */
 
-#define CONFIG_SYS_FSL_CPC	/* Corenet Platform Cache */
 #define CONFIG_SYS_NUM_CPC	CONFIG_SYS_NUM_DDR_CTLRS
 
 #ifdef CONFIG_RAMBOOT_PBL
include/configs/T208xRDB.h +0 -1
index 5ed9e1badb3b..716e9c3d5566 100644
@@ -17,7 +17,6 @@
 
 /* High Level Configuration Options */
 
-#define CONFIG_SYS_FSL_CPC	/* Corenet Platform Cache */
 #define CONFIG_SYS_NUM_CPC	CONFIG_SYS_NUM_DDR_CTLRS
 
 #ifdef CONFIG_RAMBOOT_PBL
include/configs/T4240RDB.h +0 -1
index 96e8ff4842b4..e697d8490c94 100644
@@ -39,7 +39,6 @@
 #define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
-#define CONFIG_SYS_FSL_CPC		/* Corenet Platform Cache */
 #define CONFIG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
 
 /*
include/configs/corenet_ds.h +0 -1
index 66bd5cb9c0fe..d1a5d866d2d0 100644
@@ -33,7 +33,6 @@
 #define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
 #endif
 
-#define CONFIG_SYS_FSL_CPC		/* Corenet Platform Cache */
 #define CONFIG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
 
 /*
include/configs/kmcent2.h +0 -1
index eafdc35c27bb..ff9d7d59a390 100644
@@ -137,7 +137,6 @@
 
 #define CONFIG_RESET_VECTOR_ADDRESS	0xebfffffc
 
-#define CONFIG_SYS_FSL_CPC		/* Corenet Platform Cache */
 #define CONFIG_SYS_NUM_CPC		CONFIG_SYS_NUM_DDR_CTLRS
 
 /* Environment in parallel NOR-Flash */
Signature · 1 line
2.25.1
author
#16 lore raw

PATCH 16/20 Convert CONFIG_SYS_BOOT_RAMDISK_HIGH to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_SYS_BOOT_RAMDISK_HIGH

---
 README                               | 5 -----
 arch/arc/include/asm/config.h        | 2 --
 arch/arm/include/asm/config.h        | 2 --
 arch/m68k/include/asm/config.h       | 2 --
 arch/microblaze/include/asm/config.h | 2 --
 arch/mips/include/asm/config.h       | 2 --
 arch/powerpc/include/asm/config.h    | 2 --
 arch/riscv/include/asm/config.h      | 2 --
 arch/x86/include/asm/config.h        | 2 --
 boot/Kconfig                         | 8 ++++++++
 scripts/config_whitelist.txt         | 1 -
 11 files changed, 8 insertions(+), 22 deletions(-)
README +0 -5
index dae467a4da09..fb0284d4ecb6 100644
@@ -1754,11 +1754,6 @@ Configuration Settings:
 		CONFIG_SYS_BOOTMAPSZ.  If CONFIG_SYS_BOOTMAPSZ is undefined,
 		then the value in "bootm_size" will be used instead.
 
-- CONFIG_SYS_BOOT_RAMDISK_HIGH:
-		Enable initrd_high functionality.  If defined then the
-		initrd_high feature is enabled and the bootm ramdisk subcommand
-		is enabled.
-
 - CONFIG_SYS_BOOT_GET_CMDLINE:
 		Enables allocating and saving kernel cmdline in space between
 		"bootm_low" and "bootm_low" + BOOTMAPSZ.
arch/arc/include/asm/config.h +0 -2
index 46e94be141b9..afdfcaa78b57 100644
@@ -6,6 +6,4 @@
 #ifndef __ASM_ARC_CONFIG_H_
 #define __ASM_ARC_CONFIG_H_
 
-#define CONFIG_SYS_BOOT_RAMDISK_HIGH
-
 #endif /*__ASM_ARC_CONFIG_H_ */
arch/arm/include/asm/config.h +0 -2
index be44b7676429..5870412c4390 100644
@@ -6,8 +6,6 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#define CONFIG_SYS_BOOT_RAMDISK_HIGH
-
 #if defined(CONFIG_ARCH_LS1021A) || \
 	defined(CONFIG_FSL_LAYERSCAPE)
 #include <asm/arch/config.h>
arch/m68k/include/asm/config.h +0 -2
index 221eb93d58bc..bad0026648a1 100644
@@ -6,6 +6,4 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#define CONFIG_SYS_BOOT_RAMDISK_HIGH
-
 #endif
arch/microblaze/include/asm/config.h +0 -2
index 221eb93d58bc..bad0026648a1 100644
@@ -6,6 +6,4 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#define CONFIG_SYS_BOOT_RAMDISK_HIGH
-
 #endif
arch/mips/include/asm/config.h +0 -2
index 221eb93d58bc..bad0026648a1 100644
@@ -6,6 +6,4 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#define CONFIG_SYS_BOOT_RAMDISK_HIGH
-
 #endif
arch/powerpc/include/asm/config.h +0 -2
index 059ffe1fd4f9..79fe567b5875 100644
@@ -14,8 +14,6 @@
   #define HWCONFIG_BUFFER_SIZE 256
 #endif
 
-#define CONFIG_SYS_BOOT_RAMDISK_HIGH
-
 #ifndef CONFIG_MAX_MEM_MAPPED
 #if	defined(CONFIG_E500)		|| \
 	defined(CONFIG_MPC86xx)		|| \
arch/riscv/include/asm/config.h +0 -2
index d91100753769..c55c85d4e6cd 100644
@@ -7,6 +7,4 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#define CONFIG_SYS_BOOT_RAMDISK_HIGH
-
 #endif
arch/x86/include/asm/config.h +0 -2
index 221eb93d58bc..bad0026648a1 100644
@@ -6,6 +6,4 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#define CONFIG_SYS_BOOT_RAMDISK_HIGH
-
 #endif
boot/Kconfig +8 -0
index 8e50eef727d9..924845887975 100644
@@ -606,6 +606,14 @@ config SYS_FSL_PBL_RCW
 	  Enables addition of RCW (Power on reset configuration) in built image.
 	  Please refer doc/README.pblimage for more details.
 
+config SYS_BOOT_RAMDISK_HIGH
+	depends on CMD_BOOTM || CMD_BOOTI || CMD_BOOTZ
+	depends on !(NIOS2 || SANDBOX || SH || XTENSA)
+	def_bool y
+	help
+	  Enable initrd_high functionality.  If defined then the initrd_high
+	  feature is enabled and the boot* ramdisk subcommand is enabled.
+
 endmenu		# Boot images
 
 menu "Boot timing"
scripts/config_whitelist.txt +0 -1
index 2b792a90692d..f2181353ea71 100644
@@ -502,7 +502,6 @@ CONFIG_SYS_BOOTCOUNT_LE
 CONFIG_SYS_BOOTMAPSZ
 CONFIG_SYS_BOOTM_LEN
 CONFIG_SYS_BOOT_BLOCK
-CONFIG_SYS_BOOT_RAMDISK_HIGH
 CONFIG_SYS_CACHE_ACR0
 CONFIG_SYS_CACHE_ACR1
 CONFIG_SYS_CACHE_ACR2
Signature · 1 line
2.25.1
author
#17 lore raw

PATCH 17/20 mx*sabresd: Reference CONFIG_SYS_AUXCORE_BOOTDATA value directly

In reply to Tom Rini

As this is used in the environment, reference it directly rather than as a CONFIG value.

Cc Fabio Estevam <[email protected]>
Cc Adrian Alonso <[email protected]>

---
An alternative would be to move to text file environments (which would be good to do regardless) and control this via an environmental variable if desired. Or introduce a new CONFIG symbol in Kconfig.

---
 include/configs/mx6sxsabresd.h | 4 +---
 include/configs/mx7dsabresd.h  | 5 +----
 2 files changed, 2 insertions(+), 7 deletions(-)
include/configs/mx6sxsabresd.h +1 -3
index 58d550fee9ec..570e2ce687ac 100644
@@ -19,8 +19,6 @@
 #define CONFIG_MXC_UART_BASE		UART1_BASE
 
 #ifdef CONFIG_IMX_BOOTAUX
-/* Set to QSPI2 B flash at default */
-#define CONFIG_SYS_AUXCORE_BOOTDATA 0x78000000
 
 #define UPDATE_M4_ENV \
 	"m4image=m4_qspi.bin\0" \
@@ -35,7 +33,7 @@
 				"sf write ${loadaddr} 0x0 ${filesize}; " \
 			"fi; " \
 		"fi\0" \
-	"m4boot=sf probe 1:0; bootaux "__stringify(CONFIG_SYS_AUXCORE_BOOTDATA)"\0"
+	"m4boot=sf probe 1:0; bootaux 0x78000000\0"
 #else
 #define UPDATE_M4_ENV ""
 #endif
include/configs/mx7dsabresd.h +1 -4
index a6b8c275fe77..b96341a587c4 100644
@@ -12,10 +12,7 @@
 
 #define PHYS_SDRAM_SIZE			SZ_1G
 
-
 #ifdef CONFIG_IMX_BOOTAUX
-/* Set to QSPI1 A flash at default */
-#define CONFIG_SYS_AUXCORE_BOOTDATA 0x60000000
 
 #define UPDATE_M4_ENV \
 	"m4image=m4_qspi.bin\0" \
@@ -30,7 +27,7 @@
 				"sf write ${loadaddr} 0x0 ${filesize}; " \
 			"fi; " \
 		"fi\0" \
-	"m4boot=sf probe 0:0; bootaux "__stringify(CONFIG_SYS_AUXCORE_BOOTDATA)"\0"
+	"m4boot=sf probe 0:0; bootaux 0x60000000\0"
 #else
 #define UPDATE_M4_ENV ""
 #endif
Signature · 1 line
2.25.1
author
#18 lore raw

PATCH 18/20 kmcoge5ne: Move BFTIC3 CONFIG references to their usage

In reply to Tom Rini

We only reference CONFIG_SYS_BFTIC3_BASE in one location. Move the comment to where we reference it, and use the value directly.

Cc Holger Brunck <[email protected]>
Cc Heiko Schocher <[email protected]>
---
 board/keymile/km83xx/km83xx.c | 6 ++++--
 include/configs/kmcoge5ne.h   | 6 ------
 2 files changed, 4 insertions(+), 8 deletions(-)
board/keymile/km83xx/km83xx.c +4 -2
index ecc8c786b6b8..8a0b17585663 100644
@@ -102,8 +102,10 @@ int misc_init_r(void)
 int last_stage_init(void)
 {
 #if defined(CONFIG_TARGET_KMCOGE5NE)
-	struct bfticu_iomap *base =
-		(struct bfticu_iomap *)CONFIG_SYS_BFTIC3_BASE;
+	/*
+	 * BFTIC3 on the local bus CS4
+	 */
+	struct bfticu_iomap *base = (struct bfticu_iomap *)0xB0000000;
 	u8 dip_switch = in_8((u8 *)&(base->mswitch)) & BFTICU_DIPSWITCH_MASK;
 
 	if (dip_switch != 0) {
include/configs/kmcoge5ne.h +0 -6
index 8f4685c271c6..b9d20c9c8eb9 100644
@@ -35,12 +35,6 @@
 	CSCONFIG_ROW_BIT_13 | \
 	CSCONFIG_COL_BIT_10)
 
-/*
- * BFTIC3 on the local bus CS4
- */
-#define CONFIG_SYS_BFTIC3_BASE			0xB0000000
-#define CONFIG_SYS_BFTIC3_SIZE			256
-
 /* enable POST tests */
 #define CONFIG_POST (CONFIG_SYS_POST_MEMORY|CONFIG_SYS_POST_MEM_REGIONS)
 #define CONFIG_POST_EXTERNAL_WORD_FUNCS /* use own functions, not generic */
Signature · 1 line
2.25.1
Reviewed-by on v1 18/20
#19 lore raw

RE: [PATCH 18/20] kmcoge5ne: Move BFTIC3 CONFIG references to their usage

Quoted 4 lines

We only reference CONFIG_SYS_BFTIC3_BASE in one location. Move the comment to where we reference it, and use the value directly.

Quoted 8 lines
Cc Holger Brunck <[email protected]>
Cc Heiko Schocher <[email protected]>
---
 board/keymile/km83xx/km83xx.c | 6 ++++--
 include/configs/kmcoge5ne.h   | 6 ------
 2 files changed, 4 insertions(+), 8 deletions(-)

Best regards
Holger

Reviewed-by on v1 18/20
#20 lore raw

Re: [PATCH 18/20] kmcoge5ne: Move BFTIC3 CONFIG references to their usage

In reply to Tom Rini

Hello Tom,

Quoted 10 lines · Tom Rini

We only reference CONFIG_SYS_BFTIC3_BASE in one location. Move the comment to where we reference it, and use the value directly.

Cc Holger Brunck <[email protected]>
Cc Heiko Schocher <[email protected]>
---
 board/keymile/km83xx/km83xx.c | 6 ++++--
 include/configs/kmcoge5ne.h   | 6 ------
 2 files changed, 4 insertions(+), 8 deletions(-)

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: [email protected]
author
#21 lore raw

PATCH 19/20 Convert CONFIG_SYS_BOOTCOUNT_LE et al to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_SYS_BOOTCOUNT_LE
CONFIG_SYS_BOOTCOUNT_BE

---
 configs/am335x_boneblack_vboot_defconfig |  1 +
 configs/am335x_evm_defconfig             |  1 +
 configs/am335x_evm_spiboot_defconfig     |  1 +
 configs/am335x_hs_evm_defconfig          |  1 +
 configs/am335x_hs_evm_uart_defconfig     |  1 +
 configs/am335x_sl50_defconfig            |  1 +
 configs/chiliboard_defconfig             |  1 +
 configs/dh_imx6_defconfig                |  1 +
 configs/kmcent2_defconfig                |  1 +
 configs/kmcoge5ne_defconfig              |  1 +
 configs/kmeter1_defconfig                |  1 +
 configs/kmsupx5_defconfig                |  1 +
 configs/kmtegr1_defconfig                |  1 +
 configs/pg_wcom_expu1_defconfig          |  1 +
 configs/pg_wcom_expu1_update_defconfig   |  1 +
 configs/pg_wcom_seli8_defconfig          |  1 +
 configs/pg_wcom_seli8_update_defconfig   |  1 +
 configs/socfpga_is1_defconfig            |  1 +
 configs/socfpga_sr1500_defconfig         |  1 +
 configs/tuge1_defconfig                  |  1 +
 drivers/bootcount/Kconfig                | 11 +++++++++++
 include/bootcount.h                      |  8 --------
 include/configs/am335x_evm.h             |  8 --------
 include/configs/am335x_guardian.h        |  3 ---
 include/configs/am335x_sl50.h            |  3 ---
 include/configs/chiliboard.h             |  2 --
 include/configs/dh_imx6.h                |  3 ---
 include/configs/highbank.h               |  2 --
 include/configs/km/pg-wcom-ls102xa.h     |  2 --
 include/configs/socfpga_is1.h            |  5 -----
 include/configs/socfpga_sr1500.h         |  5 -----
 include/configs/tqma6_wru4.h             |  3 ---
 32 files changed, 31 insertions(+), 44 deletions(-)
configs/am335x_boneblack_vboot_defconfig +1 -0
index b5ba2ccda5c9..ab74bdb2f884 100644
@@ -54,6 +54,7 @@ CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y
 # CONFIG_SPL_BLK is not set
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
configs/am335x_evm_defconfig +1 -0
index c7dbd3c5702d..de13af62be2d 100644
@@ -63,6 +63,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_CLK=y
 CONFIG_CLK_CDCE9XX=y
 CONFIG_CLK_TI_CTRL=y
configs/am335x_evm_spiboot_defconfig +1 -0
index a5af17b2ffbe..f0a6b4be43a8 100644
@@ -53,6 +53,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_CLK=y
 CONFIG_CLK_CDCE9XX=y
 CONFIG_DFU_TFTP=y
configs/am335x_hs_evm_defconfig +1 -0
index ef0a09877c10..4d0ee46ac70f 100644
@@ -51,6 +51,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_CLK=y
 CONFIG_CLK_CDCE9XX=y
 CONFIG_DFU_MMC=y
configs/am335x_hs_evm_uart_defconfig +1 -0
index d7ea5a31cd1d..9a86e869aa1f 100644
@@ -52,6 +52,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_CLK=y
 CONFIG_CLK_CDCE9XX=y
 CONFIG_DFU_MMC=y
configs/am335x_sl50_defconfig +1 -0
index 1338190e9ff4..8808e1ff6583 100644
@@ -68,6 +68,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x50
configs/chiliboard_defconfig +1 -0
index 849d751f08e8..055690614299 100644
@@ -54,6 +54,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_MISC=y
configs/dh_imx6_defconfig +1 -0
index 7cb4f417e7eb..051816f719fe 100644
@@ -69,6 +69,7 @@ CONFIG_BOUNCE_BUFFER=y
 CONFIG_DWC_AHSATA=y
 CONFIG_LBA48=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_MXC=y
configs/kmcent2_defconfig +1 -0
index bcecb88e4d10..ee900f5d9cd3 100644
@@ -57,6 +57,7 @@ CONFIG_USE_ETHPRIME=y
 CONFIG_ETHPRIME="fm1-mac5"
 CONFIG_DM=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_FSL_CAAM=y
 CONFIG_DDR_CLK_FREQ=66666666
 CONFIG_CHIP_SELECTS_PER_CTRL=2
configs/kmcoge5ne_defconfig +1 -0
index 924f9ac46377..3b73fbc812cb 100644
@@ -200,6 +200,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_BOOTCOUNT=y
 CONFIG_BOOTCOUNT_MEM=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_SYS_BR0_PRELIM_BOOL=y
 CONFIG_SYS_BR0_PRELIM=0xF0001001
 CONFIG_SYS_OR0_PRELIM=0xF0000E55
configs/kmeter1_defconfig +1 -0
index dfa2500a29a5..310278d61127 100644
@@ -169,6 +169,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_BOOTCOUNT=y
 CONFIG_BOOTCOUNT_MEM=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_SYS_BR0_PRELIM_BOOL=y
 CONFIG_SYS_BR0_PRELIM=0xF0001001
 CONFIG_SYS_OR0_PRELIM=0xF0000E55
configs/kmsupx5_defconfig +1 -0
index 221335da8eae..027bb73b57c6 100644
@@ -160,6 +160,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_BOOTCOUNT=y
 CONFIG_BOOTCOUNT_MEM=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_SYS_BR0_PRELIM_BOOL=y
 CONFIG_SYS_BR0_PRELIM=0xF0001001
 CONFIG_SYS_OR0_PRELIM=0xF0000E55
configs/kmtegr1_defconfig +1 -0
index f1791a0fc0e8..19cb1e85b04c 100644
@@ -161,6 +161,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_BOOTCOUNT=y
 CONFIG_BOOTCOUNT_MEM=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_SYS_BR0_PRELIM_BOOL=y
 CONFIG_SYS_BR0_PRELIM=0xF0001001
 CONFIG_SYS_OR0_PRELIM=0xF0000E55
configs/pg_wcom_expu1_defconfig +1 -0
index 4b205e13831c..a84e0cdd9eb1 100644
@@ -70,6 +70,7 @@ CONFIG_ETHPRIME="ethernet@2d90000"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_DM=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_DDR_CLK_FREQ=50000000
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_SYS_I2C_LEGACY=y
configs/pg_wcom_expu1_update_defconfig +1 -0
index 98f3dcc4545a..f04c3ac61476 100644
@@ -68,6 +68,7 @@ CONFIG_ETHPRIME="ethernet@2d90000"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_DM=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_DDR_CLK_FREQ=50000000
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_SYS_I2C_LEGACY=y
configs/pg_wcom_seli8_defconfig +1 -0
index ce3e7eb179b1..4380d8836351 100644
@@ -70,6 +70,7 @@ CONFIG_ETHPRIME="ethernet@2d90000"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_DM=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_DDR_CLK_FREQ=50000000
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_SYS_I2C_LEGACY=y
configs/pg_wcom_seli8_update_defconfig +1 -0
index 623afa33877e..ca05e25d47e2 100644
@@ -68,6 +68,7 @@ CONFIG_ETHPRIME="ethernet@2d90000"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_DM=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_DDR_CLK_FREQ=50000000
 CONFIG_SYS_FSL_DDR3=y
 CONFIG_SYS_I2C_LEGACY=y
configs/socfpga_is1_defconfig +1 -0
index c3b6368f6171..958adfe25a43 100644
@@ -52,6 +52,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_ARP_TIMEOUT=500
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_sr1500_defconfig +1 -0
index 53d6b82972f9..def2ee8dbc14 100644
@@ -56,6 +56,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/tuge1_defconfig +1 -0
index 3c2a7a34d1c4..1bd48cb82a14 100644
@@ -160,6 +160,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_BOOTCOUNT=y
 CONFIG_BOOTCOUNT_MEM=y
+CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_SYS_BR0_PRELIM_BOOL=y
 CONFIG_SYS_BR0_PRELIM=0xF0001001
 CONFIG_SYS_OR0_PRELIM=0xF0000E55
drivers/bootcount/Kconfig +11 -0
index 66ce4cc29baa..13e99dfc0d95 100644
@@ -237,4 +237,15 @@ config SYS_BOOTCOUNT_MAGIC
 	help
 	  Set the magic value used for the boot counter.
 
+choice
+	prompt "Endianess of bootcount accessors"
+	default SYS_BOOTCOUNT_LE
+
+config SYS_BOOTCOUNT_LE
+	bool "Little endian accessors"
+
+config SYS_BOOTCOUNT_BE
+	bool "Big endian accessors"
+
+endchoice
 endif
include/bootcount.h +0 -8
index fccee7e15bf7..bfa5d4642764 100644
@@ -72,14 +72,6 @@ ulong bootcount_load(void);
 
 #if defined(CONFIG_SPL_BOOTCOUNT_LIMIT) || defined(CONFIG_TPL_BOOTCOUNT_LIMIT) || defined(CONFIG_BOOTCOUNT_LIMIT)
 
-#if !defined(CONFIG_SYS_BOOTCOUNT_LE) && !defined(CONFIG_SYS_BOOTCOUNT_BE)
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-#  define CONFIG_SYS_BOOTCOUNT_LE
-# else
-#  define CONFIG_SYS_BOOTCOUNT_BE
-# endif
-#endif
-
 #ifdef CONFIG_SYS_BOOTCOUNT_LE
 static inline void raw_bootcount_store(volatile u32 *addr, u32 data)
 {
include/configs/am335x_evm.h +0 -8
index 754bcc3304b9..f0a979423dea 100644
@@ -170,14 +170,6 @@
 /* PMIC support */
 #define CONFIG_POWER_TPS65910
 
-/* SPL */
-#ifndef CONFIG_NOR_BOOT
-/* Bootcount using the RTC block */
-#define CONFIG_SYS_BOOTCOUNT_BE
-
-/* USB gadget RNDIS */
-#endif
-
 #ifdef CONFIG_MTD_RAW_NAND
 /* NAND: device related configs */
 /* NAND: driver related configs */
include/configs/am335x_guardian.h +0 -3
index 93fea95996cc..356c21a1b0ad 100644
@@ -93,9 +93,6 @@
 #define CONFIG_SYS_NS16550_COM5		0x481a8000	/* UART4 */
 #define CONFIG_SYS_NS16550_COM6		0x481aa000	/* UART5 */
 
-/* Bootcount using the RTC block */
-#define CONFIG_SYS_BOOTCOUNT_LE
-
 #ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SYS_NAND_ECCPOS  {   2,   3,   4,   5,   6,   7,   8,   9, \
 			 10,  11,  12,  13,  14,  15,  16,  17,  18,  19, \
include/configs/am335x_sl50.h +0 -3
index 79d9d03a176b..4289836bc3f6 100644
@@ -50,9 +50,6 @@
 
 /* SPL */
 
-/* Bootcount using the RTC block */
-#define CONFIG_SYS_BOOTCOUNT_BE
-
 /* Network. */
 
 #endif	/* ! __CONFIG_AM335X_SL50_H */
include/configs/chiliboard.h +0 -2
index 97adb8353591..965eba58b311 100644
@@ -105,8 +105,6 @@
 #define CONFIG_SYS_NS16550_COM6		0x481aa000	/* UART5 */
 
 /* SPL */
-/* Bootcount using the RTC block */
-#define CONFIG_SYS_BOOTCOUNT_BE
 
 /* NAND: device related configs */
 /* NAND: driver related configs */
include/configs/dh_imx6.h +0 -3
index f770b3552869..79424647f618 100644
@@ -26,9 +26,6 @@
 
 /* Miscellaneous configurable options */
 
-/* Bootcounter */
-#define CONFIG_SYS_BOOTCOUNT_BE
-
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #define CONFIG_SYS_FSL_USDHC_NUM	3
include/configs/highbank.h +0 -2
index 1fc38cfa0cc6..bb6cc957261a 100644
@@ -14,8 +14,6 @@
 
 #define CONFIG_PL011_CLOCK		150000000
 
-#define CONFIG_SYS_BOOTCOUNT_LE		/* Use little-endian accessors */
-
 /*
  * Miscellaneous configurable options
  */
include/configs/km/pg-wcom-ls102xa.h +0 -2
index a12923386a5f..dd6747388c74 100644
@@ -187,8 +187,6 @@
 
 #define CONFIG_SYS_MONITOR_LEN		0x100000     /* 1Mbyte */
 
-#define CONFIG_SYS_BOOTCOUNT_BE
-
 /*
  * Environment
  */
include/configs/socfpga_is1.h +0 -5
index 468a35d4ff9b..ad271791206d 100644
@@ -16,9 +16,4 @@
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>
 
-/*
- * Bootcounter
- */
-#define CONFIG_SYS_BOOTCOUNT_BE
-
 #endif	/* __CONFIG_SOCFPGA_IS1_H__ */
include/configs/socfpga_sr1500.h +0 -5
index 62c1bc7408a6..432144cb40ce 100644
@@ -18,11 +18,6 @@
 /* Enable SPI NOR flash reset, needed for SPI booting */
 #define CONFIG_SPI_N25Q256A_RESET
 
-/*
- * Bootcounter
- */
-#define CONFIG_SYS_BOOTCOUNT_BE
-
 /* Environment setting for SPI flash */
 
 /* The rest of the configuration is shared */
include/configs/tqma6_wru4.h +0 -3
index 90db96599c1b..999130600ccb 100644
@@ -24,9 +24,6 @@
 
 /* LED */
 
-/* Bootcounter */
-#define CONFIG_SYS_BOOTCOUNT_BE
-
 /* I2C */
 
 #endif /* __CONFIG_TQMA6_WRU4_H */
Signature · 1 line
2.25.1
author
#22 lore raw

PATCH 20/20 Convert CONFIG_SYS_BOOTM_LEN to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_SYS_BOOTM_LEN

As part of this, rework error handling in boot/bootm.c so that we pass the buffer size to handle_decomp_error as CONFIG_SYS_BOOTM_LEN will not be available to host tools but we do know the size that we passed to malloc().

---
 README                                        |  6 -----
 boot/bootm.c                                  | 24 +++++++++----------
 cmd/Kconfig                                   | 10 ++++++++
 configs/M5208EVBE_defconfig                   |  1 +
 configs/M5235EVB_Flash32_defconfig            |  1 +
 configs/M5235EVB_defconfig                    |  1 +
 configs/M5253DEMO_defconfig                   |  1 +
 configs/M5275EVB_defconfig                    |  1 +
 configs/M53017EVB_defconfig                   |  1 +
 configs/M5329AFEE_defconfig                   |  1 +
 configs/M5329BFEE_defconfig                   |  1 +
 configs/M5373EVB_defconfig                    |  1 +
 configs/MCR3000_defconfig                     |  1 +
 configs/a3y17lte_defconfig                    |  1 +
 configs/a5y17lte_defconfig                    |  1 +
 configs/a64-olinuxino-emmc_defconfig          |  1 +
 configs/a64-olinuxino_defconfig               |  1 +
 configs/a7y17lte_defconfig                    |  1 +
 configs/ae350_rv32_defconfig                  |  1 +
 configs/ae350_rv32_spl_defconfig              |  1 +
 configs/ae350_rv32_spl_xip_defconfig          |  1 +
 configs/ae350_rv32_xip_defconfig              |  1 +
 configs/ae350_rv64_defconfig                  |  1 +
 configs/ae350_rv64_spl_defconfig              |  1 +
 configs/ae350_rv64_spl_xip_defconfig          |  1 +
 configs/ae350_rv64_xip_defconfig              |  1 +
 configs/am335x_baltos_defconfig               |  1 +
 configs/am335x_boneblack_vboot_defconfig      |  1 +
 configs/am335x_evm_defconfig                  |  1 +
 configs/am335x_evm_spiboot_defconfig          |  1 +
 configs/am335x_guardian_defconfig             |  1 +
 configs/am335x_hs_evm_defconfig               |  1 +
 configs/am335x_hs_evm_uart_defconfig          |  1 +
 configs/am335x_shc_defconfig                  |  1 +
 configs/am335x_shc_ict_defconfig              |  1 +
 configs/am335x_shc_netboot_defconfig          |  1 +
 configs/am335x_shc_sdboot_defconfig           |  1 +
 configs/am335x_sl50_defconfig                 |  1 +
 configs/am57xx_evm_defconfig                  |  1 +
 configs/am57xx_hs_evm_defconfig               |  1 +
 configs/am57xx_hs_evm_usb_defconfig           |  1 +
 configs/am62x_evm_a53_defconfig               |  1 +
 configs/am64x_evm_a53_defconfig               |  1 +
 configs/am65x_evm_r5_defconfig                |  1 +
 configs/am65x_evm_r5_usbdfu_defconfig         |  1 +
 configs/am65x_evm_r5_usbmsc_defconfig         |  1 +
 configs/am65x_hs_evm_r5_defconfig             |  1 +
 configs/amarula_a64_relic_defconfig           |  1 +
 configs/apalis_imx6_defconfig                 |  1 +
 configs/apple_m1_defconfig                    |  1 +
 configs/aristainetos2c_defconfig              |  1 +
 configs/aristainetos2ccslb_defconfig          |  1 +
 ...edev_cc_v1_0_ultrazedev_som_v1_0_defconfig |  1 +
 configs/axs101_defconfig                      |  1 +
 configs/axs103_defconfig                      |  1 +
 configs/bananapi_m2_plus_h5_defconfig         |  1 +
 configs/bananapi_m64_defconfig                |  1 +
 configs/bcm7260_defconfig                     |  1 +
 configs/bcm7445_defconfig                     |  1 +
 configs/bcm947622_defconfig                   |  1 +
 configs/bcm963158_ram_defconfig               |  1 +
 configs/bcm968360bg_ram_defconfig             |  1 +
 configs/bcm968580xref_ram_defconfig           |  1 +
 configs/bcm_ns3_defconfig                     |  1 +
 configs/beelink_gs1_defconfig                 |  1 +
 configs/bitmain_antminer_s9_defconfig         |  1 +
 configs/boston32r2_defconfig                  |  1 +
 configs/boston32r2el_defconfig                |  1 +
 configs/boston32r6_defconfig                  |  1 +
 configs/boston32r6el_defconfig                |  1 +
 configs/boston64r2_defconfig                  |  1 +
 configs/boston64r2el_defconfig                |  1 +
 configs/boston64r6_defconfig                  |  1 +
 configs/boston64r6el_defconfig                |  1 +
 configs/brppt1_mmc_defconfig                  |  1 +
 configs/brppt1_nand_defconfig                 |  1 +
 configs/brppt1_spi_defconfig                  |  1 +
 configs/brsmarc1_defconfig                    |  1 +
 configs/bubblegum_96_defconfig                |  1 +
 configs/cgtqmx8_defconfig                     |  1 +
 configs/chromebit_mickey_defconfig            |  1 +
 configs/chromebook_jerry_defconfig            |  1 +
 configs/chromebook_minnie_defconfig           |  1 +
 configs/chromebook_speedy_defconfig           |  1 +
 configs/ci20_mmc_defconfig                    |  1 +
 configs/cl-som-imx7_defconfig                 |  1 +
 configs/clearfog_gt_8k_defconfig              |  1 +
 configs/cm_fx6_defconfig                      |  1 +
 configs/colibri-imx6ull-emmc_defconfig        |  1 +
 configs/colibri-imx6ull_defconfig             |  1 +
 configs/colibri_imx6_defconfig                |  1 +
 configs/colibri_imx7_defconfig                |  1 +
 configs/colibri_imx7_emmc_defconfig           |  1 +
 configs/corstone1000_defconfig                |  1 +
 configs/cortina_presidio-asic-base_defconfig  |  1 +
 configs/cortina_presidio-asic-emmc_defconfig  |  1 +
 configs/cortina_presidio-asic-pnand_defconfig |  1 +
 configs/crs305-1g-4s-bit_defconfig            |  1 +
 configs/crs305-1g-4s_defconfig                |  1 +
 configs/crs326-24g-2s-bit_defconfig           |  1 +
 configs/crs326-24g-2s_defconfig               |  1 +
 configs/crs328-4c-20s-4s-bit_defconfig        |  1 +
 configs/crs328-4c-20s-4s_defconfig            |  1 +
 configs/cubieboard7_defconfig                 |  1 +
 configs/deneb_defconfig                       |  1 +
 configs/dh_imx6_defconfig                     |  1 +
 configs/display5_defconfig                    |  1 +
 configs/display5_factory_defconfig            |  1 +
 configs/durian_defconfig                      |  1 +
 configs/emlid_neutis_n5_devboard_defconfig    |  1 +
 configs/espresso7420_defconfig                |  1 +
 configs/ev-imx280-nano-x-mb_defconfig         |  1 +
 configs/evb-rk3128_defconfig                  |  1 +
 configs/evb-rk3229_defconfig                  |  1 +
 configs/evb-rk3288_defconfig                  |  1 +
 configs/firefly-rk3288_defconfig              |  1 +
 configs/gazerbeam_defconfig                   |  1 +
 configs/ge_b1x5v2_defconfig                   |  1 +
 configs/ge_bx50v3_defconfig                   |  1 +
 configs/giedi_defconfig                       |  1 +
 configs/gwventana_emmc_defconfig              |  1 +
 configs/gwventana_gw5904_defconfig            |  1 +
 configs/gwventana_nand_defconfig              |  1 +
 configs/hsdk_4xd_defconfig                    |  1 +
 configs/hsdk_defconfig                        |  1 +
 configs/ids8313_defconfig                     |  1 +
 configs/imx6dl_icore_nand_defconfig           |  1 +
 configs/imx6dl_mamoj_defconfig                |  1 +
 configs/imx6q_bosch_acc_defconfig             |  1 +
 configs/imx6q_icore_nand_defconfig            |  1 +
 configs/imx6q_logic_defconfig                 |  1 +
 configs/imx6qdl_icore_mipi_defconfig          |  1 +
 configs/imx6qdl_icore_mmc_defconfig           |  1 +
 configs/imx6qdl_icore_nand_defconfig          |  1 +
 configs/imx6qdl_icore_rqs_defconfig           |  1 +
 configs/imx6ul_geam_mmc_defconfig             |  1 +
 configs/imx6ul_geam_nand_defconfig            |  1 +
 configs/imx6ul_isiot_emmc_defconfig           |  1 +
 configs/imx6ul_isiot_nand_defconfig           |  1 +
 configs/imx7_cm_defconfig                     |  1 +
 configs/imx8mm-cl-iot-gate-optee_defconfig    |  1 +
 configs/imx8mm-cl-iot-gate_defconfig          |  1 +
 configs/imx8mm-icore-mx8mm-ctouch2_defconfig  |  1 +
 configs/imx8mm-icore-mx8mm-edimm2.2_defconfig |  1 +
 configs/imx8mm_beacon_defconfig               |  1 +
 configs/imx8mm_data_modul_edm_sbc_defconfig   |  1 +
 configs/imx8mm_venice_defconfig               |  1 +
 configs/imx8mn_beacon_2g_defconfig            |  1 +
 configs/imx8mn_beacon_defconfig               |  1 +
 configs/imx8mn_bsh_smm_s2_defconfig           |  1 +
 configs/imx8mn_bsh_smm_s2pro_defconfig        |  1 +
 configs/imx8mn_ddr4_evk_defconfig             |  1 +
 configs/imx8mn_evk_defconfig                  |  1 +
 configs/imx8mn_var_som_defconfig              |  1 +
 configs/imx8mn_venice_defconfig               |  1 +
 configs/imx8mp_dhcom_pdk2_defconfig           |  1 +
 configs/imx8mp_evk_defconfig                  |  1 +
 configs/imx8mp_rsb3720a1_4G_defconfig         |  1 +
 configs/imx8mp_rsb3720a1_6G_defconfig         |  1 +
 configs/imx8mp_venice_defconfig               |  1 +
 configs/imx8mq_cm_defconfig                   |  1 +
 configs/imx8mq_phanbell_defconfig             |  1 +
 configs/imx8qxp_mek_defconfig                 |  1 +
 configs/j7200_evm_r5_defconfig                |  1 +
 configs/j721e_evm_r5_defconfig                |  1 +
 configs/j721e_hs_evm_r5_defconfig             |  1 +
 configs/j721s2_evm_r5_defconfig               |  1 +
 configs/km_kirkwood_128m16_defconfig          |  1 +
 configs/km_kirkwood_defconfig                 |  1 +
 configs/km_kirkwood_pci_defconfig             |  1 +
 configs/kmcoge5ne_defconfig                   |  1 +
 configs/kmcoge5un_defconfig                   |  1 +
 configs/kmeter1_defconfig                     |  1 +
 configs/kmnusa_defconfig                      |  1 +
 configs/kmopti2_defconfig                     |  1 +
 configs/kmsupx5_defconfig                     |  1 +
 configs/kmsuse2_defconfig                     |  1 +
 configs/kmtegr1_defconfig                     |  1 +
 configs/kmtepr2_defconfig                     |  1 +
 configs/kontron-sl-mx6ul_defconfig            |  1 +
 configs/kontron_pitx_imx8m_defconfig          |  1 +
 configs/kontron_sl28_defconfig                |  1 +
 configs/kp_imx6q_tpc_defconfig                |  1 +
 configs/libretech_all_h3_cc_h5_defconfig      |  1 +
 configs/libretech_all_h3_it_h5_defconfig      |  1 +
 configs/libretech_all_h5_cc_h5_defconfig      |  1 +
 configs/liteboard_defconfig                   |  1 +
 configs/ls1021aqds_ddr4_nor_defconfig         |  1 +
 configs/ls1021aqds_ddr4_nor_lpuart_defconfig  |  1 +
 configs/ls1021aqds_nand_defconfig             |  1 +
 configs/ls1021aqds_nor_SECURE_BOOT_defconfig  |  1 +
 configs/ls1021aqds_nor_defconfig              |  1 +
 configs/ls1021aqds_nor_lpuart_defconfig       |  1 +
 configs/ls1021aqds_qspi_defconfig             |  1 +
 configs/ls1021aqds_sdcard_ifc_defconfig       |  1 +
 configs/ls1021aqds_sdcard_qspi_defconfig      |  1 +
 configs/ls1021atsn_qspi_defconfig             |  1 +
 configs/ls1021atsn_sdcard_defconfig           |  1 +
 configs/ls1021atwr_nor_SECURE_BOOT_defconfig  |  1 +
 configs/ls1021atwr_nor_defconfig              |  1 +
 configs/ls1021atwr_nor_lpuart_defconfig       |  1 +
 configs/ls1021atwr_qspi_defconfig             |  1 +
 ...s1021atwr_sdcard_ifc_SECURE_BOOT_defconfig |  1 +
 configs/ls1021atwr_sdcard_ifc_defconfig       |  1 +
 configs/ls1021atwr_sdcard_qspi_defconfig      |  1 +
 configs/malta64_defconfig                     |  1 +
 configs/malta64el_defconfig                   |  1 +
 configs/malta_defconfig                       |  1 +
 configs/maltael_defconfig                     |  1 +
 configs/marsboard_defconfig                   |  1 +
 configs/mccmon6_nor_defconfig                 |  1 +
 configs/mccmon6_sd_defconfig                  |  1 +
 configs/meerkat96_defconfig                   |  1 +
 configs/microblaze-generic_defconfig          |  1 +
 configs/microchip_mpfs_icicle_defconfig       |  1 +
 configs/miqi-rk3288_defconfig                 |  1 +
 configs/mscc_jr2_defconfig                    |  1 +
 configs/mscc_luton_defconfig                  |  1 +
 configs/mscc_ocelot_defconfig                 |  1 +
 configs/mscc_serval_defconfig                 |  1 +
 configs/mscc_servalt_defconfig                |  1 +
 configs/mt7620_mt7530_rfb_defconfig           |  1 +
 configs/mt7620_rfb_defconfig                  |  1 +
 configs/mt7623a_unielec_u7623_02_defconfig    |  1 +
 configs/mt7623n_bpir2_defconfig               |  1 +
 configs/mt7628_rfb_defconfig                  |  1 +
 configs/mt7629_rfb_defconfig                  |  1 +
 configs/mvebu_crb_cn9130_defconfig            |  1 +
 configs/mvebu_db_armada8k_defconfig           |  1 +
 configs/mvebu_db_cn9130_defconfig             |  1 +
 configs/mvebu_mcbin-88f8040_defconfig         |  1 +
 configs/mvebu_puzzle-m801-88f8040_defconfig   |  1 +
 configs/mx6cuboxi_defconfig                   |  1 +
 configs/mx6qsabrelite_defconfig               |  1 +
 configs/mx6sabreauto_defconfig                |  1 +
 configs/mx6sabresd_defconfig                  |  1 +
 configs/mx6slevk_defconfig                    |  1 +
 configs/mx6slevk_spinor_defconfig             |  1 +
 configs/mx6slevk_spl_defconfig                |  1 +
 configs/mx6sllevk_defconfig                   |  1 +
 configs/mx6sllevk_plugin_defconfig            |  1 +
 configs/mx6sxsabreauto_defconfig              |  1 +
 configs/mx6sxsabresd_defconfig                |  1 +
 configs/mx6ul_14x14_evk_defconfig             |  1 +
 configs/mx6ul_9x9_evk_defconfig               |  1 +
 configs/mx6ull_14x14_evk_defconfig            |  1 +
 configs/mx6ull_14x14_evk_plugin_defconfig     |  1 +
 configs/mx6ulz_14x14_evk_defconfig            |  1 +
 configs/mx7dsabresd_defconfig                 |  1 +
 configs/mx7dsabresd_qspi_defconfig            |  1 +
 configs/mx7ulp_com_defconfig                  |  1 +
 configs/mx7ulp_evk_defconfig                  |  1 +
 configs/mx7ulp_evk_plugin_defconfig           |  1 +
 configs/myir_mys_6ulx_defconfig               |  1 +
 configs/nanopi_a64_defconfig                  |  1 +
 configs/nanopi_neo2_defconfig                 |  1 +
 configs/nanopi_neo_plus2_defconfig            |  1 +
 configs/nanopi_r1s_h5_defconfig               |  1 +
 configs/nitrogen6dl2g_defconfig               |  1 +
 configs/nitrogen6dl_defconfig                 |  1 +
 configs/nitrogen6q2g_defconfig                |  1 +
 configs/nitrogen6q_defconfig                  |  1 +
 configs/nitrogen6s1g_defconfig                |  1 +
 configs/nitrogen6s_defconfig                  |  1 +
 configs/novena_defconfig                      |  1 +
 configs/nsim_700_defconfig                    |  1 +
 configs/nsim_700be_defconfig                  |  1 +
 configs/nsim_hs38_defconfig                   |  1 +
 configs/nsim_hs38be_defconfig                 |  1 +
 configs/o4-imx6ull-nano_defconfig             |  1 +
 configs/oceanic_5205_5inmfd_defconfig         |  1 +
 configs/octeon_ebb7304_defconfig              |  1 +
 configs/octeon_nic23_defconfig                |  1 +
 configs/octeontx2_95xx_defconfig              |  1 +
 configs/octeontx2_96xx_defconfig              |  1 +
 configs/octeontx_81xx_defconfig               |  1 +
 configs/octeontx_83xx_defconfig               |  1 +
 configs/openpiton_riscv64_defconfig           |  1 +
 configs/openpiton_riscv64_spl_defconfig       |  1 +
 configs/opos6uldev_defconfig                  |  1 +
 configs/orangepi_3_defconfig                  |  1 +
 configs/orangepi_lite2_defconfig              |  1 +
 configs/orangepi_one_plus_defconfig           |  1 +
 configs/orangepi_pc2_defconfig                |  1 +
 configs/orangepi_prime_defconfig              |  1 +
 configs/orangepi_win_defconfig                |  1 +
 configs/orangepi_zero2_defconfig              |  1 +
 configs/orangepi_zero_plus2_defconfig         |  1 +
 configs/orangepi_zero_plus_defconfig          |  1 +
 configs/p2371-0000_defconfig                  |  1 +
 configs/p2371-2180_defconfig                  |  1 +
 configs/p2571_defconfig                       |  1 +
 configs/p2771-0000-000_defconfig              |  1 +
 configs/p2771-0000-500_defconfig              |  1 +
 configs/p3450-0000_defconfig                  |  1 +
 configs/pcm058_defconfig                      |  1 +
 configs/pg_wcom_expu1_defconfig               |  1 +
 configs/pg_wcom_expu1_update_defconfig        |  1 +
 configs/pg_wcom_seli8_defconfig               |  1 +
 configs/pg_wcom_seli8_update_defconfig        |  1 +
 configs/phycore-rk3288_defconfig              |  1 +
 configs/phycore_pcl063_defconfig              |  1 +
 configs/phycore_pcl063_ull_defconfig          |  1 +
 configs/pico-dwarf-imx6ul_defconfig           |  1 +
 configs/pico-dwarf-imx7d_defconfig            |  1 +
 configs/pico-hobbit-imx6ul_defconfig          |  1 +
 configs/pico-hobbit-imx7d_defconfig           |  1 +
 configs/pico-imx6_defconfig                   |  1 +
 configs/pico-imx6ul_defconfig                 |  1 +
 configs/pico-imx7d_bl33_defconfig             |  1 +
 configs/pico-imx7d_defconfig                  |  1 +
 configs/pico-imx8mq_defconfig                 |  1 +
 configs/pico-nymph-imx7d_defconfig            |  1 +
 configs/pico-pi-imx6ul_defconfig              |  1 +
 configs/pico-pi-imx7d_defconfig               |  1 +
 configs/pine64-lts_defconfig                  |  1 +
 configs/pine64_plus_defconfig                 |  1 +
 configs/pine_h64_defconfig                    |  1 +
 configs/pinebook_defconfig                    |  1 +
 configs/pinephone_defconfig                   |  1 +
 configs/pinetab_defconfig                     |  1 +
 configs/pomelo_defconfig                      |  1 +
 configs/popmetal-rk3288_defconfig             |  1 +
 configs/qemu-riscv32_defconfig                |  1 +
 configs/qemu-riscv32_smode_defconfig          |  1 +
 configs/qemu-riscv32_spl_defconfig            |  1 +
 configs/qemu-riscv64_defconfig                |  1 +
 configs/qemu-riscv64_smode_defconfig          |  1 +
 configs/qemu-riscv64_spl_defconfig            |  1 +
 configs/qemu_arm_defconfig                    |  1 +
 configs/riotboard_defconfig                   |  1 +
 configs/rock-pi-n8-rk3288_defconfig           |  1 +
 configs/rock2_defconfig                       |  1 +
 configs/sama7g5ek_mmc1_defconfig              |  1 +
 configs/sama7g5ek_mmc_defconfig               |  1 +
 configs/seeed_npi_imx6ull_defconfig           |  1 +
 configs/sifive_unleashed_defconfig            |  1 +
 configs/sifive_unmatched_defconfig            |  1 +
 configs/smegw01_defconfig                     |  1 +
 configs/socfpga_agilex_atf_defconfig          |  1 +
 configs/socfpga_agilex_defconfig              |  1 +
 configs/socfpga_agilex_vab_defconfig          |  1 +
 configs/socfpga_n5x_atf_defconfig             |  1 +
 configs/socfpga_n5x_defconfig                 |  1 +
 configs/socfpga_n5x_vab_defconfig             |  1 +
 configs/socfpga_secu1_defconfig               |  1 +
 configs/socfpga_stratix10_atf_defconfig       |  1 +
 configs/socfpga_stratix10_defconfig           |  1 +
 configs/socfpga_vining_fpga_defconfig         |  1 +
 configs/socrates_defconfig                    |  1 +
 configs/somlabs_visionsom_6ull_defconfig      |  1 +
 configs/sopine_baseboard_defconfig            |  1 +
 configs/stemmy_defconfig                      |  1 +
 configs/stih410-b2260_defconfig               |  1 +
 configs/stm32mp13_defconfig                   |  1 +
 ...stm32mp15-icore-stm32mp1-ctouch2_defconfig |  1 +
 ...tm32mp15-icore-stm32mp1-edimm2.2_defconfig |  1 +
 ...-microgea-stm32mp1-microdev2-of7_defconfig |  1 +
 ...mp15-microgea-stm32mp1-microdev2_defconfig |  1 +
 configs/stm32mp15_basic_defconfig             |  1 +
 configs/stm32mp15_defconfig                   |  1 +
 configs/stm32mp15_dhcom_basic_defconfig       |  1 +
 configs/stm32mp15_dhcor_basic_defconfig       |  1 +
 configs/stm32mp15_trusted_defconfig           |  1 +
 configs/synquacer_developerbox_defconfig      |  1 +
 configs/syzygy_hub_defconfig                  |  1 +
 configs/tanix_tx6_defconfig                   |  1 +
 configs/tb100_defconfig                       |  1 +
 configs/tbs2910_defconfig                     |  1 +
 configs/teres_i_defconfig                     |  1 +
 configs/thunderx_88xx_defconfig               |  1 +
 configs/tinker-rk3288_defconfig               |  1 +
 configs/tinker-s-rk3288_defconfig             |  1 +
 configs/topic_miami_defconfig                 |  1 +
 configs/topic_miamilite_defconfig             |  1 +
 configs/topic_miamiplus_defconfig             |  1 +
 configs/tqma6dl_mba6_mmc_defconfig            |  1 +
 configs/tqma6dl_mba6_spi_defconfig            |  1 +
 configs/tqma6q_mba6_mmc_defconfig             |  1 +
 configs/tqma6q_mba6_spi_defconfig             |  1 +
 configs/tqma6s_mba6_mmc_defconfig             |  1 +
 configs/tqma6s_mba6_spi_defconfig             |  1 +
 configs/tuge1_defconfig                       |  1 +
 configs/tuxx1_defconfig                       |  1 +
 configs/udoo_defconfig                        |  1 +
 configs/udoo_neo_defconfig                    |  1 +
 configs/uniphier_ld4_sld8_defconfig           |  1 +
 configs/uniphier_v7_defconfig                 |  1 +
 configs/uniphier_v8_defconfig                 |  1 +
 configs/variscite_dart6ul_defconfig           |  1 +
 configs/vining_2000_defconfig                 |  1 +
 configs/vyasa-rk3288_defconfig                |  1 +
 configs/wandboard_defconfig                   |  1 +
 configs/warp7_bl33_defconfig                  |  1 +
 configs/warp7_defconfig                       |  1 +
 configs/warp_defconfig                        |  1 +
 configs/xenguest_arm64_defconfig              |  1 +
 configs/xilinx_versal_virt_defconfig          |  1 +
 configs/xilinx_zynq_virt_defconfig            |  1 +
 configs/xilinx_zynqmp_r5_defconfig            |  1 +
 configs/xilinx_zynqmp_virt_defconfig          |  1 +
 include/configs/M5208EVBE.h                   |  1 -
 include/configs/M5235EVB.h                    |  1 -
 include/configs/M5253DEMO.h                   |  1 -
 include/configs/M5275EVB.h                    |  1 -
 include/configs/M53017EVB.h                   |  1 -
 include/configs/M5329EVB.h                    |  1 -
 include/configs/M5373EVB.h                    |  1 -
 include/configs/MPC837XERDB.h                 |  1 -
 include/configs/MPC8548CDS.h                  |  1 -
 include/configs/P1010RDB.h                    |  1 -
 include/configs/P2041RDB.h                    |  1 -
 include/configs/T102xRDB.h                    |  1 -
 include/configs/T104xRDB.h                    |  1 -
 include/configs/T208xQDS.h                    |  1 -
 include/configs/T208xRDB.h                    |  1 -
 include/configs/T4240RDB.h                    |  1 -
 include/configs/am335x_evm.h                  |  2 --
 include/configs/am335x_guardian.h             |  2 --
 include/configs/am335x_shc.h                  |  2 --
 include/configs/am335x_sl50.h                 |  2 --
 include/configs/am57xx_evm.h                  |  2 --
 include/configs/am65x_evm.h                   |  2 --
 include/configs/apalis-imx8.h                 |  2 --
 include/configs/ax25-ae350.h                  |  1 -
 include/configs/axs10x.h                      |  2 --
 include/configs/baltos.h                      |  1 -
 include/configs/bcm947622.h                   |  2 --
 include/configs/bcm_ns3.h                     |  1 -
 include/configs/bcmstb.h                      |  1 -
 include/configs/boston.h                      |  1 -
 include/configs/broadcom_bcm963158.h          |  1 -
 include/configs/brppt1.h                      |  1 -
 include/configs/brsmarc1.h                    |  1 -
 include/configs/ci20.h                        |  1 -
 include/configs/colibri-imx8x.h               |  2 --
 include/configs/corenet_ds.h                  |  1 -
 include/configs/crs3xx-98dx3236.h             |  2 --
 include/configs/dragonboard410c.h             |  1 -
 include/configs/dragonboard820c.h             |  1 -
 include/configs/durian.h                      |  1 -
 include/configs/exynos78x0-common.h           |  1 -
 include/configs/gw_ventana.h                  |  3 ---
 include/configs/hikey.h                       |  2 --
 include/configs/hikey960.h                    |  2 --
 include/configs/hsdk-4xd.h                    |  2 --
 include/configs/hsdk.h                        |  2 --
 include/configs/imx8mm-cl-iot-gate.h          |  1 -
 include/configs/imx8mm_data_modul_edm_sbc.h   |  2 --
 include/configs/imx8mm_evk.h                  |  1 -
 include/configs/imx8mm_icore_mx8mm.h          |  1 -
 include/configs/imx8mm_venice.h               |  1 -
 include/configs/imx8mn_bsh_smm_s2_common.h    |  2 --
 include/configs/imx8mn_evk.h                  |  2 --
 include/configs/imx8mn_var_som.h              |  2 --
 include/configs/imx8mn_venice.h               |  1 -
 include/configs/imx8mp_dhcom_pdk2.h           |  2 --
 include/configs/imx8mp_evk.h                  |  2 --
 include/configs/imx8mp_rsb3720.h              |  2 --
 include/configs/imx8mp_venice.h               |  1 -
 include/configs/imx8mq_cm.h                   |  2 --
 include/configs/imx8mq_evk.h                  |  2 --
 include/configs/imx8qm_mek.h                  |  2 --
 include/configs/imx8qm_rom7720.h              |  2 --
 include/configs/imx8ulp_evk.h                 |  1 -
 include/configs/iot2050.h                     |  2 --
 include/configs/iot_devkit.h                  |  2 --
 include/configs/j721e_evm.h                   |  2 --
 include/configs/j721s2_evm.h                  |  2 --
 include/configs/km/km-powerpc.h               |  1 -
 include/configs/km/km_arm.h                   |  1 -
 include/configs/km/pg-wcom-ls102xa.h          |  1 -
 include/configs/kmcent2.h                     |  1 -
 include/configs/kontron-sl-mx8mm.h            |  2 --
 include/configs/kontron_pitx_imx8m.h          |  2 --
 include/configs/ls1012a_common.h              |  2 --
 include/configs/ls1021aqds.h                  |  1 -
 include/configs/ls1021atsn.h                  |  2 --
 include/configs/ls1021atwr.h                  |  1 -
 include/configs/ls1028a_common.h              |  2 --
 include/configs/ls1043a_common.h              |  2 --
 include/configs/ls1046a_common.h              |  2 --
 include/configs/ls1088a_common.h              |  1 -
 include/configs/ls2080a_common.h              |  2 --
 include/configs/lx2160a_common.h              |  2 --
 include/configs/malta.h                       |  2 --
 include/configs/meson64.h                     |  1 -
 include/configs/microblaze-generic.h          |  2 --
 include/configs/microchip_mpfs_icicle.h       |  2 --
 include/configs/mt7620.h                      |  2 --
 include/configs/mt7622.h                      |  1 -
 include/configs/mt7623.h                      |  2 --
 include/configs/mt7628.h                      |  2 --
 include/configs/mt7629.h                      |  2 --
 include/configs/mt8183.h                      |  2 --
 include/configs/mt8512.h                      |  3 ---
 include/configs/mt8516.h                      |  2 --
 include/configs/mt8518.h                      |  2 --
 include/configs/mvebu_armada-37xx.h           |  2 --
 include/configs/mx6_common.h                  |  2 --
 include/configs/mx7_common.h                  |  2 --
 include/configs/mx7ulp_com.h                  |  2 --
 include/configs/mx7ulp_evk.h                  |  2 --
 include/configs/nsim.h                        |  2 --
 include/configs/octeon_common.h               |  2 --
 include/configs/octeontx2_common.h            |  1 -
 include/configs/octeontx_common.h             |  1 -
 include/configs/openpiton-riscv64.h           |  1 -
 include/configs/p1_p2_rdb_pc.h                |  1 -
 include/configs/phycore_imx8mm.h              |  1 -
 include/configs/phycore_imx8mp.h              |  2 --
 include/configs/pico-imx8mq.h                 |  2 --
 include/configs/pomelo.h                      |  1 -
 include/configs/poplar.h                      |  1 -
 include/configs/presidio_asic.h               |  2 --
 include/configs/px30_common.h                 |  4 ----
 include/configs/qemu-arm.h                    |  2 --
 include/configs/qemu-ppce500.h                |  1 -
 include/configs/qemu-riscv.h                  |  2 --
 include/configs/rcar-gen3-common.h            |  1 -
 include/configs/rk3128_common.h               |  2 --
 include/configs/rk322x_common.h               |  2 --
 include/configs/rk3288_common.h               |  2 --
 include/configs/rk3308_common.h               |  4 ----
 include/configs/rk3328_common.h               |  2 --
 include/configs/rk3368_common.h               |  2 --
 include/configs/rk3399_common.h               |  2 --
 include/configs/rk3568_common.h               |  2 --
 include/configs/rpi.h                         |  4 ----
 include/configs/sama7g5ek.h                   |  1 -
 include/configs/sdm845.h                      |  1 -
 include/configs/sifive-unleashed.h            |  2 --
 include/configs/sifive-unmatched.h            |  2 --
 include/configs/socfpga_arria5_secu1.h        |  2 --
 include/configs/socfpga_soc64_common.h        |  1 -
 include/configs/socfpga_vining_fpga.h         |  1 -
 include/configs/stemmy.h                      |  1 -
 include/configs/stih410-b2260.h               |  2 --
 include/configs/stm32mp13_common.h            |  1 -
 include/configs/stm32mp15_common.h            |  1 -
 include/configs/sunxi-common.h                |  4 ----
 include/configs/tb100.h                       |  2 --
 include/configs/total_compute.h               |  2 --
 include/configs/turris_mox.h                  |  1 -
 include/configs/uniphier.h                    |  2 --
 include/configs/vcoreiii.h                    |  2 --
 include/configs/verdin-imx8mm.h               |  2 --
 include/configs/verdin-imx8mp.h               |  2 --
 include/configs/vexpress_aemv8.h              |  2 --
 include/configs/x86-common.h                  |  1 -
 include/configs/xilinx_versal.h               |  2 --
 include/configs/xilinx_zynqmp.h               |  2 --
 include/configs/xilinx_zynqmp_r5.h            |  1 -
 include/configs/zynq-common.h                 |  1 -
 scripts/config_whitelist.txt                  |  1 -
 555 files changed, 419 insertions(+), 270 deletions(-)
README +0 -6
index fb0284d4ecb6..ff0df3797d21 100644
@@ -1736,12 +1736,6 @@ Configuration Settings:
 
 		Non-cached memory is only supported on 32-bit ARM at present.
 
-- CONFIG_SYS_BOOTM_LEN:
-		Normally compressed uImages are limited to an
-		uncompressed size of 8 MBytes. If this is not enough,
-		you can define CONFIG_SYS_BOOTM_LEN in your board config file
-		to adjust this setting to your needs.
-
 - CONFIG_SYS_BOOTMAPSZ:
 		Maximum size of memory mapped by the startup code of
 		the Linux kernel; all data that must be processed by
boot/bootm.c +11 -13
index dfa65f125e57..86dbfbcfed5b 100644
@@ -33,11 +33,6 @@
 #include <bootm.h>
 #include <image.h>
 
-#ifndef CONFIG_SYS_BOOTM_LEN
-/* use 8MByte as default max gunzip size */
-#define CONFIG_SYS_BOOTM_LEN	0x800000
-#endif
-
 #define MAX_CMDLINE_SIZE	SZ_4K
 
 #define IH_INITRD_ARCH IH_ARCH_DEFAULT
@@ -369,10 +364,12 @@ static int bootm_find_other(struct cmd_tbl *cmdtp, int flag, int argc,
  *
  * @comp_type:		Compression type being used (IH_COMP_...)
  * @uncomp_size:	Number of bytes uncompressed
+ * @buf_size:		Number of bytes the decompresion buffer was
  * @ret:		errno error code received from compression library
  * Return: Appropriate BOOTM_ERR_ error code
  */
-static int handle_decomp_error(int comp_type, size_t uncomp_size, int ret)
+static int handle_decomp_error(int comp_type, size_t uncomp_size,
+			       size_t buf_size, int ret)
 {
 	const char *name = genimg_get_comp_name(comp_type);
 
@@ -380,7 +377,7 @@ static int handle_decomp_error(int comp_type, size_t uncomp_size, int ret)
 	if (ret == -ENOSYS)
 		return BOOTM_ERR_UNIMPLEMENTED;
 
-	if (uncomp_size >= CONFIG_SYS_BOOTM_LEN)
+	if (uncomp_size >= buf_size)
 		printf("Image too large: increase CONFIG_SYS_BOOTM_LEN\n");
 	else
 		printf("%s: uncompress error %d\n", name, ret);
@@ -420,7 +417,8 @@ static int bootm_load_os(bootm_headers_t *images, int boot_progress)
 			   load_buf, image_buf, image_len,
 			   CONFIG_SYS_BOOTM_LEN, &load_end);
 	if (err) {
-		err = handle_decomp_error(os.comp, load_end - load, err);
+		err = handle_decomp_error(os.comp, load_end - load,
+					  CONFIG_SYS_BOOTM_LEN, err);
 		bootstage_error(BOOTSTAGE_ID_DECOMP_IMAGE);
 		return err;
 	}
@@ -1006,7 +1004,7 @@ static int bootm_host_load_image(const void *fit, int req_image_type,
 	ulong data, len;
 	bootm_headers_t images;
 	int noffset;
-	ulong load_end;
+	ulong load_end, buf_size;
 	uint8_t image_type;
 	uint8_t imape_comp;
 	void *load_buf;
@@ -1032,14 +1030,14 @@ static int bootm_host_load_image(const void *fit, int req_image_type,
 	}
 
 	/* Allow the image to expand by a factor of 4, should be safe */
-	load_buf = malloc((1 << 20) + len * 4);
+	buf_size = (1 << 20) + len * 4;
+	load_buf = malloc(buf_size);
 	ret = image_decomp(imape_comp, 0, data, image_type, load_buf,
-			   (void *)data, len, CONFIG_SYS_BOOTM_LEN,
-			   &load_end);
+			   (void *)data, len, buf_size, &load_end);
 	free(load_buf);
 
 	if (ret) {
-		ret = handle_decomp_error(imape_comp, load_end - 0, ret);
+		ret = handle_decomp_error(imape_comp, load_end - 0, buf_size, ret);
 		if (ret != BOOTM_ERR_UNIMPLEMENTED)
 			return ret;
 	}
cmd/Kconfig +10 -0
index bb956e330750..357b82849f7f 100644
@@ -335,6 +335,16 @@ config BOOTM_VXWORKS
 	help
 	  Support booting VxWorks images via the bootm command.
 
+config SYS_BOOTM_LEN
+	hex "Maximum size of a decompresed OS image"
+	depends on CMD_BOOTM || CMD_BOOTI || CMD_BOOTZ
+	default 0x4000000 if PPC || ARM64
+	default 0x1000000 if X86
+	default 0x800000
+	help
+	  Normally compressed OS images are limited to an uncompressed size of
+	  8 MiB. If this is not enough, increase this setting to fit your needs.
+
 config CMD_BOOTEFI
 	bool "bootefi"
 	depends on EFI_LOADER
configs/M5208EVBE_defconfig +1 -0
index 4ab888f59ed5..858fc5bbfd2e 100644
@@ -16,6 +16,7 @@ CONFIG_SYS_MALLOC_BOOTPARAMS=y
 # CONFIG_AUTO_COMPLETE is not set
 CONFIG_SYS_PROMPT="-> "
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_IMLS=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_MII=y
configs/M5235EVB_Flash32_defconfig +1 -0
index 2a7996278418..c7fd5a07a7c5 100644
@@ -16,6 +16,7 @@ CONFIG_SYS_MALLOC_BOOTPARAMS=y
 # CONFIG_CMDLINE_EDITING is not set
 # CONFIG_AUTO_COMPLETE is not set
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_I2C=y
 # CONFIG_CMD_LOADB is not set
configs/M5235EVB_defconfig +1 -0
index 5eeed2d2f313..a14bf427ad0a 100644
@@ -16,6 +16,7 @@ CONFIG_SYS_MALLOC_BOOTPARAMS=y
 # CONFIG_AUTO_COMPLETE is not set
 CONFIG_SYS_PROMPT="-> "
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_I2C=y
 # CONFIG_CMD_LOADB is not set
configs/M5253DEMO_defconfig +1 -0
index b3e6277a7e6d..3ed703a7a793 100644
@@ -15,6 +15,7 @@ CONFIG_SYS_MALLOC_BOOTPARAMS=y
 # CONFIG_CMDLINE_EDITING is not set
 # CONFIG_AUTO_COMPLETE is not set
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_IDE=y
 # CONFIG_CMD_SETEXPR is not set
configs/M5275EVB_defconfig +1 -0
index 3420934caf71..fe6ffca43c9f 100644
@@ -18,6 +18,7 @@ CONFIG_SYS_MALLOC_BOOTPARAMS=y
 # CONFIG_AUTO_COMPLETE is not set
 CONFIG_SYS_PROMPT="-> "
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_I2C=y
 # CONFIG_CMD_LOADB is not set
configs/M53017EVB_defconfig +1 -0
index cec2520bdd78..28d51eaa9deb 100644
@@ -18,6 +18,7 @@ CONFIG_SYS_MALLOC_BOOTPARAMS=y
 # CONFIG_AUTO_COMPLETE is not set
 CONFIG_SYS_PROMPT="-> "
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_MII=y
configs/M5329AFEE_defconfig +1 -0
index 9d55d5058e57..c59359b820c7 100644
@@ -16,6 +16,7 @@ CONFIG_SYS_MALLOC_BOOTPARAMS=y
 # CONFIG_AUTO_COMPLETE is not set
 CONFIG_SYS_PROMPT="-> "
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_I2C=y
 # CONFIG_CMD_SETEXPR is not set
configs/M5329BFEE_defconfig +1 -0
index bd0cbddfb89c..ae4add504b1c 100644
@@ -16,6 +16,7 @@ CONFIG_SYS_MALLOC_BOOTPARAMS=y
 # CONFIG_AUTO_COMPLETE is not set
 CONFIG_SYS_PROMPT="-> "
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_NAND=y
configs/M5373EVB_defconfig +1 -0
index 0a159eb170e2..aead0f45bd30 100644
@@ -16,6 +16,7 @@ CONFIG_SYS_MALLOC_BOOTPARAMS=y
 # CONFIG_AUTO_COMPLETE is not set
 CONFIG_SYS_PROMPT="-> "
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_NAND=y
configs/MCR3000_defconfig +1 -0
index 236be1628ce0..6adba431ef09 100644
@@ -34,6 +34,7 @@ CONFIG_SYS_PROMPT="S3K> "
 CONFIG_SYS_PBSIZE=278
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
+CONFIG_SYS_BOOTM_LEN=0x800000
 # CONFIG_CMD_IMI is not set
 CONFIG_CMD_ASKENV=y
 # CONFIG_CMD_LOADB is not set
configs/a3y17lte_defconfig +1 -0
index 67eb7aff1fd0..9c0427236b93 100644
@@ -20,6 +20,7 @@ CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR=y
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_DM_I2C_GPIO=y
configs/a5y17lte_defconfig +1 -0
index 44915ea5341e..ea0773e7a264 100644
@@ -20,6 +20,7 @@ CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR=y
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_DM_I2C_GPIO=y
configs/a64-olinuxino-emmc_defconfig +1 -0
index 7d8e7649f2a5..afa0c24b688a 100644
@@ -8,6 +8,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_SUN8I_EMAC=y
 CONFIG_USB_EHCI_HCD=y
configs/a64-olinuxino_defconfig +1 -0
index 06f51a8f8d31..ccb5abc98452 100644
@@ -8,6 +8,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SUN8I_EMAC=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
configs/a7y17lte_defconfig +1 -0
index 58486f6a5715..952c72b760d2 100644
@@ -20,6 +20,7 @@ CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR=y
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_DM_I2C_GPIO=y
configs/ae350_rv32_defconfig +1 -0
index fcfc7b3fe231..b7ea28b1786a 100644
@@ -15,6 +15,7 @@ CONFIG_BOOTDELAY=3
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SYS_PROMPT="RISC-V # "
 CONFIG_SYS_PBSIZE=1050
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF_TEST=y
configs/ae350_rv32_spl_defconfig +1 -0
index cfd857c183fb..fd89ea14e9cb 100644
@@ -21,6 +21,7 @@ CONFIG_SPL_MAX_SIZE=0x100000
 CONFIG_SPL_BSS_START_ADDR=0x4000000
 CONFIG_SYS_PROMPT="RISC-V # "
 CONFIG_SYS_PBSIZE=1050
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF_TEST=y
configs/ae350_rv32_spl_xip_defconfig +1 -0
index 36345fbfdc33..2a0c1abf6e54 100644
@@ -23,6 +23,7 @@ CONFIG_SPL_MAX_SIZE=0x100000
 CONFIG_SPL_BSS_START_ADDR=0x4000000
 CONFIG_SYS_PROMPT="RISC-V # "
 CONFIG_SYS_PBSIZE=1050
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF_TEST=y
configs/ae350_rv32_xip_defconfig +1 -0
index 01883850f9a4..e85921bcb3ab 100644
@@ -16,6 +16,7 @@ CONFIG_BOOTDELAY=3
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SYS_PROMPT="RISC-V # "
 CONFIG_SYS_PBSIZE=1050
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF_TEST=y
configs/ae350_rv64_defconfig +1 -0
index 477329fa67ae..cab5a387e5a9 100644
@@ -16,6 +16,7 @@ CONFIG_BOOTDELAY=3
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SYS_PROMPT="RISC-V # "
 CONFIG_SYS_PBSIZE=1050
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF_TEST=y
configs/ae350_rv64_spl_defconfig +1 -0
index eba12a8f0d40..a5cc75718229 100644
@@ -22,6 +22,7 @@ CONFIG_SPL_MAX_SIZE=0x100000
 CONFIG_SPL_BSS_START_ADDR=0x4000000
 CONFIG_SYS_PROMPT="RISC-V # "
 CONFIG_SYS_PBSIZE=1050
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF_TEST=y
configs/ae350_rv64_spl_xip_defconfig +1 -0
index 6ade12b740e2..dbe5db278fd2 100644
@@ -24,6 +24,7 @@ CONFIG_SPL_MAX_SIZE=0x100000
 CONFIG_SPL_BSS_START_ADDR=0x4000000
 CONFIG_SYS_PROMPT="RISC-V # "
 CONFIG_SYS_PBSIZE=1050
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF_TEST=y
configs/ae350_rv64_xip_defconfig +1 -0
index 2be91815a8e7..c9dc1d10f821 100644
@@ -17,6 +17,7 @@ CONFIG_BOOTDELAY=3
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SYS_PROMPT="RISC-V # "
 CONFIG_SYS_PBSIZE=1050
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF_TEST=y
configs/am335x_baltos_defconfig +1 -0
index 0ec440917519..bbb987c5edd6 100644
@@ -31,6 +31,7 @@ CONFIG_SPL_POWER=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_EEPROM=y
 CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
configs/am335x_boneblack_vboot_defconfig +1 -0
index ab74bdb2f884..9fe5ac4a1618 100644
@@ -36,6 +36,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_ETHER=y
 CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_SPL=y
 CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
 # CONFIG_CMD_FLASH is not set
configs/am335x_evm_defconfig +1 -0
index de13af62be2d..b5801094e8c4 100644
@@ -42,6 +42,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_ETHER=y
 CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_SPL=y
 CONFIG_CMD_SPL_NAND_OFS=0x00080000
 CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
configs/am335x_evm_spiboot_defconfig +1 -0
index f0a6b4be43a8..1f28d50a1b3e 100644
@@ -32,6 +32,7 @@ CONFIG_SPL_DM_SPI_FLASH=y
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
 CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_SPL=y
 CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
 # CONFIG_CMD_FLASH is not set
configs/am335x_guardian_defconfig +1 -0
index 34bef30edd3b..56da3720d961 100644
@@ -48,6 +48,7 @@ CONFIG_SPL_POWER=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_ETHER=y
 CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_MEMINFO=y
 CONFIG_CMD_MEMTEST=y
configs/am335x_hs_evm_defconfig +1 -0
index 4d0ee46ac70f..bb03e487f874 100644
@@ -33,6 +33,7 @@ CONFIG_SPL_NAND_ECC=y
 CONFIG_SPL_NAND_BASE=y
 # CONFIG_SPL_YMODEM_SUPPORT is not set
 CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_NAND=y
configs/am335x_hs_evm_uart_defconfig +1 -0
index 9a86e869aa1f..ac451026b09a 100644
@@ -34,6 +34,7 @@ CONFIG_SPL_NAND_DRIVERS=y
 CONFIG_SPL_NAND_ECC=y
 CONFIG_SPL_NAND_BASE=y
 CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_NAND=y
configs/am335x_shc_defconfig +1 -0
index 77593e3e3dcb..070674651ffd 100644
@@ -49,6 +49,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_SYS_PROMPT="U-Boot# "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=1049
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
configs/am335x_shc_ict_defconfig +1 -0
index 97a361ce4d61..595e7301cf9e 100644
@@ -47,6 +47,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_SYS_PROMPT="U-Boot# "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=1049
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
configs/am335x_shc_netboot_defconfig +1 -0
index 2c6fc5496ebd..d5cd182acb83 100644
@@ -51,6 +51,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_SYS_PROMPT="U-Boot# "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=1049
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
configs/am335x_shc_sdboot_defconfig +1 -0
index a154a342551a..e9e89f627e20 100644
@@ -50,6 +50,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_SYS_PROMPT="U-Boot# "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=1049
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
configs/am335x_sl50_defconfig +1 -0
index 8808e1ff6583..f2385e3d703a 100644
@@ -44,6 +44,7 @@ CONFIG_SPL_POWER=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_SPL=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_EEPROM=y
configs/am57xx_evm_defconfig +1 -0
index a077ef8ae24b..249e6702dd76 100644
@@ -45,6 +45,7 @@ CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_ADTIMG=y
 CONFIG_CMD_ABOOTIMG=y
 CONFIG_CMD_SPL=y
configs/am57xx_hs_evm_defconfig +1 -0
index e22c11d9807d..aa0b466d9548 100644
@@ -42,6 +42,7 @@ CONFIG_SPL_DM_SPI_FLASH=y
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_ADTIMG=y
 CONFIG_CMD_ABOOTIMG=y
 CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
configs/am57xx_hs_evm_usb_defconfig +1 -0
index fc1bc01c0629..1c37b635406a 100644
@@ -49,6 +49,7 @@ CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_DFU=y
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_ADTIMG=y
 CONFIG_CMD_ABOOTIMG=y
 CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
configs/am62x_evm_a53_defconfig +1 -0
index 7ebf3665214f..2c0bd4d2e10c 100644
@@ -33,6 +33,7 @@ CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img"
 CONFIG_SPL_DM_MAILBOX=y
 CONFIG_SPL_POWER_DOMAIN=y
 CONFIG_SPL_YMODEM_SUPPORT=y
+CONFIG_SYS_BOOTM_LEN=0x800000
 CONFIG_CMD_MMC=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
configs/am64x_evm_a53_defconfig +1 -0
index 49bfc006ddba..0f547526fe62 100644
@@ -63,6 +63,7 @@ CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_DFU=y
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_BOOTM_LEN=0x800000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_DFU=y
 CONFIG_CMD_DM=y
configs/am65x_evm_r5_defconfig +1 -0
index 2d8add2fbd5e..5232b979709d 100644
@@ -64,6 +64,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=64
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
configs/am65x_evm_r5_usbdfu_defconfig +1 -0
index 05a6a9219ea7..7507128c11e9 100644
@@ -56,6 +56,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=64
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_DFU=y
 CONFIG_CMD_GPT=y
configs/am65x_evm_r5_usbmsc_defconfig +1 -0
index 37e04483dbdb..e7e222647322 100644
@@ -56,6 +56,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=64
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
configs/am65x_hs_evm_r5_defconfig +1 -0
index fc0c5432dbc3..6e63f0e88078 100644
@@ -60,6 +60,7 @@ CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=64
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
configs/amarula_a64_relic_defconfig +1 -0
index 0e173c28c12a..72f97cee4de5 100644
@@ -9,6 +9,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
configs/apalis_imx6_defconfig +1 -0
index f9721796dbf9..b5f0aeb28b10 100644
@@ -46,6 +46,7 @@ CONFIG_SYS_PROMPT="Apalis iMX6 # "
 CONFIG_SYS_MAXARGS=48
 CONFIG_SYS_CBSIZE=1024
 CONFIG_SYS_PBSIZE=1055
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
configs/apple_m1_defconfig +1 -0
index c4fd80345657..4ba09334d422 100644
@@ -8,6 +8,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x800000
 # CONFIG_NET is not set
 CONFIG_APPLE_SPI_KEYB=y
 # CONFIG_MMC is not set
configs/aristainetos2c_defconfig +1 -0
index 26bcb00ff537..3b2f3c204aaa 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
 # CONFIG_BOOTM_VXWORKS is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_ENV_FLAGS=y
 CONFIG_CMD_NVEDIT_INFO=y
 # CONFIG_CMD_FLASH is not set
configs/aristainetos2ccslb_defconfig +1 -0
index 682903082cba..c07e547f551c 100644
@@ -30,6 +30,7 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
 # CONFIG_BOOTM_VXWORKS is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_ENV_FLAGS=y
 CONFIG_CMD_NVEDIT_INFO=y
 # CONFIG_CMD_FLASH is not set
configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig +1 -0
index 450b2830e56a..bfcbaa59f854 100644
@@ -44,6 +44,7 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_SPL_ARGS_ADDR=0x8000000
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=2073
+CONFIG_SYS_BOOTM_LEN=0x6400000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_FPGA_LOADBP=y
 CONFIG_CMD_FPGA_LOADP=y
configs/axs101_defconfig +1 -0
index efad458720b3..c744b38cc48b 100644
@@ -21,6 +21,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="AXS# "
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=278
+CONFIG_SYS_BOOTM_LEN=0x8000000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SPI=y
configs/axs103_defconfig +1 -0
index 0d1764958224..29affdc5e964 100644
@@ -21,6 +21,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="AXS# "
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=278
+CONFIG_SYS_BOOTM_LEN=0x8000000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SPI=y
configs/bananapi_m2_plus_h5_defconfig +1 -0
index 0fb1bda1c6ef..a68742e9d6a7 100644
@@ -9,6 +9,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SUN8I_EMAC=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
configs/bananapi_m64_defconfig +1 -0
index 5d1d10a0918c..36aa80a09baa 100644
@@ -9,6 +9,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_SUN8I_EMAC=y
 CONFIG_USB_EHCI_HCD=y
configs/bcm7260_defconfig +1 -0
index 280422021099..c44e6ba4ffcc 100644
@@ -22,6 +22,7 @@ CONFIG_SYS_PROMPT="U-Boot>"
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=536
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GPT=y
 # CONFIG_RANDOM_UUID is not set
configs/bcm7445_defconfig +1 -0
index 0382034a4793..bab2c76efb73 100644
@@ -23,6 +23,7 @@ CONFIG_SYS_PROMPT="U-Boot>"
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=536
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF_TEST=y
configs/bcm947622_defconfig +1 -0
index af9e0c742c69..c61fbe1848e6 100644
@@ -16,6 +16,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_CACHE=y
 CONFIG_OF_EMBED=y
 CONFIG_CLK=y
configs/bcm963158_ram_defconfig +1 -0
index 3bc4ca3ef6e2..424eca7946b8 100644
@@ -25,6 +25,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=24
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_LZMADEC is not set
 # CONFIG_CMD_UNZIP is not set
 # CONFIG_CMD_FLASH is not set
configs/bcm968360bg_ram_defconfig +1 -0
index d327dc68b110..7f9093c6f6d3 100644
@@ -23,6 +23,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=24
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x800000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MTD=y
 CONFIG_CMD_NAND=y
configs/bcm968580xref_ram_defconfig +1 -0
index ef5ae44345e7..a8c7ffa74875 100644
@@ -23,6 +23,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=24
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x800000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MTD=y
 CONFIG_CMD_NAND=y
configs/bcm_ns3_defconfig +1 -0
index 9446f8454c1a..9181b9e47743 100644
@@ -29,6 +29,7 @@ CONFIG_SYS_PROMPT="u-boot> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=1049
 # CONFIG_SYS_XTRACE is not set
+CONFIG_SYS_BOOTM_LEN=0x1800000
 CONFIG_CMD_GPT=y
 CONFIG_CMD_GPT_RENAME=y
 CONFIG_CMD_MMC=y
configs/beelink_gs1_defconfig +1 -0
index 6453a72a7d78..2c440e44f5dc 100644
@@ -10,6 +10,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x118000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 CONFIG_USB_EHCI_HCD=y
configs/bitmain_antminer_s9_defconfig +1 -0
index 98d38a89a042..00f604725f51 100644
@@ -41,6 +41,7 @@ CONFIG_SYS_PROMPT="antminer> "
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=2075
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x3c00000
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_DM is not set
 # CONFIG_CMD_FLASH is not set
configs/boston32r2_defconfig +1 -0
index 691e47c5508d..2be57d2d1ed9 100644
@@ -21,6 +21,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_PROMPT="boston # "
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=282
+CONFIG_SYS_BOOTM_LEN=0x4000000
 # CONFIG_CMD_ELF is not set
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MEMTEST=y
configs/boston32r2el_defconfig +1 -0
index 3c4aac93d89a..bcd6c05a1141 100644
@@ -22,6 +22,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_PROMPT="boston # "
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=282
+CONFIG_SYS_BOOTM_LEN=0x4000000
 # CONFIG_CMD_ELF is not set
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MEMTEST=y
configs/boston32r6_defconfig +1 -0
index 30c5356c015b..7bb4e692d6b7 100644
@@ -22,6 +22,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_PROMPT="boston # "
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=282
+CONFIG_SYS_BOOTM_LEN=0x4000000
 # CONFIG_CMD_ELF is not set
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MEMTEST=y
configs/boston32r6el_defconfig +1 -0
index f1253e6a51cf..a3c6546ebb5b 100644
@@ -23,6 +23,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_PROMPT="boston # "
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=282
+CONFIG_SYS_BOOTM_LEN=0x4000000
 # CONFIG_CMD_ELF is not set
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MEMTEST=y
configs/boston64r2_defconfig +1 -0
index a7c67805ab1a..4a41e6b5cc64 100644
@@ -22,6 +22,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_PROMPT="boston # "
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=282
+CONFIG_SYS_BOOTM_LEN=0x4000000
 # CONFIG_CMD_ELF is not set
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MEMTEST=y
configs/boston64r2el_defconfig +1 -0
index 326c757057fb..792341e76f06 100644
@@ -23,6 +23,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_PROMPT="boston # "
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=282
+CONFIG_SYS_BOOTM_LEN=0x4000000
 # CONFIG_CMD_ELF is not set
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MEMTEST=y
configs/boston64r6_defconfig +1 -0
index d31b92dc3cda..bf7f709524b9 100644
@@ -22,6 +22,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_PROMPT="boston # "
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=282
+CONFIG_SYS_BOOTM_LEN=0x4000000
 # CONFIG_CMD_ELF is not set
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MEMTEST=y
configs/boston64r6el_defconfig +1 -0
index 72b3649d4a13..f716a4383959 100644
@@ -23,6 +23,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_SYS_PROMPT="boston # "
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=282
+CONFIG_SYS_BOOTM_LEN=0x4000000
 # CONFIG_CMD_ELF is not set
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MEMTEST=y
configs/brppt1_mmc_defconfig +1 -0
index b1c8577ab627..f088e0bdc099 100644
@@ -46,6 +46,7 @@ CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x2000000
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_EDITENV is not set
configs/brppt1_nand_defconfig +1 -0
index 5addd4970b2a..7f961ae473cb 100644
@@ -46,6 +46,7 @@ CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x2000000
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_EDITENV is not set
configs/brppt1_spi_defconfig +1 -0
index 67683c895d23..5d6dfbd5c449 100644
@@ -54,6 +54,7 @@ CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x2000000
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_EDITENV is not set
configs/brsmarc1_defconfig +1 -0
index 2f7ff524cc1d..0a906ca95517 100644
@@ -56,6 +56,7 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_BOOTM_NETBSD is not set
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
+CONFIG_SYS_BOOTM_LEN=0x2000000
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_EDITENV is not set
configs/bubblegum_96_defconfig +1 -0
index 0daff7d15054..8dc928a9274e 100644
@@ -18,6 +18,7 @@ CONFIG_BOOTARGS="console=ttyOWL5,115200n8"
 CONFIG_SYS_PROMPT="U-Boot => "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=1051
+CONFIG_SYS_BOOTM_LEN=0x800000
 CONFIG_CMD_MD5SUM=y
 CONFIG_CMD_MEMINFO=y
 CONFIG_CMD_CACHE=y
configs/cgtqmx8_defconfig +1 -0
index 17219969f604..5dea71980ba0 100644
@@ -49,6 +49,7 @@ CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
 CONFIG_CMD_CPU=y
 # CONFIG_BOOTM_NETBSD is not set
+CONFIG_SYS_BOOTM_LEN=0x800000
 # CONFIG_CMD_IMPORTENV is not set
 CONFIG_CMD_CLK=y
 CONFIG_CMD_DM=y
configs/chromebit_mickey_defconfig +1 -0
index 862b37d0fb64..dad3b36b9937 100644
@@ -36,6 +36,7 @@ CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 # CONFIG_SPL_CRC32 is not set
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
configs/chromebook_jerry_defconfig +1 -0
index a0f15f6e7b2d..35d546e63159 100644
@@ -37,6 +37,7 @@ CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 # CONFIG_SPL_CRC32 is not set
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
configs/chromebook_minnie_defconfig +1 -0
index 513e5f85e9cb..60fc528a8ce7 100644
@@ -37,6 +37,7 @@ CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 # CONFIG_SPL_CRC32 is not set
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
configs/chromebook_speedy_defconfig +1 -0
index 7fc505ee4e36..e6f03faa87e8 100644
@@ -37,6 +37,7 @@ CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 # CONFIG_SPL_CRC32 is not set
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
configs/ci20_mmc_defconfig +1 -0
index 983642dac5c6..07848a5933eb 100644
@@ -34,6 +34,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1c
 CONFIG_SPL_MMC_TINY=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_DM=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_DHCP=y
configs/cl-som-imx7_defconfig +1 -0
index bf670dbae689..d1e44f8e68ab 100644
@@ -41,6 +41,7 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_BOOTM_NETBSD is not set
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_EXPORTENV is not set
configs/clearfog_gt_8k_defconfig +1 -0
index cf35307937f6..baafe3c58c6e 100644
@@ -26,6 +26,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_ARCH_EARLY_INIT_R=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SYS_MAXARGS=32
+CONFIG_SYS_BOOTM_LEN=0x800000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
configs/cm_fx6_defconfig +1 -0
index 9bf78788e497..c02def8ecd51 100644
@@ -39,6 +39,7 @@ CONFIG_SPL_WATCHDOG=y
 CONFIG_SYS_PROMPT="CM-FX6 # "
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=538
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_XIMG is not set
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_EEPROM=y
configs/colibri-imx6ull-emmc_defconfig +1 -0
index bfbbf34ae5cd..81987abcc6f8 100644
@@ -25,6 +25,7 @@ CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=547
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
configs/colibri-imx6ull_defconfig +1 -0
index a4225d862b44..f309bc8a726c 100644
@@ -27,6 +27,7 @@ CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=547
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
configs/colibri_imx6_defconfig +1 -0
index 0bdd088b1e7e..0320eafb11e9 100644
@@ -45,6 +45,7 @@ CONFIG_SYS_PROMPT="Colibri iMX6 # "
 CONFIG_SYS_MAXARGS=48
 CONFIG_SYS_CBSIZE=1024
 CONFIG_SYS_PBSIZE=1056
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
configs/colibri_imx7_defconfig +1 -0
index 15dae6b3db94..9de3744a0016 100644
@@ -30,6 +30,7 @@ CONFIG_SYS_PBSIZE=544
 # CONFIG_CMD_BOOTD is not set
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
 CONFIG_CMD_ASKENV=y
configs/colibri_imx7_emmc_defconfig +1 -0
index 361077ee84e7..40b1e8432ccb 100644
@@ -29,6 +29,7 @@ CONFIG_SYS_PBSIZE=544
 # CONFIG_CMD_BOOTD is not set
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
 CONFIG_CMD_ASKENV=y
configs/corstone1000_defconfig +1 -0
index 49a651aba238..ba5cf0308f3a 100644
@@ -24,6 +24,7 @@ CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=512
 # CONFIG_CMD_CONSOLE is not set
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x800000
 # CONFIG_CMD_XIMG is not set
 CONFIG_CMD_LOADM=y
 # CONFIG_CMD_LOADS is not set
configs/cortina_presidio-asic-base_defconfig +1 -0
index 3edc532e31eb..1471deb0a987 100644
@@ -25,6 +25,7 @@ CONFIG_SYS_PROMPT="G3#"
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0xc00000
 CONFIG_CMD_WDT=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIMER=y
configs/cortina_presidio-asic-emmc_defconfig +1 -0
index becb1beb1f91..456f26ced3c2 100644
@@ -23,6 +23,7 @@ CONFIG_SYS_PROMPT="G3#"
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0xc00000
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_WDT=y
configs/cortina_presidio-asic-pnand_defconfig +1 -0
index 842ec9fa92a7..be3e6a9bd193 100644
@@ -25,6 +25,7 @@ CONFIG_SYS_PROMPT="G3#"
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0xc00000
 CONFIG_CMD_MTD=y
 CONFIG_CMD_WDT=y
 CONFIG_CMD_CACHE=y
configs/crs305-1g-4s-bit_defconfig +1 -0
index 01e784efa85f..1b46ab4bf972 100644
@@ -25,6 +25,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=96
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MTD=y
 CONFIG_CMD_SPI=y
configs/crs305-1g-4s_defconfig +1 -0
index 98e10d509dd1..a7a3ffe4812d 100644
@@ -25,6 +25,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=96
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MTD=y
 CONFIG_CMD_SPI=y
configs/crs326-24g-2s-bit_defconfig +1 -0
index dd04bd18a1c3..70f71de6ae09 100644
@@ -25,6 +25,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=96
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MTD=y
 CONFIG_CMD_SPI=y
configs/crs326-24g-2s_defconfig +1 -0
index 8f7b839460b9..5991b62923af 100644
@@ -25,6 +25,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=96
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MTD=y
 CONFIG_CMD_SPI=y
configs/crs328-4c-20s-4s-bit_defconfig +1 -0
index 68a47fc7c219..434e9fb90f39 100644
@@ -25,6 +25,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=96
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MTD=y
 CONFIG_CMD_SPI=y
configs/crs328-4c-20s-4s_defconfig +1 -0
index fbf810136349..8e08cceaac4a 100644
@@ -25,6 +25,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=96
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MTD=y
 CONFIG_CMD_SPI=y
configs/cubieboard7_defconfig +1 -0
index 223a775387a4..7437d4b4b9d5 100644
@@ -17,6 +17,7 @@ CONFIG_BOOTARGS="console=ttyOWL3,115200n8"
 CONFIG_SYS_PROMPT="U-Boot => "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=1051
+CONFIG_SYS_BOOTM_LEN=0x800000
 CONFIG_CMD_MMC=y
 CONFIG_MMC_OWL=y
 CONFIG_PHY_REALTEK=y
configs/deneb_defconfig +1 -0
index 309545be5310..ae1179a11601 100644
@@ -59,6 +59,7 @@ CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2073
 CONFIG_CMD_CPU=y
 # CONFIG_BOOTM_NETBSD is not set
+CONFIG_SYS_BOOTM_LEN=0x800000
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 # CONFIG_CMD_CRC32 is not set
configs/dh_imx6_defconfig +1 -0
index 051816f719fe..042aecd7b4e1 100644
@@ -40,6 +40,7 @@ CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x11400
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_UNZIP=y
 CONFIG_CMD_DFU=y
configs/display5_defconfig +1 -0
index f586596ee921..2ddb11300df3 100644
@@ -57,6 +57,7 @@ CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2076
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_ELF is not set
 CONFIG_CMD_SPL=y
 CONFIG_CMD_ASKENV=y
configs/display5_factory_defconfig +1 -0
index e2f35a9790c0..05ed34933a0d 100644
@@ -55,6 +55,7 @@ CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2084
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_ELF is not set
 CONFIG_CMD_SPL=y
 CONFIG_CMD_ASKENV=y
configs/durian_defconfig +1 -0
index eccf55f895ec..27c8e260d92e 100644
@@ -22,6 +22,7 @@ CONFIG_LAST_STAGE_INIT=y
 CONFIG_SYS_PROMPT="durian#"
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=280
+CONFIG_SYS_BOOTM_LEN=0x3c00000
 # CONFIG_CMD_LZMADEC is not set
 # CONFIG_CMD_UNZIP is not set
 CONFIG_CMD_PCI=y
configs/emlid_neutis_n5_devboard_defconfig +1 -0
index d9272eae168f..73121f2f4eb2 100644
@@ -10,4 +10,5 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SUPPORT_EMMC_BOOT=y
configs/espresso7420_defconfig +1 -0
index 9128fa086a7a..34e5b4e743f2 100644
@@ -20,6 +20,7 @@ CONFIG_CONSOLE_MUX=y
 # CONFIG_SYS_LONGHELP is not set
 CONFIG_SYS_PROMPT="ESPRESSO7420 # "
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x800000
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 # CONFIG_MMC is not set
configs/ev-imx280-nano-x-mb_defconfig +1 -0
index 20ac5ddb332c..cb84e4045a97 100644
@@ -11,6 +11,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMINFO=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
configs/evb-rk3128_defconfig +1 -0
index ac38d5e78852..6526933274a2 100644
@@ -18,6 +18,7 @@ CONFIG_FIT=y
 CONFIG_DEFAULT_FDT_FILE="rk3128-evb.dtb"
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
configs/evb-rk3229_defconfig +1 -0
index f44dec09c278..ebf13c31c5bf 100644
@@ -36,6 +36,7 @@ CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 CONFIG_SPL_OPTEE_IMAGE=y
 CONFIG_TPL_MAX_SIZE=0x100000
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB_MASS_STORAGE=y
configs/evb-rk3288_defconfig +1 -0
index 6587c19c36a1..a2b88169c67d 100644
@@ -33,6 +33,7 @@ CONFIG_SPL_STACK=0xff718000
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
 CONFIG_SPL_OPTEE_IMAGE=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
configs/firefly-rk3288_defconfig +1 -0
index c2b3a0e315de..b3198bfa3808 100644
@@ -28,6 +28,7 @@ CONFIG_SPL_NO_BSS_LIMIT=y
 CONFIG_SPL_STACK=0xff718000
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
configs/gazerbeam_defconfig +1 -0
index c48541a9ec5c..a81aa00f2dba 100644
@@ -133,6 +133,7 @@ CONFIG_LAST_STAGE_INIT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_CBSIZE=1024
 CONFIG_CMD_CPU=y
+CONFIG_SYS_BOOTM_LEN=0x800000
 CONFIG_CMD_BINOP=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_SYS_ALT_MEMTEST=y
configs/ge_b1x5v2_defconfig +1 -0
index c282990aa458..0ef089c1ec53 100644
@@ -47,6 +47,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MEMINFO=y
 CONFIG_CMD_DM=y
configs/ge_bx50v3_defconfig +1 -0
index c33287812663..d0949a157476 100644
@@ -26,6 +26,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_DM=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
configs/giedi_defconfig +1 -0
index 7e9a7ea7c0b5..016282080bed 100644
@@ -59,6 +59,7 @@ CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2073
 CONFIG_CMD_CPU=y
 # CONFIG_BOOTM_NETBSD is not set
+CONFIG_SYS_BOOTM_LEN=0x800000
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 # CONFIG_CMD_CRC32 is not set
configs/gwventana_emmc_defconfig +1 -0
index ea9e7e2cbf0a..0516176e6d07 100644
@@ -57,6 +57,7 @@ CONFIG_SYS_PROMPT="Ventana > "
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=539
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_SPL_WRITE_SIZE=0x20000
 CONFIG_CMD_UNZIP=y
 # CONFIG_CMD_FLASH is not set
configs/gwventana_gw5904_defconfig +1 -0
index c0c7c0daf134..63c87f17a5c6 100644
@@ -57,6 +57,7 @@ CONFIG_SYS_PROMPT="Ventana > "
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=539
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_SPL_WRITE_SIZE=0x20000
 CONFIG_CMD_UNZIP=y
 # CONFIG_CMD_FLASH is not set
configs/gwventana_nand_defconfig +1 -0
index 7ce02fef8a2c..9d6819f19d30 100644
@@ -59,6 +59,7 @@ CONFIG_SYS_PROMPT="Ventana > "
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=539
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_SPL_NAND_OFS=0x1100000
 CONFIG_CMD_SPL_WRITE_SIZE=0x20000
 CONFIG_CMD_UNZIP=y
configs/hsdk_4xd_defconfig +1 -0
index 1d78c17d13b0..8e673545a966 100644
@@ -23,6 +23,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="hsdk-4xd# "
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2075
+CONFIG_SYS_BOOTM_LEN=0x8000000
 CONFIG_CMD_ENV_FLAGS=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
configs/hsdk_defconfig +1 -0
index f9823af34d4d..3bd6f9314ccb 100644
@@ -22,6 +22,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="hsdk# "
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2071
+CONFIG_SYS_BOOTM_LEN=0x8000000
 CONFIG_CMD_ENV_FLAGS=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
configs/ids8313_defconfig +1 -0
index b8070e7351a6..74dfc6680420 100644
@@ -142,6 +142,7 @@ CONFIG_MISC_INIT_R=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_AUTO_COMPLETE is not set
 CONFIG_SYS_CBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x800000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_ENV_FLAGS=y
 CONFIG_CMD_I2C=y
configs/imx6dl_icore_nand_defconfig +1 -0
index 71e3d39597d1..d53c524abeef 100644
@@ -32,6 +32,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl> "
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=541
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/imx6dl_mamoj_defconfig +1 -0
index 067498d80e32..9f4408ee2e64 100644
@@ -26,6 +26,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x800
 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x10
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_SPL=y
 CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_MEMTEST=y
configs/imx6q_bosch_acc_defconfig +1 -0
index a2501ebc1a1e..31a0d804afb3 100644
@@ -43,6 +43,7 @@ CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_BOOTD is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_FDT is not set
 # CONFIG_CMD_GO is not set
configs/imx6q_icore_nand_defconfig +1 -0
index bf5f620ad882..252eaf9c7085 100644
@@ -33,6 +33,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl> "
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=541
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/imx6q_logic_defconfig +1 -0
index 1510d10dc527..43de4b86e72e 100644
@@ -47,6 +47,7 @@ CONFIG_SPL_WATCHDOG=y
 CONFIG_SYS_PROMPT="i.MX6 Logic # "
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=543
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_SPL=y
 CONFIG_CMD_SPL_NAND_OFS=0x1500000
 CONFIG_CMD_SPL_WRITE_SIZE=0x00100000
configs/imx6qdl_icore_mipi_defconfig +1 -0
index bddc4ff98ef6..93fcd33116d3 100644
@@ -45,6 +45,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl-mipi> "
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=546
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_SPL=y
 CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_MEMTEST=y
configs/imx6qdl_icore_mmc_defconfig +1 -0
index f8194a002a19..8b5fdf52ef80 100644
@@ -48,6 +48,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl> "
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=541
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_SPL=y
 CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_MEMTEST=y
configs/imx6qdl_icore_nand_defconfig +1 -0
index bf5f620ad882..252eaf9c7085 100644
@@ -33,6 +33,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl> "
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=541
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/imx6qdl_icore_rqs_defconfig +1 -0
index cb2b0df98b76..d96d2dce428e 100644
@@ -42,6 +42,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="icorem6qdl-rqs> "
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=545
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_SPL=y
 CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_MEMTEST=y
configs/imx6ul_geam_mmc_defconfig +1 -0
index 9e46b1137fc8..d48e0a8c3298 100644
@@ -34,6 +34,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="geam6ul> "
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=538
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
configs/imx6ul_geam_nand_defconfig +1 -0
index ac56f204cdbd..e93df0a4e6d2 100644
@@ -33,6 +33,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="geam6ul> "
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=538
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
configs/imx6ul_isiot_emmc_defconfig +1 -0
index 7dadf80cd5ac..4c9cb42e7419 100644
@@ -34,6 +34,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="isiotmx6ul> "
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=541
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
configs/imx6ul_isiot_nand_defconfig +1 -0
index a5828ead1bd7..afc338122614 100644
@@ -33,6 +33,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="isiotmx6ul> "
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=541
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CRC32_VERIFY=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
configs/imx7_cm_defconfig +1 -0
index 830e4029e504..5d9511c70d05 100644
@@ -35,6 +35,7 @@ CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 # CONFIG_CMD_BOOTD is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_BOOTMENU=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
configs/imx8mm-cl-iot-gate-optee_defconfig +1 -0
index 800559120960..2a209bcfe471 100644
@@ -43,6 +43,7 @@ CONFIG_SYS_PROMPT="u-boot=> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2074
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_BOOTEFI_SELFTEST=y
 CONFIG_CMD_NVEDIT_EFI=y
 CONFIG_CMD_EEPROM=y
configs/imx8mm-cl-iot-gate_defconfig +1 -0
index dae7ddc20e07..070849881394 100644
@@ -45,6 +45,7 @@ CONFIG_SYS_PROMPT="u-boot=> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2074
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_BOOTEFI_SELFTEST=y
 CONFIG_CMD_NVEDIT_EFI=y
 CONFIG_CMD_EEPROM=y
configs/imx8mm-icore-mx8mm-ctouch2_defconfig +1 -0
index 69ebc6fa325a..7040d782ef64 100644
@@ -41,6 +41,7 @@ CONFIG_SYS_PROMPT="u-boot=> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2074
+CONFIG_SYS_BOOTM_LEN=0x10000000
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 # CONFIG_CMD_CRC32 is not set
configs/imx8mm-icore-mx8mm-edimm2.2_defconfig +1 -0
index a3c142feb284..0488ec223f0d 100644
@@ -41,6 +41,7 @@ CONFIG_SYS_PROMPT="u-boot=> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2074
+CONFIG_SYS_BOOTM_LEN=0x10000000
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 # CONFIG_CMD_CRC32 is not set
configs/imx8mm_beacon_defconfig +1 -0
index bf2b6486347a..1a0672879e58 100644
@@ -46,6 +46,7 @@ CONFIG_SYS_PROMPT="u-boot=> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2074
+CONFIG_SYS_BOOTM_LEN=0x800000
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 # CONFIG_CMD_CRC32 is not set
configs/imx8mm_data_modul_edm_sbc_defconfig +1 -0
index 399b388460f4..da59e4c7adf5 100644
@@ -71,6 +71,7 @@ CONFIG_SYS_PBSIZE=2074
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
 # CONFIG_BOOTM_VXWORKS is not set
+CONFIG_SYS_BOOTM_LEN=0x8000000
 CONFIG_CMD_ASKENV=y
 # CONFIG_CMD_EXPORTENV is not set
 CONFIG_CMD_ERASEENV=y
configs/imx8mm_venice_defconfig +1 -0
index 190209d63256..49b36e0c8f48 100644
@@ -49,6 +49,7 @@ CONFIG_SYS_PROMPT="u-boot=> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2074
+CONFIG_SYS_BOOTM_LEN=0x10000000
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 CONFIG_CRC32_VERIFY=y
configs/imx8mn_beacon_2g_defconfig +1 -0
index cadef45028d9..bd177887689c 100644
@@ -54,6 +54,7 @@ CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2074
 # CONFIG_BOOTM_NETBSD is not set
+CONFIG_SYS_BOOTM_LEN=0x800000
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 CONFIG_CMD_ERASEENV=y
configs/imx8mn_beacon_defconfig +1 -0
index 357109e32e5f..738d308f45b3 100644
@@ -54,6 +54,7 @@ CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2074
 # CONFIG_BOOTM_NETBSD is not set
+CONFIG_SYS_BOOTM_LEN=0x800000
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 CONFIG_CMD_ERASEENV=y
configs/imx8mn_bsh_smm_s2_defconfig +1 -0
index 68c2940456d9..5013dc5895c7 100644
@@ -48,6 +48,7 @@ CONFIG_SYS_PROMPT="> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2067
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_FUSE=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
configs/imx8mn_bsh_smm_s2pro_defconfig +1 -0
index 4bc551210515..74d033eb4035 100644
@@ -48,6 +48,7 @@ CONFIG_SYS_PROMPT="> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2067
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_FUSE=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
configs/imx8mn_ddr4_evk_defconfig +1 -0
index e16c1f60e674..e53e00845edb 100644
@@ -45,6 +45,7 @@ CONFIG_SYS_PROMPT="u-boot=> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2074
+CONFIG_SYS_BOOTM_LEN=0x2000000
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 CONFIG_CMD_ERASEENV=y
configs/imx8mn_evk_defconfig +1 -0
index 6390a274e509..7c1e48dcccea 100644
@@ -50,6 +50,7 @@ CONFIG_SYS_PROMPT="u-boot=> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2074
+CONFIG_SYS_BOOTM_LEN=0x2000000
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 CONFIG_CMD_ERASEENV=y
configs/imx8mn_var_som_defconfig +1 -0
index 889bcf7dc58e..927b449e03f9 100644
@@ -48,6 +48,7 @@ CONFIG_SYS_PROMPT="> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2067
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_FUSE=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
configs/imx8mn_venice_defconfig +1 -0
index 4a0bf393986c..935de023161a 100644
@@ -51,6 +51,7 @@ CONFIG_SYS_PROMPT="u-boot=> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2074
+CONFIG_SYS_BOOTM_LEN=0x10000000
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 CONFIG_CRC32_VERIFY=y
configs/imx8mp_dhcom_pdk2_defconfig +1 -0
index 3a41767c1560..f3b69070698b 100644
@@ -71,6 +71,7 @@ CONFIG_SYS_PBSIZE=2081
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
 # CONFIG_BOOTM_VXWORKS is not set
+CONFIG_SYS_BOOTM_LEN=0x8000000
 CONFIG_CMD_ASKENV=y
 # CONFIG_CMD_EXPORTENV is not set
 CONFIG_CMD_ERASEENV=y
configs/imx8mp_evk_defconfig +1 -0
index 2b2a025c2b2f..dcee933a1be0 100644
@@ -50,6 +50,7 @@ CONFIG_SYS_PROMPT="u-boot=> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2074
+CONFIG_SYS_BOOTM_LEN=0x2000000
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 # CONFIG_CMD_CRC32 is not set
configs/imx8mp_rsb3720a1_4G_defconfig +1 -0
index 97925196a85f..9f067fc6336e 100644
@@ -56,6 +56,7 @@ CONFIG_SYS_PROMPT="u-boot=> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2074
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_BOOTEFI_SELFTEST=y
 CONFIG_CMD_ERASEENV=y
 CONFIG_CMD_NVEDIT_EFI=y
configs/imx8mp_rsb3720a1_6G_defconfig +1 -0
index df35dcbb7625..2271f2a14e5e 100644
@@ -56,6 +56,7 @@ CONFIG_SYS_PROMPT="u-boot=> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2074
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_BOOTEFI_SELFTEST=y
 CONFIG_CMD_ERASEENV=y
 CONFIG_CMD_NVEDIT_EFI=y
configs/imx8mp_venice_defconfig +1 -0
index cef5f26d0baa..7fdde41b6da5 100644
@@ -51,6 +51,7 @@ CONFIG_SYS_PROMPT="u-boot=> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2074
+CONFIG_SYS_BOOTM_LEN=0x10000000
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 CONFIG_CRC32_VERIFY=y
configs/imx8mq_cm_defconfig +1 -0
index cd1ee4d9e702..6f59f29dac07 100644
@@ -44,6 +44,7 @@ CONFIG_SPL_I2C=y
 CONFIG_SYS_PROMPT="u-boot=> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=1050
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_FUSE=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/imx8mq_phanbell_defconfig +1 -0
index 2c566e068fd9..dc3992b0b45f 100644
@@ -49,6 +49,7 @@ CONFIG_SPL_POWER=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=64
 # CONFIG_BOOTM_NETBSD is not set
+CONFIG_SYS_BOOTM_LEN=0x800000
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 # CONFIG_CMD_CRC32 is not set
configs/imx8qxp_mek_defconfig +1 -0
index 5c361780267f..f250425e26a6 100644
@@ -51,6 +51,7 @@ CONFIG_SYS_CBSIZE=2048
 CONFIG_SYS_PBSIZE=2068
 CONFIG_CMD_CPU=y
 # CONFIG_BOOTM_NETBSD is not set
+CONFIG_SYS_BOOTM_LEN=0x800000
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 # CONFIG_CMD_CRC32 is not set
configs/j7200_evm_r5_defconfig +1 -0
index a0f9f20f2f5c..9ac6ef167862 100644
@@ -66,6 +66,7 @@ CONFIG_SPL_DFU=y
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_DFU=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPT=y
configs/j721e_evm_r5_defconfig +1 -0
index 21ec66d7e4ab..5e25ed620fa9 100644
@@ -67,6 +67,7 @@ CONFIG_SPL_DFU=y
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_DFU=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPT=y
configs/j721e_hs_evm_r5_defconfig +1 -0
index 02a666522386..add8da02056c 100644
@@ -59,6 +59,7 @@ CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_BOOTM_LEN=0x4000000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
configs/j721s2_evm_r5_defconfig +1 -0
index fb6e69197d11..98d69a18b95f 100644
@@ -73,6 +73,7 @@ CONFIG_SPL_DFU=y
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=64
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_DFU=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPT=y
configs/km_kirkwood_128m16_defconfig +1 -0
index 655759b09ce7..054038fdd043 100644
@@ -32,6 +32,7 @@ CONFIG_SYS_PBSIZE=532
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
 # CONFIG_BOOTM_VXWORKS is not set
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_EEPROM=y
configs/km_kirkwood_defconfig +1 -0
index 65378d3cec16..ac2deeb27c20 100644
@@ -32,6 +32,7 @@ CONFIG_SYS_PBSIZE=532
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
 # CONFIG_BOOTM_VXWORKS is not set
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_EEPROM=y
configs/km_kirkwood_pci_defconfig +1 -0
index 4d116c3a7adb..80746791fe3a 100644
@@ -32,6 +32,7 @@ CONFIG_SYS_PBSIZE=532
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
 # CONFIG_BOOTM_VXWORKS is not set
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_EEPROM=y
configs/kmcoge5ne_defconfig +1 -0
index 3b73fbc812cb..34ab31565ca4 100644
@@ -171,6 +171,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
configs/kmcoge5un_defconfig +1 -0
index 8b54f9c7c842..5766f49d774a 100644
@@ -35,6 +35,7 @@ CONFIG_SYS_PBSIZE=532
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
 # CONFIG_BOOTM_VXWORKS is not set
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_EEPROM=y
configs/kmeter1_defconfig +1 -0
index 310278d61127..98f23dbbf175 100644
@@ -141,6 +141,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
configs/kmnusa_defconfig +1 -0
index 8cbde0e178aa..a309acae7dc3 100644
@@ -35,6 +35,7 @@ CONFIG_SYS_PBSIZE=532
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
 # CONFIG_BOOTM_VXWORKS is not set
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_EEPROM=y
configs/kmopti2_defconfig +1 -0
index 7775b604f570..6a6f20890a76 100644
@@ -154,6 +154,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
configs/kmsupx5_defconfig +1 -0
index 027bb73b57c6..d251eba0d04b 100644
@@ -134,6 +134,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
configs/kmsuse2_defconfig +1 -0
index 8e27f9f6af3b..de44deb1ad1c 100644
@@ -36,6 +36,7 @@ CONFIG_SYS_PBSIZE=532
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
 # CONFIG_BOOTM_VXWORKS is not set
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_EEPROM=y
configs/kmtegr1_defconfig +1 -0
index 19cb1e85b04c..7c0ebefa6982 100644
@@ -133,6 +133,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
configs/kmtepr2_defconfig +1 -0
index 6670c317a19e..5bb3d9c1160a 100644
@@ -154,6 +154,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
configs/kontron-sl-mx6ul_defconfig +1 -0
index f9cebf9e9c96..a0486381f5cd 100644
@@ -34,6 +34,7 @@ CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/kontron_pitx_imx8m_defconfig +1 -0
index 27a89f9b1b66..49671e8fb47f 100644
@@ -48,6 +48,7 @@ CONFIG_SPL_WATCHDOG=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
 # CONFIG_BOOTM_NETBSD is not set
+CONFIG_SYS_BOOTM_LEN=0x2000000
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 CONFIG_CMD_NVEDIT_EFI=y
configs/kontron_sl28_defconfig +1 -0
index aaabb14f91a2..aaca8966c8f9 100644
@@ -50,6 +50,7 @@ CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x230000
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x800000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_NVEDIT_EFI=y
configs/kp_imx6q_tpc_defconfig +1 -0
index 8c5010d60523..03d1c5ca46e3 100644
@@ -32,6 +32,7 @@ CONFIG_SPL_POWER=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_ELF is not set
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/libretech_all_h3_cc_h5_defconfig +1 -0
index 524138aa2e17..13ff75821244 100644
@@ -8,6 +8,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SUN8I_EMAC=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
configs/libretech_all_h3_it_h5_defconfig +1 -0
index 1b0833358632..75280ee1e3b2 100644
@@ -9,6 +9,7 @@ CONFIG_SPL_SPI_SUNXI=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SPI_FLASH_XMC=y
 CONFIG_SPI=y
 CONFIG_USB_EHCI_HCD=y
configs/libretech_all_h5_cc_h5_defconfig +1 -0
index e0734f96735a..f42747e9466c 100644
@@ -9,6 +9,7 @@ CONFIG_SPL_SPI_SUNXI=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SPI_FLASH_XMC=y
 CONFIG_SUN8I_EMAC=y
 CONFIG_SPI=y
configs/liteboard_defconfig +1 -0
index 24e71bb48d88..85db3dd74685 100644
@@ -30,6 +30,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
configs/ls1021aqds_ddr4_nor_defconfig +1 -0
index 165e1a780fd2..92fa4f000ed3 100644
@@ -38,6 +38,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_GREPENV=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5
configs/ls1021aqds_ddr4_nor_lpuart_defconfig +1 -0
index 13ded158e68e..fcbaf9b685e0 100644
@@ -38,6 +38,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_GREPENV=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5
configs/ls1021aqds_nand_defconfig +1 -0
index 1423d732f8ae..19a21f4a0475 100644
@@ -66,6 +66,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_GREPENV=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5
configs/ls1021aqds_nor_SECURE_BOOT_defconfig +1 -0
index 1e6e650f47b3..727475f62264 100644
@@ -37,6 +37,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_GREPENV=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5
configs/ls1021aqds_nor_defconfig +1 -0
index 7cc61213e33b..82c6a1bdc3bc 100644
@@ -38,6 +38,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_GREPENV=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5
configs/ls1021aqds_nor_lpuart_defconfig +1 -0
index 04cb087ad55c..438a8ecf0ae6 100644
@@ -38,6 +38,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_GREPENV=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5
configs/ls1021aqds_qspi_defconfig +1 -0
index 2d560b2ea6d2..750a5a501e5f 100644
@@ -37,6 +37,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_GREPENV=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5
 CONFIG_CMD_MEMINFO=y
configs/ls1021aqds_sdcard_ifc_defconfig +1 -0
index 8e23ccc78895..cbb7c55944f9 100644
@@ -64,6 +64,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_GREPENV=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5
configs/ls1021aqds_sdcard_qspi_defconfig +1 -0
index ff8fbeb71778..71eff4582f93 100644
@@ -63,6 +63,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_GREPENV=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5
 CONFIG_CMD_MEMINFO=y
configs/ls1021atsn_qspi_defconfig +1 -0
index b368791280ac..4ee30728663e 100644
@@ -29,6 +29,7 @@ CONFIG_MISC_INIT_R=y
 CONFIG_ID_EEPROM=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x8000000
 CONFIG_CMD_GREPENV=y
 CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
 CONFIG_CMD_MEMINFO=y
configs/ls1021atsn_sdcard_defconfig +1 -0
index 64266afd013a..aad997833111 100644
@@ -55,6 +55,7 @@ CONFIG_SPL_MPC8XXX_INIT_DDR=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x8000000
 CONFIG_CMD_GREPENV=y
 CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
 CONFIG_CMD_MEMINFO=y
configs/ls1021atwr_nor_SECURE_BOOT_defconfig +1 -0
index 831c20fc6d96..b86a60fd3264 100644
@@ -35,6 +35,7 @@ CONFIG_MISC_INIT_R=y
 CONFIG_ID_EEPROM=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_GREPENV=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5
configs/ls1021atwr_nor_defconfig +1 -0
index c806309b0938..0410249b316b 100644
@@ -36,6 +36,7 @@ CONFIG_MISC_INIT_R=y
 CONFIG_ID_EEPROM=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_GREPENV=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5
configs/ls1021atwr_nor_lpuart_defconfig +1 -0
index de025930d85d..82e3b39a522e 100644
@@ -36,6 +36,7 @@ CONFIG_MISC_INIT_R=y
 CONFIG_ID_EEPROM=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_GREPENV=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5
configs/ls1021atwr_qspi_defconfig +1 -0
index b5b2cf13f923..9343203eacfd 100644
@@ -37,6 +37,7 @@ CONFIG_MISC_INIT_R=y
 CONFIG_ID_EEPROM=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_GREPENV=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5
 CONFIG_CMD_MEMINFO=y
configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +1 -0
index 2b76f0a2b960..d247d114f393 100644
@@ -62,6 +62,7 @@ CONFIG_SPL_MPC8XXX_INIT_DDR=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_GREPENV=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5
configs/ls1021atwr_sdcard_ifc_defconfig +1 -0
index 161fa1eebd6d..855657ca37a0 100644
@@ -63,6 +63,7 @@ CONFIG_SPL_MPC8XXX_INIT_DDR=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_GREPENV=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5
configs/ls1021atwr_sdcard_qspi_defconfig +1 -0
index 2dc01e19bbc5..a225f1a37bf7 100644
@@ -64,6 +64,7 @@ CONFIG_SPL_MPC8XXX_INIT_DDR=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_GREPENV=y
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5
 CONFIG_CMD_MEMINFO=y
configs/malta64_defconfig +1 -0
index be8689071665..e55b4a491455 100644
@@ -17,6 +17,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="malta # "
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=281
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_IDE=y
 # CONFIG_CMD_LOADB is not set
configs/malta64el_defconfig +1 -0
index 436bae8af87c..2bd6d7c26fd8 100644
@@ -19,6 +19,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="maltael # "
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=283
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_IDE=y
 # CONFIG_CMD_LOADB is not set
configs/malta_defconfig +1 -0
index 88c0d5628dee..3aff68b0188f 100644
@@ -16,6 +16,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="malta # "
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=281
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_IDE=y
 # CONFIG_CMD_LOADB is not set
configs/maltael_defconfig +1 -0
index 58d31d6a4432..e268fb63743f 100644
@@ -18,6 +18,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="maltael # "
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=283
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_IDE=y
 # CONFIG_CMD_LOADB is not set
configs/marsboard_defconfig +1 -0
index c7212ebcd3b9..307ba9ade977 100644
@@ -22,6 +22,7 @@ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
configs/mccmon6_nor_defconfig +1 -0
index 80b59cbb053b..4282058f4987 100644
@@ -33,6 +33,7 @@ CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
 CONFIG_SYS_OS_BASE=0x8180000
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_SPL=y
 CONFIG_CMD_SPL_NOR_OFS=0x09600000
 CONFIG_CMD_SPL_WRITE_SIZE=0x20000
configs/mccmon6_sd_defconfig +1 -0
index 6984256a1c2d..5469fa93ec98 100644
@@ -30,6 +30,7 @@ CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_NOR_SUPPORT=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_SPL=y
 CONFIG_CMD_SPL_NOR_OFS=0x09600000
 CONFIG_CMD_SPL_WRITE_SIZE=0x20000
configs/meerkat96_defconfig +1 -0
index 4fdcdafac205..25ecc70b0ac7 100644
@@ -19,6 +19,7 @@ CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 # CONFIG_CMD_BOOTD is not set
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
 CONFIG_CMD_MEMTEST=y
configs/microblaze-generic_defconfig +1 -0
index 8ece12630fb2..688f42afdb1f 100644
@@ -38,6 +38,7 @@ CONFIG_SYS_PROMPT="U-Boot-mONStR> "
 CONFIG_SYS_MAXARGS=15
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=544
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_SPL=y
 CONFIG_CMD_ASKENV=y
configs/microchip_mpfs_icicle_defconfig +1 -0
index 462c8b7f291b..cf093532b192 100644
@@ -16,6 +16,7 @@ CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_SYS_PROMPT="RISC-V # "
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=282
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_DM_MTD=y
configs/miqi-rk3288_defconfig +1 -0
index 7000b89311a2..34465f99a52f 100644
@@ -28,6 +28,7 @@ CONFIG_SPL_NO_BSS_LIMIT=y
 CONFIG_SPL_STACK=0xff718000
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
configs/mscc_jr2_defconfig +1 -0
index 04e15c61487b..f3b60e4e4f88 100644
@@ -30,6 +30,7 @@ CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=279
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
configs/mscc_luton_defconfig +1 -0
index b144dd4354c5..dc996936a9fa 100644
@@ -32,6 +32,7 @@ CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=281
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
configs/mscc_ocelot_defconfig +1 -0
index e088f3ca04ad..450ff6e0e174 100644
@@ -29,6 +29,7 @@ CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=282
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
configs/mscc_serval_defconfig +1 -0
index a56c5ebdecfe..fe2dcee9742c 100644
@@ -27,6 +27,7 @@ CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=282
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
configs/mscc_servalt_defconfig +1 -0
index cf1c4db1d384..5819827de03a 100644
@@ -26,6 +26,7 @@ CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=283
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
configs/mt7620_mt7530_rfb_defconfig +1 -0
index 9e409b60b275..8c64bb740a30 100644
@@ -29,6 +29,7 @@ CONFIG_SPL_BSS_START_ADDR=0x80010000
 CONFIG_SPL_BSS_MAX_SIZE=0x10000
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_NOR_SUPPORT=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_CRC32 is not set
configs/mt7620_rfb_defconfig +1 -0
index f3f5e3a88711..2aa6eb7e2697 100644
@@ -28,6 +28,7 @@ CONFIG_SPL_BSS_START_ADDR=0x80010000
 CONFIG_SPL_BSS_MAX_SIZE=0x10000
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_NOR_SUPPORT=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_CRC32 is not set
configs/mt7623a_unielec_u7623_02_defconfig +1 -0
index 06e85c2f57d7..c8ac1997ca58 100644
@@ -21,6 +21,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_PROMPT="U-Boot> "
 CONFIG_SYS_MAXARGS=8
 CONFIG_SYS_PBSIZE=1049
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_BOOTMENU=y
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_XIMG is not set
configs/mt7623n_bpir2_defconfig +1 -0
index 4320fe5bb626..4e8905b68f79 100644
@@ -21,6 +21,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_PROMPT="U-Boot> "
 CONFIG_SYS_MAXARGS=8
 CONFIG_SYS_PBSIZE=1049
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_BOOTMENU=y
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_XIMG is not set
configs/mt7628_rfb_defconfig +1 -0
index 7690213ab80c..14fc8b05e3cf 100644
@@ -28,6 +28,7 @@ CONFIG_SPL_BSS_START_ADDR=0x80010000
 CONFIG_SPL_BSS_MAX_SIZE=0x10000
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_NOR_SUPPORT=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_CRC32 is not set
configs/mt7629_rfb_defconfig +1 -0
index f5e3c26d66ce..a74c3edbf8e6 100644
@@ -37,6 +37,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot> "
 CONFIG_SYS_MAXARGS=8
 CONFIG_SYS_PBSIZE=1049
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_BOOTMENU=y
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_XIMG is not set
configs/mvebu_crb_cn9130_defconfig +1 -0
index 2541b8a22aee..bcffaefb9b19 100644
@@ -26,6 +26,7 @@ CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SYS_PROMPT="Marvell>> "
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=1051
+CONFIG_SYS_BOOTM_LEN=0x800000
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_MTD=y
configs/mvebu_db_armada8k_defconfig +1 -0
index d3633d04dcb3..2eee745ed67a 100644
@@ -25,6 +25,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_ARCH_EARLY_INIT_R=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SYS_MAXARGS=32
+CONFIG_SYS_BOOTM_LEN=0x800000
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
configs/mvebu_db_cn9130_defconfig +1 -0
index 7563873ef2e4..99d46c1a2a80 100644
@@ -28,6 +28,7 @@ CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SYS_PROMPT="Marvell>> "
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=1051
+CONFIG_SYS_BOOTM_LEN=0x800000
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_MTD=y
configs/mvebu_mcbin-88f8040_defconfig +1 -0
index d334c89ed315..8164beb14132 100644
@@ -26,6 +26,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_ARCH_EARLY_INIT_R=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SYS_MAXARGS=32
+CONFIG_SYS_BOOTM_LEN=0x800000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
configs/mvebu_puzzle-m801-88f8040_defconfig +1 -0
index 5cec3d8a682a..25ae690fe600 100644
@@ -30,6 +30,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_ARCH_EARLY_INIT_R=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SYS_MAXARGS=32
+CONFIG_SYS_BOOTM_LEN=0x800000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
configs/mx6cuboxi_defconfig +1 -0
index 1f15287369e3..0cded7fe8cb9 100644
@@ -34,6 +34,7 @@ CONFIG_SPL_I2C=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
 # CONFIG_CMD_PINMUX is not set
configs/mx6qsabrelite_defconfig +1 -0
index fa2c280a8d40..b8ae5915ffd6 100644
@@ -27,6 +27,7 @@ CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_MISC_INIT_R=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_SYS_ALT_MEMTEST=y
 # CONFIG_CMD_FLASH is not set
configs/mx6sabreauto_defconfig +1 -0
index d9d429b4f962..e73e90dc7e7a 100644
@@ -46,6 +46,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_DFU=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
configs/mx6sabresd_defconfig +1 -0
index ea0c76467462..9a47b47acbab 100644
@@ -42,6 +42,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_SPL=y
 CONFIG_CMD_SPL_WRITE_SIZE=0x20000
 # CONFIG_CMD_FLASH is not set
configs/mx6slevk_defconfig +1 -0
index 34f9b06deefb..d9668b4cf439 100644
@@ -18,6 +18,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/mx6slevk_spinor_defconfig +1 -0
index 5e54fd3eac42..7537dc8a1222 100644
@@ -20,6 +20,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/mx6slevk_spl_defconfig +1 -0
index c05c33d0df88..126630c10617 100644
@@ -34,6 +34,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
configs/mx6sllevk_defconfig +1 -0
index ec6843e57431..886090c1c0e8 100644
@@ -20,6 +20,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/mx6sllevk_plugin_defconfig +1 -0
index bd44298cb297..ab1df8435ed0 100644
@@ -21,6 +21,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/mx6sxsabreauto_defconfig +1 -0
index d32ea1ea3cac..483053599452 100644
@@ -17,6 +17,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/mx6sxsabresd_defconfig +1 -0
index 1985ff96dec3..549d880244dc 100644
@@ -19,6 +19,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/mx6ul_14x14_evk_defconfig +1 -0
index 784a5d97f086..e1e156c32a0c 100644
@@ -39,6 +39,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/mx6ul_9x9_evk_defconfig +1 -0
index de77e4fed6df..b210cefb0730 100644
@@ -36,6 +36,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/mx6ull_14x14_evk_defconfig +1 -0
index c48fd4adae0b..48dc67c0c98f 100644
@@ -19,6 +19,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/mx6ull_14x14_evk_plugin_defconfig +1 -0
index a9b7eb4aaff2..e3182a25d92f 100644
@@ -20,6 +20,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/mx6ulz_14x14_evk_defconfig +1 -0
index a3afd12d2cbc..ad949474865b 100644
@@ -19,6 +19,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/mx7dsabresd_defconfig +1 -0
index 0de958b621b9..7cc56ce707c4 100644
@@ -22,6 +22,7 @@ CONFIG_SYS_PBSIZE=532
 # CONFIG_BOOTM_NETBSD is not set
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_EXPORTENV is not set
configs/mx7dsabresd_qspi_defconfig +1 -0
index c52f45a97493..c0fa715f1f10 100644
@@ -21,6 +21,7 @@ CONFIG_SYS_PBSIZE=532
 # CONFIG_BOOTM_NETBSD is not set
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_EXPORTENV is not set
configs/mx7ulp_com_defconfig +1 -0
index 5b3b332f10d1..2b55fbd3b29a 100644
@@ -20,6 +20,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
configs/mx7ulp_evk_defconfig +1 -0
index 6a22040c035c..95cd22a59d8f 100644
@@ -21,6 +21,7 @@ CONFIG_SYS_MAXARGS=256
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_FUSE=y
 CONFIG_CMD_GPIO=y
configs/mx7ulp_evk_plugin_defconfig +1 -0
index ea03eb377171..45cdd74f09ab 100644
@@ -19,6 +19,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=256
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_FUSE=y
 CONFIG_CMD_GPIO=y
configs/myir_mys_6ulx_defconfig +1 -0
index f748b4dd66ba..90a1d3b078b2 100644
@@ -27,6 +27,7 @@ CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_DM=y
 CONFIG_CMD_GPIO=y
configs/nanopi_a64_defconfig +1 -0
index 8f3c242a7a93..226ccaa12ffe 100644
@@ -7,6 +7,7 @@ CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SUN8I_EMAC=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
configs/nanopi_neo2_defconfig +1 -0
index 66df94b33b9f..6fedf056ff72 100644
@@ -9,6 +9,7 @@ CONFIG_DRAM_ZQ=3881977
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SUN8I_EMAC=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
configs/nanopi_neo_plus2_defconfig +1 -0
index 60f26318429b..3f834b756dfd 100644
@@ -11,6 +11,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SUN8I_EMAC=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
configs/nanopi_r1s_h5_defconfig +1 -0
index 06c564ec8cd8..a0cf8ff0442f 100644
@@ -11,6 +11,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SUN8I_EMAC=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
configs/nitrogen6dl2g_defconfig +1 -0
index 2d653d4d0d33..1a9aff5e9a53 100644
@@ -32,6 +32,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_SYS_ALT_MEMTEST=y
 # CONFIG_CMD_FLASH is not set
configs/nitrogen6dl_defconfig +1 -0
index 282fea4508d1..16c1ffdaaa7c 100644
@@ -32,6 +32,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_SYS_ALT_MEMTEST=y
 # CONFIG_CMD_FLASH is not set
configs/nitrogen6q2g_defconfig +1 -0
index ec75ead6e20c..5637343eec13 100644
@@ -32,6 +32,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_SYS_ALT_MEMTEST=y
 # CONFIG_CMD_FLASH is not set
configs/nitrogen6q_defconfig +1 -0
index 1b999ecc9c17..dd36a3af5573 100644
@@ -32,6 +32,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_SYS_ALT_MEMTEST=y
 # CONFIG_CMD_FLASH is not set
configs/nitrogen6s1g_defconfig +1 -0
index 60edd7d6e321..473fdc65caae 100644
@@ -32,6 +32,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_SYS_ALT_MEMTEST=y
 # CONFIG_CMD_FLASH is not set
configs/nitrogen6s_defconfig +1 -0
index 7d1da4cf6b1a..57003d661c00 100644
@@ -32,6 +32,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_SYS_ALT_MEMTEST=y
 # CONFIG_CMD_FLASH is not set
configs/novena_defconfig +1 -0
index d4ab93850c4a..89e68991beb5 100644
@@ -38,6 +38,7 @@ CONFIG_SPL_I2C=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_EEPROM=y
 CONFIG_SYS_I2C_EEPROM_BUS=2
configs/nsim_700_defconfig +1 -0
index bcf954aa632d..60809400d263 100644
@@ -18,6 +18,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200n8"
 CONFIG_SYS_PROMPT="nsim# "
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=279
+CONFIG_SYS_BOOTM_LEN=0x2000000
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
configs/nsim_700be_defconfig +1 -0
index 5a09db2f9bf3..e021cc94cca6 100644
@@ -19,6 +19,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200n8"
 CONFIG_SYS_PROMPT="nsim# "
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=279
+CONFIG_SYS_BOOTM_LEN=0x2000000
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
configs/nsim_hs38_defconfig +1 -0
index ad8acec4e085..3c3d1812a791 100644
@@ -20,6 +20,7 @@ CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_SYS_PROMPT="nsim# "
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=279
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_DM=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
configs/nsim_hs38be_defconfig +1 -0
index 8a63e58263f3..9e1a14845df3 100644
@@ -20,6 +20,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200n8"
 CONFIG_SYS_PROMPT="nsim# "
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=279
+CONFIG_SYS_BOOTM_LEN=0x2000000
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
configs/o4-imx6ull-nano_defconfig +1 -0
index b634a82eaa7f..a8bfdf72a12a 100644
@@ -11,6 +11,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMINFO=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
configs/oceanic_5205_5inmfd_defconfig +1 -0
index 21468c426b52..1cd8e9f2b680 100644
@@ -12,6 +12,7 @@ CONFIG_SPL_SPI_SUNXI=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SUN8I_EMAC=y
 CONFIG_SPI=y
 CONFIG_USB_EHCI_HCD=y
configs/octeon_ebb7304_defconfig +1 -0
index dc2e215c0502..0a18b94295a6 100644
@@ -20,6 +20,7 @@ CONFIG_BOARD_LATE_INIT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
configs/octeon_nic23_defconfig +1 -0
index 23cdef3316c0..95e98c1161db 100644
@@ -27,6 +27,7 @@ CONFIG_LAST_STAGE_INIT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x4000000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/octeontx2_95xx_defconfig +1 -0
index 2b3748b2d049..d4f9f565aef8 100644
@@ -37,6 +37,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Marvell> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=1050
+CONFIG_SYS_BOOTM_LEN=0x10000000
 # CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
 CONFIG_CMD_MD5SUM=y
 CONFIG_MD5SUM_VERIFY=y
configs/octeontx2_96xx_defconfig +1 -0
index 0fd5b7212b82..aeb9f8a8b6de 100644
@@ -37,6 +37,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Marvell> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=1050
+CONFIG_SYS_BOOTM_LEN=0x10000000
 # CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
 CONFIG_CMD_MD5SUM=y
 CONFIG_MD5SUM_VERIFY=y
configs/octeontx_81xx_defconfig +1 -0
index 38ef7f41632d..6fe96f47553d 100644
@@ -37,6 +37,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Marvell> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=1050
+CONFIG_SYS_BOOTM_LEN=0x10000000
 # CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
 CONFIG_CMD_MD5SUM=y
 CONFIG_MD5SUM_VERIFY=y
configs/octeontx_83xx_defconfig +1 -0
index 371f61866970..5ba4fc1cad86 100644
@@ -35,6 +35,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Marvell> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=1050
+CONFIG_SYS_BOOTM_LEN=0x10000000
 # CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
 CONFIG_CMD_MD5SUM=y
 CONFIG_MD5SUM_VERIFY=y
configs/openpiton_riscv64_defconfig +1 -0
index f75c140cf4d4..98d6818e1be4 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
 # CONFIG_BOOTM_VXWORKS is not set
+CONFIG_SYS_BOOTM_LEN=0x10000000
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
configs/openpiton_riscv64_spl_defconfig +1 -0
index e9514f3da1de..8ae265f902b7 100644
@@ -43,6 +43,7 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
 # CONFIG_BOOTM_VXWORKS is not set
+CONFIG_SYS_BOOTM_LEN=0x10000000
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
configs/opos6uldev_defconfig +1 -0
index b76e272e2552..0fbe2b8b507e 100644
@@ -42,6 +42,7 @@ CONFIG_SYS_PBSIZE=535
 CONFIG_CMD_CONFIG=y
 CONFIG_CMD_LICENSE=y
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_ELF is not set
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
configs/orangepi_3_defconfig +1 -0
index 824f017dae45..dbca66d14292 100644
@@ -10,6 +10,7 @@ CONFIG_BLUETOOTH_DT_DEVICE_FIXUP="brcm,bcm4345c5"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x118000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_PHY_SUN50I_USB3=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
configs/orangepi_lite2_defconfig +1 -0
index cfce6cb0d478..14c880628122 100644
@@ -9,5 +9,6 @@ CONFIG_MMC0_CD_PIN="PF6"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x118000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
configs/orangepi_one_plus_defconfig +1 -0
index 63d3addbdd38..a4336332fc75 100644
@@ -9,5 +9,6 @@ CONFIG_MMC0_CD_PIN="PF6"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x118000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
configs/orangepi_pc2_defconfig +1 -0
index 7b12bf00ff24..d0cad2a74615 100644
@@ -11,6 +11,7 @@ CONFIG_SPL_SPI_SUNXI=y
 CONFIG_SPL_STACK=0x54000
 CONFIG_SPL_I2C=y
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MVTWSI=y
 CONFIG_SPI_FLASH_MACRONIX=y
configs/orangepi_prime_defconfig +1 -0
index 8c4cb57ef0f9..690a5f195b63 100644
@@ -9,6 +9,7 @@ CONFIG_DRAM_ZQ=3881977
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SUN8I_EMAC=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
configs/orangepi_win_defconfig +1 -0
index 830cbbaaeba3..7a9ca8e88a80 100644
@@ -9,6 +9,7 @@ CONFIG_SPL_SPI_SUNXI=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_REALTEK=y
 CONFIG_SUN8I_EMAC=y
configs/orangepi_zero2_defconfig +1 -0
index 62117548e2bc..cad7a7bb064f 100644
@@ -14,6 +14,7 @@ CONFIG_SPL_MAX_SIZE=0xbfa0
 CONFIG_SPL_STACK=0x58000
 CONFIG_SPL_I2C=y
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MVTWSI=y
 CONFIG_SYS_I2C_SLAVE=0x7f
configs/orangepi_zero_plus2_defconfig +1 -0
index 79040125dcc3..02f70ccf0c09 100644
@@ -11,6 +11,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SUN8I_EMAC=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
configs/orangepi_zero_plus_defconfig +1 -0
index 008384e46014..15520955f5ef 100644
@@ -9,6 +9,7 @@ CONFIG_DRAM_ZQ=3881977
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SUN8I_EMAC=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
configs/p2371-0000_defconfig +1 -0
index dcba51de8e56..3852f7ba07f7 100644
@@ -16,6 +16,7 @@ CONFIG_SYS_STDIO_DEREGISTER=y
 CONFIG_SYS_PROMPT="Tegra210 (P2371-0000) # "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=2089
+CONFIG_SYS_BOOTM_LEN=0x800000
 # CONFIG_CMD_IMI is not set
 CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
configs/p2371-2180_defconfig +1 -0
index f8a8407a7f81..bf5872203b3d 100644
@@ -19,6 +19,7 @@ CONFIG_SYS_STDIO_DEREGISTER=y
 CONFIG_SYS_PROMPT="Tegra210 (P2371-2180) # "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=2089
+CONFIG_SYS_BOOTM_LEN=0x800000
 # CONFIG_CMD_IMI is not set
 CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
configs/p2571_defconfig +1 -0
index 031549470f7b..5f57b1c01989 100644
@@ -17,6 +17,7 @@ CONFIG_SYS_STDIO_DEREGISTER=y
 CONFIG_SYS_PROMPT="Tegra210 (P2571) # "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=2084
+CONFIG_SYS_BOOTM_LEN=0x800000
 # CONFIG_CMD_IMI is not set
 CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
configs/p2771-0000-000_defconfig +1 -0
index 7b2fd5795a0f..ed23937fed50 100644
@@ -16,6 +16,7 @@ CONFIG_SYS_STDIO_DEREGISTER=y
 CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-000) # "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=2093
+CONFIG_SYS_BOOTM_LEN=0x800000
 # CONFIG_CMD_IMI is not set
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/p2771-0000-500_defconfig +1 -0
index 41621970f004..15e07a129429 100644
@@ -16,6 +16,7 @@ CONFIG_SYS_STDIO_DEREGISTER=y
 CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-500) # "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=2093
+CONFIG_SYS_BOOTM_LEN=0x800000
 # CONFIG_CMD_IMI is not set
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/p3450-0000_defconfig +1 -0
index 7604e8a12231..36a001b83b66 100644
@@ -20,6 +20,7 @@ CONFIG_SYS_STDIO_DEREGISTER=y
 CONFIG_SYS_PROMPT="Tegra210 (P3450-0000) # "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=2089
+CONFIG_SYS_BOOTM_LEN=0x800000
 # CONFIG_CMD_IMI is not set
 CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
configs/pcm058_defconfig +1 -0
index 132942bf554c..51fa5e8f8309 100644
@@ -42,6 +42,7 @@ CONFIG_SPL_WATCHDOG=y
 CONFIG_SPL_YMODEM_SUPPORT=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/pg_wcom_expu1_defconfig +1 -0
index a84e0cdd9eb1..bc58a631bed3 100644
@@ -46,6 +46,7 @@ CONFIG_MISC_INIT_R=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MEMINFO=y
configs/pg_wcom_expu1_update_defconfig +1 -0
index f04c3ac61476..5d70160bd3b9 100644
@@ -44,6 +44,7 @@ CONFIG_MISC_INIT_R=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MEMINFO=y
configs/pg_wcom_seli8_defconfig +1 -0
index 4380d8836351..a604d3248f2c 100644
@@ -46,6 +46,7 @@ CONFIG_MISC_INIT_R=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MEMINFO=y
configs/pg_wcom_seli8_update_defconfig +1 -0
index ca05e25d47e2..dfd6d627e1c1 100644
@@ -44,6 +44,7 @@ CONFIG_MISC_INIT_R=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_MEMINFO=y
configs/phycore-rk3288_defconfig +1 -0
index d791e9dcf8d4..519a705a40ed 100644
@@ -29,6 +29,7 @@ CONFIG_SPL_NO_BSS_LIMIT=y
 CONFIG_SPL_STACK=0xff718000
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
configs/phycore_pcl063_defconfig +1 -0
index b9d2a976636c..b7b1f3fb488f 100644
@@ -23,6 +23,7 @@ CONFIG_SPL_USB_HOST=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_DM=y
 CONFIG_CMD_GPIO=y
configs/phycore_pcl063_ull_defconfig +1 -0
index f172b065bfcf..7eb6850200aa 100644
@@ -23,6 +23,7 @@ CONFIG_SPL_USB_HOST=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_DM=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
configs/pico-dwarf-imx6ul_defconfig +1 -0
index cb9c6b8fece9..89dfaf475433 100644
@@ -31,6 +31,7 @@ CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_BOOTMENU=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_DFU=y
configs/pico-dwarf-imx7d_defconfig +1 -0
index 3adba803dd43..2577332a74dd 100644
@@ -36,6 +36,7 @@ CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 # CONFIG_CMD_BOOTD is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_BOOTMENU=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
configs/pico-hobbit-imx6ul_defconfig +1 -0
index 0a2f10d0f159..8a759c24d4b1 100644
@@ -32,6 +32,7 @@ CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_BOOTMENU=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_DFU=y
configs/pico-hobbit-imx7d_defconfig +1 -0
index cbfe346820f5..3f3fa1420b33 100644
@@ -36,6 +36,7 @@ CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 # CONFIG_CMD_BOOTD is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_BOOTMENU=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
configs/pico-imx6_defconfig +1 -0
index 086b3ee3ab25..94b352acfa0d 100644
@@ -37,6 +37,7 @@ CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_BOOTMENU=y
 CONFIG_CMD_SPL=y
 CONFIG_CMD_SPL_WRITE_SIZE=0x20000
configs/pico-imx6ul_defconfig +1 -0
index e8f6c434b66e..4e84627c27b9 100644
@@ -32,6 +32,7 @@ CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_BOOTMENU=y
 CONFIG_CMD_SPL=y
 CONFIG_CMD_SPL_WRITE_SIZE=0x20000
configs/pico-imx7d_bl33_defconfig +1 -0
index a9d21eb02c8d..0220fb76b1a4 100644
@@ -39,6 +39,7 @@ CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 # CONFIG_CMD_BOOTD is not set
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_SPL=y
 CONFIG_CMD_SPL_WRITE_SIZE=0x20000
 CONFIG_CMD_MEMTEST=y
configs/pico-imx7d_defconfig +1 -0
index 6a2f87a8bb17..a004d3c68965 100644
@@ -36,6 +36,7 @@ CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 # CONFIG_CMD_BOOTD is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_BOOTMENU=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
configs/pico-imx8mq_defconfig +1 -0
index 8e27f7231429..6d4bebd6dcf2 100644
@@ -49,6 +49,7 @@ CONFIG_SPL_WATCHDOG=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=64
 # CONFIG_BOOTM_NETBSD is not set
+CONFIG_SYS_BOOTM_LEN=0x8000000
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 # CONFIG_CMD_CRC32 is not set
configs/pico-nymph-imx7d_defconfig +1 -0
index 3adba803dd43..2577332a74dd 100644
@@ -36,6 +36,7 @@ CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 # CONFIG_CMD_BOOTD is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_BOOTMENU=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
configs/pico-pi-imx6ul_defconfig +1 -0
index a184393abd22..c50a8317cd51 100644
@@ -32,6 +32,7 @@ CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_BOOTMENU=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_DFU=y
configs/pico-pi-imx7d_defconfig +1 -0
index 79aa398e1e81..564bdb6d43f3 100644
@@ -36,6 +36,7 @@ CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 # CONFIG_CMD_BOOTD is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_BOOTMENU=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
configs/pine64-lts_defconfig +1 -0
index c6b4f7bf1438..3f9ea1e329f1 100644
@@ -12,6 +12,7 @@ CONFIG_SPL_SPI_SUNXI=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SUN8I_EMAC=y
configs/pine64_plus_defconfig +1 -0
index 7dbe061790cd..62608f93bdb5 100644
@@ -8,6 +8,7 @@ CONFIG_PINE64_DT_SELECTION=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_OF_LIST="sun50i-a64-pine64 sun50i-a64-pine64-plus"
 CONFIG_PHY_REALTEK=y
 CONFIG_SUN8I_EMAC=y
configs/pine_h64_defconfig +1 -0
index 2cddcf58301e..2f511c805173 100644
@@ -13,6 +13,7 @@ CONFIG_SPL_SPI_SUNXI=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x118000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SUN8I_EMAC=y
configs/pinebook_defconfig +1 -0
index bf070aab8b34..982f68143b9d 100644
@@ -10,6 +10,7 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_R_I2C_ENABLE=y
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MVTWSI=y
 CONFIG_DM_REGULATOR_FIXED=y
configs/pinephone_defconfig +1 -0
index d882c0cc8802..905b47d29e6a 100644
@@ -12,6 +12,7 @@ CONFIG_PINEPHONE_DT_SELECTION=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_OF_LIST="sun50i-a64-pinephone-1.1 sun50i-a64-pinephone-1.2"
 CONFIG_LED_STATUS=y
 CONFIG_LED_STATUS_GPIO=y
configs/pinetab_defconfig +1 -0
index f90cb0d1f818..e20d20a2fd5e 100644
@@ -10,3 +10,4 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
configs/pomelo_defconfig +1 -0
index 13b1d7b628b7..515624fd42e9 100644
@@ -18,6 +18,7 @@ CONFIG_LAST_STAGE_INIT=y
 CONFIG_SYS_PROMPT="pomelo#"
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=280
+CONFIG_SYS_BOOTM_LEN=0x3c00000
 CONFIG_OF_CONTROL=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM_PCI_COMPAT=y
configs/popmetal-rk3288_defconfig +1 -0
index 5b5039e290be..7b024437c2ba 100644
@@ -29,6 +29,7 @@ CONFIG_SPL_NO_BSS_LIMIT=y
 CONFIG_SPL_STACK=0xff718000
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
configs/qemu-riscv32_defconfig +1 -0
index 1f169e1a34f6..9634d7f77f11 100644
@@ -13,6 +13,7 @@ CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_BOOTEFI_SELFTEST=y
 CONFIG_CMD_NVEDIT_EFI=y
 # CONFIG_CMD_MII is not set
configs/qemu-riscv32_smode_defconfig +1 -0
index 6f501a8798c6..1c5a0617aa8d 100644
@@ -14,6 +14,7 @@ CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_BOOTEFI_SELFTEST=y
 CONFIG_CMD_NVEDIT_EFI=y
 # CONFIG_CMD_MII is not set
configs/qemu-riscv32_spl_defconfig +1 -0
index 2bc7b9fbd0f0..2421c9a37194 100644
@@ -20,6 +20,7 @@ CONFIG_SPL_BSS_START_ADDR=0x84000000
 CONFIG_SYS_SPL_MALLOC=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x4000000
 # CONFIG_CMD_MII is not set
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM_MTD=y
configs/qemu-riscv64_defconfig +1 -0
index 95dc1b47699d..d5eae95c80fd 100644
@@ -14,6 +14,7 @@ CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_BOOTEFI_SELFTEST=y
 CONFIG_CMD_NVEDIT_EFI=y
 # CONFIG_CMD_MII is not set
configs/qemu-riscv64_smode_defconfig +1 -0
index 3eb3ea756e4e..2861d07f97e7 100644
@@ -17,6 +17,7 @@ CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_BOOTEFI_SELFTEST=y
 CONFIG_CMD_NVEDIT_EFI=y
 # CONFIG_CMD_MII is not set
configs/qemu-riscv64_spl_defconfig +1 -0
index e39accf94005..1ecfa27ce29a 100644
@@ -20,6 +20,7 @@ CONFIG_SPL_BSS_START_ADDR=0x84000000
 CONFIG_SYS_SPL_MALLOC=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x4000000
 # CONFIG_CMD_MII is not set
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM_MTD=y
configs/qemu_arm_defconfig +1 -0
index d14a7adc5df3..50945472315a 100644
@@ -28,6 +28,7 @@ CONFIG_USE_PREBOOT=y
 CONFIG_PCI_INIT_R=y
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_BOOTEFI_SELFTEST=y
 CONFIG_CMD_NVEDIT_EFI=y
 CONFIG_CMD_DFU=y
configs/riotboard_defconfig +1 -0
index a2ef6187f827..5d93bdf148b2 100644
@@ -36,6 +36,7 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_SPL_ARGS_ADDR=0x13000000
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
configs/rock-pi-n8-rk3288_defconfig +1 -0
index 7abb343ad698..87b050f5dc84 100644
@@ -28,6 +28,7 @@ CONFIG_SPL_NO_BSS_LIMIT=y
 CONFIG_SPL_STACK=0xff718000
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_SPL=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
configs/rock2_defconfig +1 -0
index c06ab641c300..dcececdc315c 100644
@@ -29,6 +29,7 @@ CONFIG_SPL_NO_BSS_LIMIT=y
 CONFIG_SPL_STACK=0xff718000
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
configs/sama7g5ek_mmc1_defconfig +1 -0
index 20ca98821a06..860362e15897 100644
@@ -28,6 +28,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x2000000
 # CONFIG_CMD_IMI is not set
 CONFIG_CMD_MD5SUM=y
 CONFIG_CMD_MEMTEST=y
configs/sama7g5ek_mmc_defconfig +1 -0
index c9f62a8ebe54..bc2852f0916f 100644
@@ -28,6 +28,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x2000000
 # CONFIG_CMD_IMI is not set
 CONFIG_CMD_MD5SUM=y
 CONFIG_CMD_MEMTEST=y
configs/seeed_npi_imx6ull_defconfig +1 -0
index e12a7d850606..79917b0349ac 100644
@@ -28,6 +28,7 @@ CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_DM=y
 CONFIG_CMD_GPIO=y
configs/sifive_unleashed_defconfig +1 -0
index 84bc49c0f23c..99faabaa2ff2 100644
@@ -34,6 +34,7 @@ CONFIG_SPL_DM_RESET=y
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_CLK=y
configs/sifive_unmatched_defconfig +1 -0
index 02d4e54b0717..c390af26897f 100644
@@ -38,6 +38,7 @@ CONFIG_SPL_DM_RESET=y
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_EEPROM=y
 CONFIG_CMD_MEMINFO=y
 CONFIG_CMD_PWM=y
configs/smegw01_defconfig +1 -0
index 25a75d1aa5ac..a161c04c64b9 100644
@@ -24,6 +24,7 @@ CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 # CONFIG_CMD_BOOTD is not set
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
 CONFIG_CMD_MEMTEST=y
configs/socfpga_agilex_atf_defconfig +1 -0
index 8f2d26e43d06..bdfe764d9e41 100644
@@ -48,6 +48,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="SOCFPGA_AGILEX # "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=2082
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/socfpga_agilex_defconfig +1 -0
index 7ae2b164a02d..e2d869610cf5 100644
@@ -42,6 +42,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="SOCFPGA_AGILEX # "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=2082
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/socfpga_agilex_vab_defconfig +1 -0
index 2beadc7ff7ac..6f15b3e9622a 100644
@@ -49,6 +49,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="SOCFPGA_AGILEX # "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=2082
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/socfpga_n5x_atf_defconfig +1 -0
index 2917ece783da..37c843631881 100644
@@ -47,6 +47,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="SOCFPGA_N5X # "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=2079
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/socfpga_n5x_defconfig +1 -0
index 92d6045c6a7f..5f415b7ad4f9 100644
@@ -39,6 +39,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="SOCFPGA_N5X # "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=2079
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/socfpga_n5x_vab_defconfig +1 -0
index b9358fcc5d01..a57d54a7f271 100644
@@ -48,6 +48,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="SOCFPGA_N5X # "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=2079
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/socfpga_secu1_defconfig +1 -0
index 4a244e17bc48..83e24402a887 100644
@@ -44,6 +44,7 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=0x1
 CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SYS_MAXARGS=32
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_EEPROM=y
configs/socfpga_stratix10_atf_defconfig +1 -0
index 6c8ea81b67b6..6be4210c7d6e 100644
@@ -47,6 +47,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="SOCFPGA_STRATIX10 # "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=2085
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_MEMTEST=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
configs/socfpga_stratix10_defconfig +1 -0
index 6aff07d77841..07e9f20a41a2 100644
@@ -43,6 +43,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="SOCFPGA_STRATIX10 # "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=2085
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_MEMTEST=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
configs/socfpga_vining_fpga_defconfig +1 -0
index 0f4aa9051477..d0c87416efd0 100644
@@ -35,6 +35,7 @@ CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_CMDLINE_PS_SUPPORT=y
 CONFIG_SYS_MAXARGS=32
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
 CONFIG_CMD_EEPROM=y
configs/socrates_defconfig +1 -0
index 621573653785..60a38abc8e3a 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_REGINFO=y
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
 # CONFIG_BOOTM_VXWORKS is not set
+CONFIG_SYS_BOOTM_LEN=0x800000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_DM=y
 CONFIG_CMD_I2C=y
configs/somlabs_visionsom_6ull_defconfig +1 -0
index b99266fec74a..bfcadcb8fab0 100644
@@ -19,6 +19,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
configs/sopine_baseboard_defconfig +1 -0
index 576e86493a24..55116f72d0d3 100644
@@ -13,6 +13,7 @@ CONFIG_SPL_SPI_SUNXI=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SUN8I_EMAC=y
configs/stemmy_defconfig +1 -0
index 28a312987373..7fc0a39872c9 100644
@@ -21,6 +21,7 @@ CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=276
 CONFIG_CMD_CONFIG=y
 CONFIG_CMD_LICENSE=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_DM=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
configs/stih410-b2260_defconfig +1 -0
index cb8c73afd474..c9be056cf624 100644
@@ -19,6 +19,7 @@ CONFIG_BOOTARGS="console=ttyAS1,115200 CONSOLE=/dev/ttyAS1 consoleblank=0 root=/
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_SYS_PROMPT="stih410-b2260 => "
 CONFIG_SYS_PBSIZE=1058
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
configs/stm32mp13_defconfig +1 -0
index b5dcec78f516..f5b62628833e 100644
@@ -18,6 +18,7 @@ CONFIG_FIT=y
 CONFIG_BOOTDELAY=1
 CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
 CONFIG_SYS_PROMPT="STM32MP> "
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_ADTIMG=y
 CONFIG_CMD_ERASEENV=y
 CONFIG_CMD_MEMINFO=y
configs/stm32mp15-icore-stm32mp1-ctouch2_defconfig +1 -0
index 76a450952fc1..c70329cd4a69 100644
@@ -32,6 +32,7 @@ CONFIG_SPL_I2C=y
 CONFIG_SPL_POWER=y
 CONFIG_SYS_PROMPT="STM32MP> "
 CONFIG_SYS_PBSIZE=1050
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_ADTIMG=y
 CONFIG_CMD_ERASEENV=y
 CONFIG_CMD_MEMINFO=y
configs/stm32mp15-icore-stm32mp1-edimm2.2_defconfig +1 -0
index d413d2cac4b6..838fd89eb993 100644
@@ -32,6 +32,7 @@ CONFIG_SPL_I2C=y
 CONFIG_SPL_POWER=y
 CONFIG_SYS_PROMPT="STM32MP> "
 CONFIG_SYS_PBSIZE=1050
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_ADTIMG=y
 CONFIG_CMD_ERASEENV=y
 CONFIG_CMD_MEMINFO=y
configs/stm32mp15-microgea-stm32mp1-microdev2-of7_defconfig +1 -0
index dd270975508c..d503c1a36fe7 100644
@@ -32,6 +32,7 @@ CONFIG_SPL_I2C=y
 CONFIG_SPL_POWER=y
 CONFIG_SYS_PROMPT="STM32MP> "
 CONFIG_SYS_PBSIZE=1050
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_ADTIMG=y
 CONFIG_CMD_ERASEENV=y
 CONFIG_CMD_MEMINFO=y
configs/stm32mp15-microgea-stm32mp1-microdev2_defconfig +1 -0
index 54a5385926f1..c2792aaad301 100644
@@ -32,6 +32,7 @@ CONFIG_SPL_I2C=y
 CONFIG_SPL_POWER=y
 CONFIG_SYS_PROMPT="STM32MP> "
 CONFIG_SYS_PBSIZE=1050
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_ADTIMG=y
 CONFIG_CMD_ERASEENV=y
 CONFIG_CMD_MEMINFO=y
configs/stm32mp15_basic_defconfig +1 -0
index a17dbed6590e..416d92bf1bb6 100644
@@ -47,6 +47,7 @@ CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
 CONFIG_FDT_SIMPLEFB=y
 CONFIG_SYS_PROMPT="STM32MP> "
 CONFIG_SYS_PBSIZE=1050
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_ADTIMG=y
 CONFIG_CMD_ERASEENV=y
 CONFIG_CMD_NVEDIT_EFI=y
configs/stm32mp15_defconfig +1 -0
index 48185d32baa7..3452403c61db 100644
@@ -23,6 +23,7 @@ CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
 CONFIG_FDT_SIMPLEFB=y
 CONFIG_SYS_PROMPT="STM32MP> "
 CONFIG_SYS_PBSIZE=1050
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_ADTIMG=y
 CONFIG_CMD_ERASEENV=y
 CONFIG_CMD_NVEDIT_EFI=y
configs/stm32mp15_dhcom_basic_defconfig +1 -0
index 178c51687bec..4f478c13120c 100644
@@ -52,6 +52,7 @@ CONFIG_SPL_DFU=y
 CONFIG_SPL_TARGET="u-boot.itb"
 CONFIG_SYS_PROMPT="STM32MP> "
 CONFIG_SYS_PBSIZE=1050
+CONFIG_SYS_BOOTM_LEN=0x2000000
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_EXPORTENV is not set
 CONFIG_CMD_EEPROM=y
configs/stm32mp15_dhcor_basic_defconfig +1 -0
index 67a2c249007c..01fbb05123a9 100644
@@ -50,6 +50,7 @@ CONFIG_SPL_DFU=y
 CONFIG_SPL_TARGET="u-boot.itb"
 CONFIG_SYS_PROMPT="STM32MP> "
 CONFIG_SYS_PBSIZE=1050
+CONFIG_SYS_BOOTM_LEN=0x2000000
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_EXPORTENV is not set
 CONFIG_CMD_EEPROM=y
configs/stm32mp15_trusted_defconfig +1 -0
index 7cb430fc3282..e14668042fa2 100644
@@ -24,6 +24,7 @@ CONFIG_BOOTCOMMAND="run bootcmd_stm32mp"
 CONFIG_FDT_SIMPLEFB=y
 CONFIG_SYS_PROMPT="STM32MP> "
 CONFIG_SYS_PBSIZE=1050
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_ADTIMG=y
 CONFIG_CMD_ERASEENV=y
 CONFIG_CMD_NVEDIT_EFI=y
configs/synquacer_developerbox_defconfig +1 -0
index 5e4accf4b127..9ddc80fe17df 100644
@@ -17,6 +17,7 @@ CONFIG_FIT=y
 CONFIG_BOOTSTAGE_STASH_SIZE=4096
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=128
+CONFIG_SYS_BOOTM_LEN=0x800000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_ERASEENV=y
 CONFIG_CMD_NVEDIT_EFI=y
configs/syzygy_hub_defconfig +1 -0
index 31a550031dae..5d0a85443f19 100644
@@ -39,6 +39,7 @@ CONFIG_SPL_OS_BOOT=y
 CONFIG_SYS_SPL_ARGS_ADDR=0x10000000
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=2071
+CONFIG_SYS_BOOTM_LEN=0x3c00000
 CONFIG_CMD_FPGA_LOADBP=y
 CONFIG_CMD_FPGA_LOADFS=y
 CONFIG_CMD_FPGA_LOADMK=y
configs/tanix_tx6_defconfig +1 -0
index d1f12fba9bb0..84dbf106d495 100644
@@ -10,3 +10,4 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_STACK=0x118000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
configs/tb100_defconfig +1 -0
index 575bf2dae284..aebaa6ad1476 100644
@@ -15,6 +15,7 @@ CONFIG_BOOTARGS="console=ttyS0,115200n8"
 CONFIG_SYS_PROMPT="[tb100]:~# "
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=284
+CONFIG_SYS_BOOTM_LEN=0x2000000
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
configs/tbs2910_defconfig +1 -0
index 892d7c60d283..f0ecfd049d65 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_BOOTZ=y
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
 # CONFIG_BOOTM_VXWORKS is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_FDT is not set
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_GPIO=y
configs/teres_i_defconfig +1 -0
index cd6d825715e8..6f202dc8a434 100644
@@ -11,6 +11,7 @@ CONFIG_I2C0_ENABLE=y
 CONFIG_PREBOOT="setenv usb_pgood_delay 2000; usb start"
 CONFIG_SPL_STACK=0x54000
 CONFIG_SYS_PBSIZE=1024
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MVTWSI=y
 CONFIG_DM_REGULATOR_FIXED=y
configs/thunderx_88xx_defconfig +1 -0
index 03b6201591f8..71fbf2122cdd 100644
@@ -26,6 +26,7 @@ CONFIG_SYS_PROMPT="ThunderX_88XX> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=544
+CONFIG_SYS_BOOTM_LEN=0x800000
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 # CONFIG_CMD_EDITENV is not set
configs/tinker-rk3288_defconfig +1 -0
index ce12b79ac471..839b93284f8c 100644
@@ -31,6 +31,7 @@ CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 CONFIG_SPL_I2C=y
 CONFIG_SPL_POWER=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
configs/tinker-s-rk3288_defconfig +1 -0
index 8dede27efcc9..886c6a933a7c 100644
@@ -31,6 +31,7 @@ CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x300000
 CONFIG_SPL_I2C=y
 CONFIG_SPL_POWER=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
configs/topic_miami_defconfig +1 -0
index a11a17905cb9..986368a6dd36 100644
@@ -39,6 +39,7 @@ CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
 CONFIG_SYS_PROMPT="zynq-uboot> "
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=2077
+CONFIG_SYS_BOOTM_LEN=0x3c00000
 CONFIG_CMD_THOR_DOWNLOAD=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_DFU=y
configs/topic_miamilite_defconfig +1 -0
index f962f37d7ebe..0db956bd1c4c 100644
@@ -39,6 +39,7 @@ CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
 CONFIG_SYS_PROMPT="zynq-uboot> "
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=2077
+CONFIG_SYS_BOOTM_LEN=0x3c00000
 CONFIG_CMD_THOR_DOWNLOAD=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_DFU=y
configs/topic_miamiplus_defconfig +1 -0
index dc71856f7204..b0e8ca82e339 100644
@@ -39,6 +39,7 @@ CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
 CONFIG_SYS_PROMPT="zynq-uboot> "
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=2077
+CONFIG_SYS_BOOTM_LEN=0x3c00000
 CONFIG_CMD_THOR_DOWNLOAD=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_DFU=y
configs/tqma6dl_mba6_mmc_defconfig +1 -0
index a02ee9278524..febe6eb162d6 100644
@@ -19,6 +19,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_EEPROM=y
 CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
 CONFIG_CMD_GPIO=y
configs/tqma6dl_mba6_spi_defconfig +1 -0
index 8f7e0ac1019f..c6f3eb4900f2 100644
@@ -22,6 +22,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_EEPROM=y
 CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
 CONFIG_CMD_GPIO=y
configs/tqma6q_mba6_mmc_defconfig +1 -0
index 48822f388c8f..53c8bca51939 100644
@@ -19,6 +19,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_EEPROM=y
 CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
 CONFIG_CMD_GPIO=y
configs/tqma6q_mba6_spi_defconfig +1 -0
index ed774262aecf..ea551ab85431 100644
@@ -22,6 +22,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_EEPROM=y
 CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
 CONFIG_CMD_GPIO=y
configs/tqma6s_mba6_mmc_defconfig +1 -0
index 9400c6481211..966c412ae9ce 100644
@@ -19,6 +19,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_EEPROM=y
 CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
 CONFIG_CMD_GPIO=y
configs/tqma6s_mba6_spi_defconfig +1 -0
index ddbf9a757e6e..719bef506f61 100644
@@ -22,6 +22,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_EEPROM=y
 CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
 CONFIG_CMD_GPIO=y
configs/tuge1_defconfig +1 -0
index 1bd48cb82a14..0d1c99c62c50 100644
@@ -134,6 +134,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
configs/tuxx1_defconfig +1 -0
index 8f273da2f1ff..3fe731fd188a 100644
@@ -156,6 +156,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_CBSIZE=512
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x2000000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
configs/udoo_defconfig +1 -0
index a1d2d7f2e475..cc3001fa84aa 100644
@@ -29,6 +29,7 @@ CONFIG_SPL_I2C=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
 # CONFIG_CMD_PINMUX is not set
configs/udoo_neo_defconfig +1 -0
index e5ba2f3d0902..074fb725aedb 100644
@@ -29,6 +29,7 @@ CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot-dtb.img"
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_MMC=y
 # CONFIG_CMD_PINMUX is not set
configs/uniphier_ld4_sld8_defconfig +1 -0
index 72306ab25eb8..5de9a6883432 100644
@@ -27,6 +27,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_NOR_SUPPORT=y
 CONFIG_SPL_TARGET="u-boot-with-spl.bin"
 CONFIG_CMD_CONFIG=y
+CONFIG_SYS_BOOTM_LEN=0x2000000
 # CONFIG_CMD_XIMG is not set
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10
 CONFIG_CMD_GPIO=y
configs/uniphier_v7_defconfig +1 -0
index a448d1cb4be3..b6b5ca58c272 100644
@@ -27,6 +27,7 @@ CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_NOR_SUPPORT=y
 CONFIG_SPL_TARGET="u-boot-with-spl.bin"
 CONFIG_CMD_CONFIG=y
+CONFIG_SYS_BOOTM_LEN=0x2000000
 # CONFIG_CMD_XIMG is not set
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10
 CONFIG_CMD_GPIO=y
configs/uniphier_v8_defconfig +1 -0
index db986cf13b84..eccfb0dbb167 100644
@@ -16,6 +16,7 @@ CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="env exist ${bootdev}preboot && run ${bootdev}preboot"
 CONFIG_LOGLEVEL=6
 CONFIG_CMD_CONFIG=y
+CONFIG_SYS_BOOTM_LEN=0x2000000
 # CONFIG_CMD_XIMG is not set
 CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10
 CONFIG_CMD_GPIO=y
configs/variscite_dart6ul_defconfig +1 -0
index 0f9cc8d82d3b..9a0e02d8c784 100644
@@ -23,6 +23,7 @@ CONFIG_SPL_USB_HOST=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_DM=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
configs/vining_2000_defconfig +1 -0
index 8d87857ba0a4..af55a4b834bc 100644
@@ -43,6 +43,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
configs/vyasa-rk3288_defconfig +1 -0
index cbaf970e6ad9..516e2cc32b8c 100644
@@ -34,6 +34,7 @@ CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x8800
 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x8000
 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x10
+CONFIG_SYS_BOOTM_LEN=0x4000000
 CONFIG_CMD_SPL=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
configs/wandboard_defconfig +1 -0
index 8b0533ce585c..aa81cb4eb27f 100644
@@ -41,6 +41,7 @@ CONFIG_SPL_I2C=y
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
configs/warp7_bl33_defconfig +1 -0
index a50a1c8bc770..9319cd30694c 100644
@@ -22,6 +22,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
configs/warp7_defconfig +1 -0
index 40f9e502e92f..7ec165c423fd 100644
@@ -27,6 +27,7 @@ CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 # CONFIG_CMD_BOOTD is not set
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
 CONFIG_CMD_MEMTEST=y
configs/warp_defconfig +1 -0
index 4c9f7051fefc..b722414373aa 100644
@@ -19,6 +19,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532
 CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
 CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
configs/xenguest_arm64_defconfig +1 -0
index fec124204b73..31fb4fde40e2 100644
@@ -15,6 +15,7 @@ CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=1051
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_BOOTD is not set
+CONFIG_SYS_BOOTM_LEN=0x800000
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_GO is not set
 # CONFIG_CMD_IMI is not set
configs/xilinx_versal_virt_defconfig +1 -0
index 78a0cc382807..a91fa80e5ff2 100644
@@ -24,6 +24,7 @@ CONFIG_CLOCKS=y
 CONFIG_SYS_PROMPT="Versal> "
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=2073
+CONFIG_SYS_BOOTM_LEN=0x6400000
 CONFIG_CMD_BOOTMENU=y
 CONFIG_CMD_NVEDIT_EFI=y
 CONFIG_CMD_MEMTEST=y
configs/xilinx_zynq_virt_defconfig +1 -0
index 92ef35c64751..aef971fb71f7 100644
@@ -47,6 +47,7 @@ CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=2071
 # CONFIG_BOOTM_NETBSD is not set
+CONFIG_SYS_BOOTM_LEN=0x3c00000
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_THOR_DOWNLOAD=y
 CONFIG_CMD_MEMTEST=y
configs/xilinx_zynqmp_r5_defconfig +1 -0
index 1ae634903063..1784792ce49c 100644
@@ -18,6 +18,7 @@ CONFIG_SYS_PROMPT="ZynqMP r5> "
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_CBSIZE=256
 CONFIG_SYS_PBSIZE=284
+CONFIG_SYS_BOOTM_LEN=0x3c00000
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_BOOTSTAGE=y
 CONFIG_OF_EMBED=y
configs/xilinx_zynqmp_virt_defconfig +1 -0
index 7f0ed8bc2250..b4ba161f3a31 100644
@@ -55,6 +55,7 @@ CONFIG_SPL_ATF=y
 CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=2073
+CONFIG_SYS_BOOTM_LEN=0x6400000
 CONFIG_CMD_BOOTMENU=y
 CONFIG_CMD_THOR_DOWNLOAD=y
 CONFIG_CMD_NVEDIT_EFI=y
include/configs/M5208EVBE.h +0 -1
index 14b35d7ef507..c773164c869b 100644
@@ -78,7 +78,6 @@
  * the maximum mapped by the Linux kernel during initialization ??
  */
 #define CONFIG_SYS_BOOTMAPSZ		(CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
-#define CONFIG_SYS_BOOTM_LEN		(CONFIG_SYS_SDRAM_SIZE << 20)
 
 /* FLASH organization */
 #ifdef CONFIG_SYS_FLASH_CFI
include/configs/M5235EVB.h +0 -1
index 762d1dd94b1c..79448cf44048 100644
@@ -84,7 +84,6 @@
  */
 /* Initial Memory map for Linux */
 #define CONFIG_SYS_BOOTMAPSZ		(CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
-#define CONFIG_SYS_BOOTM_LEN		(CONFIG_SYS_SDRAM_SIZE << 20)
 
 /*-----------------------------------------------------------------------
  * FLASH organization
include/configs/M5253DEMO.h +0 -1
index 840d3b4672e6..cac9b24ead8e 100644
@@ -90,7 +90,6 @@
  * the maximum mapped by the Linux kernel during initialization ??
  */
 #define CONFIG_SYS_BOOTMAPSZ		(CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
-#define CONFIG_SYS_BOOTM_LEN		(CONFIG_SYS_SDRAM_SIZE << 20)
 
 /* FLASH organization */
 #define CONFIG_SYS_FLASH_BASE		(CONFIG_SYS_CS0_BASE)
include/configs/M5275EVB.h +0 -1
index 4f6fc6d8cb9f..292578fc15b9 100644
@@ -87,7 +87,6 @@
  * the maximum mapped by the Linux kernel during initialization ??
  */
 #define CONFIG_SYS_BOOTMAPSZ		(CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
-#define CONFIG_SYS_BOOTM_LEN		(CONFIG_SYS_SDRAM_SIZE << 20)
 
 /*-----------------------------------------------------------------------
  * FLASH organization
include/configs/M53017EVB.h +0 -1
index 90b0d41078ad..4d8f752777d0 100644
@@ -92,7 +92,6 @@
  * the maximum mapped by the Linux kernel during initialization ??
  */
 #define CONFIG_SYS_BOOTMAPSZ		(CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
-#define CONFIG_SYS_BOOTM_LEN		(CONFIG_SYS_SDRAM_SIZE << 20)
 
 /*-----------------------------------------------------------------------
  * FLASH organization
include/configs/M5329EVB.h +0 -1
index 6eaa660e11fb..87d3e8fb153b 100644
@@ -86,7 +86,6 @@
  * the maximum mapped by the Linux kernel during initialization ??
  */
 #define CONFIG_SYS_BOOTMAPSZ		(CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
-#define CONFIG_SYS_BOOTM_LEN		(CONFIG_SYS_SDRAM_SIZE << 20)
 
 /*-----------------------------------------------------------------------
  * FLASH organization
include/configs/M5373EVB.h +0 -1
index 2e3988f6c723..d920587c3790 100644
@@ -88,7 +88,6 @@
  * the maximum mapped by the Linux kernel during initialization ??
  */
 #define CONFIG_SYS_BOOTMAPSZ		(CONFIG_SYS_SDRAM_BASE + (CONFIG_SYS_SDRAM_SIZE << 20))
-#define CONFIG_SYS_BOOTM_LEN		(CONFIG_SYS_SDRAM_SIZE << 20)
 
 /*-----------------------------------------------------------------------
  * FLASH organization
include/configs/MPC837XERDB.h +0 -1
index b6621f9a0728..d56d60306abf 100644
@@ -248,7 +248,6 @@
  * the maximum mapped by the Linux kernel during initialization.
  */
 #define CONFIG_SYS_BOOTMAPSZ	(256 << 20) /* Initial Memory map for Linux */
-#define CONFIG_SYS_BOOTM_LEN	(64 << 20)	/* Increase max gunzip size */
 
 /*
  * Environment Configuration
include/configs/MPC8548CDS.h +0 -1
index 2eb33812f76a..c3c68071f2f2 100644
@@ -356,7 +356,6 @@
  * the maximum mapped by the Linux kernel during initialization.
  */
 #define CONFIG_SYS_BOOTMAPSZ	(64 << 20)	/* Initial Memory map for Linux*/
-#define CONFIG_SYS_BOOTM_LEN	(64 << 20)	/* Increase max gunzip size */
 
 /*
  * Environment Configuration
include/configs/P1010RDB.h +0 -1
index b5e0e2901f0a..d263999b5a71 100644
@@ -477,7 +477,6 @@ extern unsigned long get_sdram_size(void);
  * the maximum mapped by the Linux kernel during initialization.
  */
 #define CONFIG_SYS_BOOTMAPSZ	(64 << 20) /* Initial Memory map for Linux */
-#define CONFIG_SYS_BOOTM_LEN	(64 << 20) /* Increase max gunzip size */
 
 /*
  * Environment Configuration
include/configs/P2041RDB.h +0 -1
index 27889e3033cf..64f4c244fa21 100644
@@ -353,7 +353,6 @@
  * the maximum mapped by the Linux kernel during initialization.
  */
 #define CONFIG_SYS_BOOTMAPSZ	(64 << 20)	/* Initial Memory for Linux */
-#define CONFIG_SYS_BOOTM_LEN	(64 << 20)	/* Increase max gunzip size */
 
 /*
  * Environment Configuration
include/configs/T102xRDB.h +0 -1
index aa80d400bd98..3df6ec6246a5 100644
@@ -457,7 +457,6 @@
  * the maximum mapped by the Linux kernel during initialization.
  */
 #define CONFIG_SYS_BOOTMAPSZ	(64 << 20)	/* Initial map for Linux*/
-#define CONFIG_SYS_BOOTM_LEN	(64 << 20)	/* Increase max gunzip size */
 
 /*
  * Environment Configuration
include/configs/T104xRDB.h +0 -1
index 2fb181090b5d..8503fd108793 100644
@@ -447,7 +447,6 @@
  * the maximum mapped by the Linux kernel during initialization.
  */
 #define CONFIG_SYS_BOOTMAPSZ	(64 << 20)	/* Initial map for Linux*/
-#define CONFIG_SYS_BOOTM_LEN	(64 << 20)	/* Increase max gunzip size */
 
 /*
  * Dynamic MTD Partition support with mtdparts
include/configs/T208xQDS.h +0 -1
index 84dfc8948194..e981f621c379 100644
@@ -464,7 +464,6 @@
  * the maximum mapped by the Linux kernel during initialization.
  */
 #define CONFIG_SYS_BOOTMAPSZ	(64 << 20)	/* Initial map for Linux*/
-#define CONFIG_SYS_BOOTM_LEN	(64 << 20)	/* Increase max gunzip size */
 
 /*
  * Environment Configuration
include/configs/T208xRDB.h +0 -1
index 716e9c3d5566..48cdc75a08df 100644
@@ -418,7 +418,6 @@
  * the maximum mapped by the Linux kernel during initialization.
  */
 #define CONFIG_SYS_BOOTMAPSZ	(64 << 20)	/* Initial map for Linux*/
-#define CONFIG_SYS_BOOTM_LEN	(64 << 20)	/* Increase max gunzip size */
 
 /*
  * Environment Configuration
include/configs/T4240RDB.h +0 -1
index e697d8490c94..c31b0b684156 100644
@@ -152,7 +152,6 @@
  * the maximum mapped by the Linux kernel during initialization.
  */
 #define CONFIG_SYS_BOOTMAPSZ	(64 << 20)	/* Initial map for Linux*/
-#define CONFIG_SYS_BOOTM_LEN	(64 << 20)	/* Increase max gunzip size */
 
 /*
  * Environment Configuration
include/configs/am335x_evm.h +0 -2
index f0a979423dea..4b59759f818e 100644
@@ -19,8 +19,6 @@
 #include <configs/ti_am335x_common.h>
 #include <linux/sizes.h>
 
-#define CONFIG_SYS_BOOTM_LEN		SZ_16M
-
 /* Clock Defines */
 #define V_OSCK				24000000  /* Clock output from T2 */
 #define V_SCLK				(V_OSCK)
include/configs/am335x_guardian.h +0 -2
index 356c21a1b0ad..7a9928fba749 100644
@@ -12,8 +12,6 @@
 
 #include <configs/ti_am335x_common.h>
 
-#define CONFIG_SYS_BOOTM_LEN		(16 << 20)
-
 /* Clock Defines */
 #define V_OSCK				24000000  /* Clock output from T2 */
 #define V_SCLK				(V_OSCK)
include/configs/am335x_shc.h +0 -2
index 5964ccc74c26..08bae9b886f2 100644
@@ -16,8 +16,6 @@
 
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

include/configs/am335x_sl50.h +0 -2
index 4289836bc3f6..7df5f1405512 100644

Lines of this file are not shown. View the raw message.

include/configs/am57xx_evm.h +0 -2
index c36311e06d79..d8b0531673f1 100644

Lines of this file are not shown. View the raw message.

include/configs/am65x_evm.h +0 -2
index d8f18d0b9ac9..0345160787ef 100644

Lines of this file are not shown. View the raw message.

include/configs/apalis-imx8.h +0 -2
index 4a3e51d19ef9..c9f876f5da7e 100644

Lines of this file are not shown. View the raw message.

include/configs/ax25-ae350.h +0 -1
index 754e90961940..daa5cdf5b26b 100644

Lines of this file are not shown. View the raw message.

include/configs/axs10x.h +0 -2
index 3e98ce09c720..f2357b5785a1 100644

Lines of this file are not shown. View the raw message.

include/configs/baltos.h +0 -1
index 25906e404b1c..266b2ae04b3f 100644

Lines of this file are not shown. View the raw message.

include/configs/bcm947622.h +0 -2
index 3a02806878bf..d0c46a2c823b 100644

Lines of this file are not shown. View the raw message.

include/configs/bcm_ns3.h +0 -1
index 97e1a88f270c..795de469384c 100644

Lines of this file are not shown. View the raw message.

include/configs/bcmstb.h +0 -1
index ed78b732121f..134a3ec28920 100644

Lines of this file are not shown. View the raw message.

include/configs/boston.h +0 -1
index 3bf85b6c28d1..8b04492753a8 100644

Lines of this file are not shown. View the raw message.

include/configs/broadcom_bcm963158.h +0 -1
index 493114836c8e..0c8d352be97c 100644

Lines of this file are not shown. View the raw message.

include/configs/brppt1.h +0 -1
index c046fcb2bec0..789e6a4c9d59 100644

Lines of this file are not shown. View the raw message.

include/configs/brsmarc1.h +0 -1
index 8fa5843be5d1..f9908352b0dc 100644

Lines of this file are not shown. View the raw message.

include/configs/ci20.h +0 -1
index 01f636490536..192da015e188 100644

Lines of this file are not shown. View the raw message.

include/configs/colibri-imx8x.h +0 -2
index fb7de896b75d..5d6449c7f74a 100644

Lines of this file are not shown. View the raw message.

include/configs/corenet_ds.h +0 -1
index d1a5d866d2d0..f20f4e35e957 100644

Lines of this file are not shown. View the raw message.

include/configs/crs3xx-98dx3236.h +0 -2
index 07769c9e0e49..25bcc2a6841c 100644

Lines of this file are not shown. View the raw message.

include/configs/dragonboard410c.h +0 -1
index e1d580b1c8f8..c37b4c635b27 100644

Lines of this file are not shown. View the raw message.

include/configs/dragonboard820c.h +0 -1
index 705146d04f76..1fa5d05e7b47 100644

Lines of this file are not shown. View the raw message.

include/configs/durian.h +0 -1
index 7971df8c1d3b..8f0e8be43307 100644

Lines of this file are not shown. View the raw message.

include/configs/exynos78x0-common.h +0 -1
index 6b1de18bc159..b05846d0b920 100644

Lines of this file are not shown. View the raw message.

include/configs/gw_ventana.h +0 -3
index 4a0aaf4da583..82076ff74ff6 100644

Lines of this file are not shown. View the raw message.

include/configs/hikey.h +0 -2
index 33e9aa5ffb45..5be6eb4e766c 100644

Lines of this file are not shown. View the raw message.

include/configs/hikey960.h +0 -2
index caa6abb9d9d7..ad070439d002 100644

Lines of this file are not shown. View the raw message.

include/configs/hsdk-4xd.h +0 -2
index 03ca9281c829..4af845ea9c2d 100644

Lines of this file are not shown. View the raw message.

include/configs/hsdk.h +0 -2
index 0b8ac78e2794..0ce65e7755ea 100644

Lines of this file are not shown. View the raw message.

include/configs/imx8mm-cl-iot-gate.h +0 -1
index 60a0c16f9041..c69f2fa19f30 100644

Lines of this file are not shown. View the raw message.

include/configs/imx8mm_data_modul_edm_sbc.h +0 -2
index 5392569a556a..fb05958bdc81 100644

Lines of this file are not shown. View the raw message.

include/configs/imx8mm_evk.h +0 -1
index 227e9649f53b..5e9e3e800d8f 100644

Lines of this file are not shown. View the raw message.

include/configs/imx8mm_icore_mx8mm.h +0 -1
index ec4aea337c93..6b7f3af53a21 100644

Lines of this file are not shown. View the raw message.

include/configs/imx8mm_venice.h +0 -1
index cfcad110c716..130156045091 100644

Lines of this file are not shown. View the raw message.

include/configs/imx8mn_bsh_smm_s2_common.h +0 -2
index 63f7da740ef1..a371c5b3832c 100644

Lines of this file are not shown. View the raw message.

include/configs/imx8mn_evk.h +0 -2
index 9de31cfe81c9..ae7fcb1027a0 100644

Lines of this file are not shown. View the raw message.

include/configs/imx8mn_var_som.h +0 -2
index ccf83128f282..c8604e0de592 100644

Lines of this file are not shown. View the raw message.

include/configs/imx8mn_venice.h +0 -1
index adac387fac92..c43c4da6fbf8 100644

Lines of this file are not shown. View the raw message.

include/configs/imx8mp_dhcom_pdk2.h +0 -2
index 797ea0c7fad2..4b4731c3035b 100644

Lines of this file are not shown. View the raw message.

include/configs/imx8mp_evk.h +0 -2
index f161cffb9716..5581c0fac024 100644

Lines of this file are not shown. View the raw message.

include/configs/imx8mp_rsb3720.h +0 -2
index 1d4c057ccc01..17e00f958b6c 100644

Lines of this file are not shown. View the raw message.

include/configs/imx8mp_venice.h +0 -1
index 51fdcb7d5b19..9f4c1b161f7a 100644

Lines of this file are not shown. View the raw message.

include/configs/imx8mq_cm.h +0 -2
index f7a254359c9b..ab74d5b26b6f 100644

Lines of this file are not shown. View the raw message.

include/configs/imx8mq_evk.h +0 -2
index 43328082edc6..ea4305667f24 100644

Lines of this file are not shown. View the raw message.

include/configs/imx8qm_mek.h +0 -2
index b59502e5895b..6f244df6f9bd 100644

Lines of this file are not shown. View the raw message.

include/configs/imx8qm_rom7720.h +0 -2
index 88d38a1dcbd9..308f17fd5959 100644

Lines of this file are not shown. View the raw message.

include/configs/imx8ulp_evk.h +0 -1
index f9080216f1fc..ebfc166b4d46 100644

Lines of this file are not shown. View the raw message.

include/configs/iot2050.h +0 -2
index d379bad0b154..0f6150fc9c7e 100644

Lines of this file are not shown. View the raw message.

include/configs/iot_devkit.h +0 -2
index 0ebb1b526e9f..a2e50c3b8df2 100644

Lines of this file are not shown. View the raw message.

include/configs/j721e_evm.h +0 -2
index ecf876478100..9f54f259994a 100644

Lines of this file are not shown. View the raw message.

include/configs/j721s2_evm.h +0 -2
index 4c3a155a950a..932d7d3c8cb5 100644

Lines of this file are not shown. View the raw message.

include/configs/km/km-powerpc.h +0 -1
index a9a6a41f6b78..6becd7cd31a8 100644

Lines of this file are not shown. View the raw message.

include/configs/km/km_arm.h +0 -1
index a485c3ac6d1d..eee71db37c2b 100644

Lines of this file are not shown. View the raw message.

include/configs/km/pg-wcom-ls102xa.h +0 -1
index dd6747388c74..f83739013507 100644

Lines of this file are not shown. View the raw message.

include/configs/kmcent2.h +0 -1
index ff9d7d59a390..3f22ddc6dd8d 100644

Lines of this file are not shown. View the raw message.

include/configs/kontron-sl-mx8mm.h +0 -2
index 6b591ed7872e..622ab5976247 100644

Lines of this file are not shown. View the raw message.

include/configs/kontron_pitx_imx8m.h +0 -2
index bf336b99d6a1..d77e4b4e1009 100644

Lines of this file are not shown. View the raw message.

include/configs/ls1012a_common.h +0 -2
index 0c194ee575bf..87eb10db19fd 100644

Lines of this file are not shown. View the raw message.

include/configs/ls1021aqds.h +0 -1
index 1a46f72a7357..517ade383bee 100644

Lines of this file are not shown. View the raw message.

include/configs/ls1021atsn.h +0 -2
index e5754c94e0fc..2fbd495e1193 100644

Lines of this file are not shown. View the raw message.

include/configs/ls1021atwr.h +0 -1
index 09dce21aec5f..1aa29e541ec5 100644

Lines of this file are not shown. View the raw message.

include/configs/ls1028a_common.h +0 -2
index 5b0b86b39bee..b104524becb1 100644

Lines of this file are not shown. View the raw message.

include/configs/ls1043a_common.h +0 -2
index ed32e20dbf45..95cbcb036eb8 100644

Lines of this file are not shown. View the raw message.

include/configs/ls1046a_common.h +0 -2
index 94118c420e6a..2e48ea0f8aad 100644

Lines of this file are not shown. View the raw message.

include/configs/ls1088a_common.h +0 -1
index ff85f1eb4ac8..4b8462da7bcd 100644

Lines of this file are not shown. View the raw message.

include/configs/ls2080a_common.h +0 -2
index d2978713e6b7..3e86d1bff215 100644

Lines of this file are not shown. View the raw message.

include/configs/lx2160a_common.h +0 -2
index 77e25822dcd6..b7543731691f 100644

Lines of this file are not shown. View the raw message.

include/configs/malta.h +0 -2
index affee0069402..c8b230ab21e9 100644

Lines of this file are not shown. View the raw message.

include/configs/meson64.h +0 -1
index 51dd4d706e00..40803ee9da1a 100644

Lines of this file are not shown. View the raw message.

include/configs/microblaze-generic.h +0 -2
index 2adc1f6d86b8..926c229e3a64 100644

Lines of this file are not shown. View the raw message.

include/configs/microchip_mpfs_icicle.h +0 -2
index 236db537db73..4c7cfac8af75 100644

Lines of this file are not shown. View the raw message.

include/configs/mt7620.h +0 -2
index db4d68d75076..049d9a1b55bb 100644

Lines of this file are not shown. View the raw message.

include/configs/mt7622.h +0 -1
index 6c681a3c30bb..78d79b7780bc 100644

Lines of this file are not shown. View the raw message.

include/configs/mt7623.h +0 -2
index 06367221ebc3..0cd8b08552cf 100644

Lines of this file are not shown. View the raw message.

include/configs/mt7628.h +0 -2
index 4dcfa39350cc..3680c0fe442a 100644

Lines of this file are not shown. View the raw message.

include/configs/mt7629.h +0 -2
index 87e2251777cb..22d11d014761 100644

Lines of this file are not shown. View the raw message.

include/configs/mt8183.h +0 -2
index 665a4e44f3f4..c93d70ddf1a6 100644

Lines of this file are not shown. View the raw message.

include/configs/mt8512.h +0 -3
index d4aa279b551c..964c95781338 100644

Lines of this file are not shown. View the raw message.

include/configs/mt8516.h +0 -2
index 928f4b0dc773..7228f3e42884 100644

Lines of this file are not shown. View the raw message.

include/configs/mt8518.h +0 -2
index e313f6f6afaa..6d4704644e4f 100644

Lines of this file are not shown. View the raw message.

include/configs/mvebu_armada-37xx.h +0 -2
index 56f640226dd9..51f7e16ece1a 100644

Lines of this file are not shown. View the raw message.

include/configs/mx6_common.h +0 -2
index 75bc27d1798b..e416f81e43a1 100644

Lines of this file are not shown. View the raw message.

include/configs/mx7_common.h +0 -2
index 9f4dbec07002..4704276a74de 100644

Lines of this file are not shown. View the raw message.

include/configs/mx7ulp_com.h +0 -2
index c6c3695e5df1..62e8e6299118 100644

Lines of this file are not shown. View the raw message.

include/configs/mx7ulp_evk.h +0 -2
index 57fed4ed69ca..e93824928b32 100644

Lines of this file are not shown. View the raw message.

include/configs/nsim.h +0 -2
index 586ac3ebcaad..d469ef83c240 100644

Lines of this file are not shown. View the raw message.

include/configs/octeon_common.h +0 -2
index 7e71c83887f3..0fa7490e7de6 100644

Lines of this file are not shown. View the raw message.

include/configs/octeontx2_common.h +0 -1
index f377ba8fa2ec..2c430e8d3762 100644

Lines of this file are not shown. View the raw message.

include/configs/octeontx_common.h +0 -1
index 73a14b25de67..e7a6bd41db05 100644

Lines of this file are not shown. View the raw message.

include/configs/openpiton-riscv64.h +0 -1
index 12bd8fb99cd6..3ff8187b5df7 100644

Lines of this file are not shown. View the raw message.

include/configs/p1_p2_rdb_pc.h +0 -1
index 7410c60cbd2a..b0b3ec18d143 100644

Lines of this file are not shown. View the raw message.

include/configs/phycore_imx8mm.h +0 -1
index f8c3e1f10dbd..049d1d74345d 100644

Lines of this file are not shown. View the raw message.

include/configs/phycore_imx8mp.h +0 -2
index dd0b108a89f8..df1716106fe1 100644

Lines of this file are not shown. View the raw message.

include/configs/pico-imx8mq.h +0 -2
index a587570ea172..d1cc1b9d63fb 100644

Lines of this file are not shown. View the raw message.

include/configs/pomelo.h +0 -1
index 647bb3d02a1b..2e206542f8db 100644

Lines of this file are not shown. View the raw message.

include/configs/poplar.h +0 -1
index 4b749b13ee81..c58105597e47 100644

Lines of this file are not shown. View the raw message.

include/configs/presidio_asic.h +0 -2
index 48c0584d5b34..90f548cc6c13 100644

Lines of this file are not shown. View the raw message.

include/configs/px30_common.h +0 -4
index 62ed86b29c89..49d1878ebdd7 100644

Lines of this file are not shown. View the raw message.

include/configs/qemu-arm.h +0 -2
index 14cae43db3a6..e9f756b13edb 100644

Lines of this file are not shown. View the raw message.

include/configs/qemu-ppce500.h +0 -1
index ce60a3c7421d..31e94df84df7 100644

Lines of this file are not shown. View the raw message.

include/configs/qemu-riscv.h +0 -2
index a81c503d9fd1..d81e5d6c8620 100644

Lines of this file are not shown. View the raw message.

include/configs/rcar-gen3-common.h +0 -1
index e80e45dcbd7e..9efda3eeea93 100644

Lines of this file are not shown. View the raw message.

include/configs/rk3128_common.h +0 -2
index d5a4ca26b048..12d4bc65d7e4 100644

Lines of this file are not shown. View the raw message.

include/configs/rk322x_common.h +0 -2
index c3279b84d3a4..ec9e9ca1e31a 100644

Lines of this file are not shown. View the raw message.

include/configs/rk3288_common.h +0 -2
index 18f4289d29ab..f4b3481115b3 100644

Lines of this file are not shown. View the raw message.

include/configs/rk3308_common.h +0 -4
index d5aadd5fa803..200b34b35bae 100644

Lines of this file are not shown. View the raw message.

include/configs/rk3328_common.h +0 -2
index 165b78ff3309..1e214e4ebe15 100644

Lines of this file are not shown. View the raw message.

include/configs/rk3368_common.h +0 -2
index 4db4026ebe56..37e0c1d936c3 100644

Lines of this file are not shown. View the raw message.

include/configs/rk3399_common.h +0 -2
index 3ca80c8c7c0d..2f9aee58197b 100644

Lines of this file are not shown. View the raw message.

include/configs/rk3568_common.h +0 -2
index ef4f725b5793..15e815234020 100644

Lines of this file are not shown. View the raw message.

include/configs/rpi.h +0 -4
index 27738ab1933f..4f5025d0da58 100644

Lines of this file are not shown. View the raw message.

include/configs/sama7g5ek.h +0 -1
index 78347373fca9..3f905bf2d77d 100644

Lines of this file are not shown. View the raw message.

include/configs/sdm845.h +0 -1
index e1b8c61d0763..af5fe27e68bd 100644

Lines of this file are not shown. View the raw message.

include/configs/sifive-unleashed.h +0 -2
index a99d143485c4..2e5592cf94d5 100644

Lines of this file are not shown. View the raw message.

include/configs/sifive-unmatched.h +0 -2
index 680caac377bc..9923f3d9c344 100644

Lines of this file are not shown. View the raw message.

include/configs/socfpga_arria5_secu1.h +0 -2
index 2d654b42d56b..261ae56c1dce 100644

Lines of this file are not shown. View the raw message.

include/configs/socfpga_soc64_common.h +0 -1
index a3e8d5492919..06198ddd82a3 100644

Lines of this file are not shown. View the raw message.

include/configs/socfpga_vining_fpga.h +0 -1
index c333c931ab7a..70d9f3607a67 100644

Lines of this file are not shown. View the raw message.

include/configs/stemmy.h +0 -1
index 4ad55afad869..71b25c23b13c 100644

Lines of this file are not shown. View the raw message.

include/configs/stih410-b2260.h +0 -2
index 1b8d38f4b52a..b1a011bacb22 100644

Lines of this file are not shown. View the raw message.

include/configs/stm32mp13_common.h +0 -1
index beb56fcb5af8..3ca65ea2a37b 100644

Lines of this file are not shown. View the raw message.

include/configs/stm32mp15_common.h +0 -1
index 1e14e91ea701..56fb4d38e45a 100644

Lines of this file are not shown. View the raw message.

include/configs/sunxi-common.h +0 -4
index 2bf4e58cddf7..0f0ef4f64bbf 100644

Lines of this file are not shown. View the raw message.

include/configs/tb100.h +0 -2
index 03aeb4f5d2eb..16bdc39b750e 100644

Lines of this file are not shown. View the raw message.

include/configs/total_compute.h +0 -2
index 41297b693cff..4fb3d731c67a 100644

Lines of this file are not shown. View the raw message.

include/configs/turris_mox.h +0 -1
index d4aa312da4f4..401627a47a2f 100644

Lines of this file are not shown. View the raw message.

include/configs/uniphier.h +0 -2
index 8096b2c89603..15d41fba95cc 100644

Lines of this file are not shown. View the raw message.

include/configs/vcoreiii.h +0 -2
index 43127ae649a6..78a62a8b028c 100644

Lines of this file are not shown. View the raw message.

include/configs/verdin-imx8mm.h +0 -2
index 6d77df09fb51..5b5fce9bda17 100644

Lines of this file are not shown. View the raw message.

include/configs/verdin-imx8mp.h +0 -2
index 0de249aa96b2..fca40beba18a 100644

Lines of this file are not shown. View the raw message.

include/configs/vexpress_aemv8.h +0 -2
index e864b3fee6ae..3705313aec06 100644

Lines of this file are not shown. View the raw message.

include/configs/x86-common.h +0 -1
index 1366f623aa25..42b2cb2fc85a 100644

Lines of this file are not shown. View the raw message.

include/configs/xilinx_versal.h +0 -2
index 55837e1c5649..971bd69dec8d 100644

Lines of this file are not shown. View the raw message.

include/configs/xilinx_zynqmp.h +0 -2
index 4e71a42cd346..f72f3e644768 100644

Lines of this file are not shown. View the raw message.

include/configs/xilinx_zynqmp_r5.h +0 -1
index 37750d3d15db..b6bc402a7e97 100644

Lines of this file are not shown. View the raw message.

include/configs/zynq-common.h +0 -1
index 6a045ec60aeb..1fdde90654f2 100644

Lines of this file are not shown. View the raw message.

scripts/config_whitelist.txt +0 -1
index f2181353ea71..5c214632af0d 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.25.1

Part of the diff is not shown here. View the raw message.

#23 lore raw

Re: [PATCH 20/20] Convert CONFIG_SYS_BOOTM_LEN to Kconfig

Hi Tom,

Quoted 13 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_SYS_BOOTM_LEN

As part of this, rework error handling in boot/bootm.c so that we pass the buffer size to handle_decomp_error as CONFIG_SYS_BOOTM_LEN will not be available to host tools but we do know the size that we passed to malloc().

-- > README | 6 -----

boot/bootm.c                                  | 24 +++++++++----------
cmd/Kconfig                                   | 10 ++++++++
configs/M5208EVBE_defconfig                   |  1 +

[...]

Quoted 4 lines
  include/configs/xilinx_zynqmp_r5.h            |  1 -
  include/configs/zynq-common.h                 |  1 -
  scripts/config_whitelist.txt                  |  1 -
  555 files changed, 419 insertions(+), 270 deletions(-)

Is it really necessary to create so many additional lines just for a conversion?

Quoted 23 lines
README +0 -6
index fb0284d4ecb6..ff0df3797d21 100644
@@ -1736,12 +1736,6 @@ Configuration Settings:
 
  		Non-cached memory is only supported on 32-bit ARM at present.
 
-- CONFIG_SYS_BOOTM_LEN:
-		Normally compressed uImages are limited to an
-		uncompressed size of 8 MBytes. If this is not enough,
-		you can define CONFIG_SYS_BOOTM_LEN in your board config file
-		to adjust this setting to your needs.
-
  - CONFIG_SYS_BOOTMAPSZ:
  		Maximum size of memory mapped by the startup code of
  		the Linux kernel; all data that must be processed by
boot/bootm.c +0 -0
index dfa65f125e57..86dbfbcfed5b 100644

boot/bootm.c line 40

Quoted 8 lines
boot/bootm.c +0 -5
@@ -33,11 +33,6 @@
  #include <bootm.h>
  #include <image.h>
 
-#ifndef CONFIG_SYS_BOOTM_LEN
-/* use 8MByte as default max gunzip size */
-#define CONFIG_SYS_BOOTM_LEN	0x800000
-#endif
-

The old default was 8MiB, OK.

Quoted 3 lines
boot/bootm.c +0 -0
  #define MAX_CMDLINE_SIZE	SZ_4K
 
  #define IH_INITRD_ARCH IH_ARCH_DEFAULT

[...]

Quoted 8 lines
cmd/Kconfig +0 -0
index bb956e330750..357b82849f7f 100644
@@ -335,6 +335,16 @@ config BOOTM_VXWORKS
  	help
  	  Support booting VxWorks images via the bootm command.
 

cmd/Kconfig config BOOTM_VXWORKS · line 347

Quoted 10 lines
cmd/Kconfig +10 -0
+config SYS_BOOTM_LEN
+	hex "Maximum size of a decompresed OS image"
+	depends on CMD_BOOTM || CMD_BOOTI || CMD_BOOTZ
+	default 0x4000000 if PPC || ARM64
+	default 0x1000000 if X86
+	default 0x800000
+	help
+	  Normally compressed OS images are limited to an uncompressed size of
+	  8 MiB. If this is not enough, increase this setting to fit your needs.
+

The new default is sad to be 8MiB, too (as the old default was), but this is not true for all architectures. So the help text is misleading.

Besides that, there is probably nothing wrong with the new defaults.

Quoted 15 lines
cmd/Kconfig +0 -0
  config CMD_BOOTEFI
  	bool "bootefi"
  	depends on EFI_LOADER
configs/M5208EVBE_defconfig +1 -0
index 4ab888f59ed5..858fc5bbfd2e 100644
@@ -16,6 +16,7 @@ CONFIG_SYS_MALLOC_BOOTPARAMS=y
  # CONFIG_AUTO_COMPLETE is not set
  CONFIG_SYS_PROMPT="-> "
  CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x2000000
  CONFIG_CMD_IMLS=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_MII=y

[...]

configs/tbs2910_defconfig CONFIG_CMD_BOOTZ=y · line 38

Quoted 9 lines
configs/tbs2910_defconfig +1 -0
index 892d7c60d283..f0ecfd049d65 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_BOOTZ=y
  # CONFIG_BOOTM_PLAN9 is not set
  # CONFIG_BOOTM_RTEMS is not set
  # CONFIG_BOOTM_VXWORKS is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000

For tbs2910 there is another value set here - not the old default, not the new one. Why?
This looks like a carefully chosen value, but very likely it is not.

Probably also this value is fine for this board, but for me it makes no sense to set a board specific value here.

Regards,
Soeren

author
#24 lore raw

Re: [PATCH 20/20] Convert CONFIG_SYS_BOOTM_LEN to Kconfig

Quoted 16 lines · Soeren Moch

Hi Tom,

Quoted 8 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_SYS_BOOTM_LEN

As part of this, rework error handling in boot/bootm.c so that we pass the buffer size to handle_decomp_error as CONFIG_SYS_BOOTM_LEN will not be available to host tools but we do know the size that we passed to malloc().

Quoted 5 lines

-- > README | 6 -----

boot/bootm.c                                  | 24 +++++++++----------
cmd/Kconfig                                   | 10 ++++++++
configs/M5208EVBE_defconfig                   |  1 +
Quoted 8 lines

[...]

Quoted 4 lines
  include/configs/xilinx_zynqmp_r5.h            |  1 -
  include/configs/zynq-common.h                 |  1 -
  scripts/config_whitelist.txt                  |  1 -
  555 files changed, 419 insertions(+), 270 deletions(-)

Is it really necessary to create so many additional lines just for a conversion?

It's about as small as I can get it to without spending a lot of time massaging defaults. As is the case with any of the conversions, arch/SoC maintainers or other knowledgable parties are welcome and encouraged to submit a follow-up to add default X if Y. It's keeping the in-use value for everyone and unfortunately aside from platforms that didn't change from the old default, there's not a lot of consistency, but arguably should be.

Quoted 45 lines
Quoted 22 lines
README +0 -6
index fb0284d4ecb6..ff0df3797d21 100644
@@ -1736,12 +1736,6 @@ Configuration Settings:
 
  		Non-cached memory is only supported on 32-bit ARM at present.
 
-- CONFIG_SYS_BOOTM_LEN:
-		Normally compressed uImages are limited to an
-		uncompressed size of 8 MBytes. If this is not enough,
-		you can define CONFIG_SYS_BOOTM_LEN in your board config file
-		to adjust this setting to your needs.
-
  - CONFIG_SYS_BOOTMAPSZ:
  		Maximum size of memory mapped by the startup code of
  		the Linux kernel; all data that must be processed by
boot/bootm.c +0 -0
index dfa65f125e57..86dbfbcfed5b 100644

boot/bootm.c line 40

Quoted 8 lines
boot/bootm.c +0 -5
@@ -33,11 +33,6 @@
  #include <bootm.h>
  #include <image.h>
 
-#ifndef CONFIG_SYS_BOOTM_LEN
-/* use 8MByte as default max gunzip size */
-#define CONFIG_SYS_BOOTM_LEN	0x800000
-#endif
-

The old default was 8MiB, OK.

Quoted 3 lines
boot/bootm.c +0 -0
  #define MAX_CMDLINE_SIZE	SZ_4K
 
  #define IH_INITRD_ARCH IH_ARCH_DEFAULT

[...]

Quoted 8 lines
cmd/Kconfig +0 -0
index bb956e330750..357b82849f7f 100644
@@ -335,6 +335,16 @@ config BOOTM_VXWORKS
  	help
  	  Support booting VxWorks images via the bootm command.
 
Quoted 13 lines

cmd/Kconfig config BOOTM_VXWORKS · line 347

Quoted 10 lines
cmd/Kconfig +10 -0
+config SYS_BOOTM_LEN
+	hex "Maximum size of a decompresed OS image"
+	depends on CMD_BOOTM || CMD_BOOTI || CMD_BOOTZ
+	default 0x4000000 if PPC || ARM64
+	default 0x1000000 if X86
+	default 0x800000
+	help
+	  Normally compressed OS images are limited to an uncompressed size of
+	  8 MiB. If this is not enough, increase this setting to fit your needs.
+

The new default is sad to be 8MiB, too (as the old default was), but this is not true for all architectures. So the help text is misleading.

English is an imprecise language. Maybe just not mentioning the size in the help is best.

Quoted 32 lines

Besides that, there is probably nothing wrong with the new defaults.

Quoted 15 lines
cmd/Kconfig +0 -0
  config CMD_BOOTEFI
  	bool "bootefi"
  	depends on EFI_LOADER
configs/M5208EVBE_defconfig +1 -0
index 4ab888f59ed5..858fc5bbfd2e 100644
@@ -16,6 +16,7 @@ CONFIG_SYS_MALLOC_BOOTPARAMS=y
  # CONFIG_AUTO_COMPLETE is not set
  CONFIG_SYS_PROMPT="-> "
  CONFIG_SYS_PBSIZE=276
+CONFIG_SYS_BOOTM_LEN=0x2000000
  CONFIG_CMD_IMLS=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_MII=y

[...]

configs/tbs2910_defconfig CONFIG_CMD_BOOTZ=y · line 38

Quoted 9 lines
configs/tbs2910_defconfig +1 -0
index 892d7c60d283..f0ecfd049d65 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_BOOTZ=y
  # CONFIG_BOOTM_PLAN9 is not set
  # CONFIG_BOOTM_RTEMS is not set
  # CONFIG_BOOTM_VXWORKS is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000

For tbs2910 there is another value set here - not the old default, not the new one. Why?
This looks like a carefully chosen value, but very likely it is not.

Quoted 2 lines

Probably also this value is fine for this board, but for me it makes no sense to set a board specific value here.

I don't follow you, sorry. Since tbs2910 isn't X86 or PPC or ARM64, it's using the current value instead. Before this patch include/configs/tbs2910.h includes include/configs/mx6_common.h which sets it to 0x1000000. Which means I probably could put a || ARCH_MX6 in the Kconfig entry and drop out another 84 files (3 MX6 platforms set 0x4000000 instead today).

Signature · 1 line
Tom
#25 lore raw

Re: [PATCH 20/20] Convert CONFIG_SYS_BOOTM_LEN to Kconfig

Quoted 14 lines
Quoted 14 lines

configs/tbs2910_defconfig CONFIG_CMD_BOOTZ=y · line 38

Quoted 10 lines
configs/tbs2910_defconfig +1 -0
index 892d7c60d283..f0ecfd049d65 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_BOOTZ=y
   # CONFIG_BOOTM_PLAN9 is not set
   # CONFIG_BOOTM_RTEMS is not set
   # CONFIG_BOOTM_VXWORKS is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000

For tbs2910 there is another value set here - not the old default, not the new one. Why?
This looks like a carefully chosen value, but very likely it is not.

Quoted 6 lines
Quoted 2 lines

Probably also this value is fine for this board, but for me it makes no sense to set a board specific value here.

I don't follow you, sorry. Since tbs2910 isn't X86 or PPC or ARM64, it's using the current value instead. Before this patch include/configs/tbs2910.h includes include/configs/mx6_common.h which sets it to 0x1000000.

OK, I missed that part in the long patch, my bad.

As I wrote, all possible values are probably good for this board. I just would prefer to use some default value (as before), since there is no special requirement for this board in particular. To keep the old value in this conversion of course makes sense.

Quoted 4 lines

Which means I probably could put a || ARCH_MX6 in
the Kconfig entry and drop out another 84 files (3 MX6 platforms set 0x4000000 instead today).

That would make it more obvious that the old default is used for these boards. But if you prefer the board specific defconfig setting, that of course is also a valid solution.

Regards,
Soeren

author
#26 lore raw

Re: [PATCH 20/20] Convert CONFIG_SYS_BOOTM_LEN to Kconfig

Quoted 26 lines · Soeren Moch
Quoted 14 lines
Quoted 14 lines

configs/tbs2910_defconfig CONFIG_CMD_BOOTZ=y · line 38

Quoted 10 lines
configs/tbs2910_defconfig +1 -0
index 892d7c60d283..f0ecfd049d65 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_BOOTZ=y
   # CONFIG_BOOTM_PLAN9 is not set
   # CONFIG_BOOTM_RTEMS is not set
   # CONFIG_BOOTM_VXWORKS is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000

For tbs2910 there is another value set here - not the old default, not the new one. Why?
This looks like a carefully chosen value, but very likely it is not.

Quoted 6 lines
Quoted 2 lines

Probably also this value is fine for this board, but for me it makes no sense to set a board specific value here.

I don't follow you, sorry. Since tbs2910 isn't X86 or PPC or ARM64, it's using the current value instead. Before this patch include/configs/tbs2910.h includes include/configs/mx6_common.h which sets it to 0x1000000.

OK, I missed that part in the long patch, my bad.

As I wrote, all possible values are probably good for this board. I just would prefer to use some default value (as before), since there is no special requirement for this board in particular. To keep the old value in this conversion of course makes sense.

Quoted 7 lines
Quoted 4 lines

Which means I probably could put a || ARCH_MX6 in
the Kconfig entry and drop out another 84 files (3 MX6 platforms set 0x4000000 instead today).

That would make it more obvious that the old default is used for these boards. But if you prefer the board specific defconfig setting, that of course is also a valid solution.

To be clear, here (and unless I otherwise note, all of the other conversions I've been doing) the intention is the same values on every platform, before and after. Many times the patches end up small because I can do a few default A if B lines and cover the vast majority if platforms. Sadly sometimes we get cases like this where in hindsight, a bigger default, or a more consistent default for every architecture should have been used, but wasn't. We can clean it up after but it needs to be separate so that someone can bisect a problem back to when the value was changed, not when it was migrated, if there's a problem.

So this isn't a super platform dependent value, and should probably be something like 96MiB for 32bit ARM (I forget what the practical maximum image size is, I know I talked with rmk about it about a decade ago I think), and some other similar sane maximum for other platforms. But, a follow up to do that.

Signature · 1 line
Tom
#27 lore raw

Re: [PATCH 20/20] Convert CONFIG_SYS_BOOTM_LEN to Kconfig

Quoted 33 lines · Tom Rini
Quoted 25 lines · Soeren Moch
Quoted 13 lines
Quoted 13 lines

configs/tbs2910_defconfig CONFIG_CMD_BOOTZ=y · line 38

Quoted 9 lines
configs/tbs2910_defconfig +1 -0
index 892d7c60d283..f0ecfd049d65 100644
@@ -35,6 +35,7 @@ CONFIG_CMD_BOOTZ=y
    # CONFIG_BOOTM_PLAN9 is not set
    # CONFIG_BOOTM_RTEMS is not set
    # CONFIG_BOOTM_VXWORKS is not set
+CONFIG_SYS_BOOTM_LEN=0x1000000

For tbs2910 there is another value set here - not the old default, not the new one. Why?
This looks like a carefully chosen value, but very likely it is not.

Quoted 6 lines
Quoted 2 lines

Probably also this value is fine for this board, but for me it makes no sense to set a board specific value here.

I don't follow you, sorry. Since tbs2910 isn't X86 or PPC or ARM64, it's using the current value instead. Before this patch include/configs/tbs2910.h includes include/configs/mx6_common.h which sets it to 0x1000000.

OK, I missed that part in the long patch, my bad.

As I wrote, all possible values are probably good for this board. I just would prefer to use some default value (as before), since there is no special requirement for this board in particular. To keep the old value in this conversion of course makes sense.

Quoted 7 lines
Quoted 4 lines

Which means I probably could put a || ARCH_MX6 in
the Kconfig entry and drop out another 84 files (3 MX6 platforms set 0x4000000 instead today).

That would make it more obvious that the old default is used for these boards. But if you prefer the board specific defconfig setting, that of course is also a valid solution.

Quoted 9 lines

To be clear, here (and unless I otherwise note, all of the other conversions I've been doing) the intention is the same values on every platform, before and after. Many times the patches end up small because I can do a few default A if B lines and cover the vast majority if platforms. Sadly sometimes we get cases like this where in hindsight, a bigger default, or a more consistent default for every architecture should have been used, but wasn't. We can clean it up after but it needs to be separate so that someone can bisect a problem back to when the value was changed, not when it was migrated, if there's a problem.

I totally agree. For me it looked like the default was changed for tbs2910, but it was not. My mistake.
In your v2 it is obvious that we use the same defaults, great.

Quoted 5 lines

So this isn't a super platform dependent value, and should probably be something like 96MiB for 32bit ARM (I forget what the practical maximum image size is, I know I talked with rmk about it about a decade ago I think),

I _think_ the maximum text size (or image size?) is 16MiB for arm, but I'm not totally sure about this. But this would match with the mx6/mx7 defaults.

Quoted 3 lines

and some other similar sane maximum for other platforms. But, a
follow up to do that.

Yes, changes should be done in a separate patch. But I do not see any need from my side. And I'm happy that there is no board specific defconfig entry for tbs2910 in your v2.

Thanks,
Soeren