Skip to contentSkip to conversation

Kconfig: add SPL_LOAD_FIT_ADDRESS

PATCH New peng.fan at nxp.com 3 participants 6 messages Jul 6, 2020 – Jul 28, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 Kconfig: add SPL_LOAD_FIT_ADDRESS

From: Peng Fan <[email protected]>

Add SPL_LOAD_FIT_ADDRESS to make user could add it in defconfig

---
 Kconfig | 8 ++++++++
 1 file changed, 8 insertions(+)
Kconfig +8 -0
index 8f3fba085a..1e63e1d7ba 100644
@@ -474,6 +474,14 @@ config SPL_LOAD_FIT
 	  particular it can handle selecting from multiple device tree
 	  and passing the correct one to U-Boot.
 
+config SPL_LOAD_FIT_ADDRESS
+	hex "load address of fit image"
+	depends on SPL_LOAD_FIT
+	default 0x0
+	help
+	  Specify the load address of the fit image that will be loaded
+	  by SPL.
+
 config SPL_LOAD_FIT_APPLY_OVERLAY
 	bool "Enable SPL applying DT overlays from FIT"
 	depends on SPL_LOAD_FIT
Signature · 1 line
2.16.4
#1 lore raw

PATCH 2/2 configs: migrate CONFIG_SPL_LOAD_FIT_ADDRESS to defconfigs

From: Peng Fan <[email protected]>

Done with:
./tools/moveconfig.py -S SPL_LOAD_FIT_ADDRESS
./tools/moveconfig.py -S SPL_LOAD_FIT_ADDRESS -H

---
 configs/am57xx_hs_evm_usb_defconfig                            | 3 ++-
 configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig | 1 +
 configs/dra7xx_evm_defconfig                                   | 3 ++-
 configs/dra7xx_hs_evm_defconfig                                | 1 +
 configs/dra7xx_hs_evm_usb_defconfig                            | 3 ++-
 configs/j721e_evm_a72_defconfig                                | 3 ++-
 configs/j721e_evm_r5_defconfig                                 | 3 ++-
 configs/j721e_hs_evm_a72_defconfig                             | 3 ++-
 configs/j721e_hs_evm_r5_defconfig                              | 3 ++-
 configs/xilinx_zynq_virt_defconfig                             | 1 +
 configs/xilinx_zynqmp_virt_defconfig                           | 1 +
 include/configs/am57xx_evm.h                                   | 1 -
 include/configs/ax25-ae350.h                                   | 6 ------
 include/configs/dra7xx_evm.h                                   | 1 -
 include/configs/j721e_evm.h                                    | 2 --
 include/configs/qemu-riscv.h                                   | 2 --
 include/configs/sifive-fu540.h                                 | 2 --
 include/configs/xilinx_zynqmp.h                                | 3 ---
 include/configs/zynq-common.h                                  | 2 --
 scripts/config_whitelist.txt                                   | 1 -
 20 files changed, 18 insertions(+), 27 deletions(-)
configs/am57xx_hs_evm_usb_defconfig +2 -1
index 3b155cc202..2fa60ac517 100644
@@ -6,6 +6,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_TEXT_BASE=0x40306D50
 CONFIG_OMAP54XX=y
 CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000
 CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
@@ -17,10 +18,10 @@ CONFIG_ENV_OFFSET_REDUND=0x280000
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_ARMV7_LPAE=y
-CONFIG_SPL_TEXT_BASE=0x40306D50
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT_IMAGE_POST_PROCESS=y
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000
 CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_BOOTARGS=y
configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig +1 -0
index 030d28a5df..0ae610be56 100644
@@ -13,6 +13,7 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x10000000
 CONFIG_BOOTDELAY=0
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_SPL_OS_BOOT=y
configs/dra7xx_evm_defconfig +2 -1
index e4547d9dcc..393020fbd5 100644
@@ -4,6 +4,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_SYS_MALLOC_F_LEN=0x18000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_TEXT_BASE=0x40300000
 CONFIG_OMAP54XX=y
 CONFIG_TARGET_DRA7XX_EVM=y
 CONFIG_NR_DRAM_BANKS=2
@@ -12,10 +13,10 @@ CONFIG_ENV_OFFSET_REDUND=0x280000
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_ARMV7_LPAE=y
-CONFIG_SPL_TEXT_BASE=0x40300000
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="androidboot.serialno=${serial#} console=ttyS0,115200 androidboot.console=ttyS0 androidboot.hardware=jacinto6evmboard"
configs/dra7xx_hs_evm_defconfig +1 -0
index c08bcce903..ee57b7997a 100644
@@ -20,6 +20,7 @@ CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT_IMAGE_POST_PROCESS=y
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000
 CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_BOOTARGS=y
configs/dra7xx_hs_evm_usb_defconfig +2 -1
index 879c2b650b..5ea6e8bf07 100644
@@ -6,6 +6,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_SYS_MALLOC_F_LEN=0x18000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_TEXT_BASE=0x40306D50
 CONFIG_OMAP54XX=y
 CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000
 CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
@@ -17,11 +18,11 @@ CONFIG_ENV_OFFSET_REDUND=0x280000
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_ARMV7_LPAE=y
-CONFIG_SPL_TEXT_BASE=0x40306D50
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT_IMAGE_POST_PROCESS=y
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000
 CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_BOOTARGS=y
