Eric Lee / smarc-uboot

Download as
Browse Code »

Commit bb1f8b4f8bb0bfce52e0faa4637b975b745824b3

Authored by Jean-Christophe PLAGNIOL-VILLARD
1 parent 32628c5008
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_EEPROM in CONFIG_ENV_IS_IN_EEPROM 

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

Showing 94 changed files with 127 additions and 127 deletions Side-by-side Diff

... ... @@ -2199,7 +2199,7 @@
2199 2199 to save the current settings.
2200 2200  
2201 2201  
2202   -- CFG_ENV_IS_IN_EEPROM:
  2202 +- CONFIG_ENV_IS_IN_EEPROM:
2203 2203  
2204 2204 Use this if you have an EEPROM or similar serial access
2205 2205 device and a driver for it.
board/Marvell/common/bootseq.txt
Diff comments   View file @ bb1f8b4
... ... @@ -88,7 +88,7 @@
88 88 nothing
89 89 mem_malloc_init
90 90 malloc_bin_reloc
91   - spi_init (r or f)??? (CFG_ENV_IS_IN_EEPROM)
  91 + spi_init (r or f)??? (CONFIG_ENV_IS_IN_EEPROM)
92 92 env_relocated
93 93 misc_init_r(bd): (board/evb64260/evb64260.c)
94 94 mpsc_init2
board/evb64260/bootseq.txt
Diff comments   View file @ bb1f8b4
... ... @@ -88,7 +88,7 @@
88 88 nothing
89 89 mem_malloc_init
90 90 malloc_bin_reloc
91   - spi_init (r or f)??? (CFG_ENV_IS_IN_EEPROM)
  91 + spi_init (r or f)??? (CONFIG_ENV_IS_IN_EEPROM)
92 92 env_relocated
93 93 misc_init_r(bd): (board/evb64260/evb64260.c)
94 94 mpsc_init2
board/netstal/hcu5/README.txt
Diff comments   View file @ bb1f8b4
... ... @@ -152,7 +152,7 @@
152 152 CFG_EBC_PB0A, CFG_EBC_PB0C from hcu5.h
153 153 mem_malloc_init
154 154 malloc_bin_reloc
155   - spi_init (r or f)??? (CFG_ENV_IS_IN_EEPROM)
  155 + spi_init (r or f)??? (CONFIG_ENV_IS_IN_EEPROM)
156 156 env_relocated
157 157 misc_init_r(bd): (board/netstal/hcu5.c)
158 158 ethaddr mit serial number ergänzen
board/xilinx/ml300/ml300.c
Diff comments   View file @ bb1f8b4
... ... @@ -42,7 +42,7 @@
42 42 #include <common.h>
43 43 #include <asm/processor.h>
44 44  
45   -#ifdef CFG_ENV_IS_IN_EEPROM
  45 +#ifdef CONFIG_ENV_IS_IN_EEPROM
46 46 extern void convert_env(void);
47 47 #endif
48 48  
board/xilinx/xilinx_iic/iic_adapter.c
Diff comments   View file @ bb1f8b4
... ... @@ -42,7 +42,7 @@
42 42 #include <environment.h>
43 43 #include <net.h>
44 44  
45   -#ifdef CFG_ENV_IS_IN_EEPROM
  45 +#ifdef CONFIG_ENV_IS_IN_EEPROM
46 46 #include <i2c.h>
47 47 #include "xiic_l.h"
48 48  
... ... @@ -42,7 +42,7 @@
42 42 #include <command.h>
43 43 #include <i2c.h>
44 44  
45   -#if defined(CFG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM)
  45 +#if defined(CONFIG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM)
46 46  
47 47 extern void eeprom_init (void);
48 48 extern int eeprom_read (unsigned dev_addr, unsigned offset,
... ... @@ -121,7 +121,7 @@
121 121 * 0x00000nxx for EEPROM address selectors and page number at n.
122 122 */
123 123  
124   -#if defined(CFG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM)
  124 +#if defined(CONFIG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM)
125 125  
126 126 #ifndef CONFIG_SPI
127 127 #if !defined(CFG_I2C_EEPROM_ADDR_LEN) || CFG_I2C_EEPROM_ADDR_LEN < 1 || CFG_I2C_EEPROM_ADDR_LEN > 2
... ... @@ -53,7 +53,7 @@
53 53 DECLARE_GLOBAL_DATA_PTR;
54 54  
55 55 #if !defined(CFG_ENV_IS_IN_NVRAM) && \
56   - !defined(CFG_ENV_IS_IN_EEPROM) && \
  56 + !defined(CONFIG_ENV_IS_IN_EEPROM) && \
57 57 !defined(CFG_ENV_IS_IN_FLASH) && \
58 58 !defined(CFG_ENV_IS_IN_DATAFLASH) && \
59 59 !defined(CFG_ENV_IS_IN_NAND) && \
... ... @@ -540,7 +540,7 @@
540 540 return (-1);
541 541 }
542 542  
543   -#if ((defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) \
  543 +#if ((defined(CFG_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(CFG_ENV_IS_IN_EEPROM) \
  599 +#if ((defined(CFG_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))) \
... ... @@ -26,7 +26,7 @@
26 26  
27 27 #include <common.h>
28 28  
29   -#if defined(CFG_ENV_IS_IN_EEPROM) /* Environment is in EEPROM */
  29 +#if defined(CONFIG_ENV_IS_IN_EEPROM) /* Environment is in EEPROM */
30 30  
31 31 #include <command.h>
32 32 #include <environment.h>
... ... @@ -107,5 +107,5 @@
107 107 return (0);
108 108 }
109 109  
110   -#endif /* CFG_ENV_IS_IN_EEPROM */
  110 +#endif /* CONFIG_ENV_IS_IN_EEPROM */
include/configs/APC405.h
Diff comments   View file @ bb1f8b4
... ... @@ -291,7 +291,7 @@
291 291 /*
292 292 * Environment Variable setup
293 293 */
294   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  294 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
295 295 #define CFG_ENV_OFFSET 0x000 /* environment starts at the */
296 296 /* beginning of the EEPROM */
297 297 #define CFG_ENV_SIZE 0x800 /* 2048 bytes may be used for env vars*/
include/configs/ASH405.h
Diff comments   View file @ bb1f8b4
... ... @@ -233,7 +233,7 @@
233 233 /*-----------------------------------------------------------------------
234 234 * Environment Variable setup
235 235 */
236   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  236 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
237 237 #define CFG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */
238 238 #define CFG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/
239 239 /* total size of a CAT24WC16 is 2048 bytes */
include/configs/Alaska8220.h
Diff comments   View file @ bb1f8b4
... ... @@ -133,7 +133,7 @@
133 133 #define CFG_EEPROM_PAGE_WRITE_BITS 3
134 134 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 70
135 135 /*
136   -#define CFG_ENV_IS_IN_EEPROM 1
  136 +#define CONFIG_ENV_IS_IN_EEPROM 1
137 137 #define CFG_ENV_OFFSET 0
138 138 #define CFG_ENV_SIZE 256
139 139 */
140 140  
... ... @@ -226,11 +226,11 @@
226 226  
227 227 #if defined CFG_ENV_IS_IN_FLASH
228 228 #undef CFG_ENV_IS_IN_NVRAM
229   -#undef CFG_ENV_IS_IN_EEPROM
  229 +#undef CONFIG_ENV_IS_IN_EEPROM
