Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 9314cee6917444ab88bd4e758da7a30975120187

Authored by Jean-Christophe PLAGNIOL-VILLARD
1 parent 06f6135439
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

rename CFG_ENV_IS_IN_NVRAM in CONFIG_ENV_IS_IN_NVRAM 

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Showing 64 changed files with 93 additions and 93 deletions Side-by-side Diff

... ... @@ -1063,7 +1063,7 @@
1063 1063 $(XECHO) "... with LCD display ..."; \
1064 1064 }
1065 1065 @[ -z "$(findstring _NVRAM,$@)" ] || \
1066   - { echo "#define CFG_ENV_IS_IN_NVRAM" >>$(obj)include/config.h ; \
  1066 + { echo "#define CONFIG_ENV_IS_IN_NVRAM" >>$(obj)include/config.h ; \
1067 1067 $(XECHO) "... with ENV in NVRAM ..."; \
1068 1068 }
1069 1069 @$(MKCONFIG) -a RPXlite_DW ppc mpc8xx RPXlite_dw
... ... @@ -2174,7 +2174,7 @@
2174 2174 accordingly!
2175 2175  
2176 2176  
2177   -- CFG_ENV_IS_IN_NVRAM:
  2177 +- CONFIG_ENV_IS_IN_NVRAM:
2178 2178  
2179 2179 Define this if you have some non-volatile memory device
2180 2180 (NVRAM, battery buffered SRAM) which you want to use for the
board/LEOX/elpt860/README.LEOX
Diff comments   View file @ 9314cee
... ... @@ -106,7 +106,7 @@
106 106 ? - alias for 'help'
107 107  
108 108 ##################################################
109   -# Environment Variables (CFG_ENV_IS_IN_NVRAM)
  109 +# Environment Variables (CONFIG_ENV_IS_IN_NVRAM)
110 110 ##############################
111 111  
112 112 LEOX_elpt860: printenv
board/RPXlite_dw/README
Diff comments   View file @ 9314cee
... ... @@ -21,7 +21,7 @@
21 21 make RPXlite_DW_64_config
22 22 make all
23 23  
24   -2. CFG_ENV_IS_IN_FLASH/CFG_ENV_IS_IN_NVRAM
  24 +2. CFG_ENV_IS_IN_FLASH/CONFIG_ENV_IS_IN_NVRAM
25 25  
26 26 The default environment parameter is stored in FLASH because it is a common choice for
27 27 environment parameter.So I make NVRAM as backup parameter storeage.The reason why I
... ... @@ -52,7 +52,7 @@
52 52  
53 53 DECLARE_GLOBAL_DATA_PTR;
54 54  
55   -#if !defined(CFG_ENV_IS_IN_NVRAM) && \
  55 +#if !defined(CONFIG_ENV_IS_IN_NVRAM) && \
56 56 !defined(CONFIG_ENV_IS_IN_EEPROM) && \
57 57 !defined(CFG_ENV_IS_IN_FLASH) && \
58 58 !defined(CONFIG_ENV_IS_IN_DATAFLASH) && \
... ... @@ -540,7 +540,7 @@
540 540 return (-1);
541 541 }
542 542  
543   -#if ((defined(CFG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \
  543 +#if ((defined(CONFIG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \
544 544 || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
545 545 || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
546 546 || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \
... ... @@ -596,7 +596,7 @@
596 596 " - delete environment variable 'name'\n"
597 597 );
598 598  
599   -#if ((defined(CFG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \
  599 +#if ((defined(CONFIG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \
600 600 || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
601 601 || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
602 602 || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \
... ... @@ -44,7 +44,7 @@
44 44  
45 45 DECLARE_GLOBAL_DATA_PTR;
46 46  
47   -#ifdef CFG_ENV_IS_IN_NVRAM /* Environment is in NVRAM */
  47 +#ifdef CONFIG_ENV_IS_IN_NVRAM /* Environment is in NVRAM */
48 48  
49 49 #include <command.h>
50 50 #include <environment.h>
... ... @@ -157,5 +157,5 @@
157 157 return (0);
158 158 }
159 159  
160   -#endif /* CFG_ENV_IS_IN_NVRAM */
  160 +#endif /* CONFIG_ENV_IS_IN_NVRAM */
cpu/mpc8xx/cpu_init.c
Diff comments   View file @ 9314cee
... ... @@ -245,7 +245,7 @@
245 245 rpxclassic_init ();
246 246 #endif
247 247  
248   -#if defined(CONFIG_RPXLITE) && defined(CFG_ENV_IS_IN_NVRAM)
  248 +#if defined(CONFIG_RPXLITE) && defined(CONFIG_ENV_IS_IN_NVRAM)
249 249 rpxlite_init ();
250 250 #endif
251 251  
include/configs/ADCIOP.h
Diff comments   View file @ 9314cee
... ... @@ -160,7 +160,7 @@
160 160 /*-----------------------------------------------------------------------
161 161 * NVRAM organization
162 162 */
163   -#define CFG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
  163 +#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
164 164 #define CFG_NVRAM_BASE_ADDR 0x10000000 /* NVRAM base address */
165 165 #define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */
166 166 #define CFG_ENV_SIZE 0x0400 /* Size of Environment vars */
include/configs/AP1000.h
Diff comments   View file @ 9314cee
... ... @@ -40,11 +40,11 @@
40 40 #define CFG_ENV_IS_IN_FLASH 1
41 41 #define CFG_FLASH_USE_BUFFER_WRITE
42 42  
43   -#ifdef CFG_ENV_IS_IN_NVRAM
  43 +#ifdef CONFIG_ENV_IS_IN_NVRAM
