Convert CONFIG_SYS_SPL_ARGS_ADDR to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_SPL_ARGS_ADDR

In doing so, we also consistently use this variable for SPL_OS_BOOT and
not CONFIG_SYS_FDT_BASE in some cases.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index dfbda1befb58461440d984ec7654cb42b473f335..71b2600df586f39eebedcd81e04b86714a336691 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -1188,6 +1188,14 @@ config SPL_OS_BOOT
          Enable booting directly to an OS from SPL.
          for more info read doc/README.falcon
 
+config SYS_SPL_ARGS_ADDR
+       hex "Address in memory to load 'args' file for Falcon Mode to"
+       depends on SPL_OS_BOOT
+       default 0x88000000 if ARCH_OMAP2PLUS
+       help
+         Address in memory where the 'args' file, typically a device tree
+         will be loaded in to memory.
+
 if SPL_OS_BOOT
 config SYS_OS_BASE
        hex "addr, where OS is found"

diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
index 067a2d42bbf8e171b1f0cf90b7d62d0d784030f9..7986e930d28b6343306cfd3a97e5d1df1b849f17 100644 (file)
--- a/common/spl/spl_nor.c
+++ b/common/spl/spl_nor.c
@@ -74,8 +74,8 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,
                               (void *)(CONFIG_SYS_OS_BASE +
                                        sizeof(struct image_header)),
                               spl_image->size);
-#ifdef CONFIG_SYS_FDT_BASE
-                       spl_image->arg = (void *)CONFIG_SYS_FDT_BASE;
+#ifdef CONFIG_SYS_SPL_ARGS_ADDR
+                       spl_image->arg = (void *)CONFIG_SYS_SPL_ARGS_ADDR;
 #endif
 
                        return 0;