230 230 #elif defined CFG_ENV_IS_IN_NVRAM
231 231 #undef CFG_ENV_IS_IN_FLASH
232   -#undef CFG_ENV_IS_IN_EEPROM
233   -#elif defined CFG_ENV_IS_IN_EEPROM
  232 +#undef CONFIG_ENV_IS_IN_EEPROM
  233 +#elif defined CONFIG_ENV_IS_IN_EEPROM
234 234 #undef CFG_ENV_IS_IN_NVRAM
235 235 #undef CFG_ENV_IS_IN_FLASH
236 236 #endif
include/configs/B2.h
Diff comments   View file @ bb1f8b4
... ... @@ -176,7 +176,7 @@
176 176 /*-----------------------------------------------------------------------
177 177 * Environment Variable setup
178 178 */
179   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  179 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
180 180 #define CFG_ENV_OFFSET 0x0 /* environment starts at the beginning of the EEPROM */
181 181  
182 182 /*-----------------------------------------------------------------------
include/configs/CANBT.h
Diff comments   View file @ bb1f8b4
... ... @@ -163,7 +163,7 @@
163 163  
164 164 #else /* Use EEPROM for environment variables */
165 165  
166   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  166 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
167 167 #define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */
168 168 #define CFG_ENV_SIZE 0x400 /* 1024 bytes may be used for env vars */
169 169 /* total size of a CAT24WC08 is 1024 bytes */
include/configs/CCM.h
Diff comments   View file @ bb1f8b4
... ... @@ -227,7 +227,7 @@
227 227 #define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE)
228 228 #else
229 229 /* Final version: environment in EEPROM */
230   -#define CFG_ENV_IS_IN_EEPROM 1
  230 +#define CONFIG_ENV_IS_IN_EEPROM 1
231 231 #define CFG_ENV_OFFSET 2048
232 232 #define CFG_ENV_SIZE 2048
233 233 #endif
include/configs/CMS700.h
Diff comments   View file @ bb1f8b4
... ... @@ -248,7 +248,7 @@
248 248 /*-----------------------------------------------------------------------
249 249 * Environment Variable setup
250 250 */
251   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  251 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
252 252 #define CFG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */
253 253 #define CFG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/
254 254 /* total size of a CAT24WC16 is 2048 bytes */
include/configs/CPCI2DP.h
Diff comments   View file @ bb1f8b4
... ... @@ -200,7 +200,7 @@
200 200  
201 201 #define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
202 202  
203   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  203 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
204 204 #define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */
205 205 #define CFG_ENV_SIZE 0x400 /* 1024 bytes may be used for env vars */
206 206  
include/configs/CPCI405.h
Diff comments   View file @ bb1f8b4
... ... @@ -243,7 +243,7 @@
243 243  
244 244 #else /* Use EEPROM for environment variables */
245 245  
246   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  246 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
247 247 #define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */
248 248 #define CFG_ENV_SIZE 0x400 /* 1024 bytes may be used for env vars */
249 249 /* total size of a CAT24WC08 is 1024 bytes */
include/configs/CPCI4052.h
Diff comments   View file @ bb1f8b4
... ... @@ -258,7 +258,7 @@
258 258  
259 259 #else /* Use EEPROM for environment variables */
260 260  
261   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  261 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
262 262 #define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */
263 263 #define CFG_ENV_SIZE 0x800 /* 2048 bytes may be used for env vars*/
264 264 /* total size of a CAT24WC16 is 2048 bytes */
include/configs/CPCI405AB.h
Diff comments   View file @ bb1f8b4
... ... @@ -263,7 +263,7 @@
263 263  
264 264 /* Use EEPROM for environment variables */
265 265  
266   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  266 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
267 267 #define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */
268 268 #define CFG_ENV_SIZE 0x800 /* 2048 bytes may be used for env vars*/
269 269 /* total size of a CAT24WC32 is 4096 bytes */
include/configs/CPCI405DT.h
Diff comments   View file @ bb1f8b4
... ... @@ -261,7 +261,7 @@
261 261  
262 262 #else /* Use EEPROM for environment variables */
263 263  
264   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  264 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
265 265 #define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */
266 266 #define CFG_ENV_SIZE 0x800 /* 2048 bytes may be used for env vars*/
267 267 /* total size of a CAT24WC16 is 2048 bytes */
include/configs/CPCI750.h
Diff comments   View file @ bb1f8b4
... ... @@ -579,7 +579,7 @@
579 579 /* #define CFG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CFG_ENV_SECT_SIZE) */
580 580 #endif
581 581  
582   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  582 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
583 583 #define CFG_EEPROM_PAGE_WRITE_BITS 5
584 584 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 20
585 585 #define CFG_I2C_EEPROM_ADDR 0x050
include/configs/CPCIISER4.h
Diff comments   View file @ bb1f8b4
... ... @@ -200,7 +200,7 @@
200 200 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* and takes up to 10 msec */
201 201 #define CFG_EEPROM_PAGE_WRITE_ENABLE
202 202  
203   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  203 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
204 204 #define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */
205 205 #define CFG_ENV_SIZE 0x300 /* 768 bytes may be used for env vars */
206 206 /* total size of a CAT24WC08 is 1024 bytes */
include/configs/CPU86.h
Diff comments   View file @ bb1f8b4
... ... @@ -332,7 +332,7 @@
332 332 #endif
333 333 #else
334 334 /* environment is in EEPROM */
335   -#define CFG_ENV_IS_IN_EEPROM 1
  335 +#define CONFIG_ENV_IS_IN_EEPROM 1
336 336 #define CFG_I2C_EEPROM_ADDR 0x58 /* EEPROM X24C16 */
337 337 #define CFG_I2C_EEPROM_ADDR_LEN 1
338 338 /* mask of address bits that overflow into the "EEPROM chip address" */
include/configs/CPU87.h
Diff comments   View file @ bb1f8b4
... ... @@ -347,7 +347,7 @@
347 347 #endif
348 348 #else
349 349 /* environment is in EEPROM */
350   -#define CFG_ENV_IS_IN_EEPROM 1
  350 +#define CONFIG_ENV_IS_IN_EEPROM 1
351 351 #define CFG_I2C_EEPROM_ADDR 0x58 /* EEPROM X24C16 */
352 352 #define CFG_I2C_EEPROM_ADDR_LEN 1
353 353 /* mask of address bits that overflow into the "EEPROM chip address" */
include/configs/DP405.h
Diff comments   View file @ bb1f8b4
... ... @@ -216,7 +216,7 @@
216 216 /*-----------------------------------------------------------------------
217 217 * Environment Variable setup
218 218 */
219   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  219 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
220 220 #define CFG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */
221 221 #define CFG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/
222 222 /* total size of a CAT24WC16 is 2048 bytes */
include/configs/DU405.h
Diff comments   View file @ bb1f8b4
... ... @@ -227,7 +227,7 @@
227 227 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* and takes up to 10 msec */
228 228 #define CFG_EEPROM_PAGE_WRITE_ENABLE
229 229  
230   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  230 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
231 231 #define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */
232 232 #define CFG_ENV_SIZE 0x400 /* 1024 bytes may be used for env vars */
233 233 /* total size of a CAT24WC08 is 1024 bytes */
include/configs/DU440.h
Diff comments   View file @ bb1f8b4
... ... @@ -113,7 +113,7 @@
113 113 /*
114 114 * Environment
115 115 */
116   -#define CFG_ENV_IS_IN_EEPROM 1 /* use FLASH for environment vars */
  116 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use FLASH for environment vars */
