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 ---
Changes in v7: None Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: - Rebase on the current u-boot/master
Changes in v2: - Rebase on the current u-boot/master
doc/README.SPL | 2 +- include/configs/B4860QDS.h | 2 +- include/configs/BSC9131RDB.h | 2 +- include/configs/BSC9132QDS.h | 2 +- include/configs/C29XPCIE.h | 4 ++-- include/configs/MPC8313ERDB.h | 2 +- include/configs/P1010RDB.h | 8 ++++---- include/configs/P1022DS.h | 8 ++++---- include/configs/P1_P2_RDB.h | 8 ++++---- include/configs/T104xRDB.h | 2 +- include/configs/T208xQDS.h | 2 +- include/configs/T208xRDB.h | 2 +- include/configs/T4240QDS.h | 2 +- include/configs/a3m071.h | 2 +- include/configs/am335x_igep0033.h | 2 +- include/configs/am3517_crane.h | 2 +- include/configs/am3517_evm.h | 2 +- include/configs/apf27.h | 2 +- include/configs/arndale.h | 2 +- include/configs/bur_am335x_common.h | 2 +- include/configs/cam_enc_4xx.h | 2 +- include/configs/cm_t35.h | 2 +- include/configs/da850evm.h | 2 +- include/configs/devkit8000.h | 2 +- include/configs/exynos5-dt.h | 2 +- include/configs/hawkboard.h | 2 +- include/configs/ipam390.h | 2 +- include/configs/lwmon5.h | 2 +- include/configs/m53evk.h | 2 +- include/configs/mcx.h | 2 +- include/configs/microblaze-generic.h | 2 +- include/configs/mx31pdk.h | 2 +- include/configs/mxs.h | 2 +- include/configs/omap3_evm_common.h | 2 +- include/configs/origen.h | 2 +- include/configs/p1_p2_rdb_pc.h | 8 ++++---- include/configs/palmtreo680.h | 2 +- include/configs/pcm051.h | 2 +- include/configs/sama5d3_xplained.h | 2 +- include/configs/sama5d3xek.h | 2 +- include/configs/siemens-am33x-common.h | 2 +- include/configs/smdkv310.h | 2 +- include/configs/socfpga_cyclone5.h | 2 +- include/configs/sunxi-common.h | 2 +- include/configs/tam3517-common.h | 2 +- include/configs/tao3530.h | 2 +- include/configs/tegra-common.h | 2 +- include/configs/ti814x_evm.h | 2 +- include/configs/ti816x_evm.h | 2 +- include/configs/ti_armv7_common.h | 2 +- include/configs/tricorder.h | 2 +- include/configs/tx25.h | 2 +- include/configs/vpac270.h | 2 +- include/configs/woodburn_sd.h | 2 +- include/configs/x600.h | 2 +- include/configs/zynq-common.h | 2 +- 56 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/doc/README.SPL b/doc/README.SPL index 57a39a4..2b4b0b8 100644 --- 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 diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 43c9df0..e6475ef 100644 --- 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 diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 5a316c8..e6b46e4 100644 --- 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 diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 49c16af..37e1688 100644 --- 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 diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 0dd1560..f170fc7 100644 --- 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 diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 69b2cb1..7f5aa59 100644 --- 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 diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 50529bf..51127c8 100644 --- 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 diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 959cdf6..5a38efe 100644 --- 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 diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h index 110ba5f..dd80ddc 100644 --- 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 diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index c96f03c..65fc8b7 100644 --- 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 diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 784310a..cffafab 100644 --- 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 diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index deeabae..55e4177 100644 --- 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 diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index efdb68b..92642d8 100644 --- 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 diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h index 205adfd..9f85389 100644 --- 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 diff --git a/include/configs/am335x_igep0033.h b/include/configs/am335x_igep0033.h index c17327f..5023f9d 100644 --- 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. diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index ad4cbd8..1c3e62f 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -298,7 +298,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 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 0102ff5..e4eee38 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -307,7 +307,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 diff --git a/include/configs/apf27.h b/include/configs/apf27.h index b10c48c..a97f213 100644 --- 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 diff --git a/include/configs/arndale.h b/include/configs/arndale.h index 370db82..c24df44 100644 --- 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 diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 5a37536..6ec623e 100644 --- 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. diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h index d1a8ff2..759ad2a 100644 --- 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 diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 5c484ef..84a0e73 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -319,7 +319,7 @@ #define CONFIG_OMAP3_SPI
/* Defines for SPL */ -#define CONFIG_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 b279409..9ec8cad 100644 --- 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 - \ diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 5308790..f8dd6b8 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -283,7 +283,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
diff --git a/include/configs/exynos5-dt.h b/include/configs/exynos5-dt.h index e36a031..91ad3a3 100644 --- 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 diff --git a/include/configs/hawkboard.h b/include/configs/hawkboard.h index 73e1624..8144883 100644 --- 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 diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index fdd5680..6ad8822 100644 --- 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 - \ diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 07ddfc4..22cbdaa 100644 --- 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 diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 97196c6..3818f2f 100644 --- 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 diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 47244c0..9823c04 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -348,7 +348,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 diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index c01b171..3d9df30 100644 --- 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 diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index f223788..85d438f 100644 --- 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 diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 8bce28f..fffcc37 100644 --- 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" diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h index ae4ce63..dfe0e39 100644 --- a/include/configs/omap3_evm_common.h +++ b/include/configs/omap3_evm_common.h @@ -260,7 +260,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 */ diff --git a/include/configs/origen.h b/include/configs/origen.h index 8258338..b0c6eb1 100644 --- 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
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 185df77..22f6d12 100644 --- 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 diff --git a/include/configs/palmtreo680.h b/include/configs/palmtreo680.h index 3662663..31e89d9 100644 --- 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 */ diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index 9af3efd..207a290 100644 --- 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 /* diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index f72ab0b..41b041b 100644 --- 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 diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index da27180..fe44521 100644 --- 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 diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 53816a6..236bb0c 100644 --- 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) diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index 34adfaf..e9f33cf 100644 --- 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
diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h index 262e744..5ebf9e4 100644 --- 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 */ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 5d72d62..63795af 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -128,7 +128,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 diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 0c2f0f1..38d8333 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -219,7 +219,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 diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 1b0fee9..baacd58 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -305,7 +305,7 @@ #define CONGIG_CMD_STORAGE
/* Defines for SPL */ -#define CONFIG_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 3b88a83..779a1d2 100644 --- 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 diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index b51400c..bd25ec8 100644 --- 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) diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index b8c0d54..ea0c4fd 100644 --- 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) diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 6e0bf09..1793aee 100644 --- 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
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 80985a2..5c5e304 100644 --- 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
diff --git a/include/configs/tx25.h b/include/configs/tx25.h index 5ac6e64..d362087 100644 --- 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 diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h index c6d4763..e53d3c4 100644 --- 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 \ diff --git a/include/configs/woodburn_sd.h b/include/configs/woodburn_sd.h index 437472f..2bf5c10 100644 --- 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 diff --git a/include/configs/x600.h b/include/configs/x600.h index eae85d6..e5bc6b9 100644 --- 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" diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index fa252c0..5ea7e68 100644 --- 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