Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 13:43:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH

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:04 +02:00
parent 7d9b5bae5b
commit 5a1aceb068
463 changed files with 591 additions and 591 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README
View file

@ -2104,7 +2104,7 @@ The following definitions that deal with the placement and management
of environment data (variable area); in general, we support the
following configurations:
- CFG_ENV_IS_IN_FLASH:
- CONFIG_ENV_IS_IN_FLASH:
Define this if the environment is in flash memory.
@ -2146,7 +2146,7 @@ following configurations:
- CFG_ENV_SIZE:
If you use this in combination with CFG_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
of this flash sector for the environment. This saves
memory for the RAM copy of the environment.

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

@ -122,7 +122,7 @@ flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

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

@ -123,7 +123,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

2
board/RPXlite_dw/README
View file

@ -21,7 +21,7 @@ make distclean
make RPXlite_DW_64_config
make all
2. CFG_ENV_IS_IN_FLASH/CONFIG_ENV_IS_IN_NVRAM
2. CONFIG_ENV_IS_IN_FLASH/CONFIG_ENV_IS_IN_NVRAM
The default environment parameter is stored in FLASH because it is a common choice for
environment parameter.So I make NVRAM as backup parameter storeage.The reason why I

2
board/RRvision/flash.c
View file

@ -77,7 +77,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

4
board/a3000/flash.c
View file

@ -25,7 +25,7 @@
#include <common.h>
#include <mpc824x.h>
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -108,7 +108,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
DEBUGF("protect environtment %x @ %x\n", CFG_ENV_ADDR, CFG_ENV_SECT_SIZE);
flash_protect(FLAG_PROTECT_SET,

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

@ -153,11 +153,11 @@ unsigned long flash_init(void)
(void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[i]);
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
&flash_info[i]);
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR_REDUND)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR_REDUND)
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1,
&flash_info[i]);

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

@ -84,7 +84,7 @@ unsigned long flash_init(void)
CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[0]);
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
&flash_info[0]);

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

@ -124,7 +124,7 @@ unsigned long flash_init(void)
(void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[2]);
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
&flash_info[2]);

2
board/amcc/kilauea/kilauea.c
View file

@ -219,7 +219,7 @@ int board_early_init_f (void)
int misc_init_r(void)
{
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* Monitor protection ON by default */
flash_protect(FLAG_PROTECT_SET,
-CFG_MONITOR_LEN,

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

@ -95,7 +95,7 @@ unsigned long flash_init(void)
(void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[2]);
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
&flash_info[2]);

2
board/amcc/makalu/makalu.c
View file

@ -210,7 +210,7 @@ int board_early_init_f (void)
int misc_init_r(void)
{
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* Monitor protection ON by default */
flash_protect(FLAG_PROTECT_SET,
-CFG_MONITOR_LEN,

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

@ -134,7 +134,7 @@ unsigned long flash_init(void)
(void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[i]);
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
&flash_info[i]);

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

@ -157,7 +157,7 @@ int misc_init_r(void)
*/
flash_get_size(gd->bd->bi_flashstart, 0);
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* Monitor protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
-CFG_MONITOR_LEN,

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

@ -87,7 +87,7 @@ unsigned long flash_init(void)
CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[0]);
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
&flash_info[0]);

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

@ -82,7 +82,7 @@ unsigned long flash_init(void)
CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[0]);
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
&flash_info[0]);

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

@ -1037,7 +1037,7 @@ unsigned long flash_init(void)
(void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[i]);
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
&flash_info[i]);

2
board/atc/flash.c
View file

@ -95,7 +95,7 @@ unsigned long flash_init (void)
flash_get_info(CFG_MONITOR_BASE));
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

4
board/barco/flash.c
View file

@ -58,7 +58,7 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -224,7 +224,7 @@ unsigned long flash_init(void)
&flash_info[0]);
#endif
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1,

4
board/bmw/flash.c
View file

@ -31,7 +31,7 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -224,7 +224,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1,

4
board/c2mon/flash.c
View file

@ -95,7 +95,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,
@ -122,7 +122,7 @@ unsigned long flash_init (void)
&flash_info[1]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

2
board/cmc_pu2/flash.c
View file

@ -71,7 +71,7 @@ unsigned long flash_init (void)
flash_get_info(CFG_MONITOR_BASE));
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

4
board/cmi/flash.c
View file

