summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
Diffstat (limited to 'board')
-rw-r--r--board/LEOX/elpt860/flash.c2
-rw-r--r--board/MAI/AmigaOneG3SE/flash_new.c2
-rw-r--r--board/RPXlite_dw/README2
-rw-r--r--board/RRvision/flash.c2
-rw-r--r--board/a3000/flash.c4
-rw-r--r--board/amcc/bamboo/flash.c4
-rw-r--r--board/amcc/bubinga/flash.c2
-rw-r--r--board/amcc/ebony/flash.c2
-rw-r--r--board/amcc/kilauea/kilauea.c2
-rw-r--r--board/amcc/luan/flash.c2
-rw-r--r--board/amcc/makalu/makalu.c2
-rw-r--r--board/amcc/ocotea/flash.c2
-rw-r--r--board/amcc/sequoia/sequoia.c2
-rw-r--r--board/amcc/taihu/flash.c2
-rw-r--r--board/amcc/walnut/flash.c2
-rw-r--r--board/amcc/yucca/flash.c2
-rw-r--r--board/atc/flash.c2
-rw-r--r--board/barco/flash.c4
-rw-r--r--board/bmw/flash.c4
-rw-r--r--board/c2mon/flash.c4
-rw-r--r--board/cmc_pu2/flash.c2
-rw-r--r--board/cmi/flash.c4
-rw-r--r--board/cogent/flash.c4
-rw-r--r--board/cpc45/flash.c4
-rw-r--r--board/cpu86/flash.c2
-rw-r--r--board/cpu87/flash.c2
-rw-r--r--board/cu824/flash.c4
-rw-r--r--board/emk/common/flash.c2
-rw-r--r--board/ep8260/flash.c2
-rw-r--r--board/esd/pf5200/flash.c2
-rw-r--r--board/esd/pmc440/pmc440.c2
-rw-r--r--board/evb64260/flash.c2
-rw-r--r--board/exbitgen/flash.c2
-rw-r--r--board/fads/fads.h2
-rw-r--r--board/fads/flash.c4
-rw-r--r--board/flagadm/flash.c2
-rw-r--r--board/freescale/mpc8260ads/flash.c2
-rw-r--r--board/freescale/mpc8266ads/flash.c4
-rw-r--r--board/funkwerk/vovpn-gw/flash.c2
-rw-r--r--board/gen860t/flash.c4
-rw-r--r--board/gw8260/flash.c2
-rw-r--r--board/hidden_dragon/flash.c4
-rw-r--r--board/icecube/flash.c2
-rw-r--r--board/icu862/flash.c4
-rw-r--r--board/ids8247/flash.c4
-rw-r--r--board/incaip/flash.c2
-rw-r--r--board/innokom/flash.c2
-rw-r--r--board/integratorcp/flash.c2
-rw-r--r--board/ip860/flash.c4
-rw-r--r--board/iphase4539/flash.c2
-rw-r--r--board/ivm/flash.c4
-rw-r--r--board/kup/common/flash.c2
-rw-r--r--board/lantec/flash.c6
-rw-r--r--board/lwmon/flash.c6
-rw-r--r--board/mpc8540eval/flash.c4
-rw-r--r--board/mpl/common/flash.c2
-rw-r--r--board/musenki/flash.c6
-rw-r--r--board/nc650/flash.c4
-rw-r--r--board/netstal/hcu5/hcu5.c2
-rw-r--r--board/o2dnt/flash.c2
-rw-r--r--board/oxc/flash.c2
-rw-r--r--board/pcippc2/flash.c2
-rw-r--r--board/pm520/flash.c2
-rw-r--r--board/pm826/flash.c2
-rw-r--r--board/pm828/flash.c2
-rw-r--r--board/ppmc7xx/flash.c2
-rw-r--r--board/purple/flash.c2
-rw-r--r--board/r360mpi/flash.c4
-rw-r--r--board/rmu/flash.c2
-rw-r--r--board/rpxsuper/flash.c2
-rw-r--r--board/rsdproto/flash.c2
-rw-r--r--board/sacsng/flash.c4
-rw-r--r--board/sandpoint/flash.c4
-rw-r--r--board/sbc8260/flash.c2
-rw-r--r--board/siemens/SCM/flash.c2
-rw-r--r--board/siemens/pcu_e/flash.c6
-rw-r--r--board/sl8245/flash.c4
-rw-r--r--board/stxgp3/flash.c4
-rw-r--r--board/svm_sc8xx/flash.c4
-rw-r--r--board/tqc/tqm5200/cam5200_flash.c2
-rw-r--r--board/tqc/tqm8260/flash.c2
-rw-r--r--board/tqc/tqm8xx/flash.c4
-rw-r--r--board/utx8245/flash.c4
-rw-r--r--board/westel/amx860/flash.c6
84 files changed, 121 insertions, 121 deletions
diff --git a/board/LEOX/elpt860/flash.c b/board/LEOX/elpt860/flash.c
index c1b3b85..d77af35 100644
--- a/board/LEOX/elpt860/flash.c
+++ b/board/LEOX/elpt860/flash.c
@@ -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,
diff --git a/board/MAI/AmigaOneG3SE/flash_new.c b/board/MAI/AmigaOneG3SE/flash_new.c
index d46bf46..5e15e20 100644
--- a/board/MAI/AmigaOneG3SE/flash_new.c
+++ b/board/MAI/AmigaOneG3SE/flash_new.c
@@ -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,
diff --git a/board/RPXlite_dw/README b/board/RPXlite_dw/README
index 60580c9..14296b2 100644
--- a/board/RPXlite_dw/README
+++ b/board/RPXlite_dw/README
@@ -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
diff --git a/board/RRvision/flash.c b/board/RRvision/flash.c
index d8e07e6..287bbac 100644
--- a/board/RRvision/flash.c
+++ b/board/RRvision/flash.c
@@ -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,
diff --git a/board/a3000/flash.c b/board/a3000/flash.c
index 13a5ca5..98a027e 100644
--- a/board/a3000/flash.c
+++ b/board/a3000/flash.c
@@ -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,
diff --git a/board/amcc/bamboo/flash.c b/board/amcc/bamboo/flash.c
index 8a2e832..f23fc24 100644
--- a/board/amcc/bamboo/flash.c
+++ b/board/amcc/bamboo/flash.c
@@ -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]);
diff --git a/board/amcc/bubinga/flash.c b/board/amcc/bubinga/flash.c
index e4832eb..0295b8c 100644
--- a/board/amcc/bubinga/flash.c
+++ b/board/amcc/bubinga/flash.c
@@ -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]);
diff --git a/board/amcc/ebony/flash.c b/board/amcc/ebony/flash.c
index e8fbbc4..b49e05f 100644
--- a/board/amcc/ebony/flash.c
+++ b/board/amcc/ebony/flash.c
@@ -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]);
diff --git a/board/amcc/kilauea/kilauea.c b/board/amcc/kilauea/kilauea.c
index 7b10255..f407e19 100644
--- a/board/amcc/kilauea/kilauea.c
+++ b/board/amcc/kilauea/kilauea.c
@@ -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,
diff --git a/board/amcc/luan/flash.c b/board/amcc/luan/flash.c
index d3c3c0d..3b2f9b7 100644
--- a/board/amcc/luan/flash.c
+++ b/board/amcc/luan/flash.c
@@ -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]);
diff --git a/board/amcc/makalu/makalu.c b/board/amcc/makalu/makalu.c
index 2b4d3d4..fc79907 100644
--- a/board/amcc/makalu/makalu.c
+++ b/board/amcc/makalu/makalu.c
@@ -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,
diff --git a/board/amcc/ocotea/flash.c b/board/amcc/ocotea/flash.c
index 5614e20..88a76f7 100644
--- a/board/amcc/ocotea/flash.c
+++ b/board/amcc/ocotea/flash.c
@@ -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]);
diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c
index 176d5cf..c682c8e 100644
--- a/board/amcc/sequoia/sequoia.c
+++ b/board/amcc/sequoia/sequoia.c
@@ -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,
diff --git a/board/amcc/taihu/flash.c b/board/amcc/taihu/flash.c
index 290259e..8ffcc39 100644
--- a/board/amcc/taihu/flash.c
+++ b/board/amcc/taihu/flash.c
@@ -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]);
diff --git a/board/amcc/walnut/flash.c b/board/amcc/walnut/flash.c
index 056f9b9..d47d263 100644
--- a/board/amcc/walnut/flash.c
+++ b/board/amcc/walnut/flash.c
@@ -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]);
diff --git a/board/amcc/yucca/flash.c b/board/amcc/yucca/flash.c
index 15b8a46..9256938 100644
--- a/board/amcc/yucca/flash.c
+++ b/board/amcc/yucca/flash.c
@@ -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]);
diff --git a/board/atc/flash.c b/board/atc/flash.c
index 2ab60e8..9e4c6c5 100644
--- a/board/atc/flash.c
+++ b/board/atc/flash.c
@@ -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,
diff --git a/board/barco/flash.c b/board/barco/flash.c
index 9502560..c6a01ca 100644
--- a/board/barco/flash.c
+++ b/board/barco/flash.c
@@ -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,
diff --git a/board/bmw/flash.c b/board/bmw/flash.c
index 6d3cfab..4c7971a 100644
--- a/board/bmw/flash.c
+++ b/board/bmw/flash.c
@@ -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,
diff --git a/board/c2mon/flash.c b/board/c2mon/flash.c
index b2be21c..2a5e050 100644
--- a/board/c2mon/flash.c
+++ b/board/c2mon/flash.c
@@ -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,
diff --git a/board/cmc_pu2/flash.c b/board/cmc_pu2/flash.c
index 9983c7b..0419d76 100644
--- a/board/cmc_pu2/flash.c
+++ b/board/cmc_pu2/flash.c
@@ -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,
diff --git a/board/cmi/flash.c b/board/cmi/flash.c
index f57d8ec..aec6a8e 100644
--- a/board/cmi/flash.c
+++ b/board/cmi/flash.c
@@ -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,
diff --git a/board/cogent/flash.c b/board/cogent/flash.c
index 969520d..fc3e5ff 100644
--- a/board/cogent/flash.c
+++ b/board/cogent/flash.c
@@ -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,
diff --git a/board/cpc45/flash.c b/board/cpc45/flash.c
index 9a39868..db9a637 100644
--- a/board/cpc45/flash.c
+++ b/board/cpc45/flash.c
@@ -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,
diff --git a/board/cpu86/flash.c b/board/cpu86/flash.c
index b1048a3..e6a14b0 100644
--- a/board/cpu86/flash.c
+++ b/board/cpu86/flash.c
@@ -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
diff --git a/board/cpu87/flash.c b/board/cpu87/flash.c
index 925a0e6..b96a30c 100644
--- a/board/cpu87/flash.c
+++ b/board/cpu87/flash.c
@@ -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
diff --git a/board/cu824/flash.c b/board/cu824/flash.c
index ec1a586..5e55284 100644
--- a/board/cu824/flash.c
+++ b/board/cu824/flash.c
@@ -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,
diff --git a/board/emk/common/flash.c b/board/emk/common/flash.c
index d6161bf..0e8d337 100644
--- a/board/emk/common/flash.c
+++ b/board/emk/common/flash.c
@@ -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,
diff --git a/board/ep8260/flash.c b/board/ep8260/flash.c
index 167f316..8d99640 100644
--- a/board/ep8260/flash.c
+++ b/board/ep8260/flash.c
@@ -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
diff --git a/board/esd/pf5200/flash.c b/board/esd/pf5200/flash.c
index 53afbc0..55419ee 100644
--- a/board/esd/pf5200/flash.c
+++ b/board/esd/pf5200/flash.c
@@ -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,
diff --git a/board/esd/pmc440/pmc440.c b/board/esd/pmc440/pmc440.c
index 0cdaee4..7c8fa74 100644
--- a/board/esd/pmc440/pmc440.c
+++ b/board/esd/pmc440/pmc440.c
@@ -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,
diff --git a/board/evb64260/flash.c b/board/evb64260/flash.c
index 6ab23dc..1691e10 100644
--- a/board/evb64260/flash.c
+++ b/board/evb64260/flash.c
@@ -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,
diff --git a/board/exbitgen/flash.c b/board/exbitgen/flash.c
index 401eead..4d83fd5 100644
--- a/board/exbitgen/flash.c
+++ b/board/exbitgen/flash.c
@@ -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,
diff --git a/board/fads/fads.h b/board/fads/fads.h
index 0a8b983..63b1e62 100644
--- a/board/fads/fads.h
+++ b/board/fads/fads.h
@@ -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 */
diff --git a/board/fads/flash.c b/board/fads/flash.c
index 7cda3a4..742a889 100644
--- a/board/fads/flash.c
+++ b/board/fads/flash.c
@@ -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,
diff --git a/board/flagadm/flash.c b/board/flagadm/flash.c
index fd0082c..3303707 100644
--- a/board/flagadm/flash.c
+++ b/board/flagadm/flash.c
@@ -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,
diff --git a/board/freescale/mpc8260ads/flash.c b/board/freescale/mpc8260ads/flash.c
index 59997aa..5f80f26 100644
--- a/board/freescale/mpc8260ads/flash.c
+++ b/board/freescale/mpc8260ads/flash.c
@@ -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,
diff --git a/board/freescale/mpc8266ads/flash.c b/board/freescale/mpc8266ads/flash.c
index 9512c72..aa533e4 100644
--- a/board/freescale/mpc8266ads/flash.c
+++ b/board/freescale/mpc8266ads/flash.c
@@ -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,
diff --git a/board/funkwerk/vovpn-gw/flash.c b/board/funkwerk/vovpn-gw/flash.c
index 7dd0d3f..935adfa 100644
--- a/board/funkwerk/vovpn-gw/flash.c
+++ b/board/funkwerk/vovpn-gw/flash.c
@@ -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,
diff --git a/board/gen860t/flash.c b/board/gen860t/flash.c
index 13faaf3..c558014 100644
--- a/board/gen860t/flash.c
+++ b/board/gen860t/flash.c
@@ -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
*/
diff --git a/board/gw8260/flash.c b/board/gw8260/flash.c
index 015ea7d..e4b596b 100644
--- a/board/gw8260/flash.c
+++ b/board/gw8260/flash.c
@@ -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
diff --git a/board/hidden_dragon/flash.c b/board/hidden_dragon/flash.c
index a2ed3bd..5fb9578 100644
--- a/board/hidden_dragon/flash.c
+++ b/board/hidden_dragon/flash.c
@@ -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,
diff --git a/board/icecube/flash.c b/board/icecube/flash.c
index 2d4026a..e6cf92e 100644
--- a/board/icecube/flash.c
+++ b/board/icecube/flash.c
@@ -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,
diff --git a/board/icu862/flash.c b/board/icu862/flash.c
index ca5bcf3..625d1a8 100644
--- a/board/icu862/flash.c
+++ b/board/icu862/flash.c
@@ -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,
diff --git a/board/ids8247/flash.c b/board/ids8247/flash.c
index 4eba4b9..522fafe 100644
--- a/board/ids8247/flash.c
+++ b/board/ids8247/flash.c
@@ -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,
diff --git a/board/incaip/flash.c b/board/incaip/flash.c
index 520514d..b510e90 100644
--- a/board/incaip/flash.c
+++ b/board/incaip/flash.c
@@ -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,
diff --git a/board/innokom/flash.c b/board/innokom/flash.c
index 8fc6e5b..2d773b1 100644
--- a/board/innokom/flash.c
+++ b/board/innokom/flash.c
@@ -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,
diff --git a/board/integratorcp/flash.c b/board/integratorcp/flash.c
index 59961cd..2a4256a 100644
--- a/board/integratorcp/flash.c
+++ b/board/integratorcp/flash.c
@@ -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,
diff --git a/board/ip860/flash.c b/board/ip860/flash.c
index 2cf23b3..6bf4d8d 100644
--- a/board/ip860/flash.c
+++ b/board/ip860/flash.c
@@ -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,
diff --git a/board/iphase4539/flash.c b/board/iphase4539/flash.c
index 4eca467..f8ab51a 100644
--- a/board/iphase4539/flash.c
+++ b/board/iphase4539/flash.c
@@ -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,
diff --git a/board/ivm/flash.c b/board/ivm/flash.c
index 140ba2d..f911fdb 100644
--- a/board/ivm/flash.c
+++ b/board/ivm/flash.c
@@ -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,
diff --git a/board/kup/common/flash.c b/board/kup/common/flash.c
index 903c88f..50bf543 100644
--- a/board/kup/common/flash.c
+++ b/board/kup/common/flash.c
@@ -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,
diff --git a/board/lantec/flash.c b/board/lantec/flash.c
index 0faa82c..ddf680a 100644
--- a/board/lantec/flash.c
+++ b/board/lantec/flash.c
@@ -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,
diff --git a/board/lwmon/flash.c b/board/lwmon/flash.c
index b894887..7e4acc2 100644
--- a/board/lwmon/flash.c
+++ b/board/lwmon/flash.c
@@ -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,
diff --git a/board/mpc8540eval/flash.c b/board/mpc8540eval/flash.c
index 79eb04c..b129602 100644
--- a/board/mpc8540eval/flash.c
+++ b/board/mpc8540eval/flash.c
@@ -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,
diff --git a/board/mpl/common/flash.c b/board/mpl/common/flash.c
index eb2702b..a2e0244 100644
--- a/board/mpl/common/flash.c
+++ b/board/mpl/common/flash.c
@@ -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,
diff --git a/board/musenki/flash.c b/board/musenki/flash.c
index cd33d8e..df7bbc5 100644
--- a/board/musenki/flash.c
+++ b/board/musenki/flash.c
@@ -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,
diff --git a/board/nc650/flash.c b/board/nc650/flash.c
index 8d7c172..a7fc084 100644
--- a/board/nc650/flash.c
+++ b/board/nc650/flash.c
@@ -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,
diff --git a/board/netstal/hcu5/hcu5.c b/board/netstal/hcu5/hcu5.c
index 4ecdb25..41fa204 100644
--- a/board/netstal/hcu5/hcu5.c
+++ b/board/netstal/hcu5/hcu5.c
@@ -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,
diff --git a/board/o2dnt/flash.c b/board/o2dnt/flash.c
index 349086f..2aa0489 100644
--- a/board/o2dnt/flash.c
+++ b/board/o2dnt/flash.c
@@ -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,
diff --git a/board/oxc/flash.c b/board/oxc/flash.c
index 4559b80..44e2300 100644
--- a/board/oxc/flash.c
+++ b/board/oxc/flash.c
@@ -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
diff --git a/board/pcippc2/flash.c b/board/pcippc2/flash.c
index 8c01415..b1fec97 100644
--- a/board/pcippc2/flash.c
+++ b/board/pcippc2/flash.c
@@ -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,
diff --git a/board/pm520/flash.c b/board/pm520/flash.c
index 4301b8c..c899ad3 100644
--- a/board/pm520/flash.c
+++ b/board/pm520/flash.c
@@ -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] );
diff --git a/board/pm826/flash.c b/board/pm826/flash.c
index 92a433a..e8e0289 100644
--- a/board/pm826/flash.c
+++ b/board/pm826/flash.c
@@ -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
diff --git a/board/pm828/flash.c b/board/pm828/flash.c
index 0e7bfe8..0620ea3 100644
--- a/board/pm828/flash.c
+++ b/board/pm828/flash.c
@@ -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
diff --git a/board/ppmc7xx/flash.c b/board/ppmc7xx/flash.c
index 4d13612..dd91da7 100644
--- a/board/ppmc7xx/flash.c
+++ b/board/ppmc7xx/flash.c
@@ -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
diff --git a/board/purple/flash.c b/board/purple/flash.c
index 1baae35..ee8a60e 100644
--- a/board/purple/flash.c
+++ b/board/purple/flash.c
@@ -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,
diff --git a/board/r360mpi/flash.c b/board/r360mpi/flash.c
index 9b42960..398e734 100644
--- a/board/r360mpi/flash.c
+++ b/board/r360mpi/flash.c
@@ -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,
diff --git a/board/rmu/flash.c b/board/rmu/flash.c
index 0f2c327..670faf0 100644
--- a/board/rmu/flash.c
+++ b/board/rmu/flash.c
@@ -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,
diff --git a/board/rpxsuper/flash.c b/board/rpxsuper/flash.c
index b29032b..2d17694 100644
--- a/board/rpxsuper/flash.c
+++ b/board/rpxsuper/flash.c
@@ -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
diff --git a/board/rsdproto/flash.c b/board/rsdproto/flash.c
index d9f6b3b..f954458 100644
--- a/board/rsdproto/flash.c
+++ b/board/rsdproto/flash.c
@@ -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
diff --git a/board/sacsng/flash.c b/board/sacsng/flash.c
index 52e01de..f37be29 100644
--- a/board/sacsng/flash.c
+++ b/board/sacsng/flash.c
@@ -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,
diff --git a/board/sandpoint/flash.c b/board/sandpoint/flash.c
index cf06679..60cb191 100644
--- a/board/sandpoint/flash.c
+++ b/board/sandpoint/flash.c
@@ -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,
diff --git a/board/sbc8260/flash.c b/board/sbc8260/flash.c
index c43435f..6d659b2 100644
--- a/board/sbc8260/flash.c
+++ b/board/sbc8260/flash.c
@@ -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
diff --git a/board/siemens/SCM/flash.c b/board/siemens/SCM/flash.c
index 063972d..815f023 100644
--- a/board/siemens/SCM/flash.c
+++ b/board/siemens/SCM/flash.c
@@ -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
diff --git a/board/siemens/pcu_e/flash.c b/board/siemens/pcu_e/flash.c
index 05c364b..5b812cb 100644
--- a/board/siemens/pcu_e/flash.c
+++ b/board/siemens/pcu_e/flash.c
@@ -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,
diff --git a/board/sl8245/flash.c b/board/sl8245/flash.c
index 7fb9463..f41dde0 100644
--- a/board/sl8245/flash.c
+++ b/board/sl8245/flash.c
@@ -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,
diff --git a/board/stxgp3/flash.c b/board/stxgp3/flash.c
index 032989b..25ac301 100644
--- a/board/stxgp3/flash.c
+++ b/board/stxgp3/flash.c
@@ -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,
diff --git a/board/svm_sc8xx/flash.c b/board/svm_sc8xx/flash.c
index 25e61dd..267be78 100644
--- a/board/svm_sc8xx/flash.c
+++ b/board/svm_sc8xx/flash.c
@@ -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,
diff --git a/board/tqc/tqm5200/cam5200_flash.c b/board/tqc/tqm5200/cam5200_flash.c
index b3f095d..bb12aae 100644
--- a/board/tqc/tqm5200/cam5200_flash.c
+++ b/board/tqc/tqm5200/cam5200_flash.c
@@ -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]);
diff --git a/board/tqc/tqm8260/flash.c b/board/tqc/tqm8260/flash.c
index 063972d..815f023 100644
--- a/board/tqc/tqm8260/flash.c
+++ b/board/tqc/tqm8260/flash.c
@@ -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
diff --git a/board/tqc/tqm8xx/flash.c b/board/tqc/tqm8xx/flash.c
index 1231c7c..f9078cf 100644
--- a/board/tqc/tqm8xx/flash.c
+++ b/board/tqc/tqm8xx/flash.c
@@ -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,
diff --git a/board/utx8245/flash.c b/board/utx8245/flash.c
index ae0e659..515d8c2 100644
--- a/board/utx8245/flash.c
+++ b/board/utx8245/flash.c
@@ -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
diff --git a/board/westel/amx860/flash.c b/board/westel/amx860/flash.c
index 12a1335..4d468d3 100644
--- a/board/westel/amx860/flash.c
+++ b/board/westel/amx860/flash.c
@@ -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,