117 117  
118 118 /*
119 119 * FLASH related
... ... @@ -146,7 +146,7 @@
146 146 #define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE)
147 147 #endif
148 148  
149   -#ifdef CFG_ENV_IS_IN_EEPROM
  149 +#ifdef CONFIG_ENV_IS_IN_EEPROM
150 150 #define CFG_ENV_OFFSET 0 /* environment starts at */
151 151 /* the beginning of the EEPROM */
152 152 #define CFG_ENV_SIZE 0x1000 /* 4096 bytes may be used for env vars */
include/configs/ELPT860.h
Diff comments   View file @ bb1f8b4
... ... @@ -138,7 +138,7 @@
138 138 #define CONFIG_ENV_OVERWRITE 1 /* Allow Overwrite of serial# & ethaddr */
139 139  
140 140 #undef CFG_ENV_IS_IN_NVRAM /* Environment is in NVRAM */
141   -#undef CFG_ENV_IS_IN_EEPROM /* Environment is in I2C EEPROM */
  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  
144 144 #define CONFIG_BAUDRATE 9600 /* console baudrate = 9600 bps */
include/configs/ERIC.h
Diff comments   View file @ bb1f8b4
... ... @@ -48,7 +48,7 @@
48 48 #define CFG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
49 49 #endif
50 50 #if 0
51   -#define CFG_ENV_IS_IN_EEPROM 1 /* use I2C RTC X1240 for environment vars */
  51 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use I2C RTC X1240 for environment vars */
52 52 #define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */
53 53 #define CFG_ENV_SIZE 0x800 /* 2048 bytes may be used for env vars */
54 54 #endif /* total size of a X1240 is 2048 bytes */
55 55  
56 56  
... ... @@ -64,13 +64,13 @@
64 64  
65 65 #ifdef CFG_ENV_IS_IN_FLASH
66 66 #undef CFG_ENV_IS_IN_NVRAM
67   -#undef CFG_ENV_IS_IN_EEPROM
  67 +#undef CONFIG_ENV_IS_IN_EEPROM
68 68 #else
69 69 #ifdef CFG_ENV_IS_IN_NVRAM
70 70 #undef CFG_ENV_IS_IN_FLASH
71   -#undef CFG_ENV_IS_IN_EEPROM
  71 +#undef CONFIG_ENV_IS_IN_EEPROM
72 72 #else
73   -#ifdef CFG_ENV_IS_IN_EEPROM
  73 +#ifdef CONFIG_ENV_IS_IN_EEPROM
74 74 #undef CFG_ENV_IS_IN_NVRAM
75 75 #undef CFG_ENV_IS_IN_FLASH
76 76 #endif
include/configs/EXBITGEN.h
Diff comments   View file @ bb1f8b4
... ... @@ -47,11 +47,11 @@
47 47 #define CFG_I2C_SLAVE 0x7F /* I2C slave address */
48 48  
49 49 /* environment is in EEPROM */
50   -#define CFG_ENV_IS_IN_EEPROM 1
  50 +#define CONFIG_ENV_IS_IN_EEPROM 1
51 51 #undef CFG_ENV_IS_IN_FLASH
52 52 #undef CFG_ENV_IS_IN_NVRAM
53 53  
54   -#ifdef CFG_ENV_IS_IN_EEPROM
  54 +#ifdef CONFIG_ENV_IS_IN_EEPROM
55 55 #define CFG_I2C_EEPROM_ADDR 0x56 /* 1010110 */
56 56 #define CFG_I2C_EEPROM_ADDR_LEN 1 /* 8-bit internal addressing */
57 57 #define CFG_I2C_EEPROM_ADDR_OVERFLOW 1 /* ... and 1 bit in I2C address */
include/configs/G2000.h
Diff comments   View file @ bb1f8b4
... ... @@ -299,7 +299,7 @@
299 299 * Environment Variable setup
300 300 */
301 301 #if 1 /* test-only */
302   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  302 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
303 303 #define CFG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */
304 304 #define CFG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/
305 305 /* total size of a CAT24WC16 is 2048 bytes */
include/configs/GEN860T.h
Diff comments   View file @ bb1f8b4
... ... @@ -435,9 +435,9 @@
435 435 * be edited if this is changed!
436 436 */
437 437 #undef CFG_ENV_IS_IN_FLASH
438   -#define CFG_ENV_IS_IN_EEPROM
  438 +#define CONFIG_ENV_IS_IN_EEPROM
439 439  
440   -#if defined(CFG_ENV_IS_IN_EEPROM)
  440 +#if defined(CONFIG_ENV_IS_IN_EEPROM)
441 441 #define CFG_ENV_SIZE (2 * 1024)
442 442 #define CFG_ENV_OFFSET (CFG_ENV_EEPROM_SIZE - (8 * 1024))
443 443 #else
include/configs/GTH.h
Diff comments   View file @ bb1f8b4
... ... @@ -195,7 +195,7 @@
195 195 #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
196 196  
197 197 #define CFG_ENV_IS_IN_FLASH 1
198   -#undef CFG_ENV_IS_IN_EEPROM
  198 +#undef CONFIG_ENV_IS_IN_EEPROM
199 199 #define CFG_ENV_OFFSET 0x000E0000
200 200 #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
201 201  
include/configs/HH405.h
Diff comments   View file @ bb1f8b4
... ... @@ -320,7 +320,7 @@
320 320 /*-----------------------------------------------------------------------
321 321 * Environment Variable setup
322 322 */
323   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  323 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
324 324 #define CFG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */
325 325 #define CFG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/
326 326 /* total size of a CAT24WC16 is 2048 bytes */
include/configs/HUB405.h
Diff comments   View file @ bb1f8b4
... ... @@ -232,7 +232,7 @@
232 232 /*-----------------------------------------------------------------------
233 233 * Environment Variable setup
234 234 */
235   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  235 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
236 236 #define CFG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */
237 237 #define CFG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/
238 238 /* total size of a CAT24WC16 is 2048 bytes */
include/configs/IP860.h
Diff comments   View file @ bb1f8b4
... ... @@ -190,17 +190,17 @@
190 190 #undef CFG_ENV_IS_IN_NVRAM
191 191 #undef CFG_ENV_IS_IN_NVRAM
192 192 #undef DEBUG_I2C
193   -#define CFG_ENV_IS_IN_EEPROM
  193 +#define CONFIG_ENV_IS_IN_EEPROM
194 194  
195 195 #ifdef CFG_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 198 #endif /* CFG_ENV_IS_IN_NVRAM */
199 199  
200   -#ifdef CFG_ENV_IS_IN_EEPROM
  200 +#ifdef CONFIG_ENV_IS_IN_EEPROM