@ -36,7 +36,7 @@
#include <common.h>
#include <mpc5xx.h>
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -110,7 +110,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

4
board/cogent/flash.c
View file

@ -26,7 +26,7 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -327,7 +327,7 @@ flash_init(void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

4
board/cpc45/flash.c
View file

@ -25,7 +25,7 @@
#include <mpc824x.h>
#include <asm/processor.h>
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -174,7 +174,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if CFG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE
flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR,

2
board/cpu86/flash.c
View file

@ -230,7 +230,7 @@ unsigned long flash_init (void)
#endif
#endif
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
# ifndef CFG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
# endif

2
board/cpu87/flash.c
View file

@ -236,7 +236,7 @@ unsigned long flash_init (void)
#endif
#endif
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
# ifndef CFG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
# endif

4
board/cu824/flash.c
View file

@ -25,7 +25,7 @@
#include <mpc824x.h>
#include <asm/processor.h>
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -135,7 +135,7 @@ unsigned long flash_init(void)
#endif
#endif
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if CFG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

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

@ -113,7 +113,7 @@ unsigned long flash_init (void)
flash_get_info(CFG_MONITOR_BASE));
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

2
board/ep8260/flash.c
View file

@ -157,7 +157,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
# ifndef CFG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
# endif

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

@ -76,7 +76,7 @@ unsigned long flash_init(void)
flash_get_info(CFG_MONITOR_BASE));
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1,

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

@ -239,7 +239,7 @@ int misc_init_r(void)
*/
flash_get_size(gd->bd->bi_flashstart, 0);
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* Monitor protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
-CFG_MONITOR_LEN,

2
board/evb64260/flash.c
View file

@ -119,7 +119,7 @@ flash_init (void)
flash_get_info(CFG_MONITOR_BASE));
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

2
board/exbitgen/flash.c
View file

@ -126,7 +126,7 @@ unsigned long flash_init (void)
#endif
#endif
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1,

2
board/fads/fads.h
View file

@ -226,7 +226,7 @@
#define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CFG_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 CFG_ENV_OFFSET CFG_ENV_SECT_SIZE
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment */

4
board/fads/flash.c
View file

@ -26,7 +26,7 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -124,7 +124,7 @@ unsigned long flash_init (void)
&flash_info[i]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
if (CFG_ENV_ADDR >= flash_info[i].start[0])
flash_protect (FLAG_PROTECT_SET,

2
board/flagadm/flash.c
View file

@ -81,7 +81,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_OFFSET,

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

@ -155,7 +155,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

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

@ -31,7 +31,7 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -105,7 +105,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

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

@ -151,7 +151,7 @@ flash_init(void)
CFG_MONITOR_FLASH+CFG_MONITOR_LEN-1,
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1,

4
board/gen860t/flash.c
View file

@ -25,7 +25,7 @@
#include <common.h>
#include <mpc8xx.h>
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -161,7 +161,7 @@ flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/*
* Environment protection ON by default
*/

2
board/gw8260/flash.c
View file

@ -100,7 +100,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
# ifndef CFG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
# endif

4
board/hidden_dragon/flash.c
View file

@ -35,7 +35,7 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -212,7 +212,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1,

2
board/icecube/flash.c
View file

@ -88,7 +88,7 @@ unsigned long flash_init (void)
flash_get_info(CFG_MONITOR_BASE));
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

4
board/icu862/flash.c
View file

@ -26,7 +26,7 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -108,7 +108,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

4
board/ids8247/flash.c
View file

@ -33,7 +33,7 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -113,7 +113,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR,

2
board/incaip/flash.c
View file

@ -104,7 +104,7 @@ unsigned long flash_init (void)
flash_get_info(CFG_MONITOR_BASE));
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

2
board/innokom/flash.c
View file

@ -114,7 +114,7 @@ ulong flash_init(void)
CFG_FLASH_BASE + (256*1024) - 1,
&flash_info[0]);
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1,

2
board/integratorcp/flash.c
View file

@ -125,7 +125,7 @@ unsigned long flash_init (void)
CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

4
board/ip860/flash.c
View file

@ -26,7 +26,7 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -94,7 +94,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

2
board/iphase4539/flash.c
View file

@ -75,7 +75,7 @@ unsigned long flash_init (void)
flash_info + bank);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

4
board/ivm/flash.c
View file

@ -26,7 +26,7 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -91,7 +91,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

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

