Commit 25b4adbba018633b943a99322bfb2fb819c0bafb
Committed by
Tom Rini
1 parent
c6d12624ae
Exists in
v2017.01-smarct4x
and in
37 other branches
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>
Showing 56 changed files with 0 additions and 69 deletions Side-by-side Diff
- include/configs/B4860QDS.h
- include/configs/BSC9131RDB.h
- include/configs/BSC9132QDS.h
- include/configs/C29XPCIE.h
- include/configs/MPC8313ERDB.h
- include/configs/P1010RDB.h
- include/configs/P1022DS.h
- include/configs/P1_P2_RDB.h
- include/configs/T104xRDB.h
- include/configs/T208xQDS.h
- include/configs/T208xRDB.h
- include/configs/T4240QDS.h
- include/configs/a3m071.h
- include/configs/am335x_igep0033.h
- include/configs/am3517_crane.h
- include/configs/am3517_evm.h
- include/configs/apf27.h
- include/configs/arndale.h
- include/configs/bur_am335x_common.h
- include/configs/cam_enc_4xx.h
- include/configs/cm_t35.h
- include/configs/da850evm.h
- include/configs/devkit8000.h
- include/configs/exynos5-dt.h
- include/configs/hawkboard.h
- include/configs/ipam390.h
- include/configs/lwmon5.h
- include/configs/m53evk.h
- include/configs/mcx.h
- include/configs/microblaze-generic.h
- include/configs/mx31pdk.h
- include/configs/mxs.h
- include/configs/omap3_evm_common.h
- include/configs/omap3_zoom1.h
- include/configs/origen.h
- include/configs/p1_p2_rdb_pc.h
- include/configs/palmtreo680.h
- include/configs/pcm051.h
- include/configs/sama5d3_xplained.h
- include/configs/sama5d3xek.h
- include/configs/siemens-am33x-common.h
- include/configs/smdkv310.h
- include/configs/socfpga_cyclone5.h
- include/configs/sunxi-common.h
- include/configs/tam3517-common.h
- include/configs/tao3530.h
- include/configs/tegra-common.h
- include/configs/ti814x_evm.h
- include/configs/ti816x_evm.h
- include/configs/ti_armv7_common.h
- include/configs/tricorder.h
- include/configs/tx25.h
- include/configs/vpac270.h
- include/configs/woodburn_sd.h
- include/configs/x600.h
- include/configs/zynq-common.h
include/configs/B4860QDS.h
... | ... | @@ -23,7 +23,6 @@ |
23 | 23 | #define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE |
24 | 24 | #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc |
25 | 25 | #else |
26 | -#define CONFIG_SPL 1 | |
27 | 26 | #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT |
28 | 27 | #define CONFIG_SPL_ENV_SUPPORT |
29 | 28 | #define CONFIG_SPL_SERIAL_SUPPORT |
include/configs/BSC9131RDB.h
include/configs/BSC9132QDS.h
include/configs/C29XPCIE.h
include/configs/MPC8313ERDB.h
include/configs/P1010RDB.h
... | ... | @@ -21,7 +21,6 @@ |
21 | 21 | #define CONFIG_NAND_FSL_IFC |
22 | 22 | |
23 | 23 | #ifdef CONFIG_SDCARD |
24 | -#define CONFIG_SPL 1 | |
25 | 24 | #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT |
26 | 25 | #define CONFIG_SPL_DRIVERS_MISC_SUPPORT |
27 | 26 | #define CONFIG_SPL_ENV_SUPPORT |
... | ... | @@ -56,7 +55,6 @@ |
56 | 55 | #define CONFIG_SYS_TEXT_BASE 0x11000000 |
57 | 56 | #define CONFIG_RESET_VECTOR_ADDRESS 0x1107fffc |
58 | 57 | #else |
59 | -#define CONFIG_SPL 1 | |
60 | 58 | #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT |
61 | 59 | #define CONFIG_SPL_DRIVERS_MISC_SUPPORT |
62 | 60 | #define CONFIG_SPL_ENV_SUPPORT |
... | ... | @@ -88,7 +86,6 @@ |
88 | 86 | #endif |
89 | 87 | |
90 | 88 | #ifdef CONFIG_NAND |
91 | -#define CONFIG_SPL 1 | |
92 | 89 | #ifdef CONFIG_SECURE_BOOT |
93 | 90 | #define CONFIG_SPL_INIT_MINIMAL |
94 | 91 | #define CONFIG_SPL_SERIAL_SUPPORT |
... | ... | @@ -108,7 +105,6 @@ |
108 | 105 | #define CONFIG_SYS_NAND_U_BOOT_OFFS 0 |
109 | 106 | #define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" |
110 | 107 | #else |
111 | -#define CONFIG_TPL 1 | |
112 | 108 | #ifdef CONFIG_TPL_BUILD |
113 | 109 | #define CONFIG_SPL_NAND_BOOT |
114 | 110 | #define CONFIG_SPL_FLUSH_IMAGE |
include/configs/P1022DS.h
... | ... | @@ -16,7 +16,6 @@ |
16 | 16 | #endif |
17 | 17 | |
18 | 18 | #ifdef CONFIG_SDCARD |
19 | -#define CONFIG_SPL 1 | |
20 | 19 | #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT |
21 | 20 | #define CONFIG_SPL_ENV_SUPPORT |
22 | 21 | #define CONFIG_SPL_SERIAL_SUPPORT |
... | ... | @@ -45,7 +44,6 @@ |
45 | 44 | #endif |
46 | 45 | |
47 | 46 | #ifdef CONFIG_SPIFLASH |
48 | -#define CONFIG_SPL 1 | |
49 | 47 | #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT |
50 | 48 | #define CONFIG_SPL_ENV_SUPPORT |
51 | 49 | #define CONFIG_SPL_SERIAL_SUPPORT |
... | ... | @@ -79,8 +77,6 @@ |
79 | 77 | #define CONFIG_SYS_NAND_MAX_OOBFREE 5 |
80 | 78 | |
81 | 79 | #ifdef CONFIG_NAND |
82 | -#define CONFIG_SPL 1 | |
83 | -#define CONFIG_TPL 1 | |
84 | 80 | #ifdef CONFIG_TPL_BUILD |
85 | 81 | #define CONFIG_SPL_NAND_BOOT |
86 | 82 | #define CONFIG_SPL_FLUSH_IMAGE |
include/configs/P1_P2_RDB.h
... | ... | @@ -36,7 +36,6 @@ |
36 | 36 | #endif |
37 | 37 | |
38 | 38 | #ifdef CONFIG_SDCARD |
39 | -#define CONFIG_SPL 1 | |
40 | 39 | #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT |
41 | 40 | #define CONFIG_SPL_ENV_SUPPORT |
42 | 41 | #define CONFIG_SPL_SERIAL_SUPPORT |
... | ... | @@ -64,7 +63,6 @@ |
64 | 63 | #endif |
65 | 64 | |
66 | 65 | #ifdef CONFIG_SPIFLASH |
67 | -#define CONFIG_SPL 1 | |
68 | 66 | #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT |
69 | 67 | #define CONFIG_SPL_ENV_SUPPORT |
70 | 68 | #define CONFIG_SPL_SERIAL_SUPPORT |
... | ... | @@ -93,8 +91,6 @@ |
93 | 91 | #endif |
94 | 92 | |
95 | 93 | #ifdef CONFIG_NAND |
96 | -#define CONFIG_SPL 1 | |
97 | -#define CONFIG_TPL 1 | |
98 | 94 | #ifdef CONFIG_TPL_BUILD |
99 | 95 | #define CONFIG_SPL_NAND_BOOT |
100 | 96 | #define CONFIG_SPL_FLUSH_IMAGE |
include/configs/T104xRDB.h
include/configs/T208xQDS.h
include/configs/T208xRDB.h
... | ... | @@ -44,7 +44,6 @@ |
44 | 44 | #define CONFIG_SYS_FSL_PBL_PBI board/freescale/t208xrdb/t2080_pbi.cfg |
45 | 45 | #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t208xrdb/t2080_rcw.cfg |
46 | 46 | |
47 | -#define CONFIG_SPL 1 | |
48 | 47 | #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT |
49 | 48 | #define CONFIG_SPL_ENV_SUPPORT |
50 | 49 | #define CONFIG_SPL_SERIAL_SUPPORT |
include/configs/T4240QDS.h
... | ... | @@ -25,7 +25,6 @@ |
25 | 25 | #define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE |
26 | 26 | #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc |
27 | 27 | #else |
28 | -#define CONFIG_SPL 1 | |
29 | 28 | #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT |
30 | 29 | #define CONFIG_SPL_ENV_SUPPORT |
31 | 30 | #define CONFIG_SPL_SERIAL_SUPPORT |
include/configs/a3m071.h
include/configs/am335x_igep0033.h
include/configs/am3517_crane.h
include/configs/am3517_evm.h
include/configs/apf27.h
include/configs/arndale.h
include/configs/bur_am335x_common.h
... | ... | @@ -164,7 +164,6 @@ |
164 | 164 | * under common/spl/. Given our generally common memory map, we set a |
165 | 165 | * number of related defaults and sizes here. |
166 | 166 | */ |
167 | -#define CONFIG_SPL 1 | |
168 | 167 | #define CONFIG_SPL_FRAMEWORK |
169 | 168 | /* |
170 | 169 | * Place the image at the start of the ROM defined image space. |
include/configs/cam_enc_4xx.h
include/configs/cm_t35.h
include/configs/da850evm.h
include/configs/devkit8000.h
include/configs/exynos5-dt.h
include/configs/hawkboard.h
include/configs/ipam390.h
include/configs/lwmon5.h
include/configs/m53evk.h
include/configs/mcx.h
include/configs/microblaze-generic.h
include/configs/mx31pdk.h
include/configs/mxs.h
include/configs/omap3_evm_common.h
include/configs/omap3_zoom1.h
include/configs/origen.h
include/configs/p1_p2_rdb_pc.h
... | ... | @@ -148,7 +148,6 @@ |
148 | 148 | #endif |
149 | 149 | |
150 | 150 | #ifdef CONFIG_SDCARD |
151 | -#define CONFIG_SPL 1 | |
152 | 151 | #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT |
153 | 152 | #define CONFIG_SPL_ENV_SUPPORT |
154 | 153 | #define CONFIG_SPL_SERIAL_SUPPORT |
... | ... | @@ -177,7 +176,6 @@ |
177 | 176 | #endif |
178 | 177 | |
179 | 178 | #ifdef CONFIG_SPIFLASH |
180 | -#define CONFIG_SPL 1 | |
181 | 179 | #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT |
182 | 180 | #define CONFIG_SPL_ENV_SUPPORT |
183 | 181 | #define CONFIG_SPL_SERIAL_SUPPORT |
... | ... | @@ -207,8 +205,6 @@ |
207 | 205 | #endif |
208 | 206 | |
209 | 207 | #ifdef CONFIG_NAND |
210 | -#define CONFIG_SPL 1 | |
211 | -#define CONFIG_TPL 1 | |
212 | 208 | #ifdef CONFIG_TPL_BUILD |
213 | 209 | #define CONFIG_SPL_NAND_BOOT |
214 | 210 | #define CONFIG_SPL_FLUSH_IMAGE |
include/configs/palmtreo680.h
... | ... | @@ -205,7 +205,6 @@ |
205 | 205 | /* |
206 | 206 | * SPL |
207 | 207 | */ |
208 | -#define CONFIG_SPL 1 | |
209 | 208 | #define CONFIG_SPL_TEXT_BASE 0xa1700000 /* IPL loads SPL here */ |
210 | 209 | #define CONFIG_SPL_STACK 0x5c040000 /* end of internal SRAM */ |
211 | 210 | #define CONFIG_SPL_NAND_SUPPORT /* build libnand for spl */ |
include/configs/pcm051.h
include/configs/sama5d3_xplained.h
include/configs/sama5d3xek.h
include/configs/siemens-am33x-common.h
include/configs/smdkv310.h
include/configs/socfpga_cyclone5.h
include/configs/sunxi-common.h
include/configs/tam3517-common.h
include/configs/tao3530.h
include/configs/tegra-common.h
include/configs/ti814x_evm.h
include/configs/ti816x_evm.h
include/configs/ti_armv7_common.h
include/configs/tricorder.h
include/configs/tx25.h
include/configs/vpac270.h
include/configs/woodburn_sd.h
include/configs/x600.h
... | ... | @@ -274,7 +274,6 @@ |
274 | 274 | /* |
275 | 275 | * SPL related defines |
276 | 276 | */ |
277 | -#define CONFIG_SPL 1 | |
278 | 277 | #define CONFIG_SPL_TEXT_BASE 0xd2800b00 |
279 | 278 | #define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/spear" |
280 | 279 | #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds" |