201 201 #define CFG_ENV_OFFSET 512 /* Leave 512 bytes free for other data */
202 202 #define CFG_ENV_SIZE 1536 /* Use remaining space */
203   -#endif /* CFG_ENV_IS_IN_EEPROM */
  203 +#endif /* CONFIG_ENV_IS_IN_EEPROM */
204 204  
205 205 /*-----------------------------------------------------------------------
206 206 * Cache Configuration
include/configs/JSE.h
Diff comments   View file @ bb1f8b4
... ... @@ -79,7 +79,7 @@
79 79 /* JSE has EEPROM chips that are good for environment. */
80 80 #undef CFG_ENV_IS_IN_NVRAM
81 81 #undef CFG_ENV_IS_IN_FLASH
82   -#define CFG_ENV_IS_IN_EEPROM 1
  82 +#define CONFIG_ENV_IS_IN_EEPROM 1
83 83 #undef CFG_ENV_IS_NOWHERE
84 84  
85 85 /* This is the 7bit address of the device, not including P. */
include/configs/KAREF.h
Diff comments   View file @ bb1f8b4
... ... @@ -143,7 +143,7 @@
143 143 *----------------------------------------------------------------------*/
144 144 #define CFG_ENV_IS_IN_NVRAM 1 /* Environment uses NVRAM */
145 145 #undef CFG_ENV_IS_IN_FLASH /* ... not in flash */
146   -#undef CFG_ENV_IS_IN_EEPROM /* ... not in EEPROM */
  146 +#undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */
147 147 #define CONFIG_ENV_OVERWRITE 1 /* allow env overwrite */
148 148  
149 149 #define CFG_ENV_SIZE 0x1000 /* Size of Env vars */
include/configs/METROBOX.h
Diff comments   View file @ bb1f8b4
... ... @@ -205,7 +205,7 @@
205 205 *----------------------------------------------------------------------*/
206 206 #define CFG_ENV_IS_IN_NVRAM 1 /* Environment uses NVRAM */
207 207 #undef CFG_ENV_IS_IN_FLASH /* ... not in flash */
208   -#undef CFG_ENV_IS_IN_EEPROM /* ... not in EEPROM */
  208 +#undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */
209 209 #define CONFIG_ENV_OVERWRITE 1 /* allow env overwrite */
210 210  
211 211 #define CFG_ENV_SIZE 0x1000 /* Size of Env vars */
include/configs/MIP405.h
Diff comments   View file @ bb1f8b4
... ... @@ -114,7 +114,7 @@
114 114 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* and takes up to 10 msec */
115 115  
116 116  
117   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  117 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
118 118 #define CFG_ENV_OFFSET 0x00000 /* environment starts at the beginning of the EEPROM */
119 119 #define CFG_ENV_SIZE 0x00800 /* 2k bytes may be used for env vars */
120 120  
include/configs/OCRTC.h
Diff comments   View file @ bb1f8b4
... ... @@ -199,7 +199,7 @@
199 199  
200 200 #else /* Use EEPROM for environment variables */
201 201  
202   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  202 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
203 203 #define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */
204 204 #define CFG_ENV_SIZE 0x300 /* 768 bytes may be used for env vars */
205 205 /* total size of a CAT24WC08 is 1024 bytes */
include/configs/ORSG.h
Diff comments   View file @ bb1f8b4
... ... @@ -197,7 +197,7 @@
197 197  
198 198 #else /* Use EEPROM for environment variables */
199 199  
200   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  200 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
201 201 #define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */
202 202 #define CFG_ENV_SIZE 0x300 /* 768 bytes may be used for env vars */
203 203 /* total size of a CAT24WC08 is 1024 bytes */
include/configs/PATI.h
Diff comments   View file @ bb1f8b4
... ... @@ -172,8 +172,8 @@
172 172 #define CFG_FLASH_WRITE_TOUT 600 /* Timeout for Flash Write (in ms) */
173 173  
174 174  
175   -#define CFG_ENV_IS_IN_EEPROM
176   -#ifdef CFG_ENV_IS_IN_EEPROM
  175 +#define CONFIG_ENV_IS_IN_EEPROM
  176 +#ifdef CONFIG_ENV_IS_IN_EEPROM
177 177 #define CFG_ENV_OFFSET 0
178 178 #define CFG_ENV_SIZE 2048
179 179 #endif
include/configs/PCI405.h
Diff comments   View file @ bb1f8b4
... ... @@ -225,7 +225,7 @@
225 225  
226 226 #else /* Use EEPROM for environment variables */
227 227  
228   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  228 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
229 229 #define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */
230 230 #define CFG_ENV_SIZE 0x400 /* 1024 bytes may be used for env vars*/
231 231 /* total size of a CAT24WC08 is 1024 bytes */
include/configs/PIP405.h
Diff comments   View file @ bb1f8b4
... ... @@ -95,7 +95,7 @@
95 95  
96 96 #define CFG_I2C_EEPROM_ADDR 0x53
97 97 #define CFG_I2C_EEPROM_ADDR_LEN 2
98   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  98 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
99 99 #define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */
100 100 #define CFG_ENV_SIZE 0x800 /* 2 kBytes may be used for env vars */
101 101  
include/configs/PLU405.h
Diff comments   View file @ bb1f8b4
... ... @@ -273,7 +273,7 @@
273 273 /*
274 274 * Environment Variable setup
275 275 */
276   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  276 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
277 277 #define CFG_ENV_OFFSET 0x100 /* reseve 0x100 bytes for strapping */
278 278 #define CFG_ENV_SIZE 0x700
279 279  
include/configs/PM826.h
Diff comments   View file @ bb1f8b4
... ... @@ -263,7 +263,7 @@
263 263 #define CFG_ENV_SECT_SIZE 0x40000
264 264 #else
265 265 /* Final version: environment in EEPROM */
266   -#define CFG_ENV_IS_IN_EEPROM 1
  266 +#define CONFIG_ENV_IS_IN_EEPROM 1
267 267 #define CFG_I2C_EEPROM_ADDR 0x58
268 268 #define CFG_I2C_EEPROM_ADDR_LEN 1
269 269 #define CFG_EEPROM_PAGE_WRITE_BITS 4
include/configs/PM828.h
Diff comments   View file @ bb1f8b4
... ... @@ -256,7 +256,7 @@
256 256 #define CFG_ENV_SECT_SIZE 0x40000
257 257 #else
258 258 /* Final version: environment in EEPROM */
259   -#define CFG_ENV_IS_IN_EEPROM 1
  259 +#define CONFIG_ENV_IS_IN_EEPROM 1
260 260 #define CFG_I2C_EEPROM_ADDR 0x58
261 261 #define CFG_I2C_EEPROM_ADDR_LEN 1
262 262 #define CFG_EEPROM_PAGE_WRITE_BITS 4
include/configs/PMC405.h
Diff comments   View file @ bb1f8b4
... ... @@ -244,7 +244,7 @@
244 244 /*-----------------------------------------------------------------------
245 245 * Environment Variable setup
246 246 */
247   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  247 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
248 248 #define CFG_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */
249 249 #define CFG_ENV_SIZE 0x800 /* 2048 bytes may be used for env vars*/
250 250 /* total size of a CAT24WC16 is 2048 bytes */
include/configs/PMC440.h
Diff comments   View file @ bb1f8b4
... ... @@ -105,7 +105,7 @@
105 105 * Environment
106 106 *----------------------------------------------------------------------*/
107 107 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
108   -#define CFG_ENV_IS_IN_EEPROM 1 /* use FLASH for environment vars */
  108 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use FLASH for environment vars */
