include: define CONFIG_SPL and CONFIG_TPL as 1

We are about to switch to Kconfig in the next commit. But there are something to get done beforehand. In Kconfig, include/generated/autoconf.h defines boolean CONFIG macros as 1. CONFIG_SPL and CONFIG_TPL, if defined, must be set to 1. Otherwise, when switching to Kconfig, the build log would be sprinkled with warning messages like this: warning: "CONFIG_SPL" redefined [enabled by default] Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Reviewed-by: Simon Glass <sjg@chromium.org>
10 years ago · 4ce9957029
parent 516312598a
commit 4ce9957029
56 changed files with 69 additions and 69 deletions
--- a/doc/README.SPL
+++ b/doc/README.SPL
@ -40,7 +40,7 @@ COBJS-$(CONFIG_SPL_BUILD) += foo.o

 The building of SPL images can be with:

-#define CONFIG_SPL
+#define CONFIG_SPL 1

 Because SPL images normally have a different text base, one has to be
 configured by defining CONFIG_SPL_TEXT_BASE. The linker script has to be
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@ -23,7 +23,7 @@
 #define CONFIG_RAMBOOT_TEXT_BASE	CONFIG_SYS_TEXT_BASE
 #define CONFIG_RESET_VECTOR_ADDRESS	0xfffffffc
 #else
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@ -25,7 +25,7 @@
 #endif

 #ifdef CONFIG_NAND
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@ -41,7 +41,7 @@
 #endif

 #ifdef CONFIG_NAND
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@ -24,8 +24,8 @@
 #endif

 #ifdef CONFIG_NAND
-#define CONFIG_SPL
-#define CONFIG_TPL
+#define CONFIG_SPL 1
+#define CONFIG_TPL 1
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_SPL_NAND_BOOT
 #define CONFIG_SPL_FLUSH_IMAGE
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@ -19,7 +19,7 @@
 #define CONFIG_MPC8313ERDB	1

 #ifdef CONFIG_NAND
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_NAND_SUPPORT
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@ -21,7 +21,7 @@
 #define CONFIG_NAND_FSL_IFC

 #ifdef CONFIG_SDCARD
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_DRIVERS_MISC_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
@ -56,7 +56,7 @@
 #define CONFIG_SYS_TEXT_BASE		0x11000000
 #define CONFIG_RESET_VECTOR_ADDRESS	0x1107fffc
 #else
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_DRIVERS_MISC_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
@ -88,7 +88,7 @@
 #endif

 #ifdef CONFIG_NAND
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #ifdef CONFIG_SECURE_BOOT
 #define CONFIG_SPL_INIT_MINIMAL
 #define CONFIG_SPL_SERIAL_SUPPORT
@ -108,7 +108,7 @@
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	0
 #define CONFIG_SYS_LDSCRIPT	"arch/powerpc/cpu/mpc85xx/u-boot-nand.lds"
 #else
-#define CONFIG_TPL
+#define CONFIG_TPL 1
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_SPL_NAND_BOOT
 #define CONFIG_SPL_FLUSH_IMAGE
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@ -16,7 +16,7 @@
 #endif

 #ifdef CONFIG_SDCARD
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
@ -45,7 +45,7 @@
 #endif

 #ifdef CONFIG_SPIFLASH
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
@ -79,8 +79,8 @@
 #define CONFIG_SYS_NAND_MAX_OOBFREE	5

 #ifdef CONFIG_NAND
-#define CONFIG_SPL
-#define CONFIG_TPL
+#define CONFIG_SPL 1
+#define CONFIG_TPL 1
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_SPL_NAND_BOOT
 #define CONFIG_SPL_FLUSH_IMAGE
--- a/include/configs/P1_P2_RDB.h
+++ b/include/configs/P1_P2_RDB.h
@ -36,7 +36,7 @@
 #endif

 #ifdef CONFIG_SDCARD
-#define CONFIG_SPL
+#define CONFIG_SPL	1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
@ -64,7 +64,7 @@
 #endif

 #ifdef CONFIG_SPIFLASH
-#define CONFIG_SPL
+#define CONFIG_SPL	1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
@ -93,8 +93,8 @@
 #endif

 #ifdef CONFIG_NAND
-#define CONFIG_SPL
-#define CONFIG_TPL
+#define CONFIG_SPL	1
+#define CONFIG_TPL	1
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_SPL_NAND_BOOT
 #define CONFIG_SPL_FLUSH_IMAGE
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@ -22,7 +22,7 @@
 #define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t104xrdb/t1042_rcw.cfg
 #endif

-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@ -55,7 +55,7 @@
 #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xqds/t2081_rcw.cfg
 #endif

-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@ -44,7 +44,7 @@
 #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