diff --git a/common/spl/spl_xip.c b/common/spl/spl_xip.c
index 33863fe7d454ae6a6b1a51d829340d1287de0bc3..e9a40b0ec7976d20dc113ba8f76300b0b3c57338 100644 (file)
--- a/common/spl/spl_xip.c
+++ b/common/spl/spl_xip.c
@@ -14,7 +14,7 @@ static int spl_xip(struct spl_image_info *spl_image,
 {
 #if CONFIG_IS_ENABLED(OS_BOOT)
        if (!spl_start_uboot()) {
-               spl_image->arg = (void *)CONFIG_SYS_FDT_BASE;
+               spl_image->arg = (void *)CONFIG_SYS_SPL_ARGS_ADDR;
                spl_image->name = "Linux";
                spl_image->os = IH_OS_LINUX;
                spl_image->load_addr = CONFIG_SYS_LOAD_ADDR;

diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig
index 03fc4fba8f5617c8ab071745dfa23d240558c19b..05ee3570fc939b2885e180aeca5b36c6e3c8a9ca 100644 (file)
--- a/configs/am3517_evm_defconfig
+++ b/configs/am3517_evm_defconfig
@@ -31,6 +31,7 @@ CONFIG_SPL_NAND_ECC=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SPL_NAND_BASE=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
 # CONFIG_SPL_POWER is not set

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 7f4c804c957b32c17a66016b70e22d7ca4429d4d..450b2830e56afc6e8eca4c452265f448753436f4 100644 (file)
--- a/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig
+++ b/configs/avnet_ultrazedev_cc_v1_0_ultrazedev_som_v1_0_defconfig
@@ -41,6 +41,7 @@ CONFIG_SYS_SPL_MALLOC_SIZE=0x1000000
 CONFIG_SPL_FS_LOAD_KERNEL_NAME="atf-uboot.ub"
 CONFIG_SPL_FS_LOAD_ARGS_NAME="u-boot.bin"
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x8000000
 CONFIG_SYS_MAXARGS=64
 CONFIG_SYS_PBSIZE=2073
 CONFIG_CMD_MEMTEST=y

diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig
index 08c053b4f155c9e40ad0d2337ce57c10633786be..dc07c146bdb2cad8993fa4dcc500ff5c00844ec5 100644 (file)
--- a/configs/devkit8000_defconfig
+++ b/configs/devkit8000_defconfig
@@ -22,6 +22,7 @@ CONFIG_SPL_NAND_ECC=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SPL_NAND_BASE=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x80000100
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x500
 CONFIG_SYS_MAXARGS=64

diff --git a/configs/display5_defconfig b/configs/display5_defconfig
index 6e74f68f400b08abb1d0d08b6fd6b45b1379f13d..646372c10a3aff73d9645afa7b08613796d2853e 100644 (file)
--- a/configs/display5_defconfig
+++ b/configs/display5_defconfig
@@ -44,6 +44,7 @@ CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_SAVEENV=y
 CONFIG_SPL_I2C=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x100
 CONFIG_SPL_SPI_LOAD=y

diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig
index eab9c7c1e867ff970299d800013e365ce1eba720..245122843bce289a4165c657744622dbe091c9d6 100644 (file)
--- a/configs/display5_factory_defconfig
+++ b/configs/display5_factory_defconfig
@@ -39,6 +39,7 @@ CONFIG_SYS_SPL_MALLOC=y
 CONFIG_SPL_DMA=y
 CONFIG_SPL_I2C=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x100
 CONFIG_SPL_SPI_LOAD=y

diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
index ef2ee77c3dc5fb6e4a112d29356f696093f83db9..a96ed26292a13a367321004c62d9317635a8c2f9 100644 (file)
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -46,6 +46,7 @@ CONFIG_SPL_FIT_IMAGE_TINY=y
 CONFIG_SPL_DMA=y
 CONFIG_SPL_I2C=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
 CONFIG_SPL_POWER=y

diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
index a736b81ad9a642bdd382b514b0fae486ce45db2b..85bbed23ebc8c7a5ce2fe337256104dfe617d1e4 100644 (file)
--- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig
@@ -46,6 +46,7 @@ CONFIG_SPL_FIT_IMAGE_TINY=y
 CONFIG_SPL_DMA=y
 CONFIG_SPL_I2C=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
 CONFIG_SPL_POWER=y

diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
index 5372476f045040f9499ca64d4c7c31120a5ff95b..200ecf4a0f93322a24607081c8dcb39cecbc4a34 100644 (file)
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -47,6 +47,7 @@ CONFIG_SPL_DMA=y
 CONFIG_SPL_I2C=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
 CONFIG_SPL_POWER=y

diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig
index b1162e7cdb8d44e6e23f5f8fa39045d989729403..96f2f9df8160762373d74abc95d4f7628c1946ee 100644 (file)
--- a/configs/igep00x0_defconfig
+++ b/configs/igep00x0_defconfig
@@ -41,6 +41,7 @@ CONFIG_SPL_UBI_LOAD_KERNEL_ID=3
 CONFIG_SPL_UBI_LOAD_ARGS_ID=4
 CONFIG_SPL_ONENAND_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
 CONFIG_SYS_MAXARGS=64

diff --git a/configs/imx28_xea_defconfig b/configs/imx28_xea_defconfig
index f460a01e8cef544bb19441fbda589806fa5c059c..37233bafad95cc05d23b13f08da470efc6c678ed 100644 (file)
--- a/configs/imx28_xea_defconfig
+++ b/configs/imx28_xea_defconfig
@@ -45,6 +45,7 @@ CONFIG_SPL_DMA=y
 CONFIG_SPL_MMC_TINY=y
 CONFIG_SPL_DM_SPI_FLASH=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x44000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x800
 CONFIG_SPL_SPI_LOAD=y

diff --git a/configs/imx28_xea_sb_defconfig b/configs/imx28_xea_sb_defconfig
index bad232ceec5512014cfb459e69dd410bd997b9fc..ad478c469bc1599f90ddaf02f668816c642be8b6 100644 (file)
--- a/configs/imx28_xea_sb_defconfig
+++ b/configs/imx28_xea_sb_defconfig
@@ -33,7 +33,6 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0
 CONFIG_SUPPORT_EMMC_BOOT_OVERRIDE_PART_CONFIG=y
 CONFIG_SPL_DMA=y
 CONFIG_SPL_DM_SPI_FLASH=y
-CONFIG_SPL_OS_BOOT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_MAXARGS=32
 CONFIG_CMD_SPL=y

diff --git a/configs/imx6dl_mamoj_defconfig b/configs/imx6dl_mamoj_defconfig
index 7e6e3bb4a3f333a773df8a65b88e0fea5a42469f..a52ce458f2b331e3ea15dbae01c411f3a8562f36 100644 (file)
--- a/configs/imx6dl_mamoj_defconfig
+++ b/configs/imx6dl_mamoj_defconfig
@@ -19,6 +19,7 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_SPL_MALLOC=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x13000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
 CONFIG_SYS_MAXARGS=32

diff --git a/configs/imx6q_logic_defconfig b/configs/imx6q_logic_defconfig
index 4e665ba42bfd6b82f49c2665b2876ca7d32f4538..cc7a6f0aa097ad50b87ca44202f826d2579b4562 100644 (file)
--- a/configs/imx6q_logic_defconfig
+++ b/configs/imx6q_logic_defconfig
@@ -34,6 +34,7 @@ CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot-dtb.img"
 CONFIG_SPL_I2C=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
 CONFIG_SPL_USB_HOST=y

diff --git a/configs/imx6qdl_icore_mipi_defconfig b/configs/imx6qdl_icore_mipi_defconfig
index 754537044a303b76390643c988909e9d4f4bb91f..929d31722b72298601b064da907ae2bf9e5c0ce3 100644 (file)
--- a/configs/imx6qdl_icore_mipi_defconfig
+++ b/configs/imx6qdl_icore_mipi_defconfig
@@ -35,6 +35,7 @@ CONFIG_BOOTCOMMAND="run $modeboot"
 CONFIG_SPL_RAW_IMAGE_SUPPORT=y
 CONFIG_SYS_SPL_MALLOC=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
 CONFIG_SPL_WATCHDOG=y

diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig
index 4e9fadd699a59521a003a3042153540aca01416c..3465e1915c2adf527f1ea8e686d77a8d6ec3384e 100644 (file)
--- a/configs/imx6qdl_icore_mmc_defconfig
+++ b/configs/imx6qdl_icore_mmc_defconfig
@@ -38,6 +38,7 @@ CONFIG_BOOTCOMMAND="run $modeboot"
 CONFIG_SPL_RAW_IMAGE_SUPPORT=y
 CONFIG_SYS_SPL_MALLOC=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
 CONFIG_SPL_WATCHDOG=y

diff --git a/configs/imx6qdl_icore_rqs_defconfig b/configs/imx6qdl_icore_rqs_defconfig
index d87a47700cde0a0fc55858dc53f63677423bace3..b2ca3ee1b650df05df2d69c643bef641a51b8dfc 100644 (file)
--- a/configs/imx6qdl_icore_rqs_defconfig
+++ b/configs/imx6qdl_icore_rqs_defconfig
@@ -32,6 +32,7 @@ CONFIG_BOOTCOMMAND="run $modeboot"
 CONFIG_SPL_RAW_IMAGE_SUPPORT=y
 CONFIG_SYS_SPL_MALLOC=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1000
 CONFIG_SPL_WATCHDOG=y

diff --git a/configs/ls1046ardb_qspi_spl_defconfig b/configs/ls1046ardb_qspi_spl_defconfig
index 2f6b546a260012a28bb3e880f9ce0eadcd6c162a..799d460f2bd4f9e910510b6e64a7243b912d6a06 100644 (file)
--- a/configs/ls1046ardb_qspi_spl_defconfig
+++ b/configs/ls1046ardb_qspi_spl_defconfig
@@ -56,6 +56,7 @@ CONFIG_SPL_I2C=y
 CONFIG_SPL_MPC8XXX_INIT_DDR=y
 CONFIG_SPL_NOR_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x90000000
 CONFIG_SYS_OS_BASE=0x40980000
 CONFIG_SPL_WATCHDOG=y
 CONFIG_SPL_TARGET="spl/u-boot-spl.pbl"

diff --git a/configs/mccmon6_nor_defconfig b/configs/mccmon6_nor_defconfig
index 1214163af392a2ded69235f855df3c569ef2b024..80b59cbb053b5c7545062e92a6d9ec20b8ce0f09 100644 (file)
--- a/configs/mccmon6_nor_defconfig
+++ b/configs/mccmon6_nor_defconfig
@@ -29,6 +29,7 @@ CONFIG_SPL_FIT_IMAGE_TINY=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_NOR_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x18000000
 CONFIG_SYS_OS_BASE=0x8180000
 CONFIG_SYS_MAXARGS=32
 CONFIG_SYS_PBSIZE=532

diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 86bda86b72f2961040ca0859bdf7849564413243..8ece12630fb2098fca937b7c12b76af02d973c2b 100644 (file)
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -32,6 +32,7 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_STACK=0x100000
 CONFIG_SPL_NOR_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x2a000000
 CONFIG_SYS_OS_BASE=0x2c060000
 CONFIG_SYS_PROMPT="U-Boot-mONStR> "
 CONFIG_SYS_MAXARGS=15

diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig
index e5fcba8caf179ec18e0d3c21c42596d6ffc35de7..6efc50fdf5e955767a679cf58cbd9b7d1e9c28ce 100644 (file)
--- a/configs/omap35_logic_defconfig
+++ b/configs/omap35_logic_defconfig
@@ -35,6 +35,7 @@ CONFIG_SPL_NAND_ECC=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SPL_NAND_BASE=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
 CONFIG_SYS_PROMPT="OMAP Logic # "

diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig
index 45aee91b3722d01ea378e7c98d5635a407c00b9b..3ea4d7a724ef53bbb548c12b9211c9b43813186a 100644 (file)
--- a/configs/omap35_logic_somlv_defconfig
+++ b/configs/omap35_logic_somlv_defconfig
@@ -36,6 +36,7 @@ CONFIG_SPL_NAND_ECC=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SPL_NAND_BASE=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
 # CONFIG_SPL_POWER is not set

diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index 9b2a8064449c0f18dab657080fc4d8f0e3d77a33..5c7d30d66ed0a0a7b06cff274a20f9d56c241bb0 100644 (file)
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -34,6 +34,7 @@ CONFIG_SPL_NAND_ECC=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SPL_NAND_BASE=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
 CONFIG_SYS_PROMPT="OMAP Logic # "

diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig
index ee36800d6471a8aec4512afc0bb9be09d31bec7f..9961e005a07a24858ad955e9d579f8013457e3bb 100644 (file)
--- a/configs/omap3_logic_somlv_defconfig
+++ b/configs/omap3_logic_somlv_defconfig
@@ -36,6 +36,7 @@ CONFIG_SPL_NAND_ECC=y
 CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SPL_NAND_BASE=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x84000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x1700
 # CONFIG_SPL_POWER is not set

diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig
index 8fe264d75435dc600084882cd39a3a17a7e36246..924254cbb978997df9405ef9be6115ae4dcf7640 100644 (file)
--- a/configs/riotboard_defconfig
+++ b/configs/riotboard_defconfig
@@ -33,6 +33,7 @@ CONFIG_SPL_FS_EXT4=y
 CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot-dtb.img"
 CONFIG_SPL_FS_LOAD_ARGS_NAME="imx6dl-riotboard.dtb"
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x13000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x0
 CONFIG_SYS_MAXARGS=32

diff --git a/configs/stm32746g-eval_spl_defconfig b/configs/stm32746g-eval_spl_defconfig
index 989bc7af30155d25f42656da6d685ec5da0ea8b4..55e44f863c1cf6e0fbf3b936536ab5f6182b6574 100644 (file)
--- a/configs/stm32746g-eval_spl_defconfig
+++ b/configs/stm32746g-eval_spl_defconfig
@@ -34,6 +34,7 @@ CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_XIP_SUPPORT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x81c0000
 CONFIG_SPL_DM_RESET=y
 CONFIG_SYS_PROMPT="U-Boot > "
 CONFIG_SYS_PBSIZE=1050

diff --git a/configs/stm32f746-disco_spl_defconfig b/configs/stm32f746-disco_spl_defconfig
index 3aaf7d3512182168a0a7832d6c5cf666c3cc57e1..c174984b939daff45940724d2959b98801b85ac7 100644 (file)
--- a/configs/stm32f746-disco_spl_defconfig
+++ b/configs/stm32f746-disco_spl_defconfig
@@ -34,6 +34,7 @@ CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_XIP_SUPPORT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x81c0000
 CONFIG_SPL_DM_RESET=y
 CONFIG_SYS_PROMPT="U-Boot > "
 CONFIG_SYS_PBSIZE=1050

diff --git a/configs/stm32f769-disco_spl_defconfig b/configs/stm32f769-disco_spl_defconfig
index 55ac1174af6a8e098877d60be6cb9cc56336093d..a5dc89c80273941e629a0b152451fc2f472364b5 100644 (file)
--- a/configs/stm32f769-disco_spl_defconfig
+++ b/configs/stm32f769-disco_spl_defconfig
@@ -33,6 +33,7 @@ CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_XIP_SUPPORT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x81c0000
 CONFIG_SPL_DM_RESET=y
 CONFIG_SYS_PROMPT="U-Boot > "
 CONFIG_SYS_PBSIZE=1050

diff --git a/configs/syzygy_hub_defconfig b/configs/syzygy_hub_defconfig
index 0baf6dd886acc8b9aaaf43a44ab0990e488973a0..d632cb86a25879890042eacdb63ab44c28131757 100644 (file)
--- a/configs/syzygy_hub_defconfig
+++ b/configs/syzygy_hub_defconfig
@@ -36,6 +36,7 @@ CONFIG_SYS_SPL_MALLOC=y
 CONFIG_SYS_SPL_MALLOC_SIZE=0x2000000
 CONFIG_SPL_FS_LOAD_ARGS_NAME="system.dtb"
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x10000000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x0
 CONFIG_SYS_MAXARGS=32

diff --git a/configs/vyasa-rk3288_defconfig b/configs/vyasa-rk3288_defconfig
index 27c704f8a2254cc799f1af217f717bdd088dde7e..9ae73816246a4639d7b5d11c17558d95d8696d95 100644 (file)
--- a/configs/vyasa-rk3288_defconfig
+++ b/configs/vyasa-rk3288_defconfig
@@ -29,6 +29,7 @@ CONFIG_SPL_STACK=0xff718000
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0xffe5000
 CONFIG_SPL_FALCON_BOOT_MMCSD=y
 CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR=0x8800
 CONFIG_CMD_SPL=y

diff --git a/configs/xilinx_zynq_virt_defconfig b/configs/xilinx_zynq_virt_defconfig
index a5cee103cb347e276623e4a8c4d69f7270bd2525..92ef35c647513f6b58449ce890f377dce9f81bbb 100644 (file)
--- a/configs/xilinx_zynq_virt_defconfig
+++ b/configs/xilinx_zynq_virt_defconfig
@@ -41,6 +41,7 @@ CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img"
 CONFIG_SPL_FS_LOAD_ARGS_NAME="system.dtb"
 CONFIG_SPL_FPGA=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x10000000
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
 CONFIG_SYS_MAXARGS=32

diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig
index 0ac75f6572f40bf9f1cfdfb7beabafae2b490acd..7f0ed8bc2250f6c1ce9a22a6cde8f41d183fb998 100644 (file)
--- a/configs/xilinx_zynqmp_virt_defconfig
+++ b/configs/xilinx_zynqmp_virt_defconfig
@@ -46,6 +46,7 @@ CONFIG_SPL_FS_LOAD_KERNEL_NAME="atf-uboot.ub"
 CONFIG_SPL_FS_LOAD_ARGS_NAME="u-boot.bin"
 CONFIG_SPL_FPGA=y
 CONFIG_SPL_OS_BOOT=y
+CONFIG_SYS_SPL_ARGS_ADDR=0x8000000
 CONFIG_SPL_RAM_SUPPORT=y
 CONFIG_SPL_RAM_DEVICE=y
 CONFIG_SPL_SPI_LOAD=y

diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 5057441f7506b5670c5c9f7d39ed8fb26c3ca92d..bce035531ce6055cdbc7573fe67441a9bf292b2d 100644 (file)
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -27,8 +27,6 @@
 #define CONFIG_POWER_TPS62362
 
 /* SPL defines. */
-#define CONFIG_SYS_SPL_ARGS_ADDR       (CONFIG_SYS_SDRAM_BASE + \
-                                        (128 << 20))
 
 /* Enabling L2 Cache */
 #define CONFIG_SYS_L2_PL310

diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index 769b3f073acca8b053f583882bb576477249e121..b98d4ab68ad29b2fff2836cec06e748c4677dce4 100644 (file)
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -29,8 +29,6 @@
  */
 
 #ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_SYS_SPL_ARGS_ADDR               0x80F80000
-
 /* RAW SD card / eMMC */
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x80    /* address 0x10000 */
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x80    /* 64KiB */

diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index eb015e1b20f2de75e3e3cb4f2e82d807aa359deb..ec1355b8a32085b0b5e9b96cb2be46df9eff7b2c 100644 (file)
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -76,7 +76,6 @@
                "bootz ${loadaddr} - ${fdtaddr}\0"
 
 /* SPL defines. */
-#define CONFIG_SYS_SPL_ARGS_ADDR       (CONFIG_SYS_SDRAM_BASE + (128 << 20))
 #define CONFIG_SYS_MONITOR_LEN         (512 * 1024)
 
 /* EEPROM */

diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 340c9d0d4a30618d15ae2d59b622c8f61dc6651a..2a3daea9f2539f08951f8596017bf9d92102d3ba 100644 (file)
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -124,7 +124,4 @@
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x8   /* address 0x1000 */
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 8     /* 4KB */
 
-#undef CONFIG_SYS_SPL_ARGS_ADDR
-#define CONFIG_SYS_SPL_ARGS_ADDR        (PHYS_SDRAM_1 + 0x100)
-
 #endif /* __CONFIG_H */

diff --git a/include/configs/display5.h b/include/configs/display5.h
index d7fbfbd702e10c3993eff0e53cd4bf6ae1b821fb..420b0c9f6e43f02610bd5f16db0548e9575894a2 100644 (file)
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -10,7 +10,6 @@
 #include "mx6_common.h"
 
 /* Falcon Mode */
-#define CONFIG_SYS_SPL_ARGS_ADDR       0x18000000
 
 /* Falcon Mode - MMC support */
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x3F00

diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 21b436bdb4cd89c3a51d51c5dca5ffa1306e6ee4..3023d0e0b25b0916af33057ba43d41da00e34f74 100644 (file)
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -53,7 +53,6 @@
 #ifdef CONFIG_SPL
 #include "imx6_spl.h"
 /* RiOTboard */
-#define CONFIG_SYS_SPL_ARGS_ADDR 0x13000000
 
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0 /* offset 69KB */
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0 /* offset 69KB */

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index cc6909774ed1a8097bb8b5b8bab46fb181ec93f7..2e6b9523f45b27d4ab6f3422bd9dc66d58de68c9 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -10,7 +10,6 @@
 /* Location in NAND to read U-Boot from */
 
 /* Falcon Mode */
-#define CONFIG_SYS_SPL_ARGS_ADDR       0x18000000
 
 /* Falcon Mode - NAND support: args@17MB kernel@18MB */
 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        (18 * SZ_1M)

diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h
index 2a794db4dffdea36fed8296fe24b152a2c147db4..4a1eae1d8b9b8fde96e14e5c001a9104d2e53139 100644 (file)
--- a/include/configs/imx6-engicam.h
+++ b/include/configs/imx6-engicam.h
@@ -135,8 +135,6 @@
 
 /* Falcon Mode */
 #ifdef CONFIG_SPL_OS_BOOT
-# define CONFIG_SYS_SPL_ARGS_ADDR      0x18000000
-
 /* MMC support: args@1MB kernel@2MB */
 # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR         0x800   /* 1MB */
 # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS                (CONFIG_CMD_SPL_WRITE_SIZE / 512)

diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index a8d691586c956b92be5632dde1d5e2e578b9fd1e..324016a53b24ccb6b4996e5f1ca9e08fe648a443 100644 (file)
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -130,7 +130,6 @@
 #endif
 
 /* Falcon Mode */
-#define CONFIG_SYS_SPL_ARGS_ADDR       0x18000000
 
 /* Falcon Mode - MMC support: args@1MB kernel@2MB */
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x800   /* 1MB */

diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index 437893238991168a2f640bc2434ecf99d3c6136c..00c30d4d5026e049b7417758563a23cc5bd9597e 100644 (file)
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -51,7 +51,6 @@
 #define CONFIG_USB_MAX_CONTROLLER_COUNT                2
 
 /* Falcon */
-#define CONFIG_SYS_SPL_ARGS_ADDR       0x13000000
 
 /* MMC support: args@1MB kernel@2MB */
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR          0x800   /* 1MB */

diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index 16815f4fb00ab2c4c6b4aaed832e44db1db797c2..bf8738f22a72c80972f5bbc6da26dd19aeaf4809 100644 (file)
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -20,7 +20,6 @@
 #endif
 
 #ifdef CONFIG_SD_BOOT
-#define CONFIG_SYS_SPL_ARGS_ADDR       0x90000000
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x500
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 30
 #endif

diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index ff76e69456731e822a75a52c9641e73fb3f1c26c..4ad62b43f8c962955aad99eae9192449d44a2324 100644 (file)
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -20,7 +20,6 @@
 
 #if defined(CONFIG_QSPI_BOOT)
 #define CONFIG_SYS_UBOOT_BASE          0x40100000
-#define CONFIG_SYS_SPL_ARGS_ADDR       0x90000000
 #endif
 
 #define CONFIG_SYS_NAND_BASE           0x7e800000

diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index ea7823de5a7da318e47e2ade8273411084b79169..2bbbdfa51f8420d30da1b662e7c82ca022cd2ca1 100644 (file)
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -12,7 +12,6 @@
 #include "imx6_spl.h"
 
 #define CONFIG_SYS_UBOOT_BASE (CONFIG_SYS_FLASH_BASE + 0x80000)
-#define CONFIG_SYS_SPL_ARGS_ADDR       0x18000000
 
 /*
  * Below defines are set but NOT really used since we by

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 389da112b939e95ac2594855adb077be1eca4d30..2adc1f6d86b88d855b81f33a3663151c0c77075a 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -115,13 +115,6 @@
 
 #define CONFIG_SYS_UBOOT_BASE          CONFIG_SYS_TEXT_BASE
 
-/* for booting directly linux */
-#define CONFIG_SYS_FDT_BASE            (CONFIG_SYS_TEXT_BASE + \
-                                       0x40000)
-
-#define CONFIG_SYS_SPL_ARGS_ADDR       (CONFIG_SYS_TEXT_BASE + \
-                                        0x1000000)
-
 /* SP location before relocation, must use scratch RAM */
 /* BRAM start */
 #define CONFIG_SYS_INIT_RAM_ADDR       0x0

diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h
index 246836a077b97d46ee6234c037f81ba2562ba2dd..87e2251777cbd20871ca59db7e92d2c3eab48eee 100644 (file)
--- a/include/configs/mt7629.h
+++ b/include/configs/mt7629.h
@@ -27,7 +27,6 @@
 /* SPL -> Uboot */
 
 /* UBoot -> Kernel */
-#define CONFIG_SYS_SPL_ARGS_ADDR       0x40000000
 
 /* DRAM */
 #define CONFIG_SYS_SDRAM_BASE          0x40000000

diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index 00ca50a4e64746c7da3f66613ca6fcb2a24c68c9..04f8a16fde98aaeff3608e51a68a7731489e5448 100644 (file)
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -28,8 +28,6 @@
 
 /* Falcon Mode */
 #ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_SYS_SPL_ARGS_ADDR       0x18000000
-
 /* Falcon Mode - MMC support: args@1MB kernel@2MB */
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x800   /* 1MB */
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512)

diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index c78ddc42568c8aa6b17f036ebb7bd20f5ffbaa41..43625402700633cfa632c228d5f76cb5341ffb6e 100644 (file)
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -18,7 +18,6 @@
 #include "mx6sabre_common.h"
 
 /* Falcon Mode */
-#define CONFIG_SYS_SPL_ARGS_ADDR       0x18000000
 
 /* Falcon Mode - MMC support: args@1MB kernel@2MB */
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x800   /* 1MB */

diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index 4910c80e32502f0da8cabc3d742b02792e3010ce..571a233c302de839750e7e94e11c139f12c13658 100644 (file)
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -14,7 +14,6 @@
 
 #ifdef CONFIG_SPL_OS_BOOT
 /* Falcon Mode */
-#define CONFIG_SYS_SPL_ARGS_ADDR   0x18000000
 
 /* Falcon Mode - MMC support: args@1MB kernel@2MB */
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x800   /* 1MB */

diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index eef148419034436992ce96ffa51adeaf17611798..3e0cedadc32d7888309cad7c472a6abe961b3fa3 100644 (file)
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -16,7 +16,6 @@
 
 #ifdef CONFIG_SPL_OS_BOOT
 /* Falcon Mode */
-#define CONFIG_SYS_SPL_ARGS_ADDR   0x88000000
 
 /* Falcon Mode - MMC support: args@1MB kernel@2MB */
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x800   /* 1MB */

diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 482238b419482758eeef1226e445291676715e39..a293dca6421236f8f17ca73f379811c5ac8a99b0 100644 (file)
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -14,7 +14,6 @@
 
 #ifdef CONFIG_SPL_OS_BOOT
 /* Falcon Mode */
-#define CONFIG_SYS_SPL_ARGS_ADDR       0x88000000
 
 /* Falcon Mode - MMC support: args@1MB kernel@2MB */
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x800   /* 1MB */

diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index b4590a2ea9123d168d61a5c1382580bbc8a619d6..073520bd5e5f80e0e098c1e612342340d0f002ff 100644 (file)
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -57,7 +57,6 @@
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x100  /* 128 KiB */
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512)
 /* U-Boot proper stored by default at 0x200 (256 KiB) */
-#define CONFIG_SYS_SPL_ARGS_ADDR               0x22000000
 
 /* Falcon boot support on FAT on MMC */
 

diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h
index 80db425bb7ced0e74b6b74cc1ae628980c432bd6..05ac900f3c3195e152f2f00c0840525a6687b9b2 100644 (file)
--- a/include/configs/stm32f746-disco.h
+++ b/include/configs/stm32f746-disco.h
@@ -43,10 +43,6 @@
 #define CONFIG_SYS_UBOOT_BASE          (CONFIG_SYS_FLASH_BASE + \
                                         CONFIG_SPL_PAD_TO)
 
-/* DT blob (fdt) address */
-#define CONFIG_SYS_FDT_BASE            (CONFIG_SYS_FLASH_BASE + \
-                                       0x1C0000)
-
 /* For splashcreen */
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h
index f8bd5558e56af2213ff9fc48ad02cc2f0e1ce9fb..5d5df6b10191907d49a20c3799844f868057e38e 100644 (file)
--- a/include/configs/ti_am335x_common.h
+++ b/include/configs/ti_am335x_common.h
@@ -32,8 +32,6 @@
  * supports X-MODEM loading via UART, and we leverage this and then use
  * Y-MODEM to load u-boot.img, when booted over UART.
  */