44 44 #undef CFG_ENV_IS_IN_FLASH
45 45 #else
46 46 #ifdef CFG_ENV_IS_IN_FLASH
47   -#undef CFG_ENV_IS_IN_NVRAM
  47 +#undef CONFIG_ENV_IS_IN_NVRAM
48 48 #endif
49 49 #endif
50 50  
... ... @@ -186,7 +186,7 @@
186 186 #define CFG_NVRAM_BASE_ADDR 0xf0000000 /* NVRAM base address */
187 187 #define CFG_NVRAM_SIZE 0x1ff8 /* NVRAM size */
188 188  
189   -#ifdef CFG_ENV_IS_IN_NVRAM
  189 +#ifdef CONFIG_ENV_IS_IN_NVRAM
190 190 #define CFG_ENV_SIZE 0x1000 /* Size of Environment vars */
191 191 #define CFG_ENV_ADDR \
192 192 (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) /* Env */
include/configs/Alaska8220.h
Diff comments   View file @ 9314cee
... ... @@ -225,13 +225,13 @@
225 225 #define CONFIG_ENV_OVERWRITE 1
226 226  
227 227 #if defined CFG_ENV_IS_IN_FLASH
228   -#undef CFG_ENV_IS_IN_NVRAM
  228 +#undef CONFIG_ENV_IS_IN_NVRAM
229 229 #undef CONFIG_ENV_IS_IN_EEPROM
230   -#elif defined CFG_ENV_IS_IN_NVRAM
  230 +#elif defined CONFIG_ENV_IS_IN_NVRAM
231 231 #undef CFG_ENV_IS_IN_FLASH
232 232 #undef CONFIG_ENV_IS_IN_EEPROM
233 233 #elif defined CONFIG_ENV_IS_IN_EEPROM
234   -#undef CFG_ENV_IS_IN_NVRAM
  234 +#undef CONFIG_ENV_IS_IN_NVRAM
235 235 #undef CFG_ENV_IS_IN_FLASH
236 236 #endif
237 237  
include/configs/AmigaOneG3SE.h
Diff comments   View file @ 9314cee
... ... @@ -240,7 +240,7 @@
240 240 /*
241 241 * Environment is stored in NVRAM.
242 242 */
243   -#define CFG_ENV_IS_IN_NVRAM 1
  243 +#define CONFIG_ENV_IS_IN_NVRAM 1
244 244 #define CFG_ENV_ADDR 0xFD0E0000 /* This should be 0xFD0E0000, but we skip bytes to
245 245 * protect softex's settings for now.
246 246 * Original 768 bytes where not enough.
include/configs/BAB7xx.h
Diff comments   View file @ 9314cee
... ... @@ -243,7 +243,7 @@
243 243 * Environment settings
244 244 */
245 245 #define CONFIG_ENV_OVERWRITE
246   -#define CFG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
  246 +#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
247 247 #define CFG_NVRAM_SIZE 0x1ff0 /* NVRAM size (8kB), we must protect the clock data (16 bytes) */
248 248 #define CFG_ENV_SIZE 0x400 /* Size of Environment vars (1kB) */
249 249 /*
include/configs/BMW.h
Diff comments   View file @ 9314cee
... ... @@ -289,7 +289,7 @@
289 289 * Warining: environment is not EMBEDDED in the U-Boot code.
290 290 * It's stored in flash separately.
291 291 */
292   -#define CFG_ENV_IS_IN_NVRAM 1
  292 +#define CONFIG_ENV_IS_IN_NVRAM 1
293 293 #define CONFIG_ENV_OVERWRITE 1
294 294 #define CFG_NVRAM_ACCESS_ROUTINE 1
295 295 #define CFG_ENV_ADDR 0x7c004000 /* right at the start of NVRAM */
include/configs/CPCI405.h
Diff comments   View file @ 9314cee
... ... @@ -236,7 +236,7 @@
236 236 /*-----------------------------------------------------------------------
237 237 * NVRAM organization
238 238 */
239   -#define CFG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
  239 +#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
240 240 #define CFG_ENV_SIZE 0x1000 /* Size of Environment vars */
241 241 #define CFG_ENV_ADDR \
242 242 (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) /* Env */
include/configs/CPCI4052.h
Diff comments   View file @ 9314cee
... ... @@ -251,7 +251,7 @@
251 251 /*-----------------------------------------------------------------------
252 252 * NVRAM organization
253 253 */
254   -#define CFG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
  254 +#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
255 255 #define CFG_ENV_SIZE 0x0ff8 /* Size of Environment vars */
256 256 #define CFG_ENV_ADDR \
257 257 (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(CFG_ENV_SIZE+8)) /* Env */
include/configs/CPCI405DT.h
Diff comments   View file @ 9314cee
... ... @@ -254,7 +254,7 @@
254 254 /*-----------------------------------------------------------------------
255 255 * NVRAM organization
256 256 */
257   -#define CFG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
  257 +#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
258 258 #define CFG_ENV_SIZE 0x0ff8 /* Size of Environment vars */
259 259 #define CFG_ENV_ADDR \
260 260 (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(CFG_ENV_SIZE+8)) /* Env */
include/configs/ELPPC.h
Diff comments   View file @ 9314cee
... ... @@ -218,7 +218,7 @@
218 218 * Environment settings
219 219 */
220 220 #define CONFIG_ENV_OVERWRITE
221   -#define CFG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
  221 +#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