@ -78,7 +78,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

6
board/lantec/flash.c
View file

@ -29,7 +29,7 @@
#include <common.h>
#include <mpc8xx.h>
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -138,7 +138,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,
@ -170,7 +170,7 @@ unsigned long flash_init (void)
&flash_info[1]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

6
board/lwmon/flash.c
View file

@ -26,7 +26,7 @@
#include <common.h>
#include <mpc8xx.h>
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -130,7 +130,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,
@ -163,7 +163,7 @@ unsigned long flash_init (void)
&flash_info[1]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

4
board/mpc8540eval/flash.c
View file

@ -35,7 +35,7 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -103,7 +103,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

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

@ -256,7 +256,7 @@ unsigned long flash_init (void)
p++;
}
#else /* #if !defined(CONFIG_PATI) */
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

6
board/musenki/flash.c
View file

@ -24,7 +24,7 @@
#include <common.h>
#include <mpc824x.h>
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -153,7 +153,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
DEBUGF("protect environtment %x @ %x\n", CFG_ENV_ADDR, CFG_ENV_SECT_SIZE);
flash_protect(FLAG_PROTECT_SET,
@ -174,7 +174,7 @@ unsigned long flash_init (void)
&flash_info[1]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

4
board/nc650/flash.c
View file

@ -41,7 +41,7 @@ DECLARE_GLOBAL_DATA_PTR;
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -171,7 +171,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR,

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

@ -240,7 +240,7 @@ int misc_init_r(void)
unsigned long usb2phy0cr, usb2h0cr = 0;
unsigned long sdr0_pfc1;
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* Monitor protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
-CFG_MONITOR_LEN,

2
board/o2dnt/flash.c
View file

@ -103,7 +103,7 @@ unsigned long flash_init (void)
flash_get_info(CFG_MONITOR_BASE));
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

2
board/oxc/flash.c
View file

@ -73,7 +73,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
# ifndef CFG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
# endif

2
board/pcippc2/flash.c
View file

@ -74,7 +74,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

2
board/pm520/flash.c
View file

@ -119,7 +119,7 @@ unsigned long flash_init (void)
#endif
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
flash_protect ( FLAG_PROTECT_SET,
CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0] );

2
board/pm826/flash.c
View file

@ -144,7 +144,7 @@ unsigned long flash_init (void)
# endif
#endif /* CONFIG_BOOT_ROM */
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
# ifndef CFG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
# endif

2
board/pm828/flash.c
View file

@ -144,7 +144,7 @@ unsigned long flash_init (void)
# endif
#endif /* CONFIG_BOOT_ROM */
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
# ifndef CFG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
# endif

2
board/ppmc7xx/flash.c
View file

@ -197,7 +197,7 @@ unsigned long flash_init (void)
CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
#endif
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
# ifndef CFG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
# endif

2
board/purple/flash.c
View file

@ -237,7 +237,7 @@ unsigned long flash_init (void)
flash_get_info(CFG_MONITOR_BASE));
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

4
board/r360mpi/flash.c
View file

@ -31,7 +31,7 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -111,7 +111,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR,

2
board/rmu/flash.c
View file

@ -81,7 +81,7 @@ unsigned long flash_init (void)
CFG_MONITOR_BASE+monitor_flash_len-1,
&flash_info[0]);
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

2
board/rpxsuper/flash.c
View file

@ -71,7 +71,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
# ifndef CFG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
# endif

2
board/rsdproto/flash.c
View file

@ -131,7 +131,7 @@ unsigned long flash_init (void)
&flash_info[1]);
#endif
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
# ifndef CFG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
# endif

4
board/sacsng/flash.c
View file

@ -73,7 +73,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,
@ -90,7 +90,7 @@ unsigned long flash_init (void)
&flash_info[1]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

4
board/sandpoint/flash.c
View file

@ -32,7 +32,7 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -230,7 +230,7 @@ flash_init(void)
&flash_info[0]);
#endif
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1,

2
board/sbc8260/flash.c
View file

@ -67,7 +67,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
# ifndef CFG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
# endif

2
board/siemens/SCM/flash.c
View file

@ -207,7 +207,7 @@ unsigned long flash_init (void)
CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
#endif
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
# ifndef CFG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
# endif

6
board/siemens/pcu_e/flash.c
View file