configs/j721e_evm_a72_defconfig +2 -1
index 4deb4e219f..fd7e4c8785 100644
@@ -10,6 +10,7 @@ CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x680000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_TEXT_BASE=0x80080000
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@ -21,10 +22,10 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 # CONFIG_PSCI_RESET is not set
-CONFIG_SPL_TEXT_BASE=0x80080000
 CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
 CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run boot_rprocs; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern"
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
configs/j721e_evm_r5_defconfig +2 -1
index ee9217aee2..b2739ef426 100644
@@ -10,6 +10,7 @@ CONFIG_TARGET_J721E_R5_EVM=y
 CONFIG_ENV_SIZE=0x20000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_TEXT_BASE=0x41c00000
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@ -18,9 +19,9 @@ CONFIG_SPL_FS_FAT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_SPL_TEXT_BASE=0x41c00000
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000
 CONFIG_USE_BOOTCOMMAND=y
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_SPL_BOARD_INIT=y
configs/j721e_hs_evm_a72_defconfig +2 -1
index ae540a26a4..3158abda64 100644
@@ -9,6 +9,7 @@ CONFIG_TARGET_J721E_A72_EVM=y
 CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x680000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000
+CONFIG_SPL_TEXT_BASE=0x80080000
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@ -20,11 +21,11 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 # CONFIG_PSCI_RESET is not set
-CONFIG_SPL_TEXT_BASE=0x80080000
 CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_FIT_IMAGE_POST_PROCESS=y
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
 CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
 CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run boot_rprocs; run get_fit_${boot}; run get_overlaystring; run run_fit"
 CONFIG_SPL_BOARD_INIT=y
configs/j721e_hs_evm_r5_defconfig +2 -1
index 51d5a3bb98..6f99898229 100644
@@ -11,6 +11,7 @@ CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x680000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_TEXT_BASE=0x41c00000
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@ -20,9 +21,9 @@ CONFIG_SPL_FS_FAT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_SPL_TEXT_BASE=0x41c00000
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000
 CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
 CONFIG_USE_BOOTCOMMAND=y
 # CONFIG_DISPLAY_CPUINFO is not set
configs/xilinx_zynq_virt_defconfig +1 -0
index 5da7440af2..770b8f50f5 100644
@@ -14,6 +14,7 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_FIT_PRINT=y
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x10000000
 CONFIG_LEGACY_IMAGE_FORMAT=y
 CONFIG_USE_PREBOOT=y
 CONFIG_SPL_STACK_R=y
configs/xilinx_zynqmp_virt_defconfig +1 -0
index 7886d5a38f..f66432adc7 100644
@@ -13,6 +13,7 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x10000000
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_SPL_OS_BOOT=y
include/configs/am57xx_evm.h +0 -1
index e94b7c8d21..2fe83714f8 100644
@@ -41,7 +41,6 @@
 	DFU_ALT_INFO_QSPI
 #else
 #ifdef CONFIG_SPL_DFU
-#define CONFIG_SPL_LOAD_FIT_ADDRESS 0x80200000
 #define DFUARGS \
 	"dfu_bufsiz=0x10000\0" \
 	DFU_ALT_INFO_RAM
include/configs/ax25-ae350.h +0 -6
index 34fc6b616e..4b3fc26127 100644
@@ -12,12 +12,6 @@
 #define CONFIG_SPL_BSS_START_ADDR	0x04000000
 #define CONFIG_SPL_BSS_MAX_SIZE		0x00100000
 
-#ifndef CONFIG_XIP
-#define CONFIG_SPL_LOAD_FIT_ADDRESS	0x00200000
-#else
-#define CONFIG_SPL_LOAD_FIT_ADDRESS	0x80010000
-#endif
-
 #ifdef CONFIG_SPL_MMC_SUPPORT
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION	1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME		"u-boot.itb"
include/configs/dra7xx_evm.h +0 -1
index 14cd82f5a3..cf7182d360 100644
@@ -49,7 +49,6 @@
 
 #ifdef CONFIG_SPL_BUILD
 #ifdef CONFIG_SPL_DFU
-#define CONFIG_SPL_LOAD_FIT_ADDRESS 0x80200000
 #define DFUARGS \
 	"dfu_bufsiz=0x10000\0" \
 	DFU_ALT_INFO_RAM
include/configs/j721e_evm.h +0 -2
index 7488b661f5..7b917c2247 100644
@@ -24,7 +24,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SPL_TEXT_BASE +	\
 					 CONFIG_SYS_K3_NON_SECURE_MSRAM_SIZE)
 /* Image load address in RAM for DFU boot*/
-#define CONFIG_SPL_LOAD_FIT_ADDRESS	0x81000000
 #else
 /*
  * Maximum size in memory allocated to the SPL BSS. Keep it as tight as
@@ -48,7 +47,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START	0x84000000
 #define CONFIG_SYS_SPL_MALLOC_SIZE	SZ_16M
 /* Image load address in RAM for DFU boot*/
-#define CONFIG_SPL_LOAD_FIT_ADDRESS	0x80080000
 #endif
 
 #ifdef CONFIG_SYS_K3_SPL_ATF
include/configs/qemu-riscv.h +0 -2
index 5fe9dcfc58..aed9a4ae99 100644
@@ -16,8 +16,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START	0x84100000
 #define CONFIG_SYS_SPL_MALLOC_SIZE	0x00100000
 