222 222 #define CFG_NVRAM_SIZE 0x800 /* NVRAM size (2kB) */
223 223 #define CFG_ENV_SIZE 0x400 /* Size of Environment vars (1kB) */
224 224 #define CFG_ENV_ADDR 0x0
include/configs/ELPT860.h
Diff comments   View file @ 9314cee
... ... @@ -137,7 +137,7 @@
137 137 */
138 138 #define CONFIG_ENV_OVERWRITE 1 /* Allow Overwrite of serial# & ethaddr */
139 139  
140   -#undef CFG_ENV_IS_IN_NVRAM /* Environment is in NVRAM */
  140 +#undef CONFIG_ENV_IS_IN_NVRAM /* Environment is in NVRAM */
141 141 #undef CONFIG_ENV_IS_IN_EEPROM /* Environment is in I2C EEPROM */
142 142 #define CFG_ENV_IS_IN_FLASH 1 /* Environment is in FLASH */
143 143  
... ... @@ -225,7 +225,7 @@
225 225 #define CFG_NVRAM_SIZE ((128*1024)-8) /* clock regs resident in the */
226 226 /* 8 top NVRAM locations */
227 227  
228   -#if defined(CFG_ENV_IS_IN_NVRAM)
  228 +#if defined(CONFIG_ENV_IS_IN_NVRAM)
229 229 # define CFG_ENV_ADDR CFG_NVRAM_BASE /* Base address of NVRAM area */
230 230 # define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
231 231 #endif
include/configs/ERIC.h
Diff comments   View file @ 9314cee
... ... @@ -45,7 +45,7 @@
45 45 #define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
46 46 #endif
47 47 #if 0
48   -#define CFG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
  48 +#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
49 49 #endif
50 50 #if 0
51 51 #define CONFIG_ENV_IS_IN_EEPROM 1 /* use I2C RTC X1240 for environment vars */
52 52  
53 53  
... ... @@ -63,15 +63,15 @@
63 63 #define CFG_I2C_RTC_ADDR 0x6F /* and one for RTC */
64 64  
65 65 #ifdef CFG_ENV_IS_IN_FLASH
66   -#undef CFG_ENV_IS_IN_NVRAM
  66 +#undef CONFIG_ENV_IS_IN_NVRAM
67 67 #undef CONFIG_ENV_IS_IN_EEPROM
68 68 #else
69   -#ifdef CFG_ENV_IS_IN_NVRAM
  69 +#ifdef CONFIG_ENV_IS_IN_NVRAM
70 70 #undef CFG_ENV_IS_IN_FLASH
71 71 #undef CONFIG_ENV_IS_IN_EEPROM
72 72 #else
73 73 #ifdef CONFIG_ENV_IS_IN_EEPROM
74   -#undef CFG_ENV_IS_IN_NVRAM
  74 +#undef CONFIG_ENV_IS_IN_NVRAM
75 75 #undef CFG_ENV_IS_IN_FLASH
76 76 #endif
77 77 #endif
... ... @@ -318,7 +318,7 @@
318 318 #define CFG_NVRAM_BASE_ADDR CFG_NVRAM_REG_BASE_ADDR /* NVRAM base address */
319 319 #define CFG_NVRAM_SIZE 0x7F8 /* NVRAM size 2kByte - 8 Byte for RTC */
320 320  
321   -#ifdef CFG_ENV_IS_IN_NVRAM
  321 +#ifdef CONFIG_ENV_IS_IN_NVRAM
322 322 #define CFG_ENV_SIZE 0x7F8 /* Size of Environment vars */
323 323 #define CFG_ENV_ADDR \
324 324 (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) /* Env */
include/configs/EXBITGEN.h
Diff comments   View file @ 9314cee
... ... @@ -49,7 +49,7 @@
49 49 /* environment is in EEPROM */
50 50 #define CONFIG_ENV_IS_IN_EEPROM 1
51 51 #undef CFG_ENV_IS_IN_FLASH
52   -#undef CFG_ENV_IS_IN_NVRAM
  52 +#undef CONFIG_ENV_IS_IN_NVRAM
53 53  
54 54 #ifdef CONFIG_ENV_IS_IN_EEPROM
55 55 #define CFG_I2C_EEPROM_ADDR 0x56 /* 1010110 */
include/configs/IP860.h
Diff comments   View file @ 9314cee
... ... @@ -187,15 +187,15 @@
187 187 #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
188 188  
189 189 #undef CFG_ENV_IS_IN_FLASH
190   -#undef CFG_ENV_IS_IN_NVRAM
191   -#undef CFG_ENV_IS_IN_NVRAM
  190 +#undef CONFIG_ENV_IS_IN_NVRAM
  191 +#undef CONFIG_ENV_IS_IN_NVRAM
192 192 #undef DEBUG_I2C
193 193 #define CONFIG_ENV_IS_IN_EEPROM
194 194  
195   -#ifdef CFG_ENV_IS_IN_NVRAM
  195 +#ifdef CONFIG_ENV_IS_IN_NVRAM
196 196 #define CFG_ENV_ADDR 0x20000000 /* use SRAM */
197 197 #define CFG_ENV_SIZE (16<<10) /* use 16 kB */
198   -#endif /* CFG_ENV_IS_IN_NVRAM */
  198 +#endif /* CONFIG_ENV_IS_IN_NVRAM */
199 199  
200 200 #ifdef CONFIG_ENV_IS_IN_EEPROM
201 201 #define CFG_ENV_OFFSET 512 /* Leave 512 bytes free for other data */
include/configs/JSE.h
Diff comments   View file @ 9314cee
... ... @@ -77,7 +77,7 @@
77 77 #define CONFIG_MISC_INIT_R 1
78 78  
79 79 /* JSE has EEPROM chips that are good for environment. */
80   -#undef CFG_ENV_IS_IN_NVRAM
  80 +#undef CONFIG_ENV_IS_IN_NVRAM
