Convert CONFIG_SPL_BOARD_INIT to Kconfig

This converts the following to Kconfig:
   CONFIG_SPL_BOARD_INIT

Signed-off-by: Ley Foon Tan <ley.foon.tan@intel.com>
[trini: Update the Kconfig logic]
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/README b/README
index 864bf8bc2224977b08dd73ec234113d3e8c1743b..350b805c3801945fe8c86cdb43b67c34e23d5f6d 100644 (file)
--- a/README
+++ b/README
@@ -292,7 +292,7 @@ board_init_r():
        - stack is optionally in SDRAM, if CONFIG_SPL_STACK_R is defined and
                CONFIG_SPL_STACK_R_ADDR points into SDRAM
        - preloader_console_init() can be called here - typically this is
-               done by defining CONFIG_SPL_BOARD_INIT and then supplying a
+               done by selecting CONFIG_SPL_BOARD_INIT and then supplying a
                spl_board_init() function containing this call
        - loads U-Boot or (in falcon mode) Linux
 

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a17ba2c60a54c55af61367ffe3409f70bf5e0712..86b6e297d5372dddbf3bed533d2ddf8db09b7dc3 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -281,6 +281,7 @@ choice
 
 config ARCH_AT91
        bool "Atmel AT91"
+       select SPL_BOARD_INIT if SPL
 
 config TARGET_EDB93XX
        bool "Support edb93xx"
@@ -553,6 +554,7 @@ config ARCH_KEYSTONE
 config ARCH_OMAP2PLUS
        bool "TI OMAP2+"
        select CPU_V7
+       select SPL_BOARD_INIT if SPL
        select SUPPORT_SPL
        imply FIT
 
@@ -674,6 +676,7 @@ config ARCH_ZYNQ
        select CPU_V7
        select SUPPORT_SPL
        select OF_CONTROL
+       select SPL_BOARD_INIT if SPL
        select SPL_OF_CONTROL if SPL
        select DM
        select DM_ETH
@@ -701,6 +704,7 @@ config ARCH_ZYNQMP
        select DM_SERIAL
        select SUPPORT_SPL
        select CLK
+       select SPL_BOARD_INIT if SPL
        select SPL_CLK
        select DM_USB if USB
 
@@ -943,6 +947,7 @@ config ARCH_UNIPHIER
        select OF_CONTROL
        select OF_LIBFDT
        select PINCTRL
+       select SPL_BOARD_INIT if SPL
        select SPL_DM if SPL
        select SPL_LIBCOMMON_SUPPORT if SPL
        select SPL_LIBGENERIC_SUPPORT if SPL

diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h
index b0ca4bcf044be46ea85e9d98e23b4a010917efb5..c20a3c348d4a8027699425c6e06cae0e0b9e76eb 100644 (file)
--- a/arch/arm/include/asm/fsl_secure_boot.h
+++ b/arch/arm/include/asm/fsl_secure_boot.h
@@ -13,7 +13,6 @@
 #define CONFIG_SHA_HW_ACCEL
 #define CONFIG_SHA_PROG_HW_ACCEL
 