109 109 #else
110 110 #define CFG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
111 111 #define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
... ... @@ -146,7 +146,7 @@
146 146 #define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE)
147 147 #endif
148 148  
149   -#ifdef CFG_ENV_IS_IN_EEPROM
  149 +#ifdef CONFIG_ENV_IS_IN_EEPROM
150 150 #define CFG_ENV_OFFSET 0 /* environment starts at the beginning of the EEPROM */
151 151 #define CFG_ENV_SIZE 0x1000 /* 4096 bytes may be used for env vars */
152 152 #endif
include/configs/PPChameleonEVB.h
Diff comments   View file @ bb1f8b4
... ... @@ -417,7 +417,7 @@
417 417 */
418 418 #ifdef ENVIRONMENT_IN_EEPROM
419 419  
420   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  420 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
421 421 #define CFG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */
422 422 #define CFG_ENV_SIZE 0x700 /* 2048-256 bytes may be used for env vars (total size of a CAT24WC16 is 2048 bytes)*/
423 423  
include/configs/SCM.h
Diff comments   View file @ bb1f8b4
... ... @@ -276,7 +276,7 @@
276 276 #define CFG_ENV_SECT_SIZE 0x40000
277 277 #else
278 278 /* Final version: environment in EEPROM */
279   -#define CFG_ENV_IS_IN_EEPROM 1
  279 +#define CONFIG_ENV_IS_IN_EEPROM 1
280 280 #define CFG_ENV_OFFSET 0
281 281 #define CFG_ENV_SIZE 2048
282 282 #endif
include/configs/SXNI855T.h
Diff comments   View file @ bb1f8b4
... ... @@ -458,7 +458,7 @@
458 458 #define CFG_ENV_SIZE 0x00002000
459 459 #else
460 460 /* environment is in EEPROM */
461   - #define CFG_ENV_IS_IN_EEPROM 1
  461 + #define CONFIG_ENV_IS_IN_EEPROM 1
462 462 #define CFG_ENV_OFFSET 0 /* at beginning of EEPROM */
463 463 #define CFG_ENV_SIZE 1024 /* Use only a part of it*/
464 464 #endif
include/configs/TOP5200.h
Diff comments   View file @ bb1f8b4
... ... @@ -271,7 +271,7 @@
271 271 /*
272 272 * Environment settings
273 273 */
274   -#define CFG_ENV_IS_IN_EEPROM 1 /* turn on EEPROM env feature */
  274 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* turn on EEPROM env feature */
275 275 #define CFG_ENV_OFFSET 0x1000
276 276 #define CFG_ENV_SIZE 0x0700
277 277  
include/configs/TOP860.h
Diff comments   View file @ bb1f8b4
... ... @@ -160,7 +160,7 @@
160 160 * only the first 6k in EEPROM are available for user. Of that we use 256b
161 161 */
162 162 #define CONFIG_SOFT_I2C
163   -#define CFG_ENV_IS_IN_EEPROM 1 /* turn on EEPROM env feature */
  163 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* turn on EEPROM env feature */
164 164 #define CFG_ENV_OFFSET 0x1000
165 165 #define CFG_ENV_SIZE 0x0700
166 166 #define CFG_I2C_EEPROM_ADDR 0x57
include/configs/TQM8260.h
Diff comments   View file @ bb1f8b4
... ... @@ -312,7 +312,7 @@
312 312 #define CFG_ENV_SECT_SIZE 0x40000
313 313 #else
314 314 /* Final version: environment in EEPROM */
315   -#define CFG_ENV_IS_IN_EEPROM 1
  315 +#define CONFIG_ENV_IS_IN_EEPROM 1
316 316 #define CFG_ENV_OFFSET 0
317 317 #define CFG_ENV_SIZE 2048
318 318 #endif
include/configs/VCMA9.h
Diff comments   View file @ bb1f8b4
... ... @@ -89,7 +89,7 @@
89 89  
90 90 #define CFG_I2C_EEPROM_ADDR 0x50
91 91 #define CFG_I2C_EEPROM_ADDR_LEN 2
92   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  92 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
93 93 #define CFG_ENV_OFFSET 0x000 /* environment starts at offset 0 */
94 94 #define CFG_ENV_SIZE 0x800 /* 2KB should be more than enough */
95 95  
include/configs/VOH405.h
Diff comments   View file @ bb1f8b4
... ... @@ -266,7 +266,7 @@
266 266 /*-----------------------------------------------------------------------
267 267 * Environment Variable setup
268 268 */
269   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  269 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
270 270 #define CFG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */
271 271 #define CFG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/
272 272 /* total size of a CAT24WC16 is 2048 bytes */
include/configs/VOM405.h
Diff comments   View file @ bb1f8b4
... ... @@ -191,7 +191,7 @@
191 191 /*
192 192 * Environment Variable setup
193 193 */
194   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  194 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
195 195 #define CFG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */
196 196 #define CFG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/
197 197 /* total size of a CAT24WC16 is 2048 bytes */
include/configs/WUH405.h
Diff comments   View file @ bb1f8b4
... ... @@ -229,7 +229,7 @@
229 229 /*-----------------------------------------------------------------------
230 230 * Environment Variable setup
231 231 */
232   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  232 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
233 233 #define CFG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */
234 234 #define CFG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/
235 235 /* total size of a CAT24WC16 is 2048 bytes */
include/configs/XPEDITE1K.h
Diff comments   View file @ bb1f8b4
... ... @@ -151,7 +151,7 @@
151 151 /*-----------------------------------------------------------------------
152 152 * Environment
153 153 *----------------------------------------------------------------------*/
154   -#define CFG_ENV_IS_IN_EEPROM 1
  154 +#define CONFIG_ENV_IS_IN_EEPROM 1
155 155 #define CFG_ENV_SIZE 0x100 /* Size of Environment vars */
156 156 #define CFG_ENV_OFFSET 0x100
157 157 #define CFG_I2C_EEPROM_ADDR 0x50 /* this is actually the second page of the eeprom */
include/configs/Yukon8220.h
Diff comments   View file @ bb1f8b4
... ... @@ -133,7 +133,7 @@
133 133 #define CFG_EEPROM_PAGE_WRITE_BITS 3
134 134 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 70
135 135 /*
136   -#define CFG_ENV_IS_IN_EEPROM 1
  136 +#define CONFIG_ENV_IS_IN_EEPROM 1
137 137 #define CFG_ENV_OFFSET 0
138 138 #define CFG_ENV_SIZE 256
139 139 */
140 140  
... ... @@ -226,11 +226,11 @@
226 226  
227 227 #if defined CFG_ENV_IS_IN_FLASH
228 228 #undef CFG_ENV_IS_IN_NVRAM
229   -#undef CFG_ENV_IS_IN_EEPROM
  229 +#undef CONFIG_ENV_IS_IN_EEPROM