81 81 #undef CFG_ENV_IS_IN_FLASH
82 82 #define CONFIG_ENV_IS_IN_EEPROM 1
83 83 #undef CFG_ENV_IS_NOWHERE
include/configs/KAREF.h
Diff comments   View file @ 9314cee
... ... @@ -141,7 +141,7 @@
141 141 /*-----------------------------------------------------------------------
142 142 * Environment
143 143 *----------------------------------------------------------------------*/
144   -#define CFG_ENV_IS_IN_NVRAM 1 /* Environment uses NVRAM */
  144 +#define CONFIG_ENV_IS_IN_NVRAM 1 /* Environment uses NVRAM */
145 145 #undef CFG_ENV_IS_IN_FLASH /* ... not in flash */
146 146 #undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */
147 147 #define CONFIG_ENV_OVERWRITE 1 /* allow env overwrite */
include/configs/MBX.h
Diff comments   View file @ 9314cee
... ... @@ -193,7 +193,7 @@
193 193 * board: EPPC-Bug from Motorola. To avoid collisions in NVRAM Usage, we
194 194 * access the NVRAM at the offset 0x1000.
195 195 */
196   -#define CFG_ENV_IS_IN_NVRAM 1 /* turn on NVRAM env feature */
  196 +#define CONFIG_ENV_IS_IN_NVRAM 1 /* turn on NVRAM env feature */
197 197 #define CFG_ENV_ADDR (CFG_NVRAM_BASE + 0x1000)
198 198 #define CFG_ENV_SIZE 0x1000
199 199  
include/configs/MBX860T.h
Diff comments   View file @ 9314cee
... ... @@ -143,7 +143,7 @@
143 143 * board: EPPC-Bug from Motorola. To avoid collisions in NVRAM Usage, we
144 144 * access the NVRAM at the offset 0x1000.
145 145 */
146   -#define CFG_ENV_IS_IN_NVRAM 1 /* turn on NVRAM env feature */
  146 +#define CONFIG_ENV_IS_IN_NVRAM 1 /* turn on NVRAM env feature */
147 147 #define CFG_ENV_ADDR (CFG_NVRAM_BASE + 0x1000)
148 148 #define CFG_ENV_SIZE 0x1000
149 149  
include/configs/METROBOX.h
Diff comments   View file @ 9314cee
... ... @@ -203,7 +203,7 @@
203 203 /*-----------------------------------------------------------------------
204 204 * Environment
205 205 *----------------------------------------------------------------------*/
206   -#define CFG_ENV_IS_IN_NVRAM 1 /* Environment uses NVRAM */
  206 +#define CONFIG_ENV_IS_IN_NVRAM 1 /* Environment uses NVRAM */
207 207 #undef CFG_ENV_IS_IN_FLASH /* ... not in flash */
208 208 #undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */
209 209 #define CONFIG_ENV_OVERWRITE 1 /* allow env overwrite */
include/configs/ML2.h
Diff comments   View file @ 9314cee
... ... @@ -33,11 +33,11 @@
33 33  
34 34 #define CFG_ENV_IS_IN_FLASH 1
35 35  
36   -#ifdef CFG_ENV_IS_IN_NVRAM
  36 +#ifdef CONFIG_ENV_IS_IN_NVRAM
37 37 #undef CFG_ENV_IS_IN_FLASH
38 38 #else
39 39 #ifdef CFG_ENV_IS_IN_FLASH
40   -#undef CFG_ENV_IS_IN_NVRAM
  40 +#undef CONFIG_ENV_IS_IN_NVRAM
41 41 #endif
42 42 #endif
43 43  
... ... @@ -196,7 +196,7 @@
196 196 #define CFG_NVRAM_BASE_ADDR 0xf0000000 /* NVRAM base address */
197 197 #define CFG_NVRAM_SIZE 0x1ff8 /* NVRAM size */
198 198  
199   -#ifdef CFG_ENV_IS_IN_NVRAM
  199 +#ifdef CONFIG_ENV_IS_IN_NVRAM
200 200 #define CFG_ENV_SIZE 0x1000 /* Size of Environment vars */
201 201 #define CFG_ENV_ADDR \
202 202 (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) /* Env */
include/configs/MOUSSE.h
Diff comments   View file @ 9314cee
... ... @@ -302,7 +302,7 @@
302 302 #define CFG_ENV_OFFSET 0x8000 /* Offset of the Environment Sector */
303 303 #define CFG_ENV_SIZE 0x4000 /* Size of the Environment Sector */
304 304 #else
305   -#define CFG_ENV_IS_IN_NVRAM 1
  305 +#define CONFIG_ENV_IS_IN_NVRAM 1
306 306 #define CFG_ENV_ADDR NV_OFF_U_BOOT_ADDR /* PortX NVM Free addr*/
307 307 #define CFG_ENV_OFFSET CFG_ENV_ADDR
308 308 #define CFG_ENV_SIZE NV_U_BOOT_ENV_SIZE /* 2K */
include/configs/MPC8260ADS.h
Diff comments   View file @ 9314cee
... ... @@ -384,7 +384,7 @@
384 384 # define CFG_ENV_SECT_SIZE 0x40000
385 385 # define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_ENV_SECT_SIZE)
386 386 #else
387   -# define CFG_ENV_IS_IN_NVRAM 1
  387 +# define CONFIG_ENV_IS_IN_NVRAM 1
388 388 # define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
389 389 # define CFG_ENV_SIZE 0x200
390 390 #endif /* CFG_RAMBOOT */
include/configs/MPC8266ADS.h
Diff comments   View file @ 9314cee
... ... @@ -431,7 +431,7 @@
431 431 # define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000)
432 432 # define CFG_ENV_SECT_SIZE 0x40000
433 433 #else
434   -# define CFG_ENV_IS_IN_NVRAM 1
  434 +# define CONFIG_ENV_IS_IN_NVRAM 1