-#define CONFIG_SPL_BOARD_INIT
 #ifdef CONFIG_SPL_BUILD
 /*
  * Define the key hash for U-Boot here if public/private key pair used to

diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig
index 3ea8dc33efd142e80b290804ceb6c994139ebc7d..cababdba527762decbd51442a9eb142c1dcd7dc5 100644 (file)
--- a/arch/arm/mach-keystone/Kconfig
+++ b/arch/arm/mach-keystone/Kconfig
@@ -6,19 +6,23 @@ choice
 
 config TARGET_K2HK_EVM
        bool "TI Keystone 2 Kepler/Hawking EVM"
+       select SPL_BOARD_INIT if SPL
        imply DM_I2C
 
 config TARGET_K2E_EVM
        bool "TI Keystone 2 Edison EVM"
+       select SPL_BOARD_INIT if SPL
        imply DM_I2C
 
 config TARGET_K2L_EVM
        bool "TI Keystone 2 Lamar EVM"
+       select SPL_BOARD_INIT if SPL
        imply DM_I2C
 
 config TARGET_K2G_EVM
        bool "TI Keystone 2 Galileo EVM"
         select BOARD_LATE_INIT
+       select SPL_BOARD_INIT if SPL
         select TI_I2C_BOARD_DETECT
        imply DM_I2C
 

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 740dbdf70e3ae4aa57202866aac1728b76a84cbe..6be2ab5025a27ca0abe52547817bd628e44bc78d 100644 (file)
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -14,6 +14,7 @@ config ROCKCHIP_RK3036
 config ROCKCHIP_RK3188
        bool "Support Rockchip RK3188"
        select CPU_V7
+       select SPL_BOARD_INIT if SPL
        select SUPPORT_SPL
        select SUPPORT_TPL
        select SPL
@@ -30,6 +31,7 @@ config ROCKCHIP_RK3188
 config ROCKCHIP_RK3288
        bool "Support Rockchip RK3288"
        select CPU_V7
+       select SPL_BOARD_INIT if SPL
        select SUPPORT_SPL
        select SPL
        help

diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
index 2563e7926d1d80a2fc4770e7cf10f2aa60c978db..45e5379d566c58fbb5b1fb068206ec2a4193fe39 100644 (file)
--- a/arch/arm/mach-socfpga/Kconfig
+++ b/arch/arm/mach-socfpga/Kconfig
@@ -39,6 +39,7 @@ config TARGET_SOCFPGA_ARRIA5
 
 config TARGET_SOCFPGA_ARRIA10
        bool
+       select SPL_BOARD_INIT if SPL
 
 config TARGET_SOCFPGA_CYCLONE5
        bool

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index c67ffa5a2356c08a776a5a9001c2dbd5ad685f10..66cf96063363a20940d683c1c2a4540db91db26e 100644 (file)
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -49,6 +49,7 @@ config TEGRA_ARMV7_COMMON
        bool "Tegra 32-bit common options"
        select CPU_V7
        select SPL
+       select SPL_BOARD_INIT if SPL
        select SUPPORT_SPL
        select TEGRA_COMMON
        select TEGRA_GPIO

diff --git a/board/freescale/common/Kconfig b/board/freescale/common/Kconfig
index 8a9a9be8ce857abc541664b7c68673f15aef9608..a5e302f92405f4a31b1965db38d5ab22b9e1a4f1 100644 (file)
--- a/board/freescale/common/Kconfig
+++ b/board/freescale/common/Kconfig
@@ -2,5 +2,6 @@ config CHAIN_OF_TRUST
        depends on !FIT_SIGNATURE && SECURE_BOOT
        imply CMD_BLOB
        select FSL_CAAM
+       select SPL_BOARD_INIT if (ARM && SPL)
        bool
        default y

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 5ed3f19ac3a65bcbdd52e648e0d18ccd4ee5044f..92b476e945d4699a6019ce1fc598019057820649 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -16,6 +16,14 @@ config SPL
        help
          If you want to build SPL as well as the normal image, say Y.
 
+config SPL_BOARD_INIT
+       depends on SPL
+       bool "Call board-specific initialization in SPL"
+       help
+         If this option is enabled, U-Boot will call the function
+         spl_board_init() from board_init_r(). This function should be
+         provided by the board.
+
 config SPL_RAW_IMAGE_SUPPORT
        bool "Support SPL loading and booting of RAW images"
        depends on SPL

diff --git a/configs/a3m071_defconfig b/configs/a3m071_defconfig
index 8d636e03d206478c948da2e9f7cafb82558f3888..a461b809c61284b947d8e5dd3549cdfc68b055a9 100644 (file)
--- a/configs/a3m071_defconfig
+++ b/configs/a3m071_defconfig
@@ -10,6 +10,7 @@ CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_SPL=y
+CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_NOR_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y

diff --git a/configs/a4m2k_defconfig b/configs/a4m2k_defconfig
index c3ee19945cf1fbdcf06c043928bdc20e889fa926..3100da6c6ea3e18386f306d17bf9159dfd49876e 100644 (file)
--- a/configs/a4m2k_defconfig
+++ b/configs/a4m2k_defconfig
@@ -11,6 +11,7 @@ CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_SPL=y
+CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_NOR_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y

diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig
index e1c4f0c999331b72f046987a013a8510915bd661..037f338993236a3ed3b95d45167e4873ef7e2150 100644 (file)
--- a/configs/controlcenterdc_defconfig
+++ b/configs/controlcenterdc_defconfig
@@ -11,6 +11,7 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_SPL=y
+CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_ELF is not set

diff --git a/configs/da850_am18xxevm_defconfig b/configs/da850_am18xxevm_defconfig
index d87310130c7fe38d0ba0a07b97a822d5f0e46e94..bb92c438fb9b56f8d925bdaaf4a6c1ce99ff9f37 100644 (file)
--- a/configs/da850_am18xxevm_defconfig
+++ b/configs/da850_am18xxevm_defconfig
@@ -13,6 +13,7 @@ CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL=y
+CONFIG_SPL_BOARD_INIT=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_ASKENV=y

diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig
index f50a9499723e75326a87c0813ffdff3838689e1a..1120182052b34031ca8e73258f9aaffad805fe5e 100644 (file)
--- a/configs/da850evm_defconfig
+++ b/configs/da850evm_defconfig
@@ -13,6 +13,7 @@ CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL=y
+CONFIG_SPL_BOARD_INIT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot > "
 CONFIG_CMD_BOOTZ=y

diff --git a/configs/devkit3250_defconfig b/configs/devkit3250_defconfig
index 074be13c0429e4f1aee93ec3761c221bf04f2c1a..8a8edf23c3e192c98e03f56fb69eae5c0e3d7c79 100644 (file)
--- a/configs/devkit3250_defconfig
+++ b/configs/devkit3250_defconfig
@@ -9,6 +9,7 @@ CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL=y
+CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y

diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig
index 51c9ba5f0eb2fd98fc9185c7125065d27fa453cf..9d6682147cf17a603b823660ee3c0f0cf917060b 100644 (file)
--- a/configs/edminiv2_defconfig
+++ b/configs/edminiv2_defconfig
@@ -9,6 +9,7 @@ CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_ARCH_MISC_INIT=y
 CONFIG_SPL=y
+CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_NOR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="EDMiniV2> "

diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
index dfabb6bb39e2133bd5a8a1c0cbaec2ff71c32926..d638f8bd0fc3db7cf9a4cc2ec959407130fb7a31 100644 (file)
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -19,6 +19,7 @@ CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL=y
+CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_DMA_SUPPORT=y
 CONFIG_SPL_I2C_SUPPORT=y

diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
index f95aa44390c65cf0026f80da2a476cb57cd8618c..0aef36ae7658402d3d303c608fd75dc8bfb93326 100644 (file)
--- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig
@@ -19,6 +19,7 @@ CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL=y
+CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_DMA_SUPPORT=y
 CONFIG_SPL_I2C_SUPPORT=y

diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
index 169570d8fde0e70ed4d60ae4700a1b38279a1b73..85c3485840cdf416cb584de11b31e39a495a3f57 100644 (file)
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -20,6 +20,7 @@ CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL=y
+CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL_DMA_SUPPORT=y
 CONFIG_SPL_I2C_SUPPORT=y

diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig
index 72ceb5ea4334c608dc756fccd6f4dcdb586058b5..705236eb7bb679eb3d67aa3616f337da6e041edb 100644 (file)
--- a/configs/ipam390_defconfig
+++ b/configs/ipam390_defconfig
@@ -11,6 +11,7 @@ CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL=y
+CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot > "

diff --git a/configs/m53evk_defconfig b/configs/m53evk_defconfig
index b0379b8e630a4a5d109b9a22559db7ea52005dbf..a7bf29731e581103614506fb125af4a769d75376 100644 (file)
--- a/configs/m53evk_defconfig
+++ b/configs/m53evk_defconfig
@@ -15,6 +15,7 @@ CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
+CONFIG_SPL_BOARD_INIT=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_ASKENV=y

diff --git a/configs/mccmon6_nor_defconfig b/configs/mccmon6_nor_defconfig
index 7744fcb535862fbdd611d80b587e1a4bb375997c..acc43ad94a66c38928efae91018b9ce5291386ce 100644 (file)
--- a/configs/mccmon6_nor_defconfig
+++ b/configs/mccmon6_nor_defconfig
@@ -7,6 +7,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 # CONFIG_CMD_BMODE is not set
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/liebherr/mccmon6/mon6_imximage_nor.cfg,MX6QDL"
 CONFIG_SPL=y
+CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_NOR_SUPPORT=y
 CONFIG_HUSH_PARSER=y

diff --git a/configs/mccmon6_sd_defconfig b/configs/mccmon6_sd_defconfig
index 1118caa0a9581a5462ba7b9b7851c87ea966c770..61c436e22c13207018e61c4cc948da7ffaf0d15e 100644 (file)
--- a/configs/mccmon6_sd_defconfig
+++ b/configs/mccmon6_sd_defconfig
@@ -8,6 +8,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 # CONFIG_CMD_BMODE is not set
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/liebherr/mccmon6/mon6_imximage_sd.cfg,MX6QDL"
 CONFIG_SPL=y
+CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_NOR_SUPPORT=y
 CONFIG_HUSH_PARSER=y

diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 131d6f586213d61dacf26477953923317a878f93..0bfcdd217671ad10faa427d3e43a6381e874d4ca 100644 (file)
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -14,6 +14,7 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_BOOTDELAY=-1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
+CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_SPL_NOR_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y

diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig
index 0629f9636fd4e05a4e79371140e908a894e17019..7de478848074539048723edcd0e6f5c67568cfc9 100644 (file)
--- a/configs/omapl138_lcdk_defconfig
+++ b/configs/omapl138_lcdk_defconfig
@@ -13,6 +13,7 @@ CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL=y
+CONFIG_SPL_BOARD_INIT=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xb5
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig
index 3061e5a9d9ae39c5be7678e4f3d79b8ae5d4eafb..cdeb30cb8d7db6d3d15918adda882c2af1016407 100644 (file)
--- a/configs/sandbox_spl_defconfig
+++ b/configs/sandbox_spl_defconfig
@@ -21,6 +21,7 @@ CONFIG_CONSOLE_RECORD=y
 CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000
 CONFIG_SILENT_CONSOLE=y
 CONFIG_SPL=y
+CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_CMD_CPU=y
 CONFIG_CMD_LICENSE=y

diff --git a/configs/woodburn_sd_defconfig b/configs/woodburn_sd_defconfig
index fdc2b2aa2239700b05f5d5f8e15f6804eb5bd0ee..22172c57b387c5033a524f5e13e1725964219652 100644 (file)
--- a/configs/woodburn_sd_defconfig
+++ b/configs/woodburn_sd_defconfig
@@ -10,6 +10,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/woodburn/imximage.cfg"
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_SPL=y
+CONFIG_SPL_BOARD_INIT=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x100
 CONFIG_HUSH_PARSER=y

diff --git a/configs/work_92105_defconfig b/configs/work_92105_defconfig
index ebcae43e3f8d5eb19d0e258df2f931cf13c12c66..1d22de7447dfe1edccdec37b68dd80d252ab86e8 100644 (file)
--- a/configs/work_92105_defconfig
+++ b/configs/work_92105_defconfig
@@ -9,6 +9,7 @@ CONFIG_VERSION_VARIABLE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL=y
+CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set

diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h
index 07f74db0899b46c2a458dc1c4024d2e6a06fb4ca..82b9ff471d6b52698360e52ebc7d50ffefa6de63 100644 (file)
--- a/include/configs/a3m071.h
+++ b/include/configs/a3m071.h
@@ -388,7 +388,6 @@
  * SPL related defines
  */
 #define CONFIG_SPL_FRAMEWORK
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_TEXT_BASE   0xfc000000
 
 /* Place BSS for SPL near end of SDRAM */

diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 5de39cf740f0ced7fed929ccdd89b01e087fd3af..526036590f6421c853d8dc85b64a9b173f90ce00 100644 (file)
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -250,7 +250,6 @@
 
 /* Defines for SPL */
 #define CONFIG_SPL_FRAMEWORK
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_SIMPLE
 #define CONFIG_SPL_TEXT_BASE           0x40200800
 #define CONFIG_SPL_MAX_SIZE            (SRAM_SCRATCH_SPACE_ADDR - \

diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index feb7b6eb97452ebbf1958070fd55d83bb7897a33..829dd3ecb960372acc365f20375805d8a9dfe37e 100644 (file)
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -300,7 +300,6 @@
 
 /* Defines for SPL */
 #define CONFIG_SPL_FRAMEWORK
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_SIMPLE
 #define CONFIG_SPL_TEXT_BASE           0x40200000
 #define CONFIG_SPL_MAX_SIZE            (SRAM_SCRATCH_SPACE_ADDR - \

diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index e7b9ad245ca4f9251c6debd655825f79d32b6b9a..411d7412afd0abaee122f563102fdf4772993f5f 100644 (file)
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -197,7 +197,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START    0x20080000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     0x80000
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_MONITOR_LEN         (512 << 10)
 
 #define CONFIG_SYS_MASTER_CLOCK                132096000

diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index a5489cd28c931ea1ee27d96369d54428daa59083..33cc5fc7aae8e8ddcb1105630f8a7d0f884cd7da 100644 (file)
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -191,7 +191,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START    0x20080000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     0x80000
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_MONITOR_LEN         (512 << 10)
 
 #define CONFIG_SYS_MASTER_CLOCK                132096000

diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h
index 7aad7ea51f69a170d44e06bfc7e85b81d36e7cf5..7907310084e2039fd8271d6a43bc65b456a4d8c1 100644 (file)
--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@@ -105,7 +105,6 @@
 #define CONFIG_SYS_SPL_MALLOC_SIZE     CONFIG_SYS_MALLOC_LEN
 
 /* General parts of the framework, required. */
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_LDSCRIPT            "arch/arm/mach-omap2/u-boot-spl.lds"
 
 #endif /* ! __BUR_AM335X_COMMON_H__ */

diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 1898e3837d52a097ccb12ac11026aba45611558a..4f896d26057f4f4af38d7301deaa4a8ed6d0a3da 100644 (file)
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -262,7 +262,6 @@
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "u-boot.img"
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_ECC

diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h
index add5f90cc23de7f3267ee56e0a6bc261cc3889fd..f73516c5d91d5acfaeca00b2d7fcb1ed92332646 100644 (file)
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -17,7 +17,6 @@
 #define CONFIG_DISPLAY_BOARDINFO_LATE
 #define CONFIG_BOARD_LATE_INIT
 #define CONFIG_LAST_STAGE_INIT
-#define CONFIG_SPL_BOARD_INIT
 
 /*
  * TEXT_BASE needs to be below 16MiB, since this area is scrubbed

diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index 71b428f1f745201f1afb8ddea3025613c2210ebb..3847a19cadbbe72687dc03628d954b793a351110 100644 (file)
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -148,7 +148,6 @@
 #define CONFIG_SPL_BSS_START_ADDR      CONFIG_SPL_MAX_SIZE
 #define CONFIG_SPL_BSS_MAX_SIZE                (SZ_2K)
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_ECC

diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 9442c05943ba3fa4c36bc0948654ea8646b67d10..d2aebc80f4eab720b7fc577ad00192e019711d30 100644 (file)
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -308,7 +308,6 @@
 #ifndef CONFIG_DIRECT_NOR_BOOT
 /* defines for SPL */
 #define CONFIG_SPL_FRAMEWORK
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_SPL_MALLOC_START    (CONFIG_SYS_TEXT_BASE - \
                                                CONFIG_SYS_MALLOC_LEN)
 #define CONFIG_SYS_SPL_MALLOC_SIZE     CONFIG_SYS_MALLOC_LEN

diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 6e95064fe16aaeba356470e6395974f1777f1278..0c83ee3d25d026abe41eab87ab93648454ebf548 100644 (file)
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -181,7 +181,6 @@
 
 /* SPL will use SRAM as stack */
 #define CONFIG_SPL_STACK               0x0000FFF8
-#define CONFIG_SPL_BOARD_INIT
 
 /* Use the framework and generic lib */
 #define CONFIG_SPL_FRAMEWORK

diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index d1c7b937e36b60d2fb61c2222850abc42159f1aa..31bbcc479d0642e0be29e2840de463d87b60a6dd 100644 (file)
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -25,7 +25,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START    0x00040000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     0x0001ffff
 #define CONFIG_SPL_LDSCRIPT            "$(CPUDIR)/orion5x/u-boot-spl.lds"
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_UBOOT_BASE          0xfff90000
 #define CONFIG_SYS_UBOOT_START         0x00800000
 #define CONFIG_SYS_TEXT_BASE           0x00800000

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 1c18a380fef679bcfac427d0643d67857308d84b..ba06fb6896a395eb1773414a85c1f5e08c817943 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -8,7 +8,6 @@
 #define __CONFIG_H
 
 /* SPL */
-#define CONFIG_SPL_BOARD_INIT
 /* Location in NAND to read U-Boot from */
 #define CONFIG_SYS_NAND_U_BOOT_OFFS     (14 * SZ_1M)
 

diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index 5caf02e8d9a89bcc9f50f38158035a40141f21a6..bc8f5d5e2e91f1c8bdef7adda8db3e9a381a9fd5 100644 (file)
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -273,7 +273,6 @@
 
 /* defines for SPL */
 #define CONFIG_SPL_FRAMEWORK
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_SPL_MALLOC_START    (CONFIG_SYS_TEXT_BASE - \
                                                CONFIG_SYS_MALLOC_LEN)
 #define CONFIG_SYS_SPL_MALLOC_SIZE     CONFIG_SYS_MALLOC_LEN

diff --git a/include/configs/kc1.h b/include/configs/kc1.h
index 343685a652de518e69d2424aa365855f954df3b8..408e5634b612c290bc26a6c21071e41701c0b7ac 100644 (file)
--- a/include/configs/kc1.h
+++ b/include/configs/kc1.h
@@ -90,7 +90,6 @@
 #define CONFIG_SYS_SPL_MALLOC_SIZE     (1024 * 1024)
 
 #define CONFIG_SPL_LDSCRIPT            "arch/arm/mach-omap2/u-boot-spl.lds"
-#define CONFIG_SPL_BOARD_INIT
 
 /*
  * Console

diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index c729e0938f155133ac83913ddb9971e3fbba16b0..b237cea1da259ac7967633bad63a914bed87ad1a 100644 (file)
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -218,7 +218,6 @@
  */
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TARGET              "u-boot-with-nand-spl.imx"
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_TEXT_BASE           0x70008000
 #define CONFIG_SPL_PAD_TO              0x8000
 #define CONFIG_SPL_STACK               0x70004000

diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h
index 8413c5c23463bbab660ac0b83984a1a797c331d6..6dc1fb047e80d10d2634da1569227865e97ae2a8 100644 (file)
--- a/include/configs/ma5d4evk.h
+++ b/include/configs/ma5d4evk.h
@@ -206,7 +206,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START    0x20080000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     0x80000
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_MONITOR_LEN         (512 << 10)
 
 #define CONFIG_SPL_SPI_LOAD

diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 4b9b5312bf862dd301dc95ea99bb4239dfbbe612..fca1af9d2bb9695f3e0ef0326a592d19c7d9971a 100644 (file)
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -14,7 +14,6 @@
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
 #include "imx6_spl.h"
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_UBOOT_BASE (CONFIG_SYS_FLASH_BASE + 0x80000)
 #define CONFIG_SPL_OS_BOOT

diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index c70e68c5b0c37a431c2706de3d2916f59cdb3adc..daded1114992c0550236d9e3e3a22a09b2efddb5 100644 (file)
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -289,7 +289,6 @@
 
 /* Defines for SPL */
 #define CONFIG_SPL_FRAMEWORK
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_SIMPLE
 
 #define CONFIG_SPL_NAND_BASE

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index e8fe2f673c251bb03ec0630faed3b9ba2f7fa6ce..4084c6efbde16b0a9c57b1d0f5d2b0bf622bbe5c 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -275,7 +275,6 @@
 /* SPL part */
 #define CONFIG_CMD_SPL
 #define CONFIG_SPL_FRAMEWORK
