include: remove CONFIG_SPL/CONFIG_TPL definition in config headers

Now CONFIG_SPL and CONFIG_TPL are defined in Kconfig.

Remove the redundant definition in config headers.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index e6475ef3e840101edc52b7dda4fd754ec8a682a6..953d06b53c4afc36fa7a012f08b6d8472002cd8a 100644 (file)
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -23,7 +23,6 @@
 #define CONFIG_RAMBOOT_TEXT_BASE       CONFIG_SYS_TEXT_BASE
 #define CONFIG_RESET_VECTOR_ADDRESS    0xfffffffc
 #else
-#define CONFIG_SPL 1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT

diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index e6b46e4aa758e0da1c5247f7f2557e92a29de0f6..56a3e9486851994c9e2cc96ee08f1434a1c38642 100644 (file)
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -25,7 +25,6 @@
 #endif
 
 #ifdef CONFIG_NAND
-#define CONFIG_SPL 1
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT

diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index 37e168872ca0f401331d36c19f47102083d94c33..aeded6d85b40c436998a39f5036525210d07cb09 100644 (file)
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -41,7 +41,6 @@
 #endif
 
 #ifdef CONFIG_NAND
-#define CONFIG_SPL 1
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT

diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index f170fc70db746d2ac86f06644079456fe7e6ad0a..715616d5445b872bca0db030e343a5e2d4f3bb23 100644 (file)
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -24,8 +24,6 @@
 #endif
 
 #ifdef CONFIG_NAND
-#define CONFIG_SPL 1
-#define CONFIG_TPL 1
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_SPL_NAND_BOOT
 #define CONFIG_SPL_FLUSH_IMAGE

diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 7f5aa591c4d52045e6d0b331fb2e5cca378375cc..dd8122965ad51ceb5ff2421c5fef136a539321da 100644 (file)
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -19,7 +19,6 @@
 #define CONFIG_MPC8313ERDB     1
 
 #ifdef CONFIG_NAND
-#define CONFIG_SPL 1
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 51127c846190d8e95222d3709404edc0c57f1000..a373990e5d014e9a28c16f08615d22b18144e892 100644 (file)
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -21,7 +21,6 @@
 #define CONFIG_NAND_FSL_IFC
 
 #ifdef CONFIG_SDCARD
-#define CONFIG_SPL 1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_DRIVERS_MISC_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
@@ -56,7 +55,6 @@
 #define CONFIG_SYS_TEXT_BASE           0x11000000
 #define CONFIG_RESET_VECTOR_ADDRESS    0x1107fffc
 #else
-#define CONFIG_SPL 1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_DRIVERS_MISC_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
@@ -88,7 +86,6 @@
 #endif
 
 #ifdef CONFIG_NAND
-#define CONFIG_SPL 1
 #ifdef CONFIG_SECURE_BOOT
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
@@ -108,7 +105,6 @@
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0
 #define CONFIG_SYS_LDSCRIPT    "arch/powerpc/cpu/mpc85xx/u-boot-nand.lds"
 #else
-#define CONFIG_TPL 1
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_SPL_NAND_BOOT
 #define CONFIG_SPL_FLUSH_IMAGE

diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 5a38efef9cccf0b28620eb25256726b8a34282c4..54e2569ac8bba3fc5fa65e976a87cb337a8055d7 100644 (file)
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -16,7 +16,6 @@
 #endif
 
 #ifdef CONFIG_SDCARD
-#define CONFIG_SPL 1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
@@ -45,7 +44,6 @@
 #endif
 
 #ifdef CONFIG_SPIFLASH
-#define CONFIG_SPL 1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
@@ -79,8 +77,6 @@
 #define CONFIG_SYS_NAND_MAX_OOBFREE    5
 
 #ifdef CONFIG_NAND
-#define CONFIG_SPL 1
-#define CONFIG_TPL 1
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_SPL_NAND_BOOT
 #define CONFIG_SPL_FLUSH_IMAGE

diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h
index dd80ddc1fa1012f3fe954f8461be100d610c7eaa..c75638abdaf5b3b6e85a30b3d7f9ec54ebd135e5 100644 (file)
--- a/include/configs/P1_P2_RDB.h
+++ b/include/configs/P1_P2_RDB.h
@@ -36,7 +36,6 @@
 #endif
 
 #ifdef CONFIG_SDCARD