-#define CONFIG_SPL_LOAD_FIT_ADDRESS	0x80200000
-
 #endif
 
 #define CONFIG_SYS_SDRAM_BASE		0x80000000
include/configs/sifive-fu540.h +0 -2
index 72c841eb9b..f720c0fbe4 100644
@@ -20,8 +20,6 @@
 					 CONFIG_SPL_BSS_MAX_SIZE)
 #define CONFIG_SYS_SPL_MALLOC_SIZE	0x00100000
 
-#define CONFIG_SPL_LOAD_FIT_ADDRESS	0x84000000
-
 #define CONFIG_SPL_STACK	(0x08000000 + 0x001D0000 - \
 				 GENERATED_GBL_DATA_SIZE)
 
include/configs/xilinx_zynqmp.h +0 -3
index e868c13416..d98933b1f4 100644
@@ -227,9 +227,6 @@
 /* ATF is my kernel image */
 #define CONFIG_SPL_FS_LOAD_KERNEL_NAME	"atf-uboot.ub"
 
-/* FIT load address for RAM boot */
-#define CONFIG_SPL_LOAD_FIT_ADDRESS	0x10000000
-
 /* MMC support */
 #ifdef CONFIG_MMC_SDHCI_ZYNQ
 # define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION	1
include/configs/zynq-common.h +0 -2
index 59e77f6ecc..3388b46dde 100644
@@ -275,6 +275,4 @@
 #define CONFIG_SPL_BSS_START_ADDR	0x100000
 #define CONFIG_SPL_BSS_MAX_SIZE		0x100000
 
-#define CONFIG_SPL_LOAD_FIT_ADDRESS 0x10000000
-
 #endif /* __CONFIG_ZYNQ_COMMON_H */
scripts/config_whitelist.txt +0 -1
index 916768f361..53c0a740cf 100644
@@ -1650,7 +1650,6 @@ CONFIG_SPL_GD_ADDR
 CONFIG_SPL_INIT_MINIMAL
 CONFIG_SPL_JR0_LIODN_NS
 CONFIG_SPL_JR0_LIODN_S
-CONFIG_SPL_LOAD_FIT_ADDRESS
 CONFIG_SPL_MAX_FOOTPRINT
 CONFIG_SPL_MAX_PEB_SIZE
 CONFIG_SPL_MAX_SIZE
Signature · 1 line
2.16.4
#2 lore raw

PATCH 2/2 configs: migrate CONFIG_SPL_LOAD_FIT_ADDRESS to defconfigs

Hi Peng,

I assume the purpose of these patches is try to move all the configuration into one single file, right?

However with this patch, uboot will fail on AndesCore, and I'm guessing other platforms may also have the same problem.

If you could elaborate more on the purpose of the patchset, maybe we could come up with a more reasonable fix.

Thanks in advance.

Quoted 264 lines · peng.fan at nxp.com

From: Peng Fan <[email protected]>

Done with:
./tools/moveconfig.py -S SPL_LOAD_FIT_ADDRESS
./tools/moveconfig.py -S SPL_LOAD_FIT_ADDRESS -H

---
 configs/am57xx_hs_evm_usb_defconfig                            | 3 ++-
 configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig | 1 +
 configs/dra7xx_evm_defconfig                                   | 3 ++-
 configs/dra7xx_hs_evm_defconfig                                | 1 +
 configs/dra7xx_hs_evm_usb_defconfig                            | 3 ++-
 configs/j721e_evm_a72_defconfig                                | 3 ++-
 configs/j721e_evm_r5_defconfig                                 | 3 ++-
 configs/j721e_hs_evm_a72_defconfig                             | 3 ++-
 configs/j721e_hs_evm_r5_defconfig                              | 3 ++-
 configs/xilinx_zynq_virt_defconfig                             | 1 +
 configs/xilinx_zynqmp_virt_defconfig                           | 1 +
 include/configs/am57xx_evm.h                                   | 1 -
 include/configs/ax25-ae350.h                                   | 6 ------
 include/configs/dra7xx_evm.h                                   | 1 -
 include/configs/j721e_evm.h                                    | 2 --
 include/configs/qemu-riscv.h                                   | 2 --
 include/configs/sifive-fu540.h                                 | 2 --
 include/configs/xilinx_zynqmp.h                                | 3 ---
 include/configs/zynq-common.h                                  | 2 --
 scripts/config_whitelist.txt                                   | 1 -
 20 files changed, 18 insertions(+), 27 deletions(-)
configs/am57xx_hs_evm_usb_defconfig +2 -1
index 3b155cc202..2fa60ac517 100644
@@ -6,6 +6,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_TEXT_BASE=0x40306D50
 CONFIG_OMAP54XX=y
 CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000
 CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
@@ -17,10 +18,10 @@ CONFIG_ENV_OFFSET_REDUND=0x280000
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_ARMV7_LPAE=y
-CONFIG_SPL_TEXT_BASE=0x40306D50
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT_IMAGE_POST_PROCESS=y
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000
 CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_BOOTARGS=y
configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig +1 -0
index 030d28a5df..0ae610be56 100644
@@ -13,6 +13,7 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x10000000
 CONFIG_BOOTDELAY=0
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_SPL_OS_BOOT=y
configs/dra7xx_evm_defconfig +2 -1
index e4547d9dcc..393020fbd5 100644
@@ -4,6 +4,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_SYS_MALLOC_F_LEN=0x18000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_TEXT_BASE=0x40300000
 CONFIG_OMAP54XX=y
 CONFIG_TARGET_DRA7XX_EVM=y
 CONFIG_NR_DRAM_BANKS=2