435 435 # define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
436 436 # define CFG_ENV_SIZE 0x200
437 437 #endif /* CFG_RAMBOOT */
include/configs/OCRTC.h
Diff comments   View file @ 9314cee
... ... @@ -189,7 +189,7 @@
189 189 /*-----------------------------------------------------------------------
190 190 * NVRAM organization
191 191 */
192   -#define CFG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
  192 +#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
193 193 #define CFG_NVRAM_BASE_ADDR 0xf0200000 /* NVRAM base address */
194 194 #define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */
195 195 #define CFG_ENV_SIZE 0x1000 /* Size of Environment vars */
include/configs/ORSG.h
Diff comments   View file @ 9314cee
... ... @@ -187,7 +187,7 @@
187 187 /*-----------------------------------------------------------------------
188 188 * NVRAM organization
189 189 */
190   -#define CFG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
  190 +#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
191 191 #define CFG_NVRAM_BASE_ADDR 0xf0200000 /* NVRAM base address */
192 192 #define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */
193 193 #define CFG_ENV_SIZE 0x1000 /* Size of Environment vars */
include/configs/PCI405.h
Diff comments   View file @ 9314cee
... ... @@ -218,7 +218,7 @@
218 218 /*-----------------------------------------------------------------------
219 219 * NVRAM organization
220 220 */
221   -#define CFG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
  221 +#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
222 222 #define CFG_ENV_SIZE 0x0ff8 /* Size of Environment vars */
223 223 #define CFG_ENV_ADDR \
224 224 (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(CFG_ENV_SIZE+8)) /* Env */
include/configs/QS860T.h
Diff comments   View file @ 9314cee
... ... @@ -132,7 +132,7 @@
132 132 /*
133 133 * Environment variable storage is in NVRAM
134 134 */
135   -#define CFG_ENV_IS_IN_NVRAM 1
  135 +#define CONFIG_ENV_IS_IN_NVRAM 1
136 136 #define CFG_ENV_SIZE 0x00001000 /* We use only the last 4K for PPCBoot */
137 137 #define CFG_ENV_ADDR 0xD100E000
138 138  
include/configs/RPXClassic.h
Diff comments   View file @ 9314cee
... ... @@ -224,7 +224,7 @@
224 224 #define CFG_ENV_SECT_SIZE 0x8000
225 225 #define CFG_ENV_SIZE 0x8000 /* Total Size of Environment Sector */
226 226 #else
227   -#define CFG_ENV_IS_IN_NVRAM 1
  227 +#define CONFIG_ENV_IS_IN_NVRAM 1
228 228 #define CFG_ENV_ADDR 0xfa000100
229 229 #define CFG_ENV_SIZE 0x1000
230 230 #endif
include/configs/RPXlite_DW.h
Diff comments   View file @ 9314cee
... ... @@ -229,14 +229,14 @@
229 229 #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */
230 230 #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
231 231  
232   -#ifdef CFG_ENV_IS_IN_NVRAM
  232 +#ifdef CONFIG_ENV_IS_IN_NVRAM
233 233 #define CFG_ENV_ADDR 0xFA000100
234 234 #define CFG_ENV_SIZE 0x1000
235 235 #else
236 236 #define CFG_ENV_IS_IN_FLASH
237 237 #define CFG_ENV_OFFSET 0x30000 /* Offset of Environment Sector */
238 238 #define CFG_ENV_SIZE 0x8000 /* Total Size of Environment Sector */
239   -#endif /* CFG_ENV_IS_IN_NVRAM */
  239 +#endif /* CONFIG_ENV_IS_IN_NVRAM */
240 240  
241 241 #define CFG_RESET_ADDRESS ((ulong)((((immap_t *)CFG_IMMR)->im_clkrst.res)))
242 242  
include/configs/RPXsuper.h
Diff comments   View file @ 9314cee
... ... @@ -311,7 +311,7 @@
311 311 # define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sect real size */
312 312 # endif /* CFG_ENV_IN_OWN_SECT */
313 313 #else
314   -# define CFG_ENV_IS_IN_NVRAM 1
  314 +# define CONFIG_ENV_IS_IN_NVRAM 1
315 315 # define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
316 316 # define CFG_ENV_SIZE 0x200
317 317 #endif /* CFG_RAMBOOT */
include/configs/W7OLMC.h
Diff comments   View file @ 9314cee
... ... @@ -249,7 +249,7 @@
249 249 /*-----------------------------------------------------------------------
250 250 * NVRAM organization
251 251 */
252   -#define CFG_ENV_IS_IN_NVRAM 1 /* use NVRAM for env vars */
  252 +#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for env vars */
253 253 #define CFG_NVRAM_BASE_ADDR 0xfc000000 /* NVRAM base address */
254 254 #define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */
255 255 #define CFG_ENV_SIZE 0x1000 /* Size of Environment vars */
include/configs/W7OLMG.h
Diff comments   View file @ 9314cee
... ... @@ -256,7 +256,7 @@
256 256 /*-----------------------------------------------------------------------
257 257 * NVRAM organization
258 258 */
259   -#define CFG_ENV_IS_IN_NVRAM 1 /* use NVRAM for env vars */
  259 +#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for env vars */