230 230 #elif defined CFG_ENV_IS_IN_NVRAM
231 231 #undef CFG_ENV_IS_IN_FLASH
232   -#undef CFG_ENV_IS_IN_EEPROM
233   -#elif defined CFG_ENV_IS_IN_EEPROM
  232 +#undef CONFIG_ENV_IS_IN_EEPROM
  233 +#elif defined CONFIG_ENV_IS_IN_EEPROM
234 234 #undef CFG_ENV_IS_IN_NVRAM
235 235 #undef CFG_ENV_IS_IN_FLASH
236 236 #endif
include/configs/atc.h
Diff comments   View file @ bb1f8b4
... ... @@ -275,7 +275,7 @@
275 275 # define CFG_ENV_SIZE 0x10000
276 276 # define CFG_ENV_SECT_SIZE 0x10000
277 277 #else
278   -#define CFG_ENV_IS_IN_EEPROM 1
  278 +#define CONFIG_ENV_IS_IN_EEPROM 1
279 279 #define CFG_ENV_OFFSET 0
280 280 #define CFG_ENV_SIZE 2048
281 281 #define CFG_EEPROM_PAGE_WRITE_BITS 4 /* 16-byte page size */
include/configs/bamboo.h
Diff comments   View file @ bb1f8b4
... ... @@ -233,10 +233,10 @@
233 233 #define CFG_EEPROM_PAGE_WRITE_BITS 3
234 234 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
235 235  
236   -#ifdef CFG_ENV_IS_IN_EEPROM
  236 +#ifdef CONFIG_ENV_IS_IN_EEPROM
237 237 #define CFG_ENV_SIZE 0x200 /* Size of Environment vars */
238 238 #define CFG_ENV_OFFSET 0x0
239   -#endif /* CFG_ENV_IS_IN_EEPROM */
  239 +#endif /* CONFIG_ENV_IS_IN_EEPROM */
240 240  
241 241 /*
242 242 * Default environment variables
include/configs/bf533-stamp.h
Diff comments   View file @ bb1f8b4
... ... @@ -102,7 +102,7 @@
102 102 #define CFG_MAX_FLASH_SECT 67 /* max number of sectors on one chip */
103 103  
104 104 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
105   -#define CFG_ENV_IS_IN_EEPROM 1
  105 +#define CONFIG_ENV_IS_IN_EEPROM 1
106 106 #define CFG_ENV_OFFSET 0x4000
107 107 #define CFG_ENV_HEADER (CFG_ENV_OFFSET + 0x12A) /* 0x12A is the length of LDR file header */
108 108 #else
include/configs/bf537-stamp.h
Diff comments   View file @ bb1f8b4
... ... @@ -235,7 +235,7 @@
235 235 #define CONFIG_STACKBASE (CFG_GBL_DATA_ADDR - 4)
236 236  
237 237 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
238   -#define CFG_ENV_IS_IN_EEPROM 1
  238 +#define CONFIG_ENV_IS_IN_EEPROM 1
239 239 #define CFG_ENV_OFFSET 0x4000
240 240 #define CFG_ENV_HEADER (CFG_ENV_OFFSET + 0x16e) /* 0x12A is the length of LDR file header */
241 241 #else
include/configs/cpci5200.h
Diff comments   View file @ bb1f8b4
... ... @@ -224,7 +224,7 @@
224 224 #define CFG_ENV_SECT_SIZE 0x20000
225 225 #define CONFIG_ENV_OVERWRITE 1
226 226 #else
227   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  227 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
228 228 #define CFG_ENV_OFFSET 0x0000 /* environment starts at the beginning of the EEPROM */
229 229 #define CFG_ENV_SIZE 0x0400 /* 8192 bytes may be used for env vars */
230 230 /* total size of a CAT24WC32 is 8192 bytes */
include/configs/csb272.h
Diff comments   View file @ bb1f8b4
... ... @@ -232,7 +232,7 @@
232 232 */
233 233 #define CFG_ENV_IS_IN_FLASH 1 /* environment is in FLASH */
234 234 #undef CFG_ENV_IS_IN_NVRAM
235   -#undef CFG_ENV_IS_IN_EEPROM
  235 +#undef CONFIG_ENV_IS_IN_EEPROM
236 236  
237 237 /*
238 238 * General Memory organization
include/configs/csb472.h
Diff comments   View file @ bb1f8b4
... ... @@ -231,7 +231,7 @@
231 231 */
232 232 #define CFG_ENV_IS_IN_FLASH 1 /* environment is in FLASH */
233 233 #undef CFG_ENV_IS_IN_NVRAM
234   -#undef CFG_ENV_IS_IN_EEPROM
  234 +#undef CONFIG_ENV_IS_IN_EEPROM
235 235  
236 236 /*
237 237 * General Memory organization
include/configs/ep82xxm.h
Diff comments   View file @ bb1f8b4
... ... @@ -194,7 +194,7 @@
194 194 #if 1
195 195 #define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
196 196 #else
197   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  197 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
198 198 #endif
199 199  
200 200 /*-----------------------------------------------------------------------
201 201  
... ... @@ -223,10 +223,10 @@
223 223 #define CFG_EEPROM_PAGE_WRITE_ENABLE
224 224 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
225 225  
226   -#ifdef CFG_ENV_IS_IN_EEPROM
  226 +#ifdef CONFIG_ENV_IS_IN_EEPROM
227 227 #define CFG_ENV_SIZE 0x200 /* Size of Environment vars */
228 228 #define CFG_ENV_OFFSET 0x0
229   -#endif /* CFG_ENV_IS_IN_EEPROM */
  229 +#endif /* CONFIG_ENV_IS_IN_EEPROM */
230 230  
231 231 /* RTC Configuration */
232 232 #define CONFIG_RTC_M41T11 1 /* uses a M41T81 */
include/configs/hcu4.h
Diff comments   View file @ bb1f8b4
... ... @@ -125,7 +125,7 @@
125 125 #define CFG_ENV_IS_IN_FLASH
126 126 #undef CFG_ENV_IS_NOWHERE
127 127  
128   -#ifdef CFG_ENV_IS_IN_EEPROM
  128 +#ifdef CONFIG_ENV_IS_IN_EEPROM
129 129 /* Put the environment after the SDRAM configuration */
130 130 #define PROM_SIZE 2048
131 131 #define CFG_ENV_OFFSET 512
include/configs/hcu5.h
Diff comments   View file @ bb1f8b4
... ... @@ -108,10 +108,10 @@
108 108  
109 109 #undef CFG_ENV_IS_IN_NVRAM
110 110 #define CFG_ENV_IS_IN_FLASH
111   -#undef CFG_ENV_IS_IN_EEPROM
  111 +#undef CONFIG_ENV_IS_IN_EEPROM
112 112 #undef CFG_ENV_IS_NOWHERE
113 113  
114   -#ifdef CFG_ENV_IS_IN_EEPROM
  114 +#ifdef CONFIG_ENV_IS_IN_EEPROM
115 115 /* Put the environment after the SDRAM and bootstrap configuration */
116 116 #define PROM_SIZE 2048
117 117 #define CFG_BOOSTRAP_OPTION_OFFSET 512
include/configs/imx31_phycore.h
Diff comments   View file @ bb1f8b4
... ... @@ -152,7 +152,7 @@
152 152 #define CFG_MAX_FLASH_SECT 259 /* max number of sectors on one chip */
153 153 #define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at beginning of flash */
154 154  
155   -#define CFG_ENV_IS_IN_EEPROM 1
  155 +#define CONFIG_ENV_IS_IN_EEPROM 1