@@ -12,10 +13,10 @@ CONFIG_ENV_OFFSET_REDUND=0x280000
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_ARMV7_LPAE=y
-CONFIG_SPL_TEXT_BASE=0x40300000
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="androidboot.serialno=${serial#} console=ttyS0,115200 androidboot.console=ttyS0 androidboot.hardware=jacinto6evmboard"
configs/dra7xx_hs_evm_defconfig +1 -0
index c08bcce903..ee57b7997a 100644
@@ -20,6 +20,7 @@ CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT_IMAGE_POST_PROCESS=y
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000
 CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_BOOTARGS=y
configs/dra7xx_hs_evm_usb_defconfig +2 -1
index 879c2b650b..5ea6e8bf07 100644
@@ -6,6 +6,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_SYS_MALLOC_F_LEN=0x18000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_TEXT_BASE=0x40306D50
 CONFIG_OMAP54XX=y
 CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000
 CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
@@ -17,11 +18,11 @@ CONFIG_ENV_OFFSET_REDUND=0x280000
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_ARMV7_LPAE=y
-CONFIG_SPL_TEXT_BASE=0x40306D50
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT_IMAGE_POST_PROCESS=y
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000
 CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_BOOTARGS=y
configs/j721e_evm_a72_defconfig +2 -1
index 4deb4e219f..fd7e4c8785 100644
@@ -10,6 +10,7 @@ CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x680000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_TEXT_BASE=0x80080000
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@ -21,10 +22,10 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 # CONFIG_PSCI_RESET is not set
-CONFIG_SPL_TEXT_BASE=0x80080000
 CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
 CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run boot_rprocs; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern"
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
configs/j721e_evm_r5_defconfig +2 -1
index ee9217aee2..b2739ef426 100644
@@ -10,6 +10,7 @@ CONFIG_TARGET_J721E_R5_EVM=y
 CONFIG_ENV_SIZE=0x20000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_TEXT_BASE=0x41c00000
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@ -18,9 +19,9 @@ CONFIG_SPL_FS_FAT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_SPL_TEXT_BASE=0x41c00000
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000
 CONFIG_USE_BOOTCOMMAND=y
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_SPL_BOARD_INIT=y
configs/j721e_hs_evm_a72_defconfig +2 -1
index ae540a26a4..3158abda64 100644
@@ -9,6 +9,7 @@ CONFIG_TARGET_J721E_A72_EVM=y
 CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x680000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000
+CONFIG_SPL_TEXT_BASE=0x80080000
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@ -20,11 +21,11 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 # CONFIG_PSCI_RESET is not set
-CONFIG_SPL_TEXT_BASE=0x80080000
 CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_FIT_IMAGE_POST_PROCESS=y
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
 CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
 CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run boot_rprocs; run get_fit_${boot}; run get_overlaystring; run run_fit"
 CONFIG_SPL_BOARD_INIT=y
configs/j721e_hs_evm_r5_defconfig +2 -1
index 51d5a3bb98..6f99898229 100644
@@ -11,6 +11,7 @@ CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x680000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_TEXT_BASE=0x41c00000
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@ -20,9 +21,9 @@ CONFIG_SPL_FS_FAT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_SPL_TEXT_BASE=0x41c00000
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000
 CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
 CONFIG_USE_BOOTCOMMAND=y
 # CONFIG_DISPLAY_CPUINFO is not set
configs/xilinx_zynq_virt_defconfig +1 -0
index 5da7440af2..770b8f50f5 100644
@@ -14,6 +14,7 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_FIT_PRINT=y
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x10000000
 CONFIG_LEGACY_IMAGE_FORMAT=y
 CONFIG_USE_PREBOOT=y
 CONFIG_SPL_STACK_R=y
configs/xilinx_zynqmp_virt_defconfig +1 -0
index 7886d5a38f..f66432adc7 100644
@@ -13,6 +13,7 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x10000000
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_SPL_OS_BOOT=y
include/configs/am57xx_evm.h +0 -1
index e94b7c8d21..2fe83714f8 100644
@@ -41,7 +41,6 @@
 	DFU_ALT_INFO_QSPI
 #else
 #ifdef CONFIG_SPL_DFU
-#define CONFIG_SPL_LOAD_FIT_ADDRESS 0x80200000
 #define DFUARGS \
 	"dfu_bufsiz=0x10000\0" \
 	DFU_ALT_INFO_RAM
include/configs/ax25-ae350.h +0 -0
index 34fc6b616e..4b3fc26127 100644

include/configs/ax25-ae350.h line 20

Quoted 9 lines
include/configs/ax25-ae350.h +0 -6
@@ -12,12 +12,6 @@
 #define CONFIG_SPL_BSS_START_ADDR	0x04000000
 #define CONFIG_SPL_BSS_MAX_SIZE		0x00100000
 
-#ifndef CONFIG_XIP
-#define CONFIG_SPL_LOAD_FIT_ADDRESS	0x00200000
-#else
-#define CONFIG_SPL_LOAD_FIT_ADDRESS	0x80010000
-#endif
-

This deletion here will cause u-boot to fail on Andes core.