260 260 #define CFG_NVRAM_BASE_ADDR 0xfc000000 /* NVRAM base address */
261 261 #define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */
262 262 #define CFG_ENV_SIZE 0x1000 /* Size of Environment vars */
include/configs/Yukon8220.h
Diff comments   View file @ 9314cee
... ... @@ -225,13 +225,13 @@
225 225 #define CONFIG_ENV_OVERWRITE 1
226 226  
227 227 #if defined CFG_ENV_IS_IN_FLASH
228   -#undef CFG_ENV_IS_IN_NVRAM
  228 +#undef CONFIG_ENV_IS_IN_NVRAM
229 229 #undef CONFIG_ENV_IS_IN_EEPROM
230   -#elif defined CFG_ENV_IS_IN_NVRAM
  230 +#elif defined CONFIG_ENV_IS_IN_NVRAM
231 231 #undef CFG_ENV_IS_IN_FLASH
232 232 #undef CONFIG_ENV_IS_IN_EEPROM
233 233 #elif defined CONFIG_ENV_IS_IN_EEPROM
234   -#undef CFG_ENV_IS_IN_NVRAM
  234 +#undef CONFIG_ENV_IS_IN_NVRAM
235 235 #undef CFG_ENV_IS_IN_FLASH
236 236 #endif
237 237  
include/configs/ZPC1900.h
Diff comments   View file @ 9314cee
... ... @@ -220,8 +220,8 @@
220 220 #define CFG_MALLOC_LEN (4096 << 10) /* Reserve 4 MB for malloc() */
221 221 #define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
222 222  
223   -#if !defined(CFG_ENV_IS_IN_FLASH) && !defined(CFG_ENV_IS_IN_NVRAM)
224   -#define CFG_ENV_IS_IN_NVRAM 1
  223 +#if !defined(CFG_ENV_IS_IN_FLASH) && !defined(CONFIG_ENV_IS_IN_NVRAM)
  224 +#define CONFIG_ENV_IS_IN_NVRAM 1
225 225 #endif
226 226  
227 227 #ifdef CFG_ENV_IS_IN_FLASH
include/configs/bubinga.h
Diff comments   View file @ 9314cee
... ... @@ -83,7 +83,7 @@
83 83 #if 1
84 84 #define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
85 85 #else
86   -#define CFG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
  86 +#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
87 87 #endif
88 88  
89 89 /*
... ... @@ -210,7 +210,7 @@
210 210 #define CFG_NVRAM_BASE_ADDR 0xf0000000 /* NVRAM base address */
211 211 #define CFG_NVRAM_SIZE 0x1ff8 /* NVRAM size */
212 212  
213   -#ifdef CFG_ENV_IS_IN_NVRAM
  213 +#ifdef CONFIG_ENV_IS_IN_NVRAM
214 214 #define CFG_ENV_SIZE 0x0ff8 /* Size of Environment vars */
215 215 #define CFG_ENV_ADDR \
216 216 (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) /* Env */
include/configs/csb272.h
Diff comments   View file @ 9314cee
... ... @@ -231,7 +231,7 @@
231 231 *
232 232 */
233 233 #define CFG_ENV_IS_IN_FLASH 1 /* environment is in FLASH */
234   -#undef CFG_ENV_IS_IN_NVRAM
  234 +#undef CONFIG_ENV_IS_IN_NVRAM
235 235 #undef CONFIG_ENV_IS_IN_EEPROM
236 236  
237 237 /*
include/configs/csb472.h
Diff comments   View file @ 9314cee
... ... @@ -230,7 +230,7 @@
230 230 *
231 231 */
232 232 #define CFG_ENV_IS_IN_FLASH 1 /* environment is in FLASH */
233   -#undef CFG_ENV_IS_IN_NVRAM
  233 +#undef CONFIG_ENV_IS_IN_NVRAM
234 234 #undef CONFIG_ENV_IS_IN_EEPROM
235 235  
236 236 /*
include/configs/debris.h
Diff comments   View file @ 9314cee
... ... @@ -251,7 +251,7 @@
251 251 #define MTDPARTS_DEFAULT "mtdparts=debris-0:-(jffs2)"
252 252 */
253 253  
254   -#define CFG_ENV_IS_IN_NVRAM 1
  254 +#define CONFIG_ENV_IS_IN_NVRAM 1
255 255 #define CONFIG_ENV_OVERWRITE 1
256 256 #define CFG_NVRAM_ACCESS_ROUTINE 1
257 257 #define CFG_ENV_ADDR 0xFF000000 /* right at the start of NVRAM */
include/configs/ebony.h
Diff comments   View file @ 9314cee
... ... @@ -51,7 +51,7 @@
51 51 #if 1
52 52 #define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
53 53 #else
54   -#define CFG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
  54 +#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
55 55 #endif
56 56  
57 57 /*-----------------------------------------------------------------------
58 58  
... ... @@ -97,11 +97,11 @@
97 97 #define CFG_NVRAM_SIZE (0x2000 - 8) /* NVRAM size(8k)- RTC regs */
98 98 #define CONFIG_RTC_DS174x 1 /* DS1743 RTC */
99 99  
100   -#ifdef CFG_ENV_IS_IN_NVRAM
  100 +#ifdef CONFIG_ENV_IS_IN_NVRAM
101 101 #define CFG_ENV_SIZE 0x1000 /* Size of Environment vars */
102 102 #define CFG_ENV_ADDR \
103 103 (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)
104   -#endif /* CFG_ENV_IS_IN_NVRAM */
  104 +#endif /* CONFIG_ENV_IS_IN_NVRAM */
105 105  
106 106 /*-----------------------------------------------------------------------
107 107 * FLASH related
include/configs/ep8260.h
Diff comments   View file @ 9314cee
... ... @@ -485,7 +485,7 @@
485 485 # define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sect real size */
486 486 # endif /* CFG_ENV_IN_OWN_SECT */
487 487 #else
488   -# define CFG_ENV_IS_IN_NVRAM 1
  488 +# define CONFIG_ENV_IS_IN_NVRAM 1