-#define CONFIG_SYS_SPL_ARGS_ADDR       (CONFIG_SYS_SDRAM_BASE + \
-                                        (128 << 20))
 
 /* Enable the watchdog inside of SPL */
 

diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h
index 3d7cb175faa6b2892da19c8c9b2490b31639e64b..725a5a62f5252d069128d6707f1af4b5611a291e 100644 (file)
--- a/include/configs/ti_omap3_common.h
+++ b/include/configs/ti_omap3_common.h
@@ -55,8 +55,6 @@
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)
 
 /* SPL */
-#define CONFIG_SYS_SPL_ARGS_ADDR       (CONFIG_SYS_SDRAM_BASE + \
-                                        (64 << 20))
 
 #ifdef CONFIG_MTD_RAW_NAND
 #define CONFIG_SYS_NAND_BASE           0x30000000

diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index b5ccfdcc6d46623147e2aa08613dacf4f6b83455..5d8c45af2fa0bf974f685cfe7bc9e3c1fdaecdbd 100644 (file)
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -113,8 +113,6 @@
  * SPL is overlapped with public stack and breaking non HS devices to boot.
  * So moving TEXT_BASE down to non-HS limit.
  */
-#define CONFIG_SYS_SPL_ARGS_ADDR       (CONFIG_SYS_SDRAM_BASE + \
-                                        (128 << 20))
 
 #ifdef CONFIG_SPL_BUILD
 /* No need for i2c in SPL mode as we will use SRI2C for PMIC access on OMAP4 */

diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index 714a1c55c7fb2e04cbd65ef22addcd72e9da0b8a..f7f17d0f502c3e6b485a2d4d4ffaee69e3af7ecb 100644 (file)
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -305,7 +305,4 @@
  */
 #endif
 
-#define CONFIG_SYS_SPL_ARGS_ADDR       (CONFIG_SYS_SDRAM_BASE + \
-                                        (128 << 20))
-
 #endif /* __CONFIG_TI_OMAP5_COMMON_H */

diff --git a/include/configs/trats.h b/include/configs/trats.h
index 6ed1c79c89e0f64a215073268394a08c6424b37b..db33560f0db4834cf455ffb7e46e89c6fe751986 100644 (file)
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -127,7 +127,6 @@
        "fdtaddr=40800000\0" \
 
 /* Falcon mode definitions */
-#define CONFIG_SYS_SPL_ARGS_ADDR        CONFIG_SYS_SDRAM_BASE + 0x100
 
 /* GPT */
 

diff --git a/include/configs/vyasa-rk3288.h b/include/configs/vyasa-rk3288.h
index fb76e5544ac358a6d6e3de9d3f539dff1c0a03b4..d0e017f44821fe7cb9aa9872401e130194855e83 100644 (file)
--- a/include/configs/vyasa-rk3288.h
+++ b/include/configs/vyasa-rk3288.h
@@ -22,7 +22,6 @@
 
 #ifndef CONFIG_TPL_BUILD
 /* Falcon Mode */