Quoted 91 lines
include/configs/ax25-ae350.h +0 -0
 #ifdef CONFIG_SPL_MMC_SUPPORT
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION	1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME		"u-boot.itb"
include/configs/dra7xx_evm.h +0 -1
index 14cd82f5a3..cf7182d360 100644
@@ -49,7 +49,6 @@
 
 #ifdef CONFIG_SPL_BUILD
 #ifdef CONFIG_SPL_DFU
-#define CONFIG_SPL_LOAD_FIT_ADDRESS 0x80200000
 #define DFUARGS \
 	"dfu_bufsiz=0x10000\0" \
 	DFU_ALT_INFO_RAM
include/configs/j721e_evm.h +0 -2
index 7488b661f5..7b917c2247 100644
@@ -24,7 +24,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SPL_TEXT_BASE +	\
 					 CONFIG_SYS_K3_NON_SECURE_MSRAM_SIZE)
 /* Image load address in RAM for DFU boot*/
-#define CONFIG_SPL_LOAD_FIT_ADDRESS	0x81000000
 #else
 /*
  * Maximum size in memory allocated to the SPL BSS. Keep it as tight as
@@ -48,7 +47,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START	0x84000000
 #define CONFIG_SYS_SPL_MALLOC_SIZE	SZ_16M
 /* Image load address in RAM for DFU boot*/
-#define CONFIG_SPL_LOAD_FIT_ADDRESS	0x80080000
 #endif
 
 #ifdef CONFIG_SYS_K3_SPL_ATF
include/configs/qemu-riscv.h +0 -2
index 5fe9dcfc58..aed9a4ae99 100644
@@ -16,8 +16,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START	0x84100000
 #define CONFIG_SYS_SPL_MALLOC_SIZE	0x00100000
 
-#define CONFIG_SPL_LOAD_FIT_ADDRESS	0x80200000
-
 #endif
 
 #define CONFIG_SYS_SDRAM_BASE		0x80000000
include/configs/sifive-fu540.h +0 -2
index 72c841eb9b..f720c0fbe4 100644
@@ -20,8 +20,6 @@
 					 CONFIG_SPL_BSS_MAX_SIZE)
 #define CONFIG_SYS_SPL_MALLOC_SIZE	0x00100000
 
-#define CONFIG_SPL_LOAD_FIT_ADDRESS	0x84000000
-
 #define CONFIG_SPL_STACK	(0x08000000 + 0x001D0000 - \
 				 GENERATED_GBL_DATA_SIZE)
 
include/configs/xilinx_zynqmp.h +0 -3
index e868c13416..d98933b1f4 100644
@@ -227,9 +227,6 @@
 /* ATF is my kernel image */
 #define CONFIG_SPL_FS_LOAD_KERNEL_NAME	"atf-uboot.ub"
 
-/* FIT load address for RAM boot */
-#define CONFIG_SPL_LOAD_FIT_ADDRESS	0x10000000
-
 /* MMC support */
 #ifdef CONFIG_MMC_SDHCI_ZYNQ
 # define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION	1
include/configs/zynq-common.h +0 -2
index 59e77f6ecc..3388b46dde 100644
@@ -275,6 +275,4 @@
 #define CONFIG_SPL_BSS_START_ADDR	0x100000
 #define CONFIG_SPL_BSS_MAX_SIZE		0x100000
 
-#define CONFIG_SPL_LOAD_FIT_ADDRESS 0x10000000
-
 #endif /* __CONFIG_ZYNQ_COMMON_H */
scripts/config_whitelist.txt +0 -0
index 916768f361..53c0a740cf 100644

scripts/config_whitelist.txt CONFIG_SPL_GD_ADDR · line 1655

Quoted 7 lines
scripts/config_whitelist.txt +0 -1
@@ -1650,7 +1650,6 @@ CONFIG_SPL_GD_ADDR
 CONFIG_SPL_INIT_MINIMAL
 CONFIG_SPL_JR0_LIODN_NS
 CONFIG_SPL_JR0_LIODN_S
-CONFIG_SPL_LOAD_FIT_ADDRESS
 CONFIG_SPL_MAX_FOOTPRINT
 CONFIG_SPL_MAX_PEB_SIZE
 CONFIG_SPL_MAX_SIZE

Best regards,
Leo

author
#3 lore raw

PATCH 2/2 configs: migrate CONFIG_SPL_LOAD_FIT_ADDRESS to defconfigs

Quoted 7 lines

Subject: Re: [PATCH 2/2] configs: migrate CONFIG_SPL_LOAD_FIT_ADDRESS to defconfigs

Hi Peng,

I assume the purpose of these patches is try to move all the configuration into one single file, right?

Yes

Quoted 6 lines

However with this patch, uboot will fail on AndesCore, and I'm guessing other platforms may also have the same problem.

If you could elaborate more on the purpose of the patchset, maybe we could come up with a more reasonable fix.

Kconfig is preferred over 'define xx' in header file.

Regards,
peng

Quoted 399 lines

Thanks in advance.

Quoted 10 lines · peng.fan at nxp.com

From: Peng Fan <[email protected]>

Done with:
./tools/moveconfig.py -S SPL_LOAD_FIT_ADDRESS ./tools/moveconfig.py -S SPL_LOAD_FIT_ADDRESS -H

---
configs/am57xx_hs_evm_usb_defconfig

| 3 ++-

Quoted 2 lines
 configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig | 1 +

configs/dra7xx_evm_defconfig

| 3 ++-

Quoted 1 line

configs/dra7xx_hs_evm_defconfig