-#define CONFIG_SPL_BOARD_INIT
 
 #define CONFIG_SPL_LDSCRIPT    "arch/microblaze/cpu/u-boot-spl.lds"
 

diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index d8ca6225d6e6c8d522a290c71a6cfe44e811ac25..8f8fc24076851b1969b3dd51461c74902b6b8b00 100644 (file)
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -317,7 +317,6 @@
 #define CONFIG_SPL_BSS_START_ADDR      0x80000000
 #define CONFIG_SPL_BSS_MAX_SIZE                0x80000         /* 512 KB */
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_OMAP3_ID_NAND
 #define CONFIG_SPL_LDSCRIPT            "arch/arm/mach-omap2/u-boot-spl.lds"
 

diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index 0cc0042bca3bc7f451ab94861352f91a559f6921..c8d0598af8fb02d01b91b8372fed88ff9b405f8d 100644 (file)
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -330,7 +330,6 @@
 #ifndef CONFIG_DIRECT_NOR_BOOT
 /* defines for SPL */
 #define CONFIG_SPL_FRAMEWORK
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_SPL_MALLOC_START    (CONFIG_SYS_TEXT_BASE - \
                                                CONFIG_SYS_MALLOC_LEN)
 #define CONFIG_SYS_SPL_MALLOC_SIZE     CONFIG_SYS_MALLOC_LEN

diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h
index c5e508e4ab205725b46147b5af8b58f98fa233c6..81a1553390b28aeb7d1e18b6ad457617e243a264 100644 (file)
--- a/include/configs/rk3188_common.h
+++ b/include/configs/rk3188_common.h
@@ -25,7 +25,6 @@
 #define CONFIG_SYS_TIMER_COUNTS_DOWN
 
 #define CONFIG_SYS_NS16550_MEM32
-#define CONFIG_SPL_BOARD_INIT
 
 #ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM
 /* Bootrom will load u-boot binary to 0x60000000 once return from SPL */

diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index e7a8f724f16e2d655fcb51bf6f9fead64a10da58..4cf71fa17e150427b8ccf63e21a049d36d9bfa3c 100644 (file)
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -23,7 +23,6 @@
 
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SYS_NS16550_MEM32
-#define CONFIG_SPL_BOARD_INIT
 
 #ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM
 /* Bootrom will load u-boot binary to 0x0 once return from SPL */

diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h
index 7d20d65bf3b1a4ba5572a3ff4a36baa62b5c9408..57fa67d234bedec88b8b6e0754de7dfb2f77e293 100644 (file)
--- a/include/configs/sama5d2_ptc.h
+++ b/include/configs/sama5d2_ptc.h
@@ -115,7 +115,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START    0x20080000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     0x80000
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_MONITOR_LEN         (512 << 10)
 
 #ifdef CONFIG_SYS_USE_SERIALFLASH

diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h
index f044f0e6def4880151560ba2778b4785ee7bea88..42fb1e11d0a7eec7a3b7e5416260f0b577fe8fa6 100644 (file)
--- a/include/configs/sama5d2_xplained.h
+++ b/include/configs/sama5d2_xplained.h
@@ -79,7 +79,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START    0x20080000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     0x80000
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_MONITOR_LEN         (512 << 10)
 
 #ifdef CONFIG_SYS_USE_MMC

diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index b4a62bd63af886a0de65b813cd5926aba0578fe1..074c7568f04d24ae1c0cefad8ec957b40b7763f3 100644 (file)
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -97,7 +97,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START    0x20080000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     0x80000
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_MONITOR_LEN         (512 << 10)
 
 #ifdef CONFIG_SYS_USE_MMC

diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index 509457b9bf0ea9e7e7340f217641ca7a33e72b00..9540a4a0ff9097312fe9e3dbfe58ff21764e68e4 100644 (file)
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -126,7 +126,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START    0x20080000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     0x80000
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_MONITOR_LEN         (512 << 10)
 
 #ifdef CONFIG_SYS_USE_MMC

diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h
index c584b0b9e3f96a26755a1afb63383c2073b467de..f1cf65f42c087e4199e5f2f8bc1b5c1ac2c0009f 100644 (file)
--- a/include/configs/sama5d4_xplained.h
+++ b/include/configs/sama5d4_xplained.h
@@ -75,7 +75,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START    0x20080000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     0x80000
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_MONITOR_LEN         (512 << 10)
 
 #ifdef CONFIG_SYS_USE_MMC

diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h
index 91f286b64777659d0d8920b576e3ea71279fe793..09a9757e6e50c4951715431cde5f42ac31741659 100644 (file)
--- a/include/configs/sama5d4ek.h
+++ b/include/configs/sama5d4ek.h
@@ -73,7 +73,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START    0x20080000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     0x80000
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_MONITOR_LEN         (512 << 10)
 
 #ifdef CONFIG_SYS_USE_MMC

diff --git a/include/configs/sandbox_spl.h b/include/configs/sandbox_spl.h
index 2aaa3ab976dd626b8021249df2dbe06ca005be3f..93b595dd10589b2a8fca6a1125f3f2733edf7709 100644 (file)
--- a/include/configs/sandbox_spl.h
+++ b/include/configs/sandbox_spl.h
@@ -8,8 +8,6 @@
 
 #include <configs/sandbox.h>
 
-#define CONFIG_SPL_BOARD_INIT
-
 #define CONFIG_SPL_FRAMEWORK
 
 #endif

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 5bb471c8f605c4a2f929b5dc6aa6f5fe8ad2d036..91618676752f981372ab33a41ac80eea99cb1114 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -127,7 +127,6 @@
 
 #define CONFIG_SPL_LDSCRIPT            "arch/arm/mach-omap2/u-boot-spl.lds"
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_AM33XX_BCH
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_DRIVERS

diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index e09dfe6dd3e57c7f0b7cc0126c762c3192229682..1236da724e088da7a1653d8f0a6d3fdf4321386d 100644 (file)
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -233,7 +233,6 @@
 #define CONFIG_SYS_SPL_MALLOC_SIZE      CONFIG_SYS_MALLOC_LEN
 #define CONFIG_SPL_LDSCRIPT    arch/arm/mach-at91/arm926ejs/u-boot-spl.lds
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_NAND_ENABLE_PIN_SPL (2*32 + 14)
 #define CONFIG_SYS_USE_NANDFLASH       1
 #define CONFIG_SPL_NAND_DRIVERS

diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index c56169dcff8102ed1fa8932f81162da7d5525a3d..6b065c9dc799a627ce5a60dd168b01aa15e22652 100644 (file)
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -87,7 +87,6 @@
 #define CONFIG_SPL_STACK               LOW_LEVEL_SRAM_STACK
 
 #define CONFIG_SPL_LDSCRIPT            "arch/arm/mach-omap2/u-boot-spl.lds"
-#define CONFIG_SPL_BOARD_INIT
 
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION             1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                        "u-boot.img"

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index da7e4ada499e4156927c20abd829ca2dee81beb2..bdc65129591e91584f20b2c169d83baa3267e79f 100644 (file)
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -307,9 +307,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE           CONFIG_SYS_INIT_RAM_ADDR
 #define CONFIG_SPL_MAX_SIZE            CONFIG_SYS_INIT_RAM_SIZE
-#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
-#define CONFIG_SPL_BOARD_INIT
-#endif
 
 /* SPL SDMMC boot support */
 #ifdef CONFIG_SPL_MMC_SUPPORT

diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index 34ce122489a0125fdb939ec3a6b39748a820324f..ebb716ca889a815b778a6301cbe20a3aa4361861 100644 (file)
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -170,7 +170,6 @@
 
 /* Defines for SPL */
 #define CONFIG_SPL_FRAMEWORK
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_CONSOLE
 #define CONFIG_SPL_NAND_SIMPLE
 #define CONFIG_SPL_NAND_SOFTECC

diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index ae6c768c229517f34f8b9e0404c157f72a1b7a1e..f994d2dbf3ceff5757a13883aa9f9e4cbd8f6c89 100644 (file)
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -244,7 +244,6 @@
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "u-boot.img"
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_ECC

diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index 4505be8eaf7f5225d59012abd51ea70fb8c219ca..bed2a5c3c09b2cbd90146dfaa392c9e7ac064729 100644 (file)
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -246,7 +246,6 @@
 #define CONFIG_SPL_BSS_START_ADDR      CONFIG_SPL_MAX_SIZE
 #define CONFIG_SPL_BSS_MAX_SIZE                (3 * SZ_512)
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_NAND_ENABLE_PIN_SPL (2*32 + 14)
 #define CONFIG_SYS_USE_NANDFLASH       1
 #define CONFIG_SPL_NAND_DRIVERS

diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 5107a1f6093e2e92f48e2089c9a55ec844983141..d8b7ab7cb794cfc2d1ca7f01e744db0aeedd331a 100644 (file)
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -91,7 +91,6 @@
 
 /* Defines for SPL */
 #define CONFIG_SPL_FRAMEWORK
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_SIMPLE
 #define CONFIG_SPL_MAX_FOOTPRINT       (CONFIG_SYS_TEXT_BASE - \
                                                CONFIG_SPL_TEXT_BASE)

diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index 60322b1938afafc2f05741a4713a9a5c8ea96dca..a4066a8494626cfaeff2e96405b2fd55cef00c69 100644 (file)
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -156,8 +156,6 @@
 #define CONFIG_SYS_SPI_U_BOOT_SIZE     0x40000
 #define CONFIG_SPL_LDSCRIPT            "arch/arm/mach-omap2/u-boot-spl.lds"
 
-#define CONFIG_SPL_BOARD_INIT
-
 /*
  * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM
  * 64 bytes before this address should be set aside for u-boot.img's

diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index 51b09d4b56160d3198e4db4a1e92399605171122..2303970d889b75030b0cb5c3ba84bdfeb9bce920 100644 (file)
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -122,8 +122,6 @@
 #define CONFIG_SYS_SPI_U_BOOT_SIZE  0x40000
 #define CONFIG_SPL_LDSCRIPT     "arch/arm/mach-omap2/u-boot-spl.lds"
 
-#define CONFIG_SPL_BOARD_INIT
-
 #define CONFIG_SYS_TEXT_BASE        0x80800000
 #define CONFIG_SYS_SPL_MALLOC_START 0x80208000
 #define CONFIG_SYS_SPL_MALLOC_SIZE  0x100000

diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 1561d54c9a8676df6dd6e8265bfdec35f7e51d66..0bd3c9f94cfacf257e48fd8dd06366ec114b3ab1 100644 (file)
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -216,7 +216,6 @@
 #endif
 
 /* General parts of the framework, required. */
-#define CONFIG_SPL_BOARD_INIT
 
 #ifdef CONFIG_NAND
 #define CONFIG_SPL_NAND_BASE

diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 8fe4165a77f4946ca1a0aef78f38ef7dd78cd1eb..efc6f5abe0d0cb61ac165e161a094d1030f8af87 100644 (file)
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -273,7 +273,6 @@
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_NAND_SIMPLE
 
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_BASE
 #define CONFIG_SPL_NAND_DRIVERS
 #define CONFIG_SPL_NAND_ECC

diff --git a/include/configs/twister.h b/include/configs/twister.h
index a7de75ec6ff2551bd47d04963645f67ce35d266d..94dde90e60675112a1c999cefab4f3028b792791 100644 (file)
--- a/include/configs/twister.h
+++ b/include/configs/twister.h
@@ -43,6 +43,5 @@
                                                0x600000)
 
 #define CONFIG_SYS_SPL_ARGS_ADDR       (PHYS_SDRAM_1 + 0x100)
-#define CONFIG_SPL_BOARD_INIT
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 6271b07766c58891cd1c659a8133ed4908e83b21..bc57e8a73a6daadcdf36cc0a0791e652e32bbba9 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -289,8 +289,6 @@
 #define CONFIG_SPL_BOARD_LOAD_IMAGE
 #endif
 
-#define CONFIG_SPL_BOARD_INIT
-
 #define CONFIG_SYS_NAND_U_BOOT_OFFS            0x20000
 
 /* subtract sizeof(struct image_header) */

diff --git a/include/configs/woodburn_sd.h b/include/configs/woodburn_sd.h
index eb42d8c347f66eeee26402c8377d53eb45e83e0c..bab7fdf93caadaf2c2f78b63ab816fc2ca0fa858 100644 (file)
--- a/include/configs/woodburn_sd.h
+++ b/include/configs/woodburn_sd.h
@@ -22,7 +22,6 @@
  */
 #define CONFIG_SPL_FRAMEWORK
 #define        CONFIG_SPL_LDSCRIPT     "arch/arm/cpu/arm1136/u-boot-spl.lds"
-#define CONFIG_SPL_BOARD_INIT
 
 #define CONFIG_SPL_TEXT_BASE           0x10002300
 #define CONFIG_SPL_MAX_SIZE            (64 * 1024)     /* 8 KB for stack */

diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h
index 82f4af9c9382d9a22c8ecd2bac4221df76ea6fd6..81d1fd9ecef223d4683649bdd4504a6446ebf9fb 100644 (file)
--- a/include/configs/work_92105.h
+++ b/include/configs/work_92105.h
@@ -173,7 +173,6 @@
 #define CONFIG_SPL_TEXT_BASE 0x00000000
 /* SPL will use SRAM as stack */
 #define CONFIG_SPL_STACK     0x0000FFF8
-#define CONFIG_SPL_BOARD_INIT
 /* Use the framework and generic lib */
 #define CONFIG_SPL_FRAMEWORK
 /* SPL will use serial */

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 30b5b345204ad74c53719853e4fc35cb256f5cac..f6def2c503d9cc919a3d560812ac3ea8a652fedf 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -271,7 +271,6 @@
 #define CONFIG_SPL_BSS_MAX_SIZE                0x80000
 
 #define CONFIG_SPL_FRAMEWORK
-#define CONFIG_SPL_BOARD_INIT
 
 /* u-boot is like dtb */
 #define CONFIG_SPL_FS_LOAD_ARGS_NAME   "u-boot.bin"

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 51edd463a150798e14fbf7e55fb46acfeae781ad..273e276a388d19a888fad51d44d6a9b2d2039183 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -284,7 +284,6 @@
 /* SPL part */
 #define CONFIG_CMD_SPL
 #define CONFIG_SPL_FRAMEWORK
-#define CONFIG_SPL_BOARD_INIT
 
 #define CONFIG_SPL_LDSCRIPT    "arch/arm/mach-zynq/u-boot-spl.lds"