@ -24,7 +24,7 @@
#include <common.h>
#include <mpc8xx.h>
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -151,7 +151,7 @@ unsigned long flash_init (void)
PCU_MONITOR_BASE+monitor_flash_len-1,
&flash_info[0]);
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,
@ -178,7 +178,7 @@ unsigned long flash_init (void)
flash_info[1].size = size_b1;
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

4
board/sl8245/flash.c
View file

@ -25,7 +25,7 @@
#include <mpc824x.h>
#include <asm/processor.h>
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -139,7 +139,7 @@ unsigned long flash_init (void)
#endif
#endif
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if CFG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE
flash_protect ( FLAG_PROTECT_SET,
CFG_ENV_ADDR,

4
board/stxgp3/flash.c
View file

@ -41,7 +41,7 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -99,7 +99,7 @@ unsigned long flash_init (void)
CFG_MONITOR_BASE+monitor_flash_len-1,
&flash_info[0]);
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

4
board/svm_sc8xx/flash.c
View file

@ -152,7 +152,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,
@ -179,7 +179,7 @@ unsigned long flash_init (void)
&flash_info[1]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

2
board/tqc/tqm5200/cam5200_flash.c
View file

@ -768,7 +768,7 @@ unsigned long flash_init(void)
(void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[i]);
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
&flash_info[i]);

2
board/tqc/tqm8260/flash.c
View file

@ -207,7 +207,7 @@ unsigned long flash_init (void)
CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
#endif
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
# ifndef CFG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
# endif

4
board/tqc/tqm8xx/flash.c
View file

@ -176,7 +176,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
# ifdef CFG_ENV_ADDR_REDUND
debug ("Protect primary environment: %08lx ... %08lx\n",
@ -229,7 +229,7 @@ unsigned long flash_init (void)
&flash_info[1]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

4
board/utx8245/flash.c
View file

@ -33,7 +33,7 @@
#define ROM_CS0_START 0xFF800000
#define ROM_CS1_START 0xFF000000
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -169,7 +169,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
flash_protect (FLAG_PROTECT_SET, CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
#endif

6
board/westel/amx860/flash.c
View file

@ -26,7 +26,7 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CFG_ENV_IS_IN_FLASH)
#if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
# endif
@ -134,7 +134,7 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,
@ -166,7 +166,7 @@ unsigned long flash_init (void)
&flash_info[1]);
# endif
# ifdef CFG_ENV_IS_IN_FLASH
# ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR,

2
common/cmd_nvedit.c
View file

@ -54,7 +54,7 @@ DECLARE_GLOBAL_DATA_PTR;
#if !defined(CONFIG_ENV_IS_IN_NVRAM) && \
!defined(CONFIG_ENV_IS_IN_EEPROM) && \
!defined(CFG_ENV_IS_IN_FLASH) && \
!defined(CONFIG_ENV_IS_IN_FLASH) && \
!defined(CONFIG_ENV_IS_IN_DATAFLASH) && \
!defined(CONFIG_ENV_IS_IN_NAND) && \
!defined(CONFIG_ENV_IS_IN_ONENAND) && \

4
common/env_flash.c
View file

@ -28,7 +28,7 @@
#include <common.h>
#if defined(CFG_ENV_IS_IN_FLASH) /* Environment is in Flash */
#if defined(CONFIG_ENV_IS_IN_FLASH) /* Environment is in Flash */
#include <command.h>
#include <environment.h>
@ -384,4 +384,4 @@ void env_relocate_spec (void)
#endif /* ! ENV_IS_EMBEDDED || CFG_ENV_ADDR_REDUND */
}
#endif /* CFG_ENV_IS_IN_FLASH */
#endif /* CONFIG_ENV_IS_IN_FLASH */

4
drivers/mtd/cfi_flash.c
View file