| 1 +

Quoted 1 line

configs/dra7xx_hs_evm_usb_defconfig

| 3 ++-

Quoted 1 line

configs/j721e_evm_a72_defconfig

| 3 ++-

Quoted 1 line

configs/j721e_evm_r5_defconfig

| 3 ++-

Quoted 1 line

configs/j721e_hs_evm_a72_defconfig

| 3 ++-

Quoted 1 line

configs/j721e_hs_evm_r5_defconfig

| 3 ++-

Quoted 1 line
 configs/xilinx_zynq_virt_defconfig                             | 1

+

Quoted 1 line
 configs/xilinx_zynqmp_virt_defconfig                           | 1

+

Quoted 1 line

include/configs/am57xx_evm.h

| 1 -

Quoted 1 line

include/configs/ax25-ae350.h

| 6 ------

Quoted 1 line

include/configs/dra7xx_evm.h

| 1 -

Quoted 1 line

include/configs/j721e_evm.h

| 2 --

Quoted 1 line

include/configs/qemu-riscv.h |

2 --

Quoted 1 line
 include/configs/sifive-fu540.h                                 | 2

--

Quoted 1 line

include/configs/xilinx_zynqmp.h |

3 ---

Quoted 1 line

include/configs/zynq-common.h

| 2 --

Quoted 1 line
 scripts/config_whitelist.txt                                   | 1

-

Quoted 53 lines
 20 files changed, 18 insertions(+), 27 deletions(-)
configs/am57xx_hs_evm_usb_defconfig +1 -0
index 3b155cc202..2fa60ac517 100644
@@ -6,6 +6,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_TEXT_BASE=0x40306D50
 CONFIG_OMAP54XX=y
 CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000
 CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
@@ -17,10 +18,10 @@ CONFIG_ENV_OFFSET_REDUND=0x280000

CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_ARMV7_LPAE=y

configs/am57xx_hs_evm_usb_defconfig +1 -1
-CONFIG_SPL_TEXT_BASE=0x40306D50
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT_IMAGE_POST_PROCESS=y
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000
 CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_BOOTARGS=y

diff --git a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig index 030d28a5df..0ae610be56 100644

configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig +0 -0
@@ -13,6 +13,7 @@ CONFIG_DISTRO_DEFAULTS=y  CONFIG_FIT=y

CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y

configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig +1 -0
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x10000000
 CONFIG_BOOTDELAY=0
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_SPL_OS_BOOT=y
(quoted diff) +0 -0

b/configs/dra7xx_evm_defconfig index e4547d9dcc..393020fbd5 100644

configs/dra7xx_evm_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_SYS_MALLOC_F_LEN=0x18000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_TEXT_BASE=0x40300000
 CONFIG_OMAP54XX=y
 CONFIG_TARGET_DRA7XX_EVM=y
 CONFIG_NR_DRAM_BANKS=2
@@ -12,10 +13,10 @@ CONFIG_ENV_OFFSET_REDUND=0x280000

CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_ARMV7_LPAE=y

configs/dra7xx_evm_defconfig CONFIG_ENV_OFFSET_REDUND=0x280000

Quoted 8 lines
configs/dra7xx_evm_defconfig +1 -1
-CONFIG_SPL_TEXT_BASE=0x40300000
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="androidboot.serialno=${serial#}

console=ttyS0,115200 androidboot.console=ttyS0
androidboot.hardware=jacinto6evmboard"

Quoted 2 lines
(quoted diff) +0 -0

b/configs/dra7xx_hs_evm_defconfig index c08bcce903..ee57b7997a

100644

Quoted 48 lines
configs/dra7xx_hs_evm_defconfig +1 -0
@@ -20,6 +20,7 @@ CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT_IMAGE_POST_PROCESS=y
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000
 CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_BOOTARGS=y
configs/dra7xx_hs_evm_usb_defconfig +1 -0
index 879c2b650b..5ea6e8bf07 100644
@@ -6,6 +6,7 @@ CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_SYS_MALLOC_F_LEN=0x18000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x40000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_TEXT_BASE=0x40306D50
 CONFIG_OMAP54XX=y
 CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000
 CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
@@ -17,11 +18,11 @@ CONFIG_ENV_OFFSET_REDUND=0x280000

CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_ARMV7_LPAE=y

configs/dra7xx_hs_evm_usb_defconfig +1 -1
-CONFIG_SPL_TEXT_BASE=0x40306D50
 CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT_IMAGE_POST_PROCESS=y
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000
 CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_USE_BOOTARGS=y
(quoted diff) +0 -0

b/configs/j721e_evm_a72_defconfig index 4deb4e219f..fd7e4c8785 100644

configs/j721e_evm_a72_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x680000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_TEXT_BASE=0x80080000
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@ -21,10 +22,10 @@ CONFIG_SPL_LIBDISK_SUPPORT=y
Quoted 5 lines

CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y # CONFIG_PSCI_RESET is not set -CONFIG_SPL_TEXT_BASE=0x80080000
CONFIG_DISTRO_DEFAULTS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set

CONFIG_SPL_LOAD_FIT=y

Quoted 2 lines

+CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run

boot_rprocs; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern"

Quoted 15 lines

CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y

(quoted diff) +0 -0

b/configs/j721e_evm_r5_defconfig index ee9217aee2..b2739ef426 100644

