Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-09 03:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename CFG_ENV macros to CONFIG_ENV

Browse source 
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2008-09-10 22:48:06 +02:00
parent 1ede78710c
commit 0e8d158664
599 changed files with 2795 additions and 2795 deletions
Download patch file Download diff file Expand all files Collapse all files

44
README
View file

@ -2120,22 +2120,22 @@ following configurations:
environment in one of the last sectors, leaving a gap environment in one of the last sectors, leaving a gap
between U-Boot and the environment. between U-Boot and the environment.
- CFG_ENV_OFFSET: - CONFIG_ENV_OFFSET:
Offset of environment data (variable area) to the Offset of environment data (variable area) to the
beginning of flash memory; for instance, with bottom boot beginning of flash memory; for instance, with bottom boot
type flash chips the second sector can be used: the offset type flash chips the second sector can be used: the offset
for this sector is given here. for this sector is given here.
CFG_ENV_OFFSET is used relative to CFG_FLASH_BASE. CONFIG_ENV_OFFSET is used relative to CFG_FLASH_BASE.
- CFG_ENV_ADDR: - CONFIG_ENV_ADDR:
This is just another way to specify the start address of This is just another way to specify the start address of
the flash sector containing the environment (instead of the flash sector containing the environment (instead of
CFG_ENV_OFFSET). CONFIG_ENV_OFFSET).
- CFG_ENV_SECT_SIZE: - CONFIG_ENV_SECT_SIZE:
Size of the sector containing the environment. Size of the sector containing the environment.
@ -2144,10 +2144,10 @@ following configurations:
In such a case you don't want to spend a whole sector for In such a case you don't want to spend a whole sector for
the environment. the environment.
- CFG_ENV_SIZE: - CONFIG_ENV_SIZE:
If you use this in combination with CONFIG_ENV_IS_IN_FLASH If you use this in combination with CONFIG_ENV_IS_IN_FLASH
and CFG_ENV_SECT_SIZE, you can specify to use only a part and CONFIG_ENV_SECT_SIZE, you can specify to use only a part
of this flash sector for the environment. This saves of this flash sector for the environment. This saves
memory for the RAM copy of the environment. memory for the RAM copy of the environment.
@ -2161,8 +2161,8 @@ following configurations:
wrong before the contents has been restored from a copy in wrong before the contents has been restored from a copy in
RAM, your target system will be dead. RAM, your target system will be dead.
- CFG_ENV_ADDR_REDUND - CONFIG_ENV_ADDR_REDUND
CFG_ENV_SIZE_REDUND CONFIG_ENV_SIZE_REDUND
These settings describe a second storage area used to hold These settings describe a second storage area used to hold
a redundant copy of the environment data, so that there is a redundant copy of the environment data, so that there is
@ -2180,8 +2180,8 @@ accordingly!
(NVRAM, battery buffered SRAM) which you want to use for the (NVRAM, battery buffered SRAM) which you want to use for the
environment. environment.
- CFG_ENV_ADDR: - CONFIG_ENV_ADDR:
- CFG_ENV_SIZE: - CONFIG_ENV_SIZE:
These two #defines are used to determine the memory area you These two #defines are used to determine the memory area you
want to use for environment. It is assumed that this memory want to use for environment. It is assumed that this memory
@ -2204,8 +2204,8 @@ to save the current settings.
Use this if you have an EEPROM or similar serial access Use this if you have an EEPROM or similar serial access
device and a driver for it. device and a driver for it.
- CFG_ENV_OFFSET: - CONFIG_ENV_OFFSET:
- CFG_ENV_SIZE: - CONFIG_ENV_SIZE:
These two #defines specify the offset and size of the These two #defines specify the offset and size of the
environment area within the total memory of your EEPROM. environment area within the total memory of your EEPROM.
@ -2247,9 +2247,9 @@ to save the current settings.
Define this if you have a DataFlash memory device which you Define this if you have a DataFlash memory device which you
want to use for the environment. want to use for the environment.
- CFG_ENV_OFFSET: - CONFIG_ENV_OFFSET:
- CFG_ENV_ADDR: - CONFIG_ENV_ADDR:
- CFG_ENV_SIZE: - CONFIG_ENV_SIZE:
These three #defines specify the offset and size of the These three #defines specify the offset and size of the
environment area within the total memory of your DataFlash placed environment area within the total memory of your DataFlash placed
@ -2260,21 +2260,21 @@ to save the current settings.
Define this if you have a NAND device which you want to use Define this if you have a NAND device which you want to use
for the environment. for the environment.
- CFG_ENV_OFFSET: - CONFIG_ENV_OFFSET:
- CFG_ENV_SIZE: - CONFIG_ENV_SIZE:
These two #defines specify the offset and size of the environment These two #defines specify the offset and size of the environment
area within the first NAND device. area within the first NAND device.
- CFG_ENV_OFFSET_REDUND - CONFIG_ENV_OFFSET_REDUND
This setting describes a second storage area of CFG_ENV_SIZE This setting describes a second storage area of CONFIG_ENV_SIZE
size used to hold a redundant copy of the environment data, size used to hold a redundant copy of the environment data,
so that there is a valid backup copy in case there is a so that there is a valid backup copy in case there is a
power failure during a "saveenv" operation. power failure during a "saveenv" operation.
Note: CFG_ENV_OFFSET and CFG_ENV_OFFSET_REDUND must be aligned Note: CONFIG_ENV_OFFSET and CONFIG_ENV_OFFSET_REDUND must be aligned
to a block boundary, and CFG_ENV_SIZE must be a multiple of to a block boundary, and CONFIG_ENV_SIZE must be a multiple of
the NAND devices block size. the NAND devices block size.
- CFG_SPI_INIT_OFFSET - CFG_SPI_INIT_OFFSET