-#define CONFIG_SYS_SPL_ARGS_ADDR       0x0ffe5000
 
 /* Falcon Mode - MMC support: args@16MB kernel@17MB */
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR          0x8000  /* 16MB */

diff --git a/include/configs/xea.h b/include/configs/xea.h
index 07419f0afbbcae81806a6228970d1a50a16e89a8..b82e6605f823f1fb9e0fd2d848f118d8bf218e46 100644 (file)
--- a/include/configs/xea.h
+++ b/include/configs/xea.h
@@ -16,8 +16,6 @@
 
 /* SPL */
 
-#define CONFIG_SYS_SPL_ARGS_ADDR       0x44000000
-
 #define CONFIG_SYS_SPI_KERNEL_OFFS     SZ_1M
 #define CONFIG_SYS_SPI_ARGS_OFFS       SZ_512K
 #define CONFIG_SYS_SPI_ARGS_SIZE       SZ_32K

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 713db4c4dae65f83f0f3d09c7dc203e9f6698702..3331738fc4afb832753daeb0021f2a730dbe2005 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -206,7 +206,6 @@
 #endif
 
 /* u-boot is like dtb */
-#define CONFIG_SYS_SPL_ARGS_ADDR       0x8000000
 
 /* ATF is my kernel image */
 

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index b2b95b710ef408442f9bc541b31e6efc1d40ef05..4d8d44c25d838df3899e20db22dfb64f1ddb79c1 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -210,7 +210,6 @@
 #define CONFIG_SYS_MMC_MAX_DEVICE      1
 
 /* Address in RAM where the parameters must be copied by SPL. */
-#define CONFIG_SYS_SPL_ARGS_ADDR       0x10000000
 
 /* Not using MMC raw mode - just for compilation purpose */
 #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0