configs/j721e_evm_r5_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_TARGET_J721E_R5_EVM=y
 CONFIG_ENV_SIZE=0x20000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_TEXT_BASE=0x41c00000
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y

configs/j721e_evm_r5_defconfig CONFIG_SPL_FS_FAT=y · line 22

Quoted 5 lines
configs/j721e_evm_r5_defconfig +0 -1
@@ -18,9 +19,9 @@ CONFIG_SPL_FS_FAT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_SPL_TEXT_BASE=0x41c00000
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set

CONFIG_SPL_LOAD_FIT=y

Quoted 19 lines
configs/j721e_evm_r5_defconfig +1 -0
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000
 CONFIG_USE_BOOTCOMMAND=y
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_SPL_BOARD_INIT=y
configs/j721e_hs_evm_a72_defconfig +1 -0
index ae540a26a4..3158abda64 100644
@@ -9,6 +9,7 @@ CONFIG_TARGET_J721E_A72_EVM=y
 CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x680000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000
+CONFIG_SPL_TEXT_BASE=0x80080000
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
@@ -20,11 +21,11 @@ CONFIG_SPL_LIBDISK_SUPPORT=y

CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y #

Quoted 8 lines

CONFIG_PSCI_RESET is not set -CONFIG_SPL_TEXT_BASE=0x80080000
CONFIG_DISTRO_DEFAULTS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_FIT_IMAGE_POST_PROCESS=y CONFIG_SPL_LOAD_FIT=y +CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run

boot_rprocs; run get_fit_${boot}; run get_overlaystring; run run_fit"

Quoted 15 lines

CONFIG_SPL_BOARD_INIT=y

configs/j721e_hs_evm_r5_defconfig +1 -0
index 51d5a3bb98..6f99898229 100644
@@ -11,6 +11,7 @@ CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x680000
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
 CONFIG_DM_GPIO=y
+CONFIG_SPL_TEXT_BASE=0x41c00000
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y

configs/j721e_hs_evm_r5_defconfig CONFIG_SPL_FS_FAT=y · line 24

Quoted 5 lines
configs/j721e_hs_evm_r5_defconfig +0 -1
@@ -20,9 +21,9 @@ CONFIG_SPL_FS_FAT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_SPL_TEXT_BASE=0x41c00000
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set

CONFIG_SPL_LOAD_FIT=y

configs/xilinx_zynq_virt_defconfig CONFIG_FIT_SIGNATURE=y

Quoted 10 lines
configs/j721e_hs_evm_r5_defconfig +1 -0
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000
 CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
 CONFIG_USE_BOOTCOMMAND=y
 # CONFIG_DISPLAY_CPUINFO is not set
configs/xilinx_zynq_virt_defconfig +0 -0
index 5da7440af2..770b8f50f5 100644
@@ -14,6 +14,7 @@ CONFIG_FIT_SIGNATURE=y

CONFIG_FIT_VERBOSE=y

Quoted 21 lines

CONFIG_SPL_FIT_PRINT=y CONFIG_SPL_LOAD_FIT=y

configs/xilinx_zynq_virt_defconfig +1 -0
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x10000000
 CONFIG_LEGACY_IMAGE_FORMAT=y
 CONFIG_USE_PREBOOT=y
 CONFIG_SPL_STACK_R=y
configs/xilinx_zynqmp_virt_defconfig +0 -0
index 7886d5a38f..f66432adc7 100644
@@ -13,6 +13,7 @@ CONFIG_DISTRO_DEFAULTS=y  CONFIG_FIT=y

CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y

configs/xilinx_zynqmp_virt_defconfig +1 -0
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x10000000
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_SPL_OS_BOOT=y
(quoted diff) +0 -0

b/include/configs/am57xx_evm.h index e94b7c8d21..2fe83714f8 100644

include/configs/am57xx_evm.h line 44

Quoted 4 lines
include/configs/am57xx_evm.h +0 -1
@@ -41,7 +41,6 @@
 	DFU_ALT_INFO_QSPI
 #else
 #ifdef CONFIG_SPL_DFU
-#define CONFIG_SPL_LOAD_FIT_ADDRESS 0x80200000  #define

DFUARGS \

Quoted 7 lines
include/configs/am57xx_evm.h +0 -0
 	"dfu_bufsiz=0x10000\0" \
 	DFU_ALT_INFO_RAM
(quoted diff) +0 -0

b/include/configs/ax25-ae350.h index 34fc6b616e..4b3fc26127 100644

include/configs/ax25-ae350.h line 20

Quoted 9 lines
include/configs/ax25-ae350.h +0 -6
@@ -12,12 +12,6 @@
 #define CONFIG_SPL_BSS_START_ADDR	0x04000000
 #define CONFIG_SPL_BSS_MAX_SIZE		0x00100000
 
-#ifndef CONFIG_XIP
-#define CONFIG_SPL_LOAD_FIT_ADDRESS	0x00200000
-#else
-#define CONFIG_SPL_LOAD_FIT_ADDRESS	0x80010000
-#endif
-

This deletion here will cause u-boot to fail on Andes core.

include/configs/dra7xx_evm.h line 52

Quoted 12 lines
include/configs/ax25-ae350.h +0 -0
 #ifdef CONFIG_SPL_MMC_SUPPORT
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION	1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME		"u-boot.itb"
(quoted diff) +0 -0

b/include/configs/dra7xx_evm.h index 14cd82f5a3..cf7182d360 100644