@ -255,7 +255,7 @@ u64 flash_read64(void *addr)__attribute__((weak, alias("__flash_read64")));
/*-----------------------------------------------------------------------
*/
#if defined(CFG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
#if defined(CONFIG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
static flash_info_t *flash_get_info(ulong base)
{
int i;
@ -2031,7 +2031,7 @@ unsigned long flash_init (void)
#endif
/* Environment protection ON by default */
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,

2
include/configs/A3000.h
View file

@ -297,7 +297,7 @@
/* Warining: environment is not EMBEDDED in the U-Boot code.
* It's stored in flash separately.
*/
#define CFG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR 0xFFFE0000
#define CFG_ENV_SIZE 0x00020000 /* Size of the Environment */
#define CFG_ENV_SECT_SIZE 0x00020000 /* Size of the Environment Sector */

2
include/configs/ADCIOP.h
View file

@ -170,7 +170,7 @@
#else /* Use FLASH for environment variables */
#define CFG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x00010000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */

2
include/configs/ADNPESC1.h
View file

@ -116,7 +116,7 @@
*----------------------------------------------------------------------*/
#if (CFG_NIOS_CPU_FLASH_SIZE != 0)
#define CFG_ENV_IS_IN_FLASH 1 /* Environment in flash */
#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */
/* Mem addr of environment */
#if defined(CONFIG_NIOS_BASE_32)

2
include/configs/AMX860.h
View file

@ -199,7 +199,7 @@
#define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CFG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */

8
include/configs/AP1000.h
View file

@ -37,13 +37,13 @@
#define CONFIG_COMMAND_HISTORY 1
#define CONFIG_COMPLETE_ADDRESSES 1
#define CFG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_USE_BUFFER_WRITE
#ifdef CONFIG_ENV_IS_IN_NVRAM
#undef CFG_ENV_IS_IN_FLASH
#undef CONFIG_ENV_IS_IN_FLASH
#else
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
#undef CONFIG_ENV_IS_IN_NVRAM
#endif
#endif
@ -174,7 +174,7 @@
#define CFG_FLASH_PROTECTION 1 /* use hardware protection */
/* BEG ENVIRONNEMENT FLASH */
#ifdef CFG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_OFFSET 0x00040000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x20000 /* see README - env sector total size */

2
include/configs/AR405.h
View file

@ -205,7 +205,7 @@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CFG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR 0xFFFB0000 /* Address of Environment Sector*/
#define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */
#define CFG_ENV_SIZE 0x04000 /* Size of Environment */

2
include/configs/ATUM8548.h
View file

@ -333,7 +333,7 @@
/*
* Environment
*/
#define CFG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000)
#define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */
#define CFG_ENV_SIZE 0x2000

2
include/configs/Adder.h
View file

@ -148,7 +148,7 @@
#define CFG_MAX_FLASH_SECT 128 /* Max num of sects on one chip */
/* Environment is in flash */
#define CFG_ENV_IS_IN_FLASH
#define CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x10000 /* We use one complete sector */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)

8
include/configs/Alaska8220.h
View file

@ -205,7 +205,7 @@
/*
* Environment settings
*/
#define CFG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
#if defined (CFG_AMD_BOOT)
#define CFG_ENV_ADDR (CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_AMD_SECT_SIZE)
#define CFG_ENV_SIZE PHYS_AMD_SECT_SIZE
@ -224,15 +224,15 @@
#define CONFIG_ENV_OVERWRITE 1
#if defined CFG_ENV_IS_IN_FLASH
#if defined CONFIG_ENV_IS_IN_FLASH
#undef CONFIG_ENV_IS_IN_NVRAM
#undef CONFIG_ENV_IS_IN_EEPROM
#elif defined CONFIG_ENV_IS_IN_NVRAM
#undef CFG_ENV_IS_IN_FLASH
#undef CONFIG_ENV_IS_IN_FLASH
#undef CONFIG_ENV_IS_IN_EEPROM
#elif defined CONFIG_ENV_IS_IN_EEPROM
#undef CONFIG_ENV_IS_IN_NVRAM
#undef CFG_ENV_IS_IN_FLASH
#undef CONFIG_ENV_IS_IN_FLASH
#endif
/*

2
include/configs/BC3450.h
View file

@ -358,7 +358,7 @@
/*
* Environment settings
*/
#define CFG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x10000
#define CFG_ENV_SECT_SIZE 0x20000
#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE)

2
include/configs/CANBT.h
View file

@ -155,7 +155,7 @@
#if 0 /* Use FLASH for environment variables */
#define CFG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x00010000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */

2
include/configs/CATcenter.h
View file

@ -393,7 +393,7 @@
/*-----------------------------------------------------------------------
* Environment Variable setup
*/
#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#define CFG_ENV_ADDR 0xFFFF8000 /* environment starts at the first small sector */
#define CFG_ENV_SECT_SIZE 0x2000 /* 8196 bytes may be used for env vars*/
#define CFG_ENV_ADDR_REDUND 0xFFFFA000

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