2
api/api.c
View file

@ -534,7 +534,7 @@ static int API_env_enum(va_list ap)
for (i = 0; env_get_char(i) != '\0'; i = n + 1) { for (i = 0; env_get_char(i) != '\0'; i = n + 1) {
for (n = i; env_get_char(n) != '\0'; ++n) { for (n = i; env_get_char(n) != '\0'; ++n) {
if (n >= CFG_ENV_SIZE) { if (n >= CONFIG_ENV_SIZE) {
/* XXX shouldn't we set *next = NULL?? */ /* XXX shouldn't we set *next = NULL?? */
return 0; return 0;
} }

8
board/LEOX/elpt860/flash.c
View file

@ -61,8 +61,8 @@
#include <mpc8xx.h> #include <mpc8xx.h>
#ifndef CFG_ENV_ADDR #ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
#endif #endif
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
@ -125,8 +125,8 @@ flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE-1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif

4
board/MAI/AmigaOneG3SE/flash_new.c
View file

@ -126,8 +126,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

8
board/RRvision/flash.c
View file

@ -26,8 +26,8 @@
#include <common.h> #include <common.h>
#include <mpc8xx.h> #include <mpc8xx.h>
#ifndef CFG_ENV_ADDR #ifndef CONFIG_ENV_ADDR
#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) #define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
#endif #endif
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
@ -80,8 +80,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif

18
board/a3000/flash.c
View file

@ -26,14 +26,14 @@
#include <mpc824x.h> #include <mpc824x.h>
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -110,10 +110,10 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
DEBUGF("protect environtment %x @ %x\n", CFG_ENV_ADDR, CFG_ENV_SECT_SIZE); DEBUGF("protect environtment %x @ %x\n", CONFIG_ENV_ADDR, CONFIG_ENV_SECT_SIZE);
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif

8
board/alaska/flash.c
View file

@ -144,11 +144,11 @@ unsigned long flash_init (void)
#endif #endif
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV1_ADDR, CONFIG_ENV1_ADDR,
CFG_ENV1_ADDR + CFG_ENV1_SIZE - 1, &flash_info[1]); CONFIG_ENV1_ADDR + CONFIG_ENV1_SIZE - 1, &flash_info[1]);
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[3]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[3]);
return size; return size;
} }

10
board/amcc/bamboo/flash.c
View file

@ -154,12 +154,12 @@ unsigned long flash_init(void)
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[i]); &flash_info[i]);
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[i]); &flash_info[i]);
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR_REDUND) #if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR_REDUND)
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[i]); &flash_info[i]);
#endif #endif
#endif #endif

8
board/amcc/bubinga/flash.c
View file

@ -85,11 +85,11 @@ unsigned long flash_init(void)
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[0]); &flash_info[0]);
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]); &flash_info[0]);
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

8
board/amcc/ebony/flash.c
View file

@ -125,11 +125,11 @@ unsigned long flash_init(void)
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[2]); &flash_info[2]);
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[2]); &flash_info[2]);
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[2]); &flash_info[2]);
#endif #endif

8
board/amcc/luan/flash.c
View file

@ -96,11 +96,11 @@ unsigned long flash_init(void)
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[2]); &flash_info[2]);
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[2]); &flash_info[2]);
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[2]); &flash_info[2]);
#endif #endif

8
board/amcc/ocotea/flash.c
View file

@ -135,11 +135,11 @@ unsigned long flash_init(void)
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[i]); &flash_info[i]);
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[i]); &flash_info[i]);
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[i]); &flash_info[i]);
#endif #endif

4
board/amcc/sequoia/sequoia.c
View file

@ -166,8 +166,8 @@ int misc_init_r(void)
/* Env protection ON by default */ /* Env protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET, (void)flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR_REDUND, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

8
board/amcc/taihu/flash.c
View file

@ -88,11 +88,11 @@ unsigned long flash_init(void)
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[0]); &flash_info[0]);
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]); &flash_info[0]);
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif
/* Also protect sector containing initial power-up instruction */ /* Also protect sector containing initial power-up instruction */

8
board/amcc/walnut/flash.c
View file

@ -83,11 +83,11 @@ unsigned long flash_init(void)
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[0]); &flash_info[0]);
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]); &flash_info[0]);
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

10
board/amcc/yucca/flash.c
View file

@ -1038,12 +1038,12 @@ unsigned long flash_init(void)
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[i]); &flash_info[i]);
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[i]); &flash_info[i]);
#if defined(CFG_ENV_ADDR_REDUND) #if defined(CONFIG_ENV_ADDR_REDUND)
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[i]); &flash_info[i]);
#endif #endif
#endif #endif

4
board/armadillo/flash.c
View file