include/configs/dra7xx_evm.h +0 -1
@@ -49,7 +49,6 @@
 
 #ifdef CONFIG_SPL_BUILD
 #ifdef CONFIG_SPL_DFU
-#define CONFIG_SPL_LOAD_FIT_ADDRESS 0x80200000  #define

DFUARGS \

Quoted 8 lines
include/configs/dra7xx_evm.h +0 -0
 	"dfu_bufsiz=0x10000\0" \
 	DFU_ALT_INFO_RAM
include/configs/j721e_evm.h +0 -0
index 7488b661f5..7b917c2247 100644
@@ -24,7 +24,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SPL_TEXT_BASE
(quoted diff) +1 -0
+	\

scripts/config_whitelist.txt CONFIG_SPL_GD_ADDR

Quoted 70 lines
include/configs/j721e_evm.h +0 -1
 					 CONFIG_SYS_K3_NON_SECURE_MSRAM_SIZE)
 /* Image load address in RAM for DFU boot*/
-#define CONFIG_SPL_LOAD_FIT_ADDRESS	0x81000000
 #else
 /*
  * Maximum size in memory allocated to the SPL BSS. Keep it as tight

as @@ -48,7 +47,6 @@
#define CONFIG_SYS_SPL_MALLOC_START 0x84000000
#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_16M
/* Image load address in RAM for DFU boot*/

include/configs/j721e_evm.h +0 -1
-#define CONFIG_SPL_LOAD_FIT_ADDRESS	0x80080000
 #endif
 
 #ifdef CONFIG_SYS_K3_SPL_ATF
(quoted diff) +0 -0

b/include/configs/qemu-riscv.h index 5fe9dcfc58..aed9a4ae99 100644

include/configs/qemu-riscv.h +0 -2
@@ -16,8 +16,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START	0x84100000
 #define CONFIG_SYS_SPL_MALLOC_SIZE	0x00100000
 
-#define CONFIG_SPL_LOAD_FIT_ADDRESS	0x80200000
-
 #endif
 
 #define CONFIG_SYS_SDRAM_BASE		0x80000000
(quoted diff) +0 -0

b/include/configs/sifive-fu540.h index 72c841eb9b..f720c0fbe4 100644

include/configs/sifive-fu540.h +0 -2
@@ -20,8 +20,6 @@
 					 CONFIG_SPL_BSS_MAX_SIZE)
 #define CONFIG_SYS_SPL_MALLOC_SIZE	0x00100000
 
-#define CONFIG_SPL_LOAD_FIT_ADDRESS	0x84000000
-
 #define CONFIG_SPL_STACK	(0x08000000 + 0x001D0000 - \
 				 GENERATED_GBL_DATA_SIZE)
 
(quoted diff) +0 -0

b/include/configs/xilinx_zynqmp.h index e868c13416..d98933b1f4 100644

include/configs/xilinx_zynqmp.h +0 -3
@@ -227,9 +227,6 @@
 /* ATF is my kernel image */
 #define CONFIG_SPL_FS_LOAD_KERNEL_NAME	"atf-uboot.ub"
 
-/* FIT load address for RAM boot */
-#define CONFIG_SPL_LOAD_FIT_ADDRESS	0x10000000
-
 /* MMC support */
 #ifdef CONFIG_MMC_SDHCI_ZYNQ
 # define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION	1
(quoted diff) +0 -0

b/include/configs/zynq-common.h index 59e77f6ecc..3388b46dde 100644

include/configs/zynq-common.h +0 -2
@@ -275,6 +275,4 @@
 #define CONFIG_SPL_BSS_START_ADDR	0x100000
 #define CONFIG_SPL_BSS_MAX_SIZE		0x100000
 
-#define CONFIG_SPL_LOAD_FIT_ADDRESS 0x10000000
-
 #endif /* __CONFIG_ZYNQ_COMMON_H */
(quoted diff) +0 -0

b/scripts/config_whitelist.txt index 916768f361..53c0a740cf 100644

scripts/config_whitelist.txt +0 -0
@@ -1650,7 +1650,6 @@ CONFIG_SPL_GD_ADDR

CONFIG_SPL_INIT_MINIMAL

Quoted 3 lines

CONFIG_SPL_JR0_LIODN_NS CONFIG_SPL_JR0_LIODN_S -CONFIG_SPL_LOAD_FIT_ADDRESS CONFIG_SPL_MAX_FOOTPRINT CONFIG_SPL_MAX_PEB_SIZE CONFIG_SPL_MAX_SIZE

Best regards,
Leo

#4 lore raw

PATCH 2/2 configs: migrate CONFIG_SPL_LOAD_FIT_ADDRESS to defconfigs

In reply to peng.fan at nxp.com
Quoted 7 lines · peng.fan at nxp.com

From: Peng Fan <[email protected]>

Done with:
./tools/moveconfig.py -S SPL_LOAD_FIT_ADDRESS
./tools/moveconfig.py -S SPL_LOAD_FIT_ADDRESS -H

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200728/ed1b3f35/attachment.sig>
#5 lore raw

PATCH 1/2 Kconfig: add SPL_LOAD_FIT_ADDRESS

In reply to peng.fan at nxp.com
Quoted 5 lines · peng.fan at nxp.com

From: Peng Fan <[email protected]>

Add SPL_LOAD_FIT_ADDRESS to make user could add it in defconfig

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200728/6c67ec43/attachment.sig>