489 489 # define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
490 490 # define CFG_ENV_SIZE 0x200
491 491 #endif /* CFG_RAMBOOT */
include/configs/hcu4.h
Diff comments   View file @ 9314cee
... ... @@ -121,7 +121,7 @@
121 121 * Environment
122 122 *----------------------------------------------------------------------*/
123 123  
124   -#undef CFG_ENV_IS_IN_NVRAM
  124 +#undef CONFIG_ENV_IS_IN_NVRAM
125 125 #define CFG_ENV_IS_IN_FLASH
126 126 #undef CFG_ENV_IS_NOWHERE
127 127  
include/configs/hcu5.h
Diff comments   View file @ 9314cee
... ... @@ -106,7 +106,7 @@
106 106 * Environment
107 107 *----------------------------------------------------------------------*/
108 108  
109   -#undef CFG_ENV_IS_IN_NVRAM
  109 +#undef CONFIG_ENV_IS_IN_NVRAM
110 110 #define CFG_ENV_IS_IN_FLASH
111 111 #undef CONFIG_ENV_IS_IN_EEPROM
112 112 #undef CFG_ENV_IS_NOWHERE
include/configs/kvme080.h
Diff comments   View file @ 9314cee
... ... @@ -157,7 +157,7 @@
157 157 #define CFG_JFFS2_FIRST_BANK 0
158 158 #define CFG_JFFS2_NUM_BANKS 1
159 159  
160   -#define CFG_ENV_IS_IN_NVRAM 1
  160 +#define CONFIG_ENV_IS_IN_NVRAM 1
161 161 #define CONFIG_ENV_OVERWRITE 1
162 162 #define CFG_NVRAM_ACCESS_ROUTINE
163 163 #define CFG_ENV_ADDR CFG_NVRAM_BASE_ADDR
include/configs/mcu25.h
Diff comments   View file @ 9314cee
... ... @@ -121,7 +121,7 @@
121 121 * Environment
122 122 *----------------------------------------------------------------------*/
123 123  
124   -#undef CFG_ENV_IS_IN_NVRAM
  124 +#undef CONFIG_ENV_IS_IN_NVRAM
125 125 #define CFG_ENV_IS_IN_FLASH
126 126 #undef CFG_ENV_IS_NOWHERE
127 127  
include/configs/mpc7448hpc2.h
Diff comments   View file @ 9314cee
... ... @@ -381,7 +381,7 @@
381 381 #define PHYS_FLASH_SIZE 0x01000000
382 382 #define CFG_MAX_FLASH_SECT (128)
383 383  
384   -#define CFG_ENV_IS_IN_NVRAM
  384 +#define CONFIG_ENV_IS_IN_NVRAM
385 385 #define CFG_ENV_ADDR 0xFC000000
386 386  
387 387 #define CFG_ENV_OFFSET 0x00000000 /* Offset of Environment Sector */
include/configs/ocotea.h
Diff comments   View file @ 9314cee
... ... @@ -95,7 +95,7 @@
95 95 #if 1
96 96 #define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
97 97 #else
98   -#define CFG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
  98 +#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
99 99 #endif
100 100  
101 101  
102 102  
... ... @@ -112,11 +112,11 @@
112 112 #define CFG_NVRAM_SIZE (0x2000 - 8) /* NVRAM size(8k)- RTC regs */
113 113 #define CONFIG_RTC_DS174x 1 /* DS1743 RTC */
114 114  
115   -#ifdef CFG_ENV_IS_IN_NVRAM
  115 +#ifdef CONFIG_ENV_IS_IN_NVRAM
116 116 #define CFG_ENV_SIZE 0x1000 /* Size of Environment vars */
117 117 #define CFG_ENV_ADDR \
118 118 (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)
119   -#endif /* CFG_ENV_IS_IN_NVRAM */
  119 +#endif /* CONFIG_ENV_IS_IN_NVRAM */
120 120  
121 121 /*-----------------------------------------------------------------------
122 122 * FLASH related
include/configs/redwood.h
Diff comments   View file @ 9314cee
... ... @@ -119,7 +119,7 @@
119 119 /*-----------------------------------------------------------------------
120 120 * Environment
121 121 *----------------------------------------------------------------------*/
122   -#undef CFG_ENV_IS_IN_NVRAM /* ... not in NVRAM */
  122 +#undef CONFIG_ENV_IS_IN_NVRAM /* ... not in NVRAM */
123 123 #define CFG_ENV_IS_IN_FLASH 1 /* Environment uses flash */
124 124 #undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */
125 125  
include/configs/sacsng.h
Diff comments   View file @ 9314cee
... ... @@ -719,7 +719,7 @@
719 719 # endif /* CFG_ENV_IN_OWN_SECT */
720 720  
721 721 #else
722   -# define CFG_ENV_IS_IN_NVRAM 1
  722 +# define CONFIG_ENV_IS_IN_NVRAM 1
723 723 # define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
724 724 # define CFG_ENV_SIZE 0x200
725 725 #endif /* CFG_RAMBOOT */
include/configs/sbc8260.h
Diff comments   View file @ 9314cee
... ... @@ -615,7 +615,7 @@
615 615 # endif /* CFG_ENV_IN_OWN_SECT */
616 616  
617 617 #else
618   -# define CFG_ENV_IS_IN_NVRAM 1
  618 +# define CONFIG_ENV_IS_IN_NVRAM 1