156 156 #define CFG_ENV_OFFSET 0x00 /* environment starts here */
157 157 #define CFG_ENV_SIZE 4096
158 158 #define CFG_I2C_EEPROM_ADDR 0x52
include/configs/innokom.h
Diff comments   View file @ bb1f8b4
... ... @@ -140,7 +140,7 @@
140 140 #define CFG_I2C_SPEED 50000
141 141 #define CFG_I2C_SLAVE 0xfe
142 142  
143   -#define CFG_ENV_IS_IN_EEPROM 1
  143 +#define CONFIG_ENV_IS_IN_EEPROM 1
144 144  
145 145 #define CFG_ENV_OFFSET 0x00 /* environment starts here */
146 146 #define CFG_ENV_SIZE 1024 /* 1 KiB */
include/configs/kb9202.h
Diff comments   View file @ bb1f8b4
... ... @@ -128,7 +128,7 @@
128 128  
129 129 #define CONFIG_HARD_I2C
130 130  
131   -#define CFG_ENV_IS_IN_EEPROM
  131 +#define CONFIG_ENV_IS_IN_EEPROM
132 132  
133 133 #ifdef CONFIG_KB9202
134 134 #define CFG_ENV_OFFSET 0x3E00
include/configs/m501sk.h
Diff comments   View file @ bb1f8b4
... ... @@ -65,7 +65,7 @@
65 65 #define CFG_I2C_SPEED 100
66 66 #define CFG_I2C_SLAVE 0
67 67 #define CFG_CONSOLE_INFO_QUIET
68   -#undef CFG_ENV_IS_IN_EEPROM
  68 +#undef CONFIG_ENV_IS_IN_EEPROM
69 69 #define CFG_I2C_EEPROM_ADDR 0x50
70 70 #define CFG_I2C_EEPROM_ADDR_LEN 1
71 71 #define CFG_EEPROM_AT24C16
... ... @@ -164,7 +164,7 @@
164 164 #define CFG_ENV_SIZE 2048
165 165 #endif
166 166  
167   -#ifdef CFG_ENV_IS_IN_EEPROM
  167 +#ifdef CONFIG_ENV_IS_IN_EEPROM
168 168 #define CFG_ENV_OFFSET 1024
169 169 #define CFG_ENV_SIZE 1024
170 170 #endif
include/configs/mcu25.h
Diff comments   View file @ bb1f8b4
... ... @@ -125,7 +125,7 @@
125 125 #define CFG_ENV_IS_IN_FLASH
126 126 #undef CFG_ENV_IS_NOWHERE
127 127  
128   -#ifdef CFG_ENV_IS_IN_EEPROM
  128 +#ifdef CONFIG_ENV_IS_IN_EEPROM
129 129 /* Put the environment after the SDRAM configuration */
130 130 #define PROM_SIZE 2048
131 131 #define CFG_ENV_OFFSET 512
include/configs/mecp5200.h
Diff comments   View file @ bb1f8b4
... ... @@ -196,7 +196,7 @@
196 196 #define CFG_ENV_SECT_SIZE 0x10000
197 197 #define CONFIG_ENV_OVERWRITE 1
198 198 #else
199   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  199 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
200 200 #define CFG_ENV_OFFSET 0x0000 /* environment starts at the beginning of the EEPROM */
201 201 #define CFG_ENV_SIZE 0x0400 /* 8192 bytes may be used for env vars*/
202 202 /* total size of a CAT24WC32 is 8192 bytes */
include/configs/ml300.h
Diff comments   View file @ bb1f8b4
... ... @@ -62,10 +62,10 @@
62 62 #define CFG_SYSTEMACE_BASE XPAR_OPB_SYSACE_0_BASEADDR
63 63 #define CFG_SYSTEMACE_WIDTH XPAR_XSYSACE_MEM_WIDTH
64 64  
65   -#define CFG_ENV_IS_IN_EEPROM 1 /* environment is in EEPROM */
  65 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* environment is in EEPROM */
66 66  
67 67 /* following are used only if env is in EEPROM */
68   -#ifdef CFG_ENV_IS_IN_EEPROM
  68 +#ifdef CONFIG_ENV_IS_IN_EEPROM
69 69 #define CFG_I2C_EEPROM_ADDR XPAR_PERSISTENT_0_IIC_0_EEPROMADDR
70 70 #define CFG_I2C_EEPROM_ADDR_LEN 1
71 71 #define CFG_ENV_OFFSET XPAR_PERSISTENT_0_IIC_0_BASEADDR
include/configs/pcu_e.h
Diff comments   View file @ bb1f8b4
... ... @@ -234,7 +234,7 @@
234 234 #define CFG_ENV_IS_EMBEDDED 1 /* short-cut compile-time test */
235 235 #else
236 236 /* Final version: environment in EEPROM */
237   -#define CFG_ENV_IS_IN_EEPROM 1
  237 +#define CONFIG_ENV_IS_IN_EEPROM 1
238 238 #define CFG_I2C_EEPROM_ADDR 0
239 239 #define CFG_I2C_EEPROM_ADDR_LEN 2
240 240 #define CFG_ENV_OFFSET 1024
include/configs/pf5200.h
Diff comments   View file @ bb1f8b4
... ... @@ -210,7 +210,7 @@
210 210 #define CFG_ENV_SECT_SIZE 0x10000
211 211 #define CONFIG_ENV_OVERWRITE 1
212 212 #else
213   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  213 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
214 214 #define CFG_ENV_OFFSET 0x0000 /* environment starts at the beginning of the EEPROM */
215 215 #define CFG_ENV_SIZE 0x0400 /* 8192 bytes may be used for env vars */
216 216 /* total size of a CAT24WC32 is 8192 bytes */
include/configs/quad100hd.h
Diff comments   View file @ bb1f8b4
... ... @@ -42,7 +42,7 @@
42 42 #define PLLMR1_DEFAULT PLLMR1_266_133_66 /* no PCI */
43 43  
44 44 /* the environment is in the EEPROM by default */
45   -#define CFG_ENV_IS_IN_EEPROM
  45 +#define CONFIG_ENV_IS_IN_EEPROM
46 46 #undef CFG_ENV_IS_IN_FLASH
47 47  
48 48 #define CONFIG_NET_MULTI 1
... ... @@ -208,7 +208,7 @@
208 208 #define CFG_ENV_SIZE_REDUND (CFG_ENV_SECT_SIZE)
209 209 #endif
210 210  
211   -#ifdef CFG_ENV_IS_IN_EEPROM
  211 +#ifdef CONFIG_ENV_IS_IN_EEPROM
212 212 #define CFG_ENV_SIZE 0x400 /* Size of Environment vars */
213 213 #define CFG_ENV_OFFSET 0x00000000
214 214 #define CFG_ENABLE_CRC_16 1 /* Intrinsyc formatting used crc16 */
include/configs/redwood.h
Diff comments   View file @ bb1f8b4
... ... @@ -121,7 +121,7 @@
121 121 *----------------------------------------------------------------------*/
122 122 #undef CFG_ENV_IS_IN_NVRAM /* ... not in NVRAM */
123 123 #define CFG_ENV_IS_IN_FLASH 1 /* Environment uses flash */
124   -#undef CFG_ENV_IS_IN_EEPROM /* ... not in EEPROM */
  124 +#undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */
125 125  
126 126 #define CONFIG_PREBOOT "echo;" \
127 127 "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
include/configs/sc520_cdp.h
Diff comments   View file @ bb1f8b4
... ... @@ -144,7 +144,7 @@
144 144 #define CONFIG_ENV_OVERWRITE
145 145  
146 146 /* Environment in EEPROM */
147   -#define CFG_ENV_IS_IN_EEPROM 1
  147 +#define CONFIG_ENV_IS_IN_EEPROM 1
148 148 #define CONFIG_SPI
149 149 #define CFG_ENV_SIZE 0x4000 /* Total Size of Environment EEPROM 16k is SPI is used or 128 bytes if MW is used*/
150 150 #define CFG_ENV_OFFSET 0
include/configs/sc520_spunk.h
Diff comments   View file @ bb1f8b4
... ... @@ -161,7 +161,7 @@
161 161 #else
162 162 /* Environment in EEPROM */
163 163  
164   -# define CFG_ENV_IS_IN_EEPROM 1
  164 +# define CONFIG_ENV_IS_IN_EEPROM 1
165 165 # define CONFIG_SPI
166 166 # define CONFIG_SPI_X 1
167 167 # define CFG_ENV_SIZE 0x2000 /* Total Size of Environment EEPROM */
include/configs/sorcery.h
Diff comments   View file @ bb1f8b4
... ... @@ -208,11 +208,11 @@
208 208  
209 209 #if defined CFG_ENV_IS_IN_FLASH
210 210 #undef CFG_ENV_IS_IN_NVRAM
211   -#undef CFG_ENV_IS_IN_EEPROM
  211 +#undef CONFIG_ENV_IS_IN_EEPROM
212 212 #elif defined CFG_ENV_IS_IN_NVRAM
213 213 #undef CFG_ENV_IS_IN_FLASH
214   -#undef CFG_ENV_IS_IN_EEPROM
215   -#elif defined CFG_ENV_IS_IN_EEPROM
  214 +#undef CONFIG_ENV_IS_IN_EEPROM
  215 +#elif defined CONFIG_ENV_IS_IN_EEPROM
216 216 #undef CFG_ENV_IS_IN_NVRAM
217 217 #undef CFG_ENV_IS_IN_FLASH
218 218 #endif
include/configs/stxssa.h
Diff comments   View file @ bb1f8b4
... ... @@ -313,7 +313,7 @@
313 313  
314 314 /* Environment - default config is in flash, see below */
315 315 #if 0 /* in EEPROM */
316   -# define CFG_ENV_IS_IN_EEPROM 1
  316 +# define CONFIG_ENV_IS_IN_EEPROM 1
317 317 # define CFG_ENV_OFFSET 0
318 318 # define CFG_ENV_SIZE 2048
319 319 #else /* in flash */
... ... @@ -426,7 +426,7 @@
426 426 * but only little space is available, so we use a very simple setup.
427 427 * With environment in flash, we use a more powerful default configuration.
428 428 */
429   -#ifdef CFG_ENV_IS_IN_EEPROM /* use restricted "standard" environment */
  429 +#ifdef CONFIG_ENV_IS_IN_EEPROM /* use restricted "standard" environment */
430 430  
431 431 #define CONFIG_BAUDRATE 38400
432 432  
... ... @@ -480,7 +480,7 @@
480 480 ""
481 481 #define CONFIG_BOOTCOMMAND "run flash_self"
482 482  
483   -#endif /* CFG_ENV_IS_IN_EEPROM */
  483 +#endif /* CONFIG_ENV_IS_IN_EEPROM */
484 484  
485 485 #endif /* __CONFIG_H */
include/configs/yosemite.h
Diff comments   View file @ bb1f8b4
... ... @@ -98,7 +98,7 @@
98 98 #if 1
99 99 #define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
100 100 #else
101   -#define CFG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
  101 +#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
102 102 #endif
103 103  
104 104 /*-----------------------------------------------------------------------
105 105  
... ... @@ -147,10 +147,10 @@
147 147 #define CFG_EEPROM_PAGE_WRITE_BITS 3
148 148 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
149 149  
150   -#ifdef CFG_ENV_IS_IN_EEPROM
  150 +#ifdef CONFIG_ENV_IS_IN_EEPROM
151 151 #define CFG_ENV_SIZE 0x200 /* Size of Environment vars */
152 152 #define CFG_ENV_OFFSET 0x0
153   -#endif /* CFG_ENV_IS_IN_EEPROM */
  153 +#endif /* CONFIG_ENV_IS_IN_EEPROM */
154 154  
155 155 /* I2C SYSMON (LM75, AD7414 is almost compatible) */
156 156 #define CONFIG_DTT_LM75 1 /* ON Semi's LM75 */
include/configs/yucca.h
Diff comments   View file @ bb1f8b4
... ... @@ -141,7 +141,7 @@
141 141  
142 142 #undef CFG_ENV_IS_IN_NVRAM /* ... not in NVRAM */
143 143 #define CFG_ENV_IS_IN_FLASH 1 /* Environment uses flash */
144   -#undef CFG_ENV_IS_IN_EEPROM /* ... not in EEPROM */
  144 +#undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */
145 145 #define CONFIG_ENV_OVERWRITE 1
146 146  
147 147 /*
lib_blackfin/board.c
Diff comments   View file @ bb1f8b4
... ... @@ -378,7 +378,7 @@
378 378 malloc_bin_reloc();
379 379  
380 380 #ifdef CONFIG_SPI
381   -# if ! defined(CFG_ENV_IS_IN_EEPROM)
  381 +# if ! defined(CONFIG_ENV_IS_IN_EEPROM)
382 382 spi_init_f();
383 383 # endif
384 384 spi_init_r();
... ... @@ -568,7 +568,7 @@
568 568 malloc_bin_reloc ();
569 569  
570 570 #ifdef CONFIG_SPI
571   -# if !defined(CFG_ENV_IS_IN_EEPROM)
  571 +# if !defined(CONFIG_ENV_IS_IN_EEPROM)
572 572 spi_init_f ();
573 573 # endif
574 574 spi_init_r ();
... ... @@ -822,7 +822,7 @@
822 822 malloc_bin_reloc ();
823 823  
824 824 #ifdef CONFIG_SPI
825   -# if !defined(CFG_ENV_IS_IN_EEPROM)
  825 +# if !defined(CONFIG_ENV_IS_IN_EEPROM)
826 826 spi_init_f ();
827 827 # endif
828 828 spi_init_r ();
... ... @@ -377,7 +377,7 @@
377 377 malloc_bin_reloc();
378 378  
379 379 #ifdef CONFIG_SPI
380   -# if !defined(CFG_ENV_IS_IN_EEPROM)
  380 +# if !defined(CONFIG_ENV_IS_IN_EEPROM)
381 381 spi_init_f();
382 382 # endif
383 383 spi_init_r();