@ -74,8 +74,8 @@ ulong flash_init (void)
&flash_info[0]); &flash_info[0]);
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
return size; return size;
} }

6
board/atc/flash.c
View file

@ -98,9 +98,9 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
flash_get_info(CFG_ENV_ADDR)); flash_get_info(CONFIG_ENV_ADDR));
#endif #endif

4
board/atmel/at91rm9200dk/flash.c
View file

@ -221,8 +221,8 @@ ulong flash_init (void)
/* Protect environment variables */ /* Protect environment variables */
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
/* Protect U-Boot gzipped image */ /* Protect U-Boot gzipped image */
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,

18
board/barco/flash.c
View file

@ -59,14 +59,14 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -224,10 +224,10 @@ unsigned long flash_init(void)
&flash_info[0]); &flash_info[0]);
#endif #endif
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) #if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

2
board/bmw/bmw.c
View file

@ -125,7 +125,7 @@ void doc_init (void)
doc_probe(DOC_BASE_ADDR); doc_probe(DOC_BASE_ADDR);
} }
#define NV_ADDR ((volatile unsigned char *) CFG_ENV_ADDR) #define NV_ADDR ((volatile unsigned char *) CONFIG_ENV_ADDR)
/* Read from NVRAM */ /* Read from NVRAM */
void* void*

18
board/bmw/flash.c
View file

@ -32,14 +32,14 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -224,10 +224,10 @@ unsigned long flash_init (void)
&flash_info[0]); &flash_info[0]);
#endif #endif
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) #if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

12
board/c2mon/flash.c
View file

@ -24,8 +24,8 @@
#include <common.h> #include <common.h>
#include <mpc8xx.h> #include <mpc8xx.h>
#ifndef CFG_ENV_ADDR #ifndef CONFIG_ENV_ADDR
#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) #define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
#endif #endif
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
@ -98,8 +98,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
@ -125,8 +125,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
&flash_info[1]); &flash_info[1]);
#endif #endif
} else { } else {

4
board/cerf250/flash.c
View file

@ -90,8 +90,8 @@ unsigned long flash_init (void)
&flash_info[0] ); &flash_info[0] );
flash_protect ( FLAG_PROTECT_SET, flash_protect ( FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0] ); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0] );
return size; return size;
} }

10
board/cmc_pu2/flash.c
View file

@ -29,8 +29,8 @@
#include <common.h> #include <common.h>
#ifndef CFG_ENV_ADDR #ifndef CONFIG_ENV_ADDR
#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) #define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
#endif #endif
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
@ -74,9 +74,9 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
flash_get_info(CFG_ENV_ADDR)); flash_get_info(CONFIG_ENV_ADDR));
#endif #endif
return size ? size : 1; return size ? size : 1;

2
board/cmi/cmi.c
View file

@ -70,4 +70,4 @@ phys_size_t initdram(int board_type)
/* /*
* Absolute environment address for linker file. * Absolute environment address for linker file.
*/ */
GEN_ABS(env_start, CFG_ENV_OFFSET + CFG_FLASH_BASE); GEN_ABS(env_start, CONFIG_ENV_OFFSET + CFG_FLASH_BASE);

16
board/cmi/flash.c
View file

@ -37,14 +37,14 @@
#include <mpc5xx.h> #include <mpc5xx.h>
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -113,8 +113,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif

16
board/cogent/flash.c
View file

@ -27,14 +27,14 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -330,8 +330,8 @@ flash_init(void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
return total; return total;

24
board/cpc45/flash.c
View file

@ -26,14 +26,14 @@
#include <asm/processor.h> #include <asm/processor.h>
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -174,15 +174,15 @@ unsigned long flash_init (void)
&flash_info[0]); &flash_info[0]);
#endif #endif
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) #if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
#if CFG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE #if CONFIG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[1]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[1]);
#else #else
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
#endif #endif
#endif #endif

16
board/cpu86/flash.c
View file

@ -230,20 +230,20 @@ unsigned long flash_init (void)
#endif #endif
#endif #endif
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) #if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# if CFG_ENV_ADDR >= CFG_BOOTROM_BASE # if CONFIG_ENV_ADDR >= CFG_BOOTROM_BASE
if (size_b1) { if (size_b1) {
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[1]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[1]);
} }
# else # else
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
# endif # endif
#endif #endif

16
board/cpu87/flash.c
View file

@ -236,20 +236,20 @@ unsigned long flash_init (void)
#endif #endif
#endif #endif
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) #if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# if CFG_ENV_ADDR >= CFG_BOOTROM_BASE # if CONFIG_ENV_ADDR >= CFG_BOOTROM_BASE
if (size_b1) { if (size_b1) {
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[1]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[1]);
} }
# else # else
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
# endif # endif
#endif #endif

4
board/cradle/flash.c
View file

@ -76,8 +76,8 @@ ulong flash_init (void)
&flash_info[0]); &flash_info[0]);
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
return size; return size;
} }

4
board/csb226/flash.c
View file

@ -81,8 +81,8 @@ ulong flash_init(void)
&flash_info[0]); &flash_info[0]);
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
return size; return size;

24
board/cu824/flash.c
View file

@ -26,14 +26,14 @@
#include <asm/processor.h> #include <asm/processor.h>
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -135,16 +135,16 @@ unsigned long flash_init(void)
#endif #endif
#endif #endif
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) #if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
#if CFG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE #if CONFIG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[1]); &flash_info[1]);
#else #else
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif
#endif #endif

