summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/A3000.h2
-rw-r--r--include/configs/ADCIOP.h2
-rw-r--r--include/configs/ADNPESC1.h2
-rw-r--r--include/configs/AMX860.h2
-rw-r--r--include/configs/AP1000.h8
-rw-r--r--include/configs/AR405.h2
-rw-r--r--include/configs/ATUM8548.h2
-rw-r--r--include/configs/Adder.h2
-rw-r--r--include/configs/Alaska8220.h8
-rw-r--r--include/configs/BC3450.h2
-rw-r--r--include/configs/CANBT.h2
-rw-r--r--include/configs/CATcenter.h2
-rw-r--r--include/configs/CCM.h2
-rw-r--r--include/configs/CPC45.h2
-rw-r--r--include/configs/CPCI750.h2
-rw-r--r--include/configs/CPU86.h2
-rw-r--r--include/configs/CPU87.h2
-rw-r--r--include/configs/CRAYL1.h2
-rw-r--r--include/configs/CU824.h2
-rw-r--r--include/configs/DASA_SIM.h2
-rw-r--r--include/configs/DB64360.h2
-rw-r--r--include/configs/DB64460.h2
-rw-r--r--include/configs/DK1C20.h2
-rw-r--r--include/configs/DK1S10.h2
-rw-r--r--include/configs/DU440.h2
-rw-r--r--include/configs/EB+MCF-EV123.h4
-rw-r--r--include/configs/ELPT860.h6
-rw-r--r--include/configs/EP1C20.h2
-rw-r--r--include/configs/EP1S10.h2
-rw-r--r--include/configs/EP1S40.h2
-rw-r--r--include/configs/EP88x.h2
-rw-r--r--include/configs/ERIC.h10
-rw-r--r--include/configs/ESTEEM192E.h2
-rw-r--r--include/configs/ETX094.h2
-rw-r--r--include/configs/EVB64260.h2
-rw-r--r--include/configs/EXBITGEN.h4
-rw-r--r--include/configs/FADS823.h2
-rw-r--r--include/configs/FADS850SAR.h2
-rw-r--r--include/configs/FLAGADM.h2
-rw-r--r--include/configs/FPS850L.h2
-rw-r--r--include/configs/FPS860L.h2
-rw-r--r--include/configs/G2000.h2
-rw-r--r--include/configs/GEN860T.h2
-rw-r--r--include/configs/GENIETV.h2
-rw-r--r--include/configs/GTH.h2
-rw-r--r--include/configs/HIDDEN_DRAGON.h2
-rw-r--r--include/configs/HMI10.h2
-rw-r--r--include/configs/IAD210.h2
-rw-r--r--include/configs/ICU862.h2
-rw-r--r--include/configs/IDS8247.h2
-rw-r--r--include/configs/IP860.h2
-rw-r--r--include/configs/IPHASE4539.h2
-rw-r--r--include/configs/ISPAN.h2
-rw-r--r--include/configs/IVML24.h2
-rw-r--r--include/configs/IVMS8.h2
-rw-r--r--include/configs/IceCube.h2
-rw-r--r--include/configs/JSE.h2
-rw-r--r--include/configs/KAREF.h2
-rw-r--r--include/configs/KUP4K.h2
-rw-r--r--include/configs/KUP4X.h2
-rw-r--r--include/configs/LANTEC.h2
-rw-r--r--include/configs/M52277EVB.h2
-rw-r--r--include/configs/M5235EVB.h2
-rw-r--r--include/configs/M5249EVB.h2
-rw-r--r--include/configs/M5253DEMO.h4
-rw-r--r--include/configs/M5253EVBE.h4
-rw-r--r--include/configs/M5271EVB.h2
-rw-r--r--include/configs/M5272C3.h4
-rw-r--r--include/configs/M5275EVB.h4
-rw-r--r--include/configs/M5282EVB.h2
-rw-r--r--include/configs/M5329EVB.h2
-rw-r--r--include/configs/M5373EVB.h2
-rw-r--r--include/configs/M54451EVB.h2
-rw-r--r--include/configs/M54455EVB.h2
-rw-r--r--include/configs/M5475EVB.h2
-rw-r--r--include/configs/M5485EVB.h2
-rw-r--r--include/configs/METROBOX.h2
-rw-r--r--include/configs/MHPC.h2
-rw-r--r--include/configs/ML2.h8
-rw-r--r--include/configs/MOUSSE.h2
-rw-r--r--include/configs/MPC8260ADS.h2
-rw-r--r--include/configs/MPC8266ADS.h2
-rw-r--r--include/configs/MPC8313ERDB.h2
-rw-r--r--include/configs/MPC8315ERDB.h2
-rw-r--r--include/configs/MPC8323ERDB.h2
-rw-r--r--include/configs/MPC832XEMDS.h2
-rw-r--r--include/configs/MPC8349EMDS.h2
-rw-r--r--include/configs/MPC8349ITX.h2
-rw-r--r--include/configs/MPC8360EMDS.h2
-rw-r--r--include/configs/MPC8360ERDK.h2
-rw-r--r--include/configs/MPC837XEMDS.h2
-rw-r--r--include/configs/MPC837XERDB.h2
-rw-r--r--include/configs/MPC8536DS.h2
-rw-r--r--include/configs/MPC8540ADS.h2
-rw-r--r--include/configs/MPC8540EVAL.h2
-rw-r--r--include/configs/MPC8541CDS.h2
-rw-r--r--include/configs/MPC8544DS.h2
-rw-r--r--include/configs/MPC8548CDS.h2
-rw-r--r--include/configs/MPC8555CDS.h2
-rw-r--r--include/configs/MPC8560ADS.h2
-rw-r--r--include/configs/MPC8568MDS.h2
-rw-r--r--include/configs/MPC8572DS.h2
-rw-r--r--include/configs/MPC8610HPCD.h2
-rw-r--r--include/configs/MPC8641HPCN.h2
-rw-r--r--include/configs/MUSENKI.h2
-rw-r--r--include/configs/MVBC_P.h2
-rw-r--r--include/configs/MVBLM7.h2
-rw-r--r--include/configs/MVBLUE.h2
-rw-r--r--include/configs/MVS1.h2
-rw-r--r--include/configs/MigoR.h2
-rw-r--r--include/configs/NC650.h2
-rw-r--r--include/configs/NETPHONE.h2
-rw-r--r--include/configs/NETTA.h2
-rw-r--r--include/configs/NETTA2.h2
-rw-r--r--include/configs/NETVIA.h2
-rw-r--r--include/configs/NSCU.h2
-rw-r--r--include/configs/NX823.h2
-rw-r--r--include/configs/OXC.h2
-rw-r--r--include/configs/P3G4.h2
-rw-r--r--include/configs/PATI.h4
-rw-r--r--include/configs/PCI5441.h2
-rw-r--r--include/configs/PCIPPC2.h2
-rw-r--r--include/configs/PCIPPC6.h2
-rw-r--r--include/configs/PK1C20.h2
-rw-r--r--include/configs/PM520.h2
-rw-r--r--include/configs/PM826.h2
-rw-r--r--include/configs/PM828.h2
-rw-r--r--include/configs/PM854.h2
-rw-r--r--include/configs/PM856.h2
-rw-r--r--include/configs/PMC440.h2
-rw-r--r--include/configs/PPChameleonEVB.h2
-rw-r--r--include/configs/QS823.h2
-rw-r--r--include/configs/QS850.h2
-rw-r--r--include/configs/QS860T.h2
-rw-r--r--include/configs/R360MPI.h2
-rw-r--r--include/configs/RBC823.h2
-rw-r--r--include/configs/RPXClassic.h2
-rw-r--r--include/configs/RPXlite.h2
-rw-r--r--include/configs/RPXlite_DW.h2
-rw-r--r--include/configs/RPXsuper.h2
-rw-r--r--include/configs/RRvision.h2
-rw-r--r--include/configs/Rattler.h6
-rw-r--r--include/configs/SBC8540.h2
-rw-r--r--include/configs/SCM.h2
-rw-r--r--include/configs/SL8245.h2
-rw-r--r--include/configs/SM850.h2
-rw-r--r--include/configs/SMN42.h2
-rw-r--r--include/configs/SPD823TS.h2
-rw-r--r--include/configs/SX1.h2
-rw-r--r--include/configs/SXNI855T.h4
-rw-r--r--include/configs/Sandpoint8240.h2
-rw-r--r--include/configs/Sandpoint8245.h2
-rw-r--r--include/configs/TASREG.h2
-rw-r--r--include/configs/TB5200.h2
-rw-r--r--include/configs/TK885D.h2
-rw-r--r--include/configs/TQM5200.h2
-rw-r--r--include/configs/TQM823L.h2
-rw-r--r--include/configs/TQM823M.h2
-rw-r--r--include/configs/TQM8260.h2
-rw-r--r--include/configs/TQM8272.h2
-rw-r--r--include/configs/TQM834x.h2
-rw-r--r--include/configs/TQM850L.h2
-rw-r--r--include/configs/TQM850M.h2
-rw-r--r--include/configs/TQM855L.h2
-rw-r--r--include/configs/TQM855M.h2
-rw-r--r--include/configs/TQM85xx.h2
-rw-r--r--include/configs/TQM860L.h2
-rw-r--r--include/configs/TQM860M.h2
-rw-r--r--include/configs/TQM862L.h2
-rw-r--r--include/configs/TQM862M.h2
-rw-r--r--include/configs/TQM866M.h2
-rw-r--r--include/configs/TQM885D.h2
-rw-r--r--include/configs/Total5200.h2
-rw-r--r--include/configs/VCMA9.h2
-rw-r--r--include/configs/VoVPN-GW.h2
-rw-r--r--include/configs/W7OLMC.h2
-rw-r--r--include/configs/W7OLMG.h2
-rw-r--r--include/configs/Yukon8220.h8
-rw-r--r--include/configs/ZPC1900.h4
-rw-r--r--include/configs/ZUMA.h2
-rw-r--r--include/configs/acadia.h4
-rw-r--r--include/configs/actux1.h2
-rw-r--r--include/configs/actux2.h2
-rw-r--r--include/configs/actux3.h2
-rw-r--r--include/configs/actux4.h2
-rw-r--r--include/configs/ads5121.h2
-rw-r--r--include/configs/aev.h2
-rw-r--r--include/configs/alpr.h2
-rw-r--r--include/configs/ap325rxa.h2
-rw-r--r--include/configs/armadillo.h2
-rw-r--r--include/configs/assabet.h4
-rw-r--r--include/configs/at91cap9adk.h2
-rw-r--r--include/configs/at91rm9200dk.h2
-rw-r--r--include/configs/atc.h2
-rw-r--r--include/configs/atngw100.h2
-rw-r--r--include/configs/atstk1002.h2
-rw-r--r--include/configs/atstk1003.h2
-rw-r--r--include/configs/atstk1004.h2
-rw-r--r--include/configs/atstk1006.h2
-rw-r--r--include/configs/bamboo.h6
-rw-r--r--include/configs/barco.h2
-rw-r--r--include/configs/bf533-ezkit.h2
-rw-r--r--include/configs/bf533-stamp.h2
-rw-r--r--include/configs/bf537-stamp.h2
-rw-r--r--include/configs/bf561-ezkit.h2
-rw-r--r--include/configs/bubinga.h6
-rw-r--r--include/configs/c2mon.h2
-rw-r--r--include/configs/canmb.h2
-rw-r--r--include/configs/canyonlands.h6
-rw-r--r--include/configs/cerf250.h2
-rw-r--r--include/configs/cm5200.h2
-rw-r--r--include/configs/cmc_pu2.h2
-rw-r--r--include/configs/cmi_mpc5xx.h4
-rw-r--r--include/configs/cobra5272.h4
-rw-r--r--include/configs/cogent_mpc8260.h2
-rw-r--r--include/configs/cogent_mpc8xx.h2
-rw-r--r--include/configs/cpci5200.h2
-rw-r--r--include/configs/cradle.h2
-rw-r--r--include/configs/csb226.h2
-rw-r--r--include/configs/csb272.h4
-rw-r--r--include/configs/csb472.h4
-rw-r--r--include/configs/csb637.h2
-rw-r--r--include/configs/davinci_dvevm.h4
-rw-r--r--include/configs/davinci_schmoogie.h2
-rw-r--r--include/configs/davinci_sffsdr.h2
-rw-r--r--include/configs/davinci_sonata.h4
-rw-r--r--include/configs/dnp1110.h2
-rw-r--r--include/configs/eXalion.h2
-rw-r--r--include/configs/ebony.h6
-rw-r--r--include/configs/ep7312.h2
-rw-r--r--include/configs/ep8248.h6
-rw-r--r--include/configs/ep8260.h2
-rw-r--r--include/configs/ep82xxm.h6
-rw-r--r--include/configs/evb4510.h2
-rw-r--r--include/configs/favr-32-ezkit.h2
-rw-r--r--include/configs/gcplus.h2
-rw-r--r--include/configs/gr_cpci_ax2000.h2
-rw-r--r--include/configs/gr_ep2s60.h2
-rw-r--r--include/configs/gr_xc3s_1500.h2
-rw-r--r--include/configs/grsim.h2
-rw-r--r--include/configs/grsim_leon2.h2
-rw-r--r--include/configs/gw8260.h2
-rw-r--r--include/configs/hammerhead.h2
-rw-r--r--include/configs/hcu4.h4
-rw-r--r--include/configs/hcu5.h4
-rw-r--r--include/configs/hermes.h2
-rw-r--r--include/configs/hmi1001.h2
-rw-r--r--include/configs/hymod.h2
-rw-r--r--include/configs/idmr.h4
-rw-r--r--include/configs/impa7.h2
-rw-r--r--include/configs/imx31_litekit.h2
-rw-r--r--include/configs/incaip.h2
-rw-r--r--include/configs/inka4x0.h2
-rw-r--r--include/configs/integratorcp.h2
-rw-r--r--include/configs/ixdp425.h2
-rw-r--r--include/configs/ixdpg425.h2
-rw-r--r--include/configs/jupiter.h2
-rw-r--r--include/configs/katmai.h2
-rw-r--r--include/configs/kilauea.h6
-rw-r--r--include/configs/korat.h2
-rw-r--r--include/configs/lart.h2
-rw-r--r--include/configs/linkstation.h2
-rw-r--r--include/configs/logodl.h2
-rw-r--r--include/configs/lpc2292sodimm.h2
-rw-r--r--include/configs/lpd7a400.h2
-rw-r--r--include/configs/lpd7a404.h2
-rw-r--r--include/configs/luan.h6
-rw-r--r--include/configs/lubbock.h2
-rw-r--r--include/configs/lwmon.h2
-rw-r--r--include/configs/lwmon5.h2
-rw-r--r--include/configs/m501sk.h2
-rw-r--r--include/configs/makalu.h6
-rw-r--r--include/configs/mcc200.h2
-rw-r--r--include/configs/mcu25.h4
-rw-r--r--include/configs/mecp5200.h2
-rw-r--r--include/configs/mgcoge.h6
-rw-r--r--include/configs/mgsuvd.h2
-rw-r--r--include/configs/mimc200.h2
-rw-r--r--include/configs/ml401.h2
-rw-r--r--include/configs/ml507.h2
-rw-r--r--include/configs/modnet50.h2
-rw-r--r--include/configs/motionpro.h2
-rw-r--r--include/configs/mp2usb.h2
-rw-r--r--include/configs/mpr2.h2
-rw-r--r--include/configs/ms7720se.h2
-rw-r--r--include/configs/ms7722se.h2
-rw-r--r--include/configs/ms7750se.h2
-rw-r--r--include/configs/muas3001.h6
-rw-r--r--include/configs/mucmc52.h2
-rw-r--r--include/configs/munices.h2
-rw-r--r--include/configs/mx1ads.h2
-rw-r--r--include/configs/mx1fs2.h2
-rw-r--r--include/configs/mx31ads.h2
-rw-r--r--include/configs/netstar.h2
-rw-r--r--include/configs/ns9750dev.h2
-rw-r--r--include/configs/o2dnt.h2
-rw-r--r--include/configs/ocotea.h6
-rw-r--r--include/configs/omap1510inn.h2
-rw-r--r--include/configs/omap1610h2.h2
-rw-r--r--include/configs/omap1610inn.h2
-rw-r--r--include/configs/omap2420h4.h2
-rw-r--r--include/configs/omap5912osk.h2
-rw-r--r--include/configs/omap730p2.h2
-rw-r--r--include/configs/p3mx.h2
-rw-r--r--include/configs/p3p440.h2
-rw-r--r--include/configs/pcs440ep.h6
-rw-r--r--include/configs/pcu_e.h2
-rw-r--r--include/configs/pdnb3.h2
-rw-r--r--include/configs/pf5200.h2
-rw-r--r--include/configs/pleb2.h2
-rw-r--r--include/configs/ppmc7xx.h4
-rw-r--r--include/configs/ppmc8260.h4
-rw-r--r--include/configs/purple.h2
-rw-r--r--include/configs/pxa255_idp.h2
-rw-r--r--include/configs/qemu-mips.h2
-rw-r--r--include/configs/quad100hd.h4
-rw-r--r--include/configs/quantum.h2
-rw-r--r--include/configs/r2dplus.h2
-rw-r--r--include/configs/r7780mp.h2
-rw-r--r--include/configs/redwood.h6
-rw-r--r--include/configs/rmu.h2
-rw-r--r--include/configs/rsdproto.h2
-rw-r--r--include/configs/rsk7203.h2
-rw-r--r--include/configs/sacsng.h2
-rw-r--r--include/configs/sbc2410x.h2
-rw-r--r--include/configs/sbc405.h2
-rw-r--r--include/configs/sbc8240.h2
-rw-r--r--include/configs/sbc8260.h2
-rw-r--r--include/configs/sbc8349.h2
-rw-r--r--include/configs/sbc8548.h2
-rw-r--r--include/configs/sbc8560.h2
-rw-r--r--include/configs/sbc8641d.h2
-rw-r--r--include/configs/sc3.h4
-rw-r--r--include/configs/sc520_spunk.h2
-rw-r--r--include/configs/scb9328.h2
-rw-r--r--include/configs/sequoia.h4
-rw-r--r--include/configs/sh7763rdp.h2
-rw-r--r--include/configs/sh7785lcr.h2
-rw-r--r--include/configs/shannon.h2
-rw-r--r--include/configs/smdk2400.h2
-rw-r--r--include/configs/smdk2410.h2
-rw-r--r--include/configs/smmaco4.h2
-rw-r--r--include/configs/socrates.h2
-rw-r--r--include/configs/sorcery.h8
-rw-r--r--include/configs/spc1920.h2
-rw-r--r--include/configs/spieval.h2
-rw-r--r--include/configs/stxgp3.h2
-rw-r--r--include/configs/stxssa.h2
-rw-r--r--include/configs/stxxtc.h2
-rw-r--r--include/configs/svm_sc8xx.h2
-rw-r--r--include/configs/taihu.h6
-rw-r--r--include/configs/taishan.h2
-rw-r--r--include/configs/tb0229.h2
-rw-r--r--include/configs/trab.h2
-rw-r--r--include/configs/trizepsiv.h2
-rw-r--r--include/configs/uc100.h2
-rw-r--r--include/configs/uc101.h2
-rw-r--r--include/configs/utx8245.h2
-rw-r--r--include/configs/v38b.h2
-rw-r--r--include/configs/v5fx30teval.h2
-rw-r--r--include/configs/versatile.h2
-rw-r--r--include/configs/virtlab2.h2
-rw-r--r--include/configs/voiceblue.h2
-rw-r--r--include/configs/walnut.h6
-rw-r--r--include/configs/wepep250.h2
-rw-r--r--include/configs/xaeniax.h2
-rw-r--r--include/configs/xilinx-ppc440-generic.h2
-rw-r--r--include/configs/xm250.h2
-rw-r--r--include/configs/xsengine.h2
-rw-r--r--include/configs/yosemite.h6
-rw-r--r--include/configs/yucca.h6
-rw-r--r--include/configs/zeus.h4
372 files changed, 458 insertions, 458 deletions
diff --git a/include/configs/A3000.h b/include/configs/A3000.h
index dba1bf727d2..35180d636e0 100644
--- a/include/configs/A3000.h
+++ b/include/configs/A3000.h
@@ -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 */
diff --git a/include/configs/ADCIOP.h b/include/configs/ADCIOP.h
index 148c905925e..0069aabab7c 100644
--- a/include/configs/ADCIOP.h
+++ b/include/configs/ADCIOP.h
@@ -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 */
diff --git a/include/configs/ADNPESC1.h b/include/configs/ADNPESC1.h
index cc91c8d11d0..2999b2a0b7e 100644
--- a/include/configs/ADNPESC1.h
+++ b/include/configs/ADNPESC1.h
@@ -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)
diff --git a/include/configs/AMX860.h b/include/configs/AMX860.h
index 035ebc69355..85a7ee91fe2 100644
--- a/include/configs/AMX860.h
+++ b/include/configs/AMX860.h
@@ -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 */
diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h
index f0e0282280a..a4582148a9e 100644
--- a/include/configs/AP1000.h
+++ b/include/configs/AP1000.h
@@ -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 */
diff --git a/include/configs/AR405.h b/include/configs/AR405.h
index 06023819f9d..045849f76d9 100644
--- a/include/configs/AR405.h
+++ b/include/configs/AR405.h
@@ -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 */
diff --git a/include/configs/ATUM8548.h b/include/configs/ATUM8548.h
index 5bc28f18f90..0ce81dbaf23 100644
--- a/include/configs/ATUM8548.h
+++ b/include/configs/ATUM8548.h
@@ -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
diff --git a/include/configs/Adder.h b/include/configs/Adder.h
index 07a9f4e9345..3c2f4d646d8 100644
--- a/include/configs/Adder.h
+++ b/include/configs/Adder.h
@@ -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)
diff --git a/include/configs/Alaska8220.h b/include/configs/Alaska8220.h
index 3d4cd36a496..3b3c0bcbb11 100644
--- a/include/configs/Alaska8220.h
+++ b/include/configs/Alaska8220.h
@@ -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
/*
diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h
index 3c5d03812eb..09c1995f09c 100644
--- a/include/configs/BC3450.h
+++ b/include/configs/BC3450.h
@@ -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)
diff --git a/include/configs/CANBT.h b/include/configs/CANBT.h
index a4afccab961..d50be015f59 100644
--- a/include/configs/CANBT.h
+++ b/include/configs/CANBT.h
@@ -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 */
diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h
index 1603c9c0bda..b9c998eec68 100644
--- a/include/configs/CATcenter.h
+++ b/include/configs/CATcenter.h
@@ -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
diff --git a/include/configs/CCM.h b/include/configs/CCM.h
index 57c122395d7..52b7b82cdc7 100644
--- a/include/configs/CCM.h
+++ b/include/configs/CCM.h
@@ -218,7 +218,7 @@
#if 1
/* Start port with environment in flash; switch to SPI EEPROM later */
-#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 */
diff --git a/include/configs/CPC45.h b/include/configs/CPC45.h
index 11107d499a0..7ec48a127d8 100644
--- a/include/configs/CPC45.h
+++ b/include/configs/CPC45.h
@@ -323,7 +323,7 @@
/* Warining: environment is not EMBEDDED in the ppcboot 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 (CFG_FLASH_BASE + 0x7F8000)
#define CFG_ENV_SIZE 0x4000 /* Size of the Environment */
diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h
index 48f308c76f6..7a185e847e1 100644
--- a/include/configs/CPCI750.h
+++ b/include/configs/CPCI750.h
@@ -572,7 +572,7 @@
#define CFG_FLASH_LOCK_TOUT 500 /* Timeout for Flash Lock (in ms) */
#if 0
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x10000
#define CFG_ENV_ADDR 0xFFF78000 /* Marvell 8-Bit Bootflash last sector */
diff --git a/include/configs/CPU86.h b/include/configs/CPU86.h
index 742ea463e59..443b976495f 100644
--- a/include/configs/CPU86.h
+++ b/include/configs/CPU86.h
@@ -324,7 +324,7 @@
#if 0
/* environment is in Flash */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_BOOT_ROM
# define CFG_ENV_ADDR (CFG_FLASH_BASE+0x70000)
# define CFG_ENV_SIZE 0x10000
diff --git a/include/configs/CPU87.h b/include/configs/CPU87.h
index db423a0ba94..45075fa2e38 100644
--- a/include/configs/CPU87.h
+++ b/include/configs/CPU87.h
@@ -339,7 +339,7 @@
#if 0
/* environment is in Flash */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_BOOT_ROM
# define CFG_ENV_ADDR (CFG_FLASH_BASE+0x70000)
# define CFG_ENV_SIZE 0x10000
diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h
index 604779a691b..c15a02ab961 100644
--- a/include/configs/CRAYL1.h
+++ b/include/configs/CRAYL1.h
@@ -170,7 +170,7 @@
/* BEG ENVIRONNEMENT FLASH: needs to be a whole FlashSector */
#define CFG_ENV_OFFSET 0x3c8000
-#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_SIZE 0x1000 /* Total Size of Environment area */
#define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */
diff --git a/include/configs/CU824.h b/include/configs/CU824.h
index f36d8dacc0c..3320c9aee7b 100644
--- a/include/configs/CU824.h
+++ b/include/configs/CU824.h
@@ -271,7 +271,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
#if 0
#define CFG_ENV_ADDR 0xFF008000
#define CFG_ENV_SIZE 0x8000 /* Size of the Environment Sector */
diff --git a/include/configs/DASA_SIM.h b/include/configs/DASA_SIM.h
index 117a1367c1d..24370c93fdc 100644
--- a/include/configs/DASA_SIM.h
+++ b/include/configs/DASA_SIM.h
@@ -157,7 +157,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_OFFSET 0x00010000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */
diff --git a/include/configs/DB64360.h b/include/configs/DB64360.h
index eef216dfae7..3fc280fc388 100644
--- a/include/configs/DB64360.h
+++ b/include/configs/DB64360.h
@@ -559,7 +559,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
#define CFG_FLASH_LOCK_TOUT 500 /* Timeout for Flash Lock (in ms) */
#define CFG_FLASH_CFI 1
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x10000
#define CFG_ENV_ADDR 0xFFF78000 /* Marvell 8-Bit Bootflash last sector */
diff --git a/include/configs/DB64460.h b/include/configs/DB64460.h
index b14cd0df1a5..59a934e6943 100644
--- a/include/configs/DB64460.h
+++ b/include/configs/DB64460.h
@@ -497,7 +497,7 @@ ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
#define CFG_FLASH_LOCK_TOUT 500 /* Timeout for Flash Lock (in ms) */
#define CFG_FLASH_CFI 1
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x10000
#define CFG_ENV_ADDR 0xFFF78000 /* Marvell 8-Bit Bootflash last sector */
diff --git a/include/configs/DK1C20.h b/include/configs/DK1C20.h
index 96582782361..a1f4e0dc73b 100644
--- a/include/configs/DK1C20.h
+++ b/include/configs/DK1C20.h
@@ -111,7 +111,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 */
#define CFG_ENV_ADDR CFG_FLASH_BASE /* Mem addr of env */
#define CFG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */
#define CONFIG_ENV_OVERWRITE /* Serial/eth change Ok */
diff --git a/include/configs/DK1S10.h b/include/configs/DK1S10.h
index e5bf8c7cccc..eda328ab3ec 100644
--- a/include/configs/DK1S10.h
+++ b/include/configs/DK1S10.h
@@ -119,7 +119,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 */
#if defined(CONFIG_NIOS_STANDARD_32)
#define CFG_ENV_ADDR CFG_FLASH_BASE /* Mem addr of env */
diff --git a/include/configs/DU440.h b/include/configs/DU440.h
index b1d4ff3f642..37a7e3ae87e 100644
--- a/include/configs/DU440.h
+++ b/include/configs/DU440.h
@@ -136,7 +136,7 @@
#define CFG_FLASH_EMPTY_INFO
#define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */
#define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */
diff --git a/include/configs/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h
index 324eb6ce15b..80a6cb7bec6 100644
--- a/include/configs/EB+MCF-EV123.h
+++ b/include/configs/EB+MCF-EV123.h
@@ -53,7 +53,7 @@
#ifndef CONFIG_MONITOR_IS_IN_RAM
#define CFG_ENV_ADDR 0xF003C000 /* End of 256K */
#define CFG_ENV_SECT_SIZE 0x4000
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
/*
#define CFG_ENV_IS_EMBEDDED 1
#define CFG_ENV_ADDR_REDUND 0xF0018000
@@ -62,7 +62,7 @@
#else
#define CFG_ENV_ADDR 0xFFE04000
#define CFG_ENV_SECT_SIZE 0x2000
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#endif
diff --git a/include/configs/ELPT860.h b/include/configs/ELPT860.h
index b9178069b8b..11eca4c4d57 100644
--- a/include/configs/ELPT860.h
+++ b/include/configs/ELPT860.h
@@ -139,7 +139,7 @@
#undef CONFIG_ENV_IS_IN_NVRAM /* Environment is in NVRAM */
#undef CONFIG_ENV_IS_IN_EEPROM /* Environment is in I2C EEPROM */
-#define CFG_ENV_IS_IN_FLASH 1 /* Environment is in FLASH */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment is in FLASH */
#define CONFIG_BAUDRATE 9600 /* console baudrate = 9600 bps */
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
@@ -180,7 +180,7 @@
#define CFG_FLASH_BASE 0x02000000
#define CFG_NVRAM_BASE 0x03000000
-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
# if defined(DEBUG)
# define CFG_MONITOR_LEN (320 << 10) /* Reserve 320 kB for Monitor */
# else
@@ -213,7 +213,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) */
-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
# define CFG_ENV_OFFSET 0x10000 /* Offset of Environment Sector */
# define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */
#endif
diff --git a/include/configs/EP1C20.h b/include/configs/EP1C20.h
index cfa6335927a..aaf61726db1 100644
--- a/include/configs/EP1C20.h
+++ b/include/configs/EP1C20.h
@@ -86,7 +86,7 @@
* of flash. NOTE: the monitor length must be multiple of sector size
* (which is common practice).
*----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_FLASH 1 /* Environment in flash */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */
#define CFG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */
#define CONFIG_ENV_OVERWRITE /* Serial change Ok */
#define CFG_ENV_ADDR (CFG_RESET_ADDR + CFG_MONITOR_LEN)
diff --git a/include/configs/EP1S10.h b/include/configs/EP1S10.h
index 7c526f759e7..ae1e476fd34 100644
--- a/include/configs/EP1S10.h
+++ b/include/configs/EP1S10.h
@@ -84,7 +84,7 @@
* of flash. NOTE: the monitor length must be multiple of sector size
* (which is common practice).
*----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_FLASH 1 /* Environment in flash */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */
#define CFG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */
#define CONFIG_ENV_OVERWRITE /* Serial change Ok */
#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN)
diff --git a/include/configs/EP1S40.h b/include/configs/EP1S40.h
index 1fe8f68c2e6..7aedcca1dbe 100644
--- a/include/configs/EP1S40.h
+++ b/include/configs/EP1S40.h
@@ -84,7 +84,7 @@
* of flash. NOTE: the monitor length must be multiple of sector size
* (which is common practice).
*----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_FLASH 1 /* Environment in flash */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */
#define CFG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */
#define CONFIG_ENV_OVERWRITE /* Serial change Ok */
#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN)
diff --git a/include/configs/EP88x.h b/include/configs/EP88x.h
index 5f1743b2ff3..81d5e55461d 100644
--- a/include/configs/EP88x.h
+++ b/include/configs/EP88x.h
@@ -143,7 +143,7 @@
#define CFG_MAX_FLASH_SECT 512 /* 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 0x20000 /* We use one complete sector */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
diff --git a/include/configs/ERIC.h b/include/configs/ERIC.h
index c699855a554..b7ec0d01058 100644
--- a/include/configs/ERIC.h
+++ b/include/configs/ERIC.h
@@ -42,7 +42,7 @@
#define CONFIG_SYS_CLK_FREQ 33333333 /* external frequency to pll */
#if 1
-#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#endif
#if 0
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
@@ -62,17 +62,17 @@
#define CONFIG_I2C_RTC 1 /* we have a Xicor X1240 RTC */
#define CFG_I2C_RTC_ADDR 0x6F /* and one for RTC */
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#undef CONFIG_ENV_IS_IN_NVRAM
#undef CONFIG_ENV_IS_IN_EEPROM
#else
#ifdef CONFIG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
#undef CONFIG_ENV_IS_IN_EEPROM
#else
#ifdef CONFIG_ENV_IS_IN_EEPROM
#undef CONFIG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
#endif
#endif
#endif
@@ -298,7 +298,7 @@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
/* BEG ENVIRONNEMENT FLASH */
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE (128*1024)
#if 0 /* force ENV to be NOT embedded */
diff --git a/include/configs/ESTEEM192E.h b/include/configs/ESTEEM192E.h
index 66e1203b7dd..24f0f4c1fbe 100644
--- a/include/configs/ESTEEM192E.h
+++ b/include/configs/ESTEEM192E.h
@@ -154,7 +154,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 0x2000 /* Total Size of Environment Sector */
/*-----------------------------------------------------------------------
diff --git a/include/configs/ETX094.h b/include/configs/ETX094.h
index 525051fb57e..940e53d23a3 100644
--- a/include/configs/ETX094.h
+++ b/include/configs/ETX094.h
@@ -171,7 +171,7 @@
#define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */
#define CFG_FLASH_WRITE_TOUT 1000 /* Timeout for Flash Write (in ms) */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_FLASH_16BIT
#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x8000 /* Total Size of Environment Sector */
diff --git a/include/configs/EVB64260.h b/include/configs/EVB64260.h
index c9d8c271ba6..2a78fd648b9 100644
--- a/include/configs/EVB64260.h
+++ b/include/configs/EVB64260.h
@@ -391,7 +391,7 @@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CFG_FLASH_CFI 1
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x10000
#define CFG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CFG_ENV_SECT_SIZE)
diff --git a/include/configs/EXBITGEN.h b/include/configs/EXBITGEN.h
index 4193492ff90..fed8d4247f9 100644
--- a/include/configs/EXBITGEN.h
+++ b/include/configs/EXBITGEN.h
@@ -48,7 +48,7 @@
/* environment is in EEPROM */
#define CONFIG_ENV_IS_IN_EEPROM 1
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
#undef CONFIG_ENV_IS_IN_NVRAM
#ifdef CONFIG_ENV_IS_IN_EEPROM
@@ -188,7 +188,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) */
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_OFFSET 0x00060000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x00010000 /* Total Size of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x00010000 /* see README - env sector total size */
diff --git a/include/configs/FADS823.h b/include/configs/FADS823.h
index 6f3e6a75b84..c6c7b533be7 100644
--- a/include/configs/FADS823.h
+++ b/include/configs/FADS823.h
@@ -203,7 +203,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 0x00040000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git a/include/configs/FADS850SAR.h b/include/configs/FADS850SAR.h
index 356705ba1fd..82a875719e6 100644
--- a/include/configs/FADS850SAR.h
+++ b/include/configs/FADS850SAR.h
@@ -153,7 +153,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 0x00040000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git a/include/configs/FLAGADM.h b/include/configs/FLAGADM.h
index 431844c7f3d..e7fcf751981 100644
--- a/include/configs/FLAGADM.h
+++ b/include/configs/FLAGADM.h
@@ -158,7 +158,7 @@
#define CFG_FLASH_ERASE_TOUT 8000 /* 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
/* This is a litlebit wasteful, but one sector is 128kb and we have to
* assigne a whole sector for the environment, so that we can safely
* erase and write it without disturbing the boot sector
diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h
index e694a0218fc..2b819c52f12 100644
--- a/include/configs/FPS850L.h
+++ b/include/configs/FPS850L.h
@@ -201,7 +201,7 @@
#define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
-#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 */
diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h
index 84b682415d4..b3380dbbcbc 100644
--- a/include/configs/FPS860L.h
+++ b/include/configs/FPS860L.h
@@ -201,7 +201,7 @@
#define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
-#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 */
diff --git a/include/configs/G2000.h b/include/configs/G2000.h
index 74e6ef70ee5..43926a280c9 100644
--- a/include/configs/G2000.h
+++ b/include/configs/G2000.h
@@ -306,7 +306,7 @@
#else /* DEFAULT: environment in flash, using redundand flash sectors */
-#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 0xFFFA0000 /* environment starts before u-boot */
#define CFG_ENV_SECT_SIZE 0x20000 /* 128k bytes may be used for env vars*/
diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h
index 51cf5794b9a..6a5a316dd22 100644
--- a/include/configs/GEN860T.h
+++ b/include/configs/GEN860T.h
@@ -434,7 +434,7 @@
* Select environment placement. NOTE that u-boot.lds must
* be edited if this is changed!
*/
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_IS_IN_EEPROM
#if defined(CONFIG_ENV_IS_IN_EEPROM)
diff --git a/include/configs/GENIETV.h b/include/configs/GENIETV.h
index f6d6ae0ce5b..3cf7fb1d1a3 100644
--- a/include/configs/GENIETV.h
+++ b/include/configs/GENIETV.h
@@ -196,7 +196,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 0x10000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector (64k)*/
diff --git a/include/configs/GTH.h b/include/configs/GTH.h
index 4a98c406386..d5816ae2f6b 100644
--- a/include/configs/GTH.h
+++ b/include/configs/GTH.h
@@ -194,7 +194,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
#undef CONFIG_ENV_IS_IN_EEPROM
#define CFG_ENV_OFFSET 0x000E0000
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
diff --git a/include/configs/HIDDEN_DRAGON.h b/include/configs/HIDDEN_DRAGON.h
index 5deb84de5a6..5168be0dc04 100644
--- a/include/configs/HIDDEN_DRAGON.h
+++ b/include/configs/HIDDEN_DRAGON.h
@@ -145,7 +145,7 @@
#define CFG_FLASH_BASE 0xFFE00000
#define CFG_FLASH_SIZE (2 * 1024 * 1024) /* Unity has onboard 1MByte flash */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x00004000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x00002000 /* Total Size of Environment Sector */
diff --git a/include/configs/HMI10.h b/include/configs/HMI10.h
index a7e7c5744ec..406c352644b 100644
--- a/include/configs/HMI10.h
+++ b/include/configs/HMI10.h
@@ -234,7 +234,7 @@
#define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
-#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 */
diff --git a/include/configs/IAD210.h b/include/configs/IAD210.h
index 87827ead1c8..c80165ba59f 100644
--- a/include/configs/IAD210.h
+++ b/include/configs/IAD210.h
@@ -220,7 +220,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
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
diff --git a/include/configs/ICU862.h b/include/configs/ICU862.h
index f693956d428..caf7210a64e 100644
--- a/include/configs/ICU862.h
+++ b/include/configs/ICU862.h
@@ -229,7 +229,7 @@
#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 0x00F40000
#define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment sector */
diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h
index 029bb9914b7..459654e546e 100644
--- a/include/configs/IDS8247.h
+++ b/include/configs/IDS8247.h
@@ -251,7 +251,7 @@
#define CFG_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (in ms) */
/* Environment in flash */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_FLASH_BASE+0x60000)
#define CFG_ENV_SIZE 0x20000
#define CFG_ENV_SECT_SIZE 0x20000
diff --git a/include/configs/IP860.h b/include/configs/IP860.h
index 63e7e5d452d..fa3c29ec9a7 100644
--- a/include/configs/IP860.h
+++ b/include/configs/IP860.h
@@ -186,7 +186,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) */
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
#undef CONFIG_ENV_IS_IN_NVRAM
#undef CONFIG_ENV_IS_IN_NVRAM
#undef DEBUG_I2C
diff --git a/include/configs/IPHASE4539.h b/include/configs/IPHASE4539.h
index 7d564a0957d..cea85320473 100644
--- a/include/configs/IPHASE4539.h
+++ b/include/configs/IPHASE4539.h
@@ -208,7 +208,7 @@
#define CFG_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (in ms) */
/* Environment in FLASH, there is little space left in Serial EEPROM */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SECT_SIZE 0x10000 /* We use one complete sector */
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x10000) /* 2. sector */
diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h
index 27e46a432bb..6de40da4ed7 100644
--- a/include/configs/ISPAN.h
+++ b/include/configs/ISPAN.h
@@ -185,7 +185,7 @@
#define CFG_MAX_FLASH_SECT 142 /* Max num of sects on one chip */
/* Environment is in flash, there is little space left in Serial EEPROM */
-#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_SIZE (CFG_ENV_SECT_SIZE)
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
diff --git a/include/configs/IVML24.h b/include/configs/IVML24.h
index 0ffdfac07ce..ee302d9a61f 100644
--- a/include/configs/IVML24.h
+++ b/include/configs/IVML24.h
@@ -184,7 +184,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 0x7A000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */
/*-----------------------------------------------------------------------
diff --git a/include/configs/IVMS8.h b/include/configs/IVMS8.h
index ea3ffe0a10a..1bdd0318e6a 100644
--- a/include/configs/IVMS8.h
+++ b/include/configs/IVMS8.h
@@ -180,7 +180,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 0x7A000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */
/*-----------------------------------------------------------------------
diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index 0b90946a364..804fc3f69ce 100644
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -255,7 +255,7 @@
/*
* Environment settings
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x10000
#if defined(CONFIG_LITE5200B)
#define CFG_ENV_SECT_SIZE 0x20000
diff --git a/include/configs/JSE.h b/include/configs/JSE.h
index ecc344d8296..4bcd17a6ee9 100644
--- a/include/configs/JSE.h
+++ b/include/configs/JSE.h
@@ -78,7 +78,7 @@
/* JSE has EEPROM chips that are good for environment. */
#undef CONFIG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_IS_IN_EEPROM 1
#undef CONFIG_ENV_IS_NOWHERE
diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h
index 7208444bdd0..897d8a05927 100644
--- a/include/configs/KAREF.h
+++ b/include/configs/KAREF.h
@@ -142,7 +142,7 @@
* Environment
*----------------------------------------------------------------------*/
#define CONFIG_ENV_IS_IN_NVRAM 1 /* Environment uses NVRAM */
-#undef CFG_ENV_IS_IN_FLASH /* ... not in flash */
+#undef CONFIG_ENV_IS_IN_FLASH /* ... not in flash */
#undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */
#define CONFIG_ENV_OVERWRITE 1 /* allow env overwrite */
diff --git a/include/configs/KUP4K.h b/include/configs/KUP4K.h
index e52fbfde0e7..e40e53bb2fa 100644
--- a/include/configs/KUP4K.h
+++ b/include/configs/KUP4K.h
@@ -254,7 +254,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 0x40000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x10000
diff --git a/include/configs/KUP4X.h b/include/configs/KUP4X.h
index be0c7af8f3e..29c3e2d7bac 100644
--- a/include/configs/KUP4X.h
+++ b/include/configs/KUP4X.h
@@ -266,7 +266,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 0x40000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x10000
diff --git a/include/configs/LANTEC.h b/include/configs/LANTEC.h
index e92069b5a93..dc6084877c1 100644
--- a/include/configs/LANTEC.h
+++ b/include/configs/LANTEC.h
@@ -185,7 +185,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 */
diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index 8713b02aaf9..10b37b5e01f 100644
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -192,7 +192,7 @@
/* Configuration for environment
* Environment is embedded in u-boot in the second sector of the flash
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OVERWRITE 1
#undef CFG_ENV_IS_EMBEDDED
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index b32eabe9a37..3f55594a3c4 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -220,7 +220,7 @@
/* Configuration for environment
* Environment is embedded in u-boot in the second sector of the flash
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_IS_EMBEDDED 1
#ifdef NORFLASH_PS32BIT
# define CFG_ENV_OFFSET (0x8000)
diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index 6bf2d99c9c1..c7544a8ebbc 100644
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -113,7 +113,7 @@
#define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
#define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x4000 /* Address of Environment Sector*/
#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x2000 /* see README - env sector total size */
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 9f78f6ebc88..72dd05db663 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -45,11 +45,11 @@
#ifdef CONFIG_MONITOR_IS_IN_RAM
# define CFG_ENV_OFFSET 0x4000
# define CFG_ENV_SECT_SIZE 0x1000
-# define CFG_ENV_IS_IN_FLASH 1
+# define CONFIG_ENV_IS_IN_FLASH 1
#else
# define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x4000)
# define CFG_ENV_SECT_SIZE 0x1000
-# define CFG_ENV_IS_IN_FLASH 1
+# define CONFIG_ENV_IS_IN_FLASH 1
#endif
/*
diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h
index 6e14ebf5b1e..cbf50fe7135 100644
--- a/include/configs/M5253EVBE.h
+++ b/include/configs/M5253EVBE.h
@@ -45,11 +45,11 @@
#ifndef CONFIG_MONITOR_IS_IN_RAM
#define CFG_ENV_OFFSET 0x4000
#define CFG_ENV_SECT_SIZE 0x2000
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#else
#define CFG_ENV_ADDR 0xffe04000
#define CFG_ENV_SECT_SIZE 0x2000
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#endif
/*
diff --git a/include/configs/M5271EVB.h b/include/configs/M5271EVB.h
index 78a1b93cf75..482c262c811 100644
--- a/include/configs/M5271EVB.h
+++ b/include/configs/M5271EVB.h
@@ -56,7 +56,7 @@
#define CFG_ENV_ADDR 0xffe04000
#endif
#define CFG_ENV_SECT_SIZE 0x2000
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
/*
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index fc457e3bcbb..22124c961f2 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -54,12 +54,12 @@
#ifndef CONFIG_MONITOR_IS_IN_RAM
#define CFG_ENV_OFFSET 0x4000
#define CFG_ENV_SECT_SIZE 0x2000
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_IS_EMBEDDED 1
#else
#define CFG_ENV_ADDR 0xffe04000
#define CFG_ENV_SECT_SIZE 0x2000
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#endif
/*
diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index 430af6bfa21..0a30e0b1ede 100644
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -54,12 +54,12 @@
#ifndef CONFIG_MONITOR_IS_IN_RAM
#define CFG_ENV_OFFSET 0x4000
#define CFG_ENV_SECT_SIZE 0x2000
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_IS_EMBEDDED 1
#else
#define CFG_ENV_ADDR 0xffe04000
#define CFG_ENV_SECT_SIZE 0x2000
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#endif
/*
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index eb59c250dbf..1763f97b65e 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -50,7 +50,7 @@
*/
#define CFG_ENV_ADDR 0xffe04000
#define CFG_ENV_SIZE 0x2000
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
/*
* BOOTP options
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 58948a20a9c..441f209c4af 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -230,7 +230,7 @@
*/
#define CFG_ENV_OFFSET 0x4000
#define CFG_ENV_SECT_SIZE 0x2000
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_IS_EMBEDDED 1
/*-----------------------------------------------------------------------
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 814c3a610d1..f8212c6551a 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -230,7 +230,7 @@
*/
#define CFG_ENV_OFFSET 0x4000
#define CFG_ENV_SECT_SIZE 0x2000
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_IS_EMBEDDED 1
/*-----------------------------------------------------------------------
diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index 06e22443b3f..d0a66ea8fe0 100644
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -272,7 +272,7 @@
# define CFG_ENV_SIZE 0x2000
# define CFG_ENV_SECT_SIZE 0x10000
#else
-# define CFG_ENV_IS_IN_FLASH 1
+# define CONFIG_ENV_IS_IN_FLASH 1
# define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x4000)
# define CFG_ENV_SECT_SIZE 0x2000
#endif
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 45a244fae7a..9872d58d22a 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -334,7 +334,7 @@
# define CONFIG_ENV_IS_IN_SPI_FLASH
# define CFG_ENV_SPI_CS 1
#else
-# define CFG_ENV_IS_IN_FLASH 1
+# define CONFIG_ENV_IS_IN_FLASH 1
#endif
#undef CONFIG_ENV_OVERWRITE
#undef CFG_ENV_IS_EMBEDDED
diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index af6723c6375..7913879489c 100644
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -279,7 +279,7 @@
*/
#define CFG_ENV_OFFSET 0x2000
#define CFG_ENV_SECT_SIZE 0x2000
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_IS_EMBEDDED 1
/*-----------------------------------------------------------------------
diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index 248db53d9a3..df92a244193 100644
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -265,7 +265,7 @@
*/
#define CFG_ENV_OFFSET 0x2000
#define CFG_ENV_SECT_SIZE 0x2000
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_IS_EMBEDDED 1
/*-----------------------------------------------------------------------
diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h
index fdb840ec6cf..b972390b046 100644
--- a/include/configs/METROBOX.h
+++ b/include/configs/METROBOX.h
@@ -204,7 +204,7 @@
* Environment
*----------------------------------------------------------------------*/
#define CONFIG_ENV_IS_IN_NVRAM 1 /* Environment uses NVRAM */
-#undef CFG_ENV_IS_IN_FLASH /* ... not in flash */
+#undef CONFIG_ENV_IS_IN_FLASH /* ... not in flash */
#undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */
#define CONFIG_ENV_OVERWRITE 1 /* allow env overwrite */
diff --git a/include/configs/MHPC.h b/include/configs/MHPC.h
index dde77427113..de7cb128f3e 100644
--- a/include/configs/MHPC.h
+++ b/include/configs/MHPC.h
@@ -228,7 +228,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 CFG_MONITOR_LEN /* Offset of Environment */
#define CFG_ENV_SIZE 0x20000 /* Total Size of Environment */
diff --git a/include/configs/ML2.h b/include/configs/ML2.h
index 3ce1807b52f..a2703b1688b 100644
--- a/include/configs/ML2.h
+++ b/include/configs/ML2.h
@@ -31,12 +31,12 @@
#define CONFIG_ML2 1 /* ...on a ML2 board */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#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
@@ -184,7 +184,7 @@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
/* BEG ENVIRONNEMENT FLASH */
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_OFFSET 0x00050000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */
diff --git a/include/configs/MOUSSE.h b/include/configs/MOUSSE.h
index 4052e786280..b145166f030 100644
--- a/include/configs/MOUSSE.h
+++ b/include/configs/MOUSSE.h
@@ -298,7 +298,7 @@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#if 0
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x8000 /* Offset of the Environment Sector */
#define CFG_ENV_SIZE 0x4000 /* Size of the Environment Sector */
#else
diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h
index 735cfaae5be..9a767323103 100644
--- a/include/configs/MPC8260ADS.h
+++ b/include/configs/MPC8260ADS.h
@@ -380,7 +380,7 @@
#endif /* CONFIG_BZIP2 */
#ifndef CFG_RAMBOOT
-# define CFG_ENV_IS_IN_FLASH 1
+# define CONFIG_ENV_IS_IN_FLASH 1
# define CFG_ENV_SECT_SIZE 0x40000
# define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_ENV_SECT_SIZE)
#else
diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h
index 4429e99571d..e062717e6b7 100644
--- a/include/configs/MPC8266ADS.h
+++ b/include/configs/MPC8266ADS.h
@@ -427,7 +427,7 @@
#define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
#ifndef CFG_RAMBOOT
-# 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
#else
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 776fe991601..aef35781cde 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -393,7 +393,7 @@
#define CFG_ENV_RANGE (CFG_ENV_SECT_SIZE * 4)
#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET + CFG_ENV_RANGE)
#elif !defined(CFG_RAMBOOT)
- #define CFG_ENV_IS_IN_FLASH 1
+ #define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#define CFG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */
#define CFG_ENV_SIZE 0x2000
diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index 1edd9ced4be..92a6218427e 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -377,7 +377,7 @@
* Environment
*/
#ifndef CFG_RAMBOOT
- #define CFG_ENV_IS_IN_FLASH 1
+ #define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#define CFG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */
#define CFG_ENV_SIZE 0x2000
diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 308f1021616..7e4849a9130 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -391,7 +391,7 @@
* Environment
*/
#ifndef CFG_RAMBOOT
- #define CFG_ENV_IS_IN_FLASH 1
+ #define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#define CFG_ENV_SECT_SIZE 0x20000
#define CFG_ENV_SIZE 0x2000
diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index b98f3ee18e0..3102272ae39 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -403,7 +403,7 @@
* Environment
*/
#ifndef CFG_RAMBOOT
- #define CFG_ENV_IS_IN_FLASH 1
+ #define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#define CFG_ENV_SECT_SIZE 0x20000
#define CFG_ENV_SIZE 0x2000
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index e03f5ca0921..d737cb44fa0 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -465,7 +465,7 @@
* Environment
*/
#ifndef CFG_RAMBOOT
- #define CFG_ENV_IS_IN_FLASH 1
+ #define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#define CFG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */
#define CFG_ENV_SIZE 0x2000
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 7f5d303f001..7635c65e361 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -413,7 +413,7 @@ boards, we say we have two, but don't display a message if we find only one. */
#define CONFIG_ENV_OVERWRITE
#ifndef CFG_RAMBOOT
- #define CFG_ENV_IS_IN_FLASH
+ #define CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#define CFG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for environment */
#define CFG_ENV_SIZE 0x2000
diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h
index c532eb1fc05..37173cc4675 100644
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -434,7 +434,7 @@
*/
#ifndef CFG_RAMBOOT
- #define CFG_ENV_IS_IN_FLASH 1
+ #define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#define CFG_ENV_SECT_SIZE 0x20000
#define CFG_ENV_SIZE 0x2000
diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h
index 47016005f2f..b20f16504af 100644
--- a/include/configs/MPC8360ERDK.h
+++ b/include/configs/MPC8360ERDK.h
@@ -339,7 +339,7 @@
*/
#ifndef CFG_RAMBOOT
-#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 0x20000 /* 128K(one sector) for env */
#define CFG_ENV_SIZE 0x20000
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 220c148618f..21d7d2dd64d 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -421,7 +421,7 @@
* Environment
*/
#ifndef CFG_RAMBOOT
- #define CFG_ENV_IS_IN_FLASH 1
+ #define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#define CFG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */
#define CFG_ENV_SIZE 0x2000
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 289bcfaba46..7ffc743c351 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -442,7 +442,7 @@
* Environment
*/
#ifndef CFG_RAMBOOT
- #define CFG_ENV_IS_IN_FLASH 1
+ #define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_MONITOR_BASE+CFG_MONITOR_LEN)
#define CFG_ENV_SECT_SIZE 0x10000 /* 64K (one sector) for env */
#define CFG_ENV_SIZE 0x4000
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index dc304e7bcaf..f290075d8ee 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -446,7 +446,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
/*
* Environment
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#if CFG_MONITOR_BASE > 0xfff80000
#define CFG_ENV_ADDR 0xfff80000
#else
diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index c23dcf66bff..0dc10965cec 100644
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -381,7 +381,7 @@
* Environment
*/
#ifndef CFG_RAMBOOT
- #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
diff --git a/include/configs/MPC8540EVAL.h b/include/configs/MPC8540EVAL.h
index 04bec2d02da..d4df8a613b6 100644
--- a/include/configs/MPC8540EVAL.h
+++ b/include/configs/MPC8540EVAL.h
@@ -260,7 +260,7 @@
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x100000)
#define CFG_ENV_SIZE 0x2000
#else
-#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 */
#endif
diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index bfd86f50696..569952daef4 100644
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -405,7 +405,7 @@ extern unsigned long get_clock_freq(void);
/*
* 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
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 612e8f2a741..02776b35fd7 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -394,7 +394,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
/*
* Environment
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#if CFG_MONITOR_BASE > 0xfff80000
#define CFG_ENV_ADDR 0xfff80000
#else
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 06965ed4b49..4afb7aeee54 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -466,7 +466,7 @@ extern unsigned long get_clock_freq(void);
/*
* 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
diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index a92c0fe301f..c5213365387 100644
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -403,7 +403,7 @@ extern unsigned long get_clock_freq(void);
/*
* 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
diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index f661c8e3b44..72a8b25f484 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -412,7 +412,7 @@
* Environment
*/
#ifndef CFG_RAMBOOT
- #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
diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index 8aeaa293bb9..5b1cf6f919b 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -424,7 +424,7 @@ extern unsigned long get_clock_freq(void);
/*
* 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
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index b0094f310f6..94c02408f58 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -426,7 +426,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
/*
* Environment
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#if CFG_MONITOR_BASE > 0xfff80000
#define CFG_ENV_ADDR 0xfff80000
#else
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 2ee8d57015f..744110f36c6 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -438,7 +438,7 @@
* Environment
*/
#ifndef CFG_RAMBOOT
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#define CFG_ENV_SECT_SIZE 0x20000 /* 126k (one sector) for env */
#define CFG_ENV_SIZE 0x2000
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 170fbd6a5ca..7b5c402e9b9 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -504,7 +504,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
* Environment
*/
#ifndef CFG_RAMBOOT
- #define CFG_ENV_IS_IN_FLASH 1
+ #define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x60000)
#define CFG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */
#define CFG_ENV_SIZE 0x2000
diff --git a/include/configs/MUSENKI.h b/include/configs/MUSENKI.h
index 4319e6c04c3..4a7540ec592 100644
--- a/include/configs/MUSENKI.h
+++ b/include/configs/MUSENKI.h
@@ -280,7 +280,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 0xFFFF0000
#define CFG_ENV_SIZE 0x00010000 /* Size of the Environment */
#define CFG_ENV_SECT_SIZE 0x20000 /* Size of the Environment Sector */
diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h
index 0ce88d6be6f..bf06ef831a2 100644
--- a/include/configs/MVBC_P.h
+++ b/include/configs/MVBC_P.h
@@ -215,7 +215,7 @@
/*
* Environment settings
*/
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#undef CFG_FLASH_PROTECTION
#define CFG_ENV_ADDR 0xFFFE0000
diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h
index 849350fd8a4..b8288571ab3 100644
--- a/include/configs/MVBLM7.h
+++ b/include/configs/MVBLM7.h
@@ -255,7 +255,7 @@
#undef CFG_FLASH_PROTECTION
#define CONFIG_ENV_OVERWRITE
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR 0xFF800000
#define CFG_ENV_SIZE 0x2000
#define CFG_ENV_SECT_SIZE 0x2000
diff --git a/include/configs/MVBLUE.h b/include/configs/MVBLUE.h
index 8e247af63cd..819e72542e2 100644
--- a/include/configs/MVBLUE.h
+++ b/include/configs/MVBLUE.h
@@ -328,7 +328,7 @@
#define CFG_FLASH_WRITE_TOUT 1000
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_OFFSET 0x00010000
#define CFG_ENV_SIZE 0x00010000
diff --git a/include/configs/MVS1.h b/include/configs/MVS1.h
index 87458e3624f..df1586bdfe3 100644
--- a/include/configs/MVS1.h
+++ b/include/configs/MVS1.h
@@ -174,7 +174,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
/* 4MB flash - use bottom sectors of a bottom boot sector flash (16 bit access) */
#define CFG_ENV_OFFSET 0x8000 /* Offset of Environment Sector (bottom boot sector) */
diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index 40cf275786b..59d6e9a131f 100644
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -130,7 +130,7 @@
#undef CFG_DIRECT_FLASH_TFTP
/* ENV setting */
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OVERWRITE 1
#define CFG_ENV_SECT_SIZE (128 * 1024)
#define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE)
diff --git a/include/configs/NC650.h b/include/configs/NC650.h
index 84c6e9b6179..22bd0f070c2 100644
--- a/include/configs/NC650.h
+++ b/include/configs/NC650.h
@@ -232,7 +232,7 @@
#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 0x00740000
#define CFG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment sector */
diff --git a/include/configs/NETPHONE.h b/include/configs/NETPHONE.h
index 1494190bf97..ac4c42493e6 100644
--- a/include/configs/NETPHONE.h
+++ b/include/configs/NETPHONE.h
@@ -216,7 +216,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 0x10000
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x60000)
diff --git a/include/configs/NETTA.h b/include/configs/NETTA.h
index 64806342aeb..80aee5bc2aa 100644
--- a/include/configs/NETTA.h
+++ b/include/configs/NETTA.h
@@ -220,7 +220,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 0x10000
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x60000)
diff --git a/include/configs/NETTA2.h b/include/configs/NETTA2.h
index efa91e304a2..6cb39d9f836 100644
--- a/include/configs/NETTA2.h
+++ b/include/configs/NETTA2.h
@@ -217,7 +217,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 0x10000
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x60000)
diff --git a/include/configs/NETVIA.h b/include/configs/NETVIA.h
index 40e09fba620..0d318e8247a 100644
--- a/include/configs/NETVIA.h
+++ b/include/configs/NETVIA.h
@@ -187,7 +187,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 0x10000
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x60000)
diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h
index 31762b9a368..9991d699761 100644
--- a/include/configs/NSCU.h
+++ b/include/configs/NSCU.h
@@ -207,7 +207,7 @@
#define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
-#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 */
diff --git a/include/configs/NX823.h b/include/configs/NX823.h
index 2a4bd4724c0..eddb52bece2 100644
--- a/include/configs/NX823.h
+++ b/include/configs/NX823.h
@@ -147,7 +147,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 xEMBED
#ifdef EMBED
#define CFG_ENV_SIZE 0x200 /* FIXME How big when embedded?? */
diff --git a/include/configs/OXC.h b/include/configs/OXC.h
index 8d61bcd2d41..d9b4224fe1e 100644
--- a/include/configs/OXC.h
+++ b/include/configs/OXC.h
@@ -193,7 +193,7 @@
* Environment
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR 0xFFF30000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x00010000 /* Total Size of Environment Sector */
#define CFG_ENV_IS_EMBEDDED 1 /* short-cut compile-time test */
diff --git a/include/configs/P3G4.h b/include/configs/P3G4.h
index 5a2d1577053..232044b084f 100644
--- a/include/configs/P3G4.h
+++ b/include/configs/P3G4.h
@@ -397,7 +397,7 @@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CFG_FLASH_CFI 1
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x20000
#define CFG_ENV_ADDR 0xFFFE0000
diff --git a/include/configs/PATI.h b/include/configs/PATI.h
index 2676c78fa97..96150447c71 100644
--- a/include/configs/PATI.h
+++ b/include/configs/PATI.h
@@ -178,8 +178,8 @@
#define CFG_ENV_SIZE 2048
#endif
-#undef CFG_ENV_IS_IN_FLASH
-#ifdef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SIZE 0x00002000 /* Set whole sector as env */
#define CFG_ENV_OFFSET ((0 - CFG_FLASH_BASE) - CFG_ENV_SIZE) /* Environment starts at this adress */
#endif
diff --git a/include/configs/PCI5441.h b/include/configs/PCI5441.h
index abb9bfc25c7..94f6f93454c 100644
--- a/include/configs/PCI5441.h
+++ b/include/configs/PCI5441.h
@@ -84,7 +84,7 @@
* of flash. NOTE: the monitor length must be multiple of sector size
* (which is common practice).
*----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_FLASH 1 /* Environment in flash */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */
#define CFG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */
#define CONFIG_ENV_OVERWRITE /* Serial change Ok */
#define CFG_ENV_ADDR (CFG_RESET_ADDR + CFG_MONITOR_LEN)
diff --git a/include/configs/PCIPPC2.h b/include/configs/PCIPPC2.h
index 6ebaa85e8c0..af3b8ee5a2a 100644
--- a/include/configs/PCIPPC2.h
+++ b/include/configs/PCIPPC2.h
@@ -221,7 +221,7 @@
* Note: 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 (CFG_FLASH_BASE + 0x70000)
#define CFG_ENV_SIZE 0x1000 /* Size of the Environment */
#define CFG_ENV_SECT_SIZE 0x10000 /* Size of the Environment Sector */
diff --git a/include/configs/PCIPPC6.h b/include/configs/PCIPPC6.h
index 9202794ab21..e229bde246f 100644
--- a/include/configs/PCIPPC6.h
+++ b/include/configs/PCIPPC6.h
@@ -223,7 +223,7 @@
* Note: 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 (CFG_FLASH_BASE + 0x70000)
#define CFG_ENV_SIZE 0x1000 /* Size of the Environment */
#define CFG_ENV_SECT_SIZE 0x10000 /* Size of the Environment Sector */
diff --git a/include/configs/PK1C20.h b/include/configs/PK1C20.h
index d90351add35..48e9269d99b 100644
--- a/include/configs/PK1C20.h
+++ b/include/configs/PK1C20.h
@@ -86,7 +86,7 @@
* of flash. NOTE: the monitor length must be multiple of sector size
* (which is common practice).
*----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_FLASH 1 /* Environment in flash */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */
#define CFG_ENV_SIZE (64 * 1024) /* 64 KByte (1 sector) */
#define CONFIG_ENV_OVERWRITE /* Serial change Ok */
#define CFG_ENV_ADDR (CFG_RESET_ADDR + CFG_MONITOR_LEN)
diff --git a/include/configs/PM520.h b/include/configs/PM520.h
index 5e0bb056d80..4da84ca9ff6 100644
--- a/include/configs/PM520.h
+++ b/include/configs/PM520.h
@@ -245,7 +245,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 0x40000
#define CONFIG_ENV_OVERWRITE 1
diff --git a/include/configs/PM826.h b/include/configs/PM826.h
index de1ecde0d5f..0782ff0c470 100644
--- a/include/configs/PM826.h
+++ b/include/configs/PM826.h
@@ -257,7 +257,7 @@
#if 0
/* Start port with environment in flash; switch to EEPROM later */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_FLASH_BASE+0x40000)
#define CFG_ENV_SIZE 0x40000
#define CFG_ENV_SECT_SIZE 0x40000
diff --git a/include/configs/PM828.h b/include/configs/PM828.h
index cac8f272665..a342824ef4c 100644
--- a/include/configs/PM828.h
+++ b/include/configs/PM828.h
@@ -250,7 +250,7 @@
#if 0
/* Start port with environment in flash; switch to EEPROM later */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_FLASH_BASE+0x40000)
#define CFG_ENV_SIZE 0x40000
#define CFG_ENV_SECT_SIZE 0x40000
diff --git a/include/configs/PM854.h b/include/configs/PM854.h
index 1212bcdb7c2..8babcb2730b 100644
--- a/include/configs/PM854.h
+++ b/include/configs/PM854.h
@@ -293,7 +293,7 @@
* Environment
*/
#ifndef CFG_RAMBOOT
- #define CFG_ENV_IS_IN_FLASH 1
+ #define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x80000)
#define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */
#define CFG_ENV_SIZE 0x2000
diff --git a/include/configs/PM856.h b/include/configs/PM856.h
index 75dba3bcb1f..9690bd7631c 100644
--- a/include/configs/PM856.h
+++ b/include/configs/PM856.h
@@ -293,7 +293,7 @@
* Environment
*/
#ifndef CFG_RAMBOOT
- #define CFG_ENV_IS_IN_FLASH 1
+ #define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x80000)
#define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */
#define CFG_ENV_SIZE 0x2000
diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index 5b253230c15..7a787761d2b 100644
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -136,7 +136,7 @@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */
#define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */
diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index a33bc3ba5a1..81085ec0df2 100644
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -423,7 +423,7 @@
#else /* DEFAULT: environment in flash, using redundand flash sectors */
-#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
diff --git a/include/configs/QS823.h b/include/configs/QS823.h
index cef9f42dfdc..3c7fc6f9067 100644
--- a/include/configs/QS823.h
+++ b/include/configs/QS823.h
@@ -223,7 +223,7 @@
/*-----------------------------------------------------------------------
* Environment variable storage is in FLASH, one sector before U-boot
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SECT_SIZE 0x20000 /* 128Kb, one whole sector */
#define CFG_ENV_SIZE 0x2000 /* 8kb */
#define CFG_ENV_ADDR 0xffee0000 /* address of env sector */
diff --git a/include/configs/QS850.h b/include/configs/QS850.h
index ba5827a22d6..44daf520c19 100644
--- a/include/configs/QS850.h
+++ b/include/configs/QS850.h
@@ -223,7 +223,7 @@
/*-----------------------------------------------------------------------
* Environment variable storage is in FLASH, one sector before U-boot
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SECT_SIZE 0x20000 /* 128Kb, one whole sector */
#define CFG_ENV_SIZE 0x2000 /* 8kb */
#define CFG_ENV_ADDR 0xffee0000 /* address of env sector */
diff --git a/include/configs/QS860T.h b/include/configs/QS860T.h
index 9dfceef3c83..dd792463016 100644
--- a/include/configs/QS860T.h
+++ b/include/configs/QS860T.h
@@ -213,7 +213,7 @@ CONFIG_SPI
#define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git a/include/configs/R360MPI.h b/include/configs/R360MPI.h
index a653cca96fe..26729fcb682 100644
--- a/include/configs/R360MPI.h
+++ b/include/configs/R360MPI.h
@@ -229,7 +229,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 0x40000 /* Offset of Environment */
#define CFG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment sector */
#define CFG_ENV_SIZE 0x4000 /* Used Size of Environment sector */
diff --git a/include/configs/RBC823.h b/include/configs/RBC823.h
index 9222d21554a..8f594509083 100644
--- a/include/configs/RBC823.h
+++ b/include/configs/RBC823.h
@@ -203,7 +203,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 0x10000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */
diff --git a/include/configs/RPXClassic.h b/include/configs/RPXClassic.h
index 37623910abe..50345e53e97 100644
--- a/include/configs/RPXClassic.h
+++ b/include/configs/RPXClassic.h
@@ -219,7 +219,7 @@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#if 0
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x20000 /* Offset of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x8000
#define CFG_ENV_SIZE 0x8000 /* Total Size of Environment Sector */
diff --git a/include/configs/RPXlite.h b/include/configs/RPXlite.h
index 671094b69df..2e4710ac6f5 100644
--- a/include/configs/RPXlite.h
+++ b/include/configs/RPXlite.h
@@ -155,7 +155,7 @@
#define CFG_DIRECT_FLASH_TFTP
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SECT_SIZE 0x40000 /* We use one complete sector */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h
index d1358186a65..724dc48eb2c 100644
--- a/include/configs/RPXlite_DW.h
+++ b/include/configs/RPXlite_DW.h
@@ -233,7 +233,7 @@
#define CFG_ENV_ADDR 0xFA000100
#define CFG_ENV_SIZE 0x1000
#else
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_OFFSET 0x30000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x8000 /* Total Size of Environment Sector */
#endif /* CONFIG_ENV_IS_IN_NVRAM */
diff --git a/include/configs/RPXsuper.h b/include/configs/RPXsuper.h
index 2a9c62709b7..8bdb4015085 100644
--- a/include/configs/RPXsuper.h
+++ b/include/configs/RPXsuper.h
@@ -300,7 +300,7 @@
#define CFG_FLASH_WRITE_TOUT 1 /* Timeout for Flash Write (in ms) */
#ifndef CFG_RAMBOOT
-# define CFG_ENV_IS_IN_FLASH 1
+# define CONFIG_ENV_IS_IN_FLASH 1
# ifdef CFG_ENV_IN_OWN_SECT
# define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000)
diff --git a/include/configs/RRvision.h b/include/configs/RRvision.h
index 6a71801935a..22d3da614dd 100644
--- a/include/configs/RRvision.h
+++ b/include/configs/RRvision.h
@@ -227,7 +227,7 @@
#define CFG_FLASH_ERASE_TOUT (120*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (1 * CFG_HZ) /* Timeout for Flash Write */
-#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 */
diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h
index e8ed0951c8b..e603f29b3b3 100644
--- a/include/configs/Rattler.h
+++ b/include/configs/Rattler.h
@@ -223,12 +223,12 @@
#define CFG_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x10000
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
#define CFG_DEFAULT_IMMR 0xFF010000
diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index 6b25d56fcbd..64f23205744 100644
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -337,7 +337,7 @@
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x100000)
#define CFG_ENV_SIZE 0x2000
#else
- #define CFG_ENV_IS_IN_FLASH 1
+ #define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE 0x2000 /* CFG_ENV_SECT_SIZE */
diff --git a/include/configs/SCM.h b/include/configs/SCM.h
index 2c7e55f287d..bc779de8040 100644
--- a/include/configs/SCM.h
+++ b/include/configs/SCM.h
@@ -270,7 +270,7 @@
#if 0
/* Start port with environment in flash; switch to EEPROM later */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_FLASH_BASE+0x40000)
#define CFG_ENV_SIZE 0x40000
#define CFG_ENV_SECT_SIZE 0x40000
diff --git a/include/configs/SL8245.h b/include/configs/SL8245.h
index 31853c8de3a..56436a4354e 100644
--- a/include/configs/SL8245.h
+++ b/include/configs/SL8245.h
@@ -257,7 +257,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 0xFFFF0000
#define CFG_ENV_SIZE 0x00010000 /* Size of the Environment */
#define CFG_ENV_SECT_SIZE 0x00010000 /* Size of the Environment Sector */
diff --git a/include/configs/SM850.h b/include/configs/SM850.h
index 465db4735f2..138dbd24c7f 100644
--- a/include/configs/SM850.h
+++ b/include/configs/SM850.h
@@ -163,7 +163,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 */
diff --git a/include/configs/SMN42.h b/include/configs/SMN42.h
index a5d3d695889..583ee211144 100644
--- a/include/configs/SMN42.h
+++ b/include/configs/SMN42.h
@@ -189,7 +189,7 @@
#define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
/* The Environment Sector is in the CPU-internal flash */
#define CFG_FLASH_BASE 0
#define CFG_ENV_OFFSET 0x3C000
diff --git a/include/configs/SPD823TS.h b/include/configs/SPD823TS.h
index 395c7a1e7a0..39ab1c80a6f 100644
--- a/include/configs/SPD823TS.h
+++ b/include/configs/SPD823TS.h
@@ -167,7 +167,7 @@
#define CFG_FLASH_ERASE_TOUT 0 /* Timeout for Flash Erase (in ms) */
#define CFG_FLASH_WRITE_TOUT 0 /* 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 0x0800 /* Total Size of Environment Sector */
/*-----------------------------------------------------------------------
diff --git a/include/configs/SX1.h b/include/configs/SX1.h
index d23367979fb..d1b6998b969 100644
--- a/include/configs/SX1.h
+++ b/include/configs/SX1.h
@@ -189,7 +189,7 @@
#define CFG_FLASH_ERASE_TOUT (20*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE
#define CFG_ENV_SIZE CFG_ENV_SECT_SIZE /* Total Size of Environment Sector */
#define CFG_ENV_OFFSET ( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */
diff --git a/include/configs/SXNI855T.h b/include/configs/SXNI855T.h
index 85b3a9f75d8..67b6071be1d 100644
--- a/include/configs/SXNI855T.h
+++ b/include/configs/SXNI855T.h
@@ -449,8 +449,8 @@
#define CONFIG_RESET_ON_PANIC /* reset if system panic() */
-#define CFG_ENV_IS_IN_FLASH
-#ifdef CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
/* environment is in FLASH */
#define CFG_ENV_ADDR 0xF8040000 /* AM29LV641 or AM29LV800BT */
#define CFG_ENV_ADDR_REDUND 0xF8050000 /* AM29LV641 or AM29LV800BT */
diff --git a/include/configs/Sandpoint8240.h b/include/configs/Sandpoint8240.h
index cfd16d31274..7c880ab5ad3 100644
--- a/include/configs/Sandpoint8240.h
+++ b/include/configs/Sandpoint8240.h
@@ -176,7 +176,7 @@
#else
#define CFG_FLASH_SIZE (1024 * 1024) /* Unity has onboard 1MByte flash */
#endif
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x00004000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x00002000 /* Total Size of Environment Sector */
diff --git a/include/configs/Sandpoint8245.h b/include/configs/Sandpoint8245.h
index c0f2c5796a6..39f66cbdb31 100644
--- a/include/configs/Sandpoint8245.h
+++ b/include/configs/Sandpoint8245.h
@@ -146,7 +146,7 @@
#else
#define CFG_FLASH_SIZE (1024 * 1024) /* Unity has onboard 1MByte flash */
#endif
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x00004000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x00002000 /* Total Size of Environment Sector */
diff --git a/include/configs/TASREG.h b/include/configs/TASREG.h
index dccdf0ca9b4..1b2b70a4521 100644
--- a/include/configs/TASREG.h
+++ b/include/configs/TASREG.h
@@ -195,7 +195,7 @@
#define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
#define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR 0xFFC40000 /* Address of Environment Sector*/
#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */
diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h
index 3b6816675a2..97a8d6f8a0e 100644
--- a/include/configs/TB5200.h
+++ b/include/configs/TB5200.h
@@ -296,7 +296,7 @@
/*
* Environment settings
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x10000
#if defined(CONFIG_TQM5200_B)
#define CFG_ENV_SECT_SIZE 0x40000
diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h
index 8073b7ec6e5..99829169ccf 100644
--- a/include/configs/TK885D.h
+++ b/include/configs/TK885D.h
@@ -254,7 +254,7 @@
#define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x08000 /* Total Size of Environment */
#define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 0ba74558967..d91d2e51b2b 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -456,7 +456,7 @@
/*
* Environment settings
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x4000 /* 16 k - keep small for fast booting */
#if defined(CONFIG_TQM5200_B) || defined (CONFIG_CAM5200)
#define CFG_ENV_SECT_SIZE 0x40000
diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h
index 839b6be91b9..a979351166f 100644
--- a/include/configs/TQM823L.h
+++ b/include/configs/TQM823L.h
@@ -215,7 +215,7 @@
#define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
-#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 */
diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h
index b9a7a59c258..86432c6eaeb 100644
--- a/include/configs/TQM823M.h
+++ b/include/configs/TQM823M.h
@@ -210,7 +210,7 @@
#define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x08000 /* Total Size of Environment */
#define CFG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */
diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h
index a77b1199bd8..46ecb5127a0 100644
--- a/include/configs/TQM8260.h
+++ b/include/configs/TQM8260.h
@@ -306,7 +306,7 @@
#if 0
/* Start port with environment in flash; switch to EEPROM later */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_FLASH_BASE+0x40000)
#define CFG_ENV_SIZE 0x40000
#define CFG_ENV_SECT_SIZE 0x40000
diff --git a/include/configs/TQM8272.h b/include/configs/TQM8272.h
index 039ecf17bb8..8642a9f610b 100644
--- a/include/configs/TQM8272.h
+++ b/include/configs/TQM8272.h
@@ -381,7 +381,7 @@
#define CFG_UPDATE_FLASH_SIZE
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x40000)
#define CFG_ENV_SIZE 0x20000
#define CFG_ENV_SECT_SIZE 0x20000
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 2ab6991513a..0d47d70fd13 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -300,7 +300,7 @@ extern int tqm834x_num_flash_banks;
#define CONFIG_ENV_OVERWRITE
#ifndef CFG_RAMBOOT
- #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
diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h
index 388fafc5554..1a808961764 100644
--- a/include/configs/TQM850L.h
+++ b/include/configs/TQM850L.h
@@ -200,7 +200,7 @@
#define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
-#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 */
diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h
index 6f0864f47ab..4626f2ef277 100644
--- a/include/configs/TQM850M.h
+++ b/include/configs/TQM850M.h
@@ -199,7 +199,7 @@
#define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x08000 /* Total Size of Environment */
#define CFG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */
diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h
index 093d6599ea1..6582d97a119 100644
--- a/include/configs/TQM855L.h
+++ b/include/configs/TQM855L.h
@@ -205,7 +205,7 @@
#define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
-#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 */
diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h
index 64bbc39cf82..2ff208c44a7 100644
--- a/include/configs/TQM855M.h
+++ b/include/configs/TQM855M.h
@@ -239,7 +239,7 @@
#define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x08000 /* Total Size of Environment */
#define CFG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */
diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h
index 5e1cf956f1b..c6bb4f902ea 100644
--- a/include/configs/TQM85xx.h
+++ b/include/configs/TQM85xx.h
@@ -558,7 +558,7 @@
/*
* Environment
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_TQM_FLASH_N_TYPE
#define CFG_ENV_SECT_SIZE 0x40000 /* 256K (one sector) for env */
diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index dacc3406bb8..1daf8666baf 100644
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -204,7 +204,7 @@
#define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
-#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 */
diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h
index 3ec849c8bc8..dcdcdc1ae94 100644
--- a/include/configs/TQM860M.h
+++ b/include/configs/TQM860M.h
@@ -204,7 +204,7 @@
#define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x08000 /* Total Size of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */
diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index 6c610ee5904..53a8f345030 100644
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -208,7 +208,7 @@
#define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
-#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 */
diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index 2eca59b99dd..41a0cac8a3e 100644
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -208,7 +208,7 @@
#define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x08000 /* Total Size of Environment */
#define CFG_ENV_SECT_SIZE 0x20000 /* Total Size of Environment Sector */
diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index 4683286d7a0..3e50cd4223b 100644
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -248,7 +248,7 @@
#define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x08000 /* Total Size of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */
diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h
index 5daaf04be84..ebdf17d3971 100644
--- a/include/configs/TQM885D.h
+++ b/include/configs/TQM885D.h
@@ -251,7 +251,7 @@
#define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x40000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x08000 /* Total Size of Environment */
#define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */
diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h
index 25e98e249e5..16584ecbc37 100644
--- a/include/configs/Total5200.h
+++ b/include/configs/Total5200.h
@@ -232,7 +232,7 @@
/*
* Environment settings
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x40000
#define CFG_ENV_SECT_SIZE 0x40000
#define CONFIG_ENV_OVERWRITE 1
diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 50dd7aae9f7..9822d7d428e 100644
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -239,7 +239,7 @@
#define CFG_FLASH_WRITE_TOUT (5*CFG_HZ) /* Timeout for Flash Write */
#if 0
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */
#endif
diff --git a/include/configs/VoVPN-GW.h b/include/configs/VoVPN-GW.h
index db05d82bfce..d8d97e84fba 100644
--- a/include/configs/VoVPN-GW.h
+++ b/include/configs/VoVPN-GW.h
@@ -259,7 +259,7 @@
#define CFG_MONITOR_OFFSET 0x00700000
/* environment in flash */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00020000)
#define CFG_ENV_SIZE 0x00020000
#define CFG_ENV_SECT_SIZE 0x00020000
diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h
index d4ec03e5e8c..2471a44172f 100644
--- a/include/configs/W7OLMC.h
+++ b/include/configs/W7OLMC.h
@@ -261,7 +261,7 @@
/*-----------------------------------------------------------------------
* Flash EEPROM for environment
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x00040000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x10000 /* Total Size of env. sector */
diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h
index ac52e39fe01..fe09c9a1305 100644
--- a/include/configs/W7OLMG.h
+++ b/include/configs/W7OLMG.h
@@ -268,7 +268,7 @@
/*-----------------------------------------------------------------------
* Flash EEPROM for environment
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x00040000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x10000 /* Total Size of env. sector */
diff --git a/include/configs/Yukon8220.h b/include/configs/Yukon8220.h
index 9ace43eff92..ef230e15dfa 100644
--- a/include/configs/Yukon8220.h
+++ b/include/configs/Yukon8220.h
@@ -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
#ifndef CFG_JFFS2_FIRST_SECTOR
diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h
index 4217900e604..5fade6332eb 100644
--- a/include/configs/ZPC1900.h
+++ b/include/configs/ZPC1900.h
@@ -220,11 +220,11 @@
#define CFG_MALLOC_LEN (4096 << 10) /* Reserve 4 MB for malloc() */
#define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
-#if !defined(CFG_ENV_IS_IN_FLASH) && !defined(CONFIG_ENV_IS_IN_NVRAM)
+#if !defined(CONFIG_ENV_IS_IN_FLASH) && !defined(CONFIG_ENV_IS_IN_NVRAM)
#define CONFIG_ENV_IS_IN_NVRAM 1
#endif
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
# define CFG_ENV_SECT_SIZE 0x10000
# define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#else
diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h
index 5ba8d1a7157..1b713884839 100644
--- a/include/configs/ZUMA.h
+++ b/include/configs/ZUMA.h
@@ -349,7 +349,7 @@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CFG_FLASH_CFI 1
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sect real size */
#define CFG_ENV_ADDR (0xfff80000 - CFG_ENV_SECT_SIZE)
diff --git a/include/configs/acadia.h b/include/configs/acadia.h
index 894a62b847c..ffaaa847a37 100644
--- a/include/configs/acadia.h
+++ b/include/configs/acadia.h
@@ -96,7 +96,7 @@
* Environment
*----------------------------------------------------------------------*/
#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
-#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#else
#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
@@ -123,7 +123,7 @@
#define CFG_NO_FLASH 1 /* No NOR on Acadia when NAND-booting */
#endif
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x40000 /* size of one complete sector */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
diff --git a/include/configs/actux1.h b/include/configs/actux1.h
index 33a74949a54..d18c4b5848b 100644
--- a/include/configs/actux1.h
+++ b/include/configs/actux1.h
@@ -202,7 +202,7 @@
* environment organization:
* one flash sector, embedded in uboot area (bottom bootblock flash)
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x2000
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x4000)
#define CFG_USE_PPCENV 1
diff --git a/include/configs/actux2.h b/include/configs/actux2.h
index 75aaa118421..f6919a5edf5 100644
--- a/include/configs/actux2.h
+++ b/include/configs/actux2.h
@@ -179,7 +179,7 @@
* environment organization:
* one flash sector, embedded in uboot area (bottom bootblock flash)
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x2000
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x4000)
#define CFG_USE_PPCENV 1
diff --git a/include/configs/actux3.h b/include/configs/actux3.h
index 693c2847fdb..dfc8967d299 100644
--- a/include/configs/actux3.h
+++ b/include/configs/actux3.h
@@ -179,7 +179,7 @@
* environment organization:
* one flash sector, embedded in uboot area (bottom bootblock flash)
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x2000
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x4000)
#define CFG_USE_PPCENV 1
diff --git a/include/configs/actux4.h b/include/configs/actux4.h
index 7f8e0f4d0f9..48d3713f368 100644
--- a/include/configs/actux4.h
+++ b/include/configs/actux4.h
@@ -176,7 +176,7 @@
#define CFG_CACHELINE_SIZE 32
/* environment organization: one complete 4k flash sector */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x1000
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x3f000)
diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h
index f516c4602c2..eb6a6454a1a 100644
--- a/include/configs/ads5121.h
+++ b/include/configs/ads5121.h
@@ -320,7 +320,7 @@
/*
* Environment
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
/* This has to be a multiple of the Flash sector size */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#define CFG_ENV_SIZE 0x2000
diff --git a/include/configs/aev.h b/include/configs/aev.h
index f27cc4a1500..bd7dab2f7bb 100644
--- a/include/configs/aev.h
+++ b/include/configs/aev.h
@@ -246,7 +246,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)
diff --git a/include/configs/alpr.h b/include/configs/alpr.h
index f342c7a6db6..ee60644ad00 100644
--- a/include/configs/alpr.h
+++ b/include/configs/alpr.h
@@ -93,7 +93,7 @@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
-#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_SECT_SIZE 0x10000 /* size of one complete sector */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 3db609bb3b8..79f4d11447a 100644
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -160,7 +160,7 @@
#undef CFG_DIRECT_FLASH_TFTP
/* ENV setting */
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OVERWRITE 1
#define CFG_ENV_SECT_SIZE (128 * 1024)
#define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE)
diff --git a/include/configs/armadillo.h b/include/configs/armadillo.h
index 98a83db296c..45b20bdc4a1 100644
--- a/include/configs/armadillo.h
+++ b/include/configs/armadillo.h
@@ -147,7 +147,7 @@
#define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x20000) /* Addr of Environment Sector */
#define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */
diff --git a/include/configs/assabet.h b/include/configs/assabet.h
index ed7b5ef8ffd..3cc4db43acb 100644
--- a/include/configs/assabet.h
+++ b/include/configs/assabet.h
@@ -160,9 +160,9 @@
#undef CFG_FLASH_PROTECTION
#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE }
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
#define CFG_ENV_IN_OWN_SECTOR 1
#define CFG_ENV_ADDR (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE)
#define CFG_ENV_SIZE PHYS_FLASH_SECT_SIZE
diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index acf452bbe36..fb5358c787c 100644
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -163,7 +163,7 @@
#else
/* bootstrap + u-boot + env + linux in norflash */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MONITOR_BASE (PHYS_FLASH_1 + 0x8000)
#define CFG_ENV_OFFSET 0x4000
#define CFG_ENV_ADDR (PHYS_FLASH_1 + CFG_ENV_OFFSET)
diff --git a/include/configs/at91rm9200dk.h b/include/configs/at91rm9200dk.h
index 92724abbe89..31d84d21623 100644
--- a/include/configs/at91rm9200dk.h
+++ b/include/configs/at91rm9200dk.h
@@ -186,7 +186,7 @@
#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
#define CFG_ENV_SIZE 0x2000 /* 0x8000 */
#else
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_SKIP_LOWLEVEL_INIT
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0xe000) /* between boot.bin and u-boot.bin.gz */
#define CFG_ENV_SIZE 0x2000 /* 0x8000 */
diff --git a/include/configs/atc.h b/include/configs/atc.h
index 1e393a2a1f1..a7b154ddbdb 100644
--- a/include/configs/atc.h
+++ b/include/configs/atc.h
@@ -270,7 +270,7 @@
#if 1
/* environment is in Flash */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
# define CFG_ENV_ADDR (CFG_FLASH_BASE+0x30000)
# define CFG_ENV_SIZE 0x10000
# define CFG_ENV_SECT_SIZE 0x10000
diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index 6d8c1b22a38..12da7f09060 100644
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -153,7 +153,7 @@
#define CFG_INTRAM_SIZE INTERNAL_SRAM_SIZE
#define CFG_SDRAM_BASE EBI_SDRAM_BASE
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 65536
#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE)
diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index 3a7d27354f8..4a9a94e3655 100644
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -177,7 +177,7 @@
#define CFG_INTRAM_SIZE INTERNAL_SRAM_SIZE
#define CFG_SDRAM_BASE EBI_SDRAM_BASE
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 65536
#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE)
diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h
index 55ea7f290f3..62c1aff85bb 100644
--- a/include/configs/atstk1003.h
+++ b/include/configs/atstk1003.h
@@ -160,7 +160,7 @@
#define CFG_INTRAM_SIZE INTERNAL_SRAM_SIZE
#define CFG_SDRAM_BASE EBI_SDRAM_BASE
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 65536
#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE)
diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h
index 369c6196490..a9a94841e16 100644
--- a/include/configs/atstk1004.h
+++ b/include/configs/atstk1004.h
@@ -160,7 +160,7 @@
#define CFG_INTRAM_SIZE INTERNAL_SRAM_SIZE
#define CFG_SDRAM_BASE EBI_SDRAM_BASE
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 65536
#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE)
diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h
index 902f822e45f..c454ec01c87 100644
--- a/include/configs/atstk1006.h
+++ b/include/configs/atstk1006.h
@@ -177,7 +177,7 @@
#define CFG_INTRAM_SIZE INTERNAL_SRAM_SIZE
#define CFG_SDRAM_BASE EBI_SDRAM_BASE
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 65536
#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE)
diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h
index 20ebc3fb8f1..2485477876c 100644
--- a/include/configs/bamboo.h
+++ b/include/configs/bamboo.h
@@ -103,7 +103,7 @@
* Environment
*----------------------------------------------------------------------*/
#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
-#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#else
#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
@@ -126,7 +126,7 @@
#define CFG_FLASH_2ND_16BIT_DEV 1 /* bamboo has 8 and 16bit device */
#define CFG_FLASH_2ND_ADDR 0x87800000 /* bamboo has 8 and 16bit device */
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */
#define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */
@@ -134,7 +134,7 @@
/* Address and size of Redundant Environment Sector */
#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
/*
* IPL (Initial Program Loader, integrated inside CPU)
diff --git a/include/configs/barco.h b/include/configs/barco.h
index 4f57067db15..cbf5868a31c 100644
--- a/include/configs/barco.h
+++ b/include/configs/barco.h
@@ -166,7 +166,7 @@
#define CFG_FLASH_BASE 0xFFF00000
#define CFG_FLASH_SIZE (8 * 1024 * 1024) /* Unity has onboard 1MByte flash */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x000047A4 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x00002000 /* Total Size of Environment Sector */
/* #define ENV_CRC 0x8BF6F24B XXX - FIXME: gets defined automatically */
diff --git a/include/configs/bf533-ezkit.h b/include/configs/bf533-ezkit.h
index 2f551adca4b..08fb639c153 100644
--- a/include/configs/bf533-ezkit.h
+++ b/include/configs/bf533-ezkit.h
@@ -138,7 +138,7 @@
#define CFG_MAX_FLASH_BANKS 3 /* max number of memory banks */
#define CFG_MAX_FLASH_SECT 40 /* max number of sectors on one chip */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR 0x20020000
#define CFG_ENV_SECT_SIZE 0x10000 /* Total Size of Environment Sector */
diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index 842207f7311..2e71780d07b 100644
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -106,7 +106,7 @@
#define CFG_ENV_OFFSET 0x4000
#define CFG_ENV_HEADER (CFG_ENV_OFFSET + 0x12A) /* 0x12A is the length of LDR file header */
#else
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR 0x20004000
#define CFG_ENV_OFFSET (CFG_ENV_ADDR - CFG_FLASH_BASE)
#endif
diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index 6d438395933..5224eb2ff0d 100644
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -239,7 +239,7 @@
#define CFG_ENV_OFFSET 0x4000
#define CFG_ENV_HEADER (CFG_ENV_OFFSET + 0x16e) /* 0x12A is the length of LDR file header */
#else
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR 0x20004000
#define CFG_ENV_OFFSET (CFG_ENV_ADDR - CFG_FLASH_BASE)
#endif
diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index e4a7f9dbce3..ff10650eb76 100644
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -79,7 +79,7 @@
#define CFG_FLASH_CFI /* The flash is CFI compatible */
#define CONFIG_FLASH_CFI_DRIVER /* Use common CFI driver */
#define CFG_FLASH_CFI_AMD_RESET
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_BASE 0x20000000
#define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */
#define CFG_MAX_FLASH_SECT 135 /* max number of sectors on one chip */
diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h
index 4b42f8b1a85..146d25493aa 100644
--- a/include/configs/bubinga.h
+++ b/include/configs/bubinga.h
@@ -81,7 +81,7 @@
* supported for backward compatibility.
*/
#if 1
-#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#else
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
#endif
@@ -194,7 +194,7 @@
#define CFG_FLASH_ADDR1 0x2aaa
#define CFG_FLASH_WORD_SIZE unsigned char
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
@@ -202,7 +202,7 @@
/* Address and size of Redundant Environment Sector */
#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
* NVRAM organization
diff --git a/include/configs/c2mon.h b/include/configs/c2mon.h
index 6f0d4b0f80a..17178e9f02e 100644
--- a/include/configs/c2mon.h
+++ b/include/configs/c2mon.h
@@ -177,7 +177,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 */
diff --git a/include/configs/canmb.h b/include/configs/canmb.h
index 38714cc3069..f0818b77dd8 100644
--- a/include/configs/canmb.h
+++ b/include/configs/canmb.h
@@ -137,7 +137,7 @@
/*
* Environment settings
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET (2*128*1024)
#define CFG_ENV_SIZE 0x2000
#define CFG_ENV_SECT_SIZE (128*1024)
diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h
index 189107448cb..9ec49c10c7d 100644
--- a/include/configs/canyonlands.h
+++ b/include/configs/canyonlands.h
@@ -112,7 +112,7 @@
* Define here the location of the environment variables (FLASH).
*/
#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
-#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_NAND_CS 3 /* NAND chip connected to CSx */
#else
#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
@@ -201,7 +201,7 @@
#define CFG_FLASH_USE_BUFFER_WRITE 1 /* use buffered writes (20x faster) */
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
@@ -209,7 +209,7 @@
/* Address and size of Redundant Environment Sector */
#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR - CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
* NAND-FLASH related
diff --git a/include/configs/cerf250.h b/include/configs/cerf250.h
index c801f037e1f..fb737d50cce 100644
--- a/include/configs/cerf250.h
+++ b/include/configs/cerf250.h
@@ -217,7 +217,7 @@
#define CFG_FLASH_WRITE_TOUT (25*CFG_HZ) /* Timeout for Flash Write */
#define CFG_MONITOR_LEN 0x40000 /* 256 KiB */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (PHYS_FLASH_1 + CFG_MONITOR_LEN)
#define CFG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */
diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h
index 0221dfeb8c1..5f0d3fbcc95 100644
--- a/include/configs/cm5200.h
+++ b/include/configs/cm5200.h
@@ -264,7 +264,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 (CFG_FLASH_BASE + CFG_MONITOR_LEN)
diff --git a/include/configs/cmc_pu2.h b/include/configs/cmc_pu2.h
index bce5fcd82f5..d9c1263326a 100644
--- a/include/configs/cmc_pu2.h
+++ b/include/configs/cmc_pu2.h
@@ -172,7 +172,7 @@
#define CFG_FLASH_ERASE_TOUT (11 * CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT ( 2 * CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x20000 /* after u-boot.bin */
#define CFG_ENV_SECT_SIZE (64 << 10) /* sectors are 64 kB */
#define CFG_ENV_SIZE (16 << 10) /* Use only 16 kB */
diff --git a/include/configs/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h
index ac2b7a1e71d..ed6578a10ae 100644
--- a/include/configs/cmi_mpc5xx.h
+++ b/include/configs/cmi_mpc5xx.h
@@ -168,9 +168,9 @@
#define CFG_FLASH_WRITE_TOUT 600 /* Timeout for Flash Write (in ms) */
#define CFG_FLASH_PROTECTION 1 /* Physically section protection on */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_OFFSET 0x00020000 /* Environment starts at this adress */
#define CFG_ENV_SIZE 0x00010000 /* Set whole sector as env */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 649b053c2b6..c908d5aa3d5 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -126,12 +126,12 @@
#ifndef CONFIG_MONITOR_IS_IN_RAM
#define CFG_ENV_OFFSET 0x4000
#define CFG_ENV_SECT_SIZE 0x2000
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_IS_EMBEDDED 1
#else
#define CFG_ENV_ADDR 0xffe04000
#define CFG_ENV_SECT_SIZE 0x2000
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#endif
diff --git a/include/configs/cogent_mpc8260.h b/include/configs/cogent_mpc8260.h
index 84d50c71dd5..fff35f98ecf 100644
--- a/include/configs/cogent_mpc8260.h
+++ b/include/configs/cogent_mpc8260.h
@@ -257,7 +257,7 @@
#define CFG_FLASH_ERASE_TOUT 120000 /* Flash Erase Timeout (in ms) */
#define CFG_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (in ms) */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR CFG_FLASH_BASE /* Addr of Environment Sector */
#ifdef CONFIG_CMA302
#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */
diff --git a/include/configs/cogent_mpc8xx.h b/include/configs/cogent_mpc8xx.h
index ce38af1dd85..9d257d29d1b 100644
--- a/include/configs/cogent_mpc8xx.h
+++ b/include/configs/cogent_mpc8xx.h
@@ -203,7 +203,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_ADDR CFG_FLASH_BASE /* Addr of Environment Sector */
#ifdef CONFIG_CMA302
#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */
diff --git a/include/configs/cpci5200.h b/include/configs/cpci5200.h
index 7974491aca7..cbc5b2ea67b 100644
--- a/include/configs/cpci5200.h
+++ b/include/configs/cpci5200.h
@@ -219,7 +219,7 @@
* Environment settings
*/
#if 1 /* test-only */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x20000
#define CFG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_OVERWRITE 1
diff --git a/include/configs/cradle.h b/include/configs/cradle.h
index eb93a8f083f..ee319a7af7e 100644
--- a/include/configs/cradle.h
+++ b/include/configs/cradle.h
@@ -152,7 +152,7 @@
#define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR 0x00020000 /* absolute address for now */
#define CFG_ENV_SIZE 0x20000 /* 8K ouch, this may later be */
diff --git a/include/configs/csb226.h b/include/configs/csb226.h
index a807d0084da..c5d65e57965 100644
--- a/include/configs/csb226.h
+++ b/include/configs/csb226.h
@@ -488,7 +488,7 @@
#define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x1C000)
/* Addr of Environment Sector */
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
diff --git a/include/configs/csb272.h b/include/configs/csb272.h
index 880bee8612c..1d6a0775bbb 100644
--- a/include/configs/csb272.h
+++ b/include/configs/csb272.h
@@ -230,7 +230,7 @@
* Environment configuration
*
*/
-#define CFG_ENV_IS_IN_FLASH 1 /* environment is in FLASH */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* environment is in FLASH */
#undef CONFIG_ENV_IS_IN_NVRAM
#undef CONFIG_ENV_IS_IN_EEPROM
@@ -252,7 +252,7 @@
#define CFG_RAMSTART
#endif
-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
#define CFG_ENV_IN_OWN_SECTOR 1 /* Give Environment own sector */
#define CFG_ENV_ADDR 0xFFF00000 /* Address of Environment Sector */
#define CFG_ENV_SIZE 0x00001000 /* Size of Environment */
diff --git a/include/configs/csb472.h b/include/configs/csb472.h
index e343632935e..62bcc2ff1cd 100644
--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@@ -229,7 +229,7 @@
* Environment configuration
*
*/
-#define CFG_ENV_IS_IN_FLASH 1 /* environment is in FLASH */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* environment is in FLASH */
#undef CONFIG_ENV_IS_IN_NVRAM
#undef CONFIG_ENV_IS_IN_EEPROM
@@ -251,7 +251,7 @@
#define CFG_RAMSTART
#endif
-#if defined(CFG_ENV_IS_IN_FLASH)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
#define CFG_ENV_IN_OWN_SECTOR 1 /* Give Environment own sector */
#define CFG_ENV_ADDR 0xFFF00000 /* Address of Environment Sector */
#define CFG_ENV_SIZE 0x00001000 /* Size of Environment */
diff --git a/include/configs/csb637.h b/include/configs/csb637.h
index 66265242e69..c3054d3709b 100644
--- a/include/configs/csb637.h
+++ b/include/configs/csb637.h
@@ -198,7 +198,7 @@
#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
#define CFG_ENV_SIZE 0x2000 /* 0x8000 */
#else
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x20000) /* after u-boot.bin */
#define CFG_ENV_SIZE 0x20000 /* sectors are 128K here */
#endif /* CONFIG_ENV_IS_IN_DATAFLASH */
diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h
index 9d79e3cf741..13f5e01a002 100644
--- a/include/configs/davinci_dvevm.h
+++ b/include/configs/davinci_dvevm.h
@@ -112,7 +112,7 @@
/* Flash & Environment */
/*=====================*/
#ifdef CFG_USE_NAND
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
#define CFG_NO_FLASH
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
#ifdef CFG_NAND_SMALLPAGE
@@ -138,7 +138,7 @@
#undef CONFIG_SKIP_LOWLEVEL_INIT
#undef CONFIG_SKIP_RELOCATE_UBOOT
#endif
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#undef CFG_NO_FLASH
#define CONFIG_FLASH_CFI_DRIVER
#define CFG_FLASH_CFI
diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h
index 4aed8439d5a..f6234ec3d0b 100644
--- a/include/configs/davinci_schmoogie.h
+++ b/include/configs/davinci_schmoogie.h
@@ -79,7 +79,7 @@
/*=====================*/
/* Flash & Environment */
/*=====================*/
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
#define CFG_NO_FLASH
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
#define CFG_ENV_SECT_SIZE 2048 /* Env sector Size */
diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h
index c46a4305a83..b4f4b116820 100644
--- a/include/configs/davinci_sffsdr.h
+++ b/include/configs/davinci_sffsdr.h
@@ -75,7 +75,7 @@
#define CONFIG_NET_RETRY_COUNT 10
#define CONFIG_OVERWRITE_ETHADDR_ONCE
/* Flash & Environment */
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
#define CFG_NO_FLASH
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
#define CFG_ENV_SECT_SIZE 2048 /* Env sector Size */
diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
index 9c54f084d48..cd781eda05e 100644
--- a/include/configs/davinci_sonata.h
+++ b/include/configs/davinci_sonata.h
@@ -112,7 +112,7 @@
/* Flash & Environment */
/*=====================*/
#ifdef CFG_USE_NAND
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
#define CFG_NO_FLASH
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
#define CFG_ENV_SECT_SIZE 512 /* Env sector Size */
@@ -133,7 +133,7 @@
#undef CONFIG_SKIP_LOWLEVEL_INIT
#undef CONFIG_SKIP_RELOCATE_UBOOT
#endif
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#undef CFG_NO_FLASH
#define CONFIG_FLASH_CFI_DRIVER
#define CFG_FLASH_CFI
diff --git a/include/configs/dnp1110.h b/include/configs/dnp1110.h
index e7873e95fdd..4adfeed082a 100644
--- a/include/configs/dnp1110.h
+++ b/include/configs/dnp1110.h
@@ -155,7 +155,7 @@
#define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0xF80000) /* Addr of Environment Sector */
#define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */
diff --git a/include/configs/eXalion.h b/include/configs/eXalion.h
index 6ba0d3fe57d..deb20aab9b7 100644
--- a/include/configs/eXalion.h
+++ b/include/configs/eXalion.h
@@ -135,7 +135,7 @@
#error Specific type of MPC824x must be defined (i.e. CONFIG_MPC8240)
#endif
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SECT_SIZE 0x20000 /* Size of one Flash sector */
#define CFG_ENV_SIZE CFG_ENV_SECT_SIZE /* Use one Flash sector for enviroment */
#define CFG_ENV_ADDR 0xFFFC0000
diff --git a/include/configs/ebony.h b/include/configs/ebony.h
index 21c0866f895..2a3595aa570 100644
--- a/include/configs/ebony.h
+++ b/include/configs/ebony.h
@@ -49,7 +49,7 @@
* supported for backward compatibility.
*/
#if 1
-#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#else
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
#endif
@@ -118,7 +118,7 @@
#define CFG_FLASH_ADDR1 0x2aaa
#define CFG_FLASH_WORD_SIZE unsigned char
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
@@ -126,7 +126,7 @@
/* Address and size of Redundant Environment Sector */
#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
* DDR SDRAM
diff --git a/include/configs/ep7312.h b/include/configs/ep7312.h
index 54330821b1f..367e667a101 100644
--- a/include/configs/ep7312.h
+++ b/include/configs/ep7312.h
@@ -149,7 +149,7 @@
#define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x20000) /* Addr of Environment Sector */
#define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */
diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h
index ccc0d5d225b..54484ad433b 100644
--- a/include/configs/ep8248.h
+++ b/include/configs/ep8248.h
@@ -214,12 +214,12 @@
#define CFG_MONITOR_LEN (256 << 10) /* Reserve 256KB for Monitor */
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x20000
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
#define CFG_DEFAULT_IMMR 0x00010000
diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h
index 094a14c24ba..0911f8c9259 100644
--- a/include/configs/ep8260.h
+++ b/include/configs/ep8260.h
@@ -474,7 +474,7 @@
#endif
#ifndef CFG_RAMBOOT
-# define CFG_ENV_IS_IN_FLASH 1
+# define CONFIG_ENV_IS_IN_FLASH 1
# ifdef CFG_ENV_IN_OWN_SECT
# define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000)
diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h
index 4de879abe23..17c84963c36 100644
--- a/include/configs/ep82xxm.h
+++ b/include/configs/ep82xxm.h
@@ -192,7 +192,7 @@
* Note: DENX encourages to use redundant environment in FLASH.
*/
#if 1
-#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#else
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#endif
@@ -207,10 +207,10 @@
#define CFG_MAX_FLASH_SECT 512 /* max num of sects on one chip */
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector in flinfo */
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x20000
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
* I2C
diff --git a/include/configs/evb4510.h b/include/configs/evb4510.h
index f2ed0df494d..35a020bd6d6 100644
--- a/include/configs/evb4510.h
+++ b/include/configs/evb4510.h
@@ -171,7 +171,7 @@
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
/* environment settings */
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#undef CONFIG_ENV_IS_NOWHERE
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x20000) /* environment start address */
diff --git a/include/configs/favr-32-ezkit.h b/include/configs/favr-32-ezkit.h
index 35d289fadc7..ce19b1f8208 100644
--- a/include/configs/favr-32-ezkit.h
+++ b/include/configs/favr-32-ezkit.h
@@ -174,7 +174,7 @@
#define CFG_INTRAM_SIZE INTERNAL_SRAM_SIZE
#define CFG_SDRAM_BASE EBI_SDRAM_BASE
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 65536
#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE)
diff --git a/include/configs/gcplus.h b/include/configs/gcplus.h
index 1d9c05b729b..31e99f3bec1 100644
--- a/include/configs/gcplus.h
+++ b/include/configs/gcplus.h
@@ -178,7 +178,7 @@
#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE }
#endif
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE) /* Addr of Environment Sector */
#define CFG_ENV_SIZE PHYS_FLASH_SECT_SIZE
diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index 7fee1d2dfc1..e363d9a078b 100644
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -219,7 +219,7 @@
* Environment settings
*/
/*#define CONFIG_ENV_IS_NOWHERE 1*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
/* CFG_ENV_ADDR need to be at sector boundary */
#define CFG_ENV_SIZE 0x8000
#define CFG_ENV_SECT_SIZE 0x20000
diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index 776fe40dec1..7f8367436ca 100644
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -207,7 +207,7 @@
* Environment settings
*/
/*#define CONFIG_ENV_IS_NOWHERE 1*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
/* CFG_ENV_ADDR need to be at sector boundary */
#define CFG_ENV_SIZE 0x8000
#define CFG_ENV_SECT_SIZE 0x20000
diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index f0f770cb3fe..a6e34d0cc16 100644
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -183,7 +183,7 @@
* Environment settings
*/
/*#define CONFIG_ENV_IS_NOWHERE 1*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
/* CFG_ENV_ADDR need to be at sector boundary */
#define CFG_ENV_SIZE 0x8000
#define CFG_ENV_SECT_SIZE 0x20000
diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index a23ac9ca49b..2a8226a8de6 100644
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -210,7 +210,7 @@
* Environment settings
*/
#define CONFIG_ENV_IS_NOWHERE 1
-/*#define CFG_ENV_IS_IN_FLASH*/
+/*#define CONFIG_ENV_IS_IN_FLASH*/
/*#define CFG_ENV_SIZE 0x8000*/
#define CFG_ENV_SECT_SIZE 0x40000
#define CONFIG_ENV_OVERWRITE 1
diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index c45b258bda7..3cfeb204050 100644
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -207,7 +207,7 @@
* Environment settings
*/
#define CONFIG_ENV_IS_NOWHERE 1
-/*#define CFG_ENV_IS_IN_FLASH*/
+/*#define CONFIG_ENV_IS_IN_FLASH*/
/*#define CFG_ENV_SIZE 0x8000*/
#define CFG_ENV_SECT_SIZE 0x40000
#define CONFIG_ENV_OVERWRITE 1
diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h
index d9187825e54..19641b7df5e 100644
--- a/include/configs/gw8260.h
+++ b/include/configs/gw8260.h
@@ -463,7 +463,7 @@
#define CFG_FLASH_ERASE_TOUT 8000 /* Timeout for Flash Erase (in ms) */
#define CFG_FLASH_WRITE_TOUT 1 /* Timeout for Flash Write (in ms) */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CFG_ENV_IN_OWN_SECT
# define CFG_ENV_ADDR (CFG_MONITOR_BASE + (256 * 1024))
diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h
index c44d62eb0c5..68bd4c8fa8b 100644
--- a/include/configs/hammerhead.h
+++ b/include/configs/hammerhead.h
@@ -143,7 +143,7 @@
#define CFG_SDRAM_BASE 0x10000000
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 65536
#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE)
diff --git a/include/configs/hcu4.h b/include/configs/hcu4.h
index 7f262cbf918..b98883edbe6 100644
--- a/include/configs/hcu4.h
+++ b/include/configs/hcu4.h
@@ -122,7 +122,7 @@
*----------------------------------------------------------------------*/
#undef CONFIG_ENV_IS_IN_NVRAM
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#undef CONFIG_ENV_IS_NOWHERE
#ifdef CONFIG_ENV_IS_IN_EEPROM
@@ -132,7 +132,7 @@
#define CFG_ENV_SIZE (PROM_SIZE-CFG_ENV_OFFSET)
#endif
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
/* Put the environment in Flash */
#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */
#define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE)
diff --git a/include/configs/hcu5.h b/include/configs/hcu5.h
index af0f7f4758e..91c5f22b549 100644
--- a/include/configs/hcu5.h
+++ b/include/configs/hcu5.h
@@ -107,7 +107,7 @@
*----------------------------------------------------------------------*/
#undef CONFIG_ENV_IS_IN_NVRAM
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#undef CONFIG_ENV_IS_IN_EEPROM
#undef CONFIG_ENV_IS_NOWHERE
@@ -119,7 +119,7 @@
#define CFG_ENV_SIZE (PROM_SIZE-CFG_ENV_OFFSET)
#endif
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
/* Put the environment in Flash */
#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */
#define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE)
diff --git a/include/configs/hermes.h b/include/configs/hermes.h
index 48b23bdcd64..1ecb4b5ef4c 100644
--- a/include/configs/hermes.h
+++ b/include/configs/hermes.h
@@ -155,7 +155,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 0x4000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */
/*-----------------------------------------------------------------------
diff --git a/include/configs/hmi1001.h b/include/configs/hmi1001.h
index 205f5ccb03a..4d557611469 100644
--- a/include/configs/hmi1001.h
+++ b/include/configs/hmi1001.h
@@ -163,7 +163,7 @@
/*
* Environment settings
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x4000
#define CFG_ENV_SECT_SIZE 0x20000
#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE)
diff --git a/include/configs/hymod.h b/include/configs/hymod.h
index 264192f2620..fd0bab1643b 100644
--- a/include/configs/hymod.h
+++ b/include/configs/hymod.h
@@ -403,7 +403,7 @@
#define CFG_FLASH_ERASE_TOUT 120000 /* Flash Erase Timeout (in ms) */
#define CFG_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (in ms) */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x40000 /* see README - env sect real size */
#define CFG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CFG_ENV_SECT_SIZE)
diff --git a/include/configs/idmr.h b/include/configs/idmr.h
index 7c3ebad4b7f..43453b7cfca 100644
--- a/include/configs/idmr.h
+++ b/include/configs/idmr.h
@@ -118,11 +118,11 @@
#define CFG_ENV_ADDR 0xff820000
#define CFG_ENV_SECT_SIZE 0x10000
#define CFG_ENV_SIZE 0x2000
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#else /* CONFIG_MONITOR_IS_IN_RAM */
#define CFG_ENV_OFFSET 0x4000
#define CFG_ENV_SECT_SIZE 0x2000
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#endif /* !CONFIG_MONITOR_IS_IN_RAM */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git a/include/configs/impa7.h b/include/configs/impa7.h
index e9704fc9af8..7eb6921b55e 100644
--- a/include/configs/impa7.h
+++ b/include/configs/impa7.h
@@ -151,7 +151,7 @@
#define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h
index c4763335b6e..1660b0509e9 100644
--- a/include/configs/imx31_litekit.h
+++ b/include/configs/imx31_litekit.h
@@ -150,7 +150,7 @@
#define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at beginning of flash */
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x001f0000)
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SECT_SIZE (64 * 1024)
#define CFG_ENV_SIZE (64 * 1024)
diff --git a/include/configs/incaip.h b/include/configs/incaip.h
index 2e4ee66cf61..3d98974a2a4 100644
--- a/include/configs/incaip.h
+++ b/include/configs/incaip.h
@@ -150,7 +150,7 @@
#define CFG_FLASH_ERASE_TOUT (2 * CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (2 * CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
/* Address and size of Primary Environment Sector */
#define CFG_ENV_ADDR 0xB0030000
diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index efa2802fee2..528f2762a58 100644
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -171,7 +171,7 @@
/*
* Environment settings
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x4000)
#define CFG_ENV_SIZE 0x2000
#define CFG_ENV_SECT_SIZE 0x2000
diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index 5340f7c2d1d..d66ec3a194f 100644
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -163,7 +163,7 @@ SIB at Block62 End Block62 address 0x24f80000
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
#define CFG_MONITOR_LEN 0x00100000
-#define CFG_ENV_IS_IN_FLASH (1)
+#define CONFIG_ENV_IS_IN_FLASH 1
/*
* Move up the U-Boot & monitor area if more flash is fitted.
diff --git a/include/configs/ixdp425.h b/include/configs/ixdp425.h
index 6b73abe1f6f..6559429f82f 100644
--- a/include/configs/ixdp425.h
+++ b/include/configs/ixdp425.h
@@ -182,7 +182,7 @@
#define CFG_FLASH_CFI /* The flash is CFI compatible */
#define CONFIG_FLASH_CFI_DRIVER /* Use common CFI driver */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_BANKS_LIST { PHYS_FLASH_1 }
diff --git a/include/configs/ixdpg425.h b/include/configs/ixdpg425.h
index d4e487124b1..484c2d98aa9 100644
--- a/include/configs/ixdpg425.h
+++ b/include/configs/ixdpg425.h
@@ -211,7 +211,7 @@
#define CFG_FLASH_CFI /* The flash is CFI compatible */
#define CONFIG_FLASH_CFI_DRIVER /* Use common CFI driver */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_USE_BUFFER_WRITE 1 /* use buffered writes (20x faster) */
#define CFG_FLASH_PROTECTION 1 /* hardware flash protection */
diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index af88a3fa2d1..ce90d7f170a 100644
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -201,7 +201,7 @@
/*
* Environment settings
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x20000
#define CFG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_OVERWRITE 1
diff --git a/include/configs/katmai.h b/include/configs/katmai.h
index 5dcca757337..1876279abd4 100644
--- a/include/configs/katmai.h
+++ b/include/configs/katmai.h
@@ -170,7 +170,7 @@
/*-----------------------------------------------------------------------
* Environment
*----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_FLASH 1 /* Environment uses flash */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment uses flash */
/*
* Default environment variables
diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h
index 01d861b2ed8..fec22d89a45 100644
--- a/include/configs/kilauea.h
+++ b/include/configs/kilauea.h
@@ -121,7 +121,7 @@
* Environment
*----------------------------------------------------------------------*/
#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
-#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#else
#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
@@ -143,7 +143,7 @@
#define CFG_FLASH_USE_BUFFER_WRITE 1 /* use buffered writes (20x faster) */
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
@@ -151,7 +151,7 @@
/* Address and size of Redundant Environment Sector */
#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
/*
* IPL (Initial Program Loader, integrated inside CPU)
diff --git a/include/configs/korat.h b/include/configs/korat.h
index a887446f262..b6984da2ca0 100644
--- a/include/configs/korat.h
+++ b/include/configs/korat.h
@@ -104,7 +104,7 @@
/*
* Environment
*/
-#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environ vars */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environ vars */
/*
* FLASH related
diff --git a/include/configs/lart.h b/include/configs/lart.h
index 4570398cd46..f38e5da0d04 100644
--- a/include/configs/lart.h
+++ b/include/configs/lart.h
@@ -152,7 +152,7 @@
#define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h
index e5a0fb97153..01ae31769f6 100644
--- a/include/configs/linkstation.h
+++ b/include/configs/linkstation.h
@@ -449,7 +449,7 @@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
/*
* The original LinkStation flash organisation uses
* 448 kB (0xFFF00000 - 0xFFF6FFFF) for the boot loader
diff --git a/include/configs/logodl.h b/include/configs/logodl.h
index 047b4a4f71a..5e51d8134ed 100644
--- a/include/configs/logodl.h
+++ b/include/configs/logodl.h
@@ -288,7 +288,7 @@
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
/* FIXME */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
diff --git a/include/configs/lpc2292sodimm.h b/include/configs/lpc2292sodimm.h
index e3fef5e2ce9..2f2a3e823af 100644
--- a/include/configs/lpc2292sodimm.h
+++ b/include/configs/lpc2292sodimm.h
@@ -150,7 +150,7 @@
#define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (0x0 + 0x3C000) /* Addr of Environment Sector */
#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */
diff --git a/include/configs/lpd7a400.h b/include/configs/lpd7a400.h
index 04148898eac..ae9503fd9f6 100644
--- a/include/configs/lpd7a400.h
+++ b/include/configs/lpd7a400.h
@@ -110,7 +110,7 @@
#define CFG_MONITOR_BASE CFG_FLASH_BASE
#define CFG_MONITOR_LEN (256<<10)
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
/* Address and size of Primary Environment Sector */
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0xFC0000)
diff --git a/include/configs/lpd7a404.h b/include/configs/lpd7a404.h
index 11ede968180..7ea4342a1be 100644
--- a/include/configs/lpd7a404.h
+++ b/include/configs/lpd7a404.h
@@ -110,7 +110,7 @@
#define CFG_MONITOR_BASE CFG_FLASH_BASE
#define CFG_MONITOR_LEN (256<<10)
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
/* Address and size of Primary Environment Sector */
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0xFC0000)
diff --git a/include/configs/luan.h b/include/configs/luan.h
index 805cc59b306..9aef77cc5af 100644
--- a/include/configs/luan.h
+++ b/include/configs/luan.h
@@ -97,7 +97,7 @@
* Define here the location of the environment variables (FLASH or EEPROM).
* Note: DENX encourages to use redundant environment in FLASH.
*/
-#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
/*-----------------------------------------------------------------------
* FLASH related
@@ -114,7 +114,7 @@
#define CFG_FLASH_ADDR1 0x2aa
#define CFG_FLASH_WORD_SIZE unsigned char
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */
@@ -122,7 +122,7 @@
/* Address and size of Redundant Environment Sector */
#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
* DDR SDRAM
diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h
index 82fe19c725f..7e0c4a20cfb 100644
--- a/include/configs/lubbock.h
+++ b/include/configs/lubbock.h
@@ -231,7 +231,7 @@
* second sector, not an environment. You have been warned!
*/
#define CFG_MONITOR_LEN PHYS_FLASH_SECT_SIZE
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE)
#define CFG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE
#define CFG_ENV_SIZE (PHYS_FLASH_SECT_SIZE / 16)
diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h
index 87abfba14c2..73b988f29b6 100644
--- a/include/configs/lwmon.h
+++ b/include/configs/lwmon.h
@@ -315,7 +315,7 @@
#define CFG_FLASH_BUFFER_SIZE (2*32)
/* Put environment in flash which is much faster to boot than using the EEPROM */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR 0x40040000 /* Address of Environment Sector */
#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment */
#define CFG_ENV_SECT_SIZE 0x40000 /* we have BIG sectors only :-( */
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index 3d135c4eaa6..841361541a8 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -118,7 +118,7 @@
/*-----------------------------------------------------------------------
* Environment
*----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
/*-----------------------------------------------------------------------
* FLASH related
diff --git a/include/configs/m501sk.h b/include/configs/m501sk.h
index 7024a833b24..bbc2b4e3ebd 100644
--- a/include/configs/m501sk.h
+++ b/include/configs/m501sk.h
@@ -159,7 +159,7 @@
#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
#define CFG_ENV_SIZE 0x2000
#else
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x00020000)
#define CFG_ENV_SIZE 2048
#endif
diff --git a/include/configs/makalu.h b/include/configs/makalu.h
index cfc6fdc3e06..97715a32928 100644
--- a/include/configs/makalu.h
+++ b/include/configs/makalu.h
@@ -119,7 +119,7 @@
/*-----------------------------------------------------------------------
* Environment
*----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
/*-----------------------------------------------------------------------
* FLASH related
@@ -137,7 +137,7 @@
#define CFG_FLASH_USE_BUFFER_WRITE 1 /* use buffered writes (20x faster) */
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
@@ -145,7 +145,7 @@
/* Address and size of Redundant Environment Sector */
#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
* DDR SDRAM
diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h
index f5128474479..4e8c0d11055 100644
--- a/include/configs/mcc200.h
+++ b/include/configs/mcc200.h
@@ -227,7 +227,7 @@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
-#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_SECT_SIZE 0x40000 /* size of one complete sector */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
diff --git a/include/configs/mcu25.h b/include/configs/mcu25.h
index 35ecc656b93..67c848510ec 100644
--- a/include/configs/mcu25.h
+++ b/include/configs/mcu25.h
@@ -122,7 +122,7 @@
*----------------------------------------------------------------------*/
#undef CONFIG_ENV_IS_IN_NVRAM
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#undef CONFIG_ENV_IS_NOWHERE
#ifdef CONFIG_ENV_IS_IN_EEPROM
@@ -132,7 +132,7 @@
#define CFG_ENV_SIZE (PROM_SIZE-CFG_ENV_OFFSET)
#endif
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
/* Put the environment in Flash */
#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */
#define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE)
diff --git a/include/configs/mecp5200.h b/include/configs/mecp5200.h
index 1c2f1a2ec5f..e0bd6e3e05e 100644
--- a/include/configs/mecp5200.h
+++ b/include/configs/mecp5200.h
@@ -191,7 +191,7 @@
* Environment settings
*/
#if 1 /* test-only */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x10000
#define CFG_ENV_SECT_SIZE 0x10000
#define CONFIG_ENV_OVERWRITE 1
diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h
index 5fe3075efc4..015e4dc527e 100644
--- a/include/configs/mgcoge.h
+++ b/include/configs/mgcoge.h
@@ -169,12 +169,12 @@
#define CFG_MONITOR_LEN (256 << 10) /* Reserve 256KB for Monitor */
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x20000
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
#define CFG_IMMR 0xF0000000
diff --git a/include/configs/mgsuvd.h b/include/configs/mgsuvd.h
index 6f1c640b1a3..7fd5a47f337 100644
--- a/include/configs/mgsuvd.h
+++ b/include/configs/mgsuvd.h
@@ -196,7 +196,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 0x40000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x08000 /* Total Size of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */
diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h
index 57f64ba4079..69e99a6db43 100644
--- a/include/configs/mimc200.h
+++ b/include/configs/mimc200.h
@@ -149,7 +149,7 @@
#define CFG_FRAM_BASE 0x08000000
#define CFG_FRAM_SIZE 0x20000
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 65536
#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE)
diff --git a/include/configs/ml401.h b/include/configs/ml401.h
index c626702dd32..75fcb6a922b 100644
--- a/include/configs/ml401.h
+++ b/include/configs/ml401.h
@@ -166,7 +166,7 @@
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SIZE)
#else /* !RAMENV */
- #define CFG_ENV_IS_IN_FLASH 1
+ #define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SECT_SIZE 0x40000 /* 256K(one sector) for env */
#define CFG_ENV_ADDR (CFG_FLASH_BASE + (2 * CFG_ENV_SECT_SIZE))
#define CFG_ENV_SIZE 0x40000
diff --git a/include/configs/ml507.h b/include/configs/ml507.h
index 37d93bb3c70..e34e43a2e7b 100644
--- a/include/configs/ml507.h
+++ b/include/configs/ml507.h
@@ -27,7 +27,7 @@
#define CFG_SDRAM_SIZE_MB 256
/*Env*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x20000
#define CFG_ENV_SECT_SIZE 0x20000
#define CFG_ENV_OFFSET 0x340000
diff --git a/include/configs/modnet50.h b/include/configs/modnet50.h
index 84540f5e546..7cfd4fa4ae6 100644
--- a/include/configs/modnet50.h
+++ b/include/configs/modnet50.h
@@ -170,7 +170,7 @@
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
/* environment settings */
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#undef CONFIG_ENV_IS_NOWHERE
#define CFG_ENV_ADDR 0x1001C000 /* environment start address */
diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index f2a35ee2b39..8692ab8b8dd 100644
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -353,7 +353,7 @@ extern void __led_set(led_id_t id, int state);
/*
* Environment settings
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
/* This has to be a multiple of the Flash sector size */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#define CFG_ENV_SIZE 0x1000
diff --git a/include/configs/mp2usb.h b/include/configs/mp2usb.h
index 87264fbb4b5..f0b5c9fe9f3 100644
--- a/include/configs/mp2usb.h
+++ b/include/configs/mp2usb.h
@@ -199,7 +199,7 @@
#define CFG_FLASH_UNLOCK_TOUT (10*CFG_HZ) /* Timeout for Flash Clear Lock Bits */
#define CFG_FLASH_PROTECTION /* "Real" (hardware) sectors protection */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x20000 /* after u-boot.bin */
#define CFG_ENV_ADDR (CFG_FLASH_BASE+CFG_ENV_OFFSET)
#define CFG_ENV_SIZE 0x20000
diff --git a/include/configs/mpr2.h b/include/configs/mpr2.h
index 3df6e39f49d..6e0721e9869 100644
--- a/include/configs/mpr2.h
+++ b/include/configs/mpr2.h
@@ -73,7 +73,7 @@
#define CFG_MAX_FLASH_SECT 256
#define CFG_MAX_FLASH_BANKS 1
#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE }
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE (128 * 1024)
#define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index 1c3d2771b08..ee19b026e7d 100644
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@@ -92,7 +92,7 @@
#define CFG_MAX_FLASH_BANKS 1
#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE }
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE (64 * 1024)
#define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index 3809e7120cd..55f264c323b 100644
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -114,7 +114,7 @@
#undef CFG_DIRECT_FLASH_TFTP
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OVERWRITE 1
#define CFG_ENV_SECT_SIZE (8 * 1024)
#define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE)
diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h
index 4356a671e83..c4a1f54885a 100644
--- a/include/configs/ms7750se.h
+++ b/include/configs/ms7750se.h
@@ -92,7 +92,7 @@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x20000
#define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE)
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h
index a13648b6efe..ded0f4cbeda 100644
--- a/include/configs/muas3001.h
+++ b/include/configs/muas3001.h
@@ -227,12 +227,12 @@
#define CFG_MONITOR_LEN (256 << 10) /* Reserve 256KB for Monitor */
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x10000
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
/*
* I2C Bus
diff --git a/include/configs/mucmc52.h b/include/configs/mucmc52.h
index 18200ec8145..d3546c7470f 100644
--- a/include/configs/mucmc52.h
+++ b/include/configs/mucmc52.h
@@ -174,7 +174,7 @@
/*
* Environment settings
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x4000
#define CFG_ENV_SECT_SIZE 0x20000
#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE)
diff --git a/include/configs/munices.h b/include/configs/munices.h
index cea2834305d..6d39580b272 100644
--- a/include/configs/munices.h
+++ b/include/configs/munices.h
@@ -152,7 +152,7 @@
/*
* Environment settings
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0x40000
#define CFG_ENV_ADDR (TEXT_BASE + CFG_ENV_OFFSET)
#define CFG_ENV_SECT_SIZE 0x20000
diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h
index 5125b21e04f..bf43dad01b5 100644
--- a/include/configs/mx1ads.h
+++ b/include/configs/mx1ads.h
@@ -174,7 +174,7 @@
#define CFG_MAX_FLASH_SECT (16)
#define CFG_ENV_ADDR (CFG_FLASH_BASE+0x00ff8000)
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x04000 /* Total Size of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x100000
diff --git a/include/configs/mx1fs2.h b/include/configs/mx1fs2.h
index d527d098f57..8f4b42c757c 100644
--- a/include/configs/mx1fs2.h
+++ b/include/configs/mx1fs2.h
@@ -207,7 +207,7 @@
#define CFG_MONITOR_BASE 0x10000000
#define CFG_MONITOR_LEN 0x20000 /* 128b ( 1 flash sector ) */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR 0x10020000 /* absolute address for now */
#define CFG_ENV_SIZE 0x20000
diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index 9ede7645d9e..0bb0568e424 100644
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -167,7 +167,7 @@
#define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at beginning of flash */
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256KiB */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SECT_SIZE (32 * 1024)
#define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
diff --git a/include/configs/netstar.h b/include/configs/netstar.h
index 756b7c26717..76d025cf695 100644
--- a/include/configs/netstar.h
+++ b/include/configs/netstar.h
@@ -75,7 +75,7 @@
/*
* Environment settings
*/
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_ADDR 0x4000
#define CFG_ENV_SIZE (8 * 1024)
#define CFG_ENV_SECT_SIZE (8 * 1024)
diff --git a/include/configs/ns9750dev.h b/include/configs/ns9750dev.h
index b9eec62cfa4..f8200f99f2f 100644
--- a/include/configs/ns9750dev.h
+++ b/include/configs/ns9750dev.h
@@ -185,7 +185,7 @@
#define CFG_FLASH_WRITE_TOUT (5*CFG_HZ) /* Timeout for Flash Write */
/* @TODO */
-/*#define CFG_ENV_IS_IN_FLASH 1*/
+/*#define CONFIG_ENV_IS_IN_FLASH 1*/
#define CONFIG_ENV_IS_NOWHERE
#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */
diff --git a/include/configs/o2dnt.h b/include/configs/o2dnt.h
index 88bdb03e67a..09995e87be0 100644
--- a/include/configs/o2dnt.h
+++ b/include/configs/o2dnt.h
@@ -203,7 +203,7 @@
/*
* Environment settings
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x20000
#define CFG_ENV_SECT_SIZE 0x20000
#define CONFIG_ENV_OVERWRITE 1
diff --git a/include/configs/ocotea.h b/include/configs/ocotea.h
index e8549e93861..b0a2e5d2071 100644
--- a/include/configs/ocotea.h
+++ b/include/configs/ocotea.h
@@ -93,7 +93,7 @@
* supported for backward compatibility.
*/
#if 1
-#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#else
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
#endif
@@ -132,7 +132,7 @@
#define CFG_FLASH_ADDR1 0x2aaa
#define CFG_FLASH_WORD_SIZE unsigned char
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
@@ -140,7 +140,7 @@
/* Address and size of Redundant Environment Sector */
#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
* DDR SDRAM
diff --git a/include/configs/omap1510inn.h b/include/configs/omap1510inn.h
index 46b30e025a4..fe6a0db5369 100644
--- a/include/configs/omap1510inn.h
+++ b/include/configs/omap1510inn.h
@@ -187,7 +187,7 @@
#define CFG_FLASH_ERASE_TOUT (20*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE /* Total Size of Environment Sector */
#define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
#define CFG_ENV_OFFSET ( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */
diff --git a/include/configs/omap1610h2.h b/include/configs/omap1610h2.h
index 74bba05fe8a..9d2051df3a3 100644
--- a/include/configs/omap1610h2.h
+++ b/include/configs/omap1610h2.h
@@ -187,7 +187,7 @@ extern unsigned long omap_flash_base; /* set in flash__init */
#define CFG_FLASH_ERASE_TOUT (20*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */
#define CFG_ENV_OFFSET 0x20000 /* environment starts here */
diff --git a/include/configs/omap1610inn.h b/include/configs/omap1610inn.h
index 734f3543927..edc42e45aee 100644
--- a/include/configs/omap1610inn.h
+++ b/include/configs/omap1610inn.h
@@ -192,7 +192,7 @@ extern unsigned long omap_flash_base; /* set in flash__init */
#define CFG_FLASH_ERASE_TOUT (20*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */
#define CFG_ENV_OFFSET 0x20000 /* environment starts here */
diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h
index 461362f91a3..ac98fb5483d 100644
--- a/include/configs/omap2420h4.h
+++ b/include/configs/omap2420h4.h
@@ -274,7 +274,7 @@
#define CFG_ENV_OFFSET 0x80000 /* environment starts here */
#else
#define CFG_ENV_ADDR (CFG_FLASH_BASE + SZ_128K)
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE
#define CFG_ENV_OFFSET ( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */
#endif
diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h
index 1c44ce032fe..0f56279e4de 100644
--- a/include/configs/omap5912osk.h
+++ b/include/configs/omap5912osk.h
@@ -194,7 +194,7 @@
/*-----------------------------------------------------------------------
* FLASH and environment organization
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
/* addr of environment */
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x020000)
diff --git a/include/configs/omap730p2.h b/include/configs/omap730p2.h
index c4d253af45c..b781f727324 100644
--- a/include/configs/omap730p2.h
+++ b/include/configs/omap730p2.h
@@ -199,7 +199,7 @@
#define CFG_FLASH_ERASE_TOUT (20*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */
#define CFG_ENV_OFFSET 0x20000 /* environment starts here */
diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h
index 33a94bc2ca7..1128c4ecb4b 100644
--- a/include/configs/p3mx.h
+++ b/include/configs/p3mx.h
@@ -137,7 +137,7 @@
#define CFG_FLASH_PROTECTION 1 /* use hardware flash protection */
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
-#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#if defined (CONFIG_P3M750)
#define CFG_ENV_SECT_SIZE 0x20000 /* one sector (1 device) */
#elif defined (CONFIG_P3M7448)
diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h
index ac0d83ac1c5..046ec254813 100644
--- a/include/configs/p3p440.h
+++ b/include/configs/p3p440.h
@@ -295,7 +295,7 @@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
-#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_SECT_SIZE 0x20000 /* size of one complete sector */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
diff --git a/include/configs/pcs440ep.h b/include/configs/pcs440ep.h
index ba6d9322497..368a66b95dd 100644
--- a/include/configs/pcs440ep.h
+++ b/include/configs/pcs440ep.h
@@ -92,7 +92,7 @@
/*-----------------------------------------------------------------------
* Environment
*----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
/*-----------------------------------------------------------------------
* FLASH related
@@ -109,7 +109,7 @@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */
@@ -119,7 +119,7 @@
/* Address and size of Redundant Environment Sector */
#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
#define ENV_NAME_REVLEV "revision_level"
#define ENV_NAME_SOLDER "solder_switch"
diff --git a/include/configs/pcu_e.h b/include/configs/pcu_e.h
index f15ce9906e9..1a3bf1c6fe8 100644
--- a/include/configs/pcu_e.h
+++ b/include/configs/pcu_e.h
@@ -227,7 +227,7 @@
#if 0
/* Start port with environment in flash; switch to SPI EEPROM later */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment */
#define CFG_ENV_ADDR 0xFFFFE000 /* Address of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x2000 /* use the top-most 8k boot sector */
diff --git a/include/configs/pdnb3.h b/include/configs/pdnb3.h
index 889207a94e6..0b7b6d4f87c 100644
--- a/include/configs/pdnb3.h
+++ b/include/configs/pdnb3.h
@@ -243,7 +243,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 (CFG_FLASH_BASE + CFG_MONITOR_LEN)
#if defined(CONFIG_SCPU)
diff --git a/include/configs/pf5200.h b/include/configs/pf5200.h
index a709d0ed62a..6120f582904 100644
--- a/include/configs/pf5200.h
+++ b/include/configs/pf5200.h
@@ -205,7 +205,7 @@
* Environment settings
*/
#if 1 /* test-only */
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SIZE 0x10000
#define CFG_ENV_SECT_SIZE 0x10000
#define CONFIG_ENV_OVERWRITE 1
diff --git a/include/configs/pleb2.h b/include/configs/pleb2.h
index 863029d146d..799cf769969 100644
--- a/include/configs/pleb2.h
+++ b/include/configs/pleb2.h
@@ -246,7 +246,7 @@
#define CFG_FLASH_PROTECTION 1
/* FIXME */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x3C000) /* Addr of Environment Sector */
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment */
#define CFG_ENV_SECT_SIZE 0x20000
diff --git a/include/configs/ppmc7xx.h b/include/configs/ppmc7xx.h
index 1d2d38b36bb..cd5ef94579c 100644
--- a/include/configs/ppmc7xx.h
+++ b/include/configs/ppmc7xx.h
@@ -274,13 +274,13 @@
/*
* Environment config - see memory map details above
*
- * CFG_ENV_IS_IN_FLASH - The env variables are stored in flash
+ * CONFIG_ENV_IS_IN_FLASH - The env variables are stored in flash
* CFG_ENV_ADDR - Address of the sector containing env vars
* CFG_ENV_SIZE - Ammount of RAM for env vars (used to save RAM, 4KB)
* CFG_ENV_SECT_SIZE - Size of sector containing env vars (32KB)
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR 0xFFFE0000
#define CFG_ENV_SIZE 0x1000
#define CFG_ENV_ADDR_REDUND 0xFFFE8000
diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h
index 6f1195b1e50..a045f224108 100644
--- a/include/configs/ppmc8260.h
+++ b/include/configs/ppmc8260.h
@@ -462,7 +462,7 @@
#ifndef CFG_RAMBOOT
-# define CFG_ENV_IS_IN_FLASH 1
+# define CONFIG_ENV_IS_IN_FLASH 1
# ifdef CFG_ENV_IN_OWN_SECT
# define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000)
# define CFG_ENV_SECT_SIZE 0x40000
@@ -473,7 +473,7 @@
# endif /* CFG_ENV_IN_OWN_SECT */
#else
-# define CFG_ENV_IS_IN_FLASH 1
+# define CONFIG_ENV_IS_IN_FLASH 1
# define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x40000)
#define CFG_ENV_SIZE 0x1000
# define CFG_ENV_SECT_SIZE 0x40000
diff --git a/include/configs/purple.h b/include/configs/purple.h
index ef92637127f..59743dfed01 100644
--- a/include/configs/purple.h
+++ b/include/configs/purple.h
@@ -143,7 +143,7 @@
#define CFG_FLASH_ERASE_TOUT (6 * CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (6 * CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
/* Address and size of Primary Environment Sector */
#define CFG_ENV_ADDR 0xB0008000
diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h
index 179ff7ad50a..9f83c7df064 100644
--- a/include/configs/pxa255_idp.h
+++ b/include/configs/pxa255_idp.h
@@ -348,7 +348,7 @@
#define CFG_FLASH_WRITE_TOUT (25*CFG_HZ) /* Timeout for Flash Write */
/* put cfg at end of flash for now */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
/* Addr of Environment Sector */
#define CFG_ENV_ADDR (PHYS_FLASH_1 + PHYS_FLASH_SIZE - 0x40000)
#define CFG_ENV_SIZE PHYS_FLASH_SECT_SIZE /* Total Size of Environment Sector */
diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index 19e627b61ca..e03e71026a9 100644
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -149,7 +149,7 @@
#define CONFIG_FLASH_CFI_DRIVER 1
#define CFG_FLASH_USE_BUFFER_WRITE 1
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x40000)
/* Address and size of Primary Environment Sector */
diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h
index 94bdd8ca7d2..ad7f290376b 100644
--- a/include/configs/quad100hd.h
+++ b/include/configs/quad100hd.h
@@ -43,7 +43,7 @@
/* the environment is in the EEPROM by default */
#define CONFIG_ENV_IS_IN_EEPROM
-#undef CFG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_NET_MULTI 1
#define CONFIG_HAS_ETH1 1
@@ -198,7 +198,7 @@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */
/* the environment is located before u-boot */
#define CFG_ENV_ADDR (TEXT_BASE - CFG_ENV_SECT_SIZE)
diff --git a/include/configs/quantum.h b/include/configs/quantum.h
index 34a1ea6e2c6..a35418fa896 100644
--- a/include/configs/quantum.h
+++ b/include/configs/quantum.h
@@ -208,7 +208,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 0x00F40000 /* Offset of Environment Sector absolute address 0xfff40000*/
#define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */
#define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 06ede3e039a..666219e3cfc 100644
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -71,7 +71,7 @@
#define CFG_MAX_FLASH_SECT 256
#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE }
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x40000
#define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE)
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index 77881e7a28d..7123a837094 100644
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -112,7 +112,7 @@
/* print 'E' for empty sector on flinfo */
#define CFG_FLASH_EMPTY_INFO
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE (256 * 1024)
#define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE)
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
diff --git a/include/configs/redwood.h b/include/configs/redwood.h
index b791589adf1..c825f13c26e 100644
--- a/include/configs/redwood.h
+++ b/include/configs/redwood.h
@@ -120,7 +120,7 @@
* Environment
*----------------------------------------------------------------------*/
#undef CONFIG_ENV_IS_IN_NVRAM /* ... not in NVRAM */
-#define CFG_ENV_IS_IN_FLASH 1 /* Environment uses flash */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment uses flash */
#undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */
#define CONFIG_PREBOOT "echo;" \
@@ -175,11 +175,11 @@
#define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */
#define CFG_ENV_ADDR 0xfffa0000
#define CFG_ENV_SIZE 0x10000 /* Size of Environment vars */
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
/*---------------------------------------------------------------------------*/
diff --git a/include/configs/rmu.h b/include/configs/rmu.h
index 596bf155660..46f94dac701 100644
--- a/include/configs/rmu.h
+++ b/include/configs/rmu.h
@@ -188,7 +188,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_ADDR ((TEXT_BASE) + 0x40000)
#define CFG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */
diff --git a/include/configs/rsdproto.h b/include/configs/rsdproto.h
index 6251383f558..89db35b70e1 100644
--- a/include/configs/rsdproto.h
+++ b/include/configs/rsdproto.h
@@ -291,7 +291,7 @@
/* turn off NVRAM env feature */
#undef CONFIG_NVRAM_ENV
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (PHYS_FLASH + 0x28000) /* Addr of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x8000 /* Total Size of Environment Sector */
diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h
index 23598f33ca4..f6b013c3644 100644
--- a/include/configs/rsk7203.h
+++ b/include/configs/rsk7203.h
@@ -92,7 +92,7 @@
#define CFG_MAX_FLASH_SECT 64
#define CFG_MAX_FLASH_BANKS 1
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE (64 * 1024)
#define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h
index 5c6ddc6b475..bce8c9c8fe8 100644
--- a/include/configs/sacsng.h
+++ b/include/configs/sacsng.h
@@ -707,7 +707,7 @@
#define CFG_FLASH_WRITE_TOUT 1 /* Timeout for Flash Write (in ms) */
#ifndef CFG_RAMBOOT
-# define CFG_ENV_IS_IN_FLASH 1
+# define CONFIG_ENV_IS_IN_FLASH 1
# ifdef CFG_ENV_IN_OWN_SECT
# define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
diff --git a/include/configs/sbc2410x.h b/include/configs/sbc2410x.h
index 08cadf62715..8c14e8b62cb 100644
--- a/include/configs/sbc2410x.h
+++ b/include/configs/sbc2410x.h
@@ -193,7 +193,7 @@
#define CFG_FLASH_ERASE_TOUT (5*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (5*CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */
/*-----------------------------------------------------------------------
diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h
index 60d401fa0e5..33eeca220ab 100644
--- a/include/configs/sbc405.h
+++ b/include/configs/sbc405.h
@@ -228,7 +228,7 @@
* Environment Variable setup
*/
#define CFG_ENV_ADDR CFG_FLASH_BASE /* starting right at the beginning */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_OFFSET 0 /* starting right at the beginning */
#define CFG_ENV_SECT_SIZE 0x40000 /* see README - env sector total size */
#define CFG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */
diff --git a/include/configs/sbc8240.h b/include/configs/sbc8240.h
index 0e878f054ff..6e3c160ec86 100644
--- a/include/configs/sbc8240.h
+++ b/include/configs/sbc8240.h
@@ -339,7 +339,7 @@ typedef unsigned int led_id_t;
/* 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 0xFFF70000
#define CFG_ENV_SIZE 0x4000 /* Size of the Environment */
#define CFG_ENV_OFFSET 0 /* starting right at the beginning */
diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h
index 6068c234ecf..3a031de0879 100644
--- a/include/configs/sbc8260.h
+++ b/include/configs/sbc8260.h
@@ -603,7 +603,7 @@
#define CFG_FLASH_WRITE_TOUT 1 /* Timeout for Flash Write (in ms) */
#ifndef CFG_RAMBOOT
-# define CFG_ENV_IS_IN_FLASH 1
+# define CONFIG_ENV_IS_IN_FLASH 1
# ifdef CFG_ENV_IN_OWN_SECT
# define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x40000)
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 264f5ab1d97..fa0ccd81328 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -413,7 +413,7 @@
* Environment
*/
#ifndef CFG_RAMBOOT
- #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 0x20000 /* 128K(one sector) for env */
#define CFG_ENV_SIZE 0x2000
diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index 9ef0bfdd86f..1f6dc3fe54c 100644
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -434,7 +434,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
diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
index f39867febc5..72e4791f301 100644
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -336,7 +336,7 @@
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x100000)
#define CFG_ENV_SIZE 0x2000
#else
- #define CFG_ENV_IS_IN_FLASH 1
+ #define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE 0x2000 /* CFG_ENV_SECT_SIZE */
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index c84240e03de..40211a0ac9a 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -469,7 +469,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
diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 4205f46e5c9..1a614fd6279 100644
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -404,8 +404,8 @@ extern unsigned long offsetOfEnvironment;
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CFG_WRITE_SWAPPED_DATA /* swap Databytes between reading/writing */
-#define CFG_ENV_IS_IN_FLASH 1
-#ifdef CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH 1
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_OFFSET 0x00000000 /* Offset of Environment Sector in bottom type */
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x4000 /* see README - env sector total size */
diff --git a/include/configs/sc520_spunk.h b/include/configs/sc520_spunk.h
index aa9dc9755f6..a8f520c3c2e 100644
--- a/include/configs/sc520_spunk.h
+++ b/include/configs/sc520_spunk.h
@@ -153,7 +153,7 @@
#if 0
/* Environment in flash */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
# define CFG_ENV_ADDR (0x387a0000) /* Addr of Environment Sector */
# define CFG_ENV_SIZE 0x20000 /* Total Size of Environment Sector (or 0x10000) */
# define CFG_ENV_OFFSET 0
diff --git a/include/configs/scb9328.h b/include/configs/scb9328.h
index 4ae25adde04..51826d73562 100644
--- a/include/configs/scb9328.h
+++ b/include/configs/scb9328.h
@@ -215,7 +215,7 @@
#define CFG_MONITOR_BASE 0x10000000
#define CFG_MONITOR_LEN 0x20000 /* 128b ( 1 flash sector ) */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR 0x10020000 /* absolute address for now */
#define CFG_ENV_SIZE 0x20000
diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index 0e28555bfe5..3574a6f5f88 100644
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -113,7 +113,7 @@
* Environment
*/
#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
-#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environ vars */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environ vars */
#else
#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environ vars */
#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
@@ -139,7 +139,7 @@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */
#define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */
diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index 1306702fcbb..05e3f962497 100644
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@@ -103,7 +103,7 @@
/* Use hardware flash sectors protection instead of U-Boot software protection */
#undef CFG_FLASH_PROTECTION
#undef CFG_DIRECT_FLASH_TFTP
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE (128 * 1024)
#define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE)
#define CFG_ENV_ADDR (CFG_FLASH_BASE + (1 * CFG_ENV_SECT_SIZE))
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index efdb163dd2d..f9bbb4d0b10 100644
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -150,7 +150,7 @@
#define CONFIG_RTL8169
/* ENV setting */
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OVERWRITE 1
#define CFG_ENV_SECT_SIZE (256 * 1024)
#define CFG_ENV_SIZE (CFG_ENV_SECT_SIZE)
diff --git a/include/configs/shannon.h b/include/configs/shannon.h
index 8bbc730cb9c..28fecf1fc92 100644
--- a/include/configs/shannon.h
+++ b/include/configs/shannon.h
@@ -158,7 +158,7 @@
#define CFG_FLASH_ERASE_TOUT (2*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_INFERNO
/* we take the last sector, 128 KB in size, but we only use 4 KB of it for stack reasons */
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x003E0000) /* Addr of Environment Sector */
diff --git a/include/configs/smdk2400.h b/include/configs/smdk2400.h
index ac1642e1fce..35eebeb0c6b 100644
--- a/include/configs/smdk2400.h
+++ b/include/configs/smdk2400.h
@@ -178,7 +178,7 @@
#define CFG_FLASH_ERASE_TOUT (5*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (5*CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
/* Address and size of Primary Environment Sector */
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x40000)
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index efe4693ec6f..86ebcbaf014 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -178,7 +178,7 @@
#define CFG_FLASH_ERASE_TOUT (5*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (5*CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */
#endif /* __CONFIG_H */
diff --git a/include/configs/smmaco4.h b/include/configs/smmaco4.h
index 1d202d4b2f8..cf92fa77f3a 100644
--- a/include/configs/smmaco4.h
+++ b/include/configs/smmaco4.h
@@ -226,7 +226,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)
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index a981a8fe953..09e1c8cfc5f 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -308,7 +308,7 @@
/*
* Environment
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE 0x4000
diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h
index b4da4ce9206..fef722be839 100644
--- a/include/configs/sorcery.h
+++ b/include/configs/sorcery.h
@@ -197,7 +197,7 @@
/*
* Environment settings
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x8000000 - 0x40000)
#define CFG_ENV_SIZE 0x4000 /* 16K */
#define CFG_ENV_SECT_SIZE 0x20000
@@ -206,15 +206,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
/*
diff --git a/include/configs/spc1920.h b/include/configs/spc1920.h
index daaa23f48e7..73fa97f14a6 100644
--- a/include/configs/spc1920.h
+++ b/include/configs/spc1920.h
@@ -185,7 +185,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 0x40000 /* We use one complete sector */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
diff --git a/include/configs/spieval.h b/include/configs/spieval.h
index 93798a46f96..8df56e393a8 100644
--- a/include/configs/spieval.h
+++ b/include/configs/spieval.h
@@ -308,7 +308,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)
diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
index f4a8fa577d2..95230ac17c7 100644
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -288,7 +288,7 @@
/* We use the top boot sector flash, so we have some 16K sectors for env
*/
#ifndef CFG_RAMBOOT
- #define CFG_ENV_IS_IN_FLASH 1
+ #define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x60000)
#define CFG_ENV_SECT_SIZE 0x4000 /* 16K (one top sector) for env */
#define CFG_ENV_SIZE 0x2000
diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index 4f1d70c3d5d..21bb2797fc8 100644
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -317,7 +317,7 @@
# define CFG_ENV_OFFSET 0
# define CFG_ENV_SIZE 2048
#else /* in flash */
-# define CFG_ENV_IS_IN_FLASH 1
+# define CONFIG_ENV_IS_IN_FLASH 1
# ifdef CONFIG_STXSSA_4M
# define CFG_ENV_SECT_SIZE 0x20000
# else /* default configuration - 64 MiB flash */
diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h
index 0dc9f8a010d..c8b54bf4859 100644
--- a/include/configs/stxxtc.h
+++ b/include/configs/stxxtc.h
@@ -201,7 +201,7 @@
/*-----------------------------------------------------------------------
* FLASH organization
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SECT_SIZE 0x10000
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00000000)
diff --git a/include/configs/svm_sc8xx.h b/include/configs/svm_sc8xx.h
index bbbfa15db1d..b7831b4473e 100644
--- a/include/configs/svm_sc8xx.h
+++ b/include/configs/svm_sc8xx.h
@@ -227,7 +227,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
#ifdef CONFIG_BOOT_8B
#define CFG_ENV_OFFSET 0x10000 /* Offset of Environment Sector */
diff --git a/include/configs/taihu.h b/include/configs/taihu.h
index 2ef454532f8..ad0f5a94405 100644
--- a/include/configs/taihu.h
+++ b/include/configs/taihu.h
@@ -74,7 +74,7 @@
#endif
/*----------------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
/*
* Default environment variables
@@ -205,7 +205,7 @@ unsigned char spi_read(void);
#define CFG_FLASH_ADDR1 0x2aa
#define CFG_FLASH_WORD_SIZE unsigned short
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
@@ -213,7 +213,7 @@ unsigned char spi_read(void);
/* Address and size of Redundant Environment Sector */
#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
* NVRAM organization
diff --git a/include/configs/taishan.h b/include/configs/taishan.h
index 81133bb5c86..9bac0e28834 100644
--- a/include/configs/taishan.h
+++ b/include/configs/taishan.h
@@ -83,7 +83,7 @@
/*-----------------------------------------------------------------------
* Environment
*----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
/*-----------------------------------------------------------------------
* FLASH related
diff --git a/include/configs/tb0229.h b/include/configs/tb0229.h
index fc2357d4064..cf2af93d378 100644
--- a/include/configs/tb0229.h
+++ b/include/configs/tb0229.h
@@ -153,7 +153,7 @@
#define CFG_FLASH_ERASE_TOUT (20 * CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (2 * CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
/* Address and size of Primary Environment Sector */
#define CFG_ENV_ADDR 0xBFC40000
diff --git a/include/configs/trab.h b/include/configs/trab.h
index b0615a0e377..1c8d3cec194 100644
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -403,7 +403,7 @@
#define CFG_FLASH_ERASE_TOUT (15*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
/* Address and size of Primary Environment Sector */
#ifndef CONFIG_FLASH_8MB
diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
index 6367f873ef9..dcfb73c859f 100644
--- a/include/configs/trizepsiv.h
+++ b/include/configs/trizepsiv.h
@@ -309,7 +309,7 @@
#define CFG_FLASH_USE_BUFFER_WRITE 1
/* Flash environment locations */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (PHYS_FLASH_1 + CFG_MONITOR_LEN) /* Addr of Environment Sector */
#define CFG_ENV_SIZE 0x40000 /* Total Size of Environment */
#define CFG_ENV_SECT_SIZE 0x40000 /* Total Size of Environment Sector */
diff --git a/include/configs/uc100.h b/include/configs/uc100.h
index 106e6f27591..cdd7bdf75f8 100644
--- a/include/configs/uc100.h
+++ b/include/configs/uc100.h
@@ -241,7 +241,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 (CFG_MONITOR_BASE+CFG_MONITOR_LEN)
#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
diff --git a/include/configs/uc101.h b/include/configs/uc101.h
index a18618893cd..ac5285a866f 100644
--- a/include/configs/uc101.h
+++ b/include/configs/uc101.h
@@ -176,7 +176,7 @@
/*
* Environment settings
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x4000
#define CFG_ENV_SECT_SIZE 0x10000
#define CFG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CFG_ENV_SECT_SIZE)
diff --git a/include/configs/utx8245.h b/include/configs/utx8245.h
index 1675ab752cb..2844c6354a6 100644
--- a/include/configs/utx8245.h
+++ b/include/configs/utx8245.h
@@ -392,7 +392,7 @@ protect on ${u-boot_startaddr} ${u-boot_endaddr}"
/* NOTE: environment is not EMBEDDED in the u-boot code.
It's stored in flash in its own separate sector. */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#if 1 /* AMD AM29LV033C */
#define CFG_MAX_FLASH_SECT 64 /* Max number of sectors in one bank */
diff --git a/include/configs/v38b.h b/include/configs/v38b.h
index 35745484d44..e0bd8c79764 100644
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -213,7 +213,7 @@
/*
* Environment settings
*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x00040000)
#define CFG_ENV_SIZE 0x10000
#define CFG_ENV_SECT_SIZE 0x10000
diff --git a/include/configs/v5fx30teval.h b/include/configs/v5fx30teval.h
index 67d8d7f6314..5132293def6 100644
--- a/include/configs/v5fx30teval.h
+++ b/include/configs/v5fx30teval.h
@@ -27,7 +27,7 @@
#define CFG_SDRAM_SIZE_MB 64
/*Env*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x20000
#define CFG_ENV_SECT_SIZE 0x20000
#define CFG_ENV_OFFSET 0x1A0000
diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index f563c580c20..4a54b9028d6 100644
--- a/include/configs/versatile.h
+++ b/include/configs/versatile.h
@@ -185,7 +185,7 @@
#define PHYS_FLASH_1 (CFG_FLASH_BASE)
-#define CFG_ENV_IS_IN_FLASH 1 /* env in flash instead of CONFIG_ENV_IS_NOWHERE */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* env in flash instead of CONFIG_ENV_IS_NOWHERE */
#define CFG_ENV_SECT_SIZE 0x00020000 /* 256 KB sectors (x2) */
#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */
#define CFG_ENV_OFFSET 0x01f00000 /* environment starts here */
diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h
index 1a125f16ce8..6250926281b 100644
--- a/include/configs/virtlab2.h
+++ b/include/configs/virtlab2.h
@@ -209,7 +209,7 @@
#define CFG_MAX_FLASH_BANKS 2 /* max number of memory banks */
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
-#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 */
diff --git a/include/configs/voiceblue.h b/include/configs/voiceblue.h
index 20917ee9a5c..fee3ab996f8 100644
--- a/include/configs/voiceblue.h
+++ b/include/configs/voiceblue.h
@@ -74,7 +74,7 @@
/*
* Environment settings
*/
-#define CFG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_ADDR (PHYS_FLASH_1 + CFG_MONITOR_LEN)
#define CFG_ENV_SIZE (8 * 1024)
#define CFG_ENV_SECT_SIZE (64 * 1024)
diff --git a/include/configs/walnut.h b/include/configs/walnut.h
index 4eecf770867..fc267d114fc 100644
--- a/include/configs/walnut.h
+++ b/include/configs/walnut.h
@@ -137,7 +137,7 @@
* supported for backward compatibility.
*/
#if 1
-#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#else
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
#endif
@@ -160,7 +160,7 @@
#define CFG_FLASH_ADDR1 0x2aaa
#define CFG_FLASH_WORD_SIZE unsigned char
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
@@ -168,7 +168,7 @@
/* Address and size of Redundant Environment Sector */
#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
* NVRAM organization
diff --git a/include/configs/wepep250.h b/include/configs/wepep250.h
index f2efe9f410b..9baf730798f 100644
--- a/include/configs/wepep250.h
+++ b/include/configs/wepep250.h
@@ -178,7 +178,7 @@
#define CFG_MONITOR_BASE PHYS_FLASH_1
#define CFG_MONITOR_LEN 0x20000 /* 128kb ( 1 flash sector ) */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR 0x20000 /* absolute address for now */
#define CFG_ENV_SIZE 0x2000
diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index dc0ee0b2231..3c32d9f9a30 100644
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -176,7 +176,7 @@
#define CFG_FLASH_WRITE_TOUT (25*CFG_HZ) /* Timeout for Flash Write */
/* FIXME */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x40000)/* Addr of Environment Sector */
#define CFG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */
diff --git a/include/configs/xilinx-ppc440-generic.h b/include/configs/xilinx-ppc440-generic.h
index 4e8080bf6bf..fdefc4e833d 100644
--- a/include/configs/xilinx-ppc440-generic.h
+++ b/include/configs/xilinx-ppc440-generic.h
@@ -27,7 +27,7 @@
#define CFG_SDRAM_SIZE_MB 256
/*Env*/
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_SIZE 0x20000
#define CFG_ENV_SECT_SIZE 0x20000
#define CFG_ENV_OFFSET 0x340000
diff --git a/include/configs/xm250.h b/include/configs/xm250.h
index bcd16ec5da0..d01898f2df1 100644
--- a/include/configs/xm250.h
+++ b/include/configs/xm250.h
@@ -184,7 +184,7 @@
#define CFG_FLASH_UNLOCK_TOUT (2*CFG_HZ) /* Timeout for Flash Clear Lock Bits */
#define CFG_FLASH_PROTECTION /* "Real" (hardware) sectors protection */
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x40000) /* Addr of Environment Sector */
#define CFG_ENV_SIZE 0x4000
#define CFG_ENV_SECT_SIZE 0x40000 /* Size of the Environment Sector */
diff --git a/include/configs/xsengine.h b/include/configs/xsengine.h
index 4d1bdd7b143..709423dbe0a 100644
--- a/include/configs/xsengine.h
+++ b/include/configs/xsengine.h
@@ -80,7 +80,7 @@
/* Environment settings */
#define CONFIG_ENV_OVERWRITE
-#define CFG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x40000) /* Addr of Environment Sector (after monitor)*/
#define CFG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE /* Size of the Environment Sector */
#define CFG_ENV_SIZE 0x4000 /* 16kB Total Size of Environment Sector */
diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h
index f90e9ecd735..528776a2432 100644
--- a/include/configs/yosemite.h
+++ b/include/configs/yosemite.h
@@ -96,7 +96,7 @@
* Note: DENX encourages to use redundant environment in FLASH.
*/
#if 1
-#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#else
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#endif
@@ -118,7 +118,7 @@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */
@@ -126,7 +126,7 @@
/* Address and size of Redundant Environment Sector */
#define CFG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE_REDUND (CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
* DDR SDRAM
diff --git a/include/configs/yucca.h b/include/configs/yucca.h
index 9ccd3080876..d85da94bd98 100644
--- a/include/configs/yucca.h
+++ b/include/configs/yucca.h
@@ -140,7 +140,7 @@
/* #define CFG_NVRAM_SIZE (0x2000 - 8) */ /* NVRAM size(8k)- RTC regs */
#undef CONFIG_ENV_IS_IN_NVRAM /* ... not in NVRAM */
-#define CFG_ENV_IS_IN_FLASH 1 /* Environment uses flash */
+#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment uses flash */
#undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */
#define CONFIG_ENV_OVERWRITE 1
@@ -188,12 +188,12 @@
#define CFG_FLASH_2ND_16BIT_DEV 1 /* evb440SPe has 8 and 16bit device */
#define CFG_FLASH_2ND_ADDR 0xe7c00000 /* evb440SPe has 8 and 16bit device*/
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x10000 /* size of one complete sector */
#define CFG_ENV_ADDR 0xfffa0000
/* #define CFG_ENV_ADDR (CFG_MONITOR_BASE-CFG_ENV_SECT_SIZE) */
#define CFG_ENV_SIZE 0x10000 /* Size of Environment vars */
-#endif /* CFG_ENV_IS_IN_FLASH */
+#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
* PCI stuff
*-----------------------------------------------------------------------
diff --git a/include/configs/zeus.h b/include/configs/zeus.h
index b50cba556cf..fdb4e3711e5 100644
--- a/include/configs/zeus.h
+++ b/include/configs/zeus.h
@@ -42,7 +42,7 @@
#define PLLMR0_DEFAULT PLLMR0_333_111_55_111
#define PLLMR1_DEFAULT PLLMR1_333_111_55_111
-#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 CONFIG_OVERWRITE_ETHADDR_ONCE 1
@@ -226,7 +226,7 @@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_ENV_SECT_SIZE 0x20000 /* size of one complete sector */
#define CFG_ENV_ADDR ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE)
#define CFG_ENV_SIZE 0x2000 /* Total Size of Environment Sector */