619 619 # define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
620 620 # define CFG_ENV_SIZE 0x200
621 621 #endif /* CFG_RAMBOOT */
include/configs/sorcery.h
Diff comments   View file @ 9314cee
... ... @@ -207,13 +207,13 @@
207 207 #define CONFIG_ENV_OVERWRITE 1
208 208  
209 209 #if defined CFG_ENV_IS_IN_FLASH
210   -#undef CFG_ENV_IS_IN_NVRAM
  210 +#undef CONFIG_ENV_IS_IN_NVRAM
211 211 #undef CONFIG_ENV_IS_IN_EEPROM
212   -#elif defined CFG_ENV_IS_IN_NVRAM
  212 +#elif defined CONFIG_ENV_IS_IN_NVRAM
213 213 #undef CFG_ENV_IS_IN_FLASH
214 214 #undef CONFIG_ENV_IS_IN_EEPROM
215 215 #elif defined CONFIG_ENV_IS_IN_EEPROM
216   -#undef CFG_ENV_IS_IN_NVRAM
  216 +#undef CONFIG_ENV_IS_IN_NVRAM
217 217 #undef CFG_ENV_IS_IN_FLASH
218 218 #endif
219 219  
include/configs/taihu.h
Diff comments   View file @ 9314cee
... ... @@ -221,7 +221,7 @@
221 221 #define CFG_NVRAM_BASE_ADDR 0xf0000000 /* NVRAM base address */
222 222 #define CFG_NVRAM_SIZE 0x1ff8 /* NVRAM size */
223 223  
224   -#ifdef CFG_ENV_IS_IN_NVRAM
  224 +#ifdef CONFIG_ENV_IS_IN_NVRAM
225 225 #define CFG_ENV_SIZE 0x0ff8 /* Size of Environment vars */
226 226 #define CFG_ENV_ADDR \
227 227 (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) /* Env*/
include/configs/v37.h
Diff comments   View file @ 9314cee
... ... @@ -195,7 +195,7 @@
195 195 #define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */
196 196 #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
197 197  
198   -#define CFG_ENV_IS_IN_NVRAM 1
  198 +#define CONFIG_ENV_IS_IN_NVRAM 1
199 199 #define CFG_ENV_ADDR 0x80000000/* Address of Environment */
200 200 #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
201 201  
include/configs/walnut.h
Diff comments   View file @ 9314cee
... ... @@ -139,7 +139,7 @@
139 139 #if 1
140 140 #define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
141 141 #else
142   -#define CFG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
  142 +#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
143 143 #endif
144 144  
145 145 /*-----------------------------------------------------------------------
... ... @@ -176,7 +176,7 @@
176 176 #define CFG_NVRAM_BASE_ADDR 0xf0000000 /* NVRAM base address */
177 177 #define CFG_NVRAM_SIZE 0x1ff8 /* NVRAM size */
178 178  
179   -#ifdef CFG_ENV_IS_IN_NVRAM
  179 +#ifdef CONFIG_ENV_IS_IN_NVRAM
180 180 #define CFG_ENV_SIZE 0x1000 /* Size of Environment vars */
181 181 #define CFG_ENV_ADDR \
182 182 (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE) /* Env */
include/configs/yucca.h
Diff comments   View file @ 9314cee
... ... @@ -139,7 +139,7 @@
139 139 *----------------------------------------------------------------------*/
140 140 /* #define CFG_NVRAM_SIZE (0x2000 - 8) */ /* NVRAM size(8k)- RTC regs */
141 141  
142   -#undef CFG_ENV_IS_IN_NVRAM /* ... not in NVRAM */
  142 +#undef CONFIG_ENV_IS_IN_NVRAM /* ... not in NVRAM */
143 143 #define CFG_ENV_IS_IN_FLASH 1 /* Environment uses flash */
144 144 #undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */
145 145 #define CONFIG_ENV_OVERWRITE 1
... ... @@ -77,7 +77,7 @@
77 77  
78 78 #if ( ((CFG_ENV_ADDR+CFG_ENV_SIZE) < CFG_MONITOR_BASE) || \
79 79 (CFG_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \
80   - defined(CFG_ENV_IS_IN_NVRAM)
  80 + defined(CONFIG_ENV_IS_IN_NVRAM)
81 81 #define TOTAL_MALLOC_LEN (CFG_MALLOC_LEN + CFG_ENV_SIZE)
82 82 #else
83 83 #define TOTAL_MALLOC_LEN CFG_MALLOC_LEN
... ... @@ -35,7 +35,7 @@
35 35  
36 36 #if ( ((CFG_ENV_ADDR+CFG_ENV_SIZE) < CFG_MONITOR_BASE) || \
37 37 (CFG_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \
38   - defined(CFG_ENV_IS_IN_NVRAM)
  38 + defined(CONFIG_ENV_IS_IN_NVRAM)
39 39 #define TOTAL_MALLOC_LEN (CFG_MALLOC_LEN + CFG_ENV_SIZE)
40 40 #else
41 41 #define TOTAL_MALLOC_LEN CFG_MALLOC_LEN
... ... @@ -110,7 +110,7 @@
110 110 #define TOTAL_MALLOC_LEN CFG_MALLOC_LEN
111 111 #elif ( ((CFG_ENV_ADDR+CFG_ENV_SIZE) < CFG_MONITOR_BASE) || \
112 112 (CFG_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \
113   - defined(CFG_ENV_IS_IN_NVRAM)
  113 + defined(CONFIG_ENV_IS_IN_NVRAM)
114 114 #define TOTAL_MALLOC_LEN (CFG_MALLOC_LEN + CFG_ENV_SIZE)
115 115 #else
116 116 #define TOTAL_MALLOC_LEN CFG_MALLOC_LEN