4
board/dnp1110/flash.c
View file

@ -88,8 +88,8 @@ unsigned long flash_init (void)
&flash_info[0]); &flash_info[0]);
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
return size; return size;

4
board/eltec/elppc/misc.c
View file

@ -42,7 +42,7 @@ extern int read_eeprom (struct eth_device *dev, int location, int addr_len);
void *nvram_read (void *dest, const long src, size_t count) void *nvram_read (void *dest, const long src, size_t count)
{ {
uchar *d = (uchar *) dest; uchar *d = (uchar *) dest;
uchar *s = (uchar *) (CFG_ENV_MAP_ADRS + src); uchar *s = (uchar *) (CONFIG_ENV_MAP_ADRS + src);
while (count--) while (count--)
*d++ = *s++; *d++ = *s++;
@ -52,7 +52,7 @@ void *nvram_read (void *dest, const long src, size_t count)
void nvram_write (long dest, const void *src, size_t count) void nvram_write (long dest, const void *src, size_t count)
{ {
uchar *d = (uchar *) (CFG_ENV_MAP_ADRS + dest); uchar *d = (uchar *) (CONFIG_ENV_MAP_ADRS + dest);
uchar *s = (uchar *) src; uchar *s = (uchar *) src;
while (count--) while (count--)

6
board/emk/common/flash.c
View file

@ -116,9 +116,9 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
flash_get_info(CFG_ENV_ADDR)); flash_get_info(CONFIG_ENV_ADDR));
#endif #endif

4
board/ep7312/flash.c
View file

@ -65,8 +65,8 @@ ulong flash_init (void)
&flash_info[0]); &flash_info[0]);
flash_protect ( FLAG_PROTECT_SET, flash_protect ( FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
return size; return size;
} }

10
board/ep8260/flash.c
View file

@ -157,13 +157,13 @@ unsigned long flash_init (void)
&flash_info[0]); &flash_info[0]);
#endif #endif
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) #if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

16
board/esd/cpci405/cpci405.c
View file

@ -691,7 +691,7 @@ U_BOOT_CMD(
); );
#define CFG_I2C_EEPROM_ADDR_2 0x51 /* EEPROM CAT28WC32 */ #define CFG_I2C_EEPROM_ADDR_2 0x51 /* EEPROM CAT28WC32 */
#define CFG_ENV_SIZE_2 0x800 /* 2048 bytes may be used for env vars*/ #define CONFIG_ENV_SIZE_2 0x800 /* 2048 bytes may be used for env vars*/
/* /*
* Write backplane ip-address... * Write backplane ip-address...
@ -705,11 +705,11 @@ int do_get_bpip(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
char *ptr; char *ptr;
IPaddr_t ipaddr; IPaddr_t ipaddr;
buf = malloc(CFG_ENV_SIZE_2); buf = malloc(CONFIG_ENV_SIZE_2);
if (eeprom_read(CFG_I2C_EEPROM_ADDR_2, 0, (uchar *)buf, CFG_ENV_SIZE_2)) { if (eeprom_read(CFG_I2C_EEPROM_ADDR_2, 0, (uchar *)buf, CONFIG_ENV_SIZE_2)) {
puts("\nError reading backplane EEPROM!\n"); puts("\nError reading backplane EEPROM!\n");
} else { } else {
crc = crc32(0, (uchar *)(buf+4), CFG_ENV_SIZE_2-4); crc = crc32(0, (uchar *)(buf+4), CONFIG_ENV_SIZE_2-4);
if (crc != *(ulong *)buf) { if (crc != *(ulong *)buf) {
printf("ERROR: crc mismatch %08lx %08lx\n", crc, *(ulong *)buf); printf("ERROR: crc mismatch %08lx %08lx\n", crc, *(ulong *)buf);
return -1; return -1;
@ -764,14 +764,14 @@ int do_set_bpip(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
} }
printf("Setting bp_ip to %s\n", argv[1]); printf("Setting bp_ip to %s\n", argv[1]);
buf = malloc(CFG_ENV_SIZE_2); buf = malloc(CONFIG_ENV_SIZE_2);
memset(buf, 0, CFG_ENV_SIZE_2); memset(buf, 0, CONFIG_ENV_SIZE_2);
sprintf(str, "bp_ip=%s", argv[1]); sprintf(str, "bp_ip=%s", argv[1]);
strcpy(buf+4, str); strcpy(buf+4, str);
crc = crc32(0, (uchar *)(buf+4), CFG_ENV_SIZE_2-4); crc = crc32(0, (uchar *)(buf+4), CONFIG_ENV_SIZE_2-4);
*(ulong *)buf = crc; *(ulong *)buf = crc;
if (eeprom_write(CFG_I2C_EEPROM_ADDR_2, 0, (uchar *)buf, CFG_ENV_SIZE_2)) { if (eeprom_write(CFG_I2C_EEPROM_ADDR_2, 0, (uchar *)buf, CONFIG_ENV_SIZE_2)) {
puts("\nError writing backplane EEPROM!\n"); puts("\nError writing backplane EEPROM!\n");
} }

6
board/esd/pf5200/flash.c
View file

@ -78,9 +78,9 @@ unsigned long flash_init(void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
flash_get_info(CFG_ENV_ADDR)); flash_get_info(CONFIG_ENV_ADDR));
#endif #endif
flash_afterinit(i, flash_info[i].start[0], flash_info[i].size); flash_afterinit(i, flash_info[i].start[0], flash_info[i].size);

6
board/esd/pmc440/cmd_pmc440.c
View file

@ -363,11 +363,11 @@ int do_painit(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
printf("PARAM: @%08x\n", param); printf("PARAM: @%08x\n", param);
memset((void*)param, 0, (pram << 10)); memset((void*)param, 0, (pram << 10));
env_base = memsize - 4096 - ((CFG_ENV_SIZE + 4096) & ~(4096-1)); env_base = memsize - 4096 - ((CONFIG_ENV_SIZE + 4096) & ~(4096-1));
memcpy((void*)env_base, env_ptr, CFG_ENV_SIZE); memcpy((void*)env_base, env_ptr, CONFIG_ENV_SIZE);
lptr = (ulong*)memsize; lptr = (ulong*)memsize;
*(--lptr) = CFG_ENV_SIZE; *(--lptr) = CONFIG_ENV_SIZE;
*(--lptr) = memsize - env_base; *(--lptr) = memsize - env_base;
*(--lptr) = crc32(0, (void*)(memsize - 0x08), 0x08); *(--lptr) = crc32(0, (void*)(memsize - 0x08), 0x08);
*(--lptr) = 0; *(--lptr) = 0;

4
board/esd/pmc440/pmc440.c
View file

@ -248,8 +248,8 @@ int misc_init_r(void)
/* Env protection ON by default */ /* Env protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET, (void)flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR_REDUND, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

2
board/etin/debris/debris.c
View file

@ -174,7 +174,7 @@ void nvram_write(long dest, const void *src, size_t count)
int misc_init_r(void) int misc_init_r(void)
{ {
/* Write ethernet addr in NVRAM for VxWorks */ /* Write ethernet addr in NVRAM for VxWorks */
nvram_write(CFG_ENV_ADDR + CFG_NVRAM_VXWORKS_OFFS, nvram_write(CONFIG_ENV_ADDR + CFG_NVRAM_VXWORKS_OFFS,
(char*)&gd->bd->bi_enetaddr[0], 6); (char*)&gd->bd->bi_enetaddr[0], 6);
return 0; return 0;
} }

