Kconfig: add SPL_LOAD_FIT_ADDRESS
Subsystems (3)
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
@@ -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
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
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-SSPL_LOAD_FIT_ADDRESS./tools/moveconfig.py-SSPL_LOAD_FIT_ADDRESS-HSigned-off-by Peng Fan <[email protected]>--- 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@@ -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=yconfigs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig +1
-0@@ -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=yconfigs/dra7xx_evm_defconfig +2
-1@@ -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@@ -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=yconfigs/dra7xx_hs_evm_usb_defconfig +2
-1@@ -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=yconfigs/j721e_evm_a72_defconfig +2
-1@@ -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=yconfigs/j721e_evm_r5_defconfig +2
-1@@ -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=yconfigs/j721e_hs_evm_a72_defconfig +2
-1@@ -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=yconfigs/j721e_hs_evm_r5_defconfig +2
-1@@ -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 setconfigs/xilinx_zynq_virt_defconfig +1
-0@@ -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=yconfigs/xilinx_zynqmp_virt_defconfig +1
-0@@ -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=yinclude/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 \ "dfu_bufsiz=0x10000\0" \ DFU_ALT_INFO_RAMinclude/configs/ax25-ae350.h +0
-0
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@@ -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_RAMinclude/configs/j721e_evm.h +0
-2@@ -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@@ -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 0x80000000include/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)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 1include/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 */ scripts/config_whitelist.txt +0
-0
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
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_ADDRESSto defconfigsHi 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-SSPL_LOAD_FIT_ADDRESS./tools/moveconfig.py-SSPL_LOAD_FIT_ADDRESS-HSigned-off-by Peng Fan <[email protected]>---
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@@ -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=yCONFIG_SPL_SPI_SUPPORT=yCONFIG_ARMV7_LPAE=yconfigs/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=ydiff --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..0ae610be56100644configs/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=yCONFIG_SPL_LOAD_FIT=yconfigs/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
-0b/configs/dra7xx_evm_defconfig index
e4547d9dcc..393020fbd5100644configs/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=yCONFIG_SPL_SPI_SUPPORT=yCONFIG_ARMV7_LPAE=yconfigs/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
-0b/configs/dra7xx_hs_evm_defconfig index
c08bcce903..ee57b7997a100644
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=yconfigs/dra7xx_hs_evm_usb_defconfig +1
-0@@ -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=yCONFIG_SPL_SPI_SUPPORT=yCONFIG_ARMV7_LPAE=yconfigs/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
-0b/configs/j721e_evm_a72_defconfig index
4deb4e219f..fd7e4c8785100644configs/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=yQuoted 5 lines
CONFIG_SPL_SPI_FLASH_SUPPORT=yCONFIG_SPL_SPI_SUPPORT=y#CONFIG_PSCI_RESETis not set -CONFIG_SPL_TEXT_BASE=0x80080000
CONFIG_DISTRO_DEFAULTS=y
#CONFIG_SYS_MALLOC_CLEAR_ON_INITis not set
CONFIG_SPL_LOAD_FIT=yQuoted 2 lines
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_BOOTCOMMAND="runfindfdt; run envboot; run init_${boot}; run
boot_rprocs; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; runrun_kern"Quoted 15 lines
CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y(quoted diff) +0
-0b/configs/j721e_evm_r5_defconfig index
ee9217aee2..b2739ef426100644configs/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=yconfigs/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=yQuoted 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=yconfigs/j721e_hs_evm_a72_defconfig +1
-0@@ -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=yCONFIG_SPL_SPI_SUPPORT=y#Quoted 8 lines
CONFIG_PSCI_RESETis not set -CONFIG_SPL_TEXT_BASE=0x80080000
CONFIG_DISTRO_DEFAULTS=y
#CONFIG_SYS_MALLOC_CLEAR_ON_INITis not setCONFIG_FIT_IMAGE_POST_PROCESS=yCONFIG_SPL_LOAD_FIT=y+CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
CONFIG_SPL_FIT_IMAGE_POST_PROCESS=yCONFIG_BOOTCOMMAND="runfindfdt; run envboot; run init_${boot}; run
boot_rprocs; run get_fit_${boot}; runget_overlaystring; runrun_fit"Quoted 15 lines
CONFIG_SPL_BOARD_INIT=yconfigs/j721e_hs_evm_r5_defconfig +1
-0@@ -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=yconfigs/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=yconfigs/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 setconfigs/xilinx_zynq_virt_defconfig +0
-0@@ -14,6 +14,7 @@ CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=yQuoted 21 lines
CONFIG_SPL_FIT_PRINT=yCONFIG_SPL_LOAD_FIT=yconfigs/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=yconfigs/xilinx_zynqmp_virt_defconfig +0
-0@@ -13,6 +13,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y
CONFIG_FIT_VERBOSE=yCONFIG_SPL_LOAD_FIT=yconfigs/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.hindexe94b7c8d21..2fe83714f8100644include/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 #defineDFUARGS \
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.hindex34fc6b616e..4b3fc26127100644include/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.hindex14cd82f5a3..cf7182d360100644include/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 #defineDFUARGS \
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@@ -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
-1CONFIG_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 @@
#defineCONFIG_SYS_SPL_MALLOC_START0x84000000
#defineCONFIG_SYS_SPL_MALLOC_SIZESZ_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.hindex5fe9dcfc58..aed9a4ae99100644include/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.hindex72c841eb9b..f720c0fbe4100644include/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.hindexe868c13416..d98933b1f4100644include/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.hindex59e77f6ecc..3388b46dde100644include/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.txtindex916768f361..53c0a740cf100644scripts/config_whitelist.txt +0
-0@@ -1650,7 +1650,6 @@ CONFIG_SPL_GD_ADDR
CONFIG_SPL_INIT_MINIMALQuoted 3 lines
CONFIG_SPL_JR0_LIODN_NSCONFIG_SPL_JR0_LIODN_S-CONFIG_SPL_LOAD_FIT_ADDRESSCONFIG_SPL_MAX_FOOTPRINTCONFIG_SPL_MAX_PEB_SIZECONFIG_SPL_MAX_SIZEBest regards,
Leo
PATCH 2/2 configs: migrate CONFIG_SPL_LOAD_FIT_ADDRESS to defconfigs
In reply to peng.fan at nxp.comQuoted 7 lines · peng.fan at nxp.com
From: Peng Fan <[email protected]>
Done with:
./tools/moveconfig.py-SSPL_LOAD_FIT_ADDRESS./tools/moveconfig.py-SSPL_LOAD_FIT_ADDRESS-HSigned-off-by Peng Fan <[email protected]>
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>
PATCH 1/2 Kconfig: add SPL_LOAD_FIT_ADDRESS
In reply to peng.fan at nxp.comQuoted 5 lines · peng.fan at nxp.com
From: Peng Fan <[email protected]>
Add
SPL_LOAD_FIT_ADDRESSto make user could add it in defconfigSigned-off-by Peng Fan <[email protected]>
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>