+#define CONFIG_SPL 1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
--- a/include/configs/T4240QDS.h
+++ b/include/configs/T4240QDS.h
@ -25,7 +25,7 @@
 #define CONFIG_RAMBOOT_TEXT_BASE        CONFIG_SYS_TEXT_BASE
 #define CONFIG_RESET_VECTOR_ADDRESS     0xfffffffc
 #else
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
--- a/include/configs/a3m071.h
+++ b/include/configs/a3m071.h
@ -412,7 +412,7 @@
 /*
 * SPL related defines
 */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NOR_SUPPORT
--- a/include/configs/am335x_igep0033.h
+++ b/include/configs/am335x_igep0033.h
@ -211,7 +211,7 @@
 #undef CONFIG_USE_IRQ

 /* Defines for SPL */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 /*
 * Place the image at the start of the ROM defined image space.
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@ -293,7 +293,7 @@
 					 GENERATED_GBL_DATA_SIZE)

 /* Defines for SPL */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_SIMPLE
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@ -302,7 +302,7 @@
 					 GENERATED_GBL_DATA_SIZE)

 /* Defines for SPL */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_SIMPLE
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@ -37,7 +37,7 @@
 /*
 * SPL
 */
-#define CONFIG_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
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@ -121,7 +121,7 @@

 /* MMC SPL */
 #define CONFIG_EXYNOS_SPL
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define COPY_BL2_FNPTR_ADDR	0x02020030

 #define CONFIG_SPL_LIBCOMMON_SUPPORT
--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@ -164,7 +164,7 @@
 * under common/spl/.  Given our generally common memory map, we set a
 * number of related defaults and sizes here.
 */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 /*
 * Place the image at the start of the ROM defined image space.
--- a/include/configs/cam_enc_4xx.h
+++ b/include/configs/cam_enc_4xx.h
@ -199,7 +199,7 @@
 #define CONFIG_SYS_NAND_BLOCK_SIZE	0x20000

 /* Defines for SPL */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_LIBGENERIC_SUPPORT
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@ -316,7 +316,7 @@
 #define CONFIG_OMAP3_SPI

 /* Defines for SPL */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_NAND_SIMPLE

--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@ -368,7 +368,7 @@

 #ifndef CONFIG_DIRECT_NOR_BOOT
 /* defines for SPL */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_SPL_MALLOC_START	(CONFIG_SYS_TEXT_BASE - \
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@ -281,7 +281,7 @@
 #define CONFIG_SYS_SRAM_SIZE               0x10000

 /* Defines for SPL */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_NAND_SIMPLE

--- a/include/configs/exynos5-dt.h
+++ b/include/configs/exynos5-dt.h
@ -136,7 +136,7 @@
 #define CONFIG_TPM_TIS_I2C_SLAVE_ADDR	0x20

 /* MMC SPL */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define COPY_BL2_FNPTR_ADDR	0x02020030

 #define CONFIG_SPL_LIBCOMMON_SUPPORT
--- a/include/configs/hawkboard.h
+++ b/include/configs/hawkboard.h
@ -46,7 +46,7 @@
 #endif

 /* Spl */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_SUPPORT
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@ -298,7 +298,7 @@
 					"-(rootfs)"

 /* defines for SPL */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SYS_SPL_MALLOC_START	(CONFIG_SYS_TEXT_BASE - \
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@ -665,7 +665,7 @@
 * SPL related defines
 */
 #ifdef CONFIG_LCD4_LWMON5
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NOR_SUPPORT
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@ -252,7 +252,7 @@
 /*
 * NAND SPL
 */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TARGET		"u-boot-with-nand-spl.imx"
 #define CONFIG_SPL_BOARD_INIT
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@ -344,7 +344,7 @@
 					 GENERATED_GBL_DATA_SIZE)

 /* Defines for SPL */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_NAND_SIMPLE
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@ -448,7 +448,7 @@
 #endif

 /* SPL part */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_CMD_SPL
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@ -29,7 +29,7 @@

 #define CONFIG_MACH_TYPE	MACH_TYPE_MX31_3DS

-#define CONFIG_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
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@ -50,7 +50,7 @@
 #define CONFIG_ARCH_MISC_INIT

 /* SPL */
-#define CONFIG_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"
--- a/include/configs/omap3_evm_common.h
+++ b/include/configs/omap3_evm_common.h
@ -257,7 +257,7 @@
 #define CONFIG_SYS_CACHELINE_SIZE	64

 /* Defines for SPL */
-#define CONFIG_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 */
--- a/include/configs/origen.h
+++ b/include/configs/origen.h
@ -65,7 +65,7 @@
 #undef CONFIG_CMD_NFS

 /* MMC SPL */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define COPY_BL2_FNPTR_ADDR	0x02020030
 #define CONFIG_SPL_TEXT_BASE	0x02021410

--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@ -148,7 +148,7 @@
 #endif

 #ifdef CONFIG_SDCARD
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
@ -177,7 +177,7 @@
 #endif

 #ifdef CONFIG_SPIFLASH
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
 #define CONFIG_SPL_ENV_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
@ -207,8 +207,8 @@
 #endif

 #ifdef CONFIG_NAND
-#define CONFIG_SPL
-#define CONFIG_TPL
+#define CONFIG_SPL 1
+#define CONFIG_TPL 1
 #ifdef CONFIG_TPL_BUILD
 #define CONFIG_SPL_NAND_BOOT
 #define CONFIG_SPL_FLUSH_IMAGE
--- a/include/configs/palmtreo680.h
+++ b/include/configs/palmtreo680.h
@ -205,7 +205,7 @@
 /*
 * SPL
 */
-#define CONFIG_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 */
--- a/include/configs/pcm051.h
+++ b/include/configs/pcm051.h
@ -197,7 +197,7 @@
 #define CONFIG_ENV_IS_NOWHERE

 /* Defines for SPL */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 /*
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@ -209,7 +209,7 @@
 #define CONFIG_SYS_MALLOC_LEN		(4 * 1024 * 1024)

 /* SPL */
-#define CONFIG_SPL
+#define CONFIG_SPL	1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE		0x300000
 #define CONFIG_SPL_MAX_SIZE		0x10000
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@ -244,7 +244,7 @@
 #define CONFIG_SYS_MALLOC_LEN		(1024 * 1024)

 /* SPL */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE		0x300000
 #define CONFIG_SPL_MAX_SIZE		0x10000
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@ -139,7 +139,7 @@
 #define CONFIG_SYS_I2C_OMAP24XX

 /* Defines for SPL */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE		0x402F0400
 #define CONFIG_SPL_MAX_SIZE		(101 * 1024)
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@ -76,7 +76,7 @@
 #define CONFIG_ZERO_BOOTDELAY_CHECK

 /* MMC SPL */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #define COPY_BL2_FNPTR_ADDR	0x00002488

--- a/include/configs/socfpga_cyclone5.h
+++ b/include/configs/socfpga_cyclone5.h
@ -223,7 +223,7 @@
 */

 /* Enable building of SPL globally */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK

 /* TEXT_BASE for linking the SPL binary */
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@ -127,7 +127,7 @@

 #ifdef CONFIG_SPL_FEL

-#define CONFIG_SPL
+#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
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@ -215,7 +215,7 @@
 #define CONFIG_NET_RETRY_COUNT 10

 /* Defines for SPL */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_CONSOLE
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@ -301,7 +301,7 @@
 #define CONGIG_CMD_STORAGE

 /* Defines for SPL */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_NAND_SIMPLE

--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@ -131,7 +131,7 @@
 #define CONFIG_CMD_ENTERRCM

 /* Defines for SPL */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_RAM_DEVICE
 #define CONFIG_SPL_BOARD_INIT
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@ -168,7 +168,7 @@
 #define CONFIG_ENV_IS_NOWHERE

 /* Defines for SPL */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE		0x40300000
 #define CONFIG_SPL_MAX_SIZE		((128 - 18) * 1024)
--- a/include/configs/ti816x_evm.h
+++ b/include/configs/ti816x_evm.h
@ -134,7 +134,7 @@

 /* SPL */
 /* Defines for SPL */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_TEXT_BASE    0x40400000
 #define CONFIG_SPL_MAX_SIZE     ((128 - 18) * 1024)
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@ -198,7 +198,7 @@
 */
 #if !defined(CONFIG_NOR_BOOT) && \
 	!(defined(CONFIG_QSPI_BOOT) && defined(CONFIG_AM43XX))
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_OS_BOOT

--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@ -331,7 +331,7 @@
 #define CONFIG_SYS_SRAM_SIZE		0x10000

 /* Defines for SPL */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_NAND_SIMPLE

--- a/include/configs/tx25.h
+++ b/include/configs/tx25.h
@ -21,7 +21,7 @@

 #define	CONFIG_SYS_MONITOR_LEN		(256 << 10)	/* 256 kB for U-Boot */

-#define CONFIG_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
--- a/include/configs/vpac270.h
+++ b/include/configs/vpac270.h
@ -17,7 +17,7 @@
 #define	CONFIG_SYS_TEXT_BASE	0xa0000000

 #ifdef	CONFIG_ONENAND
-#define	CONFIG_SPL
+#define	CONFIG_SPL 1
 #define	CONFIG_SPL_ONENAND_SUPPORT
 #define	CONFIG_SPL_ONENAND_LOAD_ADDR	0x2000
 #define	CONFIG_SPL_ONENAND_LOAD_SIZE	\
--- a/include/configs/woodburn_sd.h
+++ b/include/configs/woodburn_sd.h
@ -20,7 +20,7 @@
 /*
 * SPL
 */
-#define	CONFIG_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
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@ -274,7 +274,7 @@
 /*
 * SPL related defines
 */
-#define CONFIG_SPL
+#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"
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@ -257,7 +257,7 @@
 #define CONFIG_CMD_TFTPPUT

 /* SPL part */
-#define CONFIG_SPL
+#define CONFIG_SPL 1
 #define CONFIG_CMD_SPL
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_LIBCOMMON_SUPPORT