2
board/evb4510/flash.c
View file

@ -399,7 +399,7 @@ unsigned long flash_init (void)
amd160base, amd160base + monitor_flash_len - 1, info); amd160base, amd160base + monitor_flash_len - 1, info);
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CFG_ENV_ADDR + CFG_ENV_SIZE - 1, info); CONFIG_ENV_ADDR, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, info);
#if CFG_MAX_FLASH_BANKS == 2 #if CFG_MAX_FLASH_BANKS == 2
/* Configure AMD Am29LV040B (512KB) */ /* Configure AMD Am29LV040B (512KB) */

6
board/evb64260/flash.c
View file

@ -122,9 +122,9 @@ flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
flash_get_info(CFG_ENV_ADDR)); flash_get_info(CONFIG_ENV_ADDR));
#endif #endif
flash_size = size_b0 + size_b1; flash_size = size_b0 + size_b1;

6
board/exbitgen/flash.c
View file

@ -126,10 +126,10 @@ unsigned long flash_init (void)
#endif #endif
#endif #endif
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) #if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

6
board/fads/fads.h
View file

@ -227,9 +227,9 @@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SECT_SIZE 0x40000 /* see README - env sector total size */ #define CONFIG_ENV_SECT_SIZE 0x40000 /* see README - env sector total size */
#define CFG_ENV_OFFSET CFG_ENV_SECT_SIZE #define CONFIG_ENV_OFFSET CONFIG_ENV_SECT_SIZE
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment */ #define CONFIG_ENV_SIZE 0x4000 /* Total Size of Environment */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */ #define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_DIRECT_FLASH_TFTP #define CFG_DIRECT_FLASH_TFTP

18
board/fads/flash.c
View file

@ -27,14 +27,14 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -126,10 +126,10 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
if (CFG_ENV_ADDR >= flash_info[i].start[0]) if (CONFIG_ENV_ADDR >= flash_info[i].start[0])
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[i]); &flash_info[i]);
#endif #endif
} }

4
board/flagadm/flash.c
View file

@ -84,8 +84,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_OFFSET, CONFIG_ENV_OFFSET,
CFG_ENV_OFFSET+CFG_ENV_SIZE-1, CONFIG_ENV_OFFSET+CONFIG_ENV_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
return (flash_info[0].size); return (flash_info[0].size);

4
board/freescale/mpc8260ads/flash.c
View file

@ -158,8 +158,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
return (size); return (size);

16
board/freescale/mpc8266ads/flash.c
View file

@ -32,14 +32,14 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -108,8 +108,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
return (size); return (size);

4
board/funkwerk/vovpn-gw/flash.c
View file

@ -153,8 +153,8 @@ flash_init(void)
#endif #endif
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
return (size); return (size);

4
board/gcplus/flash.c
View file

@ -87,8 +87,8 @@ flash_init(void)
CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]); CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]);
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
return size; return size;
} }

