diff options
| author | Masahiro Yamada | 2014-07-30 14:08:25 +0900 |
|---|---|---|
| committer | Tom Rini | 2014-07-30 14:42:03 -0400 |
| commit | 25b4adbba018633b943a99322bfb2fb819c0bafb (patch) | |
| tree | c4232d108de3aca2127cb4b07be68649eb263c3b | |
| parent | c6d12624ae9a7822b8c5d8fb5a5fa4f83d862f8f (diff) | |
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>
56 files changed, 0 insertions, 69 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index e6475ef3e84..953d06b53c4 100644 --- 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 e6b46e4aa75..56a3e948685 100644 --- 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 37e168872ca..aeded6d85b4 100644 --- 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 f170fc70db7..715616d5445 100644 --- 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 7f5aa591c4d..dd8122965ad 100644 --- 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 51127c84619..a373990e5d0 100644 --- 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 5a38efef9cc..54e2569ac8b 100644 --- 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 dd80ddc1fa1..c75638abdaf 100644 --- 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 65fc8b7c6d4..c4bf0d68f4d 100644 --- 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 cffafabdd9c..395472be2bc 100644 --- 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 55e4177e205..e5936c78176 100644 --- 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 92642d89364..ca9724720d9 100644 --- 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 9f853897193..a4050f34cc0 100644 --- 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 5023f9d606f..dcded0acbe0 100644 --- 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 cd8108bcdd9..898ed2ee185 100644 --- 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 01c94ac89f8..1e2d55bec57 100644 --- 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 a97f21393eb..4424c304419 100644 --- 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 c24df44f652..64b54ab22b0 100644 --- 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 6ec623ec0c3..3f889f8d4f4 100644 --- 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 759ad2a5c51..5f30279fe66 100644 --- 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 29a8eff9a54..c63608c189f 100644 --- 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 9ec8cad1e12..1252d7a54a9 100644 --- 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 acd2c6b2467..69c51bc4c30 100644 --- 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 91ad3a325d7..a7c62928631 100644 --- 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 81448839fd6..8188c7b7882 100644 --- 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 6ad8822b4ea..98e819bb189 100644 --- 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 22cbdaa64c0..58e72956908 100644 --- 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 3818f2fd243..6e5200db407 100644 --- 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 2ba1edd2ba4..dff895a9651 100644 --- 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 c8a02ae2fd6..1a82a57c755 100644 --- 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 85d438fbef2..f796a414d50 100644 --- 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 fffcc371d43..5f4e48ecbb6 100644 --- 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 9589229b4f9..eef4230e64c 100644 --- 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 93f4d627a14..c5d742c2bd8 100644 --- 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 b0c6eb12495..5d24916389c 100644 --- 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 22f6d126aef..9b5895093da 100644 --- 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 31e89d9d4cd..6490be55045 100644 --- 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 207a29075b2..dcf5537687b 100644 --- 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 41b041bee47..0dfb7e7918d 100644 --- 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 fe44521a9bf..56c2454dff2 100644 --- 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 236bb0c49a0..b8fb77e8137 100644 --- 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 e9f33cf8eb3..048c1786923 100644 --- 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 5ebf9e4fafb..27c2be90983 100644 --- 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 38e882606bf..8ab6429e482 100644 --- 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 b94a6cce170..e1fc75476f6 100644 --- 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 9d4ab212233..174bfe50a9d 100644 --- 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 779a1d2f5ad..717cd61bd69 100644 --- 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 bd25ec85b86..a55bde23683 100644 --- 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 ea0c4fda9cb..e86c36443ba 100644 --- 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 ee69d7d3585..26ac2518d96 100644 --- 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 1d48031ed19..cc0d172115f 100644 --- 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 d36208791cb..118f5bae726 100644 --- 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 e53d3c4c37b..2fb91a8f8c1 100644 --- 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 2bf5c10da8e..25bfeef0367 100644 --- 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 e5bc6b90144..71373e98f95 100644 --- 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 f6d924da272..d57e9d5bbe8 100644 --- 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 |