-#define CONFIG_SPL     1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
@@ -64,7 +63,6 @@
 #endif
 
 #ifdef CONFIG_SPIFLASH
-#define CONFIG_SPL     1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
@@ -93,8 +91,6 @@
 #endif
 
 #ifdef CONFIG_NAND
-#define CONFIG_SPL     1
-#define CONFIG_TPL     1
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_SPL_NAND_BOOT
 #define CONFIG_SPL_FLUSH_IMAGE

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 65fc8b7c6d4ae218cd9562b6af48d49865d80563..c4bf0d68f4d1ca67a7cc7fd8ced9e1381b0a2921 100644 (file)
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -22,7 +22,6 @@
 #define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t104xrdb/t1042_rcw.cfg
 #endif
 
-#define CONFIG_SPL 1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT

diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index cffafabdd9cd643d4911d5715ca8df9b64165ffc..395472be2bc2a6a8d19211129c696e1f57a388a2 100644 (file)
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -55,7 +55,6 @@
 #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xqds/t2081_rcw.cfg
 #endif
 
-#define CONFIG_SPL 1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT

diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 55e4177e20502651c6c4c1e3227f73942a792dfd..e5936c78176972761a57b8b491e4a27c328f608d 100644 (file)
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -44,7 +44,6 @@
 #define CONFIG_SYS_FSL_PBL_PBI board/freescale/t208xrdb/t2080_pbi.cfg
 #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xrdb/t2080_rcw.cfg
 
-#define CONFIG_SPL 1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT

diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h
index 92642d893649ba6fa66460fc9159b969b6fd0f66..ca9724720d9f0ad53e574670a5f48495d268420d 100644 (file)
--- a/include/configs/T4240QDS.h
+++ b/include/configs/T4240QDS.h
@@ -25,7 +25,6 @@
 #define CONFIG_RAMBOOT_TEXT_BASE        CONFIG_SYS_TEXT_BASE
 #define CONFIG_RESET_VECTOR_ADDRESS     0xfffffffc
 #else
-#define CONFIG_SPL 1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT

diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h
index 9f8538971936dc7ab2f8626aba6a866663bef029..a4050f34cc01782e0a640de42052e00b05a0db9e 100644 (file)
--- a/include/configs/a3m071.h
+++ b/include/configs/a3m071.h
@@ -412,7 +412,6 @@
 /*
  * SPL related defines
  */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NOR_SUPPORT

diff --git a/include/configs/am335x_igep0033.h b/include/configs/am335x_igep0033.h
index 5023f9d606f04a3b97543f3e2181238e2055706d..dcded0acbe047e2033a0e9679ab8be5b9185e62a 100644 (file)
--- a/include/configs/am335x_igep0033.h
+++ b/include/configs/am335x_igep0033.h
@@ -211,7 +211,6 @@
 #undef CONFIG_USE_IRQ
 
 /* Defines for SPL */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 /*
  * Place the image at the start of the ROM defined image space.

diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index cd8108bcdd9ee39d7e2414a9f6929e77b6960c71..898ed2ee18542085aa03b0ffcb462dc43550668e 100644 (file)
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -293,7 +293,6 @@
                                         GENERATED_GBL_DATA_SIZE)
 
 /* Defines for SPL */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_SIMPLE

diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 01c94ac89f8e641d62e67397bf49b847f6b06a03..1e2d55bec577e3678dc5a235a52bf5c926d10871 100644 (file)
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -302,7 +302,6 @@
                                         GENERATED_GBL_DATA_SIZE)
 
 /* Defines for SPL */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_SIMPLE

diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index a97f21393eb75263a8ad5264f403e0dea5bdb4a1..4424c3044195ddb444891efd6e87a5e441569742 100644 (file)
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -37,7 +37,6 @@
 /*
  * SPL
  */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_TARGET      "u-boot-with-spl.bin"
 #define CONFIG_SPL_LDSCRIPT    "arch/$(ARCH)/cpu/u-boot-spl.lds"
 #define CONFIG_SPL_MAX_SIZE    2048

diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index c24df44f652e8e7f31435fd2d1c581c72da510d5..64b54ab22b02cc3d33a1a0418de9b7f113062564 100644 (file)
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -121,7 +121,6 @@
 
 /* MMC SPL */
 #define CONFIG_EXYNOS_SPL
-#define CONFIG_SPL 1
 #define COPY_BL2_FNPTR_ADDR    0x02020030
 
 #define CONFIG_SPL_LIBCOMMON_SUPPORT

diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h
index 6ec623ec0c30d90b8af2a9614b22d977fb91bd6a..3f889f8d4f468adabbd34476cfd4fe0d624e9b4c 100644 (file)
--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@@ -164,7 +164,6 @@
  * under common/spl/.  Given our generally common memory map, we set a
  * number of related defaults and sizes here.
  */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 /*
  * Place the image at the start of the ROM defined image space.

diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h
index 759ad2a5c51818c5570d46ebf89e338e0028ebb9..5f30279fe66c50b89ec683c1ff43de640f2bca77 100644 (file)
--- a/include/configs/cam_enc_4xx.h
+++ b/include/configs/cam_enc_4xx.h
@@ -199,7 +199,6 @@
 #define CONFIG_SYS_NAND_BLOCK_SIZE     0x20000
 
 /* Defines for SPL */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_LIBGENERIC_SUPPORT

diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 29a8eff9a546f49c0c585d282ff985ab11d2269d..c63608c189fd6b415cbb3b036fc0165479fe1c09 100644 (file)
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -316,7 +316,6 @@
 #define CONFIG_OMAP3_SPI
 
 /* Defines for SPL */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_NAND_SIMPLE
 

diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index 9ec8cad1e1245b9cc200a93a4a82788b7b5def10..1252d7a54a921f9734ca4c4a0d6f5543f1ca7079 100644 (file)
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -368,7 +368,6 @@
 
 #ifndef CONFIG_DIRECT_NOR_BOOT
 /* defines for SPL */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_SPL_MALLOC_START    (CONFIG_SYS_TEXT_BASE - \

diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index acd2c6b24678b465afc4fd76eebe3f2b9d23cf65..69c51bc4c30c49e810f3dc8dde8a6f7b237fbe5d 100644 (file)
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -281,7 +281,6 @@
 #define CONFIG_SYS_SRAM_SIZE               0x10000
 
 /* Defines for SPL */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_NAND_SIMPLE
 

diff --git a/include/configs/exynos5-dt.h b/include/configs/exynos5-dt.h
index 91ad3a325d78a49d1f717f99342d10cca31db982..a7c629286313d768dc9e36436229726d363e13f5 100644 (file)
--- a/include/configs/exynos5-dt.h
+++ b/include/configs/exynos5-dt.h
@@ -136,7 +136,6 @@
 #define CONFIG_TPM_TIS_I2C_SLAVE_ADDR  0x20
 
 /* MMC SPL */
-#define CONFIG_SPL 1
 #define COPY_BL2_FNPTR_ADDR    0x02020030
 
 #define CONFIG_SPL_LIBCOMMON_SUPPORT

diff --git a/include/configs/hawkboard.h b/include/configs/hawkboard.h
index 81448839fd6cb0f826c8ca2e32eec947c5ee4ca6..8188c7b788237fbcba017138bb4a29202909cc0e 100644 (file)
--- a/include/configs/hawkboard.h
+++ b/include/configs/hawkboard.h
@@ -46,7 +46,6 @@
 #endif
 
 /* Spl */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_SUPPORT

diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index 6ad8822b4eae56ba2de59f2cb39a6f45bc11d29f..98e819bb189e31085086831f282407ecf0efba06 100644 (file)
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -298,7 +298,6 @@
                                        "-(rootfs)"
 
 /* defines for SPL */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_SPL_MALLOC_START    (CONFIG_SYS_TEXT_BASE - \

diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index 22cbdaa64c0508f3243ba5b7af2552ab1560551d..58e72956908188b0c98991af83d7519e12f7782b 100644 (file)
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -665,7 +665,6 @@
  * SPL related defines
  */
 #ifdef CONFIG_LCD4_LWMON5
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NOR_SUPPORT

diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h
index 3818f2fd2432db7d5b347fb80b403b9e403275b0..6e5200db407e31fd99b1a1a809cd1d01d7d14890 100644 (file)
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -252,7 +252,6 @@
 /*
  * NAND SPL
  */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TARGET              "u-boot-with-nand-spl.imx"
 #define CONFIG_SPL_BOARD_INIT

diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 2ba1edd2ba4903bca8d2c191bd9d7b887ad49db2..dff895a96511068e2d970515f776b7ce1d2b99af 100644 (file)
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -344,7 +344,6 @@
                                         GENERATED_GBL_DATA_SIZE)
 
 /* Defines for SPL */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_SIMPLE

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index c8a02ae2fd6fa238dc85aeed4e41acbd92c3e8a2..1a82a57c755f1b5ef311152b16a9d794c3f28176 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -447,7 +447,6 @@
 #endif
 
 /* SPL part */
-#define CONFIG_SPL 1
 #define CONFIG_CMD_SPL
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_LIBCOMMON_SUPPORT

diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index 85d438fbef2adf043b14bb870a500aab54c82075..f796a414d50d785099cc02eeab111b78c39bee6a 100644 (file)
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -29,7 +29,6 @@
 
 #define CONFIG_MACH_TYPE       MACH_TYPE_MX31_3DS
 
-#define CONFIG_SPL 1
 #define CONFIG_SPL_TARGET      "u-boot-with-spl.bin"
 #define CONFIG_SPL_LDSCRIPT    "arch/$(ARCH)/cpu/u-boot-spl.lds"
 #define CONFIG_SPL_MAX_SIZE    2048

diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index fffcc371d43d6c5a06a406a49c2524fccec73713..5f4e48ecbb6615c1c8d13fb83fd0f40b242ab3ed 100644 (file)
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -50,7 +50,6 @@
 #define CONFIG_ARCH_MISC_INIT
 
 /* SPL */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_NO_CPU_SUPPORT_CODE
 #define CONFIG_SPL_START_S_PATH        "arch/arm/cpu/arm926ejs/mxs"
 #define CONFIG_SPL_LDSCRIPT    "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds"

diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h
index 9589229b4f98ce493299ae3926cf3aa30b861234..eef4230e64ce9432a706dc6fe913ae82a297b217 100644 (file)
--- a/include/configs/omap3_evm_common.h
+++ b/include/configs/omap3_evm_common.h
@@ -257,7 +257,6 @@
 #define CONFIG_SYS_CACHELINE_SIZE      64
 
 /* Defines for SPL */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE           0x40200800
 #define CONFIG_SPL_MAX_SIZE            (54 * 1024)     /* 8 KB for stack */

diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index 93f4d627a14d45a4a6daf2c1f20865a6fb57c17f..c5d742c2bd801c35349a56856be2e51c4c8eba9c 100644 (file)
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -26,7 +26,6 @@
 #include <configs/ti_omap3_common.h>
 
 /* Remove SPL boot option - we do not support that on LDP yet */
-#undef CONFIG_SPL
 #undef CONFIG_SPL_FRAMEWORK
 #undef CONFIG_SPL_OS_BOOT
 

diff --git a/include/configs/origen.h b/include/configs/origen.h
index b0c6eb12495b168ef006eaea564e1c694958485f..5d24916389c557f986655548e743b93d176afed7 100644 (file)
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@@ -65,7 +65,6 @@
 #undef CONFIG_CMD_NFS
 
 /* MMC SPL */
-#define CONFIG_SPL 1
 #define COPY_BL2_FNPTR_ADDR    0x02020030
 #define CONFIG_SPL_TEXT_BASE   0x02021410
 

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 22f6d126aef8c0ba0c784cd990d14a86074bc6fc..9b5895093daa255193ee36f1dce1744aee9f09f2 100644 (file)
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -148,7 +148,6 @@
 #endif
 
 #ifdef CONFIG_SDCARD
-#define CONFIG_SPL 1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
@@ -177,7 +176,6 @@
 #endif
 
 #ifdef CONFIG_SPIFLASH
-#define CONFIG_SPL 1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
@@ -207,8 +205,6 @@
 #endif
 
 #ifdef CONFIG_NAND
-#define CONFIG_SPL 1
-#define CONFIG_TPL 1
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_SPL_NAND_BOOT
 #define CONFIG_SPL_FLUSH_IMAGE

diff --git a/include/configs/palmtreo680.h b/include/configs/palmtreo680.h
index 31e89d9d4cd552c4b6f97e16488707b6341b3885..6490be55045286c7e943010ee18dc1fe63033f68 100644 (file)
--- a/include/configs/palmtreo680.h
+++ b/include/configs/palmtreo680.h
@@ -205,7 +205,6 @@
 /*
  * SPL
  */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_TEXT_BASE    0xa1700000 /* IPL loads SPL here */
 #define CONFIG_SPL_STACK        0x5c040000 /* end of internal SRAM */
 #define CONFIG_SPL_NAND_SUPPORT /* build libnand for spl */

diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
index 207a29075b2cda5fa63851768f33f9f7c2c2c1a5..dcf5537687bc001535fc45e28f094ad15e1692c6 100644 (file)
--- a/include/configs/pcm051.h
+++ b/include/configs/pcm051.h
@@ -197,7 +197,6 @@
 #define CONFIG_ENV_IS_NOWHERE
 
 /* Defines for SPL */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 /*

diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index 41b041bee47a40502ba115ab1036dcddbf02fcdf..0dfb7e7918dee17359b922e2ca80ddb647e0d662 100644 (file)
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -209,7 +209,6 @@
 #define CONFIG_SYS_MALLOC_LEN          (4 * 1024 * 1024)
 
 /* SPL */
-#define CONFIG_SPL     1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE           0x300000
 #define CONFIG_SPL_MAX_SIZE            0x10000

diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index fe44521a9bf80d8a26fb5b63c1e46a8b88a069c7..56c2454dff2ec1f33f94b49381a70ce6e9d0c6e4 100644 (file)
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -244,7 +244,6 @@
 #define CONFIG_SYS_MALLOC_LEN          (1024 * 1024)
 
 /* SPL */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE           0x300000
 #define CONFIG_SPL_MAX_SIZE            0x10000

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 236bb0c49a09b84868efbd40f53b7c2c3514fbdc..b8fb77e8137eda44dd21b610c2aa6c5b0cb1040e 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -139,7 +139,6 @@
 #define CONFIG_SYS_I2C_OMAP24XX
 
 /* Defines for SPL */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE           0x402F0400
 #define CONFIG_SPL_MAX_SIZE            (101 * 1024)

diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index e9f33cf8eb35b0ba062112d092819ccbefa6074e..048c1786923c0bee2d9624878072575a0519327e 100644 (file)
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -76,7 +76,6 @@
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 
 /* MMC SPL */
-#define CONFIG_SPL 1
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #define COPY_BL2_FNPTR_ADDR    0x00002488
 

diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h
index 5ebf9e4fafb2ae8dd51c61f7e82bdce9fc7903d5..27c2be909831a24681e8a001926af5e9605da0fa 100644 (file)
--- a/include/configs/socfpga_cyclone5.h
+++ b/include/configs/socfpga_cyclone5.h
@@ -223,7 +223,6 @@
  */
 
 /* Enable building of SPL globally */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 
 /* TEXT_BASE for linking the SPL binary */

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 38e882606bf4c37ab04ef25463ec6b08dcc580d6..8ab6429e482abaac92383964a46c6c035917c607 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -127,7 +127,6 @@
 
 #ifdef CONFIG_SPL_FEL
 
-#define CONFIG_SPL     1
 #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv7/sunxi/u-boot-spl-fel.lds"
 #define CONFIG_SPL_START_S_PATH "arch/arm/cpu/armv7/sunxi"
 #define CONFIG_SPL_TEXT_BASE           0x2000

diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index b94a6cce1701db37b30f293781ef04abf1ae11b7..e1fc75476f661691f525e3f49c45cad9658266f4 100644 (file)
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -215,7 +215,6 @@
 #define CONFIG_NET_RETRY_COUNT 10
 
 /* Defines for SPL */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_CONSOLE

diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index 9d4ab2122336335c1b5d31ba5bbf2cd47a5f8b6c..174bfe50a9d98fa954ee38dc478f5066661c3bab 100644 (file)
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -301,7 +301,6 @@
 #define CONGIG_CMD_STORAGE
 
 /* Defines for SPL */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_NAND_SIMPLE
 

diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 779a1d2f5ad5c782f3f06fe6cfca1cd602de3185..717cd61bd69a9ba349b308fd9296272d22c37024 100644 (file)
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -131,7 +131,6 @@
 #define CONFIG_CMD_ENTERRCM
 
 /* Defines for SPL */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_RAM_DEVICE
 #define CONFIG_SPL_BOARD_INIT

diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index bd25ec85b864a91f6f8cece85bd96532b3b23c84..a55bde23683896a299100382e2146490551acc0f 100644 (file)
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -168,7 +168,6 @@
 #define CONFIG_ENV_IS_NOWHERE
 
 /* Defines for SPL */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE           0x40300000
 #define CONFIG_SPL_MAX_SIZE            ((128 - 18) * 1024)

diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h
index ea0c4fda9cb88834ccb75711a2022071d84ea205..e86c36443ba56bc98ca3cccbddcb85ea627e9f2d 100644 (file)
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@@ -134,7 +134,6 @@
 
 /* SPL */
 /* Defines for SPL */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE    0x40400000
 #define CONFIG_SPL_MAX_SIZE     ((128 - 18) * 1024)

diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index ee69d7d3585c559ee77182160541dc5ad1a3135e..26ac2518d96afa8b0c97451b30563d6af381e864 100644 (file)
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -198,7 +198,6 @@
  */
 #if !defined(CONFIG_NOR_BOOT) && \
        !(defined(CONFIG_QSPI_BOOT) && defined(CONFIG_AM43XX))
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_OS_BOOT
 

diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 1d48031ed19eda7b0f151b7a90ff659e0d56f4e2..cc0d172115f9e8be45b8e5205a4ac7a81230019d 100644 (file)
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -331,7 +331,6 @@
 #define CONFIG_SYS_SRAM_SIZE           0x10000
 
 /* Defines for SPL */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_NAND_SIMPLE
 

diff --git a/include/configs/tx25.h b/include/configs/tx25.h
index d36208791cbd5d62eb34dba1a30e2c568909a98c..118f5bae7265e6e1c79d21ef8584f9a2429901c2 100644 (file)
--- a/include/configs/tx25.h
+++ b/include/configs/tx25.h
@@ -21,7 +21,6 @@
 
 #define        CONFIG_SYS_MONITOR_LEN          (256 << 10)     /* 256 kB for U-Boot */
 
-#define CONFIG_SPL 1
 #define CONFIG_SPL_TARGET              "u-boot-with-spl.bin"
 #define CONFIG_SPL_LDSCRIPT            "arch/$(ARCH)/cpu/u-boot-spl.lds"
 #define CONFIG_SPL_MAX_SIZE            2048

diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h
index e53d3c4c37bf0a56b33f3a93b2e431deef73fb8d..2fb91a8f8c1fdbf7248e225e3d1fbd625817c701 100644 (file)
--- a/include/configs/vpac270.h
+++ b/include/configs/vpac270.h
@@ -17,7 +17,6 @@
 #define        CONFIG_SYS_TEXT_BASE    0xa0000000
 
 #ifdef CONFIG_ONENAND
-#define        CONFIG_SPL 1
 #define        CONFIG_SPL_ONENAND_SUPPORT
 #define        CONFIG_SPL_ONENAND_LOAD_ADDR    0x2000
 #define        CONFIG_SPL_ONENAND_LOAD_SIZE    \

diff --git a/include/configs/woodburn_sd.h b/include/configs/woodburn_sd.h
index 2bf5c10da8e0155d3b9a2e5feaaa71b8a84635ed..25bfeef03670e95fb6646c2fe8d6ebf8831049b7 100644 (file)
--- a/include/configs/woodburn_sd.h
+++ b/include/configs/woodburn_sd.h
@@ -20,7 +20,6 @@
 /*
  * SPL
  */
-#define        CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define        CONFIG_SPL_LDSCRIPT     "arch/arm/cpu/arm1136/u-boot-spl.lds"
 #define        CONFIG_SPL_LIBCOMMON_SUPPORT

diff --git a/include/configs/x600.h b/include/configs/x600.h
index e5bc6b901447d78a57c04d51670fa7747f1b3a3a..71373e98f9585ab4b915b6ee0b1554ec4e8d9587 100644 (file)
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -274,7 +274,6 @@
 /*
  * SPL related defines
  */
-#define CONFIG_SPL 1
 #define CONFIG_SPL_TEXT_BASE   0xd2800b00
 #define        CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/spear"
 #define CONFIG_SPL_LDSCRIPT    "arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds"

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index f6d924da27222422df72d76e2db7339b76d04d2e..d57e9d5bbe84cc6c823a251e0b22a7909518b9de 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -257,7 +257,6 @@
 #define CONFIG_CMD_TFTPPUT
 
 /* SPL part */
-#define CONFIG_SPL 1
 #define CONFIG_CMD_SPL
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_LIBCOMMON_SUPPORT