16
board/gen860t/flash.c
View file

@ -26,14 +26,14 @@
#include <mpc8xx.h> #include <mpc8xx.h>
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -166,8 +166,8 @@ flash_init (void)
* Environment protection ON by default * Environment protection ON by default
*/ */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

10
board/gw8260/flash.c
View file

@ -100,13 +100,13 @@ unsigned long flash_init (void)
&flash_info[0]); &flash_info[0]);
#endif #endif
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) #if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

18
board/hidden_dragon/flash.c
View file

@ -36,14 +36,14 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -212,10 +212,10 @@ unsigned long flash_init (void)
&flash_info[0]); &flash_info[0]);
#endif #endif
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) #if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

6
board/icecube/flash.c
View file

@ -91,9 +91,9 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
flash_get_info(CFG_ENV_ADDR)); flash_get_info(CONFIG_ENV_ADDR));
#endif #endif

16
board/icu862/flash.c
View file

@ -27,14 +27,14 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -111,8 +111,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif

16
board/ids8247/flash.c
View file

@ -34,14 +34,14 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -116,8 +116,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

4
board/impa7/flash.c
View file

@ -74,8 +74,8 @@ ulong flash_init (void)
&flash_info[0]); &flash_info[0]);
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
return size; return size;
} }

6
board/incaip/flash.c
View file

@ -107,9 +107,9 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
flash_get_info(CFG_ENV_ADDR)); flash_get_info(CONFIG_ENV_ADDR));
#endif #endif

4
board/innokom/flash.c
View file

@ -116,8 +116,8 @@ ulong flash_init(void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

4
board/integratorcp/flash.c
View file

@ -128,8 +128,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON */ /* ENV protection ON */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

16
board/ip860/flash.c
View file

@ -27,14 +27,14 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -97,8 +97,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
return (size); return (size);

4
board/iphase4539/flash.c
View file

@ -78,8 +78,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
flash_info + bank); flash_info + bank);
#endif #endif

16
board/ivm/flash.c
View file

@ -27,14 +27,14 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -94,8 +94,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif

4
board/ixdp425/flash.c
View file

@ -86,8 +86,8 @@ unsigned long flash_init (void)
&flash_info[0]); &flash_info[0]);
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
return size; return size;
} }

12
board/korat/korat.c
View file

@ -71,7 +71,7 @@ int board_early_init_f(void)
if (gpio_read_in_bit(CFG_GPIO_RESET_PRESSED_)) { if (gpio_read_in_bit(CFG_GPIO_RESET_PRESSED_)) {
/* This call does not return. */ /* This call does not return. */
korat_branch_absolute( korat_branch_absolute(
CFG_FLASH1_TOP - 2 * CFG_ENV_SECT_SIZE - 4); CFG_FLASH1_TOP - 2 * CONFIG_ENV_SECT_SIZE - 4);
} }
} }
korat_buzzer(1); korat_buzzer(1);
@ -375,7 +375,7 @@ int misc_init_r(void)
* environment * environment
*/ */
gd->bd->bi_flashoffset = gd->bd->bi_flashoffset =
CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - CFG_FLASH1_ADDR; CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - CFG_FLASH1_ADDR;
mtdcr(ebccfga, pb1cr); mtdcr(ebccfga, pb1cr);
pbcr = mfdcr(ebccfgd); pbcr = mfdcr(ebccfgd);
@ -395,11 +395,11 @@ int misc_init_r(void)
flash_info); flash_info);
#endif #endif
/* Env protection ON by default */ /* Env protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
flash_info); flash_info);
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
flash_info); flash_info);
/* /*

8
board/kup/common/flash.c
View file

@ -24,8 +24,8 @@
#include <common.h> #include <common.h>
#include <mpc8xx.h> #include <mpc8xx.h>
#ifndef CFG_ENV_ADDR #ifndef CONFIG_ENV_ADDR
#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) #define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
#endif #endif
#define CONFIG_FLASH_16BIT #define CONFIG_FLASH_16BIT
@ -81,8 +81,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif

20
board/lantec/flash.c
View file

@ -30,14 +30,14 @@
#include <mpc8xx.h> #include <mpc8xx.h>
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -141,8 +141,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
@ -173,8 +173,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,
&flash_info[1]); &flash_info[1]);
#endif #endif
} else { } else {

4
board/lart/flash.c
View file

@ -109,8 +109,8 @@ ulong flash_init(void)
&flash_info[0]); &flash_info[0]);
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
return size; return size;

4
board/logodl/flash.c
View file

@ -109,8 +109,8 @@ ulong flash_init(void)
&flash_info[0]); &flash_info[0]);
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
return size; return size;

4
board/lpc2292sodimm/flash.c
View file

@ -97,8 +97,8 @@ ulong flash_init (void)
&flash_info[0]); &flash_info[0]);
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
return size; return size;

10
board/lpd7a40x/flash.c
View file

@ -97,13 +97,13 @@ ulong flash_init (void)
&flash_info[0]); &flash_info[0]);
flash_protect ( FLAG_PROTECT_SET, flash_protect ( FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
#ifdef CFG_ENV_ADDR_REDUND #ifdef CONFIG_ENV_ADDR_REDUND
flash_protect ( FLAG_PROTECT_SET, flash_protect ( FLAG_PROTECT_SET,
CFG_ENV_ADDR_REDUND, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

4
board/lubbock/flash.c
View file

@ -90,8 +90,8 @@ unsigned long flash_init (void)
&flash_info[0] ); &flash_info[0] );
flash_protect ( FLAG_PROTECT_SET, flash_protect ( FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0] ); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0] );
return size; return size;
} }

20
board/lwmon/flash.c
View file

@ -27,14 +27,14 @@
#include <mpc8xx.h> #include <mpc8xx.h>
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -133,8 +133,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
@ -166,8 +166,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,
&flash_info[1]); &flash_info[1]);
#endif #endif
} else { } else {

4
board/lwmon5/lwmon5.c
View file

@ -200,8 +200,8 @@ int misc_init_r(void)
/* Env protection ON by default */ /* Env protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET, (void)flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR_REDUND, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1,
&flash_info[1]); &flash_info[1]);
/* /*

8
board/mcc200/mcc200.c
View file

@ -263,14 +263,14 @@ int misc_init_r (void)
/* Environment protection ON by default */ /* Environment protection ON by default */
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[CFG_MAX_FLASH_BANKS - 1]); &flash_info[CFG_MAX_FLASH_BANKS - 1]);
/* Redundant environment protection ON by default */ /* Redundant environment protection ON by default */
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR_REDUND, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,
&flash_info[CFG_MAX_FLASH_BANKS - 1]); &flash_info[CFG_MAX_FLASH_BANKS - 1]);
} }

4
board/modnet50/flash.c
View file

@ -181,8 +181,8 @@ ulong flash_init (void)
&flash_info[0]); &flash_info[0]);
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
return size; return size;
} }

4
board/mp2usb/flash.c
View file

@ -98,8 +98,8 @@ unsigned long flash_init (void)
&flash_info[0] ); &flash_info[0] );
flash_protect ( FLAG_PROTECT_SET, flash_protect ( FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0] ); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0] );
return size; return size;
} }

16
board/mpc8540eval/flash.c
View file

@ -36,14 +36,14 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -106,8 +106,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
#endif #endif

10
board/mpl/common/common_util.c
View file

@ -309,7 +309,7 @@ void clear_env_values(void)
memset(&back,0xff,sizeof(backup_t)); memset(&back,0xff,sizeof(backup_t));
memset(env_crc,0x00,4); memset(env_crc,0x00,4);
i2c_write(CFG_DEF_EEPROM_ADDR,I2C_BACKUP_ADDR,2,(void *)&back,sizeof(backup_t)); i2c_write(CFG_DEF_EEPROM_ADDR,I2C_BACKUP_ADDR,2,(void *)&back,sizeof(backup_t));
i2c_write(CFG_DEF_EEPROM_ADDR,CFG_ENV_OFFSET,2,(void *)env_crc,4); i2c_write(CFG_DEF_EEPROM_ADDR,CONFIG_ENV_OFFSET,2,(void *)env_crc,4);
} }
/* /*
@ -323,7 +323,7 @@ int check_env_old_size(ulong oldsize)
/* read old CRC */ /* read old CRC */
eeprom_read (CFG_DEF_EEPROM_ADDR, eeprom_read (CFG_DEF_EEPROM_ADDR,
CFG_ENV_OFFSET, CONFIG_ENV_OFFSET,
(uchar *)&crc, sizeof(ulong)); (uchar *)&crc, sizeof(ulong));
new = 0; new = 0;
@ -333,7 +333,7 @@ int check_env_old_size(ulong oldsize)
while (len > 0) { while (len > 0) {
int n = (len > sizeof(buf)) ? sizeof(buf) : len; int n = (len > sizeof(buf)) ? sizeof(buf) : len;
eeprom_read (CFG_DEF_EEPROM_ADDR, CFG_ENV_OFFSET+off, buf, n); eeprom_read (CFG_DEF_EEPROM_ADDR, CONFIG_ENV_OFFSET+off, buf, n);
new = crc32 (new, buf, n); new = crc32 (new, buf, n);
len -= n; len -= n;
off += n; off += n;
@ -362,7 +362,7 @@ void copy_old_env(ulong size)
len=size; len=size;
off = sizeof(long); off = sizeof(long);
while (len > off) { while (len > off) {
eeprom_read (CFG_DEF_EEPROM_ADDR, CFG_ENV_OFFSET+off, &c, 1); eeprom_read (CFG_DEF_EEPROM_ADDR, CONFIG_ENV_OFFSET+off, &c, 1);
if(c != '=') { if(c != '=') {
*name++=c; *name++=c;
off++; off++;
@ -371,7 +371,7 @@ void copy_old_env(ulong size)
*name++='\0'; *name++='\0';
off++; off++;
do { do {
eeprom_read (CFG_DEF_EEPROM_ADDR, CFG_ENV_OFFSET+off, &c, 1); eeprom_read (CFG_DEF_EEPROM_ADDR, CONFIG_ENV_OFFSET+off, &c, 1);
*value++=c; *value++=c;
off++; off++;
if(c == '\0') if(c == '\0')

4
board/mpl/common/flash.c
View file

@ -259,8 +259,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
#endif /* #if !defined(CONFIG_PATI) */ #endif /* #if !defined(CONFIG_PATI) */

2
board/mpl/pati/pati.c
View file

@ -615,4 +615,4 @@ void pci_con_disc(void)
/* /*
* Absolute environment address for linker file. * Absolute environment address for linker file.
*/ */
GEN_ABS(env_start, CFG_ENV_OFFSET + CFG_FLASH_BASE); GEN_ABS(env_start, CONFIG_ENV_OFFSET + CFG_FLASH_BASE);

4
board/mpl/vcma9/flash.c
View file

@ -116,8 +116,8 @@ ulong flash_init (void)
&flash_info[0]); &flash_info[0]);
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
return size; return size;
} }

22
board/musenki/flash.c
View file

@ -25,14 +25,14 @@
#include <mpc824x.h> #include <mpc824x.h>
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -155,10 +155,10 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
DEBUGF("protect environtment %x @ %x\n", CFG_ENV_ADDR, CFG_ENV_SECT_SIZE); DEBUGF("protect environtment %x @ %x\n", CONFIG_ENV_ADDR, CONFIG_ENV_SECT_SIZE);
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
@ -177,8 +177,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,
&flash_info[1]); &flash_info[1]);
#endif #endif
} else { } else {

4
board/mx1ads/syncflash.c
View file

@ -183,8 +183,8 @@ ulong flash_init(void) {
&flash_info[0]); &flash_info[0]);
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
return FLASH_BANK_SIZE; return FLASH_BANK_SIZE;

4
board/mx1fs2/flash.c
View file

@ -106,8 +106,8 @@ flash_init(void)
&flash_info[0]); &flash_info[0]);
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
return size; return size;
} }

16
board/nc650/flash.c
View file

@ -42,14 +42,14 @@ DECLARE_GLOBAL_DATA_PTR;
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -174,8 +174,8 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

10
board/netphone/flash.c
View file

@ -72,14 +72,14 @@ unsigned long flash_init(void)
&flash_info[0]); &flash_info[0]);
flash_protect ( FLAG_PROTECT_SET, flash_protect ( FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#ifdef CFG_ENV_ADDR_REDUND #ifdef CONFIG_ENV_ADDR_REDUND
flash_protect ( FLAG_PROTECT_SET, flash_protect ( FLAG_PROTECT_SET,
CFG_ENV_ADDR_REDUND, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

6
board/netstal/hcu5/hcu5.c
View file

@ -247,11 +247,11 @@ int misc_init_r(void)
0xffffffff, 0xffffffff,
&flash_info[0]); &flash_info[0]);
#ifdef CFG_ENV_ADDR_REDUND #ifdef CONFIG_ENV_ADDR_REDUND
/* Env protection ON by default */ /* Env protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET, (void)flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR_REDUND, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif
#endif #endif

10
board/netta/flash.c
View file

@ -68,14 +68,14 @@ unsigned long flash_init(void)
&flash_info[0]); &flash_info[0]);
flash_protect ( FLAG_PROTECT_SET, flash_protect ( FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#ifdef CFG_ENV_ADDR_REDUND #ifdef CONFIG_ENV_ADDR_REDUND
flash_protect ( FLAG_PROTECT_SET, flash_protect ( FLAG_PROTECT_SET,
CFG_ENV_ADDR_REDUND, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

10
board/netta2/flash.c
View file

@ -69,14 +69,14 @@ unsigned long flash_init(void)
&flash_info[0]); &flash_info[0]);
flash_protect ( FLAG_PROTECT_SET, flash_protect ( FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#ifdef CFG_ENV_ADDR_REDUND #ifdef CONFIG_ENV_ADDR_REDUND
flash_protect ( FLAG_PROTECT_SET, flash_protect ( FLAG_PROTECT_SET,
CFG_ENV_ADDR_REDUND, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

10
board/netvia/flash.c
View file

@ -68,14 +68,14 @@ unsigned long flash_init(void)
&flash_info[0]); &flash_info[0]);
flash_protect ( FLAG_PROTECT_SET, flash_protect ( FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#ifdef CFG_ENV_ADDR_REDUND #ifdef CONFIG_ENV_ADDR_REDUND
flash_protect ( FLAG_PROTECT_SET, flash_protect ( FLAG_PROTECT_SET,
CFG_ENV_ADDR_REDUND, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

4
board/ns9750dev/flash.c
View file

@ -108,8 +108,8 @@ unsigned long flash_init (void)
CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]); CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]);
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
return size; return size;
} }

6
board/o2dnt/flash.c
View file

@ -106,9 +106,9 @@ unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
flash_get_info(CFG_ENV_ADDR)); flash_get_info(CONFIG_ENV_ADDR));
#endif #endif

4
board/omap1610inn/flash.c
View file

@ -112,8 +112,8 @@ unsigned long flash_init (void)
CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]); CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]);
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
return size; return size;
} }

4
board/omap730p2/flash.c
View file

@ -108,8 +108,8 @@ unsigned long flash_init (void)
CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]); CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]);
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
return size; return size;
} }

10
board/oxc/flash.c
View file

@ -73,13 +73,13 @@ unsigned long flash_init (void)
&flash_info[0]); &flash_info[0]);
#endif #endif
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR) #if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

Some files were not shown because too many files have changed in this diff Show more