projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1ede787
)
rename CFG_ENV macros to CONFIG_ENV
author
Jean-Christophe PLAGNIOL-VILLARD
<plagnioj@jcrosoft.com>
Wed, 10 Sep 2008 20:48:06 +0000
(22:48 +0200)
committer
Jean-Christophe PLAGNIOL-VILLARD
<plagnioj@jcrosoft.com>
Wed, 10 Sep 2008 20:48:06 +0000
(22:48 +0200)
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
599 files changed:
README
patch
|
blob
|
history
api/api.c
patch
|
blob
|
history
board/LEOX/elpt860/flash.c
patch
|
blob
|
history
board/MAI/AmigaOneG3SE/flash_new.c
patch
|
blob
|
history
board/RRvision/flash.c
patch
|
blob
|
history
board/a3000/flash.c
patch
|
blob
|
history
board/alaska/flash.c
patch
|
blob
|
history
board/amcc/bamboo/flash.c
patch
|
blob
|
history
board/amcc/bubinga/flash.c
patch
|
blob
|
history
board/amcc/ebony/flash.c
patch
|
blob
|
history
board/amcc/luan/flash.c
patch
|
blob
|
history
board/amcc/ocotea/flash.c
patch
|
blob
|
history
board/amcc/sequoia/sequoia.c
patch
|
blob
|
history
board/amcc/taihu/flash.c
patch
|
blob
|
history
board/amcc/walnut/flash.c
patch
|
blob
|
history
board/amcc/yucca/flash.c
patch
|
blob
|
history
board/armadillo/flash.c
patch
|
blob
|
history
board/atc/flash.c
patch
|
blob
|
history
board/atmel/at91rm9200dk/flash.c
patch
|
blob
|
history
board/barco/flash.c
patch
|
blob
|
history
board/bmw/bmw.c
patch
|
blob
|
history
board/bmw/flash.c
patch
|
blob
|
history
board/c2mon/flash.c
patch
|
blob
|
history
board/cerf250/flash.c
patch
|
blob
|
history
board/cmc_pu2/flash.c
patch
|
blob
|
history
board/cmi/cmi.c
patch
|
blob
|
history
board/cmi/flash.c
patch
|
blob
|
history
board/cogent/flash.c
patch
|
blob
|
history
board/cpc45/flash.c
patch
|
blob
|
history
board/cpu86/flash.c
patch
|
blob
|
history
board/cpu87/flash.c
patch
|
blob
|
history
board/cradle/flash.c
patch
|
blob
|
history
board/csb226/flash.c
patch
|
blob
|
history
board/cu824/flash.c
patch
|
blob
|
history
board/dnp1110/flash.c
patch
|
blob
|
history
board/eltec/elppc/misc.c
patch
|
blob
|
history
board/emk/common/flash.c
patch
|
blob
|
history
board/ep7312/flash.c
patch
|
blob
|
history
board/ep8260/flash.c
patch
|
blob
|
history
board/esd/cpci405/cpci405.c
patch
|
blob
|
history
board/esd/pf5200/flash.c
patch
|
blob
|
history
board/esd/pmc440/cmd_pmc440.c
patch
|
blob
|
history
board/esd/pmc440/pmc440.c
patch
|
blob
|
history
board/etin/debris/debris.c
patch
|
blob
|
history
board/evb4510/flash.c
patch
|
blob
|
history
board/evb64260/flash.c
patch
|
blob
|
history
board/exbitgen/flash.c
patch
|
blob
|
history
board/fads/fads.h
patch
|
blob
|
history
board/fads/flash.c
patch
|
blob
|
history
board/flagadm/flash.c
patch
|
blob
|
history
board/freescale/mpc8260ads/flash.c
patch
|
blob
|
history
board/freescale/mpc8266ads/flash.c
patch
|
blob
|
history
board/funkwerk/vovpn-gw/flash.c
patch
|
blob
|
history
board/gcplus/flash.c
patch
|
blob
|
history
board/gen860t/flash.c
patch
|
blob
|
history
board/gw8260/flash.c
patch
|
blob
|
history
board/hidden_dragon/flash.c
patch
|
blob
|
history
board/icecube/flash.c
patch
|
blob
|
history
board/icu862/flash.c
patch
|
blob
|
history
board/ids8247/flash.c
patch
|
blob
|
history
board/impa7/flash.c
patch
|
blob
|
history
board/incaip/flash.c
patch
|
blob
|
history
board/innokom/flash.c
patch
|
blob
|
history
board/integratorcp/flash.c
patch
|
blob
|
history
board/ip860/flash.c
patch
|
blob
|
history
board/iphase4539/flash.c
patch
|
blob
|
history
board/ivm/flash.c
patch
|
blob
|
history
board/ixdp425/flash.c
patch
|
blob
|
history
board/korat/korat.c
patch
|
blob
|
history
board/kup/common/flash.c
patch
|
blob
|
history
board/lantec/flash.c
patch
|
blob
|
history
board/lart/flash.c
patch
|
blob
|
history
board/logodl/flash.c
patch
|
blob
|
history
board/lpc2292sodimm/flash.c
patch
|
blob
|
history
board/lpd7a40x/flash.c
patch
|
blob
|
history
board/lubbock/flash.c
patch
|
blob
|
history
board/lwmon/flash.c
patch
|
blob
|
history
board/lwmon5/lwmon5.c
patch
|
blob
|
history
board/mcc200/mcc200.c
patch
|
blob
|
history
board/modnet50/flash.c
patch
|
blob
|
history
board/mp2usb/flash.c
patch
|
blob
|
history
board/mpc8540eval/flash.c
patch
|
blob
|
history
board/mpl/common/common_util.c
patch
|
blob
|
history
board/mpl/common/flash.c
patch
|
blob
|
history
board/mpl/pati/pati.c
patch
|
blob
|
history
board/mpl/vcma9/flash.c
patch
|
blob
|
history
board/musenki/flash.c
patch
|
blob
|
history
board/mx1ads/syncflash.c
patch
|
blob
|
history
board/mx1fs2/flash.c
patch
|
blob
|
history
board/nc650/flash.c
patch
|
blob
|
history
board/netphone/flash.c
patch
|
blob
|
history
board/netstal/hcu5/hcu5.c
patch
|
blob
|
history
board/netta/flash.c
patch
|
blob
|
history
board/netta2/flash.c
patch
|
blob
|
history
board/netvia/flash.c
patch
|
blob
|
history
board/ns9750dev/flash.c
patch
|
blob
|
history
board/o2dnt/flash.c
patch
|
blob
|
history
board/omap1610inn/flash.c
patch
|
blob
|
history
board/omap730p2/flash.c
patch
|
blob
|
history
board/oxc/flash.c
patch
|
blob
|
history
board/pcippc2/flash.c
patch
|
blob
|
history
board/pcs440ep/pcs440ep.c
patch
|
blob
|
history
board/pleb2/flash.c
patch
|
blob
|
history
board/pm520/flash.c
patch
|
blob
|
history
board/pm826/flash.c
patch
|
blob
|
history
board/pm828/flash.c
patch
|
blob
|
history
board/ppmc7xx/flash.c
patch
|
blob
|
history
board/prodrive/pdnb3/flash.c
patch
|
blob
|
history
board/purple/flash.c
patch
|
blob
|
history
board/r360mpi/flash.c
patch
|
blob
|
history
board/rmu/flash.c
patch
|
blob
|
history
board/rpxsuper/flash.c
patch
|
blob
|
history
board/rsdproto/flash.c
patch
|
blob
|
history
board/sacsng/flash.c
patch
|
blob
|
history
board/sandpoint/flash.c
patch
|
blob
|
history
board/sbc2410x/flash.c
patch
|
blob
|
history
board/sbc8260/flash.c
patch
|
blob
|
history
board/sc520_cdp/flash.c
patch
|
blob
|
history
board/sc520_cdp/flash_old.c
patch
|
blob
|
history
board/sc520_spunk/flash.c
patch
|
blob
|
history
board/scb9328/flash.c
patch
|
blob
|
history
board/shannon/flash.c
patch
|
blob
|
history
board/siemens/SCM/flash.c
patch
|
blob
|
history
board/siemens/SMN42/flash.c
patch
|
blob
|
history
board/siemens/pcu_e/flash.c
patch
|
blob
|
history
board/sixnet/flash.c
patch
|
blob
|
history
board/sl8245/flash.c
patch
|
blob
|
history
board/smdk2400/flash.c
patch
|
blob
|
history
board/smdk2410/flash.c
patch
|
blob
|
history
board/socrates/socrates.c
patch
|
blob
|
history
board/ssv/adnpesc1/flash.c
patch
|
blob
|
history
board/stxgp3/flash.c
patch
|
blob
|
history
board/svm_sc8xx/flash.c
patch
|
blob
|
history
board/tqc/tqm5200/cam5200_flash.c
patch
|
blob
|
history
board/tqc/tqm8260/flash.c
patch
|
blob
|
history
board/tqc/tqm85xx/tqm85xx.c
patch
|
blob
|
history
board/tqc/tqm8xx/flash.c
patch
|
blob
|
history
board/trab/flash.c
patch
|
blob
|
history
board/utx8245/flash.c
patch
|
blob
|
history
board/wepep250/flash.c
patch
|
blob
|
history
board/westel/amx860/flash.c
patch
|
blob
|
history
board/xaeniax/flash.c
patch
|
blob
|
history
board/xilinx/xilinx_iic/iic_adapter.c
patch
|
blob
|
history
board/xm250/flash.c
patch
|
blob
|
history
board/xsengine/flash.c
patch
|
blob
|
history
board/zeus/zeus.c
patch
|
blob
|
history
board/zylonite/flash.c
patch
|
blob
|
history
common/cmd_bdinfo.c
patch
|
blob
|
history
common/cmd_nvedit.c
patch
|
blob
|
history
common/env_common.c
patch
|
blob
|
history
common/env_dataflash.c
patch
|
blob
|
history
common/env_eeprom.c
patch
|
blob
|
history
common/env_embedded.c
patch
|
blob
|
history
common/env_flash.c
patch
|
blob
|
history
common/env_nand.c
patch
|
blob
|
history
common/env_nvram.c
patch
|
blob
|
history
common/env_onenand.c
patch
|
blob
|
history
common/env_sf.c
patch
|
blob
|
history
drivers/mtd/cfi_flash.c
patch
|
blob
|
history
include/configs/A3000.h
patch
|
blob
|
history
include/configs/ADCIOP.h
patch
|
blob
|
history
include/configs/ADNPESC1.h
patch
|
blob
|
history
include/configs/AMX860.h
patch
|
blob
|
history
include/configs/AP1000.h
patch
|
blob
|
history
include/configs/APC405.h
patch
|
blob
|
history
include/configs/AR405.h
patch
|
blob
|
history
include/configs/ASH405.h
patch
|
blob
|
history
include/configs/ATUM8548.h
patch
|
blob
|
history
include/configs/Adder.h
patch
|
blob
|
history
include/configs/Alaska8220.h
patch
|
blob
|
history
include/configs/AmigaOneG3SE.h
patch
|
blob
|
history
include/configs/B2.h
patch
|
blob
|
history
include/configs/BAB7xx.h
patch
|
blob
|
history
include/configs/BC3450.h
patch
|
blob
|
history
include/configs/BMW.h
patch
|
blob
|
history
include/configs/CANBT.h
patch
|
blob
|
history
include/configs/CATcenter.h
patch
|
blob
|
history
include/configs/CCM.h
patch
|
blob
|
history
include/configs/CMS700.h
patch
|
blob
|
history
include/configs/CPC45.h
patch
|
blob
|
history
include/configs/CPCI2DP.h
patch
|
blob
|
history
include/configs/CPCI405.h
patch
|
blob
|
history
include/configs/CPCI4052.h
patch
|
blob
|
history
include/configs/CPCI405AB.h
patch
|
blob
|
history
include/configs/CPCI405DT.h
patch
|
blob
|
history
include/configs/CPCI750.h
patch
|
blob
|
history
include/configs/CPCIISER4.h
patch
|
blob
|
history
include/configs/CPU86.h
patch
|
blob
|
history
include/configs/CPU87.h
patch
|
blob
|
history
include/configs/CRAYL1.h
patch
|
blob
|
history
include/configs/CU824.h
patch
|
blob
|
history
include/configs/DASA_SIM.h
patch
|
blob
|
history
include/configs/DB64360.h
patch
|
blob
|
history
include/configs/DB64460.h
patch
|
blob
|
history
include/configs/DK1C20.h
patch
|
blob
|
history
include/configs/DK1S10.h
patch
|
blob
|
history
include/configs/DP405.h
patch
|
blob
|
history
include/configs/DU405.h
patch
|
blob
|
history
include/configs/DU440.h
patch
|
blob
|
history
include/configs/EB+MCF-EV123.h
patch
|
blob
|
history
include/configs/ELPPC.h
patch
|
blob
|
history
include/configs/ELPT860.h
patch
|
blob
|
history
include/configs/EP1C20.h
patch
|
blob
|
history
include/configs/EP1S10.h
patch
|
blob
|
history
include/configs/EP1S40.h
patch
|
blob
|
history
include/configs/EP88x.h
patch
|
blob
|
history
include/configs/ERIC.h
patch
|
blob
|
history
include/configs/ESTEEM192E.h
patch
|
blob
|
history
include/configs/ETX094.h
patch
|
blob
|
history
include/configs/EVB64260.h
patch
|
blob
|
history
include/configs/EXBITGEN.h
patch
|
blob
|
history
include/configs/FADS823.h
patch
|
blob
|
history
include/configs/FADS850SAR.h
patch
|
blob
|
history
include/configs/FLAGADM.h
patch
|
blob
|
history
include/configs/FPS850L.h
patch
|
blob
|
history
include/configs/FPS860L.h
patch
|
blob
|
history
include/configs/G2000.h
patch
|
blob
|
history
include/configs/GEN860T.h
patch
|
blob
|
history
include/configs/GENIETV.h
patch
|
blob
|
history
include/configs/GTH.h
patch
|
blob
|
history
include/configs/HH405.h
patch
|
blob
|
history
include/configs/HIDDEN_DRAGON.h
patch
|
blob
|
history
include/configs/HMI10.h
patch
|
blob
|
history
include/configs/HUB405.h
patch
|
blob
|
history
include/configs/IAD210.h
patch
|
blob
|
history
include/configs/ICU862.h
patch
|
blob
|
history
include/configs/IDS8247.h
patch
|
blob
|
history
include/configs/IP860.h
patch
|
blob
|
history
include/configs/IPHASE4539.h
patch
|
blob
|
history
include/configs/ISPAN.h
patch
|
blob
|
history
include/configs/IVML24.h
patch
|
blob
|
history
include/configs/IVMS8.h
patch
|
blob
|
history
include/configs/IceCube.h
patch
|
blob
|
history
include/configs/JSE.h
patch
|
blob
|
history
include/configs/KAREF.h
patch
|
blob
|
history
include/configs/KUP4K.h
patch
|
blob
|
history
include/configs/KUP4X.h
patch
|
blob
|
history
include/configs/LANTEC.h
patch
|
blob
|
history
include/configs/M52277EVB.h
patch
|
blob
|
history
include/configs/M5235EVB.h
patch
|
blob
|
history
include/configs/M5249EVB.h
patch
|
blob
|
history
include/configs/M5253DEMO.h
patch
|
blob
|
history
include/configs/M5253EVBE.h
patch
|
blob
|
history
include/configs/M5271EVB.h
patch
|
blob
|
history
include/configs/M5272C3.h
patch
|
blob
|
history
include/configs/M5275EVB.h
patch
|
blob
|
history
include/configs/M5282EVB.h
patch
|
blob
|
history
include/configs/M5329EVB.h
patch
|
blob
|
history
include/configs/M5373EVB.h
patch
|
blob
|
history
include/configs/M54451EVB.h
patch
|
blob
|
history
include/configs/M54455EVB.h
patch
|
blob
|
history
include/configs/M5475EVB.h
patch
|
blob
|
history
include/configs/M5485EVB.h
patch
|
blob
|
history
include/configs/MBX.h
patch
|
blob
|
history
include/configs/MBX860T.h
patch
|
blob
|
history
include/configs/METROBOX.h
patch
|
blob
|
history
include/configs/MHPC.h
patch
|
blob
|
history
include/configs/MIP405.h
patch
|
blob
|
history
include/configs/ML2.h
patch
|
blob
|
history
include/configs/MOUSSE.h
patch
|
blob
|
history
include/configs/MPC8260ADS.h
patch
|
blob
|
history
include/configs/MPC8266ADS.h
patch
|
blob
|
history
include/configs/MPC8313ERDB.h
patch
|
blob
|
history
include/configs/MPC8315ERDB.h
patch
|
blob
|
history
include/configs/MPC8323ERDB.h
patch
|
blob
|
history
include/configs/MPC832XEMDS.h
patch
|
blob
|
history
include/configs/MPC8349EMDS.h
patch
|
blob
|
history
include/configs/MPC8349ITX.h
patch
|
blob
|
history
include/configs/MPC8360EMDS.h
patch
|
blob
|
history
include/configs/MPC8360ERDK.h
patch
|
blob
|
history
include/configs/MPC837XEMDS.h
patch
|
blob
|
history
include/configs/MPC837XERDB.h
patch
|
blob
|
history
include/configs/MPC8536DS.h
patch
|
blob
|
history
include/configs/MPC8540ADS.h
patch
|
blob
|
history
include/configs/MPC8540EVAL.h
patch
|
blob
|
history
include/configs/MPC8541CDS.h
patch
|
blob
|
history
include/configs/MPC8544DS.h
patch
|
blob
|
history
include/configs/MPC8548CDS.h
patch
|
blob
|
history
include/configs/MPC8555CDS.h
patch
|
blob
|
history
include/configs/MPC8560ADS.h
patch
|
blob
|
history
include/configs/MPC8568MDS.h
patch
|
blob
|
history
include/configs/MPC8572DS.h
patch
|
blob
|
history
include/configs/MPC8610HPCD.h
patch
|
blob
|
history
include/configs/MPC8641HPCN.h
patch
|
blob
|
history
include/configs/MUSENKI.h
patch
|
blob
|
history
include/configs/MVBC_P.h
patch
|
blob
|
history
include/configs/MVBLM7.h
patch
|
blob
|
history
include/configs/MVBLUE.h
patch
|
blob
|
history
include/configs/MVS1.h
patch
|
blob
|
history
include/configs/MigoR.h
patch
|
blob
|
history
include/configs/NC650.h
patch
|
blob
|
history
include/configs/NETPHONE.h
patch
|
blob
|
history
include/configs/NETTA.h
patch
|
blob
|
history
include/configs/NETTA2.h
patch
|
blob
|
history
include/configs/NETVIA.h
patch
|
blob
|
history
include/configs/NSCU.h
patch
|
blob
|
history
include/configs/NX823.h
patch
|
blob
|
history
include/configs/OCRTC.h
patch
|
blob
|
history
include/configs/ORSG.h
patch
|
blob
|
history
include/configs/OXC.h
patch
|
blob
|
history
include/configs/P3G4.h
patch
|
blob
|
history
include/configs/PATI.h
patch
|
blob
|
history
include/configs/PCI405.h
patch
|
blob
|
history
include/configs/PCI5441.h
patch
|
blob
|
history
include/configs/PCIPPC2.h
patch
|
blob
|
history
include/configs/PCIPPC6.h
patch
|
blob
|
history
include/configs/PIP405.h
patch
|
blob
|
history
include/configs/PK1C20.h
patch
|
blob
|
history
include/configs/PLU405.h
patch
|
blob
|
history
include/configs/PM520.h
patch
|
blob
|
history
include/configs/PM826.h
patch
|
blob
|
history
include/configs/PM828.h
patch
|
blob
|
history
include/configs/PM854.h
patch
|
blob
|
history
include/configs/PM856.h
patch
|
blob
|
history
include/configs/PMC405.h
patch
|
blob
|
history
include/configs/PMC440.h
patch
|
blob
|
history
include/configs/PN62.h
patch
|
blob
|
history
include/configs/PPChameleonEVB.h
patch
|
blob
|
history
include/configs/QS823.h
patch
|
blob
|
history
include/configs/QS850.h
patch
|
blob
|
history
include/configs/QS860T.h
patch
|
blob
|
history
include/configs/R360MPI.h
patch
|
blob
|
history
include/configs/RBC823.h
patch
|
blob
|
history
include/configs/RPXClassic.h
patch
|
blob
|
history
include/configs/RPXlite.h
patch
|
blob
|
history
include/configs/RPXlite_DW.h
patch
|
blob
|
history
include/configs/RPXsuper.h
patch
|
blob
|
history
include/configs/RRvision.h
patch
|
blob
|
history
include/configs/Rattler.h
patch
|
blob
|
history
include/configs/SBC8540.h
patch
|
blob
|
history
include/configs/SCM.h
patch
|
blob
|
history
include/configs/SL8245.h
patch
|
blob
|
history
include/configs/SM850.h
patch
|
blob
|
history
include/configs/SMN42.h
patch
|
blob
|
history
include/configs/SPD823TS.h
patch
|
blob
|
history
include/configs/SX1.h
patch
|
blob
|
history
include/configs/SXNI855T.h
patch
|
blob
|
history
include/configs/Sandpoint8240.h
patch
|
blob
|
history
include/configs/Sandpoint8245.h
patch
|
blob
|
history
include/configs/TASREG.h
patch
|
blob
|
history
include/configs/TB5200.h
patch
|
blob
|
history
include/configs/TK885D.h
patch
|
blob
|
history
include/configs/TOP5200.h
patch
|
blob
|
history
include/configs/TOP860.h
patch
|
blob
|
history
include/configs/TQM5200.h
patch
|
blob
|
history
include/configs/TQM823L.h
patch
|
blob
|
history
include/configs/TQM823M.h
patch
|
blob
|
history
include/configs/TQM8260.h
patch
|
blob
|
history
include/configs/TQM8272.h
patch
|
blob
|
history
include/configs/TQM834x.h
patch
|
blob
|
history
include/configs/TQM850L.h
patch
|
blob
|
history
include/configs/TQM850M.h
patch
|
blob
|
history
include/configs/TQM855L.h
patch
|
blob
|
history
include/configs/TQM855M.h
patch
|
blob
|
history
include/configs/TQM85xx.h
patch
|
blob
|
history
include/configs/TQM860L.h
patch
|
blob
|
history
include/configs/TQM860M.h
patch
|
blob
|
history
include/configs/TQM862L.h
patch
|
blob
|
history
include/configs/TQM862M.h
patch
|
blob
|
history
include/configs/TQM866M.h
patch
|
blob
|
history
include/configs/TQM885D.h
patch
|
blob
|
history
include/configs/Total5200.h
patch
|
blob
|
history
include/configs/VCMA9.h
patch
|
blob
|
history
include/configs/VOH405.h
patch
|
blob
|
history
include/configs/VOM405.h
patch
|
blob
|
history
include/configs/VoVPN-GW.h
patch
|
blob
|
history
include/configs/W7OLMC.h
patch
|
blob
|
history
include/configs/W7OLMG.h
patch
|
blob
|
history
include/configs/WUH405.h
patch
|
blob
|
history
include/configs/XPEDITE1K.h
patch
|
blob
|
history
include/configs/Yukon8220.h
patch
|
blob
|
history
include/configs/ZPC1900.h
patch
|
blob
|
history
include/configs/ZUMA.h
patch
|
blob
|
history
include/configs/acadia.h
patch
|
blob
|
history
include/configs/actux1.h
patch
|
blob
|
history
include/configs/actux2.h
patch
|
blob
|
history
include/configs/actux3.h
patch
|
blob
|
history
include/configs/actux4.h
patch
|
blob
|
history
include/configs/ads5121.h
patch
|
blob
|
history
include/configs/aev.h
patch
|
blob
|
history
include/configs/alpr.h
patch
|
blob
|
history
include/configs/ap325rxa.h
patch
|
blob
|
history
include/configs/apollon.h
patch
|
blob
|
history
include/configs/armadillo.h
patch
|
blob
|
history
include/configs/assabet.h
patch
|
blob
|
history
include/configs/at91cap9adk.h
patch
|
blob
|
history
include/configs/at91rm9200dk.h
patch
|
blob
|
history
include/configs/at91sam9260ek.h
patch
|
blob
|
history
include/configs/at91sam9261ek.h
patch
|
blob
|
history
include/configs/at91sam9263ek.h
patch
|
blob
|
history
include/configs/at91sam9rlek.h
patch
|
blob
|
history
include/configs/atc.h
patch
|
blob
|
history
include/configs/atngw100.h
patch
|
blob
|
history
include/configs/atstk1002.h
patch
|
blob
|
history
include/configs/atstk1003.h
patch
|
blob
|
history
include/configs/atstk1004.h
patch
|
blob
|
history
include/configs/atstk1006.h
patch
|
blob
|
history
include/configs/bamboo.h
patch
|
blob
|
history
include/configs/barco.h
patch
|
blob
|
history
include/configs/bf533-ezkit.h
patch
|
blob
|
history
include/configs/bf533-stamp.h
patch
|
blob
|
history
include/configs/bf537-stamp.h
patch
|
blob
|
history
include/configs/bf561-ezkit.h
patch
|
blob
|
history
include/configs/bubinga.h
patch
|
blob
|
history
include/configs/c2mon.h
patch
|
blob
|
history
include/configs/canmb.h
patch
|
blob
|
history
include/configs/canyonlands.h
patch
|
blob
|
history
include/configs/cerf250.h
patch
|
blob
|
history
include/configs/cm4008.h
patch
|
blob
|
history
include/configs/cm41xx.h
patch
|
blob
|
history
include/configs/cm5200.h
patch
|
blob
|
history
include/configs/cmc_pu2.h
patch
|
blob
|
history
include/configs/cmi_mpc5xx.h
patch
|
blob
|
history
include/configs/cobra5272.h
patch
|
blob
|
history
include/configs/cogent_mpc8260.h
patch
|
blob
|
history
include/configs/cogent_mpc8xx.h
patch
|
blob
|
history
include/configs/cpci5200.h
patch
|
blob
|
history
include/configs/cradle.h
patch
|
blob
|
history
include/configs/csb226.h
patch
|
blob
|
history
include/configs/csb272.h
patch
|
blob
|
history
include/configs/csb472.h
patch
|
blob
|
history
include/configs/csb637.h
patch
|
blob
|
history
include/configs/davinci_dvevm.h
patch
|
blob
|
history
include/configs/davinci_schmoogie.h
patch
|
blob
|
history
include/configs/davinci_sffsdr.h
patch
|
blob
|
history
include/configs/davinci_sonata.h
patch
|
blob
|
history
include/configs/dbau1x00.h
patch
|
blob
|
history
include/configs/debris.h
patch
|
blob
|
history
include/configs/delta.h
patch
|
blob
|
history
include/configs/dnp1110.h
patch
|
blob
|
history
include/configs/eXalion.h
patch
|
blob
|
history
include/configs/ebony.h
patch
|
blob
|
history
include/configs/ep7312.h
patch
|
blob
|
history
include/configs/ep8248.h
patch
|
blob
|
history
include/configs/ep8260.h
patch
|
blob
|
history
include/configs/ep82xxm.h
patch
|
blob
|
history
include/configs/evb4510.h
patch
|
blob
|
history
include/configs/favr-32-ezkit.h
patch
|
blob
|
history
include/configs/gcplus.h
patch
|
blob
|
history
include/configs/gr_cpci_ax2000.h
patch
|
blob
|
history
include/configs/gr_ep2s60.h
patch
|
blob
|
history
include/configs/gr_xc3s_1500.h
patch
|
blob
|
history
include/configs/grsim.h
patch
|
blob
|
history
include/configs/grsim_leon2.h
patch
|
blob
|
history
include/configs/gth2.h
patch
|
blob
|
history
include/configs/gw8260.h
patch
|
blob
|
history
include/configs/hammerhead.h
patch
|
blob
|
history
include/configs/hcu4.h
patch
|
blob
|
history
include/configs/hcu5.h
patch
|
blob
|
history
include/configs/hermes.h
patch
|
blob
|
history
include/configs/hmi1001.h
patch
|
blob
|
history
include/configs/hymod.h
patch
|
blob
|
history
include/configs/idmr.h
patch
|
blob
|
history
include/configs/impa7.h
patch
|
blob
|
history
include/configs/imx31_litekit.h
patch
|
blob
|
history
include/configs/imx31_phycore.h
patch
|
blob
|
history
include/configs/incaip.h
patch
|
blob
|
history
include/configs/inka4x0.h
patch
|
blob
|
history
include/configs/innokom.h
patch
|
blob
|
history
include/configs/integratorap.h
patch
|
blob
|
history
include/configs/integratorcp.h
patch
|
blob
|
history
include/configs/ixdp425.h
patch
|
blob
|
history
include/configs/ixdpg425.h
patch
|
blob
|
history
include/configs/jupiter.h
patch
|
blob
|
history
include/configs/katmai.h
patch
|
blob
|
history
include/configs/kb9202.h
patch
|
blob
|
history
include/configs/kilauea.h
patch
|
blob
|
history
include/configs/korat.h
patch
|
blob
|
history
include/configs/kvme080.h
patch
|
blob
|
history
include/configs/lart.h
patch
|
blob
|
history
include/configs/linkstation.h
patch
|
blob
|
history
include/configs/logodl.h
patch
|
blob
|
history
include/configs/lpc2292sodimm.h
patch
|
blob
|
history
include/configs/lpd7a400.h
patch
|
blob
|
history
include/configs/lpd7a404.h
patch
|
blob
|
history
include/configs/luan.h
patch
|
blob
|
history
include/configs/lubbock.h
patch
|
blob
|
history
include/configs/lwmon.h
patch
|
blob
|
history
include/configs/lwmon5.h
patch
|
blob
|
history
include/configs/m501sk.h
patch
|
blob
|
history
include/configs/makalu.h
patch
|
blob
|
history
include/configs/mcc200.h
patch
|
blob
|
history
include/configs/mcu25.h
patch
|
blob
|
history
include/configs/mecp5200.h
patch
|
blob
|
history
include/configs/mgcoge.h
patch
|
blob
|
history
include/configs/mgsuvd.h
patch
|
blob
|
history
include/configs/mimc200.h
patch
|
blob
|
history
include/configs/ml300.h
patch
|
blob
|
history
include/configs/ml401.h
patch
|
blob
|
history
include/configs/ml507.h
patch
|
blob
|
history
include/configs/modnet50.h
patch
|
blob
|
history
include/configs/motionpro.h
patch
|
blob
|
history
include/configs/mp2usb.h
patch
|
blob
|
history
include/configs/mpc7448hpc2.h
patch
|
blob
|
history
include/configs/mpr2.h
patch
|
blob
|
history
include/configs/ms7720se.h
patch
|
blob
|
history
include/configs/ms7722se.h
patch
|
blob
|
history
include/configs/ms7750se.h
patch
|
blob
|
history
include/configs/muas3001.h
patch
|
blob
|
history
include/configs/mucmc52.h
patch
|
blob
|
history
include/configs/munices.h
patch
|
blob
|
history
include/configs/mx1ads.h
patch
|
blob
|
history
include/configs/mx1fs2.h
patch
|
blob
|
history
include/configs/mx31ads.h
patch
|
blob
|
history
include/configs/netstar.h
patch
|
blob
|
history
include/configs/ns9750dev.h
patch
|
blob
|
history
include/configs/o2dnt.h
patch
|
blob
|
history
include/configs/ocotea.h
patch
|
blob
|
history
include/configs/omap1510inn.h
patch
|
blob
|
history
include/configs/omap1610h2.h
patch
|
blob
|
history
include/configs/omap1610inn.h
patch
|
blob
|
history
include/configs/omap2420h4.h
patch
|
blob
|
history
include/configs/omap5912osk.h
patch
|
blob
|
history
include/configs/omap730p2.h
patch
|
blob
|
history
include/configs/p3mx.h
patch
|
blob
|
history
include/configs/p3p440.h
patch
|
blob
|
history
include/configs/pb1x00.h
patch
|
blob
|
history
include/configs/pcs440ep.h
patch
|
blob
|
history
include/configs/pcu_e.h
patch
|
blob
|
history
include/configs/pdnb3.h
patch
|
blob
|
history
include/configs/pf5200.h
patch
|
blob
|
history
include/configs/pleb2.h
patch
|
blob
|
history
include/configs/ppmc7xx.h
patch
|
blob
|
history
include/configs/ppmc8260.h
patch
|
blob
|
history
include/configs/purple.h
patch
|
blob
|
history
include/configs/pxa255_idp.h
patch
|
blob
|
history
include/configs/qemu-mips.h
patch
|
blob
|
history
include/configs/quad100hd.h
patch
|
blob
|
history
include/configs/quantum.h
patch
|
blob
|
history
include/configs/r2dplus.h
patch
|
blob
|
history
include/configs/r7780mp.h
patch
|
blob
|
history
include/configs/redwood.h
patch
|
blob
|
history
include/configs/rmu.h
patch
|
blob
|
history
include/configs/rsdproto.h
patch
|
blob
|
history
include/configs/rsk7203.h
patch
|
blob
|
history
include/configs/sacsng.h
patch
|
blob
|
history
include/configs/sbc2410x.h
patch
|
blob
|
history
include/configs/sbc405.h
patch
|
blob
|
history
include/configs/sbc8240.h
patch
|
blob
|
history
include/configs/sbc8260.h
patch
|
blob
|
history
include/configs/sbc8349.h
patch
|
blob
|
history
include/configs/sbc8548.h
patch
|
blob
|
history
include/configs/sbc8560.h
patch
|
blob
|
history
include/configs/sbc8641d.h
patch
|
blob
|
history
include/configs/sc3.h
patch
|
blob
|
history
include/configs/sc520_cdp.h
patch
|
blob
|
history
include/configs/sc520_spunk.h
patch
|
blob
|
history
include/configs/scb9328.h
patch
|
blob
|
history
include/configs/sequoia.h
patch
|
blob
|
history
include/configs/sh7763rdp.h
patch
|
blob
|
history
include/configs/sh7785lcr.h
patch
|
blob
|
history
include/configs/shannon.h
patch
|
blob
|
history
include/configs/smdk2400.h
patch
|
blob
|
history
include/configs/smdk2410.h
patch
|
blob
|
history
include/configs/smdk6400.h
patch
|
blob
|
history
include/configs/smmaco4.h
patch
|
blob
|
history
include/configs/socrates.h
patch
|
blob
|
history
include/configs/sorcery.h
patch
|
blob
|
history
include/configs/spc1920.h
patch
|
blob
|
history
include/configs/spieval.h
patch
|
blob
|
history
include/configs/stxgp3.h
patch
|
blob
|
history
include/configs/stxssa.h
patch
|
blob
|
history
include/configs/stxxtc.h
patch
|
blob
|
history
include/configs/suzaku.h
patch
|
blob
|
history
include/configs/svm_sc8xx.h
patch
|
blob
|
history
include/configs/taihu.h
patch
|
blob
|
history
include/configs/taishan.h
patch
|
blob
|
history
include/configs/tb0229.h
patch
|
blob
|
history
include/configs/trab.h
patch
|
blob
|
history
include/configs/trizepsiv.h
patch
|
blob
|
history
include/configs/uc100.h
patch
|
blob
|
history
include/configs/uc101.h
patch
|
blob
|
history
include/configs/utx8245.h
patch
|
blob
|
history
include/configs/v37.h
patch
|
blob
|
history
include/configs/v38b.h
patch
|
blob
|
history
include/configs/v5fx30teval.h
patch
|
blob
|
history
include/configs/versatile.h
patch
|
blob
|
history
include/configs/virtlab2.h
patch
|
blob
|
history
include/configs/voiceblue.h
patch
|
blob
|
history
include/configs/walnut.h
patch
|
blob
|
history
include/configs/wepep250.h
patch
|
blob
|
history
include/configs/xaeniax.h
patch
|
blob
|
history
include/configs/xilinx-ppc440-generic.h
patch
|
blob
|
history
include/configs/xilinx-ppc440.h
patch
|
blob
|
history
include/configs/xm250.h
patch
|
blob
|
history
include/configs/xsengine.h
patch
|
blob
|
history
include/configs/xupv2p.h
patch
|
blob
|
history
include/configs/yosemite.h
patch
|
blob
|
history
include/configs/yucca.h
patch
|
blob
|
history
include/configs/zeus.h
patch
|
blob
|
history
include/configs/zylonite.h
patch
|
blob
|
history
include/environment.h
patch
|
blob
|
history
lib_m68k/board.c
patch
|
blob
|
history
lib_mips/board.c
patch
|
blob
|
history
lib_ppc/board.c
patch
|
blob
|
history
lib_sparc/board.c
patch
|
blob
|
history
tools/env/fw_env.c
patch
|
blob
|
history
tools/envcrc.c
patch
|
blob
|
history
tools/updater/flash_hw.c
patch
|
blob
|
history
diff --git
a/README
b/README
index
49f9d88
..
5135281
100644
(file)
--- a/
README
+++ b/
README
@@
-2120,22
+2120,22
@@
following configurations:
environment in one of the last sectors, leaving a gap
between U-Boot and the environment.
environment in one of the last sectors, leaving a gap
between U-Boot and the environment.
- - C
F
G_ENV_OFFSET:
+ - C
ONFI
G_ENV_OFFSET:
Offset of environment data (variable area) to the
beginning of flash memory; for instance, with bottom boot
type flash chips the second sector can be used: the offset
for this sector is given here.
Offset of environment data (variable area) to the
beginning of flash memory; for instance, with bottom boot
type flash chips the second sector can be used: the offset
for this sector is given here.
- C
F
G_ENV_OFFSET is used relative to CFG_FLASH_BASE.
+ C
ONFI
G_ENV_OFFSET is used relative to CFG_FLASH_BASE.
- - C
F
G_ENV_ADDR:
+ - C
ONFI
G_ENV_ADDR:
This is just another way to specify the start address of
the flash sector containing the environment (instead of
This is just another way to specify the start address of
the flash sector containing the environment (instead of
- C
F
G_ENV_OFFSET).
+ C
ONFI
G_ENV_OFFSET).
- - C
F
G_ENV_SECT_SIZE:
+ - C
ONFI
G_ENV_SECT_SIZE:
Size of the sector containing the environment.
Size of the sector containing the environment.
@@
-2144,10
+2144,10
@@
following configurations:
In such a case you don't want to spend a whole sector for
the environment.
In such a case you don't want to spend a whole sector for
the environment.
- - C
F
G_ENV_SIZE:
+ - C
ONFI
G_ENV_SIZE:
If you use this in combination with CONFIG_ENV_IS_IN_FLASH
If you use this in combination with CONFIG_ENV_IS_IN_FLASH
- and C
F
G_ENV_SECT_SIZE, you can specify to use only a part
+ and C
ONFI
G_ENV_SECT_SIZE, you can specify to use only a part
of this flash sector for the environment. This saves
memory for the RAM copy of the environment.
of this flash sector for the environment. This saves
memory for the RAM copy of the environment.
@@
-2161,8
+2161,8
@@
following configurations:
wrong before the contents has been restored from a copy in
RAM, your target system will be dead.
wrong before the contents has been restored from a copy in
RAM, your target system will be dead.
- - C
F
G_ENV_ADDR_REDUND
- C
F
G_ENV_SIZE_REDUND
+ - C
ONFI
G_ENV_ADDR_REDUND
+ C
ONFI
G_ENV_SIZE_REDUND
These settings describe a second storage area used to hold
a redundant copy of the environment data, so that there is
These settings describe a second storage area used to hold
a redundant copy of the environment data, so that there is
@@
-2180,8
+2180,8
@@
accordingly!
(NVRAM, battery buffered SRAM) which you want to use for the
environment.
(NVRAM, battery buffered SRAM) which you want to use for the
environment.
- - C
F
G_ENV_ADDR:
- - C
F
G_ENV_SIZE:
+ - C
ONFI
G_ENV_ADDR:
+ - C
ONFI
G_ENV_SIZE:
These two #defines are used to determine the memory area you
want to use for environment. It is assumed that this memory
These two #defines are used to determine the memory area you
want to use for environment. It is assumed that this memory
@@
-2204,8
+2204,8
@@
to save the current settings.
Use this if you have an EEPROM or similar serial access
device and a driver for it.
Use this if you have an EEPROM or similar serial access
device and a driver for it.
- - C
F
G_ENV_OFFSET:
- - C
F
G_ENV_SIZE:
+ - C
ONFI
G_ENV_OFFSET:
+ - C
ONFI
G_ENV_SIZE:
These two #defines specify the offset and size of the
environment area within the total memory of your EEPROM.
These two #defines specify the offset and size of the
environment area within the total memory of your EEPROM.
@@
-2247,9
+2247,9
@@
to save the current settings.
Define this if you have a DataFlash memory device which you
want to use for the environment.
Define this if you have a DataFlash memory device which you
want to use for the environment.
- - C
F
G_ENV_OFFSET:
- - C
F
G_ENV_ADDR:
- - C
F
G_ENV_SIZE:
+ - C
ONFI
G_ENV_OFFSET:
+ - C
ONFI
G_ENV_ADDR:
+ - C
ONFI
G_ENV_SIZE:
These three #defines specify the offset and size of the
environment area within the total memory of your DataFlash placed
These three #defines specify the offset and size of the
environment area within the total memory of your DataFlash placed
@@
-2260,21
+2260,21
@@
to save the current settings.
Define this if you have a NAND device which you want to use
for the environment.
Define this if you have a NAND device which you want to use
for the environment.
- - C
F
G_ENV_OFFSET:
- - C
F
G_ENV_SIZE:
+ - C
ONFI
G_ENV_OFFSET:
+ - C
ONFI
G_ENV_SIZE:
These two #defines specify the offset and size of the environment
area within the first NAND device.
These two #defines specify the offset and size of the environment
area within the first NAND device.
- - C
F
G_ENV_OFFSET_REDUND
+ - C
ONFI
G_ENV_OFFSET_REDUND
- This setting describes a second storage area of C
F
G_ENV_SIZE
+ This setting describes a second storage area of C
ONFI
G_ENV_SIZE
size used to hold a redundant copy of the environment data,
so that there is a valid backup copy in case there is a
power failure during a "saveenv" operation.
size used to hold a redundant copy of the environment data,
so that there is a valid backup copy in case there is a
power failure during a "saveenv" operation.
- Note: C
FG_ENV_OFFSET and CF
G_ENV_OFFSET_REDUND must be aligned
- to a block boundary, and C
F
G_ENV_SIZE must be a multiple of
+ Note: C
ONFIG_ENV_OFFSET and CONFI
G_ENV_OFFSET_REDUND must be aligned
+ to a block boundary, and C
ONFI
G_ENV_SIZE must be a multiple of
the NAND devices block size.
- CFG_SPI_INIT_OFFSET
the NAND devices block size.
- CFG_SPI_INIT_OFFSET
diff --git
a/api/api.c
b/api/api.c
index
19c7154
..
f51ebb7
100644
(file)
--- a/
api/api.c
+++ b/
api/api.c
@@
-534,7
+534,7
@@
static int API_env_enum(va_list ap)
for (i = 0; env_get_char(i) != '\0'; i = n + 1) {
for (n = i; env_get_char(n) != '\0'; ++n) {
for (i = 0; env_get_char(i) != '\0'; i = n + 1) {
for (n = i; env_get_char(n) != '\0'; ++n) {
- if (n >= C
F
G_ENV_SIZE) {
+ if (n >= C
ONFI
G_ENV_SIZE) {
/* XXX shouldn't we set *next = NULL?? */
return 0;
}
/* XXX shouldn't we set *next = NULL?? */
return 0;
}
diff --git
a/board/LEOX/elpt860/flash.c
b/board/LEOX/elpt860/flash.c
index
d77af35
..
668aee2
100644
(file)
--- a/
board/LEOX/elpt860/flash.c
+++ b/
board/LEOX/elpt860/flash.c
@@
-61,8
+61,8
@@
#include <mpc8xx.h>
#include <mpc8xx.h>
-#ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+#ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
#endif
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#endif
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
@@
-125,8
+125,8
@@
flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE-1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/MAI/AmigaOneG3SE/flash_new.c
b/board/MAI/AmigaOneG3SE/flash_new.c
index
5e15e20
..
3efee7e
100644
(file)
--- a/
board/MAI/AmigaOneG3SE/flash_new.c
+++ b/
board/MAI/AmigaOneG3SE/flash_new.c
@@
-126,8
+126,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/RRvision/flash.c
b/board/RRvision/flash.c
index
287bbac
..
6608bca
100644
(file)
--- a/
board/RRvision/flash.c
+++ b/
board/RRvision/flash.c
@@
-26,8
+26,8
@@
#include <common.h>
#include <mpc8xx.h>
#include <common.h>
#include <mpc8xx.h>
-#ifndef C
F
G_ENV_ADDR
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+#ifndef C
ONFI
G_ENV_ADDR
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
#endif
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#endif
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
@@
-80,8
+80,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE-1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/a3000/flash.c
b/board/a3000/flash.c
index
98a027e
..
add2a28
100644
(file)
--- a/
board/a3000/flash.c
+++ b/
board/a3000/flash.c
@@
-26,14
+26,14
@@
#include <mpc824x.h>
#if defined(CONFIG_ENV_IS_IN_FLASH)
#include <mpc824x.h>
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-110,10
+110,10
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
- DEBUGF("protect environtment %x @ %x\n", C
FG_ENV_ADDR, CF
G_ENV_SECT_SIZE);
+ DEBUGF("protect environtment %x @ %x\n", C
ONFIG_ENV_ADDR, CONFI
G_ENV_SECT_SIZE);
flash_protect(FLAG_PROTECT_SET,
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SECT_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE-1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/alaska/flash.c
b/board/alaska/flash.c
index
7156160
..
556c168
100644
(file)
--- a/
board/alaska/flash.c
+++ b/
board/alaska/flash.c
@@
-144,11
+144,11
@@
unsigned long flash_init (void)
#endif
flash_protect (FLAG_PROTECT_SET,
#endif
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV1_ADDR,
- C
FG_ENV1_ADDR + CF
G_ENV1_SIZE - 1, &flash_info[1]);
+ C
ONFI
G_ENV1_ADDR,
+ C
ONFIG_ENV1_ADDR + CONFI
G_ENV1_SIZE - 1, &flash_info[1]);
flash_protect (FLAG_PROTECT_SET,
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[3]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[3]);
return size;
}
return size;
}
diff --git
a/board/amcc/bamboo/flash.c
b/board/amcc/bamboo/flash.c
index
f23fc24
..
d004ed7
100644
(file)
--- a/
board/amcc/bamboo/flash.c
+++ b/
board/amcc/bamboo/flash.c
@@
-154,12
+154,12
@@
unsigned long flash_init(void)
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[i]);
#if defined(CONFIG_ENV_IS_IN_FLASH)
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[i]);
#if defined(CONFIG_ENV_IS_IN_FLASH)
- (void)flash_protect(FLAG_PROTECT_SET, C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ (void)flash_protect(FLAG_PROTECT_SET, C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[i]);
&flash_info[i]);
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR_REDUND)
- (void)flash_protect(FLAG_PROTECT_SET, C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SECT_SIZE - 1,
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR_REDUND)
+ (void)flash_protect(FLAG_PROTECT_SET, C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[i]);
#endif
#endif
&flash_info[i]);
#endif
#endif
diff --git
a/board/amcc/bubinga/flash.c
b/board/amcc/bubinga/flash.c
index
0295b8c
..
d71cc29
100644
(file)
--- a/
board/amcc/bubinga/flash.c
+++ b/
board/amcc/bubinga/flash.c
@@
-85,11
+85,11
@@
unsigned long flash_init(void)
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[0]);
#ifdef CONFIG_ENV_IS_IN_FLASH
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[0]);
#ifdef CONFIG_ENV_IS_IN_FLASH
- (void)flash_protect(FLAG_PROTECT_SET, C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ (void)flash_protect(FLAG_PROTECT_SET, C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[0]);
&flash_info[0]);
- (void)flash_protect(FLAG_PROTECT_SET, C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SECT_SIZE - 1,
+ (void)flash_protect(FLAG_PROTECT_SET, C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/amcc/ebony/flash.c
b/board/amcc/ebony/flash.c
index
b49e05f
..
d9c6974
100644
(file)
--- a/
board/amcc/ebony/flash.c
+++ b/
board/amcc/ebony/flash.c
@@
-125,11
+125,11
@@
unsigned long flash_init(void)
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[2]);
#ifdef CONFIG_ENV_IS_IN_FLASH
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[2]);
#ifdef CONFIG_ENV_IS_IN_FLASH
- (void)flash_protect(FLAG_PROTECT_SET, C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ (void)flash_protect(FLAG_PROTECT_SET, C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[2]);
&flash_info[2]);
- (void)flash_protect(FLAG_PROTECT_SET, C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SECT_SIZE - 1,
+ (void)flash_protect(FLAG_PROTECT_SET, C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[2]);
#endif
&flash_info[2]);
#endif
diff --git
a/board/amcc/luan/flash.c
b/board/amcc/luan/flash.c
index
3b2f9b7
..
d28bf9d
100644
(file)
--- a/
board/amcc/luan/flash.c
+++ b/
board/amcc/luan/flash.c
@@
-96,11
+96,11
@@
unsigned long flash_init(void)
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[2]);
#ifdef CONFIG_ENV_IS_IN_FLASH
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[2]);
#ifdef CONFIG_ENV_IS_IN_FLASH
- (void)flash_protect(FLAG_PROTECT_SET, C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ (void)flash_protect(FLAG_PROTECT_SET, C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[2]);
&flash_info[2]);
- (void)flash_protect(FLAG_PROTECT_SET, C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SECT_SIZE - 1,
+ (void)flash_protect(FLAG_PROTECT_SET, C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[2]);
#endif
&flash_info[2]);
#endif
diff --git
a/board/amcc/ocotea/flash.c
b/board/amcc/ocotea/flash.c
index
88a76f7
..
46c6946
100644
(file)
--- a/
board/amcc/ocotea/flash.c
+++ b/
board/amcc/ocotea/flash.c
@@
-135,11
+135,11
@@
unsigned long flash_init(void)
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[i]);
#ifdef CONFIG_ENV_IS_IN_FLASH
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[i]);
#ifdef CONFIG_ENV_IS_IN_FLASH
- (void)flash_protect(FLAG_PROTECT_SET, C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ (void)flash_protect(FLAG_PROTECT_SET, C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[i]);
&flash_info[i]);
- (void)flash_protect(FLAG_PROTECT_SET, C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SECT_SIZE - 1,
+ (void)flash_protect(FLAG_PROTECT_SET, C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[i]);
#endif
&flash_info[i]);
#endif
diff --git
a/board/amcc/sequoia/sequoia.c
b/board/amcc/sequoia/sequoia.c
index
c682c8e
..
e439fb9
100644
(file)
--- a/
board/amcc/sequoia/sequoia.c
+++ b/
board/amcc/sequoia/sequoia.c
@@
-166,8
+166,8
@@
int misc_init_r(void)
/* Env protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
/* Env protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + 2*CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + 2*CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/amcc/taihu/flash.c
b/board/amcc/taihu/flash.c
index
8ffcc39
..
ae92bb2
100644
(file)
--- a/
board/amcc/taihu/flash.c
+++ b/
board/amcc/taihu/flash.c
@@
-88,11
+88,11
@@
unsigned long flash_init(void)
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[0]);
#ifdef CONFIG_ENV_IS_IN_FLASH
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[0]);
#ifdef CONFIG_ENV_IS_IN_FLASH
- (void)flash_protect(FLAG_PROTECT_SET, C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ (void)flash_protect(FLAG_PROTECT_SET, C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[0]);
&flash_info[0]);
- (void)flash_protect(FLAG_PROTECT_SET, C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SECT_SIZE - 1,
+ (void)flash_protect(FLAG_PROTECT_SET, C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[0]);
#endif
/* Also protect sector containing initial power-up instruction */
&flash_info[0]);
#endif
/* Also protect sector containing initial power-up instruction */
diff --git
a/board/amcc/walnut/flash.c
b/board/amcc/walnut/flash.c
index
d47d263
..
fe6ca6c
100644
(file)
--- a/
board/amcc/walnut/flash.c
+++ b/
board/amcc/walnut/flash.c
@@
-83,11
+83,11
@@
unsigned long flash_init(void)
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[0]);
#ifdef CONFIG_ENV_IS_IN_FLASH
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[0]);
#ifdef CONFIG_ENV_IS_IN_FLASH
- (void)flash_protect(FLAG_PROTECT_SET, C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ (void)flash_protect(FLAG_PROTECT_SET, C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[0]);
&flash_info[0]);
- (void)flash_protect(FLAG_PROTECT_SET, C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SECT_SIZE - 1,
+ (void)flash_protect(FLAG_PROTECT_SET, C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/amcc/yucca/flash.c
b/board/amcc/yucca/flash.c
index
9256938
..
c405346
100644
(file)
--- a/
board/amcc/yucca/flash.c
+++ b/
board/amcc/yucca/flash.c
@@
-1038,12
+1038,12
@@
unsigned long flash_init(void)
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[i]);
#if defined(CONFIG_ENV_IS_IN_FLASH)
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[i]);
#if defined(CONFIG_ENV_IS_IN_FLASH)
- (void)flash_protect(FLAG_PROTECT_SET, C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ (void)flash_protect(FLAG_PROTECT_SET, C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[i]);
&flash_info[i]);
-#if defined(C
F
G_ENV_ADDR_REDUND)
- (void)flash_protect(FLAG_PROTECT_SET, C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SECT_SIZE - 1,
+#if defined(C
ONFI
G_ENV_ADDR_REDUND)
+ (void)flash_protect(FLAG_PROTECT_SET, C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[i]);
#endif
#endif
&flash_info[i]);
#endif
#endif
diff --git
a/board/armadillo/flash.c
b/board/armadillo/flash.c
index
8518856
..
6ed88f4
100644
(file)
--- a/
board/armadillo/flash.c
+++ b/
board/armadillo/flash.c
@@
-74,8
+74,8
@@
ulong flash_init (void)
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
return size;
}
return size;
}
diff --git
a/board/atc/flash.c
b/board/atc/flash.c
index
9e4c6c5
..
7835e8f
100644
(file)
--- a/
board/atc/flash.c
+++ b/
board/atc/flash.c
@@
-98,9
+98,9
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SIZE-1,
- flash_get_info(C
F
G_ENV_ADDR));
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE-1,
+ flash_get_info(C
ONFI
G_ENV_ADDR));
#endif
#endif
diff --git
a/board/atmel/at91rm9200dk/flash.c
b/board/atmel/at91rm9200dk/flash.c
index
0513d61
..
ef8d9a8
100644
(file)
--- a/
board/atmel/at91rm9200dk/flash.c
+++ b/
board/atmel/at91rm9200dk/flash.c
@@
-221,8
+221,8
@@
ulong flash_init (void)
/* Protect environment variables */
flash_protect (FLAG_PROTECT_SET,
/* Protect environment variables */
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
/* Protect U-Boot gzipped image */
flash_protect (FLAG_PROTECT_SET,
/* Protect U-Boot gzipped image */
flash_protect (FLAG_PROTECT_SET,
diff --git
a/board/barco/flash.c
b/board/barco/flash.c
index
c6a01ca
..
53fc58c
100644
(file)
--- a/
board/barco/flash.c
+++ b/
board/barco/flash.c
@@
-59,14
+59,14
@@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-224,10
+224,10
@@
unsigned long flash_init(void)
&flash_info[0]);
#endif
&flash_info[0]);
#endif
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR)
flash_protect(FLAG_PROTECT_SET,
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/bmw/bmw.c
b/board/bmw/bmw.c
index
0431431
..
b629c38
100644
(file)
--- a/
board/bmw/bmw.c
+++ b/
board/bmw/bmw.c
@@
-125,7
+125,7
@@
void doc_init (void)
doc_probe(DOC_BASE_ADDR);
}
doc_probe(DOC_BASE_ADDR);
}
-#define NV_ADDR ((volatile unsigned char *) C
F
G_ENV_ADDR)
+#define NV_ADDR ((volatile unsigned char *) C
ONFI
G_ENV_ADDR)
/* Read from NVRAM */
void*
/* Read from NVRAM */
void*
diff --git
a/board/bmw/flash.c
b/board/bmw/flash.c
index
4c7971a
..
0d0bc2f
100644
(file)
--- a/
board/bmw/flash.c
+++ b/
board/bmw/flash.c
@@
-32,14
+32,14
@@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-224,10
+224,10
@@
unsigned long flash_init (void)
&flash_info[0]);
#endif
&flash_info[0]);
#endif
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR)
flash_protect (FLAG_PROTECT_SET,
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/c2mon/flash.c
b/board/c2mon/flash.c
index
2a5e050
..
7cc5ef0
100644
(file)
--- a/
board/c2mon/flash.c
+++ b/
board/c2mon/flash.c
@@
-24,8
+24,8
@@
#include <common.h>
#include <mpc8xx.h>
#include <common.h>
#include <mpc8xx.h>
-#ifndef C
F
G_ENV_ADDR
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+#ifndef C
ONFI
G_ENV_ADDR
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
#endif
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#endif
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
@@
-98,8
+98,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE-1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
@@
-125,8
+125,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE-1,
&flash_info[1]);
#endif
} else {
&flash_info[1]);
#endif
} else {
diff --git
a/board/cerf250/flash.c
b/board/cerf250/flash.c
index
ba82892
..
3ff19bc
100644
(file)
--- a/
board/cerf250/flash.c
+++ b/
board/cerf250/flash.c
@@
-90,8
+90,8
@@
unsigned long flash_init (void)
&flash_info[0] );
flash_protect ( FLAG_PROTECT_SET,
&flash_info[0] );
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0] );
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0] );
return size;
}
return size;
}
diff --git
a/board/cmc_pu2/flash.c
b/board/cmc_pu2/flash.c
index
0419d76
..
8966399
100644
(file)
--- a/
board/cmc_pu2/flash.c
+++ b/
board/cmc_pu2/flash.c
@@
-29,8
+29,8
@@
#include <common.h>
#include <common.h>
-#ifndef C
F
G_ENV_ADDR
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+#ifndef C
ONFI
G_ENV_ADDR
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
#endif
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#endif
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
@@
-74,9
+74,9
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SIZE-1,
- flash_get_info(C
F
G_ENV_ADDR));
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE-1,
+ flash_get_info(C
ONFI
G_ENV_ADDR));
#endif
return size ? size : 1;
#endif
return size ? size : 1;
diff --git
a/board/cmi/cmi.c
b/board/cmi/cmi.c
index
8501cae
..
ee243db
100644
(file)
--- a/
board/cmi/cmi.c
+++ b/
board/cmi/cmi.c
@@
-70,4
+70,4
@@
phys_size_t initdram(int board_type)
/*
* Absolute environment address for linker file.
*/
/*
* Absolute environment address for linker file.
*/
-GEN_ABS(env_start, C
F
G_ENV_OFFSET + CFG_FLASH_BASE);
+GEN_ABS(env_start, C
ONFI
G_ENV_OFFSET + CFG_FLASH_BASE);
diff --git
a/board/cmi/flash.c
b/board/cmi/flash.c
index
aec6a8e
..
0d4582b
100644
(file)
--- a/
board/cmi/flash.c
+++ b/
board/cmi/flash.c
@@
-37,14
+37,14
@@
#include <mpc5xx.h>
#if defined(CONFIG_ENV_IS_IN_FLASH)
#include <mpc5xx.h>
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-113,8
+113,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SECT_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE-1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/cogent/flash.c
b/board/cogent/flash.c
index
fc3e5ff
..
942f33a
100644
(file)
--- a/
board/cogent/flash.c
+++ b/
board/cogent/flash.c
@@
-27,14
+27,14
@@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-330,8
+330,8
@@
flash_init(void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SECT_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE-1,
&flash_info[0]);
#endif
return total;
&flash_info[0]);
#endif
return total;
diff --git
a/board/cpc45/flash.c
b/board/cpc45/flash.c
index
db9a637
..
3826a54
100644
(file)
--- a/
board/cpc45/flash.c
+++ b/
board/cpc45/flash.c
@@
-26,14
+26,14
@@
#include <asm/processor.h>
#if defined(CONFIG_ENV_IS_IN_FLASH)
#include <asm/processor.h>
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-174,15
+174,15
@@
unsigned long flash_init (void)
&flash_info[0]);
#endif
&flash_info[0]);
#endif
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR)
-#if C
F
G_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR)
+#if C
ONFI
G_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE
flash_protect (FLAG_PROTECT_SET,
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[1]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[1]);
#else
flash_protect (FLAG_PROTECT_SET,
#else
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
#endif
#endif
#endif
#endif
diff --git
a/board/cpu86/flash.c
b/board/cpu86/flash.c
index
e6a14b0
..
845a3b2
100644
(file)
--- a/
board/cpu86/flash.c
+++ b/
board/cpu86/flash.c
@@
-230,20
+230,20
@@
unsigned long flash_init (void)
#endif
#endif
#endif
#endif
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR)
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR)
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# if C
F
G_ENV_ADDR >= CFG_BOOTROM_BASE
+# if C
ONFI
G_ENV_ADDR >= CFG_BOOTROM_BASE
if (size_b1) {
flash_protect (FLAG_PROTECT_SET,
if (size_b1) {
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[1]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[1]);
}
# else
flash_protect (FLAG_PROTECT_SET,
}
# else
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
# endif
#endif
# endif
#endif
diff --git
a/board/cpu87/flash.c
b/board/cpu87/flash.c
index
b96a30c
..
f7e121f
100644
(file)
--- a/
board/cpu87/flash.c
+++ b/
board/cpu87/flash.c
@@
-236,20
+236,20
@@
unsigned long flash_init (void)
#endif
#endif
#endif
#endif
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR)
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR)
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# if C
F
G_ENV_ADDR >= CFG_BOOTROM_BASE
+# if C
ONFI
G_ENV_ADDR >= CFG_BOOTROM_BASE
if (size_b1) {
flash_protect (FLAG_PROTECT_SET,
if (size_b1) {
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[1]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[1]);
}
# else
flash_protect (FLAG_PROTECT_SET,
}
# else
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
# endif
#endif
# endif
#endif
diff --git
a/board/cradle/flash.c
b/board/cradle/flash.c
index
f3f9a8c
..
4783d92
100644
(file)
--- a/
board/cradle/flash.c
+++ b/
board/cradle/flash.c
@@
-76,8
+76,8
@@
ulong flash_init (void)
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
return size;
}
return size;
}
diff --git
a/board/csb226/flash.c
b/board/csb226/flash.c
index
f6dfd96
..
2a60909
100644
(file)
--- a/
board/csb226/flash.c
+++ b/
board/csb226/flash.c
@@
-81,8
+81,8
@@
ulong flash_init(void)
&flash_info[0]);
flash_protect(FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
return size;
&flash_info[0]);
return size;
diff --git
a/board/cu824/flash.c
b/board/cu824/flash.c
index
5e55284
..
6fe2978
100644
(file)
--- a/
board/cu824/flash.c
+++ b/
board/cu824/flash.c
@@
-26,14
+26,14
@@
#include <asm/processor.h>
#if defined(CONFIG_ENV_IS_IN_FLASH)
#include <asm/processor.h>
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-135,16
+135,16
@@
unsigned long flash_init(void)
#endif
#endif
#endif
#endif
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR)
-#if C
F
G_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR)
+#if C
ONFI
G_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE
flash_protect(FLAG_PROTECT_SET,
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[1]);
#else
flash_protect(FLAG_PROTECT_SET,
&flash_info[1]);
#else
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
#endif
#endif
&flash_info[0]);
#endif
#endif
diff --git
a/board/dnp1110/flash.c
b/board/dnp1110/flash.c
index
60874ba
..
84b820a
100644
(file)
--- a/
board/dnp1110/flash.c
+++ b/
board/dnp1110/flash.c
@@
-88,8
+88,8
@@
unsigned long flash_init (void)
&flash_info[0]);
flash_protect(FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
return size;
&flash_info[0]);
return size;
diff --git
a/board/eltec/elppc/misc.c
b/board/eltec/elppc/misc.c
index
5fb20ae
..
5e3a81c
100644
(file)
--- a/
board/eltec/elppc/misc.c
+++ b/
board/eltec/elppc/misc.c
@@
-42,7
+42,7
@@
extern int read_eeprom (struct eth_device *dev, int location, int addr_len);
void *nvram_read (void *dest, const long src, size_t count)
{
uchar *d = (uchar *) dest;
void *nvram_read (void *dest, const long src, size_t count)
{
uchar *d = (uchar *) dest;
- uchar *s = (uchar *) (C
F
G_ENV_MAP_ADRS + src);
+ uchar *s = (uchar *) (C
ONFI
G_ENV_MAP_ADRS + src);
while (count--)
*d++ = *s++;
while (count--)
*d++ = *s++;
@@
-52,7
+52,7
@@
void *nvram_read (void *dest, const long src, size_t count)
void nvram_write (long dest, const void *src, size_t count)
{
void nvram_write (long dest, const void *src, size_t count)
{
- uchar *d = (uchar *) (C
F
G_ENV_MAP_ADRS + dest);
+ uchar *d = (uchar *) (C
ONFI
G_ENV_MAP_ADRS + dest);
uchar *s = (uchar *) src;
while (count--)
uchar *s = (uchar *) src;
while (count--)
diff --git
a/board/emk/common/flash.c
b/board/emk/common/flash.c
index
0e8d337
..
04c35bc
100644
(file)
--- a/
board/emk/common/flash.c
+++ b/
board/emk/common/flash.c
@@
-116,9
+116,9
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SIZE-1,
- flash_get_info(C
F
G_ENV_ADDR));
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE-1,
+ flash_get_info(C
ONFI
G_ENV_ADDR));
#endif
#endif
diff --git
a/board/ep7312/flash.c
b/board/ep7312/flash.c
index
272a9e5
..
1ef06f8
100644
(file)
--- a/
board/ep7312/flash.c
+++ b/
board/ep7312/flash.c
@@
-65,8
+65,8
@@
ulong flash_init (void)
&flash_info[0]);
flash_protect ( FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
return size;
}
return size;
}
diff --git
a/board/ep8260/flash.c
b/board/ep8260/flash.c
index
8d99640
..
d32486d
100644
(file)
--- a/
board/ep8260/flash.c
+++ b/
board/ep8260/flash.c
@@
-157,13
+157,13
@@
unsigned long flash_init (void)
&flash_info[0]);
#endif
&flash_info[0]);
#endif
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR)
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR)
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
flash_protect(FLAG_PROTECT_SET,
# endif
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/esd/cpci405/cpci405.c
b/board/esd/cpci405/cpci405.c
index
005871c
..
fb34957
100644
(file)
--- a/
board/esd/cpci405/cpci405.c
+++ b/
board/esd/cpci405/cpci405.c
@@
-691,7
+691,7
@@
U_BOOT_CMD(
);
#define CFG_I2C_EEPROM_ADDR_2 0x51 /* EEPROM CAT28WC32 */
);
#define CFG_I2C_EEPROM_ADDR_2 0x51 /* EEPROM CAT28WC32 */
-#define C
FG_ENV_SIZE_2
0x800 /* 2048 bytes may be used for env vars*/
+#define C
ONFIG_ENV_SIZE_2
0x800 /* 2048 bytes may be used for env vars*/
/*
* Write backplane ip-address...
/*
* Write backplane ip-address...
@@
-705,11
+705,11
@@
int do_get_bpip(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
char *ptr;
IPaddr_t ipaddr;
char *ptr;
IPaddr_t ipaddr;
- buf = malloc(C
F
G_ENV_SIZE_2);
- if (eeprom_read(CFG_I2C_EEPROM_ADDR_2, 0, (uchar *)buf, C
F
G_ENV_SIZE_2)) {
+ buf = malloc(C
ONFI
G_ENV_SIZE_2);
+ if (eeprom_read(CFG_I2C_EEPROM_ADDR_2, 0, (uchar *)buf, C
ONFI
G_ENV_SIZE_2)) {
puts("\nError reading backplane EEPROM!\n");
} else {
puts("\nError reading backplane EEPROM!\n");
} else {
- crc = crc32(0, (uchar *)(buf+4), C
F
G_ENV_SIZE_2-4);
+ crc = crc32(0, (uchar *)(buf+4), C
ONFI
G_ENV_SIZE_2-4);
if (crc != *(ulong *)buf) {
printf("ERROR: crc mismatch %08lx %08lx\n", crc, *(ulong *)buf);
return -1;
if (crc != *(ulong *)buf) {
printf("ERROR: crc mismatch %08lx %08lx\n", crc, *(ulong *)buf);
return -1;
@@
-764,14
+764,14
@@
int do_set_bpip(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
}
printf("Setting bp_ip to %s\n", argv[1]);
}
printf("Setting bp_ip to %s\n", argv[1]);
- buf = malloc(C
F
G_ENV_SIZE_2);
- memset(buf, 0, C
F
G_ENV_SIZE_2);
+ buf = malloc(C
ONFI
G_ENV_SIZE_2);
+ memset(buf, 0, C
ONFI
G_ENV_SIZE_2);
sprintf(str, "bp_ip=%s", argv[1]);
strcpy(buf+4, str);
sprintf(str, "bp_ip=%s", argv[1]);
strcpy(buf+4, str);
- crc = crc32(0, (uchar *)(buf+4), C
F
G_ENV_SIZE_2-4);
+ crc = crc32(0, (uchar *)(buf+4), C
ONFI
G_ENV_SIZE_2-4);
*(ulong *)buf = crc;
*(ulong *)buf = crc;
- if (eeprom_write(CFG_I2C_EEPROM_ADDR_2, 0, (uchar *)buf, C
F
G_ENV_SIZE_2)) {
+ if (eeprom_write(CFG_I2C_EEPROM_ADDR_2, 0, (uchar *)buf, C
ONFI
G_ENV_SIZE_2)) {
puts("\nError writing backplane EEPROM!\n");
}
puts("\nError writing backplane EEPROM!\n");
}
diff --git
a/board/esd/pf5200/flash.c
b/board/esd/pf5200/flash.c
index
55419ee
..
8178b56
100644
(file)
--- a/
board/esd/pf5200/flash.c
+++ b/
board/esd/pf5200/flash.c
@@
-78,9
+78,9
@@
unsigned long flash_init(void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
- flash_protect(FLAG_PROTECT_SET, C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
- flash_get_info(C
F
G_ENV_ADDR));
+ flash_protect(FLAG_PROTECT_SET, C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
+ flash_get_info(C
ONFI
G_ENV_ADDR));
#endif
flash_afterinit(i, flash_info[i].start[0], flash_info[i].size);
#endif
flash_afterinit(i, flash_info[i].start[0], flash_info[i].size);
diff --git
a/board/esd/pmc440/cmd_pmc440.c
b/board/esd/pmc440/cmd_pmc440.c
index
ca5c177
..
74cf4c3
100644
(file)
--- a/
board/esd/pmc440/cmd_pmc440.c
+++ b/
board/esd/pmc440/cmd_pmc440.c
@@
-363,11
+363,11
@@
int do_painit(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
printf("PARAM: @%08x\n", param);
memset((void*)param, 0, (pram << 10));
printf("PARAM: @%08x\n", param);
memset((void*)param, 0, (pram << 10));
- env_base = memsize - 4096 - ((C
F
G_ENV_SIZE + 4096) & ~(4096-1));
- memcpy((void*)env_base, env_ptr, C
F
G_ENV_SIZE);
+ env_base = memsize - 4096 - ((C
ONFI
G_ENV_SIZE + 4096) & ~(4096-1));
+ memcpy((void*)env_base, env_ptr, C
ONFI
G_ENV_SIZE);
lptr = (ulong*)memsize;
lptr = (ulong*)memsize;
- *(--lptr) = C
F
G_ENV_SIZE;
+ *(--lptr) = C
ONFI
G_ENV_SIZE;
*(--lptr) = memsize - env_base;
*(--lptr) = crc32(0, (void*)(memsize - 0x08), 0x08);
*(--lptr) = 0;
*(--lptr) = memsize - env_base;
*(--lptr) = crc32(0, (void*)(memsize - 0x08), 0x08);
*(--lptr) = 0;
diff --git
a/board/esd/pmc440/pmc440.c
b/board/esd/pmc440/pmc440.c
index
7c8fa74
..
85ef26f
100644
(file)
--- a/
board/esd/pmc440/pmc440.c
+++ b/
board/esd/pmc440/pmc440.c
@@
-248,8
+248,8
@@
int misc_init_r(void)
/* Env protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
/* Env protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + 2*CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + 2*CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/etin/debris/debris.c
b/board/etin/debris/debris.c
index
3fcf78e
..
a5d394c
100644
(file)
--- a/
board/etin/debris/debris.c
+++ b/
board/etin/debris/debris.c
@@
-174,7
+174,7
@@
void nvram_write(long dest, const void *src, size_t count)
int misc_init_r(void)
{
/* Write ethernet addr in NVRAM for VxWorks */
int misc_init_r(void)
{
/* Write ethernet addr in NVRAM for VxWorks */
- nvram_write(C
F
G_ENV_ADDR + CFG_NVRAM_VXWORKS_OFFS,
+ nvram_write(C
ONFI
G_ENV_ADDR + CFG_NVRAM_VXWORKS_OFFS,
(char*)&gd->bd->bi_enetaddr[0], 6);
return 0;
}
(char*)&gd->bd->bi_enetaddr[0], 6);
return 0;
}
diff --git
a/board/evb4510/flash.c
b/board/evb4510/flash.c
index
aff92f9
..
bcefafc
100644
(file)
--- a/
board/evb4510/flash.c
+++ b/
board/evb4510/flash.c
@@
-399,7
+399,7
@@
unsigned long flash_init (void)
amd160base, amd160base + monitor_flash_len - 1, info);
flash_protect (FLAG_PROTECT_SET,
amd160base, amd160base + monitor_flash_len - 1, info);
flash_protect (FLAG_PROTECT_SET,
- C
FG_ENV_ADDR, CFG_ENV_ADDR + CF
G_ENV_SIZE - 1, info);
+ C
ONFIG_ENV_ADDR, CONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, info);
#if CFG_MAX_FLASH_BANKS == 2
/* Configure AMD Am29LV040B (512KB) */
#if CFG_MAX_FLASH_BANKS == 2
/* Configure AMD Am29LV040B (512KB) */
diff --git
a/board/evb64260/flash.c
b/board/evb64260/flash.c
index
1691e10
..
f2d5390
100644
(file)
--- a/
board/evb64260/flash.c
+++ b/
board/evb64260/flash.c
@@
-122,9
+122,9
@@
flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
- flash_get_info(C
F
G_ENV_ADDR));
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
+ flash_get_info(C
ONFI
G_ENV_ADDR));
#endif
flash_size = size_b0 + size_b1;
#endif
flash_size = size_b0 + size_b1;
diff --git
a/board/exbitgen/flash.c
b/board/exbitgen/flash.c
index
4d83fd5
..
745fba2
100644
(file)
--- a/
board/exbitgen/flash.c
+++ b/
board/exbitgen/flash.c
@@
-126,10
+126,10
@@
unsigned long flash_init (void)
#endif
#endif
#endif
#endif
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR)
flash_protect(FLAG_PROTECT_SET,
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/fads/fads.h
b/board/fads/fads.h
index
63b1e62
..
23310a4
100644
(file)
--- a/
board/fads/fads.h
+++ b/
board/fads/fads.h
@@
-227,9
+227,9
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SECT_SIZE
0x40000 /* see README - env sector total size */
-#define C
FG_ENV_OFFSET CF
G_ENV_SECT_SIZE
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment */
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* see README - env sector total size */
+#define C
ONFIG_ENV_OFFSET CONFI
G_ENV_SECT_SIZE
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_DIRECT_FLASH_TFTP
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_DIRECT_FLASH_TFTP
diff --git
a/board/fads/flash.c
b/board/fads/flash.c
index
742a889
..
cd0e4d5
100644
(file)
--- a/
board/fads/flash.c
+++ b/
board/fads/flash.c
@@
-27,14
+27,14
@@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-126,10
+126,10
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
- if (C
F
G_ENV_ADDR >= flash_info[i].start[0])
+ if (C
ONFI
G_ENV_ADDR >= flash_info[i].start[0])
flash_protect (FLAG_PROTECT_SET,
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[i]);
#endif
}
&flash_info[i]);
#endif
}
diff --git
a/board/flagadm/flash.c
b/board/flagadm/flash.c
index
3303707
..
aa8b0f9
100644
(file)
--- a/
board/flagadm/flash.c
+++ b/
board/flagadm/flash.c
@@
-84,8
+84,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_OFFSET,
- C
FG_ENV_OFFSET+CF
G_ENV_SIZE-1,
+ C
ONFI
G_ENV_OFFSET,
+ C
ONFIG_ENV_OFFSET+CONFI
G_ENV_SIZE-1,
&flash_info[0]);
#endif
return (flash_info[0].size);
&flash_info[0]);
#endif
return (flash_info[0].size);
diff --git
a/board/freescale/mpc8260ads/flash.c
b/board/freescale/mpc8260ads/flash.c
index
5f80f26
..
7fcc874
100644
(file)
--- a/
board/freescale/mpc8260ads/flash.c
+++ b/
board/freescale/mpc8260ads/flash.c
@@
-158,8
+158,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SECT_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE-1,
&flash_info[0]);
#endif
return (size);
&flash_info[0]);
#endif
return (size);
diff --git
a/board/freescale/mpc8266ads/flash.c
b/board/freescale/mpc8266ads/flash.c
index
aa533e4
..
b4cdcd9
100644
(file)
--- a/
board/freescale/mpc8266ads/flash.c
+++ b/
board/freescale/mpc8266ads/flash.c
@@
-32,14
+32,14
@@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-108,8
+108,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SECT_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE-1,
&flash_info[0]);
#endif
return (size);
&flash_info[0]);
#endif
return (size);
diff --git
a/board/funkwerk/vovpn-gw/flash.c
b/board/funkwerk/vovpn-gw/flash.c
index
935adfa
..
0308611
100644
(file)
--- a/
board/funkwerk/vovpn-gw/flash.c
+++ b/
board/funkwerk/vovpn-gw/flash.c
@@
-153,8
+153,8
@@
flash_init(void)
#endif
#ifdef CONFIG_ENV_IS_IN_FLASH
flash_protect(FLAG_PROTECT_SET,
#endif
#ifdef CONFIG_ENV_IS_IN_FLASH
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SECT_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE-1,
&flash_info[0]);
#endif
return (size);
&flash_info[0]);
#endif
return (size);
diff --git
a/board/gcplus/flash.c
b/board/gcplus/flash.c
index
36d7363
..
48f33b2
100644
(file)
--- a/
board/gcplus/flash.c
+++ b/
board/gcplus/flash.c
@@
-87,8
+87,8
@@
flash_init(void)
CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]);
flash_protect(FLAG_PROTECT_SET,
CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]);
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
return size;
}
return size;
}
diff --git
a/board/gen860t/flash.c
b/board/gen860t/flash.c
index
c558014
..
a46e7e6
100644
(file)
--- a/
board/gen860t/flash.c
+++ b/
board/gen860t/flash.c
@@
-26,14
+26,14
@@
#include <mpc8xx.h>
#if defined(CONFIG_ENV_IS_IN_FLASH)
#include <mpc8xx.h>
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-166,8
+166,8
@@
flash_init (void)
* Environment protection ON by default
*/
flash_protect(FLAG_PROTECT_SET,
* Environment protection ON by default
*/
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/gw8260/flash.c
b/board/gw8260/flash.c
index
e4b596b
..
6cf311f
100644
(file)
--- a/
board/gw8260/flash.c
+++ b/
board/gw8260/flash.c
@@
-100,13
+100,13
@@
unsigned long flash_init (void)
&flash_info[0]);
#endif
&flash_info[0]);
#endif
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR)
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR)
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
flash_protect(FLAG_PROTECT_SET,
# endif
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/hidden_dragon/flash.c
b/board/hidden_dragon/flash.c
index
5fb9578
..
10293b4
100644
(file)
--- a/
board/hidden_dragon/flash.c
+++ b/
board/hidden_dragon/flash.c
@@
-36,14
+36,14
@@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-212,10
+212,10
@@
unsigned long flash_init (void)
&flash_info[0]);
#endif
&flash_info[0]);
#endif
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR)
flash_protect (FLAG_PROTECT_SET,
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/icecube/flash.c
b/board/icecube/flash.c
index
e6cf92e
..
0aa78eb
100644
(file)
--- a/
board/icecube/flash.c
+++ b/
board/icecube/flash.c
@@
-91,9
+91,9
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SIZE-1,
- flash_get_info(C
F
G_ENV_ADDR));
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE-1,
+ flash_get_info(C
ONFI
G_ENV_ADDR));
#endif
#endif
diff --git
a/board/icu862/flash.c
b/board/icu862/flash.c
index
625d1a8
..
e6382f5
100644
(file)
--- a/
board/icu862/flash.c
+++ b/
board/icu862/flash.c
@@
-27,14
+27,14
@@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-111,8
+111,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE-1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/ids8247/flash.c
b/board/ids8247/flash.c
index
522fafe
..
5800ce2
100644
(file)
--- a/
board/ids8247/flash.c
+++ b/
board/ids8247/flash.c
@@
-34,14
+34,14
@@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-116,8
+116,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect (FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/impa7/flash.c
b/board/impa7/flash.c
index
ca76fe8
..
1dea22b
100644
(file)
--- a/
board/impa7/flash.c
+++ b/
board/impa7/flash.c
@@
-74,8
+74,8
@@
ulong flash_init (void)
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
return size;
}
return size;
}
diff --git
a/board/incaip/flash.c
b/board/incaip/flash.c
index
b510e90
..
74dd6fe
100644
(file)
--- a/
board/incaip/flash.c
+++ b/
board/incaip/flash.c
@@
-107,9
+107,9
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SIZE-1,
- flash_get_info(C
F
G_ENV_ADDR));
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE-1,
+ flash_get_info(C
ONFI
G_ENV_ADDR));
#endif
#endif
diff --git
a/board/innokom/flash.c
b/board/innokom/flash.c
index
2d773b1
..
7f17ba6
100644
(file)
--- a/
board/innokom/flash.c
+++ b/
board/innokom/flash.c
@@
-116,8
+116,8
@@
ulong flash_init(void)
#ifdef CONFIG_ENV_IS_IN_FLASH
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/integratorcp/flash.c
b/board/integratorcp/flash.c
index
2a4256a
..
7effea6
100644
(file)
--- a/
board/integratorcp/flash.c
+++ b/
board/integratorcp/flash.c
@@
-128,8
+128,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/ip860/flash.c
b/board/ip860/flash.c
index
6bf4d8d
..
10a96c5
100644
(file)
--- a/
board/ip860/flash.c
+++ b/
board/ip860/flash.c
@@
-27,14
+27,14
@@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-97,8
+97,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SECT_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE-1,
&flash_info[0]);
#endif
return (size);
&flash_info[0]);
#endif
return (size);
diff --git
a/board/iphase4539/flash.c
b/board/iphase4539/flash.c
index
f8ab51a
..
098dcc2
100644
(file)
--- a/
board/iphase4539/flash.c
+++ b/
board/iphase4539/flash.c
@@
-78,8
+78,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
flash_info + bank);
#endif
flash_info + bank);
#endif
diff --git
a/board/ivm/flash.c
b/board/ivm/flash.c
index
f911fdb
..
29821ba
100644
(file)
--- a/
board/ivm/flash.c
+++ b/
board/ivm/flash.c
@@
-27,14
+27,14
@@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-94,8
+94,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SECT_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE-1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/ixdp425/flash.c
b/board/ixdp425/flash.c
index
704dea8
..
0bae9e0
100644
(file)
--- a/
board/ixdp425/flash.c
+++ b/
board/ixdp425/flash.c
@@
-86,8
+86,8
@@
unsigned long flash_init (void)
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
return size;
}
return size;
}
diff --git
a/board/korat/korat.c
b/board/korat/korat.c
index
0d90fb3
..
8787e23
100644
(file)
--- a/
board/korat/korat.c
+++ b/
board/korat/korat.c
@@
-71,7
+71,7
@@
int board_early_init_f(void)
if (gpio_read_in_bit(CFG_GPIO_RESET_PRESSED_)) {
/* This call does not return. */
korat_branch_absolute(
if (gpio_read_in_bit(CFG_GPIO_RESET_PRESSED_)) {
/* This call does not return. */
korat_branch_absolute(
- CFG_FLASH1_TOP - 2 * C
F
G_ENV_SECT_SIZE - 4);
+ CFG_FLASH1_TOP - 2 * C
ONFI
G_ENV_SECT_SIZE - 4);
}
}
korat_buzzer(1);
}
}
korat_buzzer(1);
@@
-375,7
+375,7
@@
int misc_init_r(void)
* environment
*/
gd->bd->bi_flashoffset =
* environment
*/
gd->bd->bi_flashoffset =
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SECT_SIZE - CFG_FLASH1_ADDR;
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SECT_SIZE - CFG_FLASH1_ADDR;
mtdcr(ebccfga, pb1cr);
pbcr = mfdcr(ebccfgd);
mtdcr(ebccfga, pb1cr);
pbcr = mfdcr(ebccfgd);
@@
-395,11
+395,11
@@
int misc_init_r(void)
flash_info);
#endif
/* Env protection ON by default */
flash_info);
#endif
/* Env protection ON by default */
- (void)flash_protect(FLAG_PROTECT_SET, C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ (void)flash_protect(FLAG_PROTECT_SET, C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
flash_info);
flash_info);
- (void)flash_protect(FLAG_PROTECT_SET, C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SECT_SIZE - 1,
+ (void)flash_protect(FLAG_PROTECT_SET, C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SECT_SIZE - 1,
flash_info);
/*
flash_info);
/*
diff --git
a/board/kup/common/flash.c
b/board/kup/common/flash.c
index
50bf543
..
7688ce2
100644
(file)
--- a/
board/kup/common/flash.c
+++ b/
board/kup/common/flash.c
@@
-24,8
+24,8
@@
#include <common.h>
#include <mpc8xx.h>
#include <common.h>
#include <mpc8xx.h>
-#ifndef C
F
G_ENV_ADDR
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+#ifndef C
ONFI
G_ENV_ADDR
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
#endif
#define CONFIG_FLASH_16BIT
#endif
#define CONFIG_FLASH_16BIT
@@
-81,8
+81,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE-1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/lantec/flash.c
b/board/lantec/flash.c
index
ddf680a
..
e08da33
100644
(file)
--- a/
board/lantec/flash.c
+++ b/
board/lantec/flash.c
@@
-30,14
+30,14
@@
#include <mpc8xx.h>
#if defined(CONFIG_ENV_IS_IN_FLASH)
#include <mpc8xx.h>
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-141,8
+141,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SECT_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE-1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
@@
-173,8
+173,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SECT_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE-1,
&flash_info[1]);
#endif
} else {
&flash_info[1]);
#endif
} else {
diff --git
a/board/lart/flash.c
b/board/lart/flash.c
index
28c4531
..
4326d07
100644
(file)
--- a/
board/lart/flash.c
+++ b/
board/lart/flash.c
@@
-109,8
+109,8
@@
ulong flash_init(void)
&flash_info[0]);
flash_protect(FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
return size;
&flash_info[0]);
return size;
diff --git
a/board/logodl/flash.c
b/board/logodl/flash.c
index
0807b80
..
4d9c118
100644
(file)
--- a/
board/logodl/flash.c
+++ b/
board/logodl/flash.c
@@
-109,8
+109,8
@@
ulong flash_init(void)
&flash_info[0]);
flash_protect(FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
return size;
&flash_info[0]);
return size;
diff --git
a/board/lpc2292sodimm/flash.c
b/board/lpc2292sodimm/flash.c
index
0fb0843
..
449a768
100644
(file)
--- a/
board/lpc2292sodimm/flash.c
+++ b/
board/lpc2292sodimm/flash.c
@@
-97,8
+97,8
@@
ulong flash_init (void)
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
return size;
&flash_info[0]);
return size;
diff --git
a/board/lpd7a40x/flash.c
b/board/lpd7a40x/flash.c
index
d18720e
..
ec43807
100644
(file)
--- a/
board/lpd7a40x/flash.c
+++ b/
board/lpd7a40x/flash.c
@@
-97,13
+97,13
@@
ulong flash_init (void)
&flash_info[0]);
flash_protect ( FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
-#ifdef C
F
G_ENV_ADDR_REDUND
+#ifdef C
ONFI
G_ENV_ADDR_REDUND
flash_protect ( FLAG_PROTECT_SET,
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SIZE_REDUND - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SIZE_REDUND - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/lubbock/flash.c
b/board/lubbock/flash.c
index
ba82892
..
3ff19bc
100644
(file)
--- a/
board/lubbock/flash.c
+++ b/
board/lubbock/flash.c
@@
-90,8
+90,8
@@
unsigned long flash_init (void)
&flash_info[0] );
flash_protect ( FLAG_PROTECT_SET,
&flash_info[0] );
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0] );
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0] );
return size;
}
return size;
}
diff --git
a/board/lwmon/flash.c
b/board/lwmon/flash.c
index
7e4acc2
..
8d98545
100644
(file)
--- a/
board/lwmon/flash.c
+++ b/
board/lwmon/flash.c
@@
-27,14
+27,14
@@
#include <mpc8xx.h>
#if defined(CONFIG_ENV_IS_IN_FLASH)
#include <mpc8xx.h>
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-133,8
+133,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SECT_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE-1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
@@
-166,8
+166,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SECT_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE-1,
&flash_info[1]);
#endif
} else {
&flash_info[1]);
#endif
} else {
diff --git
a/board/lwmon5/lwmon5.c
b/board/lwmon5/lwmon5.c
index
85795b7
..
8975bfd
100644
(file)
--- a/
board/lwmon5/lwmon5.c
+++ b/
board/lwmon5/lwmon5.c
@@
-200,8
+200,8
@@
int misc_init_r(void)
/* Env protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
/* Env protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + 2*CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + 2*CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[1]);
/*
&flash_info[1]);
/*
diff --git
a/board/mcc200/mcc200.c
b/board/mcc200/mcc200.c
index
4444650
..
65b8184
100644
(file)
--- a/
board/mcc200/mcc200.c
+++ b/
board/mcc200/mcc200.c
@@
-263,14
+263,14
@@
int misc_init_r (void)
/* Environment protection ON by default */
flash_protect (FLAG_PROTECT_SET,
/* Environment protection ON by default */
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
/* Redundant environment protection ON by default */
flash_protect (FLAG_PROTECT_SET,
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
/* Redundant environment protection ON by default */
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SIZE_REDUND - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SIZE_REDUND - 1,
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
}
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
}
diff --git
a/board/modnet50/flash.c
b/board/modnet50/flash.c
index
a50639e
..
fb12e03
100644
(file)
--- a/
board/modnet50/flash.c
+++ b/
board/modnet50/flash.c
@@
-181,8
+181,8
@@
ulong flash_init (void)
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
return size;
}
return size;
}
diff --git
a/board/mp2usb/flash.c
b/board/mp2usb/flash.c
index
c19d445
..
527e74e
100644
(file)
--- a/
board/mp2usb/flash.c
+++ b/
board/mp2usb/flash.c
@@
-98,8
+98,8
@@
unsigned long flash_init (void)
&flash_info[0] );
flash_protect ( FLAG_PROTECT_SET,
&flash_info[0] );
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0] );
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0] );
return size;
}
return size;
}
diff --git
a/board/mpc8540eval/flash.c
b/board/mpc8540eval/flash.c
index
b129602
..
98fd168
100644
(file)
--- a/
board/mpc8540eval/flash.c
+++ b/
board/mpc8540eval/flash.c
@@
-36,14
+36,14
@@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-106,8
+106,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SECT_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE-1,
&flash_info[0]);
#endif
#endif
&flash_info[0]);
#endif
#endif
diff --git
a/board/mpl/common/common_util.c
b/board/mpl/common/common_util.c
index
1f9a772
..
8454420
100644
(file)
--- a/
board/mpl/common/common_util.c
+++ b/
board/mpl/common/common_util.c
@@
-309,7
+309,7
@@
void clear_env_values(void)
memset(&back,0xff,sizeof(backup_t));
memset(env_crc,0x00,4);
i2c_write(CFG_DEF_EEPROM_ADDR,I2C_BACKUP_ADDR,2,(void *)&back,sizeof(backup_t));
memset(&back,0xff,sizeof(backup_t));
memset(env_crc,0x00,4);
i2c_write(CFG_DEF_EEPROM_ADDR,I2C_BACKUP_ADDR,2,(void *)&back,sizeof(backup_t));
- i2c_write(CFG_DEF_EEPROM_ADDR,C
F
G_ENV_OFFSET,2,(void *)env_crc,4);
+ i2c_write(CFG_DEF_EEPROM_ADDR,C
ONFI
G_ENV_OFFSET,2,(void *)env_crc,4);
}
/*
}
/*
@@
-323,7
+323,7
@@
int check_env_old_size(ulong oldsize)
/* read old CRC */
eeprom_read (CFG_DEF_EEPROM_ADDR,
/* read old CRC */
eeprom_read (CFG_DEF_EEPROM_ADDR,
- C
F
G_ENV_OFFSET,
+ C
ONFI
G_ENV_OFFSET,
(uchar *)&crc, sizeof(ulong));
new = 0;
(uchar *)&crc, sizeof(ulong));
new = 0;
@@
-333,7
+333,7
@@
int check_env_old_size(ulong oldsize)
while (len > 0) {
int n = (len > sizeof(buf)) ? sizeof(buf) : len;
while (len > 0) {
int n = (len > sizeof(buf)) ? sizeof(buf) : len;
- eeprom_read (CFG_DEF_EEPROM_ADDR, C
F
G_ENV_OFFSET+off, buf, n);
+ eeprom_read (CFG_DEF_EEPROM_ADDR, C
ONFI
G_ENV_OFFSET+off, buf, n);
new = crc32 (new, buf, n);
len -= n;
off += n;
new = crc32 (new, buf, n);
len -= n;
off += n;
@@
-362,7
+362,7
@@
void copy_old_env(ulong size)
len=size;
off = sizeof(long);
while (len > off) {
len=size;
off = sizeof(long);
while (len > off) {
- eeprom_read (CFG_DEF_EEPROM_ADDR, C
F
G_ENV_OFFSET+off, &c, 1);
+ eeprom_read (CFG_DEF_EEPROM_ADDR, C
ONFI
G_ENV_OFFSET+off, &c, 1);
if(c != '=') {
*name++=c;
off++;
if(c != '=') {
*name++=c;
off++;
@@
-371,7
+371,7
@@
void copy_old_env(ulong size)
*name++='\0';
off++;
do {
*name++='\0';
off++;
do {
- eeprom_read (CFG_DEF_EEPROM_ADDR, C
F
G_ENV_OFFSET+off, &c, 1);
+ eeprom_read (CFG_DEF_EEPROM_ADDR, C
ONFI
G_ENV_OFFSET+off, &c, 1);
*value++=c;
off++;
if(c == '\0')
*value++=c;
off++;
if(c == '\0')
diff --git
a/board/mpl/common/flash.c
b/board/mpl/common/flash.c
index
a2e0244
..
b2d4f6f
100644
(file)
--- a/
board/mpl/common/flash.c
+++ b/
board/mpl/common/flash.c
@@
-259,8
+259,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SECT_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE-1,
&flash_info[0]);
#endif
#endif /* #if !defined(CONFIG_PATI) */
&flash_info[0]);
#endif
#endif /* #if !defined(CONFIG_PATI) */
diff --git
a/board/mpl/pati/pati.c
b/board/mpl/pati/pati.c
index
475741d
..
0883c42
100644
(file)
--- a/
board/mpl/pati/pati.c
+++ b/
board/mpl/pati/pati.c
@@
-615,4
+615,4
@@
void pci_con_disc(void)
/*
* Absolute environment address for linker file.
*/
/*
* Absolute environment address for linker file.
*/
-GEN_ABS(env_start, C
F
G_ENV_OFFSET + CFG_FLASH_BASE);
+GEN_ABS(env_start, C
ONFI
G_ENV_OFFSET + CFG_FLASH_BASE);
diff --git
a/board/mpl/vcma9/flash.c
b/board/mpl/vcma9/flash.c
index
d15a191
..
3895263
100644
(file)
--- a/
board/mpl/vcma9/flash.c
+++ b/
board/mpl/vcma9/flash.c
@@
-116,8
+116,8
@@
ulong flash_init (void)
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
return size;
}
return size;
}
diff --git
a/board/musenki/flash.c
b/board/musenki/flash.c
index
df7bbc5
..
46035d7
100644
(file)
--- a/
board/musenki/flash.c
+++ b/
board/musenki/flash.c
@@
-25,14
+25,14
@@
#include <mpc824x.h>
#if defined(CONFIG_ENV_IS_IN_FLASH)
#include <mpc824x.h>
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-155,10
+155,10
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
- DEBUGF("protect environtment %x @ %x\n", C
FG_ENV_ADDR, CF
G_ENV_SECT_SIZE);
+ DEBUGF("protect environtment %x @ %x\n", C
ONFIG_ENV_ADDR, CONFI
G_ENV_SECT_SIZE);
flash_protect(FLAG_PROTECT_SET,
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SECT_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE-1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
@@
-177,8
+177,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SECT_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE-1,
&flash_info[1]);
#endif
} else {
&flash_info[1]);
#endif
} else {
diff --git
a/board/mx1ads/syncflash.c
b/board/mx1ads/syncflash.c
index
fae9fbb
..
0ffc378
100644
(file)
--- a/
board/mx1ads/syncflash.c
+++ b/
board/mx1ads/syncflash.c
@@
-183,8
+183,8
@@
ulong flash_init(void) {
&flash_info[0]);
flash_protect(FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
return FLASH_BANK_SIZE;
&flash_info[0]);
return FLASH_BANK_SIZE;
diff --git
a/board/mx1fs2/flash.c
b/board/mx1fs2/flash.c
index
73ce895
..
8be0f49
100644
(file)
--- a/
board/mx1fs2/flash.c
+++ b/
board/mx1fs2/flash.c
@@
-106,8
+106,8
@@
flash_init(void)
&flash_info[0]);
flash_protect(FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
return size;
}
return size;
}
diff --git
a/board/nc650/flash.c
b/board/nc650/flash.c
index
a7fc084
..
d23e976
100644
(file)
--- a/
board/nc650/flash.c
+++ b/
board/nc650/flash.c
@@
-42,14
+42,14
@@
DECLARE_GLOBAL_DATA_PTR;
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-174,8
+174,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect (FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/netphone/flash.c
b/board/netphone/flash.c
index
0c81140
..
cf0bc09
100644
(file)
--- a/
board/netphone/flash.c
+++ b/
board/netphone/flash.c
@@
-72,14
+72,14
@@
unsigned long flash_init(void)
&flash_info[0]);
flash_protect ( FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
&flash_info[0]);
-#ifdef C
F
G_ENV_ADDR_REDUND
+#ifdef C
ONFI
G_ENV_ADDR_REDUND
flash_protect ( FLAG_PROTECT_SET,
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SIZE_REDUND - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SIZE_REDUND - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/netstal/hcu5/hcu5.c
b/board/netstal/hcu5/hcu5.c
index
41fa204
..
f3428c2
100644
(file)
--- a/
board/netstal/hcu5/hcu5.c
+++ b/
board/netstal/hcu5/hcu5.c
@@
-247,11
+247,11
@@
int misc_init_r(void)
0xffffffff,
&flash_info[0]);
0xffffffff,
&flash_info[0]);
-#ifdef C
F
G_ENV_ADDR_REDUND
+#ifdef C
ONFI
G_ENV_ADDR_REDUND
/* Env protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
/* Env protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + 2*CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + 2*CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[0]);
#endif
#endif
&flash_info[0]);
#endif
#endif
diff --git
a/board/netta/flash.c
b/board/netta/flash.c
index
ca3e061
..
531204c
100644
(file)
--- a/
board/netta/flash.c
+++ b/
board/netta/flash.c
@@
-68,14
+68,14
@@
unsigned long flash_init(void)
&flash_info[0]);
flash_protect ( FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
&flash_info[0]);
-#ifdef C
F
G_ENV_ADDR_REDUND
+#ifdef C
ONFI
G_ENV_ADDR_REDUND
flash_protect ( FLAG_PROTECT_SET,
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SIZE_REDUND - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SIZE_REDUND - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/netta2/flash.c
b/board/netta2/flash.c
index
a1c87f5
..
cefff71
100644
(file)
--- a/
board/netta2/flash.c
+++ b/
board/netta2/flash.c
@@
-69,14
+69,14
@@
unsigned long flash_init(void)
&flash_info[0]);
flash_protect ( FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
&flash_info[0]);
-#ifdef C
F
G_ENV_ADDR_REDUND
+#ifdef C
ONFI
G_ENV_ADDR_REDUND
flash_protect ( FLAG_PROTECT_SET,
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SIZE_REDUND - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SIZE_REDUND - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/netvia/flash.c
b/board/netvia/flash.c
index
d31f770
..
647f594
100644
(file)
--- a/
board/netvia/flash.c
+++ b/
board/netvia/flash.c
@@
-68,14
+68,14
@@
unsigned long flash_init(void)
&flash_info[0]);
flash_protect ( FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
&flash_info[0]);
-#ifdef C
F
G_ENV_ADDR_REDUND
+#ifdef C
ONFI
G_ENV_ADDR_REDUND
flash_protect ( FLAG_PROTECT_SET,
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SIZE_REDUND - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SIZE_REDUND - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/ns9750dev/flash.c
b/board/ns9750dev/flash.c
index
e7d6515
..
2b62bef
100644
(file)
--- a/
board/ns9750dev/flash.c
+++ b/
board/ns9750dev/flash.c
@@
-108,8
+108,8
@@
unsigned long flash_init (void)
CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
return size;
}
return size;
}
diff --git
a/board/o2dnt/flash.c
b/board/o2dnt/flash.c
index
2aa0489
..
1cf78c7
100644
(file)
--- a/
board/o2dnt/flash.c
+++ b/
board/o2dnt/flash.c
@@
-106,9
+106,9
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SIZE-1,
- flash_get_info(C
F
G_ENV_ADDR));
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE-1,
+ flash_get_info(C
ONFI
G_ENV_ADDR));
#endif
#endif
diff --git
a/board/omap1610inn/flash.c
b/board/omap1610inn/flash.c
index
c8e4c9e
..
d88a981
100644
(file)
--- a/
board/omap1610inn/flash.c
+++ b/
board/omap1610inn/flash.c
@@
-112,8
+112,8
@@
unsigned long flash_init (void)
CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
return size;
}
return size;
}
diff --git
a/board/omap730p2/flash.c
b/board/omap730p2/flash.c
index
e7d6515
..
2b62bef
100644
(file)
--- a/
board/omap730p2/flash.c
+++ b/
board/omap730p2/flash.c
@@
-108,8
+108,8
@@
unsigned long flash_init (void)
CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
CFG_FLASH_BASE + monitor_flash_len - 1, &flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
return size;
}
return size;
}
diff --git
a/board/oxc/flash.c
b/board/oxc/flash.c
index
44e2300
..
94d2660
100644
(file)
--- a/
board/oxc/flash.c
+++ b/
board/oxc/flash.c
@@
-73,13
+73,13
@@
unsigned long flash_init (void)
&flash_info[0]);
#endif
&flash_info[0]);
#endif
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR)
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR)
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
flash_protect(FLAG_PROTECT_SET,
# endif
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/pcippc2/flash.c
b/board/pcippc2/flash.c
index
b1fec97
..
a915fbe
100644
(file)
--- a/
board/pcippc2/flash.c
+++ b/
board/pcippc2/flash.c
@@
-77,8
+77,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/pcs440ep/pcs440ep.c
b/board/pcs440ep/pcs440ep.c
index
f66f3f2
..
2140582
100644
(file)
--- a/
board/pcs440ep/pcs440ep.c
+++ b/
board/pcs440ep/pcs440ep.c
@@
-491,8
+491,8
@@
int misc_init_r (void)
/* Env protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
/* Env protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + 2*CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + 2*CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[1]);
pcs440ep_readinputs ();
&flash_info[1]);
pcs440ep_readinputs ();
diff --git
a/board/pleb2/flash.c
b/board/pleb2/flash.c
index
5a1eba6
..
3f01921
100644
(file)
--- a/
board/pleb2/flash.c
+++ b/
board/pleb2/flash.c
@@
-23,7
+23,7
@@
#include <common.h>
#include <mpc8xx.h>
#include <common.h>
#include <mpc8xx.h>
-/* environment.h defines the various C
F
G_ENV_... values in terms
+/* environment.h defines the various C
ONFI
G_ENV_... values in terms
* of whichever ones are given in the configuration file.
*/
#include <environment.h>
* of whichever ones are given in the configuration file.
*/
#include <environment.h>
@@
-107,16
+107,16
@@
unsigned long flash_init (void)
&flash_info[0]);
#endif
&flash_info[0]);
#endif
-#ifdef C
F
G_ENV_ADDR
+#ifdef C
ONFI
G_ENV_ADDR
flash_protect (FLAG_PROTECT_SET,
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
#endif
#endif
-#ifdef C
F
G_ENV_ADDR_REDUND
+#ifdef C
ONFI
G_ENV_ADDR_REDUND
flash_protect (FLAG_PROTECT_SET,
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SIZE_REDUND - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SIZE_REDUND - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/pm520/flash.c
b/board/pm520/flash.c
index
c899ad3
..
9ec843e
100644
(file)
--- a/
board/pm520/flash.c
+++ b/
board/pm520/flash.c
@@
-121,8
+121,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
flash_protect ( FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0] );
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0] );
#endif
flash_afterinit(flash_info[0].start[0], flash_info[0].size);
#endif
flash_afterinit(flash_info[0].start[0], flash_info[0].size);
diff --git
a/board/pm826/flash.c
b/board/pm826/flash.c
index
e8e0289
..
bd6d7d9
100644
(file)
--- a/
board/pm826/flash.c
+++ b/
board/pm826/flash.c
@@
-144,13
+144,13
@@
unsigned long flash_init (void)
# endif
#endif /* CONFIG_BOOT_ROM */
# endif
#endif /* CONFIG_BOOT_ROM */
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR)
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR)
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
flash_protect (FLAG_PROTECT_SET,
# endif
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
#endif
return (size_b0);
#endif
return (size_b0);
diff --git
a/board/pm828/flash.c
b/board/pm828/flash.c
index
0620ea3
..
2e92c11
100644
(file)
--- a/
board/pm828/flash.c
+++ b/
board/pm828/flash.c
@@
-144,13
+144,13
@@
unsigned long flash_init (void)
# endif
#endif /* CONFIG_BOOT_ROM */
# endif
#endif /* CONFIG_BOOT_ROM */
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR)
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR)
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
flash_protect (FLAG_PROTECT_SET,
# endif
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
#endif
return (size_b0);
#endif
return (size_b0);
diff --git
a/board/ppmc7xx/flash.c
b/board/ppmc7xx/flash.c
index
dd91da7
..
1722a35
100644
(file)
--- a/
board/ppmc7xx/flash.c
+++ b/
board/ppmc7xx/flash.c
@@
-197,13
+197,13
@@
unsigned long flash_init (void)
CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
#endif
CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
#endif
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR)
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR)
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
flash_protect (FLAG_PROTECT_SET,
# endif
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
#endif
return (size_b0);
#endif
return (size_b0);
diff --git
a/board/prodrive/pdnb3/flash.c
b/board/prodrive/pdnb3/flash.c
index
0786324
..
5738c5b
100644
(file)
--- a/
board/prodrive/pdnb3/flash.c
+++ b/
board/prodrive/pdnb3/flash.c
@@
-71,14
+71,14
@@
unsigned long flash_init(void)
/* Environment protection ON by default */
flash_protect(FLAG_PROTECT_SET,
/* Environment protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
/* Redundant environment protection ON by default */
flash_protect(FLAG_PROTECT_SET,
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
/* Redundant environment protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SIZE_REDUND - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SIZE_REDUND - 1,
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
flash_info[0].size = size;
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
flash_info[0].size = size;
diff --git
a/board/purple/flash.c
b/board/purple/flash.c
index
ee8a60e
..
640bc29
100644
(file)
--- a/
board/purple/flash.c
+++ b/
board/purple/flash.c
@@
-240,9
+240,9
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SIZE-1,
- flash_get_info(C
F
G_ENV_ADDR));
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE-1,
+ flash_get_info(C
ONFI
G_ENV_ADDR));
#endif
return size;
#endif
return size;
diff --git
a/board/r360mpi/flash.c
b/board/r360mpi/flash.c
index
398e734
..
8145437
100644
(file)
--- a/
board/r360mpi/flash.c
+++ b/
board/r360mpi/flash.c
@@
-32,14
+32,14
@@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-114,8
+114,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect (FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/rmu/flash.c
b/board/rmu/flash.c
index
670faf0
..
7c248a7
100644
(file)
--- a/
board/rmu/flash.c
+++ b/
board/rmu/flash.c
@@
-84,19
+84,19
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE-1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
-#if defined(C
FG_ENV_ADDR_REDUND) || defined(CF
G_ENV_OFFSET_REDUND)
+#if defined(C
ONFIG_ENV_ADDR_REDUND) || defined(CONFI
G_ENV_OFFSET_REDUND)
debug ("Protect redundand environment: %08lx ... %08lx\n",
debug ("Protect redundand environment: %08lx ... %08lx\n",
- (ulong)C
F
G_ENV_ADDR_REDUND,
- (ulong)C
FG_ENV_ADDR_REDUND + CF
G_ENV_SIZE - 1);
+ (ulong)C
ONFI
G_ENV_ADDR_REDUND,
+ (ulong)C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SIZE - 1);
flash_protect(FLAG_PROTECT_SET,
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SIZE_REDUND - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SIZE_REDUND - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/rpxsuper/flash.c
b/board/rpxsuper/flash.c
index
2d17694
..
5f444bf
100644
(file)
--- a/
board/rpxsuper/flash.c
+++ b/
board/rpxsuper/flash.c
@@
-71,13
+71,13
@@
unsigned long flash_init (void)
&flash_info[0]);
#endif
&flash_info[0]);
#endif
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR)
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR)
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
flash_protect(FLAG_PROTECT_SET,
# endif
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/rsdproto/flash.c
b/board/rsdproto/flash.c
index
f954458
..
312b400
100644
(file)
--- a/
board/rsdproto/flash.c
+++ b/
board/rsdproto/flash.c
@@
-131,17
+131,17
@@
unsigned long flash_init (void)
&flash_info[1]);
#endif
&flash_info[1]);
#endif
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR)
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR)
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
flash_protect(FLAG_PROTECT_SET,
# endif
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
flash_protect(FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[1]);
#endif
&flash_info[1]);
#endif
diff --git
a/board/sacsng/flash.c
b/board/sacsng/flash.c
index
f37be29
..
8fecf95
100644
(file)
--- a/
board/sacsng/flash.c
+++ b/
board/sacsng/flash.c
@@
-27,11
+27,11
@@
#undef DEBUG
#undef DEBUG
-#ifndef C
F
G_ENV_ADDR
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+#ifndef C
ONFI
G_ENV_ADDR
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
#endif
#endif
-#ifndef C
F
G_ENV_SIZE
-#define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+#ifndef C
ONFI
G_ENV_SIZE
+#define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
#endif
#endif
@@
-76,8
+76,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE-1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
@@
-93,8
+93,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE-1,
&flash_info[1]);
#endif
} else {
&flash_info[1]);
#endif
} else {
diff --git
a/board/sandpoint/flash.c
b/board/sandpoint/flash.c
index
60cb191
..
0f3eca2
100644
(file)
--- a/
board/sandpoint/flash.c
+++ b/
board/sandpoint/flash.c
@@
-33,14
+33,14
@@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-230,10
+230,10
@@
flash_init(void)
&flash_info[0]);
#endif
&flash_info[0]);
#endif
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR)
flash_protect(FLAG_PROTECT_SET,
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/sbc2410x/flash.c
b/board/sbc2410x/flash.c
index
0c669e4
..
fa3996d
100644
(file)
--- a/
board/sbc2410x/flash.c
+++ b/
board/sbc2410x/flash.c
@@
-114,8
+114,8
@@
ulong flash_init (void)
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
return size;
}
return size;
}
diff --git
a/board/sbc8260/flash.c
b/board/sbc8260/flash.c
index
6d659b2
..
d3b1f31
100644
(file)
--- a/
board/sbc8260/flash.c
+++ b/
board/sbc8260/flash.c
@@
-67,13
+67,13
@@
unsigned long flash_init (void)
&flash_info[0]);
#endif
&flash_info[0]);
#endif
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR)
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR)
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
flash_protect(FLAG_PROTECT_SET,
# endif
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/sc520_cdp/flash.c
b/board/sc520_cdp/flash.c
index
d52a847
..
493d51a
100644
(file)
--- a/
board/sc520_cdp/flash.c
+++ b/
board/sc520_cdp/flash.c
@@
-276,10
+276,10
@@
ulong flash_init(void)
i386boot_start,
i386boot_end,
&flash_info[0]);
i386boot_start,
i386boot_end,
&flash_info[0]);
-#ifdef C
F
G_ENV_ADDR
+#ifdef C
ONFI
G_ENV_ADDR
flash_protect(FLAG_PROTECT_SET,
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
#endif
return size;
&flash_info[0]);
#endif
return size;
diff --git
a/board/sc520_cdp/flash_old.c
b/board/sc520_cdp/flash_old.c
index
3c0f6d6
..
b68626e
100644
(file)
--- a/
board/sc520_cdp/flash_old.c
+++ b/
board/sc520_cdp/flash_old.c
@@
-119,10
+119,10
@@
ulong flash_init(void)
i386boot_end-SC520_FLASH_BANK0_BASE,
&flash_info[0]);
i386boot_end-SC520_FLASH_BANK0_BASE,
&flash_info[0]);
-#ifdef C
F
G_ENV_ADDR
+#ifdef C
ONFI
G_ENV_ADDR
flash_protect(FLAG_PROTECT_SET,
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
#endif
return size;
&flash_info[0]);
#endif
return size;
diff --git
a/board/sc520_spunk/flash.c
b/board/sc520_spunk/flash.c
index
0b4bf68
..
609cc42
100644
(file)
--- a/
board/sc520_spunk/flash.c
+++ b/
board/sc520_spunk/flash.c
@@
-323,10
+323,10
@@
ulong flash_init(void)
i386boot_start,
i386boot_end,
&flash_info[0]);
i386boot_start,
i386boot_end,
&flash_info[0]);
-#ifdef C
F
G_ENV_ADDR
+#ifdef C
ONFI
G_ENV_ADDR
flash_protect(FLAG_PROTECT_SET,
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
#endif
return size;
&flash_info[0]);
#endif
return size;
diff --git
a/board/scb9328/flash.c
b/board/scb9328/flash.c
index
304190c
..
536725a
100644
(file)
--- a/
board/scb9328/flash.c
+++ b/
board/scb9328/flash.c
@@
-142,8
+142,8
@@
ulong flash_init (void)
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
return SCB9328_FLASH_BANK_SIZE;
}
return SCB9328_FLASH_BANK_SIZE;
}
diff --git
a/board/shannon/flash.c
b/board/shannon/flash.c
index
475b76b
..
7d6eca8
100644
(file)
--- a/
board/shannon/flash.c
+++ b/
board/shannon/flash.c
@@
-128,8
+128,8
@@
ulong flash_init(void)
&flash_info[0]);
flash_protect(FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
#endif
return size;
&flash_info[0]);
#endif
return size;
diff --git
a/board/siemens/SCM/flash.c
b/board/siemens/SCM/flash.c
index
815f023
..
500af92
100644
(file)
--- a/
board/siemens/SCM/flash.c
+++ b/
board/siemens/SCM/flash.c
@@
-207,13
+207,13
@@
unsigned long flash_init (void)
CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
#endif
CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
#endif
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR)
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR)
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
flash_protect (FLAG_PROTECT_SET,
# endif
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
#endif
return (size_b0);
#endif
return (size_b0);
diff --git
a/board/siemens/SMN42/flash.c
b/board/siemens/SMN42/flash.c
index
7d4977e
..
ae64096
100644
(file)
--- a/
board/siemens/SMN42/flash.c
+++ b/
board/siemens/SMN42/flash.c
@@
-70,8
+70,8
@@
ulong flash_init (void)
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1,
&flash_info[0]);
size += ext_flash_init();
&flash_info[0]);
size += ext_flash_init();
diff --git
a/board/siemens/pcu_e/flash.c
b/board/siemens/pcu_e/flash.c
index
5b812cb
..
97b511e
100644
(file)
--- a/
board/siemens/pcu_e/flash.c
+++ b/
board/siemens/pcu_e/flash.c
@@
-25,14
+25,14
@@
#include <mpc8xx.h>
#if defined(CONFIG_ENV_IS_IN_FLASH)
#include <mpc8xx.h>
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-154,8
+154,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SECT_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE-1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
@@
-181,8
+181,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SECT_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE-1,
&flash_info[1]);
#endif
/*
&flash_info[1]);
#endif
/*
diff --git
a/board/sixnet/flash.c
b/board/sixnet/flash.c
index
61d7580
..
3f23299
100644
(file)
--- a/
board/sixnet/flash.c
+++ b/
board/sixnet/flash.c
@@
-23,7
+23,7
@@
#include <common.h>
#include <mpc8xx.h>
#include <common.h>
#include <mpc8xx.h>
-/* environment.h defines the various C
F
G_ENV_... values in terms
+/* environment.h defines the various C
ONFI
G_ENV_... values in terms
* of whichever ones are given in the configuration file.
*/
#include <environment.h>
* of whichever ones are given in the configuration file.
*/
#include <environment.h>
@@
-108,16
+108,16
@@
unsigned long flash_init (void)
&flash_info[0]);
#endif
&flash_info[0]);
#endif
-#ifdef C
F
G_ENV_ADDR
+#ifdef C
ONFI
G_ENV_ADDR
flash_protect ( FLAG_PROTECT_SET,
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
#endif
#endif
-#ifdef C
F
G_ENV_ADDR_REDUND
+#ifdef C
ONFI
G_ENV_ADDR_REDUND
flash_protect ( FLAG_PROTECT_SET,
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SIZE_REDUND - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SIZE_REDUND - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/sl8245/flash.c
b/board/sl8245/flash.c
index
f41dde0
..
c787bfb
100644
(file)
--- a/
board/sl8245/flash.c
+++ b/
board/sl8245/flash.c
@@
-26,14
+26,14
@@
#include <asm/processor.h>
#if defined(CONFIG_ENV_IS_IN_FLASH)
#include <asm/processor.h>
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-139,15
+139,15
@@
unsigned long flash_init (void)
#endif
#endif
#endif
#endif
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR)
-#if C
F
G_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR)
+#if C
ONFI
G_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE
flash_protect ( FLAG_PROTECT_SET,
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[1]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[1]);
#else
flash_protect ( FLAG_PROTECT_SET,
#else
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
#endif
#endif
#endif
#endif
diff --git
a/board/smdk2400/flash.c
b/board/smdk2400/flash.c
index
fd9992d
..
af46bf6
100644
(file)
--- a/
board/smdk2400/flash.c
+++ b/
board/smdk2400/flash.c
@@
-97,13
+97,13
@@
ulong flash_init (void)
&flash_info[0]);
flash_protect ( FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
-#ifdef C
F
G_ENV_ADDR_REDUND
+#ifdef C
ONFI
G_ENV_ADDR_REDUND
flash_protect ( FLAG_PROTECT_SET,
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SIZE_REDUND - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SIZE_REDUND - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/smdk2410/flash.c
b/board/smdk2410/flash.c
index
376930b
..
32ae80d
100644
(file)
--- a/
board/smdk2410/flash.c
+++ b/
board/smdk2410/flash.c
@@
-116,8
+116,8
@@
ulong flash_init (void)
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
return size;
}
return size;
}
diff --git
a/board/socrates/socrates.c
b/board/socrates/socrates.c
index
73a2d9d
..
cdab1a2
100644
(file)
--- a/
board/socrates/socrates.c
+++ b/
board/socrates/socrates.c
@@
-126,14
+126,14
@@
int misc_init_r (void)
/* Environment protection ON by default */
flash_protect (FLAG_PROTECT_SET,
/* Environment protection ON by default */
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
/* Redundant environment protection ON by default */
flash_protect (FLAG_PROTECT_SET,
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
/* Redundant environment protection ON by default */
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SIZE_REDUND - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SIZE_REDUND - 1,
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
}
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
}
diff --git
a/board/ssv/adnpesc1/flash.c
b/board/ssv/adnpesc1/flash.c
index
fd8379b
..
2614068
100644
(file)
--- a/
board/ssv/adnpesc1/flash.c
+++ b/
board/ssv/adnpesc1/flash.c
@@
-36,7
+36,7
@@
/*---------------------------------------------------------------------*/
#define BANKSZ (8 * 1024 * 1024)
#define SECTSZ (64 * 1024)
/*---------------------------------------------------------------------*/
#define BANKSZ (8 * 1024 * 1024)
#define SECTSZ (64 * 1024)
-#define UBOOTSECS ((CFG_MONITOR_LEN + C
F
G_ENV_SIZE) / SECTSZ)
+#define UBOOTSECS ((CFG_MONITOR_LEN + C
ONFI
G_ENV_SIZE) / SECTSZ)
#define UBOOTAREA (UBOOTSECS * 64 * 1024) /* monitor / env area */
/*---------------------------------------------------------------------*/
#define UBOOTAREA (UBOOTSECS * 64 * 1024) /* monitor / env area */
/*---------------------------------------------------------------------*/
diff --git
a/board/stxgp3/flash.c
b/board/stxgp3/flash.c
index
25ac301
..
1433491
100644
(file)
--- a/
board/stxgp3/flash.c
+++ b/
board/stxgp3/flash.c
@@
-42,14
+42,14
@@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-102,8
+102,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SECT_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE-1,
&flash_info[0]);
#endif
#endif
&flash_info[0]);
#endif
#endif
diff --git
a/board/svm_sc8xx/flash.c
b/board/svm_sc8xx/flash.c
index
267be78
..
00fed59
100644
(file)
--- a/
board/svm_sc8xx/flash.c
+++ b/
board/svm_sc8xx/flash.c
@@
-23,8
+23,8
@@
#include <common.h>
#include <mpc8xx.h>
#include <common.h>
#include <mpc8xx.h>
-#ifndef C
F
G_ENV_ADDR
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+#ifndef C
ONFI
G_ENV_ADDR
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
#endif
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#endif
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
@@
-155,8
+155,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE-1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
@@
-182,8
+182,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE-1,
&flash_info[1]);
#endif
} else {
&flash_info[1]);
#endif
} else {
diff --git
a/board/tqc/tqm5200/cam5200_flash.c
b/board/tqc/tqm5200/cam5200_flash.c
index
bb12aae
..
4fc4dc6
100644
(file)
--- a/
board/tqc/tqm5200/cam5200_flash.c
+++ b/
board/tqc/tqm5200/cam5200_flash.c
@@
-769,12
+769,12
@@
unsigned long flash_init(void)
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[i]);
#if defined(CONFIG_ENV_IS_IN_FLASH)
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[i]);
#if defined(CONFIG_ENV_IS_IN_FLASH)
- (void)flash_protect(FLAG_PROTECT_SET, C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ (void)flash_protect(FLAG_PROTECT_SET, C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[i]);
&flash_info[i]);
-#if defined(C
F
G_ENV_ADDR_REDUND)
- (void)flash_protect(FLAG_PROTECT_SET, C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SECT_SIZE - 1,
+#if defined(C
ONFI
G_ENV_ADDR_REDUND)
+ (void)flash_protect(FLAG_PROTECT_SET, C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[i]);
#endif
#endif
&flash_info[i]);
#endif
#endif
diff --git
a/board/tqc/tqm8260/flash.c
b/board/tqc/tqm8260/flash.c
index
815f023
..
500af92
100644
(file)
--- a/
board/tqc/tqm8260/flash.c
+++ b/
board/tqc/tqm8260/flash.c
@@
-207,13
+207,13
@@
unsigned long flash_init (void)
CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
#endif
CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
#endif
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR)
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR)
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
flash_protect (FLAG_PROTECT_SET,
# endif
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
#endif
return (size_b0);
#endif
return (size_b0);
diff --git
a/board/tqc/tqm85xx/tqm85xx.c
b/board/tqc/tqm85xx/tqm85xx.c
index
0e5bc2f
..
5314d33
100644
(file)
--- a/
board/tqc/tqm85xx/tqm85xx.c
+++ b/
board/tqc/tqm85xx/tqm85xx.c
@@
-321,15
+321,15
@@
int misc_init_r (void)
/* Environment protection ON by default */
flash_protect (FLAG_PROTECT_SET,
/* Environment protection ON by default */
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
-#ifdef C
F
G_ENV_ADDR_REDUND
+#ifdef C
ONFI
G_ENV_ADDR_REDUND
/* Redundant environment protection ON by default */
flash_protect (FLAG_PROTECT_SET,
/* Redundant environment protection ON by default */
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SIZE_REDUND - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SIZE_REDUND - 1,
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
#endif
&flash_info[CFG_MAX_FLASH_BANKS - 1]);
#endif
diff --git
a/board/tqc/tqm8xx/flash.c
b/board/tqc/tqm8xx/flash.c
index
f9078cf
..
ca35e91
100644
(file)
--- a/
board/tqc/tqm8xx/flash.c
+++ b/
board/tqc/tqm8xx/flash.c
@@
-43,8
+43,8
@@
DECLARE_GLOBAL_DATA_PTR;
# endif
#endif /* CONFIG_TQM8xxL/M, !TQM866M, !TQM885D */
# endif
#endif /* CONFIG_TQM8xxL/M, !TQM866M, !TQM885D */
-#ifndef C
F
G_ENV_ADDR
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+#ifndef C
ONFI
G_ENV_ADDR
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
#endif
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#endif
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
@@
-178,30
+178,30
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
-# ifdef C
F
G_ENV_ADDR_REDUND
+# ifdef C
ONFI
G_ENV_ADDR_REDUND
debug ("Protect primary environment: %08lx ... %08lx\n",
debug ("Protect primary environment: %08lx ... %08lx\n",
- (ulong)C
F
G_ENV_ADDR,
- (ulong)C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1);
+ (ulong)C
ONFI
G_ENV_ADDR,
+ (ulong)C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1);
# else
debug ("Protect environment: %08lx ... %08lx\n",
# else
debug ("Protect environment: %08lx ... %08lx\n",
- (ulong)C
F
G_ENV_ADDR,
- (ulong)C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1);
+ (ulong)C
ONFI
G_ENV_ADDR,
+ (ulong)C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1);
# endif
flash_protect(FLAG_PROTECT_SET,
# endif
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
-#ifdef C
F
G_ENV_ADDR_REDUND
+#ifdef C
ONFI
G_ENV_ADDR_REDUND
debug ("Protect redundand environment: %08lx ... %08lx\n",
debug ("Protect redundand environment: %08lx ... %08lx\n",
- (ulong)C
F
G_ENV_ADDR_REDUND,
- (ulong)C
FG_ENV_ADDR_REDUND + CF
G_ENV_SECT_SIZE - 1);
+ (ulong)C
ONFI
G_ENV_ADDR_REDUND,
+ (ulong)C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SECT_SIZE - 1);
flash_protect(FLAG_PROTECT_SET,
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
@@
-232,8
+232,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE-1,
&flash_info[1]);
#endif
} else {
&flash_info[1]);
#endif
} else {
diff --git
a/board/trab/flash.c
b/board/trab/flash.c
index
3e8f105
..
08723bd
100644
(file)
--- a/
board/trab/flash.c
+++ b/
board/trab/flash.c
@@
-107,13
+107,13
@@
ulong flash_init (void)
&flash_info[0]);
flash_protect ( FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
-#ifdef C
F
G_ENV_ADDR_REDUND
+#ifdef C
ONFI
G_ENV_ADDR_REDUND
flash_protect ( FLAG_PROTECT_SET,
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SIZE_REDUND - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SIZE_REDUND - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
diff --git
a/board/utx8245/flash.c
b/board/utx8245/flash.c
index
515d8c2
..
5aab886
100644
(file)
--- a/
board/utx8245/flash.c
+++ b/
board/utx8245/flash.c
@@
-34,14
+34,14
@@
#define ROM_CS1_START 0xFF000000
#if defined(CONFIG_ENV_IS_IN_FLASH)
#define ROM_CS1_START 0xFF000000
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-169,9
+169,9
@@
unsigned long flash_init (void)
&flash_info[0]);
#endif
&flash_info[0]);
#endif
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
F
G_ENV_ADDR)
- flash_protect (FLAG_PROTECT_SET, C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(C
ONFI
G_ENV_ADDR)
+ flash_protect (FLAG_PROTECT_SET, C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
#endif
Done:
#endif
Done:
diff --git
a/board/wepep250/flash.c
b/board/wepep250/flash.c
index
e2e08f7
..
6223ec1
100644
(file)
--- a/
board/wepep250/flash.c
+++ b/
board/wepep250/flash.c
@@
-142,8
+142,8
@@
ulong flash_init (void)
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
return WEP_FLASH_BANK_SIZE;
}
return WEP_FLASH_BANK_SIZE;
}
diff --git
a/board/westel/amx860/flash.c
b/board/westel/amx860/flash.c
index
4d468d3
..
7768e2d
100644
(file)
--- a/
board/westel/amx860/flash.c
+++ b/
board/westel/amx860/flash.c
@@
-27,14
+27,14
@@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
#endif
# endif
#endif
@@
-137,8
+137,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SECT_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE-1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
@@
-169,8
+169,8
@@
unsigned long flash_init (void)
# ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
# ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR+CF
G_ENV_SECT_SIZE-1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE-1,
&flash_info[1]);
#endif
} else {
&flash_info[1]);
#endif
} else {
diff --git
a/board/xaeniax/flash.c
b/board/xaeniax/flash.c
index
9874a14
..
cd257df
100644
(file)
--- a/
board/xaeniax/flash.c
+++ b/
board/xaeniax/flash.c
@@
-90,8
+90,8
@@
unsigned long flash_init (void)
&flash_info[0] );
flash_protect ( FLAG_PROTECT_SET,
&flash_info[0] );
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0] );
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0] );
return size;
}
return size;
}
diff --git
a/board/xilinx/xilinx_iic/iic_adapter.c
b/board/xilinx/xilinx_iic/iic_adapter.c
index
5d84ca7
..
ad19ade
100644
(file)
--- a/
board/xilinx/xilinx_iic/iic_adapter.c
+++ b/
board/xilinx/xilinx_iic/iic_adapter.c
@@
-221,7
+221,7
@@
read_crc(uchar * buffer, int len)
u8 pre; /* previous EEPROM data bit */
int i, loc;
u8 pre; /* previous EEPROM data bit */
int i, loc;
- addr = C
FG_ENV_OFFSET;
/* start from first env address */
+ addr = C
ONFIG_ENV_OFFSET;
/* start from first env address */
n = 0;
pre = 1;
stop = 1;
n = 0;
pre = 1;
stop = 1;
@@
-229,7
+229,7
@@
read_crc(uchar * buffer, int len)
/* calculate runtime CRC according to ML300 and read back
old CRC stored in the EEPROM */
/* calculate runtime CRC according to ML300 and read back
old CRC stored in the EEPROM */
- while (n < C
F
G_ENV_SIZE) {
+ while (n < C
ONFI
G_ENV_SIZE) {
receive(addr, buffer, len);
/* found two null chars, end of env */
receive(addr, buffer, len);
/* found two null chars, end of env */
@@
-270,7
+270,7
@@
read_crc(uchar * buffer, int len)
crc = 0;
n = 0;
addr =
crc = 0;
n = 0;
addr =
- C
F
G_ENV_OFFSET - offsetof(env_t, crc) + offsetof(env_t,
+ C
ONFI
G_ENV_OFFSET - offsetof(env_t, crc) + offsetof(env_t,
data);
/* calculate u-boot crc */
while (n < ENV_SIZE) {
data);
/* calculate u-boot crc */
while (n < ENV_SIZE) {
@@
-464,7
+464,7
@@
save_env(void)
/* update EEPROM env values if there is enough space */
if (update_crc(len, (uchar *)eprom) == 0)
/* update EEPROM env values if there is enough space */
if (update_crc(len, (uchar *)eprom) == 0)
- send(C
F
G_ENV_OFFSET, (uchar *)eprom, len + 6);
+ send(C
ONFI
G_ENV_OFFSET, (uchar *)eprom, len + 6);
}
/************************************************************************
}
/************************************************************************
@@
-483,7
+483,7
@@
i2c_read(uchar chip, uint addr, int alen, uchar * buffer, int len)
/* then read out EEPROM content for runtime u-boot CRC calculation */
receive(addr, buffer, len);
/* then read out EEPROM content for runtime u-boot CRC calculation */
receive(addr, buffer, len);
- if (addr + len - C
FG_ENV_OFFSET == CF
G_ENV_SIZE)
+ if (addr + len - C
ONFIG_ENV_OFFSET == CONFI
G_ENV_SIZE)
/* end of runtime crc read */
++envStep;
return 0;
/* end of runtime crc read */
++envStep;
return 0;
@@
-492,7
+492,7
@@
i2c_read(uchar chip, uint addr, int alen, uchar * buffer, int len)
if (len < 2) {
/* when call getenv_r */
receive(addr, buffer, len);
if (len < 2) {
/* when call getenv_r */
receive(addr, buffer, len);
- } else if (addr + len < C
FG_ENV_OFFSET + CF
G_ENV_SIZE) {
+ } else if (addr + len < C
ONFIG_ENV_OFFSET + CONFI
G_ENV_SIZE) {
/* calling env_relocate(), but don't read out
crc value from EEPROM */
receive(addr, buffer + 4, len);
/* calling env_relocate(), but don't read out
crc value from EEPROM */
receive(addr, buffer + 4, len);
@@
-511,7
+511,7
@@
int
i2c_write(uchar chip, uint addr, int alen, uchar * buffer, int len)
{
/* save env on last page write called by u-boot */
i2c_write(uchar chip, uint addr, int alen, uchar * buffer, int len)
{
/* save env on last page write called by u-boot */
- if (addr + len >= C
FG_ENV_OFFSET + CF
G_ENV_SIZE)
+ if (addr + len >= C
ONFIG_ENV_OFFSET + CONFI
G_ENV_SIZE)
save_env();
return 0;
save_env();
return 0;
diff --git
a/board/xm250/flash.c
b/board/xm250/flash.c
index
aab47a0
..
893351e
100644
(file)
--- a/
board/xm250/flash.c
+++ b/
board/xm250/flash.c
@@
-109,8
+109,8
@@
unsigned long flash_init (void)
&flash_info[0] );
flash_protect ( FLAG_PROTECT_SET,
&flash_info[0] );
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0] );
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0] );
return size;
}
return size;
}
diff --git
a/board/xsengine/flash.c
b/board/xsengine/flash.c
index
a188e24
..
f29def2
100644
(file)
--- a/
board/xsengine/flash.c
+++ b/
board/xsengine/flash.c
@@
-62,7
+62,7
@@
unsigned long flash_init (void)
/* Protect monitor and environment sectors */
flash_protect ( FLAG_PROTECT_SET,CFG_FLASH_BASE,CFG_FLASH_BASE + monitor_flash_len - 1,&flash_info[0] );
/* Protect monitor and environment sectors */
flash_protect ( FLAG_PROTECT_SET,CFG_FLASH_BASE,CFG_FLASH_BASE + monitor_flash_len - 1,&flash_info[0] );
- flash_protect ( FLAG_PROTECT_SET,C
FG_ENV_ADDR,CFG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0] );
+ flash_protect ( FLAG_PROTECT_SET,C
ONFIG_ENV_ADDR,CONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0] );
return size;
}
return size;
}
diff --git
a/board/zeus/zeus.c
b/board/zeus/zeus.c
index
33d971a
..
8e4c0e2
100644
(file)
--- a/
board/zeus/zeus.c
+++ b/
board/zeus/zeus.c
@@
-150,8
+150,8
@@
int misc_init_r(void)
/* Env protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
/* Env protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + 2*CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + 2*CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[0]);
return 0;
&flash_info[0]);
return 0;
@@
-249,12
+249,12
@@
static int restore_default(void)
* Unprotect and erase environment area
*/
flash_protect(FLAG_PROTECT_CLEAR,
* Unprotect and erase environment area
*/
flash_protect(FLAG_PROTECT_CLEAR,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + 2*CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + 2*CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[0]);
&flash_info[0]);
- flash_sect_erase(C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + 2*CF
G_ENV_SECT_SIZE - 1);
+ flash_sect_erase(C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + 2*CONFI
G_ENV_SECT_SIZE - 1);
/*
* Now restore default environment from U-Boot image
/*
* Now restore default environment from U-Boot image
diff --git
a/board/zylonite/flash.c
b/board/zylonite/flash.c
index
883c1ba
..
80b520b
100644
(file)
--- a/
board/zylonite/flash.c
+++ b/
board/zylonite/flash.c
@@
-91,8
+91,8
@@
unsigned long flash_init (void)
&flash_info[0] );
flash_protect ( FLAG_PROTECT_SET,
&flash_info[0] );
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0] );
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0] );
return size;
#endif
return size;
#endif
diff --git
a/common/cmd_bdinfo.c
b/common/cmd_bdinfo.c
index
24ff9b9
..
f4d9d40
100644
(file)
--- a/
common/cmd_bdinfo.c
+++ b/
common/cmd_bdinfo.c
@@
-224,7
+224,7
@@
int do_bdinfo(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
print_lnum("memsize ", bd->bi_memsize);
print_num("flashstart ", bd->bi_flashstart);
print_num("CFG_MONITOR_BASE ", CFG_MONITOR_BASE);
print_lnum("memsize ", bd->bi_memsize);
print_num("flashstart ", bd->bi_flashstart);
print_num("CFG_MONITOR_BASE ", CFG_MONITOR_BASE);
- print_num("C
FG_ENV_ADDR ", CF
G_ENV_ADDR);
+ print_num("C
ONFIG_ENV_ADDR ", CONFI
G_ENV_ADDR);
printf("CFG_RELOC_MONITOR_BASE = 0x%lx (%d)\n", CFG_RELOC_MONITOR_BASE,
CFG_MONITOR_LEN);
printf("CFG_MALLOC_BASE = 0x%lx (%d)\n", CFG_MALLOC_BASE,
printf("CFG_RELOC_MONITOR_BASE = 0x%lx (%d)\n", CFG_RELOC_MONITOR_BASE,
CFG_MONITOR_LEN);
printf("CFG_MALLOC_BASE = 0x%lx (%d)\n", CFG_MALLOC_BASE,
diff --git
a/common/cmd_nvedit.c
b/common/cmd_nvedit.c
index
f449715
..
637d6c9
100644
(file)
--- a/
common/cmd_nvedit.c
+++ b/
common/cmd_nvedit.c
@@
-503,7
+503,7
@@
char *getenv (char *name)
int val;
for (nxt=i; env_get_char(nxt) != '\0'; ++nxt) {
int val;
for (nxt=i; env_get_char(nxt) != '\0'; ++nxt) {
- if (nxt >= C
F
G_ENV_SIZE) {
+ if (nxt >= C
ONFI
G_ENV_SIZE) {
return (NULL);
}
}
return (NULL);
}
}
@@
-523,7
+523,7
@@
int getenv_r (char *name, char *buf, unsigned len)
int val, n;
for (nxt=i; env_get_char(nxt) != '\0'; ++nxt) {
int val, n;
for (nxt=i; env_get_char(nxt) != '\0'; ++nxt) {
- if (nxt >= C
F
G_ENV_SIZE) {
+ if (nxt >= C
ONFI
G_ENV_SIZE) {
return (-1);
}
}
return (-1);
}
}
diff --git
a/common/env_common.c
b/common/env_common.c
index
c3946f0
..
77f9944
100644
(file)
--- a/
common/env_common.c
+++ b/
common/env_common.c
@@
-241,7
+241,7
@@
void env_relocate (void)
/*
* We must allocate a buffer for the environment
*/
/*
* We must allocate a buffer for the environment
*/
- env_ptr = (env_t *)malloc (C
F
G_ENV_SIZE);
+ env_ptr = (env_t *)malloc (C
ONFI
G_ENV_SIZE);
DEBUGF ("%s[%d] malloced ENV at %p\n", __FUNCTION__,__LINE__,env_ptr);
#endif
DEBUGF ("%s[%d] malloced ENV at %p\n", __FUNCTION__,__LINE__,env_ptr);
#endif
diff --git
a/common/env_dataflash.c
b/common/env_dataflash.c
index
2254b9b
..
fed919e
100644
(file)
--- a/
common/env_dataflash.c
+++ b/
common/env_dataflash.c
@@
-41,22
+41,22
@@
extern uchar default_environment[];
uchar env_get_char_spec (int index)
{
uchar c;
uchar env_get_char_spec (int index)
{
uchar c;
- read_dataflash(C
F
G_ENV_ADDR + index + offsetof(env_t,data),
+ read_dataflash(C
ONFI
G_ENV_ADDR + index + offsetof(env_t,data),
1, (char *)&c);
return (c);
}
void env_relocate_spec (void)
{
1, (char *)&c);
return (c);
}
void env_relocate_spec (void)
{
- read_dataflash(C
FG_ENV_ADDR, CF
G_ENV_SIZE, (char *)env_ptr);
+ read_dataflash(C
ONFIG_ENV_ADDR, CONFI
G_ENV_SIZE, (char *)env_ptr);
}
int saveenv(void)
{
/* env must be copied to do not alter env structure in memory*/
}
int saveenv(void)
{
/* env must be copied to do not alter env structure in memory*/
- unsigned char temp[C
F
G_ENV_SIZE];
- memcpy(temp, env_ptr, C
F
G_ENV_SIZE);
- return write_dataflash(C
FG_ENV_ADDR, (unsigned long)temp, CF
G_ENV_SIZE);
+ unsigned char temp[C
ONFI
G_ENV_SIZE];
+ memcpy(temp, env_ptr, C
ONFI
G_ENV_SIZE);
+ return write_dataflash(C
ONFIG_ENV_ADDR, (unsigned long)temp, CONFI
G_ENV_SIZE);
}
/************************************************************************
}
/************************************************************************
@@
-74,14
+74,14
@@
int env_init(void)
AT91F_DataflashInit(); /* prepare for DATAFLASH read/write */
/* read old CRC */
AT91F_DataflashInit(); /* prepare for DATAFLASH read/write */
/* read old CRC */
- read_dataflash(C
F
G_ENV_ADDR + offsetof(env_t, crc),
+ read_dataflash(C
ONFI
G_ENV_ADDR + offsetof(env_t, crc),
sizeof(ulong), (char *)&crc);
new = 0;
len = ENV_SIZE;
off = offsetof(env_t,data);
while (len > 0) {
int n = (len > sizeof(buf)) ? sizeof(buf) : len;
sizeof(ulong), (char *)&crc);
new = 0;
len = ENV_SIZE;
off = offsetof(env_t,data);
while (len > 0) {
int n = (len > sizeof(buf)) ? sizeof(buf) : len;
- read_dataflash(C
F
G_ENV_ADDR + off, n, (char *)buf);
+ read_dataflash(C
ONFI
G_ENV_ADDR + off, n, (char *)buf);
new = crc32 (new, buf, n);
len -= n;
off += n;
new = crc32 (new, buf, n);
len -= n;
off += n;
diff --git
a/common/env_eeprom.c
b/common/env_eeprom.c
index
df3e31e
..
1f0f413
100644
(file)
--- a/
common/env_eeprom.c
+++ b/
common/env_eeprom.c
@@
-40,7
+40,7
@@
uchar env_get_char_spec (int index)
uchar c;
eeprom_read (CFG_DEF_EEPROM_ADDR,
uchar c;
eeprom_read (CFG_DEF_EEPROM_ADDR,
- C
F
G_ENV_OFFSET+index+offsetof(env_t,data),
+ C
ONFI
G_ENV_OFFSET+index+offsetof(env_t,data),
&c, 1);
return (c);
&c, 1);
return (c);
@@
-49,17
+49,17
@@
uchar env_get_char_spec (int index)
void env_relocate_spec (void)
{
eeprom_read (CFG_DEF_EEPROM_ADDR,
void env_relocate_spec (void)
{
eeprom_read (CFG_DEF_EEPROM_ADDR,
- C
F
G_ENV_OFFSET,
+ C
ONFI
G_ENV_OFFSET,
(uchar*)env_ptr,
(uchar*)env_ptr,
- C
F
G_ENV_SIZE);
+ C
ONFI
G_ENV_SIZE);
}
int saveenv(void)
{
return eeprom_write (CFG_DEF_EEPROM_ADDR,
}
int saveenv(void)
{
return eeprom_write (CFG_DEF_EEPROM_ADDR,
- C
F
G_ENV_OFFSET,
+ C
ONFI
G_ENV_OFFSET,
(uchar *)env_ptr,
(uchar *)env_ptr,
- C
F
G_ENV_SIZE);
+ C
ONFI
G_ENV_SIZE);
}
/************************************************************************
}
/************************************************************************
@@
-78,7
+78,7
@@
int env_init(void)
/* read old CRC */
eeprom_read (CFG_DEF_EEPROM_ADDR,
/* read old CRC */
eeprom_read (CFG_DEF_EEPROM_ADDR,
- C
F
G_ENV_OFFSET+offsetof(env_t,crc),
+ C
ONFI
G_ENV_OFFSET+offsetof(env_t,crc),
(uchar *)&crc, sizeof(ulong));
new = 0;
(uchar *)&crc, sizeof(ulong));
new = 0;
@@
-87,7
+87,7
@@
int env_init(void)
while (len > 0) {
int n = (len > sizeof(buf)) ? sizeof(buf) : len;
while (len > 0) {
int n = (len > sizeof(buf)) ? sizeof(buf) : len;
- eeprom_read (CFG_DEF_EEPROM_ADDR, C
F
G_ENV_OFFSET+off, buf, n);
+ eeprom_read (CFG_DEF_EEPROM_ADDR, C
ONFI
G_ENV_OFFSET+off, buf, n);
new = crc32 (new, buf, n);
len -= n;
off += n;
new = crc32 (new, buf, n);
len -= n;
off += n;
diff --git
a/common/env_embedded.c
b/common/env_embedded.c
index
3b9914f
..
77e5619
100644
(file)
--- a/
common/env_embedded.c
+++ b/
common/env_embedded.c
@@
-180,7
+180,7
@@
env_t environment __PPCENV__ = {
"\0" /* Term. env_t.data with 2 NULs */
}
};
"\0" /* Term. env_t.data with 2 NULs */
}
};
-#ifdef C
F
G_ENV_ADDR_REDUND
+#ifdef C
ONFI
G_ENV_ADDR_REDUND
env_t redundand_environment __PPCENV__ = {
0, /* CRC Sum: invalid */
0, /* Flags: invalid */
env_t redundand_environment __PPCENV__ = {
0, /* CRC Sum: invalid */
0, /* Flags: invalid */
@@
-188,7
+188,7
@@
env_t redundand_environment __PPCENV__ = {
"\0"
}
};
"\0"
}
};
-#endif /* C
F
G_ENV_ADDR_REDUND */
+#endif /* C
ONFI
G_ENV_ADDR_REDUND */
/*
* These will end up in the .text section
/*
* These will end up in the .text section
@@
-203,6
+203,6
@@
unsigned long env_size __PPCTEXT__ = sizeof(env_t);
/*
* Add in absolutes.
*/
/*
* Add in absolutes.
*/
-GEN_ABS(env_offset, C
F
G_ENV_OFFSET);
+GEN_ABS(env_offset, C
ONFI
G_ENV_OFFSET);
#endif /* ENV_IS_EMBEDDED */
#endif /* ENV_IS_EMBEDDED */
diff --git
a/common/env_flash.c
b/common/env_flash.c
index
84166af
..
75ee8dd
100644
(file)
--- a/
common/env_flash.c
+++ b/
common/env_flash.c
@@
-36,17
+36,17
@@
DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)
#define CMD_SAVEENV
#if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)
#define CMD_SAVEENV
-#elif defined(C
F
G_ENV_ADDR_REDUND)
-#error Cannot use C
F
G_ENV_ADDR_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_FLASH
+#elif defined(C
ONFI
G_ENV_ADDR_REDUND)
+#error Cannot use C
ONFI
G_ENV_ADDR_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_FLASH
#endif
#endif
-#if defined(C
FG_ENV_SIZE_REDUND) && (CFG_ENV_SIZE_REDUND < CF
G_ENV_SIZE)
-#error C
FG_ENV_SIZE_REDUND should not be less then CF
G_ENV_SIZE
+#if defined(C
ONFIG_ENV_SIZE_REDUND) && (CONFIG_ENV_SIZE_REDUND < CONFI
G_ENV_SIZE)
+#error C
ONFIG_ENV_SIZE_REDUND should not be less then CONFI
G_ENV_SIZE
#endif
#ifdef CONFIG_INFERNO
#endif
#ifdef CONFIG_INFERNO
-# ifdef C
F
G_ENV_ADDR_REDUND
-#error C
F
G_ENV_ADDR_REDUND is not implemented for CONFIG_INFERNO
+# ifdef C
ONFI
G_ENV_ADDR_REDUND
+#error C
ONFI
G_ENV_ADDR_REDUND is not implemented for CONFIG_INFERNO
# endif
#endif
# endif
#endif
@@
-59,28
+59,28
@@
env_t *env_ptr = (env_t *)(&environment[0]);
#ifdef CMD_SAVEENV
/* static env_t *flash_addr = (env_t *)(&environment[0]);-broken on ARM-wd-*/
#ifdef CMD_SAVEENV
/* static env_t *flash_addr = (env_t *)(&environment[0]);-broken on ARM-wd-*/
-static env_t *flash_addr = (env_t *)C
F
G_ENV_ADDR;
+static env_t *flash_addr = (env_t *)C
ONFI
G_ENV_ADDR;
#endif
#else /* ! ENV_IS_EMBEDDED */
#endif
#else /* ! ENV_IS_EMBEDDED */
-env_t *env_ptr = (env_t *)C
F
G_ENV_ADDR;
+env_t *env_ptr = (env_t *)C
ONFI
G_ENV_ADDR;
#ifdef CMD_SAVEENV
#ifdef CMD_SAVEENV
-static env_t *flash_addr = (env_t *)C
F
G_ENV_ADDR;
+static env_t *flash_addr = (env_t *)C
ONFI
G_ENV_ADDR;
#endif
#endif /* ENV_IS_EMBEDDED */
#endif
#endif /* ENV_IS_EMBEDDED */
-#ifdef C
F
G_ENV_ADDR_REDUND
-static env_t *flash_addr_new = (env_t *)C
F
G_ENV_ADDR_REDUND;
+#ifdef C
ONFI
G_ENV_ADDR_REDUND
+static env_t *flash_addr_new = (env_t *)C
ONFI
G_ENV_ADDR_REDUND;
-/* C
F
G_ENV_ADDR is supposed to be on sector boundary */
-static ulong end_addr = C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1;
-static ulong end_addr_new = C
FG_ENV_ADDR_REDUND + CF
G_ENV_SECT_SIZE - 1;
+/* C
ONFI
G_ENV_ADDR is supposed to be on sector boundary */
+static ulong end_addr = C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1;
+static ulong end_addr_new = C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SECT_SIZE - 1;
#define ACTIVE_FLAG 1
#define OBSOLETE_FLAG 0
#define ACTIVE_FLAG 1
#define OBSOLETE_FLAG 0
-#endif /* C
F
G_ENV_ADDR_REDUND */
+#endif /* C
ONFI
G_ENV_ADDR_REDUND */
extern uchar default_environment[];
extern int default_environment_size;
extern uchar default_environment[];
extern int default_environment_size;
@@
-91,7
+91,7
@@
uchar env_get_char_spec (int index)
return ( *((uchar *)(gd->env_addr + index)) );
}
return ( *((uchar *)(gd->env_addr + index)) );
}
-#ifdef C
F
G_ENV_ADDR_REDUND
+#ifdef C
ONFI
G_ENV_ADDR_REDUND
int env_init(void)
{
int env_init(void)
{
@@
-142,7
+142,7
@@
int saveenv(void)
char *saved_data = NULL;
int rc = 1;
char flag = OBSOLETE_FLAG, new_flag = ACTIVE_FLAG;
char *saved_data = NULL;
int rc = 1;
char flag = OBSOLETE_FLAG, new_flag = ACTIVE_FLAG;
-#if C
FG_ENV_SECT_SIZE > CF
G_ENV_SIZE
+#if C
ONFIG_ENV_SECT_SIZE > CONFI
G_ENV_SIZE
ulong up_data = 0;
#endif
ulong up_data = 0;
#endif
@@
-160,8
+160,8
@@
int saveenv(void)
goto Done;
}
goto Done;
}
-#if C
FG_ENV_SECT_SIZE > CF
G_ENV_SIZE
- up_data = (end_addr_new + 1 - ((long)flash_addr_new + C
F
G_ENV_SIZE));
+#if C
ONFIG_ENV_SECT_SIZE > CONFI
G_ENV_SIZE
+ up_data = (end_addr_new + 1 - ((long)flash_addr_new + C
ONFI
G_ENV_SIZE));
debug ("Data to save 0x%x\n", up_data);
if (up_data) {
if ((saved_data = malloc(up_data)) == NULL) {
debug ("Data to save 0x%x\n", up_data);
if (up_data) {
if ((saved_data = malloc(up_data)) == NULL) {
@@
-170,9
+170,9
@@
int saveenv(void)
goto Done;
}
memcpy(saved_data,
goto Done;
}
memcpy(saved_data,
- (void *)((long)flash_addr_new + C
F
G_ENV_SIZE), up_data);
+ (void *)((long)flash_addr_new + C
ONFI
G_ENV_SIZE), up_data);
debug ("Data (start 0x%x, len 0x%x) saved at 0x%x\n",
debug ("Data (start 0x%x, len 0x%x) saved at 0x%x\n",
- (long)flash_addr_new + C
F
G_ENV_SIZE,
+ (long)flash_addr_new + C
ONFI
G_ENV_SIZE,
up_data, saved_data);
}
#endif
up_data, saved_data);
}
#endif
@@
-206,12
+206,12
@@
int saveenv(void)
}
puts ("done\n");
}
puts ("done\n");
-#if C
FG_ENV_SECT_SIZE > CF
G_ENV_SIZE
+#if C
ONFIG_ENV_SECT_SIZE > CONFI
G_ENV_SIZE
if (up_data) { /* restore the rest of sector */
debug ("Restoring the rest of data to 0x%x len 0x%x\n",
if (up_data) { /* restore the rest of sector */
debug ("Restoring the rest of data to 0x%x len 0x%x\n",
- (long)flash_addr_new + C
F
G_ENV_SIZE, up_data);
+ (long)flash_addr_new + C
ONFI
G_ENV_SIZE, up_data);
if (flash_write(saved_data,
if (flash_write(saved_data,
- (long)flash_addr_new + C
F
G_ENV_SIZE,
+ (long)flash_addr_new + C
ONFI
G_ENV_SIZE,
up_data)) {
flash_perror(rc);
goto Done;
up_data)) {
flash_perror(rc);
goto Done;
@@
-242,7
+242,7
@@
Done:
}
#endif /* CMD_SAVEENV */
}
#endif /* CMD_SAVEENV */
-#else /* ! C
F
G_ENV_ADDR_REDUND */
+#else /* ! C
ONFI
G_ENV_ADDR_REDUND */
int env_init(void)
{
int env_init(void)
{
@@
-264,36
+264,36
@@
int saveenv(void)
int len, rc;
ulong end_addr;
ulong flash_sect_addr;
int len, rc;
ulong end_addr;
ulong flash_sect_addr;
-#if defined(C
FG_ENV_SECT_SIZE) && (CFG_ENV_SECT_SIZE > CF
G_ENV_SIZE)
+#if defined(C
ONFIG_ENV_SECT_SIZE) && (CONFIG_ENV_SECT_SIZE > CONFI
G_ENV_SIZE)
ulong flash_offset;
ulong flash_offset;
- uchar env_buffer[C
F
G_ENV_SECT_SIZE];
+ uchar env_buffer[C
ONFI
G_ENV_SECT_SIZE];
#else
uchar *env_buffer = (uchar *)env_ptr;
#else
uchar *env_buffer = (uchar *)env_ptr;
-#endif /* C
F
G_ENV_SECT_SIZE */
+#endif /* C
ONFI
G_ENV_SECT_SIZE */
int rcode = 0;
int rcode = 0;
-#if defined(C
FG_ENV_SECT_SIZE) && (CFG_ENV_SECT_SIZE > CF
G_ENV_SIZE)
+#if defined(C
ONFIG_ENV_SECT_SIZE) && (CONFIG_ENV_SECT_SIZE > CONFI
G_ENV_SIZE)
- flash_offset = ((ulong)flash_addr) & (C
F
G_ENV_SECT_SIZE-1);
- flash_sect_addr = ((ulong)flash_addr) & ~(C
F
G_ENV_SECT_SIZE-1);
+ flash_offset = ((ulong)flash_addr) & (C
ONFI
G_ENV_SECT_SIZE-1);
+ flash_sect_addr = ((ulong)flash_addr) & ~(C
ONFI
G_ENV_SECT_SIZE-1);
debug ( "copy old content: "
"sect_addr: %08lX env_addr: %08lX offset: %08lX\n",
flash_sect_addr, (ulong)flash_addr, flash_offset);
/* copy old contents to temporary buffer */
debug ( "copy old content: "
"sect_addr: %08lX env_addr: %08lX offset: %08lX\n",
flash_sect_addr, (ulong)flash_addr, flash_offset);
/* copy old contents to temporary buffer */
- memcpy (env_buffer, (void *)flash_sect_addr, C
F
G_ENV_SECT_SIZE);
+ memcpy (env_buffer, (void *)flash_sect_addr, C
ONFI
G_ENV_SECT_SIZE);
/* copy current environment to temporary buffer */
memcpy ((uchar *)((unsigned long)env_buffer + flash_offset),
env_ptr,
/* copy current environment to temporary buffer */
memcpy ((uchar *)((unsigned long)env_buffer + flash_offset),
env_ptr,
- C
F
G_ENV_SIZE);
+ C
ONFI
G_ENV_SIZE);
- len = C
F
G_ENV_SECT_SIZE;
+ len = C
ONFI
G_ENV_SECT_SIZE;
#else
flash_sect_addr = (ulong)flash_addr;
#else
flash_sect_addr = (ulong)flash_addr;
- len = C
F
G_ENV_SIZE;
-#endif /* C
F
G_ENV_SECT_SIZE */
+ len = C
ONFI
G_ENV_SIZE;
+#endif /* C
ONFI
G_ENV_SECT_SIZE */
#ifndef CONFIG_INFERNO
end_addr = flash_sect_addr + len - 1;
#ifndef CONFIG_INFERNO
end_addr = flash_sect_addr + len - 1;
@@
-329,12
+329,12
@@
int saveenv(void)
#endif /* CMD_SAVEENV */
#endif /* CMD_SAVEENV */
-#endif /* C
F
G_ENV_ADDR_REDUND */
+#endif /* C
ONFI
G_ENV_ADDR_REDUND */
void env_relocate_spec (void)
{
void env_relocate_spec (void)
{
-#if !defined(ENV_IS_EMBEDDED) || defined(C
F
G_ENV_ADDR_REDUND)
-#ifdef C
F
G_ENV_ADDR_REDUND
+#if !defined(ENV_IS_EMBEDDED) || defined(C
ONFI
G_ENV_ADDR_REDUND)
+#ifdef C
ONFI
G_ENV_ADDR_REDUND
if (gd->env_addr != (ulong)&(flash_addr->data)) {
env_t * etmp = flash_addr;
ulong ltmp = end_addr;
if (gd->env_addr != (ulong)&(flash_addr->data)) {
env_t * etmp = flash_addr;
ulong ltmp = end_addr;
@@
-374,9
+374,9
@@
void env_relocate_spec (void)
if (gd->env_valid == 2)
puts ("*** Warning - some problems detected "
"reading environment; recovered successfully\n\n");
if (gd->env_valid == 2)
puts ("*** Warning - some problems detected "
"reading environment; recovered successfully\n\n");
-#endif /* C
F
G_ENV_ADDR_REDUND */
+#endif /* C
ONFI
G_ENV_ADDR_REDUND */
#ifdef CMD_SAVEENV
#ifdef CMD_SAVEENV
- memcpy (env_ptr, (void*)flash_addr, C
F
G_ENV_SIZE);
+ memcpy (env_ptr, (void*)flash_addr, C
ONFI
G_ENV_SIZE);
#endif
#endif
-#endif /* ! ENV_IS_EMBEDDED || C
F
G_ENV_ADDR_REDUND */
+#endif /* ! ENV_IS_EMBEDDED || C
ONFI
G_ENV_ADDR_REDUND */
}
}
diff --git
a/common/env_nand.c
b/common/env_nand.c
index
9d01d7c
..
8af9e74
100644
(file)
--- a/
common/env_nand.c
+++ b/
common/env_nand.c
@@
-41,20
+41,20
@@
#if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)
#define CMD_SAVEENV
#if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)
#define CMD_SAVEENV
-#elif defined(C
F
G_ENV_OFFSET_REDUND)
-#error Cannot use C
F
G_ENV_OFFSET_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_NAND
+#elif defined(C
ONFI
G_ENV_OFFSET_REDUND)
+#error Cannot use C
ONFI
G_ENV_OFFSET_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_NAND
#endif
#endif
-#if defined(C
FG_ENV_SIZE_REDUND) && (CFG_ENV_SIZE_REDUND != CF
G_ENV_SIZE)
-#error C
FG_ENV_SIZE_REDUND should be the same as CF
G_ENV_SIZE
+#if defined(C
ONFIG_ENV_SIZE_REDUND) && (CONFIG_ENV_SIZE_REDUND != CONFI
G_ENV_SIZE)
+#error C
ONFIG_ENV_SIZE_REDUND should be the same as CONFI
G_ENV_SIZE
#endif
#ifdef CONFIG_INFERNO
#error CONFIG_INFERNO not supported yet
#endif
#endif
#ifdef CONFIG_INFERNO
#error CONFIG_INFERNO not supported yet
#endif
-#ifndef C
F
G_ENV_RANGE
-#define C
FG_ENV_RANGE CF
G_ENV_SIZE
+#ifndef C
ONFI
G_ENV_RANGE
+#define C
ONFIG_ENV_RANGE CONFI
G_ENV_SIZE
#endif
int nand_legacy_rw (struct nand_chip* nand, int cmd,
#endif
int nand_legacy_rw (struct nand_chip* nand, int cmd,
@@
-107,10
+107,10
@@
int env_init(void)
int crc1_ok = 0, crc2_ok = 0;
env_t *tmp_env1, *tmp_env2;
int crc1_ok = 0, crc2_ok = 0;
env_t *tmp_env1, *tmp_env2;
- total = C
F
G_ENV_SIZE;
+ total = C
ONFI
G_ENV_SIZE;
tmp_env1 = env_ptr;
tmp_env1 = env_ptr;
- tmp_env2 = (env_t *)((ulong)env_ptr + C
F
G_ENV_SIZE);
+ tmp_env2 = (env_t *)((ulong)env_ptr + C
ONFI
G_ENV_SIZE);
crc1_ok = (crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc);
crc2_ok = (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc);
crc1_ok = (crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc);
crc2_ok = (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc);
@@
-154,16
+154,16
@@
int env_init(void)
*/
int writeenv(size_t offset, u_char *buf)
{
*/
int writeenv(size_t offset, u_char *buf)
{
- size_t end = offset + C
F
G_ENV_RANGE;
+ size_t end = offset + C
ONFI
G_ENV_RANGE;
size_t amount_saved = 0;
size_t blocksize, len;
u_char *char_ptr;
blocksize = nand_info[0].erasesize;
size_t amount_saved = 0;
size_t blocksize, len;
u_char *char_ptr;
blocksize = nand_info[0].erasesize;
- len = min(blocksize, C
F
G_ENV_SIZE);
+ len = min(blocksize, C
ONFI
G_ENV_SIZE);
- while (amount_saved < C
F
G_ENV_SIZE && offset < end) {
+ while (amount_saved < C
ONFI
G_ENV_SIZE && offset < end) {
if (nand_block_isbad(&nand_info[0], offset)) {
offset += blocksize;
} else {
if (nand_block_isbad(&nand_info[0], offset)) {
offset += blocksize;
} else {
@@
-175,12
+175,12
@@
int writeenv(size_t offset, u_char *buf)
amount_saved += len;
}
}
amount_saved += len;
}
}
- if (amount_saved != C
F
G_ENV_SIZE)
+ if (amount_saved != C
ONFI
G_ENV_SIZE)
return 1;
return 0;
}
return 1;
return 0;
}
-#ifdef C
F
G_ENV_OFFSET_REDUND
+#ifdef C
ONFI
G_ENV_OFFSET_REDUND
int saveenv(void)
{
size_t total;
int saveenv(void)
{
size_t total;
@@
-188,31
+188,31
@@
int saveenv(void)
nand_erase_options_t nand_erase_options;
env_ptr->flags++;
nand_erase_options_t nand_erase_options;
env_ptr->flags++;
- total = C
F
G_ENV_SIZE;
+ total = C
ONFI
G_ENV_SIZE;
- nand_erase_options.length = C
F
G_ENV_RANGE;
+ nand_erase_options.length = C
ONFI
G_ENV_RANGE;
nand_erase_options.quiet = 0;
nand_erase_options.jffs2 = 0;
nand_erase_options.scrub = 0;
nand_erase_options.quiet = 0;
nand_erase_options.jffs2 = 0;
nand_erase_options.scrub = 0;
- if (C
FG_ENV_RANGE < CF
G_ENV_SIZE)
+ if (C
ONFIG_ENV_RANGE < CONFI
G_ENV_SIZE)
return 1;
if(gd->env_valid == 1) {
puts ("Erasing redundant Nand...\n");
return 1;
if(gd->env_valid == 1) {
puts ("Erasing redundant Nand...\n");
- nand_erase_options.offset = C
F
G_ENV_OFFSET_REDUND;
+ nand_erase_options.offset = C
ONFI
G_ENV_OFFSET_REDUND;
if (nand_erase_opts(&nand_info[0], &nand_erase_options))
return 1;
puts ("Writing to redundant Nand... ");
if (nand_erase_opts(&nand_info[0], &nand_erase_options))
return 1;
puts ("Writing to redundant Nand... ");
- ret = writeenv(C
F
G_ENV_OFFSET_REDUND, (u_char *) env_ptr);
+ ret = writeenv(C
ONFI
G_ENV_OFFSET_REDUND, (u_char *) env_ptr);
} else {
puts ("Erasing Nand...\n");
} else {
puts ("Erasing Nand...\n");
- nand_erase_options.offset = C
F
G_ENV_OFFSET;
+ nand_erase_options.offset = C
ONFI
G_ENV_OFFSET;
if (nand_erase_opts(&nand_info[0], &nand_erase_options))
return 1;
puts ("Writing to Nand... ");
if (nand_erase_opts(&nand_info[0], &nand_erase_options))
return 1;
puts ("Writing to Nand... ");
- ret = writeenv(C
F
G_ENV_OFFSET, (u_char *) env_ptr);
+ ret = writeenv(C
ONFI
G_ENV_OFFSET, (u_char *) env_ptr);
}
if (ret) {
puts("FAILED!\n");
}
if (ret) {
puts("FAILED!\n");
@@
-223,28
+223,28
@@
int saveenv(void)
gd->env_valid = (gd->env_valid == 2 ? 1 : 2);
return ret;
}
gd->env_valid = (gd->env_valid == 2 ? 1 : 2);
return ret;
}
-#else /* ! C
F
G_ENV_OFFSET_REDUND */
+#else /* ! C
ONFI
G_ENV_OFFSET_REDUND */
int saveenv(void)
{
size_t total;
int ret = 0;
nand_erase_options_t nand_erase_options;
int saveenv(void)
{
size_t total;
int ret = 0;
nand_erase_options_t nand_erase_options;
- nand_erase_options.length = C
F
G_ENV_RANGE;
+ nand_erase_options.length = C
ONFI
G_ENV_RANGE;
nand_erase_options.quiet = 0;
nand_erase_options.jffs2 = 0;
nand_erase_options.scrub = 0;
nand_erase_options.quiet = 0;
nand_erase_options.jffs2 = 0;
nand_erase_options.scrub = 0;
- nand_erase_options.offset = C
F
G_ENV_OFFSET;
+ nand_erase_options.offset = C
ONFI
G_ENV_OFFSET;
- if (C
FG_ENV_RANGE < CF
G_ENV_SIZE)
+ if (C
ONFIG_ENV_RANGE < CONFI
G_ENV_SIZE)
return 1;
puts ("Erasing Nand...\n");
if (nand_erase_opts(&nand_info[0], &nand_erase_options))
return 1;
puts ("Writing to Nand... ");
return 1;
puts ("Erasing Nand...\n");
if (nand_erase_opts(&nand_info[0], &nand_erase_options))
return 1;
puts ("Writing to Nand... ");
- total = C
F
G_ENV_SIZE;
- if (writeenv(C
F
G_ENV_OFFSET, (u_char *) env_ptr)) {
+ total = C
ONFI
G_ENV_SIZE;
+ if (writeenv(C
ONFI
G_ENV_OFFSET, (u_char *) env_ptr)) {
puts("FAILED!\n");
return 1;
}
puts("FAILED!\n");
return 1;
}
@@
-252,21
+252,21
@@
int saveenv(void)
puts ("done\n");
return ret;
}
puts ("done\n");
return ret;
}
-#endif /* C
F
G_ENV_OFFSET_REDUND */
+#endif /* C
ONFI
G_ENV_OFFSET_REDUND */
#endif /* CMD_SAVEENV */
int readenv (size_t offset, u_char * buf)
{
#endif /* CMD_SAVEENV */
int readenv (size_t offset, u_char * buf)
{
- size_t end = offset + C
F
G_ENV_RANGE;
+ size_t end = offset + C
ONFI
G_ENV_RANGE;
size_t amount_loaded = 0;
size_t blocksize, len;
u_char *char_ptr;
blocksize = nand_info[0].erasesize;
size_t amount_loaded = 0;
size_t blocksize, len;
u_char *char_ptr;
blocksize = nand_info[0].erasesize;
- len = min(blocksize, C
F
G_ENV_SIZE);
+ len = min(blocksize, C
ONFI
G_ENV_SIZE);
- while (amount_loaded < C
F
G_ENV_SIZE && offset < end) {
+ while (amount_loaded < C
ONFI
G_ENV_SIZE && offset < end) {
if (nand_block_isbad(&nand_info[0], offset)) {
offset += blocksize;
} else {
if (nand_block_isbad(&nand_info[0], offset)) {
offset += blocksize;
} else {
@@
-277,13
+277,13
@@
int readenv (size_t offset, u_char * buf)
amount_loaded += len;
}
}
amount_loaded += len;
}
}
- if (amount_loaded != C
F
G_ENV_SIZE)
+ if (amount_loaded != C
ONFI
G_ENV_SIZE)
return 1;
return 0;
}
return 1;
return 0;
}
-#ifdef C
F
G_ENV_OFFSET_REDUND
+#ifdef C
ONFI
G_ENV_OFFSET_REDUND
void env_relocate_spec (void)
{
#if !defined(ENV_IS_EMBEDDED)
void env_relocate_spec (void)
{
#if !defined(ENV_IS_EMBEDDED)
@@
-291,14
+291,14
@@
void env_relocate_spec (void)
int crc1_ok = 0, crc2_ok = 0;
env_t *tmp_env1, *tmp_env2;
int crc1_ok = 0, crc2_ok = 0;
env_t *tmp_env1, *tmp_env2;
- total = C
F
G_ENV_SIZE;
+ total = C
ONFI
G_ENV_SIZE;
- tmp_env1 = (env_t *) malloc(C
F
G_ENV_SIZE);
- tmp_env2 = (env_t *) malloc(C
F
G_ENV_SIZE);
+ tmp_env1 = (env_t *) malloc(C
ONFI
G_ENV_SIZE);
+ tmp_env2 = (env_t *) malloc(C
ONFI
G_ENV_SIZE);
- if (readenv(C
F
G_ENV_OFFSET, (u_char *) tmp_env1))
+ if (readenv(C
ONFI
G_ENV_OFFSET, (u_char *) tmp_env1))
puts("No Valid Environment Area Found\n");
puts("No Valid Environment Area Found\n");
- if (readenv(C
F
G_ENV_OFFSET_REDUND, (u_char *) tmp_env2))
+ if (readenv(C
ONFI
G_ENV_OFFSET_REDUND, (u_char *) tmp_env2))
puts("No Valid Reundant Environment Area Found\n");
crc1_ok = (crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc);
puts("No Valid Reundant Environment Area Found\n");
crc1_ok = (crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc);
@@
-336,7
+336,7
@@
void env_relocate_spec (void)
#endif /* ! ENV_IS_EMBEDDED */
}
#endif /* ! ENV_IS_EMBEDDED */
}
-#else /* ! C
F
G_ENV_OFFSET_REDUND */
+#else /* ! C
ONFI
G_ENV_OFFSET_REDUND */
/*
* The legacy NAND code saved the environment in the first NAND device i.e.,
* nand_dev_desc + 0. This is also the behaviour using the new NAND code.
/*
* The legacy NAND code saved the environment in the first NAND device i.e.,
* nand_dev_desc + 0. This is also the behaviour using the new NAND code.
@@
-346,7
+346,7
@@
void env_relocate_spec (void)
#if !defined(ENV_IS_EMBEDDED)
int ret;
#if !defined(ENV_IS_EMBEDDED)
int ret;
- ret = readenv(C
F
G_ENV_OFFSET, (u_char *) env_ptr);
+ ret = readenv(C
ONFI
G_ENV_OFFSET, (u_char *) env_ptr);
if (ret)
return use_default();
if (ret)
return use_default();
@@
-354,7
+354,7
@@
void env_relocate_spec (void)
return use_default();
#endif /* ! ENV_IS_EMBEDDED */
}
return use_default();
#endif /* ! ENV_IS_EMBEDDED */
}
-#endif /* C
F
G_ENV_OFFSET_REDUND */
+#endif /* C
ONFI
G_ENV_OFFSET_REDUND */
#if !defined(ENV_IS_EMBEDDED)
static void use_default()
#if !defined(ENV_IS_EMBEDDED)
static void use_default()
diff --git
a/common/env_nvram.c
b/common/env_nvram.c
index
c59bf9f
..
a8b7959
100644
(file)
--- a/
common/env_nvram.c
+++ b/
common/env_nvram.c
@@
-52,7
+52,7
@@
extern void *nvram_read(void *dest, const long src, size_t count);
extern void nvram_write(long dest, const void *src, size_t count);
env_t *env_ptr = NULL;
#else
extern void nvram_write(long dest, const void *src, size_t count);
env_t *env_ptr = NULL;
#else
-env_t *env_ptr = (env_t *)C
F
G_ENV_ADDR;
+env_t *env_ptr = (env_t *)C
ONFI
G_ENV_ADDR;
#endif
char * env_name_spec = "NVRAM";
#endif
char * env_name_spec = "NVRAM";
@@
-66,7
+66,7
@@
uchar env_get_char_spec (int index)
#ifdef CFG_NVRAM_ACCESS_ROUTINE
uchar c;
#ifdef CFG_NVRAM_ACCESS_ROUTINE
uchar c;
- nvram_read(&c, C
F
G_ENV_ADDR+index, 1);
+ nvram_read(&c, C
ONFI
G_ENV_ADDR+index, 1);
return c;
#else
return c;
#else
@@
-83,7
+83,7
@@
uchar env_get_char_spec (int index)
#ifdef CFG_NVRAM_ACCESS_ROUTINE
uchar c;
#ifdef CFG_NVRAM_ACCESS_ROUTINE
uchar c;
- nvram_read(&c, C
F
G_ENV_ADDR+index, 1);
+ nvram_read(&c, C
ONFI
G_ENV_ADDR+index, 1);
return c;
#else
return c;
#else
@@
-95,9
+95,9
@@
uchar env_get_char_spec (int index)
void env_relocate_spec (void)
{
#if defined(CFG_NVRAM_ACCESS_ROUTINE)
void env_relocate_spec (void)
{
#if defined(CFG_NVRAM_ACCESS_ROUTINE)
- nvram_read(env_ptr, C
FG_ENV_ADDR, CF
G_ENV_SIZE);
+ nvram_read(env_ptr, C
ONFIG_ENV_ADDR, CONFI
G_ENV_SIZE);
#else
#else
- memcpy (env_ptr, (void*)C
FG_ENV_ADDR, CF
G_ENV_SIZE);
+ memcpy (env_ptr, (void*)C
ONFIG_ENV_ADDR, CONFI
G_ENV_SIZE);
#endif
}
#endif
}
@@
-108,9
+108,9
@@
int saveenv (void)
enable_nvram();
#endif
#ifdef CFG_NVRAM_ACCESS_ROUTINE
enable_nvram();
#endif
#ifdef CFG_NVRAM_ACCESS_ROUTINE
- nvram_write(C
FG_ENV_ADDR, env_ptr, CF
G_ENV_SIZE);
+ nvram_write(C
ONFIG_ENV_ADDR, env_ptr, CONFI
G_ENV_SIZE);
#else
#else
- if (memcpy ((char *)C
FG_ENV_ADDR, env_ptr, CF
G_ENV_SIZE) == NULL)
+ if (memcpy ((char *)C
ONFIG_ENV_ADDR, env_ptr, CONFI
G_ENV_SIZE) == NULL)
rcode = 1 ;
#endif
#ifdef CONFIG_AMIGAONEG3SE
rcode = 1 ;
#endif
#ifdef CONFIG_AMIGAONEG3SE
@@
-134,11
+134,11
@@
int env_init (void)
#if defined(CFG_NVRAM_ACCESS_ROUTINE)
ulong crc;
uchar data[ENV_SIZE];
#if defined(CFG_NVRAM_ACCESS_ROUTINE)
ulong crc;
uchar data[ENV_SIZE];
- nvram_read (&crc, C
F
G_ENV_ADDR, sizeof(ulong));
- nvram_read (data, C
F
G_ENV_ADDR+sizeof(ulong), ENV_SIZE);
+ nvram_read (&crc, C
ONFI
G_ENV_ADDR, sizeof(ulong));
+ nvram_read (data, C
ONFI
G_ENV_ADDR+sizeof(ulong), ENV_SIZE);
if (crc32(0, data, ENV_SIZE) == crc) {
if (crc32(0, data, ENV_SIZE) == crc) {
- gd->env_addr = (ulong)C
F
G_ENV_ADDR + sizeof(long);
+ gd->env_addr = (ulong)C
ONFI
G_ENV_ADDR + sizeof(long);
#else
if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
gd->env_addr = (ulong)&(env_ptr->data);
#else
if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
gd->env_addr = (ulong)&(env_ptr->data);
diff --git
a/common/env_onenand.c
b/common/env_onenand.c
index
09a79d0
..
3c65b3e
100644
(file)
--- a/
common/env_onenand.c
+++ b/
common/env_onenand.c
@@
-62,7
+62,7
@@
void env_relocate_spec(void)
int use_default = 0;
size_t retlen;
int use_default = 0;
size_t retlen;
- env_addr = C
F
G_ENV_ADDR;
+ env_addr = C
ONFI
G_ENV_ADDR;
/* Check OneNAND exist */
if (onenand_mtd.writesize)
/* Check OneNAND exist */
if (onenand_mtd.writesize)
@@
-89,13
+89,13
@@
void env_relocate_spec(void)
int saveenv(void)
{
int saveenv(void)
{
- unsigned long env_addr = C
F
G_ENV_ADDR;
+ unsigned long env_addr = C
ONFI
G_ENV_ADDR;
struct erase_info instr = {
.callback = NULL,
};
size_t retlen;
struct erase_info instr = {
.callback = NULL,
};
size_t retlen;
- instr.len = C
F
G_ENV_SIZE;
+ instr.len = C
ONFI
G_ENV_SIZE;
instr.addr = env_addr;
if (onenand_erase(&onenand_mtd, &instr)) {
printf("OneNAND: erase failed at 0x%08lx\n", env_addr);
instr.addr = env_addr;
if (onenand_erase(&onenand_mtd, &instr)) {
printf("OneNAND: erase failed at 0x%08lx\n", env_addr);
diff --git
a/common/env_sf.c
b/common/env_sf.c
index
faf6260
..
1bbf93f
100644
(file)
--- a/
common/env_sf.c
+++ b/
common/env_sf.c
@@
-29,17
+29,17
@@
#include <environment.h>
#include <spi_flash.h>
#include <environment.h>
#include <spi_flash.h>
-#ifndef C
F
G_ENV_SPI_BUS
-# define C
FG_ENV_SPI_BUS
0
+#ifndef C
ONFI
G_ENV_SPI_BUS
+# define C
ONFIG_ENV_SPI_BUS
0
#endif
#endif
-#ifndef C
F
G_ENV_SPI_CS
-# define C
FG_ENV_SPI_CS
0
+#ifndef C
ONFI
G_ENV_SPI_CS
+# define C
ONFIG_ENV_SPI_CS
0
#endif
#endif
-#ifndef C
F
G_ENV_SPI_MAX_HZ
-# define C
FG_ENV_SPI_MAX_HZ
1000000
+#ifndef C
ONFI
G_ENV_SPI_MAX_HZ
+# define C
ONFIG_ENV_SPI_MAX_HZ
1000000
#endif
#endif
-#ifndef C
F
G_ENV_SPI_MODE
-# define C
FG_ENV_SPI_MODE
SPI_MODE_3
+#ifndef C
ONFI
G_ENV_SPI_MODE
+# define C
ONFIG_ENV_SPI_MODE
SPI_MODE_3
#endif
DECLARE_GLOBAL_DATA_PTR;
#endif
DECLARE_GLOBAL_DATA_PTR;
@@
-67,18
+67,18
@@
int saveenv(void)
return 1;
}
return 1;
}
- if (C
FG_ENV_SIZE > CF
G_ENV_SECT_SIZE) {
- sector = C
FG_ENV_SIZE / CF
G_ENV_SECT_SIZE;
- if (C
FG_ENV_SIZE % CF
G_ENV_SECT_SIZE)
+ if (C
ONFIG_ENV_SIZE > CONFI
G_ENV_SECT_SIZE) {
+ sector = C
ONFIG_ENV_SIZE / CONFI
G_ENV_SECT_SIZE;
+ if (C
ONFIG_ENV_SIZE % CONFI
G_ENV_SECT_SIZE)
sector++;
}
puts("Erasing SPI flash...");
sector++;
}
puts("Erasing SPI flash...");
- if (spi_flash_erase(env_flash, C
FG_ENV_OFFSET, sector * CF
G_ENV_SECT_SIZE))
+ if (spi_flash_erase(env_flash, C
ONFIG_ENV_OFFSET, sector * CONFI
G_ENV_SECT_SIZE))
return 1;
puts("Writing to SPI flash...");
return 1;
puts("Writing to SPI flash...");
- if (spi_flash_write(env_flash, C
FG_ENV_OFFSET, CF
G_ENV_SIZE, env_ptr))
+ if (spi_flash_write(env_flash, C
ONFIG_ENV_OFFSET, CONFI
G_ENV_SIZE, env_ptr))
return 1;
puts("done\n");
return 1;
puts("done\n");
@@
-89,12
+89,12
@@
void env_relocate_spec(void)
{
int ret;
{
int ret;
- env_flash = spi_flash_probe(C
FG_ENV_SPI_BUS, CF
G_ENV_SPI_CS,
- C
FG_ENV_SPI_MAX_HZ, CF
G_ENV_SPI_MODE);
+ env_flash = spi_flash_probe(C
ONFIG_ENV_SPI_BUS, CONFI
G_ENV_SPI_CS,
+ C
ONFIG_ENV_SPI_MAX_HZ, CONFI
G_ENV_SPI_MODE);
if (!env_flash)
goto err_probe;
if (!env_flash)
goto err_probe;
- ret = spi_flash_read(env_flash, C
FG_ENV_OFFSET, CF
G_ENV_SIZE, env_ptr);
+ ret = spi_flash_read(env_flash, C
ONFIG_ENV_OFFSET, CONFI
G_ENV_SIZE, env_ptr);
if (ret)
goto err_read;
if (ret)
goto err_read;
@@
-112,7
+112,7
@@
err_probe:
err_crc:
puts("*** Warning - bad CRC, using default environment\n\n");
err_crc:
puts("*** Warning - bad CRC, using default environment\n\n");
- if (default_environment_size > C
F
G_ENV_SIZE) {
+ if (default_environment_size > C
ONFI
G_ENV_SIZE) {
gd->env_valid = 0;
puts("*** Error - default environment is too large\n\n");
return;
gd->env_valid = 0;
puts("*** Error - default environment is too large\n\n");
return;
diff --git
a/drivers/mtd/cfi_flash.c
b/drivers/mtd/cfi_flash.c
index
7937b61
..
0d1ee8a
100644
(file)
--- a/
drivers/mtd/cfi_flash.c
+++ b/
drivers/mtd/cfi_flash.c
@@
-255,7
+255,7
@@
u64 flash_read64(void *addr)__attribute__((weak, alias("__flash_read64")));
/*-----------------------------------------------------------------------
*/
/*-----------------------------------------------------------------------
*/
-#if defined(CONFIG_ENV_IS_IN_FLASH) || defined(C
F
G_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
+#if defined(CONFIG_ENV_IS_IN_FLASH) || defined(C
ONFI
G_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
static flash_info_t *flash_get_info(ulong base)
{
int i;
static flash_info_t *flash_get_info(ulong base)
{
int i;
@@
-2033,17
+2033,17
@@
unsigned long flash_init (void)
/* Environment protection ON by default */
#ifdef CONFIG_ENV_IS_IN_FLASH
flash_protect (FLAG_PROTECT_SET,
/* Environment protection ON by default */
#ifdef CONFIG_ENV_IS_IN_FLASH
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
- flash_get_info(C
F
G_ENV_ADDR));
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
+ flash_get_info(C
ONFI
G_ENV_ADDR));
#endif
/* Redundant environment protection ON by default */
#endif
/* Redundant environment protection ON by default */
-#ifdef C
F
G_ENV_ADDR_REDUND
+#ifdef C
ONFI
G_ENV_ADDR_REDUND
flash_protect (FLAG_PROTECT_SET,
flash_protect (FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR_REDUND,
- C
FG_ENV_ADDR_REDUND + CF
G_ENV_SIZE_REDUND - 1,
- flash_get_info(C
F
G_ENV_ADDR_REDUND));
+ C
ONFI
G_ENV_ADDR_REDUND,
+ C
ONFIG_ENV_ADDR_REDUND + CONFI
G_ENV_SIZE_REDUND - 1,
+ flash_get_info(C
ONFI
G_ENV_ADDR_REDUND));
#endif
#if defined(CFG_FLASH_AUTOPROTECT_LIST)
#endif
#if defined(CFG_FLASH_AUTOPROTECT_LIST)
diff --git
a/include/configs/A3000.h
b/include/configs/A3000.h
index
35180d6
..
cee5560
100644
(file)
--- a/
include/configs/A3000.h
+++ b/
include/configs/A3000.h
@@
-298,9
+298,9
@@
* It's stored in flash separately.
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* It's stored in flash separately.
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
0xFFFE0000
-#define C
FG_ENV_SIZE
0x00020000 /* Size of the Environment */
-#define C
FG_ENV_SECT_SIZE
0x00020000 /* Size of the Environment Sector */
+#define C
ONFIG_ENV_ADDR
0xFFFE0000
+#define C
ONFIG_ENV_SIZE
0x00020000 /* Size of the Environment */
+#define C
ONFIG_ENV_SECT_SIZE
0x00020000 /* Size of the Environment Sector */
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/ADCIOP.h
b/include/configs/ADCIOP.h
index
0069aab
..
cc7eddc
100644
(file)
--- a/
include/configs/ADCIOP.h
+++ b/
include/configs/ADCIOP.h
@@
-163,18
+163,18
@@
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
#define CFG_NVRAM_BASE_ADDR 0x10000000 /* NVRAM base address */
#define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
#define CFG_NVRAM_BASE_ADDR 0x10000000 /* NVRAM base address */
#define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */
-#define C
FG_ENV_SIZE
0x0400 /* Size of Environment vars */
-#define C
FG_ENV_ADDR
\
- (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
FG_ENV_SIZE)
/* Env */
+#define C
ONFIG_ENV_SIZE
0x0400 /* Size of Environment vars */
+#define C
ONFIG_ENV_ADDR
\
+ (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
ONFIG_ENV_SIZE)
/* Env */
#define CFG_VXWORKS_MAC_PTR (CFG_NVRAM_BASE_ADDR+0x7800) /* VxWorks eth-addr*/
#else /* Use FLASH for environment variables */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_VXWORKS_MAC_PTR (CFG_NVRAM_BASE_ADDR+0x7800) /* VxWorks eth-addr*/
#else /* Use FLASH for environment variables */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x00010000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x00010000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x8000 /* see README - env sector total size */
+#define C
ONFIG_ENV_SECT_SIZE
0x8000 /* see README - env sector total size */
#endif
#endif
diff --git
a/include/configs/ADNPESC1.h
b/include/configs/ADNPESC1.h
index
2999b2a
..
9b84d1f
100644
(file)
--- a/
include/configs/ADNPESC1.h
+++ b/
include/configs/ADNPESC1.h
@@
-87,7
+87,7
@@
*----------------------------------------------------------------------*/
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256k */
#define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/
*----------------------------------------------------------------------*/
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256k */
#define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_MONITOR_BASE TEXT_BASE
#define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
#define CFG_MONITOR_BASE TEXT_BASE
#define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
@@
-120,12
+120,12
@@
/* Mem addr of environment */
#if defined(CONFIG_NIOS_BASE_32)
/* Mem addr of environment */
#if defined(CONFIG_NIOS_BASE_32)
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + CFG_MONITOR_LEN)
#else
#else
-#error *** CFG_ERROR: you have to setup the environment base address C
F
G_ENV_ADDR
+#error *** CFG_ERROR: you have to setup the environment base address C
ONFI
G_ENV_ADDR
#endif
#endif
-#define C
FG_ENV_SIZE
(64 * 1024) /* 64 KByte (1 sector) */
+#define C
ONFIG_ENV_SIZE
(64 * 1024) /* 64 KByte (1 sector) */
#define CONFIG_ENV_OVERWRITE /* Serial/eth change Ok */
#else
#define CONFIG_ENV_OVERWRITE /* Serial/eth change Ok */
#else
@@
-135,7
+135,7
@@
/*------------------------------------------------------------------------
* NIOS APPLICATION CODE BASE AREA
*----------------------------------------------------------------------*/
/*------------------------------------------------------------------------
* NIOS APPLICATION CODE BASE AREA
*----------------------------------------------------------------------*/
-#if ((C
FG_ENV_ADDR + CF
G_ENV_SIZE) == 0x1050000)
+#if ((C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE) == 0x1050000)
#define CFG_ADNPESC1_UPDATE_LOAD_ADDR "0x2000100"
#define CFG_ADNPESC1_NIOS_APPL_ENTRY "0x1050000"
#define CFG_ADNPESC1_NIOS_APPL_IDENT "0x105000c"
#define CFG_ADNPESC1_UPDATE_LOAD_ADDR "0x2000100"
#define CFG_ADNPESC1_NIOS_APPL_ENTRY "0x1050000"
#define CFG_ADNPESC1_NIOS_APPL_IDENT "0x105000c"
diff --git
a/include/configs/AMX860.h
b/include/configs/AMX860.h
index
85a7ee9
..
343123b
100644
(file)
--- a/
include/configs/AMX860.h
+++ b/
include/configs/AMX860.h
@@
-200,8
+200,8
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/AP1000.h
b/include/configs/AP1000.h
index
a458214
..
63d4003
100644
(file)
--- a/
include/configs/AP1000.h
+++ b/
include/configs/AP1000.h
@@
-175,9
+175,9
@@
/* BEG ENVIRONNEMENT FLASH */
#ifdef CONFIG_ENV_IS_IN_FLASH
/* BEG ENVIRONNEMENT FLASH */
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_OFFSET
0x00040000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x20000 /* see README - env sector total size */
+#define C
ONFIG_ENV_OFFSET
0x00040000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* see README - env sector total size */
#endif
/* END ENVIRONNEMENT FLASH */
/*-----------------------------------------------------------------------
#endif
/* END ENVIRONNEMENT FLASH */
/*-----------------------------------------------------------------------
@@
-187,9
+187,9
@@
#define CFG_NVRAM_SIZE 0x1ff8 /* NVRAM size */
#ifdef CONFIG_ENV_IS_IN_NVRAM
#define CFG_NVRAM_SIZE 0x1ff8 /* NVRAM size */
#ifdef CONFIG_ENV_IS_IN_NVRAM
-#define C
FG_ENV_SIZE
0x1000 /* Size of Environment vars */
-#define C
FG_ENV_ADDR
\
- (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
FG_ENV_SIZE)
/* Env */
+#define C
ONFIG_ENV_SIZE
0x1000 /* Size of Environment vars */
+#define C
ONFIG_ENV_ADDR
\
+ (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
ONFIG_ENV_SIZE)
/* Env */
#endif
/*
#endif
/*
diff --git
a/include/configs/APC405.h
b/include/configs/APC405.h
index
882d188
..
fa7798e
100644
(file)
--- a/
include/configs/APC405.h
+++ b/
include/configs/APC405.h
@@
-292,9
+292,9
@@
extern int flash_banks;
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x000 /* environment starts at the */
+#define C
ONFIG_ENV_OFFSET
0x000 /* environment starts at the */
/* beginning of the EEPROM */
/* beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x800 /* 2048 bytes may be used for env vars*/
+#define C
ONFIG_ENV_SIZE
0x800 /* 2048 bytes may be used for env vars*/
#define CONFIG_ENV_OVERWRITE 1 /* allow overwriting vendor vars */
#define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */
#define CONFIG_ENV_OVERWRITE 1 /* allow overwriting vendor vars */
#define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */
diff --git
a/include/configs/AR405.h
b/include/configs/AR405.h
index
045849f
..
18ca122
100644
(file)
--- a/
include/configs/AR405.h
+++ b/
include/configs/AR405.h
@@
-206,12
+206,12
@@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
0xFFFB0000 /* Address of Environment Sector*/
-#define C
FG_ENV_SECT_SIZE
0x10000 /* see README - env sector total size */
-#define C
FG_ENV_SIZE
0x04000 /* Size of Environment */
+#define C
ONFIG_ENV_ADDR
0xFFFB0000 /* Address of Environment Sector*/
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* see README - env sector total size */
+#define C
ONFIG_ENV_SIZE
0x04000 /* Size of Environment */
-#define C
F
G_ENV_ADDR_REDUND 0xFFFA0000
-#define C
FG_ENV_SIZE_REDUND CF
G_ENV_SIZE
+#define C
ONFI
G_ENV_ADDR_REDUND 0xFFFA0000
+#define C
ONFIG_ENV_SIZE_REDUND CONFI
G_ENV_SIZE
/*
* Init Memory Controller:
/*
* Init Memory Controller:
diff --git
a/include/configs/ASH405.h
b/include/configs/ASH405.h
index
56ae708
..
2285714
100644
(file)
--- a/
include/configs/ASH405.h
+++ b/
include/configs/ASH405.h
@@
-234,8
+234,8
@@
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x100 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x700 /* 2048 bytes may be used for env vars*/
+#define C
ONFIG_ENV_OFFSET
0x100 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x700 /* 2048 bytes may be used for env vars*/
/* total size of a CAT24WC16 is 2048 bytes */
#define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */
/* total size of a CAT24WC16 is 2048 bytes */
#define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */
diff --git
a/include/configs/ATUM8548.h
b/include/configs/ATUM8548.h
index
0ce81db
..
8efea00
100644
(file)
--- a/
include/configs/ATUM8548.h
+++ b/
include/configs/ATUM8548.h
@@
-334,9
+334,9
@@
* Environment
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
-#define C
FG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
-#define C
FG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
+#define C
ONFIG_ENV_SIZE
0x2000
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
diff --git
a/include/configs/Adder.h
b/include/configs/Adder.h
index
3c2f4d6
..
fcac647
100644
(file)
--- a/
include/configs/Adder.h
+++ b/
include/configs/Adder.h
@@
-149,8
+149,8
@@
/* Environment is in flash */
#define CONFIG_ENV_IS_IN_FLASH
/* Environment is in flash */
#define CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x10000 /* We use one complete sector */
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* We use one complete sector */
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#define CONFIG_ENV_OVERWRITE
#define CONFIG_ENV_OVERWRITE
diff --git
a/include/configs/Alaska8220.h
b/include/configs/Alaska8220.h
index
3b3c0bc
..
431ed4e
100644
(file)
--- a/
include/configs/Alaska8220.h
+++ b/
include/configs/Alaska8220.h
@@
-134,8
+134,8
@@
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 70
/*
#define CONFIG_ENV_IS_IN_EEPROM 1
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 70
/*
#define CONFIG_ENV_IS_IN_EEPROM 1
-#define C
FG_ENV_OFFSET
0
-#define C
FG_ENV_SIZE
256
+#define C
ONFIG_ENV_OFFSET
0
+#define C
ONFIG_ENV_SIZE
256
*/
/* If CFG_AMD_BOOT is defined, the the system will boot from AMD.
*/
/* If CFG_AMD_BOOT is defined, the the system will boot from AMD.
@@
-207,19
+207,19
@@
*/
#define CONFIG_ENV_IS_IN_FLASH 1
#if defined (CFG_AMD_BOOT)
*/
#define CONFIG_ENV_IS_IN_FLASH 1
#if defined (CFG_AMD_BOOT)
-#define C
FG_ENV_ADDR
(CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_AMD_SECT_SIZE)
-#define C
FG_ENV_SIZE
PHYS_AMD_SECT_SIZE
-#define C
FG_ENV_SECT_SIZE
PHYS_AMD_SECT_SIZE
-#define C
FG_ENV1_ADDR
(CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_INTEL_SECT_SIZE)
-#define C
FG_ENV1_SIZE
PHYS_INTEL_SECT_SIZE
-#define C
FG_ENV1_SECT_SIZE
PHYS_INTEL_SECT_SIZE
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_AMD_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
PHYS_AMD_SECT_SIZE
+#define C
ONFIG_ENV_SECT_SIZE
PHYS_AMD_SECT_SIZE
+#define C
ONFIG_ENV1_ADDR
(CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_INTEL_SECT_SIZE)
+#define C
ONFIG_ENV1_SIZE
PHYS_INTEL_SECT_SIZE
+#define C
ONFIG_ENV1_SECT_SIZE
PHYS_INTEL_SECT_SIZE
#else
#else
-#define C
FG_ENV_ADDR
(CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_INTEL_SECT_SIZE)
-#define C
FG_ENV_SIZE
PHYS_INTEL_SECT_SIZE
-#define C
FG_ENV_SECT_SIZE
PHYS_INTEL_SECT_SIZE
-#define C
FG_ENV1_ADDR
(CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_AMD_SECT_SIZE)
-#define C
FG_ENV1_SIZE
PHYS_AMD_SECT_SIZE
-#define C
FG_ENV1_SECT_SIZE
PHYS_AMD_SECT_SIZE
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_INTEL_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
PHYS_INTEL_SECT_SIZE
+#define C
ONFIG_ENV_SECT_SIZE
PHYS_INTEL_SECT_SIZE
+#define C
ONFIG_ENV1_ADDR
(CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_AMD_SECT_SIZE)
+#define C
ONFIG_ENV1_SIZE
PHYS_AMD_SECT_SIZE
+#define C
ONFIG_ENV1_SECT_SIZE
PHYS_AMD_SECT_SIZE
#endif
#define CONFIG_ENV_OVERWRITE 1
#endif
#define CONFIG_ENV_OVERWRITE 1
diff --git
a/include/configs/AmigaOneG3SE.h
b/include/configs/AmigaOneG3SE.h
index
17f5909
..
a6e9228
100644
(file)
--- a/
include/configs/AmigaOneG3SE.h
+++ b/
include/configs/AmigaOneG3SE.h
@@
-241,11
+241,11
@@
* Environment is stored in NVRAM.
*/
#define CONFIG_ENV_IS_IN_NVRAM 1
* Environment is stored in NVRAM.
*/
#define CONFIG_ENV_IS_IN_NVRAM 1
-#define C
FG_ENV_ADDR
0xFD0E0000 /* This should be 0xFD0E0000, but we skip bytes to
+#define C
ONFIG_ENV_ADDR
0xFD0E0000 /* This should be 0xFD0E0000, but we skip bytes to
* protect softex's settings for now.
* Original 768 bytes where not enough.
*/
* protect softex's settings for now.
* Original 768 bytes where not enough.
*/
-#define C
FG_ENV_SIZE
0x8000 /* Size of the Environment. See comment above */
+#define C
ONFIG_ENV_SIZE
0x8000 /* Size of the Environment. See comment above */
#define CFG_CONSOLE_IS_IN_ENV 1 /* stdin/stdout/stderr are in environment */
#define CFG_CONSOLE_OVERWRITE_ROUTINE 1
#define CFG_CONSOLE_IS_IN_ENV 1 /* stdin/stdout/stderr are in environment */
#define CFG_CONSOLE_OVERWRITE_ROUTINE 1
diff --git
a/include/configs/B2.h
b/include/configs/B2.h
index
1c4b6fe
..
1a8114b
100644
(file)
--- a/
include/configs/B2.h
+++ b/
include/configs/B2.h
@@
-49,8
+49,8
@@
* Size of malloc() pool
*/
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Monitor */
* Size of malloc() pool
*/
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Monitor */
-#define C
FG_ENV_SIZE
1024 /* 1024 bytes may be used for env vars*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024 )
+#define C
ONFIG_ENV_SIZE
1024 /* 1024 bytes may be used for env vars*/
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024 )
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-177,7
+177,7
@@
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x0 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_OFFSET
0x0 /* environment starts at the beginning of the EEPROM */
/*-----------------------------------------------------------------------
* I2C EEPROM (STM24C02W6) for environment
/*-----------------------------------------------------------------------
* I2C EEPROM (STM24C02W6) for environment
diff --git
a/include/configs/BAB7xx.h
b/include/configs/BAB7xx.h
index
c19f1e9
..
bfbda52
100644
(file)
--- a/
include/configs/BAB7xx.h
+++ b/
include/configs/BAB7xx.h
@@
-245,12
+245,12
@@
#define CONFIG_ENV_OVERWRITE
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
#define CFG_NVRAM_SIZE 0x1ff0 /* NVRAM size (8kB), we must protect the clock data (16 bytes) */
#define CONFIG_ENV_OVERWRITE
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
#define CFG_NVRAM_SIZE 0x1ff0 /* NVRAM size (8kB), we must protect the clock data (16 bytes) */
-#define C
F
G_ENV_SIZE 0x400 /* Size of Environment vars (1kB) */
+#define C
ONFI
G_ENV_SIZE 0x400 /* Size of Environment vars (1kB) */
/*
* We store the environment and an image of revision eeprom in the upper part of the NVRAM. Thus,
* user applications can use the remaining space for other purposes.
*/
/*
* We store the environment and an image of revision eeprom in the upper part of the NVRAM. Thus,
* user applications can use the remaining space for other purposes.
*/
-#define C
F
G_ENV_ADDR (CFG_NVRAM_SIZE +0x10 -0x800)
+#define C
ONFI
G_ENV_ADDR (CFG_NVRAM_SIZE +0x10 -0x800)
#define CFG_NV_SROM_COPY_ADDR (CFG_NVRAM_SIZE +0x10 -0x400)
#define CFG_NVRAM_ACCESS_ROUTINE /* This board needs a special routine to access the NVRAM */
#define CFG_SROM_SIZE 0x100 /* shadow of revision info is in nvram */
#define CFG_NV_SROM_COPY_ADDR (CFG_NVRAM_SIZE +0x10 -0x400)
#define CFG_NVRAM_ACCESS_ROUTINE /* This board needs a special routine to access the NVRAM */
#define CFG_SROM_SIZE 0x100 /* shadow of revision info is in nvram */
diff --git
a/include/configs/BC3450.h
b/include/configs/BC3450.h
index
09c1995
..
7fd6490
100644
(file)
--- a/
include/configs/BC3450.h
+++ b/
include/configs/BC3450.h
@@
-336,9
+336,9
@@
#undef CFG_FLASH_USE_BUFFER_WRITE /* not supported yet for AMD */
#if !defined(CFG_LOWBOOT)
#undef CFG_FLASH_USE_BUFFER_WRITE /* not supported yet for AMD */
#if !defined(CFG_LOWBOOT)
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00760000 + 0x00800000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00760000 + 0x00800000)
#else /* CFG_LOWBOOT */
#else /* CFG_LOWBOOT */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00060000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00060000)
#endif /* CFG_LOWBOOT */
#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks
(= chip selects) */
#endif /* CFG_LOWBOOT */
#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks
(= chip selects) */
@@
-359,10
+359,10
@@
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x10000
-#define C
FG_ENV_SECT_SIZE
0x20000
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
0x10000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*
* Memory map
/*
* Memory map
diff --git
a/include/configs/BMW.h
b/include/configs/BMW.h
index
5ba3e6d
..
d5a398d
100644
(file)
--- a/
include/configs/BMW.h
+++ b/
include/configs/BMW.h
@@
-292,9
+292,9
@@
#define CONFIG_ENV_IS_IN_NVRAM 1
#define CONFIG_ENV_OVERWRITE 1
#define CFG_NVRAM_ACCESS_ROUTINE 1
#define CONFIG_ENV_IS_IN_NVRAM 1
#define CONFIG_ENV_OVERWRITE 1
#define CFG_NVRAM_ACCESS_ROUTINE 1
-#define C
FG_ENV_ADDR
0x7c004000 /* right at the start of NVRAM */
-#define C
FG_ENV_SIZE
0x1ff0 /* Size of the Environment - 8K */
-#define C
FG_ENV_OFFSET
0 /* starting right at the beginning */
+#define C
ONFIG_ENV_ADDR
0x7c004000 /* right at the start of NVRAM */
+#define C
ONFIG_ENV_SIZE
0x1ff0 /* Size of the Environment - 8K */
+#define C
ONFIG_ENV_OFFSET
0 /* starting right at the beginning */
/*
* Cache Configuration
/*
* Cache Configuration
diff --git
a/include/configs/CANBT.h
b/include/configs/CANBT.h
index
d50be01
..
be58838
100644
(file)
--- a/
include/configs/CANBT.h
+++ b/
include/configs/CANBT.h
@@
-156,16
+156,16
@@
#if 0 /* Use FLASH for environment variables */
#define CONFIG_ENV_IS_IN_FLASH 1
#if 0 /* Use FLASH for environment variables */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x00010000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x00010000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x10000 /* see README - env sector total size */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* see README - env sector total size */
#else /* Use EEPROM for environment variables */
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#else /* Use EEPROM for environment variables */
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x400 /* 1024 bytes may be used for env vars */
+#define C
ONFIG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x400 /* 1024 bytes may be used for env vars */
/* total size of a CAT24WC08 is 1024 bytes */
#endif
/* total size of a CAT24WC08 is 1024 bytes */
#endif
diff --git
a/include/configs/CATcenter.h
b/include/configs/CATcenter.h
index
b9c998e
..
8862898
100644
(file)
--- a/
include/configs/CATcenter.h
+++ b/
include/configs/CATcenter.h
@@
-394,10
+394,10
@@
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
-#define C
FG_ENV_ADDR
0xFFFF8000 /* environment starts at the first small sector */
-#define C
FG_ENV_SECT_SIZE
0x2000 /* 8196 bytes may be used for env vars*/
-#define C
FG_ENV_ADDR_REDUND
0xFFFFA000
-#define C
FG_ENV_SIZE_REDUND
0x2000
+#define C
ONFIG_ENV_ADDR
0xFFFF8000 /* environment starts at the first small sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x2000 /* 8196 bytes may be used for env vars*/
+#define C
ONFIG_ENV_ADDR_REDUND
0xFFFFA000
+#define C
ONFIG_ENV_SIZE_REDUND
0x2000
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git
a/include/configs/CCM.h
b/include/configs/CCM.h
index
52b7b82
..
435e8ec
100644
(file)
--- a/
include/configs/CCM.h
+++ b/
include/configs/CCM.h
@@
-219,17
+219,17
@@
#if 1
/* Start port with environment in flash; switch to SPI EEPROM later */
#define CONFIG_ENV_IS_IN_FLASH 1
#if 1
/* Start port with environment in flash; switch to SPI EEPROM later */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#else
/* Final version: environment in EEPROM */
#define CONFIG_ENV_IS_IN_EEPROM 1
#else
/* Final version: environment in EEPROM */
#define CONFIG_ENV_IS_IN_EEPROM 1
-#define C
FG_ENV_OFFSET
2048
-#define C
FG_ENV_SIZE
2048
+#define C
ONFIG_ENV_OFFSET
2048
+#define C
ONFIG_ENV_SIZE
2048
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/CMS700.h
b/include/configs/CMS700.h
index
f157b5f
..
7c5efc2
100644
(file)
--- a/
include/configs/CMS700.h
+++ b/
include/configs/CMS700.h
@@
-249,8
+249,8
@@
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x100 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x700 /* 2048 bytes may be used for env vars*/
+#define C
ONFIG_ENV_OFFSET
0x100 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x700 /* 2048 bytes may be used for env vars*/
/* total size of a CAT24WC16 is 2048 bytes */
/*-----------------------------------------------------------------------
/* total size of a CAT24WC16 is 2048 bytes */
/*-----------------------------------------------------------------------
diff --git
a/include/configs/CPC45.h
b/include/configs/CPC45.h
index
7ec48a1
..
a338af0
100644
(file)
--- a/
include/configs/CPC45.h
+++ b/
include/configs/CPC45.h
@@
-325,10
+325,10
@@
*/
#define CONFIG_ENV_IS_IN_FLASH 1
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x7F8000)
-#define C
FG_ENV_SIZE
0x4000 /* Size of the Environment */
-#define C
FG_ENV_OFFSET
0 /* starting right at the beginning */
-#define C
FG_ENV_SECT_SIZE
0x8000 /* Size of the Environment Sector */
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x7F8000)
+#define C
ONFIG_ENV_SIZE
0x4000 /* Size of the Environment */
+#define C
ONFIG_ENV_OFFSET
0 /* starting right at the beginning */
+#define C
ONFIG_ENV_SECT_SIZE
0x8000 /* Size of the Environment Sector */
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/CPCI2DP.h
b/include/configs/CPCI2DP.h
index
8b205c7
..
bd627e1
100644
(file)
--- a/
include/configs/CPCI2DP.h
+++ b/
include/configs/CPCI2DP.h
@@
-201,8
+201,8
@@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x400 /* 1024 bytes may be used for env vars */
+#define C
ONFIG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x400 /* 1024 bytes may be used for env vars */
/*-----------------------------------------------------------------------
* I2C EEPROM (CAT24WC16) for environment
/*-----------------------------------------------------------------------
* I2C EEPROM (CAT24WC16) for environment
diff --git
a/include/configs/CPCI405.h
b/include/configs/CPCI405.h
index
9a076ba
..
8523134
100644
(file)
--- a/
include/configs/CPCI405.h
+++ b/
include/configs/CPCI405.h
@@
-237,15
+237,15
@@
* NVRAM organization
*/
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
* NVRAM organization
*/
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
-#define C
FG_ENV_SIZE
0x1000 /* Size of Environment vars */
-#define C
FG_ENV_ADDR
\
- (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
FG_ENV_SIZE)
/* Env */
+#define C
ONFIG_ENV_SIZE
0x1000 /* Size of Environment vars */
+#define C
ONFIG_ENV_ADDR
\
+ (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
ONFIG_ENV_SIZE)
/* Env */
#else /* Use EEPROM for environment variables */
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#else /* Use EEPROM for environment variables */
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
F
G_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */
-#define C
F
G_ENV_SIZE 0x400 /* 1024 bytes may be used for env vars */
+#define C
ONFI
G_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */
+#define C
ONFI
G_ENV_SIZE 0x400 /* 1024 bytes may be used for env vars */
/* total size of a CAT24WC08 is 1024 bytes */
#endif
/* total size of a CAT24WC08 is 1024 bytes */
#endif
diff --git
a/include/configs/CPCI4052.h
b/include/configs/CPCI4052.h
index
357c213
..
228821a
100644
(file)
--- a/
include/configs/CPCI4052.h
+++ b/
include/configs/CPCI4052.h
@@
-252,15
+252,15
@@
* NVRAM organization
*/
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
* NVRAM organization
*/
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
-#define C
FG_ENV_SIZE
0x0ff8 /* Size of Environment vars */
-#define C
FG_ENV_ADDR
\
- (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(C
FG_ENV_SIZE+8))
/* Env */
+#define C
ONFIG_ENV_SIZE
0x0ff8 /* Size of Environment vars */
+#define C
ONFIG_ENV_ADDR
\
+ (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(C
ONFIG_ENV_SIZE+8))
/* Env */
#else /* Use EEPROM for environment variables */
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#else /* Use EEPROM for environment variables */
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x800 /* 2048 bytes may be used for env vars*/
+#define C
ONFIG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x800 /* 2048 bytes may be used for env vars*/
/* total size of a CAT24WC16 is 2048 bytes */
#endif
/* total size of a CAT24WC16 is 2048 bytes */
#endif
diff --git
a/include/configs/CPCI405AB.h
b/include/configs/CPCI405AB.h
index
431054d
..
065b855
100644
(file)
--- a/
include/configs/CPCI405AB.h
+++ b/
include/configs/CPCI405AB.h
@@
-264,8
+264,8
@@
/* Use EEPROM for environment variables */
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
/* Use EEPROM for environment variables */
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x800 /* 2048 bytes may be used for env vars*/
+#define C
ONFIG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x800 /* 2048 bytes may be used for env vars*/
/* total size of a CAT24WC32 is 4096 bytes */
#define CFG_NVRAM_BASE_ADDR 0xf0200000 /* NVRAM base address */
/* total size of a CAT24WC32 is 4096 bytes */
#define CFG_NVRAM_BASE_ADDR 0xf0200000 /* NVRAM base address */
diff --git
a/include/configs/CPCI405DT.h
b/include/configs/CPCI405DT.h
index
53228c1
..
ffbe036
100644
(file)
--- a/
include/configs/CPCI405DT.h
+++ b/
include/configs/CPCI405DT.h
@@
-255,15
+255,15
@@
* NVRAM organization
*/
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
* NVRAM organization
*/
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
-#define C
FG_ENV_SIZE
0x0ff8 /* Size of Environment vars */
-#define C
FG_ENV_ADDR
\
- (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(C
FG_ENV_SIZE+8))
/* Env */
+#define C
ONFIG_ENV_SIZE
0x0ff8 /* Size of Environment vars */
+#define C
ONFIG_ENV_ADDR
\
+ (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(C
ONFIG_ENV_SIZE+8))
/* Env */
#else /* Use EEPROM for environment variables */
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#else /* Use EEPROM for environment variables */
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x800 /* 2048 bytes may be used for env vars*/
+#define C
ONFIG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x800 /* 2048 bytes may be used for env vars*/
/* total size of a CAT24WC16 is 2048 bytes */
#endif
/* total size of a CAT24WC16 is 2048 bytes */
#endif
diff --git
a/include/configs/CPCI750.h
b/include/configs/CPCI750.h
index
7a185e8
..
46f80d1
100644
(file)
--- a/
include/configs/CPCI750.h
+++ b/
include/configs/CPCI750.h
@@
-573,18
+573,18
@@
#if 0
#define CONFIG_ENV_IS_IN_FLASH
#if 0
#define CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x10000
-#define C
FG_ENV_ADDR
0xFFF78000 /* Marvell 8-Bit Bootflash last sector */
-/* #define C
FG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CF
G_ENV_SECT_SIZE) */
+#define C
ONFIG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000
+#define C
ONFIG_ENV_ADDR
0xFFF78000 /* Marvell 8-Bit Bootflash last sector */
+/* #define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CONFI
G_ENV_SECT_SIZE) */
#endif
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#define CFG_EEPROM_PAGE_WRITE_BITS 5
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 20
#define CFG_I2C_EEPROM_ADDR 0x050
#endif
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#define CFG_EEPROM_PAGE_WRITE_BITS 5
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 20
#define CFG_I2C_EEPROM_ADDR 0x050
-#define C
FG_ENV_OFFSET
0x200 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x600 /* 2048 bytes may be used for env vars*/
+#define C
ONFIG_ENV_OFFSET
0x200 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x600 /* 2048 bytes may be used for env vars*/
#define CFG_NVRAM_BASE_ADDR 0xf0000000 /* NVRAM base address */
#define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */
#define CFG_NVRAM_BASE_ADDR 0xf0000000 /* NVRAM base address */
#define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */
diff --git
a/include/configs/CPCIISER4.h
b/include/configs/CPCIISER4.h
index
958b111
..
bfb4242
100644
(file)
--- a/
include/configs/CPCIISER4.h
+++ b/
include/configs/CPCIISER4.h
@@
-201,8
+201,8
@@
#define CFG_EEPROM_PAGE_WRITE_ENABLE
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#define CFG_EEPROM_PAGE_WRITE_ENABLE
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x300 /* 768 bytes may be used for env vars */
+#define C
ONFIG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x300 /* 768 bytes may be used for env vars */
/* total size of a CAT24WC08 is 1024 bytes */
/*
/* total size of a CAT24WC08 is 1024 bytes */
/*
diff --git
a/include/configs/CPU86.h
b/include/configs/CPU86.h
index
443b976
..
5f4e0c7
100644
(file)
--- a/
include/configs/CPU86.h
+++ b/
include/configs/CPU86.h
@@
-326,9
+326,9
@@
/* environment is in Flash */
#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_BOOT_ROM
/* environment is in Flash */
#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_BOOT_ROM
-# define C
FG_ENV_ADDR
(CFG_FLASH_BASE+0x70000)
-# define C
FG_ENV_SIZE
0x10000
-# define C
FG_ENV_SECT_SIZE
0x10000
+# define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE+0x70000)
+# define C
ONFIG_ENV_SIZE
0x10000
+# define C
ONFIG_ENV_SECT_SIZE
0x10000
#endif
#else
/* environment is in EEPROM */
#endif
#else
/* environment is in EEPROM */
@@
-339,8
+339,8
@@
#define CFG_I2C_EEPROM_ADDR_OVERFLOW 0x07
#define CFG_EEPROM_PAGE_WRITE_BITS 4
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* and takes up to 10 msec */
#define CFG_I2C_EEPROM_ADDR_OVERFLOW 0x07
#define CFG_EEPROM_PAGE_WRITE_BITS 4
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* and takes up to 10 msec */
-#define C
FG_ENV_OFFSET
512
-#define C
FG_ENV_SIZE
(2048 - 512)
+#define C
ONFIG_ENV_OFFSET
512
+#define C
ONFIG_ENV_SIZE
(2048 - 512)
#endif
/*
#endif
/*
diff --git
a/include/configs/CPU87.h
b/include/configs/CPU87.h
index
45075fa
..
e087624
100644
(file)
--- a/
include/configs/CPU87.h
+++ b/
include/configs/CPU87.h
@@
-341,9
+341,9
@@
/* environment is in Flash */
#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_BOOT_ROM
/* environment is in Flash */
#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_BOOT_ROM
-# define C
FG_ENV_ADDR
(CFG_FLASH_BASE+0x70000)
-# define C
FG_ENV_SIZE
0x10000
-# define C
FG_ENV_SECT_SIZE
0x10000
+# define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE+0x70000)
+# define C
ONFIG_ENV_SIZE
0x10000
+# define C
ONFIG_ENV_SECT_SIZE
0x10000
#endif
#else
/* environment is in EEPROM */
#endif
#else
/* environment is in EEPROM */
@@
-354,8
+354,8
@@
#define CFG_I2C_EEPROM_ADDR_OVERFLOW 0x07
#define CFG_EEPROM_PAGE_WRITE_BITS 4
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* and takes up to 10 msec */
#define CFG_I2C_EEPROM_ADDR_OVERFLOW 0x07
#define CFG_EEPROM_PAGE_WRITE_BITS 4
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* and takes up to 10 msec */
-#define C
FG_ENV_OFFSET
512
-#define C
FG_ENV_SIZE
(2048 - 512)
+#define C
ONFIG_ENV_OFFSET
512
+#define C
ONFIG_ENV_SIZE
(2048 - 512)
#endif
/*
#endif
/*
diff --git
a/include/configs/CRAYL1.h
b/include/configs/CRAYL1.h
index
c15a02a
..
4639d30
100644
(file)
--- a/
include/configs/CRAYL1.h
+++ b/
include/configs/CRAYL1.h
@@
-169,10
+169,10
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
/* BEG ENVIRONNEMENT FLASH: needs to be a whole FlashSector */
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
/* BEG ENVIRONNEMENT FLASH: needs to be a whole FlashSector */
-#define C
FG_ENV_OFFSET
0x3c8000
+#define C
ONFIG_ENV_OFFSET
0x3c8000
#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
-#define C
FG_ENV_SIZE
0x1000 /* Total Size of Environment area */
-#define C
FG_ENV_SECT_SIZE
0x10000 /* see README - env sector total size */
+#define C
ONFIG_ENV_SIZE
0x1000 /* Total Size of Environment area */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* see README - env sector total size */
/* Memory tests: U-BOOT relocates itself to the top of Ram, so its at
* 32meg-(128k+some_malloc_space+copy-of-ENV sector)..
/* Memory tests: U-BOOT relocates itself to the top of Ram, so its at
* 32meg-(128k+some_malloc_space+copy-of-ENV sector)..
@@
-186,7
+186,7
@@
#define CFG_MALLOC_LEN (128 << 10) /* 128k for malloc space */
#define CFG_MEM_END_USAGE ( CFG_MONITOR_LEN \
+ CFG_MALLOC_LEN \
#define CFG_MALLOC_LEN (128 << 10) /* 128k for malloc space */
#define CFG_MEM_END_USAGE ( CFG_MONITOR_LEN \
+ CFG_MALLOC_LEN \
- + C
F
G_ENV_SECT_SIZE \
+ + C
ONFI
G_ENV_SECT_SIZE \
+ CFG_STACK_USAGE )
#define CFG_MEMTEST_END (CFG_SDRAM_SIZE * 1024 * 1024 - CFG_MEM_END_USAGE)
+ CFG_STACK_USAGE )
#define CFG_MEMTEST_END (CFG_SDRAM_SIZE * 1024 * 1024 - CFG_MEM_END_USAGE)
diff --git
a/include/configs/CU824.h
b/include/configs/CU824.h
index
3320c9a
..
a40df76
100644
(file)
--- a/
include/configs/CU824.h
+++ b/
include/configs/CU824.h
@@
-273,13
+273,13
@@
*/
#define CONFIG_ENV_IS_IN_FLASH 1
#if 0
*/
#define CONFIG_ENV_IS_IN_FLASH 1
#if 0
-#define C
FG_ENV_ADDR
0xFF008000
-#define C
FG_ENV_SIZE
0x8000 /* Size of the Environment Sector */
+#define C
ONFIG_ENV_ADDR
0xFF008000
+#define C
ONFIG_ENV_SIZE
0x8000 /* Size of the Environment Sector */
#else
#else
-#define C
FG_ENV_ADDR
0xFFFC0000
-#define C
FG_ENV_SIZE
0x4000 /* Size of the Environment */
-#define C
FG_ENV_OFFSET
0 /* starting right at the beginning */
-#define C
FG_ENV_SECT_SIZE
0x40000 /* Size of the Environment Sector */
+#define C
ONFIG_ENV_ADDR
0xFFFC0000
+#define C
ONFIG_ENV_SIZE
0x4000 /* Size of the Environment */
+#define C
ONFIG_ENV_OFFSET
0 /* starting right at the beginning */
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* Size of the Environment Sector */
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/DASA_SIM.h
b/include/configs/DASA_SIM.h
index
24370c9
..
3ddf1bf
100644
(file)
--- a/
include/configs/DASA_SIM.h
+++ b/
include/configs/DASA_SIM.h
@@
-158,13
+158,13
@@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x00010000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x00010000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
#if 0
#if 0
-#define C
FG_ENV_SECT_SIZE
0x8000 /* see README - env sector total size */
+#define C
ONFIG_ENV_SECT_SIZE
0x8000 /* see README - env sector total size */
#else
#else
-#define C
FG_ENV_SECT_SIZE
0x10000 /* see README - env sector total size */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* see README - env sector total size */
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/DB64360.h
b/include/configs/DB64360.h
index
3fc280f
..
0edd51a
100644
(file)
--- a/
include/configs/DB64360.h
+++ b/
include/configs/DB64360.h
@@
-560,10
+560,10
@@
ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
#define CFG_FLASH_CFI 1
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_CFI 1
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x10000
-#define C
FG_ENV_ADDR
0xFFF78000 /* Marvell 8-Bit Bootflash last sector */
-/* #define C
FG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CF
G_ENV_SECT_SIZE) */
+#define C
ONFIG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000
+#define C
ONFIG_ENV_ADDR
0xFFF78000 /* Marvell 8-Bit Bootflash last sector */
+/* #define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CONFI
G_ENV_SECT_SIZE) */
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/DB64460.h
b/include/configs/DB64460.h
index
59a934e
..
30615a4
100644
(file)
--- a/
include/configs/DB64460.h
+++ b/
include/configs/DB64460.h
@@
-498,10
+498,10
@@
ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
#define CFG_FLASH_CFI 1
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_CFI 1
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x10000
-#define C
FG_ENV_ADDR
0xFFF78000 /* Marvell 8-Bit Bootflash last sector */
-/* #define C
FG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CF
G_ENV_SECT_SIZE) */
+#define C
ONFIG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000
+#define C
ONFIG_ENV_ADDR
0xFFF78000 /* Marvell 8-Bit Bootflash last sector */
+/* #define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CONFI
G_ENV_SECT_SIZE) */
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/DK1C20.h
b/include/configs/DK1C20.h
index
a1f4e0d
..
3e1fc0a
100644
(file)
--- a/
include/configs/DK1C20.h
+++ b/
include/configs/DK1C20.h
@@
-82,7
+82,7
@@
*----------------------------------------------------------------------*/
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256k */
#define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/
*----------------------------------------------------------------------*/
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256k */
#define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_MONITOR_BASE TEXT_BASE
#define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
#define CFG_MONITOR_BASE TEXT_BASE
#define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
@@
-112,8
+112,8
@@
#if (CFG_NIOS_CPU_FLASH_SIZE != 0)
#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */
#if (CFG_NIOS_CPU_FLASH_SIZE != 0)
#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */
-#define C
FG_ENV_ADDR
CFG_FLASH_BASE /* Mem addr of env */
-#define C
FG_ENV_SIZE
(64 * 1024) /* 64 KByte (1 sector) */
+#define C
ONFIG_ENV_ADDR
CFG_FLASH_BASE /* Mem addr of env */
+#define C
ONFIG_ENV_SIZE
(64 * 1024) /* 64 KByte (1 sector) */
#define CONFIG_ENV_OVERWRITE /* Serial/eth change Ok */
#else
#define CONFIG_ENV_OVERWRITE /* Serial/eth change Ok */
#else
diff --git
a/include/configs/DK1S10.h
b/include/configs/DK1S10.h
index
eda328a
..
12d4e6b
100644
(file)
--- a/
include/configs/DK1S10.h
+++ b/
include/configs/DK1S10.h
@@
-90,7
+90,7
@@
*----------------------------------------------------------------------*/
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256k */
#define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/
*----------------------------------------------------------------------*/
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256k */
#define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_MONITOR_BASE TEXT_BASE
#define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
#define CFG_MONITOR_BASE TEXT_BASE
#define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
@@
-122,14
+122,14
@@
#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */
#if defined(CONFIG_NIOS_STANDARD_32)
#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */
#if defined(CONFIG_NIOS_STANDARD_32)
-#define C
FG_ENV_ADDR
CFG_FLASH_BASE /* Mem addr of env */
+#define C
ONFIG_ENV_ADDR
CFG_FLASH_BASE /* Mem addr of env */
#elif defined(CONFIG_NIOS_MTX_LDK_20)
#elif defined(CONFIG_NIOS_MTX_LDK_20)
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + CFG_MONITOR_LEN)
#else
#else
-#error *** CFG_ERROR: you have to setup the environment base address C
F
G_ENV_ADDR
+#error *** CFG_ERROR: you have to setup the environment base address C
ONFI
G_ENV_ADDR
#endif
#endif
-#define C
FG_ENV_SIZE
(64 * 1024) /* 64 KByte (1 sector) */
+#define C
ONFIG_ENV_SIZE
(64 * 1024) /* 64 KByte (1 sector) */
#define CONFIG_ENV_OVERWRITE /* Serial/eth change Ok */
#else
#define CONFIG_ENV_OVERWRITE /* Serial/eth change Ok */
#else
diff --git
a/include/configs/DP405.h
b/include/configs/DP405.h
index
50d44a0
..
acc2bd2
100644
(file)
--- a/
include/configs/DP405.h
+++ b/
include/configs/DP405.h
@@
-217,8
+217,8
@@
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x100 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x700 /* 2048 bytes may be used for env vars*/
+#define C
ONFIG_ENV_OFFSET
0x100 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x700 /* 2048 bytes may be used for env vars*/
/* total size of a CAT24WC16 is 2048 bytes */
#define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */
/* total size of a CAT24WC16 is 2048 bytes */
#define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */
diff --git
a/include/configs/DU405.h
b/include/configs/DU405.h
index
811b9c3
..
7debc69
100644
(file)
--- a/
include/configs/DU405.h
+++ b/
include/configs/DU405.h
@@
-228,8
+228,8
@@
#define CFG_EEPROM_PAGE_WRITE_ENABLE
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#define CFG_EEPROM_PAGE_WRITE_ENABLE
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x400 /* 1024 bytes may be used for env vars */
+#define C
ONFIG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x400 /* 1024 bytes may be used for env vars */
/* total size of a CAT24WC08 is 1024 bytes */
/*
/* total size of a CAT24WC08 is 1024 bytes */
/*
diff --git
a/include/configs/DU440.h
b/include/configs/DU440.h
index
37a7e3a
..
9f8c423
100644
(file)
--- a/
include/configs/DU440.h
+++ b/
include/configs/DU440.h
@@
-137,19
+137,19
@@
#define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
-#define C
FG_ENV_ADDR ((-CFG_MONITOR_LEN)-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR ((-CFG_MONITOR_LEN)-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif
#ifdef CONFIG_ENV_IS_IN_EEPROM
#endif
#ifdef CONFIG_ENV_IS_IN_EEPROM
-#define C
FG_ENV_OFFSET
0 /* environment starts at */
+#define C
ONFIG_ENV_OFFSET
0 /* environment starts at */
/* the beginning of the EEPROM */
/* the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x1000 /* 4096 bytes may be used for env vars */
+#define C
ONFIG_ENV_SIZE
0x1000 /* 4096 bytes may be used for env vars */
#endif
/*
#endif
/*
diff --git
a/include/configs/EB+MCF-EV123.h
b/include/configs/EB+MCF-EV123.h
index
80a6cb7
..
a949454
100644
(file)
--- a/
include/configs/EB+MCF-EV123.h
+++ b/
include/configs/EB+MCF-EV123.h
@@
-51,17
+51,17
@@
* Environment is embedded in u-boot in the second sector of the flash
*/
#ifndef CONFIG_MONITOR_IS_IN_RAM
* Environment is embedded in u-boot in the second sector of the flash
*/
#ifndef CONFIG_MONITOR_IS_IN_RAM
-#define C
FG_ENV_ADDR
0xF003C000 /* End of 256K */
-#define C
FG_ENV_SECT_SIZE
0x4000
+#define C
ONFIG_ENV_ADDR
0xF003C000 /* End of 256K */
+#define C
ONFIG_ENV_SECT_SIZE
0x4000
#define CONFIG_ENV_IS_IN_FLASH 1
/*
#define CONFIG_ENV_IS_IN_FLASH 1
/*
-#define C
FG_ENV_IS_EMBEDDED
1
-#define C
FG_ENV_ADDR_REDUND
0xF0018000
-#define C
FG_ENV_SECT_SIZE_REDUND
0x4000
+#define C
ONFIG_ENV_IS_EMBEDDED
1
+#define C
ONFIG_ENV_ADDR_REDUND
0xF0018000
+#define C
ONFIG_ENV_SECT_SIZE_REDUND
0x4000
*/
#else
*/
#else
-#define C
FG_ENV_ADDR
0xFFE04000
-#define C
FG_ENV_SECT_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
0xFFE04000
+#define C
ONFIG_ENV_SECT_SIZE
0x2000
#define CONFIG_ENV_IS_IN_FLASH 1
#endif
#define CONFIG_ENV_IS_IN_FLASH 1
#endif
diff --git
a/include/configs/ELPPC.h
b/include/configs/ELPPC.h
index
8c68400
..
08e3d71
100644
(file)
--- a/
include/configs/ELPPC.h
+++ b/
include/configs/ELPPC.h
@@
-220,10
+220,10
@@
#define CONFIG_ENV_OVERWRITE
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
#define CFG_NVRAM_SIZE 0x800 /* NVRAM size (2kB) */
#define CONFIG_ENV_OVERWRITE
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
#define CFG_NVRAM_SIZE 0x800 /* NVRAM size (2kB) */
-#define C
F
G_ENV_SIZE 0x400 /* Size of Environment vars (1kB) */
-#define C
F
G_ENV_ADDR 0x0
-#define C
F
G_ENV_MAP_ADRS 0xff000000
-#define CFG_NV_SROM_COPY_ADDR (C
FG_ENV_ADDR + CF
G_ENV_SIZE)
+#define C
ONFI
G_ENV_SIZE 0x400 /* Size of Environment vars (1kB) */
+#define C
ONFI
G_ENV_ADDR 0x0
+#define C
ONFI
G_ENV_MAP_ADRS 0xff000000
+#define CFG_NV_SROM_COPY_ADDR (C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE)
#define CFG_NVRAM_ACCESS_ROUTINE /* only byte accsess alowed */
#define CFG_SROM_SIZE 0x100 /* shadow of revision info is in nvram */
#define CFG_NVRAM_ACCESS_ROUTINE /* only byte accsess alowed */
#define CFG_SROM_SIZE 0x100 /* shadow of revision info is in nvram */
diff --git
a/include/configs/ELPT860.h
b/include/configs/ELPT860.h
index
11eca4c
..
c6a3b8b
100644
(file)
--- a/
include/configs/ELPT860.h
+++ b/
include/configs/ELPT860.h
@@
-214,8
+214,8
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#if defined(CONFIG_ENV_IS_IN_FLASH)
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# define C
FG_ENV_OFFSET
0x10000 /* Offset of Environment Sector */
-# define C
FG_ENV_SIZE
0x10000 /* Total Size of Environment Sector */
+# define C
ONFIG_ENV_OFFSET
0x10000 /* Offset of Environment Sector */
+# define C
ONFIG_ENV_SIZE
0x10000 /* Total Size of Environment Sector */
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
@@
-226,8
+226,8
@@
/* 8 top NVRAM locations */
#if defined(CONFIG_ENV_IS_IN_NVRAM)
/* 8 top NVRAM locations */
#if defined(CONFIG_ENV_IS_IN_NVRAM)
-# define C
FG_ENV_ADDR
CFG_NVRAM_BASE /* Base address of NVRAM area */
-# define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+# define C
ONFIG_ENV_ADDR
CFG_NVRAM_BASE /* Base address of NVRAM area */
+# define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/EP1C20.h
b/include/configs/EP1C20.h
index
aaf6172
..
90e3637
100644
(file)
--- a/
include/configs/EP1C20.h
+++ b/
include/configs/EP1C20.h
@@
-63,7
+63,7
@@
*----------------------------------------------------------------------*/
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 128k */
#define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/
*----------------------------------------------------------------------*/
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 128k */
#define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_MONITOR_BASE TEXT_BASE
#define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
#define CFG_MONITOR_BASE TEXT_BASE
#define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
@@
-87,9
+87,9
@@
* (which is common practice).
*----------------------------------------------------------------------*/
#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */
* (which is common practice).
*----------------------------------------------------------------------*/
#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */
-#define C
FG_ENV_SIZE
(64 * 1024) /* 64 KByte (1 sector) */
+#define C
ONFIG_ENV_SIZE
(64 * 1024) /* 64 KByte (1 sector) */
#define CONFIG_ENV_OVERWRITE /* Serial change Ok */
#define CONFIG_ENV_OVERWRITE /* Serial change Ok */
-#define C
FG_ENV_ADDR
(CFG_RESET_ADDR + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_ADDR
(CFG_RESET_ADDR + CFG_MONITOR_LEN)
/*------------------------------------------------------------------------
* CONSOLE
/*------------------------------------------------------------------------
* CONSOLE
diff --git
a/include/configs/EP1S10.h
b/include/configs/EP1S10.h
index
ae1e476
..
ae9409f
100644
(file)
--- a/
include/configs/EP1S10.h
+++ b/
include/configs/EP1S10.h
@@
-62,7
+62,7
@@
*----------------------------------------------------------------------*/
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256k */
#define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/
*----------------------------------------------------------------------*/
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256k */
#define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 256*1024) /* 256k heap */
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 256*1024) /* 256k heap */
#define CFG_MONITOR_BASE TEXT_BASE
#define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
#define CFG_MONITOR_BASE TEXT_BASE
#define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
@@
-85,9
+85,9
@@
* (which is common practice).
*----------------------------------------------------------------------*/
#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */
* (which is common practice).
*----------------------------------------------------------------------*/
#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */
-#define C
FG_ENV_SIZE
(64 * 1024) /* 64 KByte (1 sector) */
+#define C
ONFIG_ENV_SIZE
(64 * 1024) /* 64 KByte (1 sector) */
#define CONFIG_ENV_OVERWRITE /* Serial change Ok */
#define CONFIG_ENV_OVERWRITE /* Serial change Ok */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + CFG_MONITOR_LEN)
/*------------------------------------------------------------------------
* CONSOLE
/*------------------------------------------------------------------------
* CONSOLE
diff --git
a/include/configs/EP1S40.h
b/include/configs/EP1S40.h
index
7aedcca
..
95ae147
100644
(file)
--- a/
include/configs/EP1S40.h
+++ b/
include/configs/EP1S40.h
@@
-62,7
+62,7
@@
*----------------------------------------------------------------------*/
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256k */
#define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/
*----------------------------------------------------------------------*/
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256k */
#define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 256*1024) /* 256k heap */
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 256*1024) /* 256k heap */
#define CFG_MONITOR_BASE TEXT_BASE
#define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
#define CFG_MONITOR_BASE TEXT_BASE
#define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
@@
-85,9
+85,9
@@
* (which is common practice).
*----------------------------------------------------------------------*/
#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */
* (which is common practice).
*----------------------------------------------------------------------*/
#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */
-#define C
FG_ENV_SIZE
(64 * 1024) /* 64 KByte (1 sector) */
+#define C
ONFIG_ENV_SIZE
(64 * 1024) /* 64 KByte (1 sector) */
#define CONFIG_ENV_OVERWRITE /* Serial change Ok */
#define CONFIG_ENV_OVERWRITE /* Serial change Ok */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + CFG_MONITOR_LEN)
/*------------------------------------------------------------------------
* CONSOLE
/*------------------------------------------------------------------------
* CONSOLE
diff --git
a/include/configs/EP88x.h
b/include/configs/EP88x.h
index
81d5e55
..
106cc6f
100644
(file)
--- a/
include/configs/EP88x.h
+++ b/
include/configs/EP88x.h
@@
-144,8
+144,8
@@
/* Environment is in flash */
#define CONFIG_ENV_IS_IN_FLASH
/* Environment is in flash */
#define CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x20000 /* We use one complete sector */
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* We use one complete sector */
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#define CFG_OR0_PRELIM 0xFC000160
#define CFG_BR0_PRELIM (CFG_FLASH_BASE | BR_PS_32 | BR_MS_GPCM | BR_V)
#define CFG_OR0_PRELIM 0xFC000160
#define CFG_BR0_PRELIM (CFG_FLASH_BASE | BR_PS_32 | BR_MS_GPCM | BR_V)
diff --git
a/include/configs/ERIC.h
b/include/configs/ERIC.h
index
b7ec0d0
..
c3c7aa4
100644
(file)
--- a/
include/configs/ERIC.h
+++ b/
include/configs/ERIC.h
@@
-49,8
+49,8
@@
#endif
#if 0
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use I2C RTC X1240 for environment vars */
#endif
#if 0
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use I2C RTC X1240 for environment vars */
-#define C
FG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x800 /* 2048 bytes may be used for env vars */
+#define C
ONFIG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x800 /* 2048 bytes may be used for env vars */
#endif /* total size of a X1240 is 2048 bytes */
#define CONFIG_HARD_I2C 1 /* I2C with hardware support */
#endif /* total size of a X1240 is 2048 bytes */
#define CONFIG_HARD_I2C 1 /* I2C with hardware support */
@@
-299,15
+299,15
@@
/* BEG ENVIRONNEMENT FLASH */
#ifdef CONFIG_ENV_IS_IN_FLASH
/* BEG ENVIRONNEMENT FLASH */
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
F
G_ENV_SECT_SIZE (128*1024)
+#define C
ONFI
G_ENV_SECT_SIZE (128*1024)
#if 0 /* force ENV to be NOT embedded */
#if 0 /* force ENV to be NOT embedded */
-#define C
F
G_ENV_ADDR 0xfffa0000
+#define C
ONFI
G_ENV_ADDR 0xfffa0000
#else /* force ENV to be embedded */
#else /* force ENV to be embedded */
-#define C
FG_ENV_SIZE
(2 * 1024) /* Total Size of Environment Sector 2k */
-#define C
FG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN - CF
G_ENV_SIZE - 0x10) /* let space for reset vector */
-/* #define C
F
G_ENV_ADDR (CFG_MONITOR_BASE)*/
-#define C
FG_ENV_OFFSET (CF
G_ENV_ADDR - CFG_FLASH_BASE)
+#define C
ONFIG_ENV_SIZE
(2 * 1024) /* Total Size of Environment Sector 2k */
+#define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN - CONFI
G_ENV_SIZE - 0x10) /* let space for reset vector */
+/* #define C
ONFI
G_ENV_ADDR (CFG_MONITOR_BASE)*/
+#define C
ONFIG_ENV_OFFSET (CONFI
G_ENV_ADDR - CFG_FLASH_BASE)
#endif
#endif
#endif
#endif
@@
-319,9
+319,9
@@
#define CFG_NVRAM_SIZE 0x7F8 /* NVRAM size 2kByte - 8 Byte for RTC */
#ifdef CONFIG_ENV_IS_IN_NVRAM
#define CFG_NVRAM_SIZE 0x7F8 /* NVRAM size 2kByte - 8 Byte for RTC */
#ifdef CONFIG_ENV_IS_IN_NVRAM
-#define C
FG_ENV_SIZE
0x7F8 /* Size of Environment vars */
-#define C
FG_ENV_ADDR
\
- (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
FG_ENV_SIZE)
/* Env */
+#define C
ONFIG_ENV_SIZE
0x7F8 /* Size of Environment vars */
+#define C
ONFIG_ENV_ADDR
\
+ (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
ONFIG_ENV_SIZE)
/* Env */
#endif
/*
#endif
/*
diff --git
a/include/configs/ESTEEM192E.h
b/include/configs/ESTEEM192E.h
index
24f0f4c
..
02539e2
100644
(file)
--- a/
include/configs/ESTEEM192E.h
+++ b/
include/configs/ESTEEM192E.h
@@
-155,8
+155,8
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
/*-----------------------------------------------------------------------
* Cache Configuration
*/
/*-----------------------------------------------------------------------
* Cache Configuration
*/
diff --git
a/include/configs/ETX094.h
b/include/configs/ETX094.h
index
940e53d
..
adf79c7
100644
(file)
--- a/
include/configs/ETX094.h
+++ b/
include/configs/ETX094.h
@@
-173,11
+173,11
@@
#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_FLASH_16BIT
#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_FLASH_16BIT
-#define C
FG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x8000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x8000 /* Total Size of Environment Sector */
#else
#else
-#define C
FG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/EVB64260.h
b/include/configs/EVB64260.h
index
2a78fd6
..
f98831e
100644
(file)
--- a/
include/configs/EVB64260.h
+++ b/
include/configs/EVB64260.h
@@
-392,9
+392,9
@@
#define CFG_FLASH_CFI 1
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_CFI 1
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x10000
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CF
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CONFI
G_ENV_SECT_SIZE)
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/EXBITGEN.h
b/include/configs/EXBITGEN.h
index
fed8d42
..
5ba1706
100644
(file)
--- a/
include/configs/EXBITGEN.h
+++ b/
include/configs/EXBITGEN.h
@@
-57,8
+57,8
@@
#define CFG_I2C_EEPROM_ADDR_OVERFLOW 1 /* ... and 1 bit in I2C address */
#define CFG_EEPROM_PAGE_WRITE_BITS 3 /* 4 bytes per page */
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 40 /* write takes up to 40 msec */
#define CFG_I2C_EEPROM_ADDR_OVERFLOW 1 /* ... and 1 bit in I2C address */
#define CFG_EEPROM_PAGE_WRITE_BITS 3 /* 4 bytes per page */
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 40 /* write takes up to 40 msec */
-#define C
FG_ENV_OFFSET
4 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
350 /* that is 350 bytes only! */
+#define C
ONFIG_ENV_OFFSET
4 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
350 /* that is 350 bytes only! */
#endif
#define CONFIG_BOOTDELAY 10 /* autoboot after 10 seconds */
#endif
#define CONFIG_BOOTDELAY 10 /* autoboot after 10 seconds */
@@
-189,9
+189,9
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_OFFSET
0x00060000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x00010000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x00010000 /* see README - env sector total size */
+#define C
ONFIG_ENV_OFFSET
0x00060000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x00010000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x00010000 /* see README - env sector total size */
#endif
/* On Chip Memory location/size */
#endif
/* On Chip Memory location/size */
diff --git
a/include/configs/FADS823.h
b/include/configs/FADS823.h
index
c6c7b53
..
abf51ef
100644
(file)
--- a/
include/configs/FADS823.h
+++ b/
include/configs/FADS823.h
@@
-204,8
+204,8
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x00040000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x40000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x00040000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x40000 /* Total Size of Environment Sector */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
/*-----------------------------------------------------------------------
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
/*-----------------------------------------------------------------------
diff --git
a/include/configs/FADS850SAR.h
b/include/configs/FADS850SAR.h
index
82a8757
..
d617868
100644
(file)
--- a/
include/configs/FADS850SAR.h
+++ b/
include/configs/FADS850SAR.h
@@
-154,8
+154,8
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x00040000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x40000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x00040000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x40000 /* Total Size of Environment Sector */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
/*-----------------------------------------------------------------------
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
/*-----------------------------------------------------------------------
diff --git
a/include/configs/FLAGADM.h
b/include/configs/FLAGADM.h
index
e7fcf75
..
52b5ab4
100644
(file)
--- a/
include/configs/FLAGADM.h
+++ b/
include/configs/FLAGADM.h
@@
-163,8
+163,8
@@
* assigne a whole sector for the environment, so that we can safely
* erase and write it without disturbing the boot sector
*/
* assigne a whole sector for the environment, so that we can safely
* erase and write it without disturbing the boot sector
*/
-#define C
FG_ENV_OFFSET
0x20000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x20000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x20000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x20000 /* Total Size of Environment Sector */
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/FPS850L.h
b/include/configs/FPS850L.h
index
2b819c5
..
dd8051d
100644
(file)
--- a/
include/configs/FPS850L.h
+++ b/
include/configs/FPS850L.h
@@
-202,12
+202,12
@@
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git
a/include/configs/FPS860L.h
b/include/configs/FPS860L.h
index
b3380db
..
1af28b3
100644
(file)
--- a/
include/configs/FPS860L.h
+++ b/
include/configs/FPS860L.h
@@
-202,12
+202,12
@@
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git
a/include/configs/G2000.h
b/include/configs/G2000.h
index
43926a2
..
81a12f1
100644
(file)
--- a/
include/configs/G2000.h
+++ b/
include/configs/G2000.h
@@
-300,15
+300,15
@@
*/
#if 1 /* test-only */
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
*/
#if 1 /* test-only */
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x100 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x700 /* 2048 bytes may be used for env vars*/
+#define C
ONFIG_ENV_OFFSET
0x100 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x700 /* 2048 bytes may be used for env vars*/
/* total size of a CAT24WC16 is 2048 bytes */
#else /* DEFAULT: environment in flash, using redundand flash sectors */
#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
/* total size of a CAT24WC16 is 2048 bytes */
#else /* DEFAULT: environment in flash, using redundand flash sectors */
#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
-#define C
FG_ENV_ADDR
0xFFFA0000 /* environment starts before u-boot */
-#define C
FG_ENV_SECT_SIZE
0x20000 /* 128k bytes may be used for env vars*/
+#define C
ONFIG_ENV_ADDR
0xFFFA0000 /* environment starts before u-boot */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* 128k bytes may be used for env vars*/
#endif
#endif
diff --git
a/include/configs/GEN860T.h
b/include/configs/GEN860T.h
index
6a5a316
..
1627344
100644
(file)
--- a/
include/configs/GEN860T.h
+++ b/
include/configs/GEN860T.h
@@
-166,7
+166,7
@@
#define CFG_EEPROM_PAGE_WRITE_BITS 6 /* 64 byte pages */
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 12 /* 10 mS w/ 20% margin */
#define CFG_I2C_EEPROM_ADDR_LEN 2 /* need 16 bit address */
#define CFG_EEPROM_PAGE_WRITE_BITS 6 /* 64 byte pages */
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 12 /* 10 mS w/ 20% margin */
#define CFG_I2C_EEPROM_ADDR_LEN 2 /* need 16 bit address */
-#define C
FG_ENV_EEPROM_SIZE
(32 * 1024)
+#define C
ONFIG_ENV_EEPROM_SIZE
(32 * 1024)
/*
* Enable I2C and select the hardware/software driver
/*
* Enable I2C and select the hardware/software driver
@@
-438,17
+438,17
@@
#define CONFIG_ENV_IS_IN_EEPROM
#if defined(CONFIG_ENV_IS_IN_EEPROM)
#define CONFIG_ENV_IS_IN_EEPROM
#if defined(CONFIG_ENV_IS_IN_EEPROM)
-#define C
FG_ENV_SIZE
(2 * 1024)
-#define C
FG_ENV_OFFSET (CF
G_ENV_EEPROM_SIZE - (8 * 1024))
+#define C
ONFIG_ENV_SIZE
(2 * 1024)
+#define C
ONFIG_ENV_OFFSET (CONFI
G_ENV_EEPROM_SIZE - (8 * 1024))
#else
#else
-#define C
FG_ENV_SIZE
0x1000
-#define C
FG_ENV_SECT_SIZE
CFG_FLASH_SECT_SIZE
+#define C
ONFIG_ENV_SIZE
0x1000
+#define C
ONFIG_ENV_SECT_SIZE
CFG_FLASH_SECT_SIZE
/*
* This ultimately gets passed right into the linker script, so we have to
* use a number :(
*/
/*
* This ultimately gets passed right into the linker script, so we have to
* use a number :(
*/
-#define C
FG_ENV_OFFSET
0x060000
+#define C
ONFIG_ENV_OFFSET
0x060000
#endif
/*
#endif
/*
diff --git
a/include/configs/GENIETV.h
b/include/configs/GENIETV.h
index
3cf7fb1
..
b6cc17b
100644
(file)
--- a/
include/configs/GENIETV.h
+++ b/
include/configs/GENIETV.h
@@
-197,8
+197,8
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x10000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x10000 /* Total Size of Environment Sector (64k)*/
+#define C
ONFIG_ENV_OFFSET
0x10000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x10000 /* Total Size of Environment Sector (64k)*/
/* values according to the manual */
/* values according to the manual */
diff --git
a/include/configs/GTH.h
b/include/configs/GTH.h
index
d5816ae
..
18bbbc3
100644
(file)
--- a/
include/configs/GTH.h
+++ b/
include/configs/GTH.h
@@
-196,10
+196,10
@@
#define CONFIG_ENV_IS_IN_FLASH 1
#undef CONFIG_ENV_IS_IN_EEPROM
#define CONFIG_ENV_IS_IN_FLASH 1
#undef CONFIG_ENV_IS_IN_EEPROM
-#define C
FG_ENV_OFFSET
0x000E0000
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x000E0000
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x50000 /* see README - env sector total size */
+#define C
ONFIG_ENV_SECT_SIZE
0x50000 /* see README - env sector total size */
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/HH405.h
b/include/configs/HH405.h
index
cf5fcf1
..
7ff03b1
100644
(file)
--- a/
include/configs/HH405.h
+++ b/
include/configs/HH405.h
@@
-321,8
+321,8
@@
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
F
G_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */
-#define C
F
G_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/
+#define C
ONFI
G_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */
+#define C
ONFI
G_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/
/* total size of a CAT24WC16 is 2048 bytes */
#define CFG_NVRAM_BASE_ADDR 0xF4080000 /* NVRAM base address */
/* total size of a CAT24WC16 is 2048 bytes */
#define CFG_NVRAM_BASE_ADDR 0xF4080000 /* NVRAM base address */
diff --git
a/include/configs/HIDDEN_DRAGON.h
b/include/configs/HIDDEN_DRAGON.h
index
5168be0
..
c8c0409
100644
(file)
--- a/
include/configs/HIDDEN_DRAGON.h
+++ b/
include/configs/HIDDEN_DRAGON.h
@@
-146,8
+146,8
@@
#define CFG_FLASH_BASE 0xFFE00000
#define CFG_FLASH_SIZE (2 * 1024 * 1024) /* Unity has onboard 1MByte flash */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_BASE 0xFFE00000
#define CFG_FLASH_SIZE (2 * 1024 * 1024) /* Unity has onboard 1MByte flash */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x00004000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x00002000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x00004000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x00002000 /* Total Size of Environment Sector */
#define CFG_MALLOC_LEN (512 << 10) /* Reserve 512 kB for malloc() */
#define CFG_MALLOC_LEN (512 << 10) /* Reserve 512 kB for malloc() */
diff --git
a/include/configs/HMI10.h
b/include/configs/HMI10.h
index
406c352
..
807781c
100644
(file)
--- a/
include/configs/HMI10.h
+++ b/
include/configs/HMI10.h
@@
-235,12
+235,12
@@
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*-----------------------------------------------------------------------
* Hardware Information Block
/*-----------------------------------------------------------------------
* Hardware Information Block
diff --git
a/include/configs/HUB405.h
b/include/configs/HUB405.h
index
8992706
..
0727606
100644
(file)
--- a/
include/configs/HUB405.h
+++ b/
include/configs/HUB405.h
@@
-233,8
+233,8
@@
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x100 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x700 /* 2048 bytes may be used for env vars*/
+#define C
ONFIG_ENV_OFFSET
0x100 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x700 /* 2048 bytes may be used for env vars*/
/* total size of a CAT24WC16 is 2048 bytes */
#define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */
/* total size of a CAT24WC16 is 2048 bytes */
#define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */
diff --git
a/include/configs/IAD210.h
b/include/configs/IAD210.h
index
c80165b
..
a4944f1
100644
(file)
--- a/
include/configs/IAD210.h
+++ b/
include/configs/IAD210.h
@@
-221,8
+221,8
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x8000
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x8000
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/ICU862.h
b/include/configs/ICU862.h
index
caf7210
..
0ff7fa9
100644
(file)
--- a/
include/configs/ICU862.h
+++ b/
include/configs/ICU862.h
@@
-230,10
+230,10
@@
#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x00F40000
+#define C
ONFIG_ENV_OFFSET
0x00F40000
-#define C
FG_ENV_SECT_SIZE
0x40000 /* Total Size of Environment sector */
-#define C
FG_ENV_SIZE
0x4000 /* Used Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* Total Size of Environment sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Used Size of Environment Sector */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
/*-----------------------------------------------------------------------
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
/*-----------------------------------------------------------------------
diff --git
a/include/configs/IDS8247.h
b/include/configs/IDS8247.h
index
459654e
..
4d0397c
100644
(file)
--- a/
include/configs/IDS8247.h
+++ b/
include/configs/IDS8247.h
@@
-252,9
+252,9
@@
/* Environment in flash */
#define CONFIG_ENV_IS_IN_FLASH 1
/* Environment in flash */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE+0x60000)
-#define C
FG_ENV_SIZE
0x20000
-#define C
FG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE+0x60000)
+#define C
ONFIG_ENV_SIZE
0x20000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
/*-----------------------------------------------------------------------
* NAND-FLASH stuff
/*-----------------------------------------------------------------------
* NAND-FLASH stuff
diff --git
a/include/configs/IP860.h
b/include/configs/IP860.h
index
fa3c29e
..
c0bf367
100644
(file)
--- a/
include/configs/IP860.h
+++ b/
include/configs/IP860.h
@@
-193,13
+193,13
@@
#define CONFIG_ENV_IS_IN_EEPROM
#ifdef CONFIG_ENV_IS_IN_NVRAM
#define CONFIG_ENV_IS_IN_EEPROM
#ifdef CONFIG_ENV_IS_IN_NVRAM
-#define C
FG_ENV_ADDR
0x20000000 /* use SRAM */
-#define C
FG_ENV_SIZE
(16<<10) /* use 16 kB */
+#define C
ONFIG_ENV_ADDR
0x20000000 /* use SRAM */
+#define C
ONFIG_ENV_SIZE
(16<<10) /* use 16 kB */
#endif /* CONFIG_ENV_IS_IN_NVRAM */
#ifdef CONFIG_ENV_IS_IN_EEPROM
#endif /* CONFIG_ENV_IS_IN_NVRAM */
#ifdef CONFIG_ENV_IS_IN_EEPROM
-#define C
FG_ENV_OFFSET
512 /* Leave 512 bytes free for other data */
-#define C
FG_ENV_SIZE
1536 /* Use remaining space */
+#define C
ONFIG_ENV_OFFSET
512 /* Leave 512 bytes free for other data */
+#define C
ONFIG_ENV_SIZE
1536 /* Use remaining space */
#endif /* CONFIG_ENV_IS_IN_EEPROM */
/*-----------------------------------------------------------------------
#endif /* CONFIG_ENV_IS_IN_EEPROM */
/*-----------------------------------------------------------------------
diff --git
a/include/configs/IPHASE4539.h
b/include/configs/IPHASE4539.h
index
cea8532
..
31fbf32
100644
(file)
--- a/
include/configs/IPHASE4539.h
+++ b/
include/configs/IPHASE4539.h
@@
-209,8
+209,8
@@
/* Environment in FLASH, there is little space left in Serial EEPROM */
#define CONFIG_ENV_IS_IN_FLASH 1
/* Environment in FLASH, there is little space left in Serial EEPROM */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SECT_SIZE
0x10000 /* We use one complete sector */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x10000) /* 2. sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* We use one complete sector */
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x10000) /* 2. sector */
/*-----------------------------------------------------------------------
/*-----------------------------------------------------------------------
diff --git
a/include/configs/ISPAN.h
b/include/configs/ISPAN.h
index
6de40da
..
8b6f3ce
100644
(file)
--- a/
include/configs/ISPAN.h
+++ b/
include/configs/ISPAN.h
@@
-186,11
+186,11
@@
/* Environment is in flash, there is little space left in Serial EEPROM */
#define CONFIG_ENV_IS_IN_FLASH
/* Environment is in flash, there is little space left in Serial EEPROM */
#define CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x10000 /* We use one complete sector */
-#define C
FG_ENV_SIZE (CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* We use one complete sector */
+#define C
ONFIG_ENV_SIZE (CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*-----------------------------------------------------------------------
* Hard Reset Configuration Words
/*-----------------------------------------------------------------------
* Hard Reset Configuration Words
diff --git
a/include/configs/IVML24.h
b/include/configs/IVML24.h
index
ee302d9
..
6a422c8
100644
(file)
--- a/
include/configs/IVML24.h
+++ b/
include/configs/IVML24.h
@@
-185,8
+185,8
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x7A000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x7A000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
/*-----------------------------------------------------------------------
* Cache Configuration
*/
/*-----------------------------------------------------------------------
* Cache Configuration
*/
diff --git
a/include/configs/IVMS8.h
b/include/configs/IVMS8.h
index
1bdd031
..
54477ee
100644
(file)
--- a/
include/configs/IVMS8.h
+++ b/
include/configs/IVMS8.h
@@
-181,8
+181,8
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x7A000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x7A000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
/*-----------------------------------------------------------------------
* Cache Configuration
*/
/*-----------------------------------------------------------------------
* Cache Configuration
*/
diff --git
a/include/configs/IceCube.h
b/include/configs/IceCube.h
index
804fc3f
..
a705ac1
100644
(file)
--- a/
include/configs/IceCube.h
+++ b/
include/configs/IceCube.h
@@
-213,26
+213,26
@@
#define CFG_FLASH_BASE 0xFE000000
#define CFG_FLASH_SIZE 0x01000000
#if !defined(CFG_LOWBOOT)
#define CFG_FLASH_BASE 0xFE000000
#define CFG_FLASH_SIZE 0x01000000
#if !defined(CFG_LOWBOOT)
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x01760000 + 0x00800000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x01760000 + 0x00800000)
#else /* CFG_LOWBOOT */
#if defined(CFG_LOWBOOT08)
# error CFG_LOWBOOT08 is incompatible with the Lite5200B
#endif
#if defined(CFG_LOWBOOT16)
#else /* CFG_LOWBOOT */
#if defined(CFG_LOWBOOT08)
# error CFG_LOWBOOT08 is incompatible with the Lite5200B
#endif
#if defined(CFG_LOWBOOT16)
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x01060000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x01060000)
#endif
#endif /* CFG_LOWBOOT */
#else /* !CONFIG_LITE5200B (IceCube)*/
#define CFG_FLASH_BASE 0xFF000000
#define CFG_FLASH_SIZE 0x01000000
#if !defined(CFG_LOWBOOT)
#endif
#endif /* CFG_LOWBOOT */
#else /* !CONFIG_LITE5200B (IceCube)*/
#define CFG_FLASH_BASE 0xFF000000
#define CFG_FLASH_SIZE 0x01000000
#if !defined(CFG_LOWBOOT)
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00740000 + 0x00800000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00740000 + 0x00800000)
#else /* CFG_LOWBOOT */
#if defined(CFG_LOWBOOT08)
#else /* CFG_LOWBOOT */
#if defined(CFG_LOWBOOT08)
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00040000 + 0x00800000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00040000 + 0x00800000)
#endif
#if defined(CFG_LOWBOOT16)
#endif
#if defined(CFG_LOWBOOT16)
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00040000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00040000)
#endif
#endif /* CFG_LOWBOOT */
#endif /* CONFIG_LITE5200B */
#endif
#endif /* CFG_LOWBOOT */
#endif /* CONFIG_LITE5200B */
@@
-256,11
+256,11
@@
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x10000
+#define C
ONFIG_ENV_SIZE
0x10000
#if defined(CONFIG_LITE5200B)
#if defined(CONFIG_LITE5200B)
-#define C
FG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
#else
#else
-#define C
FG_ENV_SECT_SIZE
0x10000
+#define C
ONFIG_ENV_SECT_SIZE
0x10000
#endif
#define CONFIG_ENV_OVERWRITE 1
#endif
#define CONFIG_ENV_OVERWRITE 1
diff --git
a/include/configs/JSE.h
b/include/configs/JSE.h
index
4bcd17a
..
b457272
100644
(file)
--- a/
include/configs/JSE.h
+++ b/
include/configs/JSE.h
@@
-92,8
+92,8
@@
#define CFG_EEPROM_PAGE_WRITE_BITS 4
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
/* Put the environment in the second half. */
#define CFG_EEPROM_PAGE_WRITE_BITS 4
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
/* Put the environment in the second half. */
-#define C
FG_ENV_OFFSET
0x00
-#define C
FG_ENV_SIZE
512
+#define C
ONFIG_ENV_OFFSET
0x00
+#define C
ONFIG_ENV_SIZE
512
/* The JSE connects UART1 to the console tap connector. */
/* The JSE connects UART1 to the console tap connector. */
diff --git
a/include/configs/KAREF.h
b/include/configs/KAREF.h
index
897d8a0
..
eeb3924
100644
(file)
--- a/
include/configs/KAREF.h
+++ b/
include/configs/KAREF.h
@@
-146,8
+146,8
@@
#undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */
#define CONFIG_ENV_OVERWRITE 1 /* allow env overwrite */
#undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */
#define CONFIG_ENV_OVERWRITE 1 /* allow env overwrite */
-#define C
FG_ENV_SIZE
0x1000 /* Size of Env vars */
-#define C
FG_ENV_ADDR
(CFG_NVRAM_BASE_ADDR)
+#define C
ONFIG_ENV_SIZE
0x1000 /* Size of Env vars */
+#define C
ONFIG_ENV_ADDR
(CFG_NVRAM_BASE_ADDR)
#define CONFIG_BOOTDELAY 5 /* 5 second autoboot */
#define CONFIG_BOOTDELAY 5 /* 5 second autoboot */
diff --git
a/include/configs/KUP4K.h
b/include/configs/KUP4K.h
index
e40e53b
..
6f99c1b
100644
(file)
--- a/
include/configs/KUP4K.h
+++ b/
include/configs/KUP4K.h
@@
-255,14
+255,14
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x40000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x10000
+#define C
ONFIG_ENV_OFFSET
0x40000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000
/* Address and size of Redundant Environment Sector */
#if 0
/* Address and size of Redundant Environment Sector */
#if 0
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif
/*-----------------------------------------------------------------------
* Hardware Information Block
#endif
/*-----------------------------------------------------------------------
* Hardware Information Block
diff --git
a/include/configs/KUP4X.h
b/include/configs/KUP4X.h
index
29c3e2d
..
a71be0f
100644
(file)
--- a/
include/configs/KUP4X.h
+++ b/
include/configs/KUP4X.h
@@
-267,14
+267,14
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x40000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x10000
+#define C
ONFIG_ENV_OFFSET
0x40000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000
/* Address and size of Redundant Environment Sector */
#if 0
/* Address and size of Redundant Environment Sector */
#if 0
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif
/*-----------------------------------------------------------------------
* Hardware Information Block
#endif
/*-----------------------------------------------------------------------
* Hardware Information Block
diff --git
a/include/configs/LANTEC.h
b/include/configs/LANTEC.h
index
dc60848
..
8b7b1e1
100644
(file)
--- a/
include/configs/LANTEC.h
+++ b/
include/configs/LANTEC.h
@@
-186,8
+186,8
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/M52277EVB.h
b/include/configs/M52277EVB.h
index
10b37b5
..
7f24c4e
100644
(file)
--- a/
include/configs/M52277EVB.h
+++ b/
include/configs/M52277EVB.h
@@
-194,15
+194,15
@@
*/
#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OVERWRITE 1
*/
#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OVERWRITE 1
-#undef C
F
G_ENV_IS_EMBEDDED
+#undef C
ONFI
G_ENV_IS_EMBEDDED
/*-----------------------------------------------------------------------
* FLASH organization
*/
#define CFG_FLASH_BASE CFG_CS0_BASE
#define CFG_FLASH0_BASE CFG_CS0_BASE
/*-----------------------------------------------------------------------
* FLASH organization
*/
#define CFG_FLASH_BASE CFG_CS0_BASE
#define CFG_FLASH0_BASE CFG_CS0_BASE
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x8000)
-#define C
FG_ENV_SECT_SIZE
0x8000
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x8000)
+#define C
ONFIG_ENV_SECT_SIZE
0x8000
#define CFG_FLASH_CFI
#ifdef CFG_FLASH_CFI
#define CFG_FLASH_CFI
#ifdef CFG_FLASH_CFI
diff --git
a/include/configs/M5235EVB.h
b/include/configs/M5235EVB.h
index
3f55594
..
f352db1
100644
(file)
--- a/
include/configs/M5235EVB.h
+++ b/
include/configs/M5235EVB.h
@@
-221,15
+221,15
@@
* Environment is embedded in u-boot in the second sector of the flash
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment is embedded in u-boot in the second sector of the flash
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_IS_EMBEDDED
1
+#define C
ONFIG_ENV_IS_EMBEDDED
1
#ifdef NORFLASH_PS32BIT
#ifdef NORFLASH_PS32BIT
-# define C
FG_ENV_OFFSET
(0x8000)
-# define C
FG_ENV_SIZE
0x4000
-# define C
FG_ENV_SECT_SIZE
0x4000
+# define C
ONFIG_ENV_OFFSET
(0x8000)
+# define C
ONFIG_ENV_SIZE
0x4000
+# define C
ONFIG_ENV_SECT_SIZE
0x4000
#else
#else
-# define C
FG_ENV_OFFSET
(0x4000)
-# define C
FG_ENV_SIZE
0x2000
-# define C
FG_ENV_SECT_SIZE
0x2000
+# define C
ONFIG_ENV_OFFSET
(0x4000)
+# define C
ONFIG_ENV_SIZE
0x2000
+# define C
ONFIG_ENV_SECT_SIZE
0x2000
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/M5249EVB.h
b/include/configs/M5249EVB.h
index
c7544a8
..
4525e2d
100644
(file)
--- a/
include/configs/M5249EVB.h
+++ b/
include/configs/M5249EVB.h
@@
-114,9
+114,9
@@
#define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x4000 /* Address of Environment Sector*/
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x2000 /* see README - env sector total size */
+#define C
ONFIG_ENV_OFFSET
0x4000 /* Address of Environment Sector*/
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x2000 /* see README - env sector total size */
/*-----------------------------------------------------------------------
* Start addresses for the final memory configuration
/*-----------------------------------------------------------------------
* Start addresses for the final memory configuration
diff --git
a/include/configs/M5253DEMO.h
b/include/configs/M5253DEMO.h
index
72dd05d
..
8d9bfa3
100644
(file)
--- a/
include/configs/M5253DEMO.h
+++ b/
include/configs/M5253DEMO.h
@@
-43,12
+43,12
@@
* Environment is embedded in u-boot in the second sector of the flash
*/
#ifdef CONFIG_MONITOR_IS_IN_RAM
* Environment is embedded in u-boot in the second sector of the flash
*/
#ifdef CONFIG_MONITOR_IS_IN_RAM
-# define C
FG_ENV_OFFSET
0x4000
-# define C
FG_ENV_SECT_SIZE
0x1000
+# define C
ONFIG_ENV_OFFSET
0x4000
+# define C
ONFIG_ENV_SECT_SIZE
0x1000
# define CONFIG_ENV_IS_IN_FLASH 1
#else
# define CONFIG_ENV_IS_IN_FLASH 1
#else
-# define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x4000)
-# define C
FG_ENV_SECT_SIZE
0x1000
+# define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x4000)
+# define C
ONFIG_ENV_SECT_SIZE
0x1000
# define CONFIG_ENV_IS_IN_FLASH 1
#endif
# define CONFIG_ENV_IS_IN_FLASH 1
#endif
diff --git
a/include/configs/M5253EVBE.h
b/include/configs/M5253EVBE.h
index
cbf50fe
..
f58f89c
100644
(file)
--- a/
include/configs/M5253EVBE.h
+++ b/
include/configs/M5253EVBE.h
@@
-43,12
+43,12
@@
* Environment is embedded in u-boot in the second sector of the flash
*/
#ifndef CONFIG_MONITOR_IS_IN_RAM
* Environment is embedded in u-boot in the second sector of the flash
*/
#ifndef CONFIG_MONITOR_IS_IN_RAM
-#define C
FG_ENV_OFFSET
0x4000
-#define C
FG_ENV_SECT_SIZE
0x2000
+#define C
ONFIG_ENV_OFFSET
0x4000
+#define C
ONFIG_ENV_SECT_SIZE
0x2000
#define CONFIG_ENV_IS_IN_FLASH 1
#else
#define CONFIG_ENV_IS_IN_FLASH 1
#else
-#define C
FG_ENV_ADDR
0xffe04000
-#define C
FG_ENV_SECT_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
0xffe04000
+#define C
ONFIG_ENV_SECT_SIZE
0x2000
#define CONFIG_ENV_IS_IN_FLASH 1
#endif
#define CONFIG_ENV_IS_IN_FLASH 1
#endif
diff --git
a/include/configs/M5271EVB.h
b/include/configs/M5271EVB.h
index
482c262
..
844b74f
100644
(file)
--- a/
include/configs/M5271EVB.h
+++ b/
include/configs/M5271EVB.h
@@
-51,11
+51,11
@@
* Environment is embedded in u-boot in the second sector of the flash
*/
#ifndef CONFIG_MONITOR_IS_IN_RAM
* Environment is embedded in u-boot in the second sector of the flash
*/
#ifndef CONFIG_MONITOR_IS_IN_RAM
-#define C
FG_ENV_OFFSET
0x4000
+#define C
ONFIG_ENV_OFFSET
0x4000
#else
#else
-#define C
FG_ENV_ADDR
0xffe04000
+#define C
ONFIG_ENV_ADDR
0xffe04000
#endif
#endif
-#define C
FG_ENV_SECT_SIZE
0x2000
+#define C
ONFIG_ENV_SECT_SIZE
0x2000
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#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
22124c9
..
d2dcdd2
100644
(file)
--- a/
include/configs/M5272C3.h
+++ b/
include/configs/M5272C3.h
@@
-52,13
+52,13
@@
* Environment is embedded in u-boot in the second sector of the flash
*/
#ifndef CONFIG_MONITOR_IS_IN_RAM
* Environment is embedded in u-boot in the second sector of the flash
*/
#ifndef CONFIG_MONITOR_IS_IN_RAM
-#define C
FG_ENV_OFFSET
0x4000
-#define C
FG_ENV_SECT_SIZE
0x2000
+#define C
ONFIG_ENV_OFFSET
0x4000
+#define C
ONFIG_ENV_SECT_SIZE
0x2000
#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_IS_EMBEDDED
1
+#define C
ONFIG_ENV_IS_EMBEDDED
1
#else
#else
-#define C
FG_ENV_ADDR
0xffe04000
-#define C
FG_ENV_SECT_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
0xffe04000
+#define C
ONFIG_ENV_SECT_SIZE
0x2000
#define CONFIG_ENV_IS_IN_FLASH 1
#endif
#define CONFIG_ENV_IS_IN_FLASH 1
#endif
diff --git
a/include/configs/M5275EVB.h
b/include/configs/M5275EVB.h
index
0a30e0b
..
b0ef41e
100644
(file)
--- a/
include/configs/M5275EVB.h
+++ b/
include/configs/M5275EVB.h
@@
-52,13
+52,13
@@
* Environment is embedded in u-boot in the second sector of the flash
*/
#ifndef CONFIG_MONITOR_IS_IN_RAM
* Environment is embedded in u-boot in the second sector of the flash
*/
#ifndef CONFIG_MONITOR_IS_IN_RAM
-#define C
FG_ENV_OFFSET
0x4000
-#define C
FG_ENV_SECT_SIZE
0x2000
+#define C
ONFIG_ENV_OFFSET
0x4000
+#define C
ONFIG_ENV_SECT_SIZE
0x2000
#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_IS_EMBEDDED
1
+#define C
ONFIG_ENV_IS_EMBEDDED
1
#else
#else
-#define C
FG_ENV_ADDR
0xffe04000
-#define C
FG_ENV_SECT_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
0xffe04000
+#define C
ONFIG_ENV_SECT_SIZE
0x2000
#define CONFIG_ENV_IS_IN_FLASH 1
#endif
#define CONFIG_ENV_IS_IN_FLASH 1
#endif
diff --git
a/include/configs/M5282EVB.h
b/include/configs/M5282EVB.h
index
1763f97
..
5cc64c1
100644
(file)
--- a/
include/configs/M5282EVB.h
+++ b/
include/configs/M5282EVB.h
@@
-48,8
+48,8
@@
/* Configuration for environment
* Environment is embedded in u-boot in the second sector of the flash
*/
/* Configuration for environment
* Environment is embedded in u-boot in the second sector of the flash
*/
-#define C
FG_ENV_ADDR
0xffe04000
-#define C
FG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
0xffe04000
+#define C
ONFIG_ENV_SIZE
0x2000
#define CONFIG_ENV_IS_IN_FLASH 1
/*
#define CONFIG_ENV_IS_IN_FLASH 1
/*
diff --git
a/include/configs/M5329EVB.h
b/include/configs/M5329EVB.h
index
441f209
..
3a8e49a
100644
(file)
--- a/
include/configs/M5329EVB.h
+++ b/
include/configs/M5329EVB.h
@@
-228,10
+228,10
@@
/* Configuration for environment
* Environment is embedded in u-boot in the second sector of the flash
*/
/* Configuration for environment
* Environment is embedded in u-boot in the second sector of the flash
*/
-#define C
FG_ENV_OFFSET
0x4000
-#define C
FG_ENV_SECT_SIZE
0x2000
+#define C
ONFIG_ENV_OFFSET
0x4000
+#define C
ONFIG_ENV_SECT_SIZE
0x2000
#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_IS_EMBEDDED
1
+#define C
ONFIG_ENV_IS_EMBEDDED
1
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/M5373EVB.h
b/include/configs/M5373EVB.h
index
f8212c6
..
34698ee
100644
(file)
--- a/
include/configs/M5373EVB.h
+++ b/
include/configs/M5373EVB.h
@@
-228,10
+228,10
@@
/* Configuration for environment
* Environment is embedded in u-boot in the second sector of the flash
*/
/* Configuration for environment
* Environment is embedded in u-boot in the second sector of the flash
*/
-#define C
FG_ENV_OFFSET
0x4000
-#define C
FG_ENV_SECT_SIZE
0x2000
+#define C
ONFIG_ENV_OFFSET
0x4000
+#define C
ONFIG_ENV_SECT_SIZE
0x2000
#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_IS_EMBEDDED
1
+#define C
ONFIG_ENV_IS_EMBEDDED
1
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/M54451EVB.h
b/include/configs/M54451EVB.h
index
d0a66ea
..
03d21be
100644
(file)
--- a/
include/configs/M54451EVB.h
+++ b/
include/configs/M54451EVB.h
@@
-267,17
+267,17
@@
*/
#if defined(CONFIG_CF_SBF)
# define CONFIG_ENV_IS_IN_SPI_FLASH 1
*/
#if defined(CONFIG_CF_SBF)
# define CONFIG_ENV_IS_IN_SPI_FLASH 1
-# define C
FG_ENV_SPI_CS
1
-# define C
FG_ENV_OFFSET
0x20000
-# define C
FG_ENV_SIZE
0x2000
-# define C
FG_ENV_SECT_SIZE
0x10000
+# define C
ONFIG_ENV_SPI_CS
1
+# define C
ONFIG_ENV_OFFSET
0x20000
+# define C
ONFIG_ENV_SIZE
0x2000
+# define C
ONFIG_ENV_SECT_SIZE
0x10000
#else
# define CONFIG_ENV_IS_IN_FLASH 1
#else
# define CONFIG_ENV_IS_IN_FLASH 1
-# define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x4000)
-# define C
FG_ENV_SECT_SIZE
0x2000
+# define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x4000)
+# define C
ONFIG_ENV_SECT_SIZE
0x2000
#endif
#undef CONFIG_ENV_OVERWRITE
#endif
#undef CONFIG_ENV_OVERWRITE
-#undef C
F
G_ENV_IS_EMBEDDED
+#undef C
ONFI
G_ENV_IS_EMBEDDED
/*-----------------------------------------------------------------------
* FLASH organization
/*-----------------------------------------------------------------------
* FLASH organization
diff --git
a/include/configs/M54455EVB.h
b/include/configs/M54455EVB.h
index
9872d58
..
9513279
100644
(file)
--- a/
include/configs/M54455EVB.h
+++ b/
include/configs/M54455EVB.h
@@
-332,12
+332,12
@@
*/
#ifdef CONFIG_CF_SBF
# define CONFIG_ENV_IS_IN_SPI_FLASH
*/
#ifdef CONFIG_CF_SBF
# define CONFIG_ENV_IS_IN_SPI_FLASH
-# define C
FG_ENV_SPI_CS
1
+# define C
ONFIG_ENV_SPI_CS
1
#else
# define CONFIG_ENV_IS_IN_FLASH 1
#endif
#undef CONFIG_ENV_OVERWRITE
#else
# define CONFIG_ENV_IS_IN_FLASH 1
#endif
#undef CONFIG_ENV_OVERWRITE
-#undef C
F
G_ENV_IS_EMBEDDED
+#undef C
ONFI
G_ENV_IS_EMBEDDED
/*-----------------------------------------------------------------------
* FLASH organization
/*-----------------------------------------------------------------------
* FLASH organization
@@
-347,24
+347,24
@@
# define CFG_FLASH0_BASE CFG_SER_FLASH_BASE
# define CFG_FLASH1_BASE CFG_CS0_BASE
# define CFG_FLASH2_BASE CFG_CS1_BASE
# define CFG_FLASH0_BASE CFG_SER_FLASH_BASE
# define CFG_FLASH1_BASE CFG_CS0_BASE
# define CFG_FLASH2_BASE CFG_CS1_BASE
-# define C
FG_ENV_OFFSET
0x30000
-# define C
FG_ENV_SIZE
0x2000
-# define C
FG_ENV_SECT_SIZE
0x10000
+# define C
ONFIG_ENV_OFFSET
0x30000
+# define C
ONFIG_ENV_SIZE
0x2000
+# define C
ONFIG_ENV_SECT_SIZE
0x10000
#endif
#ifdef CFG_ATMEL_BOOT
# define CFG_FLASH_BASE CFG_CS0_BASE
# define CFG_FLASH0_BASE CFG_CS0_BASE
# define CFG_FLASH1_BASE CFG_CS1_BASE
#endif
#ifdef CFG_ATMEL_BOOT
# define CFG_FLASH_BASE CFG_CS0_BASE
# define CFG_FLASH0_BASE CFG_CS0_BASE
# define CFG_FLASH1_BASE CFG_CS1_BASE
-# define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x4000)
-# define C
FG_ENV_SECT_SIZE
0x2000
+# define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x4000)
+# define C
ONFIG_ENV_SECT_SIZE
0x2000
#endif
#ifdef CFG_INTEL_BOOT
# define CFG_FLASH_BASE CFG_CS0_BASE
# define CFG_FLASH0_BASE CFG_CS0_BASE
# define CFG_FLASH1_BASE CFG_CS1_BASE
#endif
#ifdef CFG_INTEL_BOOT
# define CFG_FLASH_BASE CFG_CS0_BASE
# define CFG_FLASH0_BASE CFG_CS0_BASE
# define CFG_FLASH1_BASE CFG_CS1_BASE
-# define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x40000)
-# define C
FG_ENV_SIZE
0x2000
-# define C
FG_ENV_SECT_SIZE
0x20000
+# define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x40000)
+# define C
ONFIG_ENV_SIZE
0x2000
+# define C
ONFIG_ENV_SECT_SIZE
0x20000
#endif
#define CFG_FLASH_CFI
#endif
#define CFG_FLASH_CFI
diff --git
a/include/configs/M5475EVB.h
b/include/configs/M5475EVB.h
index
7913879
..
37b1c60
100644
(file)
--- a/
include/configs/M5475EVB.h
+++ b/
include/configs/M5475EVB.h
@@
-277,10
+277,10
@@
/* Configuration for environment
* Environment is embedded in u-boot in the second sector of the flash
*/
/* Configuration for environment
* Environment is embedded in u-boot in the second sector of the flash
*/
-#define C
FG_ENV_OFFSET
0x2000
-#define C
FG_ENV_SECT_SIZE
0x2000
+#define C
ONFIG_ENV_OFFSET
0x2000
+#define C
ONFIG_ENV_SECT_SIZE
0x2000
#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_IS_EMBEDDED
1
+#define C
ONFIG_ENV_IS_EMBEDDED
1
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/M5485EVB.h
b/include/configs/M5485EVB.h
index
df92a24
..
482136e
100644
(file)
--- a/
include/configs/M5485EVB.h
+++ b/
include/configs/M5485EVB.h
@@
-263,10
+263,10
@@
/* Configuration for environment
* Environment is embedded in u-boot in the second sector of the flash
*/
/* Configuration for environment
* Environment is embedded in u-boot in the second sector of the flash
*/
-#define C
FG_ENV_OFFSET
0x2000
-#define C
FG_ENV_SECT_SIZE
0x2000
+#define C
ONFIG_ENV_OFFSET
0x2000
+#define C
ONFIG_ENV_SECT_SIZE
0x2000
#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_IS_EMBEDDED
1
+#define C
ONFIG_ENV_IS_EMBEDDED
1
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/MBX.h
b/include/configs/MBX.h
index
44e1861
..
fed4d73
100644
(file)
--- a/
include/configs/MBX.h
+++ b/
include/configs/MBX.h
@@
-194,8
+194,8
@@
* access the NVRAM at the offset 0x1000.
*/
#define CONFIG_ENV_IS_IN_NVRAM 1 /* turn on NVRAM env feature */
* access the NVRAM at the offset 0x1000.
*/
#define CONFIG_ENV_IS_IN_NVRAM 1 /* turn on NVRAM env feature */
-#define C
FG_ENV_ADDR
(CFG_NVRAM_BASE + 0x1000)
-#define C
FG_ENV_SIZE
0x1000
+#define C
ONFIG_ENV_ADDR
(CFG_NVRAM_BASE + 0x1000)
+#define C
ONFIG_ENV_SIZE
0x1000
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/MBX860T.h
b/include/configs/MBX860T.h
index
4a537e8
..
cc05111
100644
(file)
--- a/
include/configs/MBX860T.h
+++ b/
include/configs/MBX860T.h
@@
-144,8
+144,8
@@
* access the NVRAM at the offset 0x1000.
*/
#define CONFIG_ENV_IS_IN_NVRAM 1 /* turn on NVRAM env feature */
* access the NVRAM at the offset 0x1000.
*/
#define CONFIG_ENV_IS_IN_NVRAM 1 /* turn on NVRAM env feature */
-#define C
FG_ENV_ADDR
(CFG_NVRAM_BASE + 0x1000)
-#define C
FG_ENV_SIZE
0x1000
+#define C
ONFIG_ENV_ADDR
(CFG_NVRAM_BASE + 0x1000)
+#define C
ONFIG_ENV_SIZE
0x1000
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/METROBOX.h
b/include/configs/METROBOX.h
index
b972390
..
16d2363
100644
(file)
--- a/
include/configs/METROBOX.h
+++ b/
include/configs/METROBOX.h
@@
-208,8
+208,8
@@
#undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */
#define CONFIG_ENV_OVERWRITE 1 /* allow env overwrite */
#undef CONFIG_ENV_IS_IN_EEPROM /* ... not in EEPROM */
#define CONFIG_ENV_OVERWRITE 1 /* allow env overwrite */
-#define C
FG_ENV_SIZE
0x1000 /* Size of Env vars */
-#define C
FG_ENV_ADDR
(CFG_NVRAM_BASE_ADDR)
+#define C
ONFIG_ENV_SIZE
0x1000 /* Size of Env vars */
+#define C
ONFIG_ENV_ADDR
(CFG_NVRAM_BASE_ADDR)
#define CONFIG_BOOTARGS "console=ttyS0,9600 root=/dev/nfs rw nfsroot=$serverip:/home/metrobox0 nfsaddrs=$ipaddr:::::eth0:none "
#define CONFIG_BOOTCOMMAND "tftp 8000000 pImage.metrobox;bootm 8000000"
#define CONFIG_BOOTARGS "console=ttyS0,9600 root=/dev/nfs rw nfsroot=$serverip:/home/metrobox0 nfsaddrs=$ipaddr:::::eth0:none "
#define CONFIG_BOOTCOMMAND "tftp 8000000 pImage.metrobox;bootm 8000000"
diff --git
a/include/configs/MHPC.h
b/include/configs/MHPC.h
index
de7cb12
..
a7901e5
100644
(file)
--- a/
include/configs/MHPC.h
+++ b/
include/configs/MHPC.h
@@
-229,8
+229,8
@@
#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 CONFIG_ENV_IS_IN_FLASH 1
#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 CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
CFG_MONITOR_LEN /* Offset of Environment */
-#define C
FG_ENV_SIZE
0x20000 /* Total Size of Environment */
+#define C
ONFIG_ENV_OFFSET
CFG_MONITOR_LEN /* Offset of Environment */
+#define C
ONFIG_ENV_SIZE
0x20000 /* Total Size of Environment */
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/MIP405.h
b/include/configs/MIP405.h
index
e0f9386
..
4527c17
100644
(file)
--- a/
include/configs/MIP405.h
+++ b/
include/configs/MIP405.h
@@
-115,8
+115,8
@@
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x00000 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x00800 /* 2k bytes may be used for env vars */
+#define C
ONFIG_ENV_OFFSET
0x00000 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x00800 /* 2k bytes may be used for env vars */
/***************************************************************
* Definitions for Serial Presence Detect EEPROM address
/***************************************************************
* Definitions for Serial Presence Detect EEPROM address
diff --git
a/include/configs/ML2.h
b/include/configs/ML2.h
index
a2703b1
..
11323db
100644
(file)
--- a/
include/configs/ML2.h
+++ b/
include/configs/ML2.h
@@
-185,9
+185,9
@@
/* BEG ENVIRONNEMENT FLASH */
#ifdef CONFIG_ENV_IS_IN_FLASH
/* BEG ENVIRONNEMENT FLASH */
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_OFFSET
0x00050000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x10000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x10000 /* see README - env sector total size */
+#define C
ONFIG_ENV_OFFSET
0x00050000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x10000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* see README - env sector total size */
#endif
/* END ENVIRONNEMENT FLASH */
/*-----------------------------------------------------------------------
#endif
/* END ENVIRONNEMENT FLASH */
/*-----------------------------------------------------------------------
@@
-197,9
+197,9
@@
#define CFG_NVRAM_SIZE 0x1ff8 /* NVRAM size */
#ifdef CONFIG_ENV_IS_IN_NVRAM
#define CFG_NVRAM_SIZE 0x1ff8 /* NVRAM size */
#ifdef CONFIG_ENV_IS_IN_NVRAM
-#define C
FG_ENV_SIZE
0x1000 /* Size of Environment vars */
-#define C
FG_ENV_ADDR
\
- (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
FG_ENV_SIZE)
/* Env */
+#define C
ONFIG_ENV_SIZE
0x1000 /* Size of Environment vars */
+#define C
ONFIG_ENV_ADDR
\
+ (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
ONFIG_ENV_SIZE)
/* Env */
#endif
/*
#endif
/*
diff --git
a/include/configs/MOUSSE.h
b/include/configs/MOUSSE.h
index
b145166
..
b69ced6
100644
(file)
--- a/
include/configs/MOUSSE.h
+++ b/
include/configs/MOUSSE.h
@@
-299,13
+299,13
@@
#if 0
#define CONFIG_ENV_IS_IN_FLASH 1
#if 0
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET 0x8000 /* Offset of the Environment Sector
*/
-#define C
F
G_ENV_SIZE 0x4000 /* Size of the Environment Sector */
+#define C
ONFIG_ENV_OFFSET 0x8000 /* Offset of the Environment Sector
*/
+#define C
ONFI
G_ENV_SIZE 0x4000 /* Size of the Environment Sector */
#else
#define CONFIG_ENV_IS_IN_NVRAM 1
#else
#define CONFIG_ENV_IS_IN_NVRAM 1
-#define C
F
G_ENV_ADDR NV_OFF_U_BOOT_ADDR /* PortX NVM Free addr*/
-#define C
FG_ENV_OFFSET CF
G_ENV_ADDR
-#define C
F
G_ENV_SIZE NV_U_BOOT_ENV_SIZE /* 2K */
+#define C
ONFI
G_ENV_ADDR NV_OFF_U_BOOT_ADDR /* PortX NVM Free addr*/
+#define C
ONFIG_ENV_OFFSET CONFI
G_ENV_ADDR
+#define C
ONFI
G_ENV_SIZE NV_U_BOOT_ENV_SIZE /* 2K */
#endif
/*-----------------------------------------------------------------------
* Cache Configuration
#endif
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/MPC8260ADS.h
b/include/configs/MPC8260ADS.h
index
9a76732
..
763ad4c
100644
(file)
--- a/
include/configs/MPC8260ADS.h
+++ b/
include/configs/MPC8260ADS.h
@@
-381,12
+381,12
@@
#ifndef CFG_RAMBOOT
# define CONFIG_ENV_IS_IN_FLASH 1
#ifndef CFG_RAMBOOT
# define CONFIG_ENV_IS_IN_FLASH 1
-# define C
FG_ENV_SECT_SIZE
0x40000
-# define C
FG_ENV_ADDR (CFG_MONITOR_BASE + CF
G_ENV_SECT_SIZE)
+# define C
ONFIG_ENV_SECT_SIZE
0x40000
+# define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE + CONFI
G_ENV_SECT_SIZE)
#else
# define CONFIG_ENV_IS_IN_NVRAM 1
#else
# define CONFIG_ENV_IS_IN_NVRAM 1
-# define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
-# define C
FG_ENV_SIZE
0x200
+# define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+# define C
ONFIG_ENV_SIZE
0x200
#endif /* CFG_RAMBOOT */
#define CFG_CACHELINE_SIZE 32 /* For MPC8260 CPU */
#endif /* CFG_RAMBOOT */
#define CFG_CACHELINE_SIZE 32 /* For MPC8260 CPU */
diff --git
a/include/configs/MPC8266ADS.h
b/include/configs/MPC8266ADS.h
index
e062717
..
26c6fbe
100644
(file)
--- a/
include/configs/MPC8266ADS.h
+++ b/
include/configs/MPC8266ADS.h
@@
-428,12
+428,12
@@
#ifndef CFG_RAMBOOT
# define CONFIG_ENV_IS_IN_FLASH 1
#ifndef CFG_RAMBOOT
# define CONFIG_ENV_IS_IN_FLASH 1
-# define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
-# define C
FG_ENV_SECT_SIZE
0x40000
+# define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
+# define C
ONFIG_ENV_SECT_SIZE
0x40000
#else
# define CONFIG_ENV_IS_IN_NVRAM 1
#else
# define CONFIG_ENV_IS_IN_NVRAM 1
-# define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
-# define C
FG_ENV_SIZE
0x200
+# define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+# define C
ONFIG_ENV_SIZE
0x200
#endif /* CFG_RAMBOOT */
#define CFG_CACHELINE_SIZE 32 /* For MPC8260 CPU */
#endif /* CFG_RAMBOOT */
#define CFG_CACHELINE_SIZE 32 /* For MPC8260 CPU */
diff --git
a/include/configs/MPC8313ERDB.h
b/include/configs/MPC8313ERDB.h
index
aef3578
..
55d7852
100644
(file)
--- a/
include/configs/MPC8313ERDB.h
+++ b/
include/configs/MPC8313ERDB.h
@@
-209,7
+209,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_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
#define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET
-/* CFG_MONITOR_LEN must be a multiple of C
F
G_ENV_SECT_SIZE */
+/* CFG_MONITOR_LEN must be a multiple of C
ONFI
G_ENV_SECT_SIZE */
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
#define CFG_MALLOC_LEN (512 * 1024) /* Reserved for malloc */
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
#define CFG_MALLOC_LEN (512 * 1024) /* Reserved for malloc */
@@
-386,23
+386,23
@@
*/
#if defined(CONFIG_NAND_U_BOOT)
#define CONFIG_ENV_IS_IN_NAND 1
*/
#if defined(CONFIG_NAND_U_BOOT)
#define CONFIG_ENV_IS_IN_NAND 1
- #define C
FG_ENV_OFFSET
(512 * 1024)
- #define C
FG_ENV_SECT_SIZE
CFG_NAND_BLOCK_SIZE
- #define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
- #define C
FG_ENV_SIZE_REDUND CF
G_ENV_SIZE
- #define C
FG_ENV_RANGE (CF
G_ENV_SECT_SIZE * 4)
- #define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET + CF
G_ENV_RANGE)
+ #define C
ONFIG_ENV_OFFSET
(512 * 1024)
+ #define C
ONFIG_ENV_SECT_SIZE
CFG_NAND_BLOCK_SIZE
+ #define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
+ #define C
ONFIG_ENV_SIZE_REDUND CONFI
G_ENV_SIZE
+ #define C
ONFIG_ENV_RANGE (CONFI
G_ENV_SECT_SIZE * 4)
+ #define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFI
G_ENV_RANGE)
#elif !defined(CFG_RAMBOOT)
#define CONFIG_ENV_IS_IN_FLASH 1
#elif !defined(CFG_RAMBOOT)
#define CONFIG_ENV_IS_IN_FLASH 1
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
- #define C
FG_ENV_SECT_SIZE
0x10000 /* 64K(one sector) for env */
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+ #define C
ONFIG_ENV_SECT_SIZE
0x10000 /* 64K(one sector) for env */
+ #define C
ONFIG_ENV_SIZE
0x2000
/* Address and size of Redundant Environment Sector */
#else
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
/* Address and size of Redundant Environment Sector */
#else
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+ #define C
ONFIG_ENV_SIZE
0x2000
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
diff --git
a/include/configs/MPC8315ERDB.h
b/include/configs/MPC8315ERDB.h
index
92a6218
..
5879a82
100644
(file)
--- a/
include/configs/MPC8315ERDB.h
+++ b/
include/configs/MPC8315ERDB.h
@@
-378,14
+378,14
@@
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
- #define C
FG_ENV_SECT_SIZE
0x10000 /* 64K(one sector) for env */
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+ #define C
ONFIG_ENV_SECT_SIZE
0x10000 /* 64K(one sector) for env */
+ #define C
ONFIG_ENV_SIZE
0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+ #define C
ONFIG_ENV_SIZE
0x2000
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
diff --git
a/include/configs/MPC8323ERDB.h
b/include/configs/MPC8323ERDB.h
index
7e4849a
..
977142b
100644
(file)
--- a/
include/configs/MPC8323ERDB.h
+++ b/
include/configs/MPC8323ERDB.h
@@
-155,7
+155,7
@@
#undef CFG_RAMBOOT
#endif
#undef CFG_RAMBOOT
#endif
-/* CFG_MONITOR_LEN must be a multiple of C
F
G_ENV_SECT_SIZE */
+/* CFG_MONITOR_LEN must be a multiple of C
ONFI
G_ENV_SECT_SIZE */
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
#define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
#define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */
@@
-392,14
+392,14
@@
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
- #define C
FG_ENV_SECT_SIZE
0x20000
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+ #define C
ONFIG_ENV_SECT_SIZE
0x20000
+ #define C
ONFIG_ENV_SIZE
0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+ #define C
ONFIG_ENV_SIZE
0x2000
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
diff --git
a/include/configs/MPC832XEMDS.h
b/include/configs/MPC832XEMDS.h
index
3102272
..
01cf557
100644
(file)
--- a/
include/configs/MPC832XEMDS.h
+++ b/
include/configs/MPC832XEMDS.h
@@
-143,7
+143,7
@@
#undef CFG_RAMBOOT
#endif
#undef CFG_RAMBOOT
#endif
-/* CFG_MONITOR_LEN must be a multiple of C
F
G_ENV_SECT_SIZE */
+/* CFG_MONITOR_LEN must be a multiple of C
ONFI
G_ENV_SECT_SIZE */
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
#define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
#define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */
@@
-404,14
+404,14
@@
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
- #define C
FG_ENV_SECT_SIZE
0x20000
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+ #define C
ONFIG_ENV_SECT_SIZE
0x20000
+ #define C
ONFIG_ENV_SIZE
0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+ #define C
ONFIG_ENV_SIZE
0x2000
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
diff --git
a/include/configs/MPC8349EMDS.h
b/include/configs/MPC8349EMDS.h
index
d737cb4
..
87f1672
100644
(file)
--- a/
include/configs/MPC8349EMDS.h
+++ b/
include/configs/MPC8349EMDS.h
@@
-466,19
+466,19
@@
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
- #define C
FG_ENV_SECT_SIZE
0x20000 /* 128K(one sector) for env */
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+ #define C
ONFIG_ENV_SECT_SIZE
0x20000 /* 128K(one sector) for env */
+ #define C
ONFIG_ENV_SIZE
0x2000
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+ #define C
ONFIG_ENV_SIZE
0x2000
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
diff --git
a/include/configs/MPC8349ITX.h
b/include/configs/MPC8349ITX.h
index
7635c65
..
fa0c0a7
100644
(file)
--- a/
include/configs/MPC8349ITX.h
+++ b/
include/configs/MPC8349ITX.h
@@
-274,7
+274,7
@@
boards, we say we have two, but don't display a message if we find only one. */
#define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
#define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET
#define CFG_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
#define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET
-/* CFG_MONITOR_LEN must be a multiple of C
F
G_ENV_SECT_SIZE */
+/* CFG_MONITOR_LEN must be a multiple of C
ONFI
G_ENV_SECT_SIZE */
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
#define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
#define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */
@@
-414,15
+414,15
@@
boards, we say we have two, but don't display a message if we find only one. */
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
- #define C
FG_ENV_SECT_SIZE
0x10000 /* 64K (one sector) for environment */
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+ #define C
ONFIG_ENV_SECT_SIZE
0x10000 /* 64K (one sector) for environment */
+ #define C
ONFIG_ENV_SIZE
0x2000
#else
#define CFG_NO_FLASH /* Flash is not usable now */
#undef CONFIG_FLASH_CFI_DRIVER
#define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */
#else
#define CFG_NO_FLASH /* Flash is not usable now */
#undef CONFIG_FLASH_CFI_DRIVER
#define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+ #define C
ONFIG_ENV_SIZE
0x2000
#endif
#define CONFIG_LOADS_ECHO /* echo on for serial download */
#endif
#define CONFIG_LOADS_ECHO /* echo on for serial download */
diff --git
a/include/configs/MPC8360EMDS.h
b/include/configs/MPC8360EMDS.h
index
37173cc
..
f60d7a7
100644
(file)
--- a/
include/configs/MPC8360EMDS.h
+++ b/
include/configs/MPC8360EMDS.h
@@
-168,7
+168,7
@@
#undef CFG_RAMBOOT
#endif
#undef CFG_RAMBOOT
#endif
-/* CFG_MONITOR_LEN must be a multiple of C
F
G_ENV_SECT_SIZE */
+/* CFG_MONITOR_LEN must be a multiple of C
ONFI
G_ENV_SECT_SIZE */
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
#define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
#define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */
@@
-435,14
+435,14
@@
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
- #define C
FG_ENV_SECT_SIZE
0x20000
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+ #define C
ONFIG_ENV_SECT_SIZE
0x20000
+ #define C
ONFIG_ENV_SIZE
0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+ #define C
ONFIG_ENV_SIZE
0x2000
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
diff --git
a/include/configs/MPC8360ERDK.h
b/include/configs/MPC8360ERDK.h
index
b20f165
..
b2e6b3b
100644
(file)
--- a/
include/configs/MPC8360ERDK.h
+++ b/
include/configs/MPC8360ERDK.h
@@
-340,14
+340,14
@@
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
-#define C
FG_ENV_SECT_SIZE
0x20000 /* 128K(one sector) for env */
-#define C
FG_ENV_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* 128K(one sector) for env */
+#define C
ONFIG_ENV_SIZE
0x20000
#else /* CFG_RAMBOOT */
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#else /* CFG_RAMBOOT */
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
-#define C
FG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+#define C
ONFIG_ENV_SIZE
0x2000
#endif /* CFG_RAMBOOT */
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#endif /* CFG_RAMBOOT */
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
diff --git
a/include/configs/MPC837XEMDS.h
b/include/configs/MPC837XEMDS.h
index
21d7d2d
..
7c87388
100644
(file)
--- a/
include/configs/MPC837XEMDS.h
+++ b/
include/configs/MPC837XEMDS.h
@@
-203,7
+203,7
@@
#undef CFG_RAMBOOT
#endif
#undef CFG_RAMBOOT
#endif
-/* CFG_MONITOR_LEN must be a multiple of C
F
G_ENV_SECT_SIZE */
+/* CFG_MONITOR_LEN must be a multiple of C
ONFI
G_ENV_SECT_SIZE */
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
#define CFG_MALLOC_LEN (512 * 1024) /* Reserved for malloc */
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
#define CFG_MALLOC_LEN (512 * 1024) /* Reserved for malloc */
@@
-422,14
+422,14
@@
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
- #define C
FG_ENV_SECT_SIZE
0x20000 /* 128K(one sector) for env */
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+ #define C
ONFIG_ENV_SECT_SIZE
0x20000 /* 128K(one sector) for env */
+ #define C
ONFIG_ENV_SIZE
0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+ #define C
ONFIG_ENV_SIZE
0x2000
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
diff --git
a/include/configs/MPC837XERDB.h
b/include/configs/MPC837XERDB.h
index
7ffc743
..
2ac4ad0
100644
(file)
--- a/
include/configs/MPC837XERDB.h
+++ b/
include/configs/MPC837XERDB.h
@@
-443,14
+443,14
@@
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE+CFG_MONITOR_LEN)
- #define C
FG_ENV_SECT_SIZE
0x10000 /* 64K (one sector) for env */
- #define C
FG_ENV_SIZE
0x4000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE+CFG_MONITOR_LEN)
+ #define C
ONFIG_ENV_SECT_SIZE
0x10000 /* 64K (one sector) for env */
+ #define C
ONFIG_ENV_SIZE
0x4000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE-0x1000)
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE-0x1000)
+ #define C
ONFIG_ENV_SIZE
0x2000
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
diff --git
a/include/configs/MPC8536DS.h
b/include/configs/MPC8536DS.h
index
f290075
..
2578bef
100644
(file)
--- a/
include/configs/MPC8536DS.h
+++ b/
include/configs/MPC8536DS.h
@@
-448,12
+448,12
@@
extern unsigned long get_board_ddr_clk(unsigned long dummy);
*/
#define CONFIG_ENV_IS_IN_FLASH 1
#if CFG_MONITOR_BASE > 0xfff80000
*/
#define CONFIG_ENV_IS_IN_FLASH 1
#if CFG_MONITOR_BASE > 0xfff80000
-#define C
FG_ENV_ADDR
0xfff80000
+#define C
ONFIG_ENV_ADDR
0xfff80000
#else
#else
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + 0x60000)
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + 0x60000)
#endif
#endif
-#define C
FG_ENV_SIZE
0x2000
-#define C
FG_ENV_SECT_SIZE
0x20000 /* 128K (one sector) */
+#define C
ONFIG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* 128K (one sector) */
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
diff --git
a/include/configs/MPC8540ADS.h
b/include/configs/MPC8540ADS.h
index
0dc1096
..
0f5f834
100644
(file)
--- a/
include/configs/MPC8540ADS.h
+++ b/
include/configs/MPC8540ADS.h
@@
-382,14
+382,14
@@
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
- #define C
FG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
+ #define C
ONFIG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
+ #define C
ONFIG_ENV_SIZE
0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+ #define C
ONFIG_ENV_SIZE
0x2000
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
diff --git
a/include/configs/MPC8540EVAL.h
b/include/configs/MPC8540EVAL.h
index
d4df8a6
..
ee4f41f
100644
(file)
--- a/
include/configs/MPC8540EVAL.h
+++ b/
include/configs/MPC8540EVAL.h
@@
-257,19
+257,19
@@
#ifndef CFG_RAMBOOT
#if defined(CONFIG_RAM_AS_FLASH)
#define CONFIG_ENV_IS_NOWHERE
#ifndef CFG_RAMBOOT
#if defined(CONFIG_RAM_AS_FLASH)
#define CONFIG_ENV_IS_NOWHERE
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x100000)
-#define C
FG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x100000)
+#define C
ONFIG_ENV_SIZE
0x2000
#else
#define CONFIG_ENV_IS_IN_FLASH 1
#else
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
-#define C
FG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
#endif
#endif
-#define C
FG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_SIZE
0x2000
#else
/* #define CFG_NO_FLASH 1 */ /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#else
/* #define CFG_NO_FLASH 1 */ /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
-#define C
FG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+#define C
ONFIG_ENV_SIZE
0x2000
#endif
#define CONFIG_BOOTARGS "root=/dev/ram rw console=ttyS0,115200"
#endif
#define CONFIG_BOOTARGS "root=/dev/ram rw console=ttyS0,115200"
diff --git
a/include/configs/MPC8541CDS.h
b/include/configs/MPC8541CDS.h
index
569952d
..
6a400f5
100644
(file)
--- a/
include/configs/MPC8541CDS.h
+++ b/
include/configs/MPC8541CDS.h
@@
-406,9
+406,9
@@
extern unsigned long get_clock_freq(void);
* Environment
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
-#define C
FG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
-#define C
FG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
+#define C
ONFIG_ENV_SIZE
0x2000
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
diff --git
a/include/configs/MPC8544DS.h
b/include/configs/MPC8544DS.h
index
02776b3
..
b650874
100644
(file)
--- a/
include/configs/MPC8544DS.h
+++ b/
include/configs/MPC8544DS.h
@@
-396,12
+396,12
@@
extern unsigned long get_board_sys_clk(unsigned long dummy);
*/
#define CONFIG_ENV_IS_IN_FLASH 1
#if CFG_MONITOR_BASE > 0xfff80000
*/
#define CONFIG_ENV_IS_IN_FLASH 1
#if CFG_MONITOR_BASE > 0xfff80000
-#define C
FG_ENV_ADDR
0xfff80000
+#define C
ONFIG_ENV_ADDR
0xfff80000
#else
#else
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + 0x70000)
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + 0x70000)
#endif
#endif
-#define C
FG_ENV_SIZE
0x2000
-#define C
FG_ENV_SECT_SIZE
0x10000 /* 64K (one sector) */
+#define C
ONFIG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* 64K (one sector) */
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
diff --git
a/include/configs/MPC8548CDS.h
b/include/configs/MPC8548CDS.h
index
4afb7ae
..
68bc106
100644
(file)
--- a/
include/configs/MPC8548CDS.h
+++ b/
include/configs/MPC8548CDS.h
@@
-467,9
+467,9
@@
extern unsigned long get_clock_freq(void);
* Environment
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
-#define C
FG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
-#define C
FG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
+#define C
ONFIG_ENV_SIZE
0x2000
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
diff --git
a/include/configs/MPC8555CDS.h
b/include/configs/MPC8555CDS.h
index
c521336
..
ab4bc86
100644
(file)
--- a/
include/configs/MPC8555CDS.h
+++ b/
include/configs/MPC8555CDS.h
@@
-404,9
+404,9
@@
extern unsigned long get_clock_freq(void);
* Environment
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
-#define C
FG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
-#define C
FG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
+#define C
ONFIG_ENV_SIZE
0x2000
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
diff --git
a/include/configs/MPC8560ADS.h
b/include/configs/MPC8560ADS.h
index
72a8b25
..
2bd8724
100644
(file)
--- a/
include/configs/MPC8560ADS.h
+++ b/
include/configs/MPC8560ADS.h
@@
-413,14
+413,14
@@
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
- #define C
FG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
+ #define C
ONFIG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
+ #define C
ONFIG_ENV_SIZE
0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+ #define C
ONFIG_ENV_SIZE
0x2000
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
diff --git
a/include/configs/MPC8568MDS.h
b/include/configs/MPC8568MDS.h
index
5b1cf6f
..
80697a5
100644
(file)
--- a/
include/configs/MPC8568MDS.h
+++ b/
include/configs/MPC8568MDS.h
@@
-425,9
+425,9
@@
extern unsigned long get_clock_freq(void);
* Environment
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
-#define C
FG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
-#define C
FG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
+#define C
ONFIG_ENV_SIZE
0x2000
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
diff --git
a/include/configs/MPC8572DS.h
b/include/configs/MPC8572DS.h
index
94c0240
..
d7e3a88
100644
(file)
--- a/
include/configs/MPC8572DS.h
+++ b/
include/configs/MPC8572DS.h
@@
-428,12
+428,12
@@
extern unsigned long get_board_ddr_clk(unsigned long dummy);
*/
#define CONFIG_ENV_IS_IN_FLASH 1
#if CFG_MONITOR_BASE > 0xfff80000
*/
#define CONFIG_ENV_IS_IN_FLASH 1
#if CFG_MONITOR_BASE > 0xfff80000
-#define C
FG_ENV_ADDR
0xfff80000
+#define C
ONFIG_ENV_ADDR
0xfff80000
#else
#else
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + 0x70000)
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + 0x70000)
#endif
#endif
-#define C
FG_ENV_SIZE
0x2000
-#define C
FG_ENV_SECT_SIZE
0x20000 /* 128K (one sector) */
+#define C
ONFIG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* 128K (one sector) */
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
diff --git
a/include/configs/MPC8610HPCD.h
b/include/configs/MPC8610HPCD.h
index
744110f
..
4eee21c
100644
(file)
--- a/
include/configs/MPC8610HPCD.h
+++ b/
include/configs/MPC8610HPCD.h
@@
-439,13
+439,13
@@
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
-#define C
FG_ENV_SECT_SIZE
0x20000 /* 126k (one sector) for env */
-#define C
FG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* 126k (one sector) for env */
+#define C
ONFIG_ENV_SIZE
0x2000
#else
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#else
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
-#define C
FG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+#define C
ONFIG_ENV_SIZE
0x2000
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
diff --git
a/include/configs/MPC8641HPCN.h
b/include/configs/MPC8641HPCN.h
index
7b5c402
..
fc55feb
100644
(file)
--- a/
include/configs/MPC8641HPCN.h
+++ b/
include/configs/MPC8641HPCN.h
@@
-505,13
+505,13
@@
extern unsigned long get_board_sys_clk(unsigned long dummy);
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + 0x60000)
- #define C
FG_ENV_SECT_SIZE
0x10000 /* 64K(one sector) for env */
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + 0x60000)
+ #define C
ONFIG_ENV_SECT_SIZE
0x10000 /* 64K(one sector) for env */
+ #define C
ONFIG_ENV_SIZE
0x2000
#else
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#else
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+ #define C
ONFIG_ENV_SIZE
0x2000
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
diff --git
a/include/configs/MUSENKI.h
b/include/configs/MUSENKI.h
index
4a7540e
..
88d8072
100644
(file)
--- a/
include/configs/MUSENKI.h
+++ b/
include/configs/MUSENKI.h
@@
-281,9
+281,9
@@
* It's stored in flash separately.
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* It's stored in flash separately.
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
0xFFFF0000
-#define C
FG_ENV_SIZE
0x00010000 /* Size of the Environment */
-#define C
FG_ENV_SECT_SIZE
0x20000 /* Size of the Environment Sector */
+#define C
ONFIG_ENV_ADDR
0xFFFF0000
+#define C
ONFIG_ENV_SIZE
0x00010000 /* Size of the Environment */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* Size of the Environment Sector */
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/MVBC_P.h
b/include/configs/MVBC_P.h
index
bf06ef8
..
21475fb
100644
(file)
--- a/
include/configs/MVBC_P.h
+++ b/
include/configs/MVBC_P.h
@@
-218,11
+218,11
@@
#define CONFIG_ENV_IS_IN_FLASH
#undef CFG_FLASH_PROTECTION
#define CONFIG_ENV_IS_IN_FLASH
#undef CFG_FLASH_PROTECTION
-#define C
FG_ENV_ADDR
0xFFFE0000
-#define C
FG_ENV_SIZE
0x10000
-#define C
FG_ENV_SECT_SIZE
0x10000
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR+CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND CF
G_ENV_SIZE
+#define C
ONFIG_ENV_ADDR
0xFFFE0000
+#define C
ONFIG_ENV_SIZE
0x10000
+#define C
ONFIG_ENV_SECT_SIZE
0x10000
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND CONFI
G_ENV_SIZE
/*
* Memory map
/*
* Memory map
@@
-243,7
+243,7
@@
#define CFG_RAMBOOT 1
#endif
#define CFG_RAMBOOT 1
#endif
-/* CFG_MONITOR_LEN must be a multiple of C
F
G_ENV_SECT_SIZE */
+/* CFG_MONITOR_LEN must be a multiple of C
ONFI
G_ENV_SECT_SIZE */
#define CFG_MONITOR_LEN (512 << 10)
#define CFG_MALLOC_LEN (512 << 10)
#define CFG_BOOTMAPSZ (8 << 20)
#define CFG_MONITOR_LEN (512 << 10)
#define CFG_MALLOC_LEN (512 << 10)
#define CFG_BOOTMAPSZ (8 << 20)
diff --git
a/include/configs/MVBLM7.h
b/include/configs/MVBLM7.h
index
b828857
..
ec36f55
100644
(file)
--- a/
include/configs/MVBLM7.h
+++ b/
include/configs/MVBLM7.h
@@
-139,7
+139,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_GBL_DATA_OFFSET (CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
#define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET
-/* CFG_MONITOR_LEN must be a multiple of C
F
G_ENV_SECT_SIZE */
+/* CFG_MONITOR_LEN must be a multiple of C
ONFI
G_ENV_SECT_SIZE */
#define CFG_MONITOR_LEN (512 * 1024)
#define CFG_MALLOC_LEN (512 * 1024)
#define CFG_MONITOR_LEN (512 * 1024)
#define CFG_MALLOC_LEN (512 * 1024)
@@
-256,11
+256,11
@@
#define CONFIG_ENV_OVERWRITE
#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_OVERWRITE
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
0xFF800000
-#define C
FG_ENV_SIZE
0x2000
-#define C
FG_ENV_SECT_SIZE
0x2000
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR+CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND CF
G_ENV_SIZE
+#define C
ONFIG_ENV_ADDR
0xFF800000
+#define C
ONFIG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_SECT_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND CONFI
G_ENV_SIZE
#define CONFIG_LOADS_ECHO
#define CFG_LOADS_BAUD_CHANGE
#define CONFIG_LOADS_ECHO
#define CFG_LOADS_BAUD_CHANGE
diff --git
a/include/configs/MVBLUE.h
b/include/configs/MVBLUE.h
index
819e725
..
2518dbe
100644
(file)
--- a/
include/configs/MVBLUE.h
+++ b/
include/configs/MVBLUE.h
@@
-330,9
+330,9
@@
#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_OFFSET
0x00010000
-#define C
FG_ENV_SIZE
0x00010000
-#define C
FG_ENV_SECT_SIZE
0x00010000
+#define C
ONFIG_ENV_OFFSET
0x00010000
+#define C
ONFIG_ENV_SIZE
0x00010000
+#define C
ONFIG_ENV_SECT_SIZE
0x00010000
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/MVS1.h
b/include/configs/MVS1.h
index
df1586b
..
da8231c
100644
(file)
--- a/
include/configs/MVS1.h
+++ b/
include/configs/MVS1.h
@@
-177,8
+177,8
@@
#define CONFIG_ENV_IS_IN_FLASH 1
/* 4MB flash - use bottom sectors of a bottom boot sector flash (16 bit access) */
#define CONFIG_ENV_IS_IN_FLASH 1
/* 4MB flash - use bottom sectors of a bottom boot sector flash (16 bit access) */
-#define C
FG_ENV_OFFSET
0x8000 /* Offset of Environment Sector (bottom boot sector) */
-#define C
FG_ENV_SIZE
0x2000 /* Used Size of Environment Sector 8k */
+#define C
ONFIG_ENV_OFFSET
0x8000 /* Offset of Environment Sector (bottom boot sector) */
+#define C
ONFIG_ENV_SIZE
0x2000 /* Used Size of Environment Sector 8k */
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/MigoR.h
b/include/configs/MigoR.h
index
59d6e9a
..
7d90e16
100644
(file)
--- a/
include/configs/MigoR.h
+++ b/
include/configs/MigoR.h
@@
-132,12
+132,12
@@
/* ENV setting */
#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OVERWRITE 1
/* ENV setting */
#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OVERWRITE 1
-#define C
FG_ENV_SECT_SIZE
(128 * 1024)
-#define C
FG_ENV_SIZE (CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SECT_SIZE
(128 * 1024)
+#define C
ONFIG_ENV_SIZE (CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + CFG_MONITOR_LEN)
/* Offset of env Flash sector relative to CFG_FLASH_BASE */
/* Offset of env Flash sector relative to CFG_FLASH_BASE */
-#define C
FG_ENV_OFFSET (CF
G_ENV_ADDR - CFG_FLASH_BASE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_OFFSET (CONFI
G_ENV_ADDR - CFG_FLASH_BASE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SECT_SIZE)
/* Board Clock */
#define CONFIG_SYS_CLK_FREQ 33333333
/* Board Clock */
#define CONFIG_SYS_CLK_FREQ 33333333
diff --git
a/include/configs/NC650.h
b/include/configs/NC650.h
index
22bd0f0
..
3e64a7e
100644
(file)
--- a/
include/configs/NC650.h
+++ b/
include/configs/NC650.h
@@
-233,10
+233,10
@@
#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x00740000
+#define C
ONFIG_ENV_OFFSET
0x00740000
-#define C
FG_ENV_SECT_SIZE
0x20000 /* Total Size of Environment sector */
-#define C
FG_ENV_SIZE
0x4000 /* Used Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* Total Size of Environment sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Used Size of Environment Sector */
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/NETPHONE.h
b/include/configs/NETPHONE.h
index
ac4c424
..
7cc6364
100644
(file)
--- a/
include/configs/NETPHONE.h
+++ b/
include/configs/NETPHONE.h
@@
-217,15
+217,15
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SECT_SIZE
0x10000
+#define C
ONFIG_ENV_SECT_SIZE
0x10000
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x60000)
-#define C
FG_ENV_OFFSET
0
-#define C
FG_ENV_SIZE
0x4000
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x60000)
+#define C
ONFIG_ENV_OFFSET
0
+#define C
ONFIG_ENV_SIZE
0x4000
-#define C
FG_ENV_ADDR_REDUND
(CFG_FLASH_BASE + 0x70000)
-#define C
FG_ENV_OFFSET_REDUND
0
-#define C
FG_ENV_SIZE_REDUND CF
G_ENV_SIZE
+#define C
ONFIG_ENV_ADDR_REDUND
(CFG_FLASH_BASE + 0x70000)
+#define C
ONFIG_ENV_OFFSET_REDUND
0
+#define C
ONFIG_ENV_SIZE_REDUND CONFI
G_ENV_SIZE
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/NETTA.h
b/include/configs/NETTA.h
index
80aee5b
..
805b82a
100644
(file)
--- a/
include/configs/NETTA.h
+++ b/
include/configs/NETTA.h
@@
-221,15
+221,15
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SECT_SIZE
0x10000
+#define C
ONFIG_ENV_SECT_SIZE
0x10000
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x60000)
-#define C
FG_ENV_OFFSET
0
-#define C
FG_ENV_SIZE
0x4000
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x60000)
+#define C
ONFIG_ENV_OFFSET
0
+#define C
ONFIG_ENV_SIZE
0x4000
-#define C
FG_ENV_ADDR_REDUND
(CFG_FLASH_BASE + 0x70000)
-#define C
FG_ENV_OFFSET_REDUND
0
-#define C
FG_ENV_SIZE_REDUND CF
G_ENV_SIZE
+#define C
ONFIG_ENV_ADDR_REDUND
(CFG_FLASH_BASE + 0x70000)
+#define C
ONFIG_ENV_OFFSET_REDUND
0
+#define C
ONFIG_ENV_SIZE_REDUND CONFI
G_ENV_SIZE
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/NETTA2.h
b/include/configs/NETTA2.h
index
6cb39d9
..
687db1d
100644
(file)
--- a/
include/configs/NETTA2.h
+++ b/
include/configs/NETTA2.h
@@
-218,15
+218,15
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SECT_SIZE
0x10000
+#define C
ONFIG_ENV_SECT_SIZE
0x10000
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x60000)
-#define C
FG_ENV_OFFSET
0
-#define C
FG_ENV_SIZE
0x4000
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x60000)
+#define C
ONFIG_ENV_OFFSET
0
+#define C
ONFIG_ENV_SIZE
0x4000
-#define C
FG_ENV_ADDR_REDUND
(CFG_FLASH_BASE + 0x70000)
-#define C
FG_ENV_OFFSET_REDUND
0
-#define C
FG_ENV_SIZE_REDUND CF
G_ENV_SIZE
+#define C
ONFIG_ENV_ADDR_REDUND
(CFG_FLASH_BASE + 0x70000)
+#define C
ONFIG_ENV_OFFSET_REDUND
0
+#define C
ONFIG_ENV_SIZE_REDUND CONFI
G_ENV_SIZE
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/NETVIA.h
b/include/configs/NETVIA.h
index
0d318e8
..
e550030
100644
(file)
--- a/
include/configs/NETVIA.h
+++ b/
include/configs/NETVIA.h
@@
-188,15
+188,15
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SECT_SIZE
0x10000
+#define C
ONFIG_ENV_SECT_SIZE
0x10000
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x60000)
-#define C
FG_ENV_OFFSET
0
-#define C
FG_ENV_SIZE
0x4000
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x60000)
+#define C
ONFIG_ENV_OFFSET
0
+#define C
ONFIG_ENV_SIZE
0x4000
-#define C
FG_ENV_ADDR_REDUND
(CFG_FLASH_BASE + 0x70000)
-#define C
FG_ENV_OFFSET_REDUND
0
-#define C
FG_ENV_SIZE_REDUND CF
G_ENV_SIZE
+#define C
ONFIG_ENV_ADDR_REDUND
(CFG_FLASH_BASE + 0x70000)
+#define C
ONFIG_ENV_OFFSET_REDUND
0
+#define C
ONFIG_ENV_SIZE_REDUND CONFI
G_ENV_SIZE
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/NSCU.h
b/include/configs/NSCU.h
index
9991d69
..
e297c84
100644
(file)
--- a/
include/configs/NSCU.h
+++ b/
include/configs/NSCU.h
@@
-208,12
+208,12
@@
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git
a/include/configs/NX823.h
b/include/configs/NX823.h
index
eddb52b
..
1f4c329
100644
(file)
--- a/
include/configs/NX823.h
+++ b/
include/configs/NX823.h
@@
-150,11
+150,11
@@
#define CONFIG_ENV_IS_IN_FLASH 1
#define xEMBED
#ifdef EMBED
#define CONFIG_ENV_IS_IN_FLASH 1
#define xEMBED
#ifdef EMBED
-#define C
FG_ENV_SIZE
0x200 /* FIXME How big when embedded?? */
-#define C
FG_ENV_ADDR
CFG_MONITOR_BASE
+#define C
ONFIG_ENV_SIZE
0x200 /* FIXME How big when embedded?? */
+#define C
ONFIG_ENV_ADDR
CFG_MONITOR_BASE
#else
#else
-#define C
FG_ENV_ADDR
0x40020000 /* absolute address for now */
-#define C
FG_ENV_SIZE
0x20000 /* 8K ouch, this may later be */
+#define C
ONFIG_ENV_ADDR
0x40020000 /* absolute address for now */
+#define C
ONFIG_ENV_SIZE
0x20000 /* 8K ouch, this may later be */
#endif
#define CFG_FLASH_SN_BASE 0x4001fff0 /* programmer automagically puts */
#endif
#define CFG_FLASH_SN_BASE 0x4001fff0 /* programmer automagically puts */
diff --git
a/include/configs/OCRTC.h
b/include/configs/OCRTC.h
index
f839ead
..
17b00a1
100644
(file)
--- a/
include/configs/OCRTC.h
+++ b/
include/configs/OCRTC.h
@@
-192,16
+192,16
@@
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
#define CFG_NVRAM_BASE_ADDR 0xf0200000 /* NVRAM base address */
#define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
#define CFG_NVRAM_BASE_ADDR 0xf0200000 /* NVRAM base address */
#define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */
-#define C
FG_ENV_SIZE
0x1000 /* Size of Environment vars */
-#define C
FG_ENV_ADDR
\
- (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
FG_ENV_SIZE)
/* Env */
+#define C
ONFIG_ENV_SIZE
0x1000 /* Size of Environment vars */
+#define C
ONFIG_ENV_ADDR
\
+ (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
ONFIG_ENV_SIZE)
/* Env */
#define CFG_NVRAM_VXWORKS_OFFS 0x6900 /* Offset for VxWorks eth-addr */
#else /* Use EEPROM for environment variables */
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#define CFG_NVRAM_VXWORKS_OFFS 0x6900 /* Offset for VxWorks eth-addr */
#else /* Use EEPROM for environment variables */
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x300 /* 768 bytes may be used for env vars */
+#define C
ONFIG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x300 /* 768 bytes may be used for env vars */
/* total size of a CAT24WC08 is 1024 bytes */
#endif
/* total size of a CAT24WC08 is 1024 bytes */
#endif
diff --git
a/include/configs/ORSG.h
b/include/configs/ORSG.h
index
18f14bc
..
4f4b13d
100644
(file)
--- a/
include/configs/ORSG.h
+++ b/
include/configs/ORSG.h
@@
-190,16
+190,16
@@
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
#define CFG_NVRAM_BASE_ADDR 0xf0200000 /* NVRAM base address */
#define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
#define CFG_NVRAM_BASE_ADDR 0xf0200000 /* NVRAM base address */
#define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */
-#define C
FG_ENV_SIZE
0x1000 /* Size of Environment vars */
-#define C
FG_ENV_ADDR
\
- (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
FG_ENV_SIZE)
/* Env */
+#define C
ONFIG_ENV_SIZE
0x1000 /* Size of Environment vars */
+#define C
ONFIG_ENV_ADDR
\
+ (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
ONFIG_ENV_SIZE)
/* Env */
#define CFG_NVRAM_VXWORKS_OFFS 0x6900 /* Offset for VxWorks eth-addr */
#else /* Use EEPROM for environment variables */
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#define CFG_NVRAM_VXWORKS_OFFS 0x6900 /* Offset for VxWorks eth-addr */
#else /* Use EEPROM for environment variables */
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x300 /* 768 bytes may be used for env vars */
+#define C
ONFIG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x300 /* 768 bytes may be used for env vars */
/* total size of a CAT24WC08 is 1024 bytes */
#endif
/* total size of a CAT24WC08 is 1024 bytes */
#endif
diff --git
a/include/configs/OXC.h
b/include/configs/OXC.h
index
d9b4224
..
2ccaf47
100644
(file)
--- a/
include/configs/OXC.h
+++ b/
include/configs/OXC.h
@@
-194,9
+194,9
@@
*/
#define CONFIG_ENV_IS_IN_FLASH 1
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
0xFFF30000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x00010000 /* Total Size of Environment Sector */
-#define C
FG_ENV_IS_EMBEDDED
1 /* short-cut compile-time test */
+#define C
ONFIG_ENV_ADDR
0xFFF30000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x00010000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_IS_EMBEDDED
1 /* short-cut compile-time test */
#define CONFIG_ENV_OVERWRITE 1 /* Allow modifying the environment */
/*
#define CONFIG_ENV_OVERWRITE 1 /* Allow modifying the environment */
/*
diff --git
a/include/configs/P3G4.h
b/include/configs/P3G4.h
index
232044b
..
8150091
100644
(file)
--- a/
include/configs/P3G4.h
+++ b/
include/configs/P3G4.h
@@
-398,9
+398,9
@@
#define CFG_FLASH_CFI 1
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_CFI 1
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x20000
-#define C
FG_ENV_ADDR
0xFFFE0000
+#define C
ONFIG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR
0xFFFE0000
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/PATI.h
b/include/configs/PATI.h
index
9615044
..
42b155e
100644
(file)
--- a/
include/configs/PATI.h
+++ b/
include/configs/PATI.h
@@
-174,14
+174,14
@@
#define CONFIG_ENV_IS_IN_EEPROM
#ifdef CONFIG_ENV_IS_IN_EEPROM
#define CONFIG_ENV_IS_IN_EEPROM
#ifdef CONFIG_ENV_IS_IN_EEPROM
-#define C
FG_ENV_OFFSET
0
-#define C
FG_ENV_SIZE
2048
+#define C
ONFIG_ENV_OFFSET
0
+#define C
ONFIG_ENV_SIZE
2048
#endif
#undef CONFIG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
#endif
#undef CONFIG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SIZE
0x00002000 /* Set whole sector as env */
-#define C
FG_ENV_OFFSET ((0 - CFG_FLASH_BASE) - CFG_ENV_SIZE)
/* Environment starts at this adress */
+#define C
ONFIG_ENV_SIZE
0x00002000 /* Set whole sector as env */
+#define C
ONFIG_ENV_OFFSET ((0 - CFG_FLASH_BASE) - CONFIG_ENV_SIZE)
/* Environment starts at this adress */
#endif
#endif
diff --git
a/include/configs/PCI405.h
b/include/configs/PCI405.h
index
6c6a470
..
2837b51
100644
(file)
--- a/
include/configs/PCI405.h
+++ b/
include/configs/PCI405.h
@@
-219,15
+219,15
@@
* NVRAM organization
*/
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
* NVRAM organization
*/
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for environment vars */
-#define C
FG_ENV_SIZE
0x0ff8 /* Size of Environment vars */
-#define C
FG_ENV_ADDR
\
- (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(C
FG_ENV_SIZE+8))
/* Env */
+#define C
ONFIG_ENV_SIZE
0x0ff8 /* Size of Environment vars */
+#define C
ONFIG_ENV_ADDR
\
+ (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(C
ONFIG_ENV_SIZE+8))
/* Env */
#else /* Use EEPROM for environment variables */
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#else /* Use EEPROM for environment variables */
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x400 /* 1024 bytes may be used for env vars*/
+#define C
ONFIG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x400 /* 1024 bytes may be used for env vars*/
/* total size of a CAT24WC08 is 1024 bytes */
#endif
/* total size of a CAT24WC08 is 1024 bytes */
#endif
diff --git
a/include/configs/PCI5441.h
b/include/configs/PCI5441.h
index
94f6f93
..
b88a173
100644
(file)
--- a/
include/configs/PCI5441.h
+++ b/
include/configs/PCI5441.h
@@
-61,7
+61,7
@@
*----------------------------------------------------------------------*/
#define CFG_MONITOR_LEN (128 * 1024) /* Reserve 128k */
#define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/
*----------------------------------------------------------------------*/
#define CFG_MONITOR_LEN (128 * 1024) /* Reserve 128k */
#define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_MONITOR_BASE TEXT_BASE
#define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
#define CFG_MONITOR_BASE TEXT_BASE
#define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
@@
-85,9
+85,9
@@
* (which is common practice).
*----------------------------------------------------------------------*/
#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */
* (which is common practice).
*----------------------------------------------------------------------*/
#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */
-#define C
FG_ENV_SIZE
(64 * 1024) /* 64 KByte (1 sector) */
+#define C
ONFIG_ENV_SIZE
(64 * 1024) /* 64 KByte (1 sector) */
#define CONFIG_ENV_OVERWRITE /* Serial change Ok */
#define CONFIG_ENV_OVERWRITE /* Serial change Ok */
-#define C
FG_ENV_ADDR
(CFG_RESET_ADDR + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_ADDR
(CFG_RESET_ADDR + CFG_MONITOR_LEN)
/*------------------------------------------------------------------------
* CONSOLE
/*------------------------------------------------------------------------
* CONSOLE
diff --git
a/include/configs/PCIPPC2.h
b/include/configs/PCIPPC2.h
index
af3b8ee
..
048e896
100644
(file)
--- a/
include/configs/PCIPPC2.h
+++ b/
include/configs/PCIPPC2.h
@@
-222,9
+222,9
@@
* It's stored in flash separately.
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* It's stored in flash separately.
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x70000)
-#define C
FG_ENV_SIZE
0x1000 /* Size of the Environment */
-#define C
FG_ENV_SECT_SIZE
0x10000 /* Size of the Environment Sector */
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x70000)
+#define C
ONFIG_ENV_SIZE
0x1000 /* Size of the Environment */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* Size of the Environment Sector */
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/PCIPPC6.h
b/include/configs/PCIPPC6.h
index
e229bde
..
acaab7f
100644
(file)
--- a/
include/configs/PCIPPC6.h
+++ b/
include/configs/PCIPPC6.h
@@
-224,9
+224,9
@@
* It's stored in flash separately.
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* It's stored in flash separately.
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x70000)
-#define C
FG_ENV_SIZE
0x1000 /* Size of the Environment */
-#define C
FG_ENV_SECT_SIZE
0x10000 /* Size of the Environment Sector */
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x70000)
+#define C
ONFIG_ENV_SIZE
0x1000 /* Size of the Environment */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* Size of the Environment Sector */
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/PIP405.h
b/include/configs/PIP405.h
index
7876177
..
895b89c
100644
(file)
--- a/
include/configs/PIP405.h
+++ b/
include/configs/PIP405.h
@@
-96,8
+96,8
@@
#define CFG_I2C_EEPROM_ADDR 0x53
#define CFG_I2C_EEPROM_ADDR_LEN 2
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#define CFG_I2C_EEPROM_ADDR 0x53
#define CFG_I2C_EEPROM_ADDR_LEN 2
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
F
G_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */
-#define C
F
G_ENV_SIZE 0x800 /* 2 kBytes may be used for env vars */
+#define C
ONFI
G_ENV_OFFSET 0x000 /* environment starts at the beginning of the EEPROM */
+#define C
ONFI
G_ENV_SIZE 0x800 /* 2 kBytes may be used for env vars */
#undef CFG_I2C_EEPROM_ADDR_OVERFLOW
#define CFG_EEPROM_PAGE_WRITE_BITS 6 /* The Atmel 24C128/256 has */
#undef CFG_I2C_EEPROM_ADDR_OVERFLOW
#define CFG_EEPROM_PAGE_WRITE_BITS 6 /* The Atmel 24C128/256 has */
diff --git
a/include/configs/PK1C20.h
b/include/configs/PK1C20.h
index
48e9269
..
5d2bc2f
100644
(file)
--- a/
include/configs/PK1C20.h
+++ b/
include/configs/PK1C20.h
@@
-63,7
+63,7
@@
*----------------------------------------------------------------------*/
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 128k */
#define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/
*----------------------------------------------------------------------*/
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 128k */
#define CFG_GBL_DATA_SIZE 128 /* Global data size rsvd*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_MONITOR_BASE TEXT_BASE
#define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
#define CFG_MONITOR_BASE TEXT_BASE
#define CFG_MALLOC_BASE (CFG_MONITOR_BASE - CFG_MALLOC_LEN)
@@
-87,9
+87,9
@@
* (which is common practice).
*----------------------------------------------------------------------*/
#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */
* (which is common practice).
*----------------------------------------------------------------------*/
#define CONFIG_ENV_IS_IN_FLASH 1 /* Environment in flash */
-#define C
FG_ENV_SIZE
(64 * 1024) /* 64 KByte (1 sector) */
+#define C
ONFIG_ENV_SIZE
(64 * 1024) /* 64 KByte (1 sector) */
#define CONFIG_ENV_OVERWRITE /* Serial change Ok */
#define CONFIG_ENV_OVERWRITE /* Serial change Ok */
-#define C
FG_ENV_ADDR
(CFG_RESET_ADDR + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_ADDR
(CFG_RESET_ADDR + CFG_MONITOR_LEN)
/*------------------------------------------------------------------------
* CONSOLE
/*------------------------------------------------------------------------
* CONSOLE
diff --git
a/include/configs/PLU405.h
b/include/configs/PLU405.h
index
75cdc2f
..
8463ed5
100644
(file)
--- a/
include/configs/PLU405.h
+++ b/
include/configs/PLU405.h
@@
-274,8
+274,8
@@
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x100 /* reseve 0x100 bytes for strapping */
-#define C
FG_ENV_SIZE
0x700
+#define C
ONFIG_ENV_OFFSET
0x100 /* reseve 0x100 bytes for strapping */
+#define C
ONFIG_ENV_SIZE
0x700
/*
* I2C EEPROM (24WC16) for environment
/*
* I2C EEPROM (24WC16) for environment
diff --git
a/include/configs/PM520.h
b/include/configs/PM520.h
index
4da84ca
..
2676d7d
100644
(file)
--- a/
include/configs/PM520.h
+++ b/
include/configs/PM520.h
@@
-212,7
+212,7
@@
#define CFG_FLASH_SIZE 0x04000000
#define CFG_BOOTROM_BASE 0xFFF00000
#define CFG_BOOTROM_SIZE 0x00080000
#define CFG_FLASH_SIZE 0x04000000
#define CFG_BOOTROM_BASE 0xFFF00000
#define CFG_BOOTROM_SIZE 0x00080000
-#define C
FG_ENV_ADDR
(0xFDF00000 + 0x40000)
+#define C
ONFIG_ENV_ADDR
(0xFDF00000 + 0x40000)
#else
/*
* Flash configuration (8,16 or 32 MB)
#else
/*
* Flash configuration (8,16 or 32 MB)
@@
-225,7
+225,7
@@
*/
#define CFG_FLASH_BASE 0xFC000000
#define CFG_FLASH_SIZE 0x04000000
*/
#define CFG_FLASH_BASE 0xFC000000
#define CFG_FLASH_SIZE 0x04000000
-#define C
FG_ENV_ADDR
(0xFFF00000 + 0x40000)
+#define C
ONFIG_ENV_ADDR
(0xFFF00000 + 0x40000)
#endif
#define CFG_MAX_FLASH_BANKS 1 /* max num of memory banks */
#endif
#define CFG_MAX_FLASH_BANKS 1 /* max num of memory banks */
@@
-246,8
+246,8
@@
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x10000
-#define C
FG_ENV_SECT_SIZE
0x40000
+#define C
ONFIG_ENV_SIZE
0x10000
+#define C
ONFIG_ENV_SECT_SIZE
0x40000
#define CONFIG_ENV_OVERWRITE 1
/*
#define CONFIG_ENV_OVERWRITE 1
/*
diff --git
a/include/configs/PM826.h
b/include/configs/PM826.h
index
0782ff0
..
f625361
100644
(file)
--- a/
include/configs/PM826.h
+++ b/
include/configs/PM826.h
@@
-258,9
+258,9
@@
#if 0
/* Start port with environment in flash; switch to EEPROM later */
#define CONFIG_ENV_IS_IN_FLASH 1
#if 0
/* Start port with environment in flash; switch to EEPROM later */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE+0x40000)
-#define C
FG_ENV_SIZE
0x40000
-#define C
FG_ENV_SECT_SIZE
0x40000
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE+0x40000)
+#define C
ONFIG_ENV_SIZE
0x40000
+#define C
ONFIG_ENV_SECT_SIZE
0x40000
#else
/* Final version: environment in EEPROM */
#define CONFIG_ENV_IS_IN_EEPROM 1
#else
/* Final version: environment in EEPROM */
#define CONFIG_ENV_IS_IN_EEPROM 1
@@
-268,8
+268,8
@@
#define CFG_I2C_EEPROM_ADDR_LEN 1
#define CFG_EEPROM_PAGE_WRITE_BITS 4
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* and takes up to 10 msec */
#define CFG_I2C_EEPROM_ADDR_LEN 1
#define CFG_EEPROM_PAGE_WRITE_BITS 4
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* and takes up to 10 msec */
-#define C
FG_ENV_OFFSET
512
-#define C
FG_ENV_SIZE
(2048 - 512)
+#define C
ONFIG_ENV_OFFSET
512
+#define C
ONFIG_ENV_SIZE
(2048 - 512)
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/PM828.h
b/include/configs/PM828.h
index
a342824
..
f437d21
100644
(file)
--- a/
include/configs/PM828.h
+++ b/
include/configs/PM828.h
@@
-251,9
+251,9
@@
#if 0
/* Start port with environment in flash; switch to EEPROM later */
#define CONFIG_ENV_IS_IN_FLASH 1
#if 0
/* Start port with environment in flash; switch to EEPROM later */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE+0x40000)
-#define C
FG_ENV_SIZE
0x40000
-#define C
FG_ENV_SECT_SIZE
0x40000
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE+0x40000)
+#define C
ONFIG_ENV_SIZE
0x40000
+#define C
ONFIG_ENV_SECT_SIZE
0x40000
#else
/* Final version: environment in EEPROM */
#define CONFIG_ENV_IS_IN_EEPROM 1
#else
/* Final version: environment in EEPROM */
#define CONFIG_ENV_IS_IN_EEPROM 1
@@
-261,8
+261,8
@@
#define CFG_I2C_EEPROM_ADDR_LEN 1
#define CFG_EEPROM_PAGE_WRITE_BITS 4
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* and takes up to 10 msec */
#define CFG_I2C_EEPROM_ADDR_LEN 1
#define CFG_EEPROM_PAGE_WRITE_BITS 4
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* and takes up to 10 msec */
-#define C
FG_ENV_OFFSET
512
-#define C
FG_ENV_SIZE
(2048 - 512)
+#define C
ONFIG_ENV_OFFSET
512
+#define C
ONFIG_ENV_SIZE
(2048 - 512)
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/PM854.h
b/include/configs/PM854.h
index
8babcb2
..
1beee0f
100644
(file)
--- a/
include/configs/PM854.h
+++ b/
include/configs/PM854.h
@@
-294,14
+294,14
@@
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x80000)
- #define C
FG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x80000)
+ #define C
ONFIG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
+ #define C
ONFIG_ENV_SIZE
0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+ #define C
ONFIG_ENV_SIZE
0x2000
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
diff --git
a/include/configs/PM856.h
b/include/configs/PM856.h
index
9690bd7
..
9d535b6
100644
(file)
--- a/
include/configs/PM856.h
+++ b/
include/configs/PM856.h
@@
-294,14
+294,14
@@
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x80000)
- #define C
FG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x80000)
+ #define C
ONFIG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
+ #define C
ONFIG_ENV_SIZE
0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+ #define C
ONFIG_ENV_SIZE
0x2000
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
diff --git
a/include/configs/PMC405.h
b/include/configs/PMC405.h
index
f627422
..
e543059
100644
(file)
--- a/
include/configs/PMC405.h
+++ b/
include/configs/PMC405.h
@@
-245,8
+245,8
@@
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x800 /* 2048 bytes may be used for env vars*/
+#define C
ONFIG_ENV_OFFSET
0x000 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x800 /* 2048 bytes may be used for env vars*/
/* total size of a CAT24WC16 is 2048 bytes */
#define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */
/* total size of a CAT24WC16 is 2048 bytes */
#define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */
diff --git
a/include/configs/PMC440.h
b/include/configs/PMC440.h
index
7a78776
..
467a11c
100644
(file)
--- a/
include/configs/PMC440.h
+++ b/
include/configs/PMC440.h
@@
-108,7
+108,7
@@
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use FLASH for environment vars */
#else
#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use FLASH for environment vars */
#else
#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
-#define C
FG_ENV_IS_EMBEDDED
1 /* use embedded environment */
+#define C
ONFIG_ENV_IS_EMBEDDED
1 /* use embedded environment */
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
@@
-137,18
+137,18
@@
#define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
-#define C
FG_ENV_ADDR ((-CFG_MONITOR_LEN)-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR ((-CFG_MONITOR_LEN)-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif
#ifdef CONFIG_ENV_IS_IN_EEPROM
#endif
#ifdef CONFIG_ENV_IS_IN_EEPROM
-#define C
FG_ENV_OFFSET
0 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x1000 /* 4096 bytes may be used for env vars */
+#define C
ONFIG_ENV_OFFSET
0 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x1000 /* 4096 bytes may be used for env vars */
#endif
/*
#endif
/*
@@
-205,9
+205,9
@@
* For NAND booting the environment is embedded in the U-Boot image. Please take
* look at the file board/amcc/sequoia/u-boot-nand.lds for details.
*/
* For NAND booting the environment is embedded in the U-Boot image. Please take
* look at the file board/amcc/sequoia/u-boot-nand.lds for details.
*/
-#define C
FG_ENV_SIZE
CFG_NAND_BLOCK_SIZE
-#define C
FG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CF
G_ENV_SIZE)
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET + CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
CFG_NAND_BLOCK_SIZE
+#define C
ONFIG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFI
G_ENV_SIZE)
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/PN62.h
b/include/configs/PN62.h
index
074e8a1
..
192cbd4
100644
(file)
--- a/
include/configs/PN62.h
+++ b/
include/configs/PN62.h
@@
-161,8
+161,8
@@
#define CFG_NO_FLASH 1 /* There is no FLASH memory */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_NO_FLASH 1 /* There is no FLASH memory */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
-#define C
FG_ENV_OFFSET
0x00004000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x00002000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x00004000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x00002000 /* Total Size of Environment Sector */
#define CFG_MALLOC_LEN (512 << 10) /* Reserve 512 kB for malloc() */
#define CFG_MALLOC_LEN (512 << 10) /* Reserve 512 kB for malloc() */
diff --git
a/include/configs/PPChameleonEVB.h
b/include/configs/PPChameleonEVB.h
index
81085ec
..
cc3ef1c
100644
(file)
--- a/
include/configs/PPChameleonEVB.h
+++ b/
include/configs/PPChameleonEVB.h
@@
-418,16
+418,16
@@
#ifdef ENVIRONMENT_IN_EEPROM
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#ifdef ENVIRONMENT_IN_EEPROM
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x100 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x700 /* 2048-256 bytes may be used for env vars (total size of a CAT24WC16 is 2048 bytes)*/
+#define C
ONFIG_ENV_OFFSET
0x100 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x700 /* 2048-256 bytes may be used for env vars (total size of a CAT24WC16 is 2048 bytes)*/
#else /* DEFAULT: environment in flash, using redundand flash sectors */
#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#else /* DEFAULT: environment in flash, using redundand flash sectors */
#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
-#define C
FG_ENV_ADDR
0xFFFF8000 /* environment starts at the first small sector */
-#define C
FG_ENV_SECT_SIZE
0x2000 /* 8196 bytes may be used for env vars*/
-#define C
FG_ENV_ADDR_REDUND
0xFFFFA000
-#define C
FG_ENV_SIZE_REDUND
0x2000
+#define C
ONFIG_ENV_ADDR
0xFFFF8000 /* environment starts at the first small sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x2000 /* 8196 bytes may be used for env vars*/
+#define C
ONFIG_ENV_ADDR_REDUND
0xFFFFA000
+#define C
ONFIG_ENV_SIZE_REDUND
0x2000
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git
a/include/configs/QS823.h
b/include/configs/QS823.h
index
3c7fc6f
..
2586058
100644
(file)
--- a/
include/configs/QS823.h
+++ b/
include/configs/QS823.h
@@
-224,9
+224,9
@@
* Environment variable storage is in FLASH, one sector before U-boot
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment variable storage is in FLASH, one sector before U-boot
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SECT_SIZE
0x20000 /* 128Kb, one whole sector */
-#define C
FG_ENV_SIZE
0x2000 /* 8kb */
-#define C
FG_ENV_ADDR
0xffee0000 /* address of env sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* 128Kb, one whole sector */
+#define C
ONFIG_ENV_SIZE
0x2000 /* 8kb */
+#define C
ONFIG_ENV_ADDR
0xffee0000 /* address of env sector */
/*-----------------------------------------------------------------------
* Miscellaneous configurable options
/*-----------------------------------------------------------------------
* Miscellaneous configurable options
diff --git
a/include/configs/QS850.h
b/include/configs/QS850.h
index
44daf52
..
87a184b
100644
(file)
--- a/
include/configs/QS850.h
+++ b/
include/configs/QS850.h
@@
-224,9
+224,9
@@
* Environment variable storage is in FLASH, one sector before U-boot
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment variable storage is in FLASH, one sector before U-boot
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SECT_SIZE
0x20000 /* 128Kb, one whole sector */
-#define C
FG_ENV_SIZE
0x2000 /* 8kb */
-#define C
FG_ENV_ADDR
0xffee0000 /* address of env sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* 128Kb, one whole sector */
+#define C
ONFIG_ENV_SIZE
0x2000 /* 8kb */
+#define C
ONFIG_ENV_ADDR
0xffee0000 /* address of env sector */
/*-----------------------------------------------------------------------
* Miscellaneous configurable options
/*-----------------------------------------------------------------------
* Miscellaneous configurable options
diff --git
a/include/configs/QS860T.h
b/include/configs/QS860T.h
index
dd79246
..
54dbc30
100644
(file)
--- a/
include/configs/QS860T.h
+++ b/
include/configs/QS860T.h
@@
-133,8
+133,8
@@
CONFIG_SPI
* Environment variable storage is in NVRAM
*/
#define CONFIG_ENV_IS_IN_NVRAM 1
* Environment variable storage is in NVRAM
*/
#define CONFIG_ENV_IS_IN_NVRAM 1
-#define C
FG_ENV_SIZE
0x00001000 /* We use only the last 4K for PPCBoot */
-#define C
FG_ENV_ADDR
0xD100E000
+#define C
ONFIG_ENV_SIZE
0x00001000 /* We use only the last 4K for PPCBoot */
+#define C
ONFIG_ENV_ADDR
0xD100E000
/*
* Miscellaneous configurable options
/*
* Miscellaneous configurable options
diff --git
a/include/configs/R360MPI.h
b/include/configs/R360MPI.h
index
26729fc
..
001ac1c
100644
(file)
--- a/
include/configs/R360MPI.h
+++ b/
include/configs/R360MPI.h
@@
-230,9
+230,9
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x40000 /* Offset of Environment */
-#define C
FG_ENV_SECT_SIZE
0x20000 /* Total Size of Environment sector */
-#define C
FG_ENV_SIZE
0x4000 /* Used Size of Environment sector */
+#define C
ONFIG_ENV_OFFSET
0x40000 /* Offset of Environment */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* Total Size of Environment sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Used Size of Environment sector */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
/*-----------------------------------------------------------------------
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
/*-----------------------------------------------------------------------
diff --git
a/include/configs/RBC823.h
b/include/configs/RBC823.h
index
8f59450
..
aec204b
100644
(file)
--- a/
include/configs/RBC823.h
+++ b/
include/configs/RBC823.h
@@
-204,8
+204,8
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x10000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x10000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x10000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x10000 /* Total Size of Environment Sector */
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/RPXClassic.h
b/include/configs/RPXClassic.h
index
50345e5
..
4fa21b8
100644
(file)
--- a/
include/configs/RPXClassic.h
+++ b/
include/configs/RPXClassic.h
@@
-220,13
+220,13
@@
#if 0
#define CONFIG_ENV_IS_IN_FLASH 1
#if 0
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x20000 /* Offset of Environment Sector */
-#define C
F
G_ENV_SECT_SIZE 0x8000
-#define C
FG_ENV_SIZE
0x8000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x20000 /* Offset of Environment Sector */
+#define C
ONFI
G_ENV_SECT_SIZE 0x8000
+#define C
ONFIG_ENV_SIZE
0x8000 /* Total Size of Environment Sector */
#else
#define CONFIG_ENV_IS_IN_NVRAM 1
#else
#define CONFIG_ENV_IS_IN_NVRAM 1
-#define C
F
G_ENV_ADDR 0xfa000100
-#define C
F
G_ENV_SIZE 0x1000
+#define C
ONFI
G_ENV_ADDR 0xfa000100
+#define C
ONFI
G_ENV_SIZE 0x1000
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/RPXlite.h
b/include/configs/RPXlite.h
index
2e4710a
..
2870659
100644
(file)
--- a/
include/configs/RPXlite.h
+++ b/
include/configs/RPXlite.h
@@
-156,8
+156,8
@@
#define CFG_DIRECT_FLASH_TFTP
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_DIRECT_FLASH_TFTP
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SECT_SIZE
0x40000 /* We use one complete sector */
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* We use one complete sector */
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#define CONFIG_ENV_OVERWRITE
#define CONFIG_ENV_OVERWRITE
diff --git
a/include/configs/RPXlite_DW.h
b/include/configs/RPXlite_DW.h
index
724dc48
..
6e72e96
100644
(file)
--- a/
include/configs/RPXlite_DW.h
+++ b/
include/configs/RPXlite_DW.h
@@
-230,12
+230,12
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#ifdef CONFIG_ENV_IS_IN_NVRAM
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#ifdef CONFIG_ENV_IS_IN_NVRAM
-#define C
FG_ENV_ADDR
0xFA000100
-#define C
FG_ENV_SIZE
0x1000
+#define C
ONFIG_ENV_ADDR
0xFA000100
+#define C
ONFIG_ENV_SIZE
0x1000
#else
#define CONFIG_ENV_IS_IN_FLASH
#else
#define CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_OFFSET
0x30000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x8000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x30000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x8000 /* Total Size of Environment Sector */
#endif /* CONFIG_ENV_IS_IN_NVRAM */
#define CFG_RESET_ADDRESS ((ulong)((((immap_t *)CFG_IMMR)->im_clkrst.res)))
#endif /* CONFIG_ENV_IS_IN_NVRAM */
#define CFG_RESET_ADDRESS ((ulong)((((immap_t *)CFG_IMMR)->im_clkrst.res)))
diff --git
a/include/configs/RPXsuper.h
b/include/configs/RPXsuper.h
index
8bdb401
..
e805213
100644
(file)
--- a/
include/configs/RPXsuper.h
+++ b/
include/configs/RPXsuper.h
@@
-126,7
+126,7
@@
* put in the same sector as U-Boot, and changing variables
* will erase U-Boot temporarily
*/
* put in the same sector as U-Boot, and changing variables
* will erase U-Boot temporarily
*/
-#define C
F
G_ENV_IN_OWN_SECT
+#define C
ONFI
G_ENV_IN_OWN_SECT
/* Define to allow the user to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
/* Define to allow the user to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
@@
-302,18
+302,18
@@
#ifndef CFG_RAMBOOT
# define CONFIG_ENV_IS_IN_FLASH 1
#ifndef CFG_RAMBOOT
# define CONFIG_ENV_IS_IN_FLASH 1
-# ifdef C
F
G_ENV_IN_OWN_SECT
-# define C
F
G_ENV_ADDR (CFG_MONITOR_BASE + 0x40000)
-# define C
F
G_ENV_SECT_SIZE 0x40000
+# ifdef C
ONFI
G_ENV_IN_OWN_SECT
+# define C
ONFI
G_ENV_ADDR (CFG_MONITOR_BASE + 0x40000)
+# define C
ONFI
G_ENV_SECT_SIZE 0x40000
# else
# else
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CF
G_ENV_SECT_SIZE)
-# define C
F
G_ENV_SIZE 0x1000 /* Total Size of Environment Sector */
-# define C
F
G_ENV_SECT_SIZE 0x10000 /* see README - env sect real size */
-# endif /* C
F
G_ENV_IN_OWN_SECT */
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CONFI
G_ENV_SECT_SIZE)
+# define C
ONFI
G_ENV_SIZE 0x1000 /* Total Size of Environment Sector */
+# define C
ONFI
G_ENV_SECT_SIZE 0x10000 /* see README - env sect real size */
+# endif /* C
ONFI
G_ENV_IN_OWN_SECT */
#else
# define CONFIG_ENV_IS_IN_NVRAM 1
#else
# define CONFIG_ENV_IS_IN_NVRAM 1
-# define C
F
G_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
-# define C
F
G_ENV_SIZE 0x200
+# define C
ONFI
G_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
+# define C
ONFI
G_ENV_SIZE 0x200
#endif /* CFG_RAMBOOT */
/*-----------------------------------------------------------------------
#endif /* CFG_RAMBOOT */
/*-----------------------------------------------------------------------
diff --git
a/include/configs/RRvision.h
b/include/configs/RRvision.h
index
22d3da6
..
541d586
100644
(file)
--- a/
include/configs/RRvision.h
+++ b/
include/configs/RRvision.h
@@
-228,12
+228,12
@@
#define CFG_FLASH_WRITE_TOUT (1 * CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT (1 * CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git
a/include/configs/Rattler.h
b/include/configs/Rattler.h
index
e603f29
..
6ec52e6
100644
(file)
--- a/
include/configs/Rattler.h
+++ b/
include/configs/Rattler.h
@@
-226,8
+226,8
@@
#define CONFIG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x10000
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SECT_SIZE
0x10000
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#endif /* CONFIG_ENV_IS_IN_FLASH */
#define CFG_DEFAULT_IMMR 0xFF010000
#endif /* CONFIG_ENV_IS_IN_FLASH */
#define CFG_DEFAULT_IMMR 0xFF010000
diff --git
a/include/configs/SBC8540.h
b/include/configs/SBC8540.h
index
64f2320
..
2cf75e3
100644
(file)
--- a/
include/configs/SBC8540.h
+++ b/
include/configs/SBC8540.h
@@
-334,19
+334,19
@@
#if !defined(CFG_RAMBOOT)
#if defined(CONFIG_RAM_AS_FLASH)
#define CONFIG_ENV_IS_NOWHERE
#if !defined(CFG_RAMBOOT)
#if defined(CONFIG_RAM_AS_FLASH)
#define CONFIG_ENV_IS_NOWHERE
- #define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x100000)
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x100000)
+ #define C
ONFIG_ENV_SIZE
0x2000
#else
#define CONFIG_ENV_IS_IN_FLASH 1
#else
#define CONFIG_ENV_IS_IN_FLASH 1
- #define C
FG_ENV_SECT_SIZE
0x20000 /* 128K(one sector) for env */
- #define C
FG_ENV_ADDR (CFG_MONITOR_BASE - CF
G_ENV_SECT_SIZE)
- #define C
FG_ENV_SIZE 0x2000 /* CF
G_ENV_SECT_SIZE */
+ #define C
ONFIG_ENV_SECT_SIZE
0x20000 /* 128K(one sector) for env */
+ #define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE - CONFI
G_ENV_SECT_SIZE)
+ #define C
ONFIG_ENV_SIZE 0x2000 /* CONFI
G_ENV_SECT_SIZE */
#endif
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#endif
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+ #define C
ONFIG_ENV_SIZE
0x2000
#endif
#define CONFIG_BOOTARGS "root=/dev/nfs rw nfsroot=192.168.0.251:/tftpboot ip=192.168.0.105:192.168.0.251::255.255.255.0:sbc8560:eth0:off console=ttyS0,9600"
#endif
#define CONFIG_BOOTARGS "root=/dev/nfs rw nfsroot=192.168.0.251:/tftpboot ip=192.168.0.105:192.168.0.251::255.255.255.0:sbc8560:eth0:off console=ttyS0,9600"
diff --git
a/include/configs/SCM.h
b/include/configs/SCM.h
index
bc779de
..
50cf499
100644
(file)
--- a/
include/configs/SCM.h
+++ b/
include/configs/SCM.h
@@
-271,14
+271,14
@@
#if 0
/* Start port with environment in flash; switch to EEPROM later */
#define CONFIG_ENV_IS_IN_FLASH 1
#if 0
/* Start port with environment in flash; switch to EEPROM later */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE+0x40000)
-#define C
FG_ENV_SIZE
0x40000
-#define C
FG_ENV_SECT_SIZE
0x40000
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE+0x40000)
+#define C
ONFIG_ENV_SIZE
0x40000
+#define C
ONFIG_ENV_SECT_SIZE
0x40000
#else
/* Final version: environment in EEPROM */
#define CONFIG_ENV_IS_IN_EEPROM 1
#else
/* Final version: environment in EEPROM */
#define CONFIG_ENV_IS_IN_EEPROM 1
-#define C
FG_ENV_OFFSET
0
-#define C
FG_ENV_SIZE
2048
+#define C
ONFIG_ENV_OFFSET
0
+#define C
ONFIG_ENV_SIZE
2048
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/SL8245.h
b/include/configs/SL8245.h
index
56436a4
..
89d1461
100644
(file)
--- a/
include/configs/SL8245.h
+++ b/
include/configs/SL8245.h
@@
-258,9
+258,9
@@
* It's stored in flash separately.
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* It's stored in flash separately.
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
0xFFFF0000
-#define C
FG_ENV_SIZE
0x00010000 /* Size of the Environment */
-#define C
FG_ENV_SECT_SIZE
0x00010000 /* Size of the Environment Sector */
+#define C
ONFIG_ENV_ADDR
0xFFFF0000
+#define C
ONFIG_ENV_SIZE
0x00010000 /* Size of the Environment */
+#define C
ONFIG_ENV_SECT_SIZE
0x00010000 /* Size of the Environment Sector */
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/SM850.h
b/include/configs/SM850.h
index
138dbd2
..
d30c7bc
100644
(file)
--- a/
include/configs/SM850.h
+++ b/
include/configs/SM850.h
@@
-164,8
+164,8
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/*-----------------------------------------------------------------------
* Hardware Information Block
/*-----------------------------------------------------------------------
* Hardware Information Block
diff --git
a/include/configs/SMN42.h
b/include/configs/SMN42.h
index
583ee21
..
45fe14b
100644
(file)
--- a/
include/configs/SMN42.h
+++ b/
include/configs/SMN42.h
@@
-49,7
+49,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-192,9
+192,9
@@
#define CONFIG_ENV_IS_IN_FLASH 1
/* The Environment Sector is in the CPU-internal flash */
#define CFG_FLASH_BASE 0
#define CONFIG_ENV_IS_IN_FLASH 1
/* The Environment Sector is in the CPU-internal flash */
#define CFG_FLASH_BASE 0
-#define C
FG_ENV_OFFSET
0x3C000
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x3C000
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
diff --git
a/include/configs/SPD823TS.h
b/include/configs/SPD823TS.h
index
39ab1c8
..
929a4b6
100644
(file)
--- a/
include/configs/SPD823TS.h
+++ b/
include/configs/SPD823TS.h
@@
-168,8
+168,8
@@
#define CFG_FLASH_WRITE_TOUT 0 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 0 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x0800 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x0800 /* Total Size of Environment Sector */
/*-----------------------------------------------------------------------
* Cache Configuration
*/
/*-----------------------------------------------------------------------
* Cache Configuration
*/
diff --git
a/include/configs/SX1.h
b/include/configs/SX1.h
index
d1b6998
..
ff4e1a0
100644
(file)
--- a/
include/configs/SX1.h
+++ b/
include/configs/SX1.h
@@
-46,7
+46,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-172,7
+172,7
@@
#define PHYS_FLASH_SIZE (16 << 10) /* 16 MB */
#define PHYS_FLASH_SECT_SIZE (128*1024) /* Size of a sector (128kB) */
#define CFG_MAX_FLASH_SECT (128) /* max number of sectors on one chip */
#define PHYS_FLASH_SIZE (16 << 10) /* 16 MB */
#define PHYS_FLASH_SECT_SIZE (128*1024) /* Size of a sector (128kB) */
#define CFG_MAX_FLASH_SECT (128) /* max number of sectors on one chip */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + PHYS_FLASH_SECT_SIZE) /* addr of environment */
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + PHYS_FLASH_SECT_SIZE) /* addr of environment */
#define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at beginning of flash */
#define CFG_MONITOR_LEN PHYS_FLASH_SECT_SIZE /* Reserve 1 sector */
#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE, CFG_FLASH_BASE + PHYS_FLASH_SIZE }
#define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at beginning of flash */
#define CFG_MONITOR_LEN PHYS_FLASH_SECT_SIZE /* Reserve 1 sector */
#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE, CFG_FLASH_BASE + PHYS_FLASH_SIZE }
@@
-190,12
+190,12
@@
#define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SECT_SIZE
PHYS_FLASH_SECT_SIZE
-#define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE /* Total Size of Environment Sector */
-#define C
FG_ENV_OFFSET
( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */
+#define C
ONFIG_ENV_SECT_SIZE
PHYS_FLASH_SECT_SIZE
+#define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_SIZE_REDUND
0x20000
-#define C
FG_ENV_OFFSET_REDUND
0x40000
+#define C
ONFIG_ENV_SIZE_REDUND
0x20000
+#define C
ONFIG_ENV_OFFSET_REDUND
0x40000
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/SXNI855T.h
b/include/configs/SXNI855T.h
index
67b6071
..
0cc4fe4
100644
(file)
--- a/
include/configs/SXNI855T.h
+++ b/
include/configs/SXNI855T.h
@@
-452,15
+452,15
@@
#define CONFIG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* environment is in FLASH */
#define CONFIG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
/* environment is in FLASH */
- #define C
FG_ENV_ADDR
0xF8040000 /* AM29LV641 or AM29LV800BT */
- #define C
FG_ENV_ADDR_REDUND
0xF8050000 /* AM29LV641 or AM29LV800BT */
- #define C
FG_ENV_SECT_SIZE
0x00010000
- #define C
FG_ENV_SIZE
0x00002000
+ #define C
ONFIG_ENV_ADDR
0xF8040000 /* AM29LV641 or AM29LV800BT */
+ #define C
ONFIG_ENV_ADDR_REDUND
0xF8050000 /* AM29LV641 or AM29LV800BT */
+ #define C
ONFIG_ENV_SECT_SIZE
0x00010000
+ #define C
ONFIG_ENV_SIZE
0x00002000
#else
/* environment is in EEPROM */
#define CONFIG_ENV_IS_IN_EEPROM 1
#else
/* environment is in EEPROM */
#define CONFIG_ENV_IS_IN_EEPROM 1
- #define C
FG_ENV_OFFSET
0 /* at beginning of EEPROM */
- #define C
FG_ENV_SIZE
1024 /* Use only a part of it*/
+ #define C
ONFIG_ENV_OFFSET
0 /* at beginning of EEPROM */
+ #define C
ONFIG_ENV_SIZE
1024 /* Use only a part of it*/
#endif
#if 1
#endif
#if 1
diff --git
a/include/configs/Sandpoint8240.h
b/include/configs/Sandpoint8240.h
index
7c880ab
..
9898a8b
100644
(file)
--- a/
include/configs/Sandpoint8240.h
+++ b/
include/configs/Sandpoint8240.h
@@
-177,8
+177,8
@@
#define CFG_FLASH_SIZE (1024 * 1024) /* Unity has onboard 1MByte flash */
#endif
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_SIZE (1024 * 1024) /* Unity has onboard 1MByte flash */
#endif
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x00004000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x00002000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x00004000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x00002000 /* Total Size of Environment Sector */
#define CFG_MALLOC_LEN (512 << 10) /* Reserve 512 kB for malloc() */
#define CFG_MALLOC_LEN (512 << 10) /* Reserve 512 kB for malloc() */
diff --git
a/include/configs/Sandpoint8245.h
b/include/configs/Sandpoint8245.h
index
39f66cb
..
41835f0
100644
(file)
--- a/
include/configs/Sandpoint8245.h
+++ b/
include/configs/Sandpoint8245.h
@@
-147,8
+147,8
@@
#define CFG_FLASH_SIZE (1024 * 1024) /* Unity has onboard 1MByte flash */
#endif
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_SIZE (1024 * 1024) /* Unity has onboard 1MByte flash */
#endif
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x00004000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x00002000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x00004000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x00002000 /* Total Size of Environment Sector */
#define CFG_MALLOC_LEN (512 << 10) /* Reserve 512 kB for malloc() */
#define CFG_MALLOC_LEN (512 << 10) /* Reserve 512 kB for malloc() */
diff --git
a/include/configs/TASREG.h
b/include/configs/TASREG.h
index
1b2b70a
..
dd074dc
100644
(file)
--- a/
include/configs/TASREG.h
+++ b/
include/configs/TASREG.h
@@
-196,9
+196,9
@@
#define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
0xFFC40000 /* Address of Environment Sector*/
-#define C
FG_ENV_SIZE
0x10000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x10000 /* see README - env sector total size */
+#define C
ONFIG_ENV_ADDR
0xFFC40000 /* Address of Environment Sector*/
+#define C
ONFIG_ENV_SIZE
0x10000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* see README - env sector total size */
/*-----------------------------------------------------------------------
* Start addresses for the final memory configuration
/*-----------------------------------------------------------------------
* Start addresses for the final memory configuration
diff --git
a/include/configs/TB5200.h
b/include/configs/TB5200.h
index
97a8d6f
..
e4e1367
100644
(file)
--- a/
include/configs/TB5200.h
+++ b/
include/configs/TB5200.h
@@
-263,12
+263,12
@@
#define CFG_FLASH_USE_BUFFER_WRITE 1
#if !defined(CFG_LOWBOOT)
#define CFG_FLASH_USE_BUFFER_WRITE 1
#if !defined(CFG_LOWBOOT)
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00760000 + 0x00800000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00760000 + 0x00800000)
#else /* CFG_LOWBOOT */
#if defined(CONFIG_TQM5200_B)
#else /* CFG_LOWBOOT */
#if defined(CONFIG_TQM5200_B)
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00080000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00080000)
#else
#else
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00060000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00060000)
#endif /* CONFIG_TQM5200_B */
#endif /* CFG_LOWBOOT */
#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks
#endif /* CONFIG_TQM5200_B */
#endif /* CFG_LOWBOOT */
#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks
@@
-297,13
+297,13
@@
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x10000
+#define C
ONFIG_ENV_SIZE
0x10000
#if defined(CONFIG_TQM5200_B)
#if defined(CONFIG_TQM5200_B)
-#define C
FG_ENV_SECT_SIZE
0x40000
+#define C
ONFIG_ENV_SECT_SIZE
0x40000
#else
#else
-#define C
FG_ENV_SECT_SIZE
0x20000
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif /* CONFIG_TQM5200_B */
/*
#endif /* CONFIG_TQM5200_B */
/*
diff --git
a/include/configs/TK885D.h
b/include/configs/TK885D.h
index
9982916
..
2efc10a
100644
(file)
--- a/
include/configs/TK885D.h
+++ b/
include/configs/TK885D.h
@@
-255,13
+255,13
@@
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x40000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x08000 /* Total Size of Environment */
-#define C
FG_ENV_SECT_SIZE
0x40000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x40000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x08000 /* Total Size of Environment */
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*-----------------------------------------------------------------------
* Hardware Information Block
/*-----------------------------------------------------------------------
* Hardware Information Block
diff --git
a/include/configs/TOP5200.h
b/include/configs/TOP5200.h
index
083686c
..
3818368
100644
(file)
--- a/
include/configs/TOP5200.h
+++ b/
include/configs/TOP5200.h
@@
-233,7
+233,7
@@
#define CFG_FLASH_BASE 0xff000000
#define CFG_FLASH_SIZE 0x01000000
#define CFG_MAX_FLASH_BANKS 1 /* max num of memory banks */
#define CFG_FLASH_BASE 0xff000000
#define CFG_FLASH_SIZE 0x01000000
#define CFG_MAX_FLASH_BANKS 1 /* max num of memory banks */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0)
#define CFG_MAX_FLASH_SECT 256 /* max num of sects on one chip */
#define CFG_MAX_FLASH_SECT 256 /* max num of sects on one chip */
@@
-272,8
+272,8
@@
* Environment settings
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* turn on EEPROM env feature */
* Environment settings
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* turn on EEPROM env feature */
-#define C
FG_ENV_OFFSET
0x1000
-#define C
FG_ENV_SIZE
0x0700
+#define C
ONFIG_ENV_OFFSET
0x1000
+#define C
ONFIG_ENV_SIZE
0x0700
/*
* VPD settings
/*
* VPD settings
diff --git
a/include/configs/TOP860.h
b/include/configs/TOP860.h
index
288019f
..
b270832
100644
(file)
--- a/
include/configs/TOP860.h
+++ b/
include/configs/TOP860.h
@@
-161,8
+161,8
@@
*/
#define CONFIG_SOFT_I2C
#define CONFIG_ENV_IS_IN_EEPROM 1 /* turn on EEPROM env feature */
*/
#define CONFIG_SOFT_I2C
#define CONFIG_ENV_IS_IN_EEPROM 1 /* turn on EEPROM env feature */
-#define C
FG_ENV_OFFSET
0x1000
-#define C
FG_ENV_SIZE
0x0700
+#define C
ONFIG_ENV_OFFSET
0x1000
+#define C
ONFIG_ENV_SIZE
0x0700
#define CFG_I2C_EEPROM_ADDR 0x57
#define CFG_FACT_OFFSET 0x1800
#define CFG_FACT_SIZE 0x0800
#define CFG_I2C_EEPROM_ADDR 0x57
#define CFG_FACT_OFFSET 0x1800
#define CFG_FACT_SIZE 0x0800
diff --git
a/include/configs/TQM5200.h
b/include/configs/TQM5200.h
index
d91d2e5
..
efc8da4
100644
(file)
--- a/
include/configs/TQM5200.h
+++ b/
include/configs/TQM5200.h
@@
-399,11
+399,11
@@
#define CFG_FLASH_USE_BUFFER_WRITE 1
#if defined (CONFIG_CAM5200)
#define CFG_FLASH_USE_BUFFER_WRITE 1
#if defined (CONFIG_CAM5200)
-# define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00040000)
+# define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00040000)
#elif defined(CONFIG_TQM5200_B)
#elif defined(CONFIG_TQM5200_B)
-# define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00080000)
+# define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00080000)
#else
#else
-# define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00060000)
+# define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00060000)
#endif
/* Dynamic MTD partition support */
#endif
/* Dynamic MTD partition support */
@@
-457,14
+457,14
@@
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x4000 /* 16 k - keep small for fast booting */
+#define C
ONFIG_ENV_SIZE
0x4000 /* 16 k - keep small for fast booting */
#if defined(CONFIG_TQM5200_B) || defined (CONFIG_CAM5200)
#if defined(CONFIG_TQM5200_B) || defined (CONFIG_CAM5200)
-#define C
FG_ENV_SECT_SIZE
0x40000
+#define C
ONFIG_ENV_SECT_SIZE
0x40000
#else
#else
-#define C
FG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
#endif /* CONFIG_TQM5200_B */
#endif /* CONFIG_TQM5200_B */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*
* Memory map
/*
* Memory map
diff --git
a/include/configs/TQM823L.h
b/include/configs/TQM823L.h
index
a979351
..
6311902
100644
(file)
--- a/
include/configs/TQM823L.h
+++ b/
include/configs/TQM823L.h
@@
-216,12
+216,12
@@
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git
a/include/configs/TQM823M.h
b/include/configs/TQM823M.h
index
86432c6
..
53272e1
100644
(file)
--- a/
include/configs/TQM823M.h
+++ b/
include/configs/TQM823M.h
@@
-211,13
+211,13
@@
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x40000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x08000 /* Total Size of Environment */
-#define C
FG_ENV_SECT_SIZE
0x20000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x40000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x08000 /* Total Size of Environment */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git
a/include/configs/TQM8260.h
b/include/configs/TQM8260.h
index
46ecb51
..
2d54d23
100644
(file)
--- a/
include/configs/TQM8260.h
+++ b/
include/configs/TQM8260.h
@@
-307,14
+307,14
@@
#if 0
/* Start port with environment in flash; switch to EEPROM later */
#define CONFIG_ENV_IS_IN_FLASH 1
#if 0
/* Start port with environment in flash; switch to EEPROM later */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE+0x40000)
-#define C
FG_ENV_SIZE
0x40000
-#define C
FG_ENV_SECT_SIZE
0x40000
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE+0x40000)
+#define C
ONFIG_ENV_SIZE
0x40000
+#define C
ONFIG_ENV_SECT_SIZE
0x40000
#else
/* Final version: environment in EEPROM */
#define CONFIG_ENV_IS_IN_EEPROM 1
#else
/* Final version: environment in EEPROM */
#define CONFIG_ENV_IS_IN_EEPROM 1
-#define C
FG_ENV_OFFSET
0
-#define C
FG_ENV_SIZE
2048
+#define C
ONFIG_ENV_OFFSET
0
+#define C
ONFIG_ENV_SIZE
2048
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/TQM8272.h
b/include/configs/TQM8272.h
index
8642a9f
..
4e8cccd
100644
(file)
--- a/
include/configs/TQM8272.h
+++ b/
include/configs/TQM8272.h
@@
-382,11
+382,11
@@
#define CFG_UPDATE_FLASH_SIZE
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_UPDATE_FLASH_SIZE
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x40000)
-#define C
FG_ENV_SIZE
0x20000
-#define C
FG_ENV_SECT_SIZE
0x20000
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND
0x20000
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x40000)
+#define C
ONFIG_ENV_SIZE
0x20000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND
0x20000
/* Where is the Hardwareinformation Block (from Monitor Sources) */
#define MON_RES_LENGTH (0x0003FC00)
/* Where is the Hardwareinformation Block (from Monitor Sources) */
#define MON_RES_LENGTH (0x0003FC00)
diff --git
a/include/configs/TQM834x.h
b/include/configs/TQM834x.h
index
0d47d70
..
3fd46a0
100644
(file)
--- a/
include/configs/TQM834x.h
+++ b/
include/configs/TQM834x.h
@@
-301,14
+301,14
@@
extern int tqm834x_num_flash_banks;
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
- #define C
FG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
+ #define C
ONFIG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
+ #define C
ONFIG_ENV_SIZE
0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+ #define C
ONFIG_ENV_SIZE
0x2000
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
diff --git
a/include/configs/TQM850L.h
b/include/configs/TQM850L.h
index
1a80896
..
812cea1
100644
(file)
--- a/
include/configs/TQM850L.h
+++ b/
include/configs/TQM850L.h
@@
-201,12
+201,12
@@
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git
a/include/configs/TQM850M.h
b/include/configs/TQM850M.h
index
4626f2e
..
512c55d
100644
(file)
--- a/
include/configs/TQM850M.h
+++ b/
include/configs/TQM850M.h
@@
-200,13
+200,13
@@
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x40000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x08000 /* Total Size of Environment */
-#define C
FG_ENV_SECT_SIZE
0x20000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x40000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x08000 /* Total Size of Environment */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git
a/include/configs/TQM855L.h
b/include/configs/TQM855L.h
index
6582d97
..
36e2fbf
100644
(file)
--- a/
include/configs/TQM855L.h
+++ b/
include/configs/TQM855L.h
@@
-206,12
+206,12
@@
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git
a/include/configs/TQM855M.h
b/include/configs/TQM855M.h
index
2ff208c
..
2da1f3a
100644
(file)
--- a/
include/configs/TQM855M.h
+++ b/
include/configs/TQM855M.h
@@
-240,13
+240,13
@@
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x40000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x08000 /* Total Size of Environment */
-#define C
FG_ENV_SECT_SIZE
0x20000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x40000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x08000 /* Total Size of Environment */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git
a/include/configs/TQM85xx.h
b/include/configs/TQM85xx.h
index
c6bb4f9
..
fcf0f59
100644
(file)
--- a/
include/configs/TQM85xx.h
+++ b/
include/configs/TQM85xx.h
@@
-561,14
+561,14
@@
#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_TQM_FLASH_N_TYPE
#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_TQM_FLASH_N_TYPE
-#define C
FG_ENV_SECT_SIZE
0x40000 /* 256K (one sector) for env */
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* 256K (one sector) for env */
#else /* !CONFIG_TQM_FLASH_N_TYPE */
#else /* !CONFIG_TQM_FLASH_N_TYPE */
-#define C
FG_ENV_SECT_SIZE
0x20000 /* 128K (one sector) for env */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* 128K (one sector) for env */
#endif /* CONFIG_TQM_FLASH_N_TYPE */
#endif /* CONFIG_TQM_FLASH_N_TYPE */
-#define C
FG_ENV_ADDR (CFG_MONITOR_BASE - CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x2000
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR - CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE - CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
@@
-678,20
+678,20
@@
* Setup some board specific values for the default environment variables
*/
#ifdef CONFIG_CPM2
* Setup some board specific values for the default environment variables
*/
#ifdef CONFIG_CPM2
-#define C
FG_ENV_CONSDEV
"consdev=ttyCPM0\0"
+#define C
ONFIG_ENV_CONSDEV
"consdev=ttyCPM0\0"
#else
#else
-#define C
FG_ENV_CONSDEV
"consdev=ttyS0\0"
+#define C
ONFIG_ENV_CONSDEV
"consdev=ttyS0\0"
#endif
#endif
-#define C
FG_ENV_FDT_FILE
"fdt_file="MK_STR(CONFIG_HOSTNAME)"/" \
+#define C
ONFIG_ENV_FDT_FILE
"fdt_file="MK_STR(CONFIG_HOSTNAME)"/" \
MK_STR(CONFIG_HOSTNAME)".dtb\0"
MK_STR(CONFIG_HOSTNAME)".dtb\0"
-#define C
FG_ENV_BOOTFILE
"bootfile="MK_STR(CONFIG_HOSTNAME)"/uImage\0"
-#define C
FG_ENV_UBOOT
"uboot="MK_STR(CONFIG_HOSTNAME)"/u-boot.bin\0" \
+#define C
ONFIG_ENV_BOOTFILE
"bootfile="MK_STR(CONFIG_HOSTNAME)"/uImage\0"
+#define C
ONFIG_ENV_UBOOT
"uboot="MK_STR(CONFIG_HOSTNAME)"/u-boot.bin\0" \
"uboot_addr="MK_STR(TEXT_BASE)"\0"
#define CONFIG_EXTRA_ENV_SETTINGS \
"uboot_addr="MK_STR(TEXT_BASE)"\0"
#define CONFIG_EXTRA_ENV_SETTINGS \
- C
FG_ENV_BOOTFILE
\
- C
FG_ENV_FDT_FILE
\
- C
FG_ENV_CONSDEV
\
+ C
ONFIG_ENV_BOOTFILE
\
+ C
ONFIG_ENV_FDT_FILE
\
+ C
ONFIG_ENV_CONSDEV
\
"netdev=eth0\0" \
"nfsargs=setenv bootargs root=/dev/nfs rw " \
"nfsroot=$serverip:$rootpath\0" \
"netdev=eth0\0" \
"nfsargs=setenv bootargs root=/dev/nfs rw " \
"nfsroot=$serverip:$rootpath\0" \
@@
-715,7
+715,7
@@
"fdt_addr=ffec0000\0" \
"kernel_addr=ffd00000\0" \
"ramdisk_addr=ff800000\0" \
"fdt_addr=ffec0000\0" \
"kernel_addr=ffd00000\0" \
"ramdisk_addr=ff800000\0" \
- C
FG_ENV_UBOOT
\
+ C
ONFIG_ENV_UBOOT
\
"load=tftp 100000 $uboot\0" \
"update=protect off $uboot_addr +$filesize;" \
"erase $uboot_addr +$filesize;" \
"load=tftp 100000 $uboot\0" \
"update=protect off $uboot_addr +$filesize;" \
"erase $uboot_addr +$filesize;" \
diff --git
a/include/configs/TQM860L.h
b/include/configs/TQM860L.h
index
1daf866
..
87462a5
100644
(file)
--- a/
include/configs/TQM860L.h
+++ b/
include/configs/TQM860L.h
@@
-205,12
+205,12
@@
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git
a/include/configs/TQM860M.h
b/include/configs/TQM860M.h
index
dcdcdc1
..
9dc8745
100644
(file)
--- a/
include/configs/TQM860M.h
+++ b/
include/configs/TQM860M.h
@@
-205,13
+205,13
@@
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x40000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x08000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x40000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x40000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x08000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git
a/include/configs/TQM862L.h
b/include/configs/TQM862L.h
index
53a8f34
..
c039e9d
100644
(file)
--- a/
include/configs/TQM862L.h
+++ b/
include/configs/TQM862L.h
@@
-209,12
+209,12
@@
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git
a/include/configs/TQM862M.h
b/include/configs/TQM862M.h
index
41a0cac
..
cc5ee6d
100644
(file)
--- a/
include/configs/TQM862M.h
+++ b/
include/configs/TQM862M.h
@@
-209,13
+209,13
@@
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x40000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x08000 /* Total Size of Environment */
-#define C
FG_ENV_SECT_SIZE
0x20000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x40000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x08000 /* Total Size of Environment */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git
a/include/configs/TQM866M.h
b/include/configs/TQM866M.h
index
3e50cd4
..
bf3bbb2
100644
(file)
--- a/
include/configs/TQM866M.h
+++ b/
include/configs/TQM866M.h
@@
-249,13
+249,13
@@
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x40000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x08000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x40000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x40000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x08000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git
a/include/configs/TQM885D.h
b/include/configs/TQM885D.h
index
ebdf17d
..
66f4a98
100644
(file)
--- a/
include/configs/TQM885D.h
+++ b/
include/configs/TQM885D.h
@@
-252,13
+252,13
@@
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MAX_FLASH_SECT 256 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x40000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x08000 /* Total Size of Environment */
-#define C
FG_ENV_SECT_SIZE
0x40000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x40000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x08000 /* Total Size of Environment */
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*-----------------------------------------------------------------------
* Hardware Information Block
/*-----------------------------------------------------------------------
* Hardware Information Block
diff --git
a/include/configs/Total5200.h
b/include/configs/Total5200.h
index
16584ec
..
19b3be7
100644
(file)
--- a/
include/configs/Total5200.h
+++ b/
include/configs/Total5200.h
@@
-224,17
+224,17
@@
#endif /* CONFIG_TOTAL5200_REV */
#if defined(CFG_LOWBOOT)
#endif /* CONFIG_TOTAL5200_REV */
#if defined(CFG_LOWBOOT)
-# define C
FG_ENV_ADDR
0xFE040000
+# define C
ONFIG_ENV_ADDR
0xFE040000
#else /* CFG_LOWBOOT */
#else /* CFG_LOWBOOT */
-# define C
FG_ENV_ADDR
0xFFF40000
+# define C
ONFIG_ENV_ADDR
0xFFF40000
#endif /* CFG_LOWBOOT */
/*
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
#endif /* CFG_LOWBOOT */
/*
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x40000
-#define C
FG_ENV_SECT_SIZE
0x40000
+#define C
ONFIG_ENV_SIZE
0x40000
+#define C
ONFIG_ENV_SECT_SIZE
0x40000
#define CONFIG_ENV_OVERWRITE 1
/*
#define CONFIG_ENV_OVERWRITE 1
/*
diff --git
a/include/configs/VCMA9.h
b/include/configs/VCMA9.h
index
9822d7d
..
aeb649e
100644
(file)
--- a/
include/configs/VCMA9.h
+++ b/
include/configs/VCMA9.h
@@
-90,8
+90,8
@@
#define CFG_I2C_EEPROM_ADDR 0x50
#define CFG_I2C_EEPROM_ADDR_LEN 2
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#define CFG_I2C_EEPROM_ADDR 0x50
#define CFG_I2C_EEPROM_ADDR_LEN 2
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x000 /* environment starts at offset 0 */
-#define C
FG_ENV_SIZE
0x800 /* 2KB should be more than enough */
+#define C
ONFIG_ENV_OFFSET
0x000 /* environment starts at offset 0 */
+#define C
ONFIG_ENV_SIZE
0x800 /* 2KB should be more than enough */
#undef CFG_I2C_EEPROM_ADDR_OVERFLOW
#define CFG_EEPROM_PAGE_WRITE_BITS 6 /* 64 bytes page write mode on 24C256 */
#undef CFG_I2C_EEPROM_ADDR_OVERFLOW
#define CFG_EEPROM_PAGE_WRITE_BITS 6 /* 64 bytes page write mode on 24C256 */
@@
-100,7
+100,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-/*#define CONFIG_MALLOC_SIZE (C
F
G_ENV_SIZE + 128*1024)*/
+/*#define CONFIG_MALLOC_SIZE (C
ONFI
G_ENV_SIZE + 128*1024)*/
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
#define CFG_MONITOR_LEN (256 * 1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
#define CFG_MONITOR_LEN (256 * 1024)
@@
-226,12
+226,12
@@
#ifdef CONFIG_AMD_LV800
#define PHYS_FLASH_SIZE 0x00100000 /* 1MB */
#define CFG_MAX_FLASH_SECT (19) /* max number of sectors on one chip */
#ifdef CONFIG_AMD_LV800
#define PHYS_FLASH_SIZE 0x00100000 /* 1MB */
#define CFG_MAX_FLASH_SECT (19) /* max number of sectors on one chip */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x0F0000) /* addr of environment */
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x0F0000) /* addr of environment */
#endif
#ifdef CONFIG_AMD_LV400
#define PHYS_FLASH_SIZE 0x00080000 /* 512KB */
#define CFG_MAX_FLASH_SECT (11) /* max number of sectors on one chip */
#endif
#ifdef CONFIG_AMD_LV400
#define PHYS_FLASH_SIZE 0x00080000 /* 512KB */
#define CFG_MAX_FLASH_SECT (11) /* max number of sectors on one chip */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x070000) /* addr of environment */
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x070000) /* addr of environment */
#endif
/* timeout values are in ticks */
#endif
/* timeout values are in ticks */
@@
-240,7
+240,7
@@
#if 0
#define CONFIG_ENV_IS_IN_FLASH 1
#if 0
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x10000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x10000 /* Total Size of Environment Sector */
#endif
#endif
diff --git
a/include/configs/VOH405.h
b/include/configs/VOH405.h
index
5d36f24
..
d5c0a5e
100644
(file)
--- a/
include/configs/VOH405.h
+++ b/
include/configs/VOH405.h
@@
-267,8
+267,8
@@
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x100 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x700 /* 2048 bytes may be used for env vars*/
+#define C
ONFIG_ENV_OFFSET
0x100 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x700 /* 2048 bytes may be used for env vars*/
/* total size of a CAT24WC16 is 2048 bytes */
#define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */
/* total size of a CAT24WC16 is 2048 bytes */
#define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */
diff --git
a/include/configs/VOM405.h
b/include/configs/VOM405.h
index
eb8cbc8
..
b952e0c
100644
(file)
--- a/
include/configs/VOM405.h
+++ b/
include/configs/VOM405.h
@@
-192,8
+192,8
@@
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x100 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x700 /* 2048 bytes may be used for env vars*/
+#define C
ONFIG_ENV_OFFSET
0x100 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x700 /* 2048 bytes may be used for env vars*/
/* total size of a CAT24WC16 is 2048 bytes */
#define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */
/* total size of a CAT24WC16 is 2048 bytes */
#define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */
diff --git
a/include/configs/VoVPN-GW.h
b/include/configs/VoVPN-GW.h
index
d8d97e8
..
f72da78
100644
(file)
--- a/
include/configs/VoVPN-GW.h
+++ b/
include/configs/VoVPN-GW.h
@@
-260,9
+260,9
@@
/* environment in flash */
#define CONFIG_ENV_IS_IN_FLASH 1
/* environment in flash */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00020000)
-#define C
FG_ENV_SIZE
0x00020000
-#define C
FG_ENV_SECT_SIZE
0x00020000
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00020000)
+#define C
ONFIG_ENV_SIZE
0x00020000
+#define C
ONFIG_ENV_SECT_SIZE
0x00020000
/*
* Initial memory map for linux
/*
* Initial memory map for linux
diff --git
a/include/configs/W7OLMC.h
b/include/configs/W7OLMC.h
index
2471a44
..
95e4556
100644
(file)
--- a/
include/configs/W7OLMC.h
+++ b/
include/configs/W7OLMC.h
@@
-252,20
+252,20
@@
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for env vars */
#define CFG_NVRAM_BASE_ADDR 0xfc000000 /* NVRAM base address */
#define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for env vars */
#define CFG_NVRAM_BASE_ADDR 0xfc000000 /* NVRAM base address */
#define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */
-#define C
FG_ENV_SIZE
0x1000 /* Size of Environment vars */
-/*define C
FG_ENV_ADDR
\
- (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
F
G_ENV_SIZE) Env */
-#define C
FG_ENV_ADDR
CFG_NVRAM_BASE_ADDR
+#define C
ONFIG_ENV_SIZE
0x1000 /* Size of Environment vars */
+/*define C
ONFIG_ENV_ADDR
\
+ (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
ONFI
G_ENV_SIZE) Env */
+#define C
ONFIG_ENV_ADDR
CFG_NVRAM_BASE_ADDR
#else /* Use Boot Flash for environment variables */
/*-----------------------------------------------------------------------
* Flash EEPROM for environment
*/
#define CONFIG_ENV_IS_IN_FLASH 1
#else /* Use Boot Flash for environment variables */
/*-----------------------------------------------------------------------
* Flash EEPROM for environment
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x00040000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x10000 /* Total Size of env. sector */
+#define C
ONFIG_ENV_OFFSET
0x00040000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x10000 /* Total Size of env. sector */
-#define C
FG_ENV_SECT_SIZE
0x10000 /* see README - env sec tot sze */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* see README - env sec tot sze */
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/W7OLMG.h
b/include/configs/W7OLMG.h
index
fe09c9a
..
9c5bbff
100644
(file)
--- a/
include/configs/W7OLMG.h
+++ b/
include/configs/W7OLMG.h
@@
-259,20
+259,20
@@
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for env vars */
#define CFG_NVRAM_BASE_ADDR 0xfc000000 /* NVRAM base address */
#define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */
#define CONFIG_ENV_IS_IN_NVRAM 1 /* use NVRAM for env vars */
#define CFG_NVRAM_BASE_ADDR 0xfc000000 /* NVRAM base address */
#define CFG_NVRAM_SIZE (32*1024) /* NVRAM size */
-#define C
FG_ENV_SIZE
0x1000 /* Size of Environment vars */
-/*define C
FG_ENV_ADDR
\
- (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
F
G_ENV_SIZE) Env */
-#define C
FG_ENV_ADDR
CFG_NVRAM_BASE_ADDR
+#define C
ONFIG_ENV_SIZE
0x1000 /* Size of Environment vars */
+/*define C
ONFIG_ENV_ADDR
\
+ (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
ONFI
G_ENV_SIZE) Env */
+#define C
ONFIG_ENV_ADDR
CFG_NVRAM_BASE_ADDR
#else /* Use Boot Flash for environment variables */
/*-----------------------------------------------------------------------
* Flash EEPROM for environment
*/
#define CONFIG_ENV_IS_IN_FLASH 1
#else /* Use Boot Flash for environment variables */
/*-----------------------------------------------------------------------
* Flash EEPROM for environment
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x00040000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x10000 /* Total Size of env. sector */
+#define C
ONFIG_ENV_OFFSET
0x00040000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x10000 /* Total Size of env. sector */
-#define C
FG_ENV_SECT_SIZE
0x10000 /* see README - env sec tot sze */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* see README - env sec tot sze */
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/WUH405.h
b/include/configs/WUH405.h
index
9c0bd43
..
c3fc3af
100644
(file)
--- a/
include/configs/WUH405.h
+++ b/
include/configs/WUH405.h
@@
-230,8
+230,8
@@
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
* Environment Variable setup
*/
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x100 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x700 /* 2048 bytes may be used for env vars*/
+#define C
ONFIG_ENV_OFFSET
0x100 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x700 /* 2048 bytes may be used for env vars*/
/* total size of a CAT24WC16 is 2048 bytes */
#define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */
/* total size of a CAT24WC16 is 2048 bytes */
#define CFG_NVRAM_BASE_ADDR 0xF0000500 /* NVRAM base address */
diff --git
a/include/configs/XPEDITE1K.h
b/include/configs/XPEDITE1K.h
index
c3b0e08
..
77b29f4
100644
(file)
--- a/
include/configs/XPEDITE1K.h
+++ b/
include/configs/XPEDITE1K.h
@@
-152,8
+152,8
@@
extern void out32(unsigned int, unsigned long);
* Environment
*----------------------------------------------------------------------*/
#define CONFIG_ENV_IS_IN_EEPROM 1
* Environment
*----------------------------------------------------------------------*/
#define CONFIG_ENV_IS_IN_EEPROM 1
-#define C
FG_ENV_SIZE
0x100 /* Size of Environment vars */
-#define C
FG_ENV_OFFSET
0x100
+#define C
ONFIG_ENV_SIZE
0x100 /* Size of Environment vars */
+#define C
ONFIG_ENV_OFFSET
0x100
#define CFG_I2C_EEPROM_ADDR 0x50 /* this is actually the second page of the eeprom */
#define CFG_I2C_EEPROM_ADDR_LEN 1
#define CFG_EEPROM_PAGE_WRITE_ENABLE
#define CFG_I2C_EEPROM_ADDR 0x50 /* this is actually the second page of the eeprom */
#define CFG_I2C_EEPROM_ADDR_LEN 1
#define CFG_EEPROM_PAGE_WRITE_ENABLE
diff --git
a/include/configs/Yukon8220.h
b/include/configs/Yukon8220.h
index
ef230e1
..
cbc1ed6
100644
(file)
--- a/
include/configs/Yukon8220.h
+++ b/
include/configs/Yukon8220.h
@@
-134,8
+134,8
@@
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 70
/*
#define CONFIG_ENV_IS_IN_EEPROM 1
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 70
/*
#define CONFIG_ENV_IS_IN_EEPROM 1
-#define C
FG_ENV_OFFSET
0
-#define C
FG_ENV_SIZE
256
+#define C
ONFIG_ENV_OFFSET
0
+#define C
ONFIG_ENV_SIZE
256
*/
/* If CFG_AMD_BOOT is defined, the the system will boot from AMD.
*/
/* If CFG_AMD_BOOT is defined, the the system will boot from AMD.
@@
-207,19
+207,19
@@
*/
#define CONFIG_ENV_IS_IN_FLASH 1
#if defined (CFG_AMD_BOOT)
*/
#define CONFIG_ENV_IS_IN_FLASH 1
#if defined (CFG_AMD_BOOT)
-#define C
FG_ENV_ADDR
(CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_AMD_SECT_SIZE)
-#define C
FG_ENV_SIZE
PHYS_AMD_SECT_SIZE
-#define C
FG_ENV_SECT_SIZE
PHYS_AMD_SECT_SIZE
-#define C
FG_ENV1_ADDR
(CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_INTEL_SECT_SIZE)
-#define C
FG_ENV1_SIZE
PHYS_INTEL_SECT_SIZE
-#define C
FG_ENV1_SECT_SIZE
PHYS_INTEL_SECT_SIZE
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_AMD_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
PHYS_AMD_SECT_SIZE
+#define C
ONFIG_ENV_SECT_SIZE
PHYS_AMD_SECT_SIZE
+#define C
ONFIG_ENV1_ADDR
(CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_INTEL_SECT_SIZE)
+#define C
ONFIG_ENV1_SIZE
PHYS_INTEL_SECT_SIZE
+#define C
ONFIG_ENV1_SECT_SIZE
PHYS_INTEL_SECT_SIZE
#else
#else
-#define C
FG_ENV_ADDR
(CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_INTEL_SECT_SIZE)
-#define C
FG_ENV_SIZE
PHYS_INTEL_SECT_SIZE
-#define C
FG_ENV_SECT_SIZE
PHYS_INTEL_SECT_SIZE
-#define C
FG_ENV1_ADDR
(CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_AMD_SECT_SIZE)
-#define C
FG_ENV1_SIZE
PHYS_AMD_SECT_SIZE
-#define C
FG_ENV1_SECT_SIZE
PHYS_AMD_SECT_SIZE
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_INTEL_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
PHYS_INTEL_SECT_SIZE
+#define C
ONFIG_ENV_SECT_SIZE
PHYS_INTEL_SECT_SIZE
+#define C
ONFIG_ENV1_ADDR
(CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_AMD_SECT_SIZE)
+#define C
ONFIG_ENV1_SIZE
PHYS_AMD_SECT_SIZE
+#define C
ONFIG_ENV1_SECT_SIZE
PHYS_AMD_SECT_SIZE
#endif
#define CONFIG_ENV_OVERWRITE 1
#endif
#define CONFIG_ENV_OVERWRITE 1
diff --git
a/include/configs/ZPC1900.h
b/include/configs/ZPC1900.h
index
5fade63
..
59cca0b
100644
(file)
--- a/
include/configs/ZPC1900.h
+++ b/
include/configs/ZPC1900.h
@@
-225,11
+225,11
@@
#endif
#ifdef CONFIG_ENV_IS_IN_FLASH
#endif
#ifdef CONFIG_ENV_IS_IN_FLASH
-# define C
FG_ENV_SECT_SIZE
0x10000
-# define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+# define C
ONFIG_ENV_SECT_SIZE
0x10000
+# define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#else
#else
-# define C
FG_ENV_ADDR
(CFG_EEPROM + 0x400)
-# define C
FG_ENV_SIZE
0x1000
+# define C
ONFIG_ENV_ADDR
(CFG_EEPROM + 0x400)
+# define C
ONFIG_ENV_SIZE
0x1000
# define CFG_NVRAM_ACCESS_ROUTINE
#endif
# define CFG_NVRAM_ACCESS_ROUTINE
#endif
diff --git
a/include/configs/ZUMA.h
b/include/configs/ZUMA.h
index
1b71388
..
170553c
100644
(file)
--- a/
include/configs/ZUMA.h
+++ b/
include/configs/ZUMA.h
@@
-350,9
+350,9
@@
#define CFG_FLASH_CFI 1
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_CFI 1
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x10000 /* see README - env sect real size */
-#define C
FG_ENV_ADDR (0xfff80000 - CF
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* see README - env sect real size */
+#define C
ONFIG_ENV_ADDR (0xfff80000 - CONFI
G_ENV_SECT_SIZE)
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/acadia.h
b/include/configs/acadia.h
index
ffaaa84
..
1b1fd29
100644
(file)
--- a/
include/configs/acadia.h
+++ b/
include/configs/acadia.h
@@
-99,7
+99,7
@@
#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 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 C
FG_ENV_IS_EMBEDDED
1 /* use embedded environment */
+#define C
ONFIG_ENV_IS_EMBEDDED
1 /* use embedded environment */
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
@@
-124,13
+124,13
@@
#endif
#ifdef CONFIG_ENV_IS_IN_FLASH
#endif
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x40000 /* size of one complete sector */
-#define C
FG_ENV_ADDR (CFG_MONITOR_BASE-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif
/*
#endif
/*
@@
-185,9
+185,9
@@
* For NAND booting the environment is embedded in the U-Boot image. Please take
* look at the file board/amcc/sequoia/u-boot-nand.lds for details.
*/
* For NAND booting the environment is embedded in the U-Boot image. Please take
* look at the file board/amcc/sequoia/u-boot-nand.lds for details.
*/
-#define C
FG_ENV_SIZE
CFG_NAND_BLOCK_SIZE
-#define C
FG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CF
G_ENV_SIZE)
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET + CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
CFG_NAND_BLOCK_SIZE
+#define C
ONFIG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFI
G_ENV_SIZE)
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/actux1.h
b/include/configs/actux1.h
index
d18c4b5
..
ec1d469
100644
(file)
--- a/
include/configs/actux1.h
+++ b/
include/configs/actux1.h
@@
-52,7
+52,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
/* size in bytes reserved for initial data */
#define CFG_GBL_DATA_SIZE 128
/* size in bytes reserved for initial data */
#define CFG_GBL_DATA_SIZE 128
@@
-203,8
+203,8
@@
* one flash sector, embedded in uboot area (bottom bootblock flash)
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* one flash sector, embedded in uboot area (bottom bootblock flash)
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x2000
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + 0x4000)
+#define C
ONFIG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + 0x4000)
#define CFG_USE_PPCENV 1
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_USE_PPCENV 1
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git
a/include/configs/actux2.h
b/include/configs/actux2.h
index
f6919a5
..
a3f5a4a
100644
(file)
--- a/
include/configs/actux2.h
+++ b/
include/configs/actux2.h
@@
-43,7
+43,7
@@
#undef CONFIG_USE_IRQ
/* Size of malloc() pool */
#undef CONFIG_USE_IRQ
/* Size of malloc() pool */
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
/* size in bytes reserved for initial data */
#define CFG_GBL_DATA_SIZE 128
/* size in bytes reserved for initial data */
#define CFG_GBL_DATA_SIZE 128
@@
-180,8
+180,8
@@
* one flash sector, embedded in uboot area (bottom bootblock flash)
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* one flash sector, embedded in uboot area (bottom bootblock flash)
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x2000
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + 0x4000)
+#define C
ONFIG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + 0x4000)
#define CFG_USE_PPCENV 1
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_USE_PPCENV 1
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git
a/include/configs/actux3.h
b/include/configs/actux3.h
index
dfc8967
..
fc2d02f
100644
(file)
--- a/
include/configs/actux3.h
+++ b/
include/configs/actux3.h
@@
-43,7
+43,7
@@
#undef CONFIG_USE_IRQ
/* Size of malloc() pool */
#undef CONFIG_USE_IRQ
/* Size of malloc() pool */
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
/* size in bytes reserved for initial data */
#define CFG_GBL_DATA_SIZE 128
/* size in bytes reserved for initial data */
#define CFG_GBL_DATA_SIZE 128
@@
-180,8
+180,8
@@
* one flash sector, embedded in uboot area (bottom bootblock flash)
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* one flash sector, embedded in uboot area (bottom bootblock flash)
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x2000
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + 0x4000)
+#define C
ONFIG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + 0x4000)
#define CFG_USE_PPCENV 1
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_USE_PPCENV 1
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git
a/include/configs/actux4.h
b/include/configs/actux4.h
index
48d3713
..
83bd7f5
100644
(file)
--- a/
include/configs/actux4.h
+++ b/
include/configs/actux4.h
@@
-43,7
+43,7
@@
#undef CONFIG_USE_IRQ
/* Size of malloc() pool */
#undef CONFIG_USE_IRQ
/* Size of malloc() pool */
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
/* size in bytes reserved for initial data */
#define CFG_GBL_DATA_SIZE 128
/* size in bytes reserved for initial data */
#define CFG_GBL_DATA_SIZE 128
@@
-177,8
+177,8
@@
/* environment organization: one complete 4k flash sector */
#define CONFIG_ENV_IS_IN_FLASH 1
/* environment organization: one complete 4k flash sector */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x1000
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + 0x3f000)
+#define C
ONFIG_ENV_SIZE
0x1000
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + 0x3f000)
#define CONFIG_EXTRA_ENV_SETTINGS \
"mtd=IXP4XX-Flash.0:252k(uboot),4k(uboot_env);" \
#define CONFIG_EXTRA_ENV_SETTINGS \
"mtd=IXP4XX-Flash.0:252k(uboot),4k(uboot_env);" \
diff --git
a/include/configs/ads5121.h
b/include/configs/ads5121.h
index
eb6a645
..
d99f23f
100644
(file)
--- a/
include/configs/ads5121.h
+++ b/
include/configs/ads5121.h
@@
-322,17
+322,17
@@
*/
#define CONFIG_ENV_IS_IN_FLASH 1
/* This has to be a multiple of the Flash sector size */
*/
#define CONFIG_ENV_IS_IN_FLASH 1
/* This has to be a multiple of the Flash sector size */
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
-#define C
FG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SIZE
0x2000
#ifdef CONFIG_BKUP_FLASH
#ifdef CONFIG_BKUP_FLASH
-#define C
FG_ENV_SECT_SIZE
0x20000 /* one sector (256K) for env */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* one sector (256K) for env */
#else
#else
-#define C
FG_ENV_SECT_SIZE
0x40000 /* one sector (256K) for env */
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* one sector (256K) for env */
#endif
/* Address and size of Redundant Environment Sector */
#endif
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
diff --git
a/include/configs/aev.h
b/include/configs/aev.h
index
bd7dab2
..
2dcaa58
100644
(file)
--- a/
include/configs/aev.h
+++ b/
include/configs/aev.h
@@
-233,9
+233,9
@@
#undef CFG_FLASH_USE_BUFFER_WRITE /* not supported yet for AMD */
#if !defined(CFG_LOWBOOT)
#undef CFG_FLASH_USE_BUFFER_WRITE /* not supported yet for AMD */
#if !defined(CFG_LOWBOOT)
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00760000 + 0x00800000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00760000 + 0x00800000)
#else /* CFG_LOWBOOT */
#else /* CFG_LOWBOOT */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00060000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00060000)
#endif /* CFG_LOWBOOT */
#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks
(= chip selects) */
#endif /* CFG_LOWBOOT */
#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks
(= chip selects) */
@@
-247,10
+247,10
@@
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x10000
-#define C
FG_ENV_SECT_SIZE
0x20000
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
0x10000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*
* Memory map
/*
* Memory map
diff --git
a/include/configs/alpr.h
b/include/configs/alpr.h
index
ee60644
..
c80c76a
100644
(file)
--- a/
include/configs/alpr.h
+++ b/
include/configs/alpr.h
@@
-95,13
+95,13
@@
#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
-#define C
FG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
-#define C
FG_ENV_ADDR (CFG_MONITOR_BASE-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*-----------------------------------------------------------------------
* DDR SDRAM
/*-----------------------------------------------------------------------
* DDR SDRAM
diff --git
a/include/configs/ap325rxa.h
b/include/configs/ap325rxa.h
index
79f4d11
..
cfcd85c
100644
(file)
--- a/
include/configs/ap325rxa.h
+++ b/
include/configs/ap325rxa.h
@@
-162,12
+162,12
@@
/* ENV setting */
#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OVERWRITE 1
/* ENV setting */
#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OVERWRITE 1
-#define C
FG_ENV_SECT_SIZE
(128 * 1024)
-#define C
FG_ENV_SIZE (CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SECT_SIZE
(128 * 1024)
+#define C
ONFIG_ENV_SIZE (CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + CFG_MONITOR_LEN)
/* Offset of env Flash sector relative to CFG_FLASH_BASE */
/* Offset of env Flash sector relative to CFG_FLASH_BASE */
-#define C
FG_ENV_OFFSET (CF
G_ENV_ADDR - CFG_FLASH_BASE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_OFFSET (CONFI
G_ENV_ADDR - CFG_FLASH_BASE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SECT_SIZE)
/* Board Clock */
#define CONFIG_SYS_CLK_FREQ 33333333
/* Board Clock */
#define CONFIG_SYS_CLK_FREQ 33333333
diff --git
a/include/configs/apollon.h
b/include/configs/apollon.h
index
6e34ddf
..
edfae27
100644
(file)
--- a/
include/configs/apollon.h
+++ b/
include/configs/apollon.h
@@
-72,8
+72,8
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define C
FG_ENV_SIZE SZ_128K
/* Total Size of Environment Sector */
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + SZ_128K)
+#define C
ONFIG_ENV_SIZE SZ_128K
/* Total Size of Environment Sector */
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + SZ_128K)
#define CFG_GBL_DATA_SIZE 128 /* bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* bytes reserved for initial data */
/*
@@
-226,6
+226,6
@@
/* OneNAND boot, OneNAND has CS0, NOR boot ONeNAND has CS2 */
#define CFG_ONENAND_BASE 0x00000000
#define CONFIG_ENV_IS_IN_ONENAND 1
/* OneNAND boot, OneNAND has CS0, NOR boot ONeNAND has CS2 */
#define CFG_ONENAND_BASE 0x00000000
#define CONFIG_ENV_IS_IN_ONENAND 1
-#define C
FG_ENV_ADDR
0x00020000
+#define C
ONFIG_ENV_ADDR
0x00020000
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/armadillo.h
b/include/configs/armadillo.h
index
45b20bd
..
668c2c1
100644
(file)
--- a/
include/configs/armadillo.h
+++ b/
include/configs/armadillo.h
@@
-50,7
+50,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-148,8
+148,8
@@
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + 0x20000) /* Addr of Environment Sector */
-#define C
FG_ENV_SIZE
0x20000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + 0x20000) /* Addr of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x20000 /* Total Size of Environment Sector */
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
diff --git
a/include/configs/assabet.h
b/include/configs/assabet.h
index
3cc4db4
..
28864ea
100644
(file)
--- a/
include/configs/assabet.h
+++ b/
include/configs/assabet.h
@@
-45,7
+45,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size rsrvd for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size rsrvd for initial data */
/*
@@
-163,10
+163,10
@@
#define CONFIG_ENV_IS_IN_FLASH 1
#if defined(CONFIG_ENV_IS_IN_FLASH)
#define CONFIG_ENV_IS_IN_FLASH 1
#if defined(CONFIG_ENV_IS_IN_FLASH)
-#define C
FG_ENV_IN_OWN_SECTOR
1
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE)
-#define C
FG_ENV_SIZE
PHYS_FLASH_SECT_SIZE
-#define C
FG_ENV_SECT_SIZE
PHYS_FLASH_SECT_SIZE
+#define C
ONFIG_ENV_IN_OWN_SECTOR
1
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
PHYS_FLASH_SECT_SIZE
+#define C
ONFIG_ENV_SECT_SIZE
PHYS_FLASH_SECT_SIZE
#endif
#endif /* __CONFIG_H */
#endif
#endif /* __CONFIG_H */
diff --git
a/include/configs/at91cap9adk.h
b/include/configs/at91cap9adk.h
index
fb5358c
..
fd06245
100644
(file)
--- a/
include/configs/at91cap9adk.h
+++ b/
include/configs/at91cap9adk.h
@@
-150,9
+150,9
@@
/* bootstrap + u-boot + env + linux in dataflash */
#define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
/* bootstrap + u-boot + env + linux in dataflash */
#define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
-#define C
FG_ENV_OFFSET
0x4200
-#define C
FG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CF
G_ENV_OFFSET)
-#define C
FG_ENV_SIZE
0x4200
+#define C
ONFIG_ENV_OFFSET
0x4200
+#define C
ONFIG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFI
G_ENV_OFFSET)
+#define C
ONFIG_ENV_SIZE
0x4200
#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x72000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock1 " \
#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x72000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock1 " \
@@
-165,9
+165,9
@@
/* bootstrap + u-boot + env + linux in norflash */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MONITOR_BASE (PHYS_FLASH_1 + 0x8000)
/* bootstrap + u-boot + env + linux in norflash */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MONITOR_BASE (PHYS_FLASH_1 + 0x8000)
-#define C
FG_ENV_OFFSET
0x4000
-#define C
FG_ENV_ADDR (PHYS_FLASH_1 + CF
G_ENV_OFFSET)
-#define C
FG_ENV_SIZE
0x4000
+#define C
ONFIG_ENV_OFFSET
0x4000
+#define C
ONFIG_ENV_ADDR (PHYS_FLASH_1 + CONFI
G_ENV_OFFSET)
+#define C
ONFIG_ENV_SIZE
0x4000
#define CONFIG_BOOTCOMMAND "cp.b 0x10040000 0x72000000 0x200000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock4 " \
#define CONFIG_BOOTCOMMAND "cp.b 0x10040000 0x72000000 0x200000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock4 " \
@@
-192,7
+192,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN ROUND(C
F
G_ENV_SIZE + 128*1024, 0x1000)
+#define CFG_MALLOC_LEN ROUND(C
ONFI
G_ENV_SIZE + 128*1024, 0x1000)
#define CFG_GBL_DATA_SIZE 128 /* 128 bytes for initial data */
#define CONFIG_STACKSIZE (32*1024) /* regular stack */
#define CFG_GBL_DATA_SIZE 128 /* 128 bytes for initial data */
#define CONFIG_STACKSIZE (32*1024) /* regular stack */
diff --git
a/include/configs/at91rm9200dk.h
b/include/configs/at91rm9200dk.h
index
31d84d2
..
000eb0e
100644
(file)
--- a/
include/configs/at91rm9200dk.h
+++ b/
include/configs/at91rm9200dk.h
@@
-76,7
+76,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
#define CONFIG_BAUDRATE 115200
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
#define CONFIG_BAUDRATE 115200
@@
-182,17
+182,17
@@
#undef CONFIG_ENV_IS_IN_DATAFLASH
#ifdef CONFIG_ENV_IS_IN_DATAFLASH
#undef CONFIG_ENV_IS_IN_DATAFLASH
#ifdef CONFIG_ENV_IS_IN_DATAFLASH
-#define C
FG_ENV_OFFSET
0x20000
-#define C
FG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CF
G_ENV_OFFSET)
-#define C
FG_ENV_SIZE
0x2000 /* 0x8000 */
+#define C
ONFIG_ENV_OFFSET
0x20000
+#define C
ONFIG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFI
G_ENV_OFFSET)
+#define C
ONFIG_ENV_SIZE
0x2000 /* 0x8000 */
#else
#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_SKIP_LOWLEVEL_INIT
#else
#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_SKIP_LOWLEVEL_INIT
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + 0xe000) /* between boot.bin and u-boot.bin.gz */
-#define C
FG_ENV_SIZE
0x2000 /* 0x8000 */
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + 0xe000) /* between boot.bin and u-boot.bin.gz */
+#define C
ONFIG_ENV_SIZE
0x2000 /* 0x8000 */
#else
#else
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + 0x60000) /* after u-boot.bin */
-#define C
FG_ENV_SIZE
0x10000 /* sectors are 64K here */
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + 0x60000) /* after u-boot.bin */
+#define C
ONFIG_ENV_SIZE
0x10000 /* sectors are 64K here */
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
#endif /* CONFIG_ENV_IS_IN_DATAFLASH */
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
#endif /* CONFIG_ENV_IS_IN_DATAFLASH */
diff --git
a/include/configs/at91sam9260ek.h
b/include/configs/at91sam9260ek.h
index
0ddc079
..
41d1da3
100644
(file)
--- a/
include/configs/at91sam9260ek.h
+++ b/
include/configs/at91sam9260ek.h
@@
-136,9
+136,9
@@
/* bootstrap + u-boot + env + linux in dataflash on CS0 */
#define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
/* bootstrap + u-boot + env + linux in dataflash on CS0 */
#define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
-#define C
FG_ENV_OFFSET
0x4200
-#define C
FG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CF
G_ENV_OFFSET)
-#define C
FG_ENV_SIZE
0x4200
+#define C
ONFIG_ENV_OFFSET
0x4200
+#define C
ONFIG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFI
G_ENV_OFFSET)
+#define C
ONFIG_ENV_SIZE
0x4200
#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
@@
-150,9
+150,9
@@
/* bootstrap + u-boot + env + linux in dataflash on CS1 */
#define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
/* bootstrap + u-boot + env + linux in dataflash on CS1 */
#define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
-#define C
FG_ENV_OFFSET
0x4200
-#define C
FG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS1 + CF
G_ENV_OFFSET)
-#define C
FG_ENV_SIZE
0x4200
+#define C
ONFIG_ENV_OFFSET
0x4200
+#define C
ONFIG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS1 + CONFI
G_ENV_OFFSET)
+#define C
ONFIG_ENV_SIZE
0x4200
#define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
#define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
@@
-163,9
+163,9
@@
/* bootstrap + u-boot + env + linux in nandflash */
#define CONFIG_ENV_IS_IN_NAND 1
/* bootstrap + u-boot + env + linux in nandflash */
#define CONFIG_ENV_IS_IN_NAND 1
-#define C
FG_ENV_OFFSET
0x60000
-#define C
FG_ENV_OFFSET_REDUND
0x80000
-#define C
FG_ENV_SIZE
0x20000 /* 1 sector = 128 kB */
+#define C
ONFIG_ENV_OFFSET
0x60000
+#define C
ONFIG_ENV_OFFSET_REDUND
0x80000
+#define C
ONFIG_ENV_SIZE
0x20000 /* 1 sector = 128 kB */
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock5 " \
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock5 " \
@@
-190,7
+190,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN ROUND(3 * C
F
G_ENV_SIZE + 128*1024, 0x1000)
+#define CFG_MALLOC_LEN ROUND(3 * C
ONFI
G_ENV_SIZE + 128*1024, 0x1000)
#define CFG_GBL_DATA_SIZE 128 /* 128 bytes for initial data */
#define CONFIG_STACKSIZE (32*1024) /* regular stack */
#define CFG_GBL_DATA_SIZE 128 /* 128 bytes for initial data */
#define CONFIG_STACKSIZE (32*1024) /* regular stack */
diff --git
a/include/configs/at91sam9261ek.h
b/include/configs/at91sam9261ek.h
index
a4a0831
..
80c3b03
100644
(file)
--- a/
include/configs/at91sam9261ek.h
+++ b/
include/configs/at91sam9261ek.h
@@
-150,9
+150,9
@@
/* bootstrap + u-boot + env + linux in dataflash on CS0 */
#define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
/* bootstrap + u-boot + env + linux in dataflash on CS0 */
#define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
-#define C
FG_ENV_OFFSET
0x4200
-#define C
FG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CF
G_ENV_OFFSET)
-#define C
FG_ENV_SIZE
0x4200
+#define C
ONFIG_ENV_OFFSET
0x4200
+#define C
ONFIG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFI
G_ENV_OFFSET)
+#define C
ONFIG_ENV_SIZE
0x4200
#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
@@
-163,9
+163,9
@@
/* bootstrap + u-boot + env + linux in nandflash */
#define CONFIG_ENV_IS_IN_NAND 1
/* bootstrap + u-boot + env + linux in nandflash */
#define CONFIG_ENV_IS_IN_NAND 1
-#define C
FG_ENV_OFFSET
0x60000
-#define C
FG_ENV_OFFSET_REDUND
0x80000
-#define C
FG_ENV_SIZE
0x20000 /* 1 sector = 128 kB */
+#define C
ONFIG_ENV_OFFSET
0x60000
+#define C
ONFIG_ENV_OFFSET_REDUND
0x80000
+#define C
ONFIG_ENV_SIZE
0x20000 /* 1 sector = 128 kB */
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock5 " \
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock5 " \
@@
-190,7
+190,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN ROUND(3 * C
F
G_ENV_SIZE + 128*1024, 0x1000)
+#define CFG_MALLOC_LEN ROUND(3 * C
ONFI
G_ENV_SIZE + 128*1024, 0x1000)
#define CFG_GBL_DATA_SIZE 128 /* 128 bytes for initial data */
#define CONFIG_STACKSIZE (32*1024) /* regular stack */
#define CFG_GBL_DATA_SIZE 128 /* 128 bytes for initial data */
#define CONFIG_STACKSIZE (32*1024) /* regular stack */
diff --git
a/include/configs/at91sam9263ek.h
b/include/configs/at91sam9263ek.h
index
1d24311
..
b4368ef
100644
(file)
--- a/
include/configs/at91sam9263ek.h
+++ b/
include/configs/at91sam9263ek.h
@@
-156,9
+156,9
@@
/* bootstrap + u-boot + env + linux in dataflash on CS0 */
#define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
/* bootstrap + u-boot + env + linux in dataflash on CS0 */
#define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
-#define C
FG_ENV_OFFSET
0x4200
-#define C
FG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CF
G_ENV_OFFSET)
-#define C
FG_ENV_SIZE
0x4200
+#define C
ONFIG_ENV_OFFSET
0x4200
+#define C
ONFIG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFI
G_ENV_OFFSET)
+#define C
ONFIG_ENV_SIZE
0x4200
#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
@@
-169,9
+169,9
@@
/* bootstrap + u-boot + env + linux in nandflash */
#define CONFIG_ENV_IS_IN_NAND 1
/* bootstrap + u-boot + env + linux in nandflash */
#define CONFIG_ENV_IS_IN_NAND 1
-#define C
FG_ENV_OFFSET
0x60000
-#define C
FG_ENV_OFFSET_REDUND
0x80000
-#define C
FG_ENV_SIZE
0x20000 /* 1 sector = 128 kB */
+#define C
ONFIG_ENV_OFFSET
0x60000
+#define C
ONFIG_ENV_OFFSET_REDUND
0x80000
+#define C
ONFIG_ENV_SIZE
0x20000 /* 1 sector = 128 kB */
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock5 " \
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock5 " \
@@
-194,7
+194,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN ROUND(3 * C
F
G_ENV_SIZE + 128*1024, 0x1000)
+#define CFG_MALLOC_LEN ROUND(3 * C
ONFI
G_ENV_SIZE + 128*1024, 0x1000)
#define CFG_GBL_DATA_SIZE 128 /* 128 bytes for initial data */
#define CONFIG_STACKSIZE (32*1024) /* regular stack */
#define CFG_GBL_DATA_SIZE 128 /* 128 bytes for initial data */
#define CONFIG_STACKSIZE (32*1024) /* regular stack */
diff --git
a/include/configs/at91sam9rlek.h
b/include/configs/at91sam9rlek.h
index
8162475
..
32168dc
100644
(file)
--- a/
include/configs/at91sam9rlek.h
+++ b/
include/configs/at91sam9rlek.h
@@
-125,9
+125,9
@@
/* bootstrap + u-boot + env + linux in dataflash on CS0 */
#define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
/* bootstrap + u-boot + env + linux in dataflash on CS0 */
#define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
-#define C
FG_ENV_OFFSET
0x4200
-#define C
FG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CF
G_ENV_OFFSET)
-#define C
FG_ENV_SIZE
0x4200
+#define C
ONFIG_ENV_OFFSET
0x4200
+#define C
ONFIG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFI
G_ENV_OFFSET)
+#define C
ONFIG_ENV_SIZE
0x4200
#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
@@
-138,9
+138,9
@@
/* bootstrap + u-boot + env + linux in nandflash */
#define CONFIG_ENV_IS_IN_NAND 1
/* bootstrap + u-boot + env + linux in nandflash */
#define CONFIG_ENV_IS_IN_NAND 1
-#define C
FG_ENV_OFFSET
0x60000
-#define C
FG_ENV_OFFSET_REDUND
0x80000
-#define C
FG_ENV_SIZE
0x20000 /* 1 sector = 128 kB */
+#define C
ONFIG_ENV_OFFSET
0x60000
+#define C
ONFIG_ENV_OFFSET_REDUND
0x80000
+#define C
ONFIG_ENV_SIZE
0x20000 /* 1 sector = 128 kB */
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock5 " \
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock5 " \
@@
-163,7
+163,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN ROUND(3 * C
F
G_ENV_SIZE + 128*1024, 0x1000)
+#define CFG_MALLOC_LEN ROUND(3 * C
ONFI
G_ENV_SIZE + 128*1024, 0x1000)
#define CFG_GBL_DATA_SIZE 128 /* 128 bytes for initial data */
#define CONFIG_STACKSIZE (32*1024) /* regular stack */
#define CFG_GBL_DATA_SIZE 128 /* 128 bytes for initial data */
#define CONFIG_STACKSIZE (32*1024) /* regular stack */
diff --git
a/include/configs/atc.h
b/include/configs/atc.h
index
a7b154d
..
02ec239
100644
(file)
--- a/
include/configs/atc.h
+++ b/
include/configs/atc.h
@@
-271,13
+271,13
@@
#if 1
/* environment is in Flash */
#define CONFIG_ENV_IS_IN_FLASH 1
#if 1
/* environment is in Flash */
#define CONFIG_ENV_IS_IN_FLASH 1
-# define C
FG_ENV_ADDR
(CFG_FLASH_BASE+0x30000)
-# define C
FG_ENV_SIZE
0x10000
-# define C
FG_ENV_SECT_SIZE
0x10000
+# define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE+0x30000)
+# define C
ONFIG_ENV_SIZE
0x10000
+# define C
ONFIG_ENV_SECT_SIZE
0x10000
#else
#define CONFIG_ENV_IS_IN_EEPROM 1
#else
#define CONFIG_ENV_IS_IN_EEPROM 1
-#define C
FG_ENV_OFFSET
0
-#define C
FG_ENV_SIZE
2048
+#define C
ONFIG_ENV_OFFSET
0
+#define C
ONFIG_ENV_SIZE
2048
#define CFG_EEPROM_PAGE_WRITE_BITS 4 /* 16-byte page size */
#endif
/*
#define CFG_EEPROM_PAGE_WRITE_BITS 4 /* 16-byte page size */
#endif
/*
diff --git
a/include/configs/atngw100.h
b/include/configs/atngw100.h
index
12da7f0
..
5c28638
100644
(file)
--- a/
include/configs/atngw100.h
+++ b/
include/configs/atngw100.h
@@
-154,8
+154,8
@@
#define CFG_SDRAM_BASE EBI_SDRAM_BASE
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_SDRAM_BASE EBI_SDRAM_BASE
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
65536
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
65536
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFI
G_ENV_SIZE)
#define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
#define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
diff --git
a/include/configs/atstk1002.h
b/include/configs/atstk1002.h
index
4a9a94e
..
faa7a01
100644
(file)
--- a/
include/configs/atstk1002.h
+++ b/
include/configs/atstk1002.h
@@
-178,8
+178,8
@@
#define CFG_SDRAM_BASE EBI_SDRAM_BASE
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_SDRAM_BASE EBI_SDRAM_BASE
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
65536
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
65536
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFI
G_ENV_SIZE)
#define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
#define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
diff --git
a/include/configs/atstk1003.h
b/include/configs/atstk1003.h
index
62c1aff
..
e3084d4
100644
(file)
--- a/
include/configs/atstk1003.h
+++ b/
include/configs/atstk1003.h
@@
-161,8
+161,8
@@
#define CFG_SDRAM_BASE EBI_SDRAM_BASE
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_SDRAM_BASE EBI_SDRAM_BASE
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
65536
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
65536
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFI
G_ENV_SIZE)
#define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
#define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
diff --git
a/include/configs/atstk1004.h
b/include/configs/atstk1004.h
index
a9a9484
..
c87c5b7
100644
(file)
--- a/
include/configs/atstk1004.h
+++ b/
include/configs/atstk1004.h
@@
-161,8
+161,8
@@
#define CFG_SDRAM_BASE EBI_SDRAM_BASE
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_SDRAM_BASE EBI_SDRAM_BASE
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
65536
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
65536
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFI
G_ENV_SIZE)
#define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
#define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
diff --git
a/include/configs/atstk1006.h
b/include/configs/atstk1006.h
index
c454ec0
..
fe7a99b
100644
(file)
--- a/
include/configs/atstk1006.h
+++ b/
include/configs/atstk1006.h
@@
-178,8
+178,8
@@
#define CFG_SDRAM_BASE EBI_SDRAM_BASE
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_SDRAM_BASE EBI_SDRAM_BASE
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
65536
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
65536
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFI
G_ENV_SIZE)
#define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
#define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
diff --git
a/include/configs/bamboo.h
b/include/configs/bamboo.h
index
2485477
..
31c725f
100644
(file)
--- a/
include/configs/bamboo.h
+++ b/
include/configs/bamboo.h
@@
-106,7
+106,7
@@
#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 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 C
FG_ENV_IS_EMBEDDED
1 /* use embedded environment */
+#define C
ONFIG_ENV_IS_EMBEDDED
1 /* use embedded environment */
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
@@
-127,13
+127,13
@@
#define CFG_FLASH_2ND_ADDR 0x87800000 /* bamboo has 8 and 16bit device */
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_2ND_ADDR 0x87800000 /* bamboo has 8 and 16bit device */
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
-#define C
FG_ENV_ADDR ((-CFG_MONITOR_LEN)-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR ((-CFG_MONITOR_LEN)-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*
@@
-188,9
+188,9
@@
* For NAND booting the environment is embedded in the U-Boot image. Please take
* look at the file board/amcc/sequoia/u-boot-nand.lds for details.
*/
* For NAND booting the environment is embedded in the U-Boot image. Please take
* look at the file board/amcc/sequoia/u-boot-nand.lds for details.
*/
-#define C
FG_ENV_SIZE
CFG_NAND_BLOCK_SIZE
-#define C
FG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CF
G_ENV_SIZE)
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET + CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
CFG_NAND_BLOCK_SIZE
+#define C
ONFIG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFI
G_ENV_SIZE)
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
@@
-234,8
+234,8
@@
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
#ifdef CONFIG_ENV_IS_IN_EEPROM
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
#ifdef CONFIG_ENV_IS_IN_EEPROM
-#define C
FG_ENV_SIZE
0x200 /* Size of Environment vars */
-#define C
FG_ENV_OFFSET
0x0
+#define C
ONFIG_ENV_SIZE
0x200 /* Size of Environment vars */
+#define C
ONFIG_ENV_OFFSET
0x0
#endif /* CONFIG_ENV_IS_IN_EEPROM */
/*
#endif /* CONFIG_ENV_IS_IN_EEPROM */
/*
diff --git
a/include/configs/barco.h
b/include/configs/barco.h
index
cbf5868
..
9afb10e
100644
(file)
--- a/
include/configs/barco.h
+++ b/
include/configs/barco.h
@@
-167,8
+167,8
@@
#define CFG_FLASH_BASE 0xFFF00000
#define CFG_FLASH_SIZE (8 * 1024 * 1024) /* Unity has onboard 1MByte flash */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_BASE 0xFFF00000
#define CFG_FLASH_SIZE (8 * 1024 * 1024) /* Unity has onboard 1MByte flash */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x000047A4 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x00002000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x000047A4 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x00002000 /* Total Size of Environment Sector */
/* #define ENV_CRC 0x8BF6F24B XXX - FIXME: gets defined automatically */
#define CFG_MALLOC_LEN (512 << 10) /* Reserve 512 kB for malloc() */
/* #define ENV_CRC 0x8BF6F24B XXX - FIXME: gets defined automatically */
#define CFG_MALLOC_LEN (512 << 10) /* Reserve 512 kB for malloc() */
diff --git
a/include/configs/bf533-ezkit.h
b/include/configs/bf533-ezkit.h
index
08fb639
..
b35e362
100644
(file)
--- a/
include/configs/bf533-ezkit.h
+++ b/
include/configs/bf533-ezkit.h
@@
-139,8
+139,8
@@
#define CFG_MAX_FLASH_SECT 40 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MAX_FLASH_SECT 40 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
0x20020000
-#define C
FG_ENV_SECT_SIZE
0x10000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_ADDR
0x20020000
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* Total Size of Environment Sector */
/* JFFS Partition offset set */
#define CFG_JFFS2_FIRST_BANK 0
/* JFFS Partition offset set */
#define CFG_JFFS2_FIRST_BANK 0
diff --git
a/include/configs/bf533-stamp.h
b/include/configs/bf533-stamp.h
index
2e71780
..
6e138b8
100644
(file)
--- a/
include/configs/bf533-stamp.h
+++ b/
include/configs/bf533-stamp.h
@@
-103,16
+103,16
@@
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
#define CONFIG_ENV_IS_IN_EEPROM 1
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
#define CONFIG_ENV_IS_IN_EEPROM 1
-#define C
FG_ENV_OFFSET
0x4000
-#define C
FG_ENV_HEADER (CFG_ENV_OFFSET + 0x12A)
/* 0x12A is the length of LDR file header */
+#define C
ONFIG_ENV_OFFSET
0x4000
+#define C
ONFIG_ENV_HEADER (CONFIG_ENV_OFFSET + 0x12A)
/* 0x12A is the length of LDR file header */
#else
#define CONFIG_ENV_IS_IN_FLASH 1
#else
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
0x20004000
-#define C
FG_ENV_OFFSET (CF
G_ENV_ADDR - CFG_FLASH_BASE)
+#define C
ONFIG_ENV_ADDR
0x20004000
+#define C
ONFIG_ENV_OFFSET (CONFI
G_ENV_ADDR - CFG_FLASH_BASE)
#endif
#endif
-#define C
FG_ENV_SIZE
0x2000
-#define C
FG_ENV_SECT_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_SECT_SIZE
0x2000 /* Total Size of Environment Sector */
#define ENV_IS_EMBEDDED
#define CFG_FLASH_ERASE_TOUT 30000 /* Timeout for Chip Erase (in ms) */
#define ENV_IS_EMBEDDED
#define CFG_FLASH_ERASE_TOUT 30000 /* Timeout for Chip Erase (in ms) */
diff --git
a/include/configs/bf537-stamp.h
b/include/configs/bf537-stamp.h
index
5224eb2
..
01e185a
100644
(file)
--- a/
include/configs/bf537-stamp.h
+++ b/
include/configs/bf537-stamp.h
@@
-236,15
+236,15
@@
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
#define CONFIG_ENV_IS_IN_EEPROM 1
#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
#define CONFIG_ENV_IS_IN_EEPROM 1
-#define C
FG_ENV_OFFSET
0x4000
-#define C
FG_ENV_HEADER (CF
G_ENV_OFFSET + 0x16e) /* 0x12A is the length of LDR file header */
+#define C
ONFIG_ENV_OFFSET
0x4000
+#define C
ONFIG_ENV_HEADER (CONFI
G_ENV_OFFSET + 0x16e) /* 0x12A is the length of LDR file header */
#else
#define CONFIG_ENV_IS_IN_FLASH 1
#else
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
0x20004000
-#define C
FG_ENV_OFFSET (CF
G_ENV_ADDR - CFG_FLASH_BASE)
+#define C
ONFIG_ENV_ADDR
0x20004000
+#define C
ONFIG_ENV_OFFSET (CONFI
G_ENV_ADDR - CFG_FLASH_BASE)
#endif
#endif
-#define C
FG_ENV_SIZE
0x2000
-#define C
FG_ENV_SECT_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_SECT_SIZE
0x2000 /* Total Size of Environment Sector */
#define ENV_IS_EMBEDDED
/* JFFS Partition offset set */
#define ENV_IS_EMBEDDED
/* JFFS Partition offset set */
diff --git
a/include/configs/bf561-ezkit.h
b/include/configs/bf561-ezkit.h
index
ff10650
..
59a0f3f
100644
(file)
--- a/
include/configs/bf561-ezkit.h
+++ b/
include/configs/bf561-ezkit.h
@@
-83,8
+83,8
@@
#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 */
#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 */
-#define C
FG_ENV_ADDR
0x20020000
-#define C
FG_ENV_SECT_SIZE
0x10000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_ADDR
0x20020000
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* Total Size of Environment Sector */
/* JFFS Partition offset set */
#define CFG_JFFS2_FIRST_BANK 0
#define CFG_JFFS2_NUM_BANKS 1
/* JFFS Partition offset set */
#define CFG_JFFS2_FIRST_BANK 0
#define CFG_JFFS2_NUM_BANKS 1
diff --git
a/include/configs/bubinga.h
b/include/configs/bubinga.h
index
146d254
..
49abcc6
100644
(file)
--- a/
include/configs/bubinga.h
+++ b/
include/configs/bubinga.h
@@
-195,13
+195,13
@@
#define CFG_FLASH_WORD_SIZE unsigned char
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_WORD_SIZE unsigned char
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
-#define C
FG_ENV_ADDR (CFG_MONITOR_BASE-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
@@
-211,9
+211,9
@@
#define CFG_NVRAM_SIZE 0x1ff8 /* NVRAM size */
#ifdef CONFIG_ENV_IS_IN_NVRAM
#define CFG_NVRAM_SIZE 0x1ff8 /* NVRAM size */
#ifdef CONFIG_ENV_IS_IN_NVRAM
-#define C
FG_ENV_SIZE
0x0ff8 /* Size of Environment vars */
-#define C
FG_ENV_ADDR
\
- (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
FG_ENV_SIZE)
/* Env */
+#define C
ONFIG_ENV_SIZE
0x0ff8 /* Size of Environment vars */
+#define C
ONFIG_ENV_ADDR
\
+ (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
ONFIG_ENV_SIZE)
/* Env */
#endif
/*
#endif
/*
diff --git
a/include/configs/c2mon.h
b/include/configs/c2mon.h
index
17178e9
..
dca7b47
100644
(file)
--- a/
include/configs/c2mon.h
+++ b/
include/configs/c2mon.h
@@
-178,8
+178,8
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/canmb.h
b/include/configs/canmb.h
index
f0818b7
..
59e4cb3
100644
(file)
--- a/
include/configs/canmb.h
+++ b/
include/configs/canmb.h
@@
-138,9
+138,9
@@
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
(2*128*1024)
-#define C
FG_ENV_SIZE
0x2000
-#define C
F
G_ENV_SECT_SIZE (128*1024)
+#define C
ONFIG_ENV_OFFSET
(2*128*1024)
+#define C
ONFIG_ENV_SIZE
0x2000
+#define C
ONFI
G_ENV_SECT_SIZE (128*1024)
/*
* Memory map
/*
* Memory map
diff --git
a/include/configs/canyonlands.h
b/include/configs/canyonlands.h
index
9ec49c1
..
2f162e1
100644
(file)
--- a/
include/configs/canyonlands.h
+++ b/
include/configs/canyonlands.h
@@
-117,7
+117,7
@@
#else
#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
#define CFG_NAND_CS 0 /* NAND chip connected to CSx */
#else
#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
#define CFG_NAND_CS 0 /* NAND chip connected to CSx */
-#define C
FG_ENV_IS_EMBEDDED
1 /* use embedded environment */
+#define C
ONFIG_ENV_IS_EMBEDDED
1 /* use embedded environment */
#endif
/*
#endif
/*
@@
-179,9
+179,9
@@
* For NAND booting the environment is embedded in the U-Boot image. Please take
* look at the file board/amcc/canyonlands/u-boot-nand.lds for details.
*/
* For NAND booting the environment is embedded in the U-Boot image. Please take
* look at the file board/amcc/canyonlands/u-boot-nand.lds for details.
*/
-#define C
FG_ENV_SIZE
CFG_NAND_BLOCK_SIZE
-#define C
FG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CF
G_ENV_SIZE)
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET + CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
CFG_NAND_BLOCK_SIZE
+#define C
ONFIG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFI
G_ENV_SIZE)
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
@@
-202,13
+202,13
@@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
-#define C
FG_ENV_ADDR (CFG_MONITOR_BASE - CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE - CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR - CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
diff --git
a/include/configs/cerf250.h
b/include/configs/cerf250.h
index
fb737d5
..
9618425
100644
(file)
--- a/
include/configs/cerf250.h
+++ b/
include/configs/cerf250.h
@@
-44,7
+44,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-218,8
+218,8
@@
#define CFG_MONITOR_LEN 0x40000 /* 256 KiB */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MONITOR_LEN 0x40000 /* 256 KiB */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + CFG_MONITOR_LEN)
-#define C
FG_ENV_SIZE
0x40000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SIZE
0x40000 /* Total Size of Environment Sector */
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/cm4008.h
b/include/configs/cm4008.h
index
85f45b7
..
c9c057c
100644
(file)
--- a/
include/configs/cm4008.h
+++ b/
include/configs/cm4008.h
@@
-42,7
+42,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-131,6
+131,6
@@
#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_FLASH_ERASE_TOUT (20*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */
-#define C
FG_ENV_SIZE
0x20000 /* Total Size of Environment */
+#define C
ONFIG_ENV_SIZE
0x20000 /* Total Size of Environment */
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/cm41xx.h
b/include/configs/cm41xx.h
index
f34dc5c
..
940e3e1
100644
(file)
--- a/
include/configs/cm41xx.h
+++ b/
include/configs/cm41xx.h
@@
-42,7
+42,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-131,6
+131,6
@@
#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_FLASH_ERASE_TOUT (20*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */
-#define C
FG_ENV_SIZE
0x20000 /* Total Size of Environment */
+#define C
ONFIG_ENV_SIZE
0x20000 /* Total Size of Environment */
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/cm5200.h
b/include/configs/cm5200.h
index
5f0d3fb
..
5257db3
100644
(file)
--- a/
include/configs/cm5200.h
+++ b/
include/configs/cm5200.h
@@
-265,12
+265,12
@@
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x10000
-#define C
FG_ENV_SECT_SIZE
0x20000
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SIZE
0x10000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + CFG_MONITOR_LEN)
/* Configuration of redundant environment */
/* Configuration of redundant environment */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*
* Pin multiplexing configuration
/*
* Pin multiplexing configuration
diff --git
a/include/configs/cmc_pu2.h
b/include/configs/cmc_pu2.h
index
d9c1263
..
9b74438
100644
(file)
--- a/
include/configs/cmc_pu2.h
+++ b/
include/configs/cmc_pu2.h
@@
-76,7
+76,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
#define CONFIG_BAUDRATE 9600
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
#define CONFIG_BAUDRATE 9600
@@
-173,9
+173,9
@@
#define CFG_FLASH_WRITE_TOUT ( 2 * CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT ( 2 * CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x20000 /* after u-boot.bin */
-#define C
FG_ENV_SECT_SIZE
(64 << 10) /* sectors are 64 kB */
-#define C
FG_ENV_SIZE
(16 << 10) /* Use only 16 kB */
+#define C
ONFIG_ENV_OFFSET
0x20000 /* after u-boot.bin */
+#define C
ONFIG_ENV_SECT_SIZE
(64 << 10) /* sectors are 64 kB */
+#define C
ONFIG_ENV_SIZE
(16 << 10) /* Use only 16 kB */
#define CFG_LOAD_ADDR 0x21000000 /* default load address */
#define CFG_LOAD_ADDR 0x21000000 /* default load address */
diff --git
a/include/configs/cmi_mpc5xx.h
b/include/configs/cmi_mpc5xx.h
index
ed6578a
..
19c2836
100644
(file)
--- a/
include/configs/cmi_mpc5xx.h
+++ b/
include/configs/cmi_mpc5xx.h
@@
-171,8
+171,8
@@
#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_OFFSET
0x00020000 /* Environment starts at this adress */
-#define C
FG_ENV_SIZE
0x00010000 /* Set whole sector as env */
+#define C
ONFIG_ENV_OFFSET
0x00020000 /* Environment starts at this adress */
+#define C
ONFIG_ENV_SIZE
0x00010000 /* Set whole sector as env */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#endif
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#endif
diff --git
a/include/configs/cobra5272.h
b/include/configs/cobra5272.h
index
c908d5a
..
9b729ac
100644
(file)
--- a/
include/configs/cobra5272.h
+++ b/
include/configs/cobra5272.h
@@
-124,13
+124,13
@@
*/
#ifndef CONFIG_MONITOR_IS_IN_RAM
*/
#ifndef CONFIG_MONITOR_IS_IN_RAM
-#define C
FG_ENV_OFFSET
0x4000
-#define C
FG_ENV_SECT_SIZE
0x2000
+#define C
ONFIG_ENV_OFFSET
0x4000
+#define C
ONFIG_ENV_SECT_SIZE
0x2000
#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_IS_EMBEDDED
1
+#define C
ONFIG_ENV_IS_EMBEDDED
1
#else
#else
-#define C
FG_ENV_ADDR
0xffe04000
-#define C
FG_ENV_SECT_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
0xffe04000
+#define C
ONFIG_ENV_SECT_SIZE
0x2000
#define CONFIG_ENV_IS_IN_FLASH 1
#endif
#define CONFIG_ENV_IS_IN_FLASH 1
#endif
diff --git
a/include/configs/cogent_mpc8260.h
b/include/configs/cogent_mpc8260.h
index
fff35f9
..
b39f4cb
100644
(file)
--- a/
include/configs/cogent_mpc8260.h
+++ b/
include/configs/cogent_mpc8260.h
@@
-258,12
+258,12
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
CFG_FLASH_BASE /* Addr of Environment Sector */
+#define C
ONFIG_ENV_ADDR
CFG_FLASH_BASE /* Addr of Environment Sector */
#ifdef CONFIG_CMA302
#ifdef CONFIG_CMA302
-#define C
FG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
(512*1024) /* see README - env sect real size */
+#define C
ONFIG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
(512*1024) /* see README - env sect real size */
#else
#else
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/cogent_mpc8xx.h
b/include/configs/cogent_mpc8xx.h
index
9d257d2
..
c77f9a2
100644
(file)
--- a/
include/configs/cogent_mpc8xx.h
+++ b/
include/configs/cogent_mpc8xx.h
@@
-204,12
+204,12
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
CFG_FLASH_BASE /* Addr of Environment Sector */
+#define C
ONFIG_ENV_ADDR
CFG_FLASH_BASE /* Addr of Environment Sector */
#ifdef CONFIG_CMA302
#ifdef CONFIG_CMA302
-#define C
FG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
(512*1024) /* see README - env sect real size */
+#define C
ONFIG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
(512*1024) /* see README - env sect real size */
#else
#else
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
#endif
/*-----------------------------------------------------------------------
* Cache Configuration
#endif
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/cpci5200.h
b/include/configs/cpci5200.h
index
cbc5b2e
..
1f53ddc
100644
(file)
--- a/
include/configs/cpci5200.h
+++ b/
include/configs/cpci5200.h
@@
-205,7
+205,7
@@
#define CFG_FLASH_BASE 0xFE000000
#define CFG_FLASH_SIZE 0x02000000
#define CFG_FLASH_INCREMENT 0x01000000
#define CFG_FLASH_BASE 0xFE000000
#define CFG_FLASH_SIZE 0x02000000
#define CFG_FLASH_INCREMENT 0x01000000
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00000000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00000000)
#define CFG_MAX_FLASH_BANKS 2 /* max num of memory banks */
#define CFG_MAX_FLASH_SECT 128
#define CFG_MAX_FLASH_BANKS 2 /* max num of memory banks */
#define CFG_MAX_FLASH_SECT 128
@@
-220,13
+220,13
@@
*/
#if 1 /* test-only */
#define CONFIG_ENV_IS_IN_FLASH 1
*/
#if 1 /* test-only */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x20000
-#define C
FG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_SIZE
0x20000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
#define CONFIG_ENV_OVERWRITE 1
#else
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#define CONFIG_ENV_OVERWRITE 1
#else
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x0000 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x0400 /* 8192 bytes may be used for env vars */
+#define C
ONFIG_ENV_OFFSET
0x0000 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x0400 /* 8192 bytes may be used for env vars */
/* total size of a CAT24WC32 is 8192 bytes */
#define CONFIG_ENV_OVERWRITE 1
#endif
/* total size of a CAT24WC32 is 8192 bytes */
#define CONFIG_ENV_OVERWRITE 1
#endif
diff --git
a/include/configs/cradle.h
b/include/configs/cradle.h
index
ee319a7
..
34a265d
100644
(file)
--- a/
include/configs/cradle.h
+++ b/
include/configs/cradle.h
@@
-40,7
+40,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-153,8
+153,8
@@
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
0x00020000 /* absolute address for now */
-#define C
FG_ENV_SIZE
0x20000 /* 8K ouch, this may later be */
+#define C
ONFIG_ENV_ADDR
0x00020000 /* absolute address for now */
+#define C
ONFIG_ENV_SIZE
0x20000 /* 8K ouch, this may later be */
/******************************************************************************
*
/******************************************************************************
*
diff --git
a/include/configs/csb226.h
b/include/configs/csb226.h
index
c5d65e5
..
266e0e6
100644
(file)
--- a/
include/configs/csb226.h
+++ b/
include/configs/csb226.h
@@
-489,8
+489,8
@@
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
F
G_ENV_ADDR (PHYS_FLASH_1 + 0x1C000)
+#define C
ONFI
G_ENV_ADDR (PHYS_FLASH_1 + 0x1C000)
/* Addr of Environment Sector */
/* Addr of Environment Sector */
-#define C
F
G_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
+#define C
ONFI
G_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/csb272.h
b/include/configs/csb272.h
index
1d6a077
..
13892e6
100644
(file)
--- a/
include/configs/csb272.h
+++ b/
include/configs/csb272.h
@@
-253,10
+253,10
@@
#endif
#if defined(CONFIG_ENV_IS_IN_FLASH)
#endif
#if defined(CONFIG_ENV_IS_IN_FLASH)
-#define C
FG_ENV_IN_OWN_SECTOR
1 /* Give Environment own sector */
-#define C
FG_ENV_ADDR
0xFFF00000 /* Address of Environment Sector */
-#define C
FG_ENV_SIZE
0x00001000 /* Size of Environment */
-#define C
FG_ENV_SECT_SIZE
0x00040000 /* Size of Environment Sector */
+#define C
ONFIG_ENV_IN_OWN_SECTOR
1 /* Give Environment own sector */
+#define C
ONFIG_ENV_ADDR
0xFFF00000 /* Address of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x00001000 /* Size of Environment */
+#define C
ONFIG_ENV_SECT_SIZE
0x00040000 /* Size of Environment Sector */
#endif
/*
#endif
/*
diff --git
a/include/configs/csb472.h
b/include/configs/csb472.h
index
62bcc2f
..
0644982
100644
(file)
--- a/
include/configs/csb472.h
+++ b/
include/configs/csb472.h
@@
-252,10
+252,10
@@
#endif
#if defined(CONFIG_ENV_IS_IN_FLASH)
#endif
#if defined(CONFIG_ENV_IS_IN_FLASH)
-#define C
FG_ENV_IN_OWN_SECTOR
1 /* Give Environment own sector */
-#define C
FG_ENV_ADDR
0xFFF00000 /* Address of Environment Sector */
-#define C
FG_ENV_SIZE
0x00001000 /* Size of Environment */
-#define C
FG_ENV_SECT_SIZE
0x00040000 /* Size of Environment Sector */
+#define C
ONFIG_ENV_IN_OWN_SECTOR
1 /* Give Environment own sector */
+#define C
ONFIG_ENV_ADDR
0xFFF00000 /* Address of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x00001000 /* Size of Environment */
+#define C
ONFIG_ENV_SECT_SIZE
0x00040000 /* Size of Environment Sector */
#endif
/*
#endif
/*
diff --git
a/include/configs/csb637.h
b/include/configs/csb637.h
index
c3054d3
..
0760084
100644
(file)
--- a/
include/configs/csb637.h
+++ b/
include/configs/csb637.h
@@
-76,7
+76,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
#define CONFIG_BAUDRATE 115200
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
#define CONFIG_BAUDRATE 115200
@@
-194,13
+194,13
@@
#undef CONFIG_ENV_IS_IN_DATAFLASH
#ifdef CONFIG_ENV_IS_IN_DATAFLASH
#undef CONFIG_ENV_IS_IN_DATAFLASH
#ifdef CONFIG_ENV_IS_IN_DATAFLASH
-#define C
FG_ENV_OFFSET
0x20000
-#define C
FG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CF
G_ENV_OFFSET)
-#define C
FG_ENV_SIZE
0x2000 /* 0x8000 */
+#define C
ONFIG_ENV_OFFSET
0x20000
+#define C
ONFIG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFI
G_ENV_OFFSET)
+#define C
ONFIG_ENV_SIZE
0x2000 /* 0x8000 */
#else
#define CONFIG_ENV_IS_IN_FLASH 1
#else
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + 0x20000) /* after u-boot.bin */
-#define C
FG_ENV_SIZE
0x20000 /* sectors are 128K here */
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + 0x20000) /* after u-boot.bin */
+#define C
ONFIG_ENV_SIZE
0x20000 /* sectors are 128K here */
#endif /* CONFIG_ENV_IS_IN_DATAFLASH */
#endif /* CONFIG_ENV_IS_IN_DATAFLASH */
diff --git
a/include/configs/davinci_dvevm.h
b/include/configs/davinci_dvevm.h
index
13f5e01
..
ae2f6a5
100644
(file)
--- a/
include/configs/davinci_dvevm.h
+++ b/
include/configs/davinci_dvevm.h
@@
-116,11
+116,11
@@
#define CFG_NO_FLASH
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
#ifdef CFG_NAND_SMALLPAGE
#define CFG_NO_FLASH
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
#ifdef CFG_NAND_SMALLPAGE
-#define C
FG_ENV_SECT_SIZE
512 /* Env sector Size */
-#define C
FG_ENV_SIZE
SZ_16K
+#define C
ONFIG_ENV_SECT_SIZE
512 /* Env sector Size */
+#define C
ONFIG_ENV_SIZE
SZ_16K
#else
#else
-#define C
FG_ENV_SECT_SIZE
2048 /* Env sector Size */
-#define C
FG_ENV_SIZE
SZ_128K
+#define C
ONFIG_ENV_SECT_SIZE
2048 /* Env sector Size */
+#define C
ONFIG_ENV_SIZE
SZ_128K
#endif
#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */
#define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */
#endif
#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */
#define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */
@@
-128,7
+128,7
@@
#define CFG_NAND_HW_ECC
#define CFG_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
#define NAND_MAX_CHIPS 1
#define CFG_NAND_HW_ECC
#define CFG_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
#define NAND_MAX_CHIPS 1
-#define C
FG_ENV_OFFSET
0x0 /* Block 0--not used by bootcode */
+#define C
ONFIG_ENV_OFFSET
0x0 /* Block 0--not used by bootcode */
#define DEF_BOOTM ""
#elif defined(CFG_USE_NOR)
#ifdef CONFIG_NOR_UART_BOOT
#define DEF_BOOTM ""
#elif defined(CFG_USE_NOR)
#ifdef CONFIG_NOR_UART_BOOT
@@
-144,12
+144,12
@@
#define CFG_FLASH_CFI
#define CFG_MAX_FLASH_BANKS 1 /* max number of flash banks */
#define CFG_FLASH_SECT_SZ 0x10000 /* 64KB sect size AMD Flash */
#define CFG_FLASH_CFI
#define CFG_MAX_FLASH_BANKS 1 /* max number of flash banks */
#define CFG_FLASH_SECT_SZ 0x10000 /* 64KB sect size AMD Flash */
-#define C
FG_ENV_OFFSET
(CFG_FLASH_SECT_SZ*3)
+#define C
ONFIG_ENV_OFFSET
(CFG_FLASH_SECT_SZ*3)
#define PHYS_FLASH_1 0x02000000 /* CS2 Base address */
#define CFG_FLASH_BASE PHYS_FLASH_1 /* Flash Base for U-Boot */
#define PHYS_FLASH_SIZE 0x2000000 /* Flash size 32MB */
#define CFG_MAX_FLASH_SECT (PHYS_FLASH_SIZE/CFG_FLASH_SECT_SZ)
#define PHYS_FLASH_1 0x02000000 /* CS2 Base address */
#define CFG_FLASH_BASE PHYS_FLASH_1 /* Flash Base for U-Boot */
#define PHYS_FLASH_SIZE 0x2000000 /* Flash size 32MB */
#define CFG_MAX_FLASH_SECT (PHYS_FLASH_SIZE/CFG_FLASH_SECT_SZ)
-#define C
FG_ENV_SECT_SIZE
CFG_FLASH_SECT_SZ /* Env sector Size */
+#define C
ONFIG_ENV_SECT_SIZE
CFG_FLASH_SECT_SZ /* Env sector Size */
#endif
/*==============================*/
/* U-Boot general configuration */
#endif
/*==============================*/
/* U-Boot general configuration */
diff --git
a/include/configs/davinci_schmoogie.h
b/include/configs/davinci_schmoogie.h
index
f6234ec
..
016a897
100644
(file)
--- a/
include/configs/davinci_schmoogie.h
+++ b/
include/configs/davinci_schmoogie.h
@@
-82,15
+82,15
@@
#undef CONFIG_ENV_IS_IN_FLASH
#define CFG_NO_FLASH
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
#undef CONFIG_ENV_IS_IN_FLASH
#define CFG_NO_FLASH
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
-#define C
FG_ENV_SECT_SIZE
2048 /* Env sector Size */
-#define C
FG_ENV_SIZE
SZ_128K
+#define C
ONFIG_ENV_SECT_SIZE
2048 /* Env sector Size */
+#define C
ONFIG_ENV_SIZE
SZ_128K
#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */
#define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */
#define CFG_NAND_BASE 0x02000000
#define CFG_NAND_HW_ECC
#define CFG_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
#define NAND_MAX_CHIPS 1
#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */
#define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */
#define CFG_NAND_BASE 0x02000000
#define CFG_NAND_HW_ECC
#define CFG_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
#define NAND_MAX_CHIPS 1
-#define C
FG_ENV_OFFSET
0x0 /* Block 0--not used by bootcode */
+#define C
ONFIG_ENV_OFFSET
0x0 /* Block 0--not used by bootcode */
/*=====================*/
/* Board related stuff */
/*=====================*/
/*=====================*/
/* Board related stuff */
/*=====================*/
diff --git
a/include/configs/davinci_sffsdr.h
b/include/configs/davinci_sffsdr.h
index
b4f4b11
..
39fb2a5
100644
(file)
--- a/
include/configs/davinci_sffsdr.h
+++ b/
include/configs/davinci_sffsdr.h
@@
-78,15
+78,15
@@
#undef CONFIG_ENV_IS_IN_FLASH
#define CFG_NO_FLASH
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
#undef CONFIG_ENV_IS_IN_FLASH
#define CFG_NO_FLASH
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
-#define C
FG_ENV_SECT_SIZE
2048 /* Env sector Size */
-#define C
FG_ENV_SIZE
SZ_128K
+#define C
ONFIG_ENV_SECT_SIZE
2048 /* Env sector Size */
+#define C
ONFIG_ENV_SIZE
SZ_128K
#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */
#define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */
#define CFG_NAND_BASE 0x02000000
#define CFG_NAND_HW_ECC
#define CFG_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
#define NAND_MAX_CHIPS 1
#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */
#define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */
#define CFG_NAND_BASE 0x02000000
#define CFG_NAND_HW_ECC
#define CFG_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
#define NAND_MAX_CHIPS 1
-#define C
FG_ENV_OFFSET
0x0 /* Block 0--not used by bootcode */
+#define C
ONFIG_ENV_OFFSET
0x0 /* Block 0--not used by bootcode */
/* I2C switch definitions for PCA9543 chip */
#define CFG_I2C_PCA9543_ADDR 0x70
#define CFG_I2C_PCA9543_ADDR_LEN 0 /* Single register. */
/* I2C switch definitions for PCA9543 chip */
#define CFG_I2C_PCA9543_ADDR 0x70
#define CFG_I2C_PCA9543_ADDR_LEN 0 /* Single register. */
diff --git
a/include/configs/davinci_sonata.h
b/include/configs/davinci_sonata.h
index
cd781ed
..
bb42a54
100644
(file)
--- a/
include/configs/davinci_sonata.h
+++ b/
include/configs/davinci_sonata.h
@@
-115,15
+115,15
@@
#undef CONFIG_ENV_IS_IN_FLASH
#define CFG_NO_FLASH
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
#undef CONFIG_ENV_IS_IN_FLASH
#define CFG_NO_FLASH
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
-#define C
FG_ENV_SECT_SIZE
512 /* Env sector Size */
-#define C
FG_ENV_SIZE
SZ_16K
+#define C
ONFIG_ENV_SECT_SIZE
512 /* Env sector Size */
+#define C
ONFIG_ENV_SIZE
SZ_16K
#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */
#define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */
#define CFG_NAND_BASE 0x02000000
#define CFG_NAND_HW_ECC
#define CFG_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
#define NAND_MAX_CHIPS 1
#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */
#define CONFIG_SKIP_RELOCATE_UBOOT /* to a proper address, init done */
#define CFG_NAND_BASE 0x02000000
#define CFG_NAND_HW_ECC
#define CFG_MAX_NAND_DEVICE 1 /* Max number of NAND devices */
#define NAND_MAX_CHIPS 1
-#define C
FG_ENV_OFFSET
0x0 /* Block 0--not used by bootcode */
+#define C
ONFIG_ENV_OFFSET
0x0 /* Block 0--not used by bootcode */
#define DEF_BOOTM ""
#elif defined(CFG_USE_NOR)
#ifdef CONFIG_NOR_UART_BOOT
#define DEF_BOOTM ""
#elif defined(CFG_USE_NOR)
#ifdef CONFIG_NOR_UART_BOOT
@@
-139,12
+139,12
@@
#define CFG_FLASH_CFI
#define CFG_MAX_FLASH_BANKS 1 /* max number of flash banks */
#define CFG_FLASH_SECT_SZ 0x20000 /* 128KB sect size AMD Flash */
#define CFG_FLASH_CFI
#define CFG_MAX_FLASH_BANKS 1 /* max number of flash banks */
#define CFG_FLASH_SECT_SZ 0x20000 /* 128KB sect size AMD Flash */
-#define C
FG_ENV_OFFSET
(CFG_FLASH_SECT_SZ*2)
+#define C
ONFIG_ENV_OFFSET
(CFG_FLASH_SECT_SZ*2)
#define PHYS_FLASH_1 0x02000000 /* CS2 Base address */
#define CFG_FLASH_BASE PHYS_FLASH_1 /* Flash Base for U-Boot */
#define PHYS_FLASH_SIZE 0x2000000 /* Flash size 32MB */
#define CFG_MAX_FLASH_SECT (PHYS_FLASH_SIZE/CFG_FLASH_SECT_SZ)
#define PHYS_FLASH_1 0x02000000 /* CS2 Base address */
#define CFG_FLASH_BASE PHYS_FLASH_1 /* Flash Base for U-Boot */
#define PHYS_FLASH_SIZE 0x2000000 /* Flash size 32MB */
#define CFG_MAX_FLASH_SECT (PHYS_FLASH_SIZE/CFG_FLASH_SECT_SZ)
-#define C
FG_ENV_SECT_SIZE
CFG_FLASH_SECT_SZ /* Env sector Size */
+#define C
ONFIG_ENV_SECT_SIZE
CFG_FLASH_SECT_SZ /* Env sector Size */
#endif
/*==============================*/
/* U-Boot general configuration */
#endif
/*==============================*/
/* U-Boot general configuration */
diff --git
a/include/configs/dbau1x00.h
b/include/configs/dbau1x00.h
index
d422cce
..
d7e48d0
100644
(file)
--- a/
include/configs/dbau1x00.h
+++ b/
include/configs/dbau1x00.h
@@
-201,8
+201,8
@@
#define CONFIG_ENV_IS_NOWHERE 1
/* Address and size of Primary Environment Sector */
#define CONFIG_ENV_IS_NOWHERE 1
/* Address and size of Primary Environment Sector */
-#define C
FG_ENV_ADDR
0xB0030000
-#define C
FG_ENV_SIZE
0x10000
+#define C
ONFIG_ENV_ADDR
0xB0030000
+#define C
ONFIG_ENV_SIZE
0x10000
#define CONFIG_FLASH_16BIT
#define CONFIG_FLASH_16BIT
diff --git
a/include/configs/debris.h
b/include/configs/debris.h
index
68c9e54
..
3ea4fa6
100644
(file)
--- a/
include/configs/debris.h
+++ b/
include/configs/debris.h
@@
-254,9
+254,9
@@
#define CONFIG_ENV_IS_IN_NVRAM 1
#define CONFIG_ENV_OVERWRITE 1
#define CFG_NVRAM_ACCESS_ROUTINE 1
#define CONFIG_ENV_IS_IN_NVRAM 1
#define CONFIG_ENV_OVERWRITE 1
#define CFG_NVRAM_ACCESS_ROUTINE 1
-#define C
FG_ENV_ADDR
0xFF000000 /* right at the start of NVRAM */
-#define C
FG_ENV_SIZE
0x400 /* Size of the Environment - 8K */
-#define C
FG_ENV_OFFSET
0 /* starting right at the beginning */
+#define C
ONFIG_ENV_ADDR
0xFF000000 /* right at the start of NVRAM */
+#define C
ONFIG_ENV_SIZE
0x400 /* Size of the Environment - 8K */
+#define C
ONFIG_ENV_OFFSET
0 /* starting right at the beginning */
#define CFG_NVRAM_BASE_ADDR 0xff000000
#define CFG_NVRAM_BASE_ADDR 0xff000000
diff --git
a/include/configs/delta.h
b/include/configs/delta.h
index
5a5240e
..
4b75e15
100644
(file)
--- a/
include/configs/delta.h
+++ b/
include/configs/delta.h
@@
-43,7
+43,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 256*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 256*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-263,8
+263,8
@@
#define CFG_NO_FLASH 1
#define CONFIG_ENV_IS_IN_NAND 1
#define CFG_NO_FLASH 1
#define CONFIG_ENV_IS_IN_NAND 1
-#define C
FG_ENV_OFFSET
0x40000
-#define C
FG_ENV_OFFSET_REDUND
0x44000
-#define C
FG_ENV_SIZE
0x4000
+#define C
ONFIG_ENV_OFFSET
0x40000
+#define C
ONFIG_ENV_OFFSET_REDUND
0x44000
+#define C
ONFIG_ENV_SIZE
0x4000
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/dnp1110.h
b/include/configs/dnp1110.h
index
4adfeed
..
2249fc8
100644
(file)
--- a/
include/configs/dnp1110.h
+++ b/
include/configs/dnp1110.h
@@
-46,7
+46,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-156,7
+156,7
@@
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + 0xF80000) /* Addr of Environment Sector */
-#define C
FG_ENV_SIZE
0x20000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + 0xF80000) /* Addr of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x20000 /* Total Size of Environment Sector */
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/eXalion.h
b/include/configs/eXalion.h
index
deb20aa
..
ecf4c5e
100644
(file)
--- a/
include/configs/eXalion.h
+++ b/
include/configs/eXalion.h
@@
-136,10
+136,10
@@
#endif
#define CONFIG_ENV_IS_IN_FLASH 1
#endif
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SECT_SIZE
0x20000 /* Size of one Flash sector */
-#define C
FG_ENV_SIZE CFG_ENV_SECT_SIZE
/* Use one Flash sector for enviroment */
-#define C
FG_ENV_ADDR
0xFFFC0000
-#define C
FG_ENV_OFFSET
0 /* starting right at the beginning */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* Size of one Flash sector */
+#define C
ONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
/* Use one Flash sector for enviroment */
+#define C
ONFIG_ENV_ADDR
0xFFFC0000
+#define C
ONFIG_ENV_OFFSET
0 /* starting right at the beginning */
#define CFG_MALLOC_LEN (128 * 1024) /* Reserve 128 kB for malloc() */
#define CFG_MALLOC_LEN (128 * 1024) /* Reserve 128 kB for malloc() */
diff --git
a/include/configs/ebony.h
b/include/configs/ebony.h
index
2a3595a
..
3affdd2
100644
(file)
--- a/
include/configs/ebony.h
+++ b/
include/configs/ebony.h
@@
-98,9
+98,9
@@
#define CONFIG_RTC_DS174x 1 /* DS1743 RTC */
#ifdef CONFIG_ENV_IS_IN_NVRAM
#define CONFIG_RTC_DS174x 1 /* DS1743 RTC */
#ifdef CONFIG_ENV_IS_IN_NVRAM
-#define C
FG_ENV_SIZE
0x1000 /* Size of Environment vars */
-#define C
FG_ENV_ADDR
\
- (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
F
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
0x1000 /* Size of Environment vars */
+#define C
ONFIG_ENV_ADDR
\
+ (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
ONFI
G_ENV_SIZE)
#endif /* CONFIG_ENV_IS_IN_NVRAM */
/*-----------------------------------------------------------------------
#endif /* CONFIG_ENV_IS_IN_NVRAM */
/*-----------------------------------------------------------------------
@@
-119,13
+119,13
@@
#define CFG_FLASH_WORD_SIZE unsigned char
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_WORD_SIZE unsigned char
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
-#define C
FG_ENV_ADDR (CFG_MONITOR_BASE-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
diff --git
a/include/configs/ep7312.h
b/include/configs/ep7312.h
index
367e667
..
60c87bd
100644
(file)
--- a/
include/configs/ep7312.h
+++ b/
include/configs/ep7312.h
@@
-41,7
+41,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-150,8
+150,8
@@
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + 0x20000) /* Addr of Environment Sector */
-#define C
FG_ENV_SIZE
0x20000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + 0x20000) /* Addr of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x20000 /* Total Size of Environment Sector */
/*
* JFFS2 partitions
/*
* JFFS2 partitions
diff --git
a/include/configs/ep8248.h
b/include/configs/ep8248.h
index
54484ad
..
d8f1aaf
100644
(file)
--- a/
include/configs/ep8248.h
+++ b/
include/configs/ep8248.h
@@
-217,8
+217,8
@@
#define CONFIG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x20000
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#endif /* CONFIG_ENV_IS_IN_FLASH */
#define CFG_DEFAULT_IMMR 0x00010000
#endif /* CONFIG_ENV_IS_IN_FLASH */
#define CFG_DEFAULT_IMMR 0x00010000
diff --git
a/include/configs/ep8260.h
b/include/configs/ep8260.h
index
0911f8c
..
9a602c3
100644
(file)
--- a/
include/configs/ep8260.h
+++ b/
include/configs/ep8260.h
@@
-252,7
+252,7
@@
* put in the same sector as U-Boot, and changing variables
* will erase U-Boot temporarily
*/
* put in the same sector as U-Boot, and changing variables
* will erase U-Boot temporarily
*/
-#define C
F
G_ENV_IN_OWN_SECT
+#define C
ONFI
G_ENV_IN_OWN_SECT
/* Define to allow the user to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
/* Define to allow the user to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
@@
-476,18
+476,18
@@
#ifndef CFG_RAMBOOT
# define CONFIG_ENV_IS_IN_FLASH 1
#ifndef CFG_RAMBOOT
# define CONFIG_ENV_IS_IN_FLASH 1
-# ifdef C
F
G_ENV_IN_OWN_SECT
-# define C
F
G_ENV_ADDR (CFG_MONITOR_BASE + 0x40000)
-# define C
F
G_ENV_SECT_SIZE 0x40000
+# ifdef C
ONFI
G_ENV_IN_OWN_SECT
+# define C
ONFI
G_ENV_ADDR (CFG_MONITOR_BASE + 0x40000)
+# define C
ONFI
G_ENV_SECT_SIZE 0x40000
# else
# else
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CF
G_ENV_SECT_SIZE)
-# define C
F
G_ENV_SIZE 0x1000 /* Total Size of Environment Sector */
-# define C
F
G_ENV_SECT_SIZE 0x10000 /* see README - env sect real size */
-# endif /* C
F
G_ENV_IN_OWN_SECT */
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CONFI
G_ENV_SECT_SIZE)
+# define C
ONFI
G_ENV_SIZE 0x1000 /* Total Size of Environment Sector */
+# define C
ONFI
G_ENV_SECT_SIZE 0x10000 /* see README - env sect real size */
+# endif /* C
ONFI
G_ENV_IN_OWN_SECT */
#else
# define CONFIG_ENV_IS_IN_NVRAM 1
#else
# define CONFIG_ENV_IS_IN_NVRAM 1
-# define C
F
G_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
-# define C
F
G_ENV_SIZE 0x200
+# define C
ONFI
G_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
+# define C
ONFI
G_ENV_SIZE 0x200
#endif /* CFG_RAMBOOT */
/*-----------------------------------------------------------------------
#endif /* CFG_RAMBOOT */
/*-----------------------------------------------------------------------
diff --git
a/include/configs/ep82xxm.h
b/include/configs/ep82xxm.h
index
17c8496
..
a501900
100644
(file)
--- a/
include/configs/ep82xxm.h
+++ b/
include/configs/ep82xxm.h
@@
-144,7
+144,7
@@
#define CONFIG_GATEWAYIP 10.0.0.1
#define CONFIG_NETMASK 255.255.255.0
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_GATEWAYIP 10.0.0.1
#define CONFIG_NETMASK 255.255.255.0
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
-#define C
FG_ENV_IN_OWN_SECT
1
+#define C
ONFIG_ENV_IN_OWN_SECT
1
#define CONFIG_AUTO_COMPLETE 1
#define CONFIG_EXTRA_ENV_SETTINGS "ethprime=FCC3 ETHERNET"
#define CONFIG_AUTO_COMPLETE 1
#define CONFIG_EXTRA_ENV_SETTINGS "ethprime=FCC3 ETHERNET"
@@
-208,8
+208,8
@@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector in flinfo */
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector in flinfo */
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x20000
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
@@
-224,8
+224,8
@@
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
#ifdef CONFIG_ENV_IS_IN_EEPROM
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
#ifdef CONFIG_ENV_IS_IN_EEPROM
-#define C
FG_ENV_SIZE
0x200 /* Size of Environment vars */
-#define C
FG_ENV_OFFSET
0x0
+#define C
ONFIG_ENV_SIZE
0x200 /* Size of Environment vars */
+#define C
ONFIG_ENV_OFFSET
0x0
#endif /* CONFIG_ENV_IS_IN_EEPROM */
/* RTC Configuration */
#endif /* CONFIG_ENV_IS_IN_EEPROM */
/* RTC Configuration */
diff --git
a/include/configs/evb4510.h
b/include/configs/evb4510.h
index
35a020b
..
63ca2a5
100644
(file)
--- a/
include/configs/evb4510.h
+++ b/
include/configs/evb4510.h
@@
-51,7
+51,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128
/*
#define CFG_GBL_DATA_SIZE 128
/*
@@
-174,8
+174,8
@@
#define CONFIG_ENV_IS_IN_FLASH
#undef CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_IS_IN_FLASH
#undef CONFIG_ENV_IS_NOWHERE
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x20000) /* environment start address */
-#define C
FG_ENV_SECT_SIZE
0x10000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SIZE
0x1000 /* max size for environment */
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x20000) /* environment start address */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x1000 /* max size for environment */
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/favr-32-ezkit.h
b/include/configs/favr-32-ezkit.h
index
ce19b1f
..
e445a13
100644
(file)
--- a/
include/configs/favr-32-ezkit.h
+++ b/
include/configs/favr-32-ezkit.h
@@
-175,8
+175,8
@@
#define CFG_SDRAM_BASE EBI_SDRAM_BASE
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_SDRAM_BASE EBI_SDRAM_BASE
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
65536
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
65536
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFI
G_ENV_SIZE)
#define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
#define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
diff --git
a/include/configs/gcplus.h
b/include/configs/gcplus.h
index
31e99f3
..
5863f83
100644
(file)
--- a/
include/configs/gcplus.h
+++ b/
include/configs/gcplus.h
@@
-57,7
+57,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size rsrvd for initial data */
#define CFG_GBL_DATA_SIZE 128 /* size rsrvd for initial data */
@@
-179,7
+179,7
@@
#endif
#define CONFIG_ENV_IS_IN_FLASH 1
#endif
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE) /* Addr of Environment Sector */
-#define C
FG_ENV_SIZE
PHYS_FLASH_SECT_SIZE
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE) /* Addr of Environment Sector */
+#define C
ONFIG_ENV_SIZE
PHYS_FLASH_SECT_SIZE
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/gr_cpci_ax2000.h
b/include/configs/gr_cpci_ax2000.h
index
e363d9a
..
5a7a580
100644
(file)
--- a/
include/configs/gr_cpci_ax2000.h
+++ b/
include/configs/gr_cpci_ax2000.h
@@
-220,10
+220,10
@@
*/
/*#define CONFIG_ENV_IS_NOWHERE 1*/
#define CONFIG_ENV_IS_IN_FLASH 1
*/
/*#define CONFIG_ENV_IS_NOWHERE 1*/
#define CONFIG_ENV_IS_IN_FLASH 1
-/* C
F
G_ENV_ADDR need to be at sector boundary */
-#define C
FG_ENV_SIZE
0x8000
-#define C
FG_ENV_SECT_SIZE
0x20000
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE+CFG_FLASH_SIZE-CF
G_ENV_SECT_SIZE)
+/* C
ONFI
G_ENV_ADDR need to be at sector boundary */
+#define C
ONFIG_ENV_SIZE
0x8000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE+CFG_FLASH_SIZE-CONFI
G_ENV_SECT_SIZE)
#define CONFIG_ENV_OVERWRITE 1
/*
#define CONFIG_ENV_OVERWRITE 1
/*
diff --git
a/include/configs/gr_ep2s60.h
b/include/configs/gr_ep2s60.h
index
7f83674
..
3133c0d
100644
(file)
--- a/
include/configs/gr_ep2s60.h
+++ b/
include/configs/gr_ep2s60.h
@@
-208,10
+208,10
@@
*/
/*#define CONFIG_ENV_IS_NOWHERE 1*/
#define CONFIG_ENV_IS_IN_FLASH 1
*/
/*#define CONFIG_ENV_IS_NOWHERE 1*/
#define CONFIG_ENV_IS_IN_FLASH 1
-/* C
F
G_ENV_ADDR need to be at sector boundary */
-#define C
FG_ENV_SIZE
0x8000
-#define C
FG_ENV_SECT_SIZE
0x20000
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE+CFG_FLASH_SIZE-CF
G_ENV_SECT_SIZE)
+/* C
ONFI
G_ENV_ADDR need to be at sector boundary */
+#define C
ONFIG_ENV_SIZE
0x8000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE+CFG_FLASH_SIZE-CONFI
G_ENV_SECT_SIZE)
#define CONFIG_ENV_OVERWRITE 1
/*
#define CONFIG_ENV_OVERWRITE 1
/*
diff --git
a/include/configs/gr_xc3s_1500.h
b/include/configs/gr_xc3s_1500.h
index
a6e34d0
..
316b003
100644
(file)
--- a/
include/configs/gr_xc3s_1500.h
+++ b/
include/configs/gr_xc3s_1500.h
@@
-184,10
+184,10
@@
*/
/*#define CONFIG_ENV_IS_NOWHERE 1*/
#define CONFIG_ENV_IS_IN_FLASH 1
*/
/*#define CONFIG_ENV_IS_NOWHERE 1*/
#define CONFIG_ENV_IS_IN_FLASH 1
-/* C
F
G_ENV_ADDR need to be at sector boundary */
-#define C
FG_ENV_SIZE
0x8000
-#define C
FG_ENV_SECT_SIZE
0x20000
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE+CFG_FLASH_SIZE-CF
G_ENV_SECT_SIZE)
+/* C
ONFI
G_ENV_ADDR need to be at sector boundary */
+#define C
ONFIG_ENV_SIZE
0x8000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE+CFG_FLASH_SIZE-CONFI
G_ENV_SECT_SIZE)
#define CONFIG_ENV_OVERWRITE 1
/*
#define CONFIG_ENV_OVERWRITE 1
/*
diff --git
a/include/configs/grsim.h
b/include/configs/grsim.h
index
2a8226a
..
a5ef6e1
100644
(file)
--- a/
include/configs/grsim.h
+++ b/
include/configs/grsim.h
@@
-181,9
+181,9
@@
#define CFG_NO_FLASH 1
#define CFG_FLASH_BASE 0x00000000
#define CFG_FLASH_SIZE 0x00800000
#define CFG_NO_FLASH 1
#define CFG_FLASH_BASE 0x00000000
#define CFG_FLASH_SIZE 0x00800000
-#define C
FG_ENV_SIZE
0x8000
+#define C
ONFIG_ENV_SIZE
0x8000
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE+CFG_FLASH_SIZE-CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE+CFG_FLASH_SIZE-CONFI
G_ENV_SIZE)
#define PHYS_FLASH_SECT_SIZE 0x00020000 /* 128 KB sectors */
#define CFG_MAX_FLASH_SECT 64 /* max num of sects on one chip */
#define PHYS_FLASH_SECT_SIZE 0x00020000 /* 128 KB sectors */
#define CFG_MAX_FLASH_SECT 64 /* max num of sects on one chip */
@@
-211,8
+211,8
@@
*/
#define CONFIG_ENV_IS_NOWHERE 1
/*#define CONFIG_ENV_IS_IN_FLASH*/
*/
#define CONFIG_ENV_IS_NOWHERE 1
/*#define CONFIG_ENV_IS_IN_FLASH*/
-/*#define C
FG_ENV_SIZE
0x8000*/
-#define C
FG_ENV_SECT_SIZE
0x40000
+/*#define C
ONFIG_ENV_SIZE
0x8000*/
+#define C
ONFIG_ENV_SECT_SIZE
0x40000
#define CONFIG_ENV_OVERWRITE 1
/*
#define CONFIG_ENV_OVERWRITE 1
/*
diff --git
a/include/configs/grsim_leon2.h
b/include/configs/grsim_leon2.h
index
3cfeb20
..
a88ddb3
100644
(file)
--- a/
include/configs/grsim_leon2.h
+++ b/
include/configs/grsim_leon2.h
@@
-178,9
+178,9
@@
#define CFG_NO_FLASH 1
#define CFG_FLASH_BASE 0x00000000
#define CFG_FLASH_SIZE 0x00800000
#define CFG_NO_FLASH 1
#define CFG_FLASH_BASE 0x00000000
#define CFG_FLASH_SIZE 0x00800000
-#define C
FG_ENV_SIZE
0x8000
+#define C
ONFIG_ENV_SIZE
0x8000
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE+CFG_FLASH_SIZE-CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE+CFG_FLASH_SIZE-CONFI
G_ENV_SIZE)
#define PHYS_FLASH_SECT_SIZE 0x00020000 /* 128 KB sectors */
#define CFG_MAX_FLASH_SECT 64 /* max num of sects on one chip */
#define PHYS_FLASH_SECT_SIZE 0x00020000 /* 128 KB sectors */
#define CFG_MAX_FLASH_SECT 64 /* max num of sects on one chip */
@@
-208,8
+208,8
@@
*/
#define CONFIG_ENV_IS_NOWHERE 1
/*#define CONFIG_ENV_IS_IN_FLASH*/
*/
#define CONFIG_ENV_IS_NOWHERE 1
/*#define CONFIG_ENV_IS_IN_FLASH*/
-/*#define C
FG_ENV_SIZE
0x8000*/
-#define C
FG_ENV_SECT_SIZE
0x40000
+/*#define C
ONFIG_ENV_SIZE
0x8000*/
+#define C
ONFIG_ENV_SECT_SIZE
0x40000
#define CONFIG_ENV_OVERWRITE 1
/*
#define CONFIG_ENV_OVERWRITE 1
/*
diff --git
a/include/configs/gth2.h
b/include/configs/gth2.h
index
ad8bb59
..
aaf1e4a
100644
(file)
--- a/
include/configs/gth2.h
+++ b/
include/configs/gth2.h
@@
-156,8
+156,8
@@
#define CONFIG_ENV_IS_NOWHERE 1
/* Address and size of Primary Environment Sector */
#define CONFIG_ENV_IS_NOWHERE 1
/* Address and size of Primary Environment Sector */
-#define C
FG_ENV_ADDR
0xB0030000
-#define C
FG_ENV_SIZE
0x10000
+#define C
ONFIG_ENV_ADDR
0xB0030000
+#define C
ONFIG_ENV_SIZE
0x10000
#define CONFIG_FLASH_16BIT
#define CONFIG_FLASH_16BIT
diff --git
a/include/configs/gw8260.h
b/include/configs/gw8260.h
index
19641b7
..
e187764
100644
(file)
--- a/
include/configs/gw8260.h
+++ b/
include/configs/gw8260.h
@@
-139,7
+139,7
@@
* Monitor Stack Buffer (0x80)
* 0x00F5 FFB0 Board Info Data
* 0x00F6 0000 Malloc Arena
* Monitor Stack Buffer (0x80)
* 0x00F5 FFB0 Board Info Data
* 0x00F6 0000 Malloc Arena
- * : C
F
G_ENV_SECT_SIZE, 256k
+ * : C
ONFI
G_ENV_SECT_SIZE, 256k
* : CFG_MALLOC_LEN, 128k
* 0x00FC 0000 RAM Copy of Monitor Code
* : CFG_MONITOR_LEN, 256k
* : CFG_MALLOC_LEN, 128k
* 0x00FC 0000 RAM Copy of Monitor Code
* : CFG_MONITOR_LEN, 256k
@@
-162,7
+162,7
@@
* Monitor Stack Buffer (0x80)
* 0x03F5 FFB0 Board Info Data
* 0x03F6 0000 Malloc Arena
* Monitor Stack Buffer (0x80)
* 0x03F5 FFB0 Board Info Data
* 0x03F6 0000 Malloc Arena
- * : C
F
G_ENV_SECT_SIZE, 256k
+ * : C
ONFI
G_ENV_SECT_SIZE, 256k
* : CFG_MALLOC_LEN, 128k
* 0x03FC 0000 RAM Copy of Monitor Code
* : CFG_MONITOR_LEN, 256k
* : CFG_MALLOC_LEN, 128k
* 0x03FC 0000 RAM Copy of Monitor Code
* : CFG_MONITOR_LEN, 256k
@@
-258,7
+258,7
@@
* put in the same sector as U-Boot, and changing variables
* will erase U-Boot temporarily
*/
* put in the same sector as U-Boot, and changing variables
* will erase U-Boot temporarily
*/
-#define C
F
G_ENV_IN_OWN_SECT
+#define C
ONFI
G_ENV_IN_OWN_SECT
/* Define to allow the user to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
/* Define to allow the user to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
@@
-374,7
+374,7
@@
#define CFG_MEM_END_USAGE ( CFG_MONITOR_LEN \
+ CFG_MALLOC_LEN \
#define CFG_MEM_END_USAGE ( CFG_MONITOR_LEN \
+ CFG_MALLOC_LEN \
- + C
F
G_ENV_SECT_SIZE \
+ + C
ONFI
G_ENV_SECT_SIZE \
+ CFG_STACK_USAGE )
#define CFG_MEMTEST_END ( CFG_SDRAM_SIZE * 1024 * 1024 \
+ CFG_STACK_USAGE )
#define CFG_MEMTEST_END ( CFG_SDRAM_SIZE * 1024 * 1024 \
@@
-465,14
+465,14
@@
#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
-#ifdef C
F
G_ENV_IN_OWN_SECT
-# define C
F
G_ENV_ADDR (CFG_MONITOR_BASE + (256 * 1024))
-# define C
F
G_ENV_SECT_SIZE (256 * 1024)
+#ifdef C
ONFI
G_ENV_IN_OWN_SECT
+# define C
ONFI
G_ENV_ADDR (CFG_MONITOR_BASE + (256 * 1024))
+# define C
ONFI
G_ENV_SECT_SIZE (256 * 1024)
#else
#else
-# define C
F
G_ENV_SIZE (16 * 1024)/* Size of Environment Sector */
-# define C
FG_ENV_ADD ((CFG_MONITOR_BASE + CFG_MONITOR_LEN) - CF
G_ENV_SIZE)
-# define C
F
G_ENV_SECT_SIZE (256 * 1024)/* see README - env sect real size */
-#endif /* C
F
G_ENV_IN_OWN_SECT */
+# define C
ONFI
G_ENV_SIZE (16 * 1024)/* Size of Environment Sector */
+# define C
ONFIG_ENV_ADD ((CFG_MONITOR_BASE + CFG_MONITOR_LEN) - CONFI
G_ENV_SIZE)
+# define C
ONFI
G_ENV_SECT_SIZE (256 * 1024)/* see README - env sect real size */
+#endif /* C
ONFI
G_ENV_IN_OWN_SECT */
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/hammerhead.h
b/include/configs/hammerhead.h
index
68bd4c8
..
5426c7a
100644
(file)
--- a/
include/configs/hammerhead.h
+++ b/
include/configs/hammerhead.h
@@
-144,8
+144,8
@@
#define CFG_SDRAM_BASE 0x10000000
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_SDRAM_BASE 0x10000000
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
65536
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
65536
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFI
G_ENV_SIZE)
#define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
#define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
diff --git
a/include/configs/hcu4.h
b/include/configs/hcu4.h
index
b98883e
..
b51ea4e
100644
(file)
--- a/
include/configs/hcu4.h
+++ b/
include/configs/hcu4.h
@@
-128,19
+128,19
@@
#ifdef CONFIG_ENV_IS_IN_EEPROM
/* Put the environment after the SDRAM configuration */
#define PROM_SIZE 2048
#ifdef CONFIG_ENV_IS_IN_EEPROM
/* Put the environment after the SDRAM configuration */
#define PROM_SIZE 2048
-#define C
FG_ENV_OFFSET
512
-#define C
FG_ENV_SIZE (PROM_SIZE-CF
G_ENV_OFFSET)
+#define C
ONFIG_ENV_OFFSET
512
+#define C
ONFIG_ENV_SIZE (PROM_SIZE-CONFI
G_ENV_OFFSET)
#endif
#ifdef CONFIG_ENV_IS_IN_FLASH
/* Put the environment in Flash */
#endif
#ifdef CONFIG_ENV_IS_IN_FLASH
/* Put the environment in Flash */
-#define C
FG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
-#define C
FG_ENV_ADDR ((-CFG_MONITOR_LEN)-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
8*1024 /* 8 KB Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR ((-CFG_MONITOR_LEN)-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
8*1024 /* 8 KB Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/hcu5.h
b/include/configs/hcu5.h
index
91c5f22
..
1874ff2
100644
(file)
--- a/
include/configs/hcu5.h
+++ b/
include/configs/hcu5.h
@@
-115,19
+115,19
@@
/* Put the environment after the SDRAM and bootstrap configuration */
#define PROM_SIZE 2048
#define CFG_BOOSTRAP_OPTION_OFFSET 512
/* Put the environment after the SDRAM and bootstrap configuration */
#define PROM_SIZE 2048
#define CFG_BOOSTRAP_OPTION_OFFSET 512
-#define C
FG_ENV_OFFSET
(CFG_BOOSTRAP_OPTION_OFFSET + 0x10)
-#define C
FG_ENV_SIZE (PROM_SIZE-CF
G_ENV_OFFSET)
+#define C
ONFIG_ENV_OFFSET
(CFG_BOOSTRAP_OPTION_OFFSET + 0x10)
+#define C
ONFIG_ENV_SIZE (PROM_SIZE-CONFI
G_ENV_OFFSET)
#endif
#ifdef CONFIG_ENV_IS_IN_FLASH
/* Put the environment in Flash */
#endif
#ifdef CONFIG_ENV_IS_IN_FLASH
/* Put the environment in Flash */
-#define C
FG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
-#define C
FG_ENV_ADDR ((-CFG_MONITOR_LEN)-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
8*1024 /* 8 KB Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR ((-CFG_MONITOR_LEN)-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
8*1024 /* 8 KB Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif
#endif
diff --git
a/include/configs/hermes.h
b/include/configs/hermes.h
index
1ecb4b5
..
e1a0846
100644
(file)
--- a/
include/configs/hermes.h
+++ b/
include/configs/hermes.h
@@
-156,8
+156,8
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x4000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x4000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
/*-----------------------------------------------------------------------
* Cache Configuration
*/
/*-----------------------------------------------------------------------
* Cache Configuration
*/
diff --git
a/include/configs/hmi1001.h
b/include/configs/hmi1001.h
index
4d55761
..
e816b6d
100644
(file)
--- a/
include/configs/hmi1001.h
+++ b/
include/configs/hmi1001.h
@@
-149,7
+149,7
@@
#define CFG_FLASH_SIZE 0x00800000 /* 8 MByte */
#define CFG_MAX_FLASH_SECT 67 /* max num of sects on one chip */
#define CFG_FLASH_SIZE 0x00800000 /* 8 MByte */
#define CFG_MAX_FLASH_SECT 67 /* max num of sects on one chip */
-#define C
FG_ENV_ADDR
(TEXT_BASE+0x40000) /* second sector */
+#define C
ONFIG_ENV_ADDR
(TEXT_BASE+0x40000) /* second sector */
#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks
(= chip selects) */
#define CFG_FLASH_ERASE_TOUT 240000 /* Flash Erase Timeout (in ms) */
#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks
(= chip selects) */
#define CFG_FLASH_ERASE_TOUT 240000 /* Flash Erase Timeout (in ms) */
@@
-164,10
+164,10
@@
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x4000
-#define C
FG_ENV_SECT_SIZE
0x20000
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
0x4000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*
* Memory map
/*
* Memory map
diff --git
a/include/configs/hymod.h
b/include/configs/hymod.h
index
fd0bab1
..
9c704c6
100644
(file)
--- a/
include/configs/hymod.h
+++ b/
include/configs/hymod.h
@@
-404,9
+404,9
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x40000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x40000 /* see README - env sect real size */
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CF
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x40000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* see README - env sect real size */
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CONFI
G_ENV_SECT_SIZE)
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
/*-----------------------------------------------------------------------
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
/*-----------------------------------------------------------------------
diff --git
a/include/configs/idmr.h
b/include/configs/idmr.h
index
43453b7
..
a1f1517
100644
(file)
--- a/
include/configs/idmr.h
+++ b/
include/configs/idmr.h
@@
-115,13
+115,13
@@
* Configuration for environment, which occupies third sector in flash.
*/
#ifndef CONFIG_MONITOR_IS_IN_RAM
* Configuration for environment, which occupies third sector in flash.
*/
#ifndef CONFIG_MONITOR_IS_IN_RAM
-#define C
FG_ENV_ADDR
0xff820000
-#define C
FG_ENV_SECT_SIZE
0x10000
-#define C
FG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
0xff820000
+#define C
ONFIG_ENV_SECT_SIZE
0x10000
+#define C
ONFIG_ENV_SIZE
0x2000
#define CONFIG_ENV_IS_IN_FLASH
#else /* CONFIG_MONITOR_IS_IN_RAM */
#define CONFIG_ENV_IS_IN_FLASH
#else /* CONFIG_MONITOR_IS_IN_RAM */
-#define C
FG_ENV_OFFSET
0x4000
-#define C
FG_ENV_SECT_SIZE
0x2000
+#define C
ONFIG_ENV_OFFSET
0x4000
+#define C
ONFIG_ENV_SECT_SIZE
0x2000
#define CONFIG_ENV_IS_IN_FLASH
#endif /* !CONFIG_MONITOR_IS_IN_RAM */
#define CONFIG_ENV_IS_IN_FLASH
#endif /* !CONFIG_MONITOR_IS_IN_RAM */
diff --git
a/include/configs/impa7.h
b/include/configs/impa7.h
index
7eb6921
..
52eb888
100644
(file)
--- a/
include/configs/impa7.h
+++ b/
include/configs/impa7.h
@@
-41,7
+41,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-152,8
+152,8
@@
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/*
* JFFS2 partitions
/*
* JFFS2 partitions
diff --git
a/include/configs/imx31_litekit.h
b/include/configs/imx31_litekit.h
index
1660b05
..
b698136
100644
(file)
--- a/
include/configs/imx31_litekit.h
+++ b/
include/configs/imx31_litekit.h
@@
-53,7
+53,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128 * 1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128 * 1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-149,10
+149,10
@@
#define CFG_MAX_FLASH_SECT 128 /* max number of sectors on one chip */
#define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at beginning of flash */
#define CFG_MAX_FLASH_SECT 128 /* max number of sectors on one chip */
#define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at beginning of flash */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x001f0000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x001f0000)
#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SECT_SIZE
(64 * 1024)
-#define C
FG_ENV_SIZE
(64 * 1024)
+#define C
ONFIG_ENV_SECT_SIZE
(64 * 1024)
+#define C
ONFIG_ENV_SIZE
(64 * 1024)
/*-----------------------------------------------------------------------
* CFI FLASH driver setup
/*-----------------------------------------------------------------------
* CFI FLASH driver setup
diff --git
a/include/configs/imx31_phycore.h
b/include/configs/imx31_phycore.h
index
18ff450
..
bf2a8dd
100644
(file)
--- a/
include/configs/imx31_phycore.h
+++ b/
include/configs/imx31_phycore.h
@@
-51,7
+51,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128 * 1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128 * 1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-153,8
+153,8
@@
#define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at beginning of flash */
#define CONFIG_ENV_IS_IN_EEPROM 1
#define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at beginning of flash */
#define CONFIG_ENV_IS_IN_EEPROM 1
-#define C
FG_ENV_OFFSET
0x00 /* environment starts here */
-#define C
FG_ENV_SIZE
4096
+#define C
ONFIG_ENV_OFFSET
0x00 /* environment starts here */
+#define C
ONFIG_ENV_SIZE
4096
#define CFG_I2C_EEPROM_ADDR 0x52
#define CFG_EEPROM_PAGE_WRITE_BITS 5 /* 5 bits = 32 octets */
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* between stop and start */
#define CFG_I2C_EEPROM_ADDR 0x52
#define CFG_EEPROM_PAGE_WRITE_BITS 5 /* 5 bits = 32 octets */
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* between stop and start */
diff --git
a/include/configs/incaip.h
b/include/configs/incaip.h
index
3d98974
..
5368ac8
100644
(file)
--- a/
include/configs/incaip.h
+++ b/
include/configs/incaip.h
@@
-153,8
+153,8
@@
#define CONFIG_ENV_IS_IN_FLASH 1
/* Address and size of Primary Environment Sector */
#define CONFIG_ENV_IS_IN_FLASH 1
/* Address and size of Primary Environment Sector */
-#define C
FG_ENV_ADDR
0xB0030000
-#define C
FG_ENV_SIZE
0x10000
+#define C
ONFIG_ENV_ADDR
0xB0030000
+#define C
ONFIG_ENV_SIZE
0x10000
#define CONFIG_FLASH_16BIT
#define CONFIG_FLASH_16BIT
diff --git
a/include/configs/inka4x0.h
b/include/configs/inka4x0.h
index
528f276
..
32d4871
100644
(file)
--- a/
include/configs/inka4x0.h
+++ b/
include/configs/inka4x0.h
@@
-172,9
+172,9
@@
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x4000)
-#define C
FG_ENV_SIZE
0x2000
-#define C
FG_ENV_SECT_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x4000)
+#define C
ONFIG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_SECT_SIZE
0x2000
#define CONFIG_ENV_OVERWRITE 1
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CONFIG_ENV_OVERWRITE 1
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git
a/include/configs/innokom.h
b/include/configs/innokom.h
index
1435d04
..
f9535c9
100644
(file)
--- a/
include/configs/innokom.h
+++ b/
include/configs/innokom.h
@@
-142,8
+142,8
@@
#define CONFIG_ENV_IS_IN_EEPROM 1
#define CONFIG_ENV_IS_IN_EEPROM 1
-#define C
FG_ENV_OFFSET
0x00 /* environment starts here */
-#define C
FG_ENV_SIZE
1024 /* 1 KiB */
+#define C
ONFIG_ENV_OFFSET
0x00 /* environment starts here */
+#define C
ONFIG_ENV_SIZE
1024 /* 1 KiB */
#define CFG_I2C_EEPROM_ADDR 0x50 /* A0 = 0 (hardwired) */
#define CFG_EEPROM_PAGE_WRITE_BITS 5 /* 5 bits = 32 octets */
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 15 /* between stop and start */
#define CFG_I2C_EEPROM_ADDR 0x50 /* A0 = 0 (hardwired) */
#define CFG_EEPROM_PAGE_WRITE_BITS 5 /* 5 bits = 32 octets */
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 15 /* between stop and start */
diff --git
a/include/configs/integratorap.h
b/include/configs/integratorap.h
index
dd070be
..
f951a01
100644
(file)
--- a/
include/configs/integratorap.h
+++ b/
include/configs/integratorap.h
@@
-52,7
+52,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-135,7
+135,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_MAX_FLASH_SECT 128
#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_MAX_FLASH_SECT 128
-#define C
FG_ENV_SIZE
32768
+#define C
ONFIG_ENV_SIZE
32768
#define PHYS_FLASH_1 (CFG_FLASH_BASE)
#define PHYS_FLASH_1 (CFG_FLASH_BASE)
diff --git
a/include/configs/integratorcp.h
b/include/configs/integratorcp.h
index
d66ec3a
..
6dbe4b3
100644
(file)
--- a/
include/configs/integratorcp.h
+++ b/
include/configs/integratorcp.h
@@
-47,7
+47,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-169,29
+169,29
@@
SIB at Block62 End Block62 address 0x24f80000
* Move up the U-Boot & monitor area if more flash is fitted.
* If this U-Boot is to be run on Integrators with varying flash sizes,
* drivers/mtd/cfi_flash.c::flash_init() can read the Integrator CP_FLASHPROG
* Move up the U-Boot & monitor area if more flash is fitted.
* If this U-Boot is to be run on Integrators with varying flash sizes,
* drivers/mtd/cfi_flash.c::flash_init() can read the Integrator CP_FLASHPROG
- * register and dynamically assign C
F
G_ENV_ADDR & CFG_MONITOR_BASE
+ * register and dynamically assign C
ONFI
G_ENV_ADDR & CFG_MONITOR_BASE
* - CFG_MONITOR_BASE is set to indicate that the environment is not
* embedded in the boot monitor(s) area
*/
#if ( PHYS_FLASH_SIZE == 0x04000000 )
* - CFG_MONITOR_BASE is set to indicate that the environment is not
* embedded in the boot monitor(s) area
*/
#if ( PHYS_FLASH_SIZE == 0x04000000 )
-#define C
FG_ENV_ADDR
0x27F00000
+#define C
ONFIG_ENV_ADDR
0x27F00000
#define CFG_MONITOR_BASE 0x27F40000
#elif (PHYS_FLASH_SIZE == 0x02000000 )
#define CFG_MONITOR_BASE 0x27F40000
#elif (PHYS_FLASH_SIZE == 0x02000000 )
-#define C
FG_ENV_ADDR
0x25F00000
+#define C
ONFIG_ENV_ADDR
0x25F00000
#define CFG_MONITOR_BASE 0x25F40000
#else
#define CFG_MONITOR_BASE 0x25F40000
#else
-#define C
FG_ENV_ADDR
0x24F00000
+#define C
ONFIG_ENV_ADDR
0x24F00000
#define CFG_MONITOR_BASE 0x27F40000
#endif
#define CFG_MONITOR_BASE 0x27F40000
#endif
-#define C
FG_ENV_SECT_SIZE
0x40000 /* 256KB */
-#define C
FG_ENV_SIZE
8192 /* 8KB */
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* 256KB */
+#define C
ONFIG_ENV_SIZE
8192 /* 8KB */
/*-----------------------------------------------------------------------
* CP control registers
*/
/*-----------------------------------------------------------------------
* CP control registers
*/
diff --git
a/include/configs/ixdp425.h
b/include/configs/ixdp425.h
index
6559429
..
b933475
100644
(file)
--- a/
include/configs/ixdp425.h
+++ b/
include/configs/ixdp425.h
@@
-45,7
+45,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/* allow to overwrite serial and ethaddr */
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/* allow to overwrite serial and ethaddr */
@@
-193,8
+193,8
@@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
-#define C
FG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + 0x20000)
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + 0x20000)
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/ixdpg425.h
b/include/configs/ixdpg425.h
index
484c2d9
..
241728d
100644
(file)
--- a/
include/configs/ixdpg425.h
+++ b/
include/configs/ixdpg425.h
@@
-225,13
+225,13
@@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
-#define C
FG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + 0x40000)
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + 0x40000)
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*
* GPIO settings
/*
* GPIO settings
diff --git
a/include/configs/jupiter.h
b/include/configs/jupiter.h
index
ce90d7f
..
5d8e3a6
100644
(file)
--- a/
include/configs/jupiter.h
+++ b/
include/configs/jupiter.h
@@
-184,7
+184,7
@@
#define CFG_MAX_FLASH_SECT 128 /* max num of sects on one chip */
#define CFG_MAX_FLASH_SECT 128 /* max num of sects on one chip */
-#define C
FG_ENV_ADDR
(TEXT_BASE + 0x40000) /* third sector */
+#define C
ONFIG_ENV_ADDR
(TEXT_BASE + 0x40000) /* third sector */
#define CFG_FLASH_ERASE_TOUT 240000 /* Flash Erase Timeout (in ms) */
#define CFG_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (in ms) */
#define CFG_FLASH_ERASE_TOUT 240000 /* Flash Erase Timeout (in ms) */
#define CFG_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (in ms) */
@@
-202,13
+202,13
@@
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x20000
-#define C
FG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_SIZE
0x20000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
#define CONFIG_ENV_OVERWRITE 1
/* Address and size of Redundant Environment Sector */
#define CONFIG_ENV_OVERWRITE 1
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*
* Memory map
/*
* Memory map
diff --git
a/include/configs/katmai.h
b/include/configs/katmai.h
index
1876279
..
fac2844
100644
(file)
--- a/
include/configs/katmai.h
+++ b/
include/configs/katmai.h
@@
-219,13
+219,13
@@
#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_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
-#define C
FG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
-#define C
FG_ENV_ADDR (CFG_MONITOR_BASE-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*-----------------------------------------------------------------------
* PCI stuff
/*-----------------------------------------------------------------------
* PCI stuff
diff --git
a/include/configs/kb9202.h
b/include/configs/kb9202.h
index
8df222b
..
3c51417
100644
(file)
--- a/
include/configs/kb9202.h
+++ b/
include/configs/kb9202.h
@@
-60,7
+60,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (roundup(C
F
G_ENV_SIZE,4096) + 128*1024)
+#define CFG_MALLOC_LEN (roundup(C
ONFI
G_ENV_SIZE,4096) + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
#define CONFIG_BAUDRATE 115200
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
#define CONFIG_BAUDRATE 115200
@@
-131,11
+131,11
@@
#define CONFIG_ENV_IS_IN_EEPROM
#ifdef CONFIG_KB9202
#define CONFIG_ENV_IS_IN_EEPROM
#ifdef CONFIG_KB9202
-#define C
FG_ENV_OFFSET
0x3E00
-#define C
FG_ENV_SIZE
0x0200
+#define C
ONFIG_ENV_OFFSET
0x3E00
+#define C
ONFIG_ENV_SIZE
0x0200
#else
#else
-#define C
FG_ENV_OFFSET
0x1000
-#define C
FG_ENV_SIZE
0x1000
+#define C
ONFIG_ENV_OFFSET
0x1000
+#define C
ONFIG_ENV_SIZE
0x1000
#endif
#define CFG_I2C_EEPROM_ADDR 0x50
#define CFG_EEPROM_PAGE_WRITE_BITS 6
#endif
#define CFG_I2C_EEPROM_ADDR 0x50
#define CFG_EEPROM_PAGE_WRITE_BITS 6
diff --git
a/include/configs/kilauea.h
b/include/configs/kilauea.h
index
fec22d8
..
58918d4
100644
(file)
--- a/
include/configs/kilauea.h
+++ b/
include/configs/kilauea.h
@@
-124,7
+124,7
@@
#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 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 C
FG_ENV_IS_EMBEDDED
1 /* use embedded environment */
+#define C
ONFIG_ENV_IS_EMBEDDED
1 /* use embedded environment */
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
@@
-144,13
+144,13
@@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
-#define C
FG_ENV_ADDR (CFG_MONITOR_BASE-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*
@@
-205,9
+205,9
@@
* For NAND booting the environment is embedded in the U-Boot image. Please take
* look at the file board/amcc/sequoia/u-boot-nand.lds for details.
*/
* For NAND booting the environment is embedded in the U-Boot image. Please take
* look at the file board/amcc/sequoia/u-boot-nand.lds for details.
*/
-#define C
FG_ENV_SIZE
CFG_NAND_BLOCK_SIZE
-#define C
FG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CF
G_ENV_SIZE)
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET + CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
CFG_NAND_BLOCK_SIZE
+#define C
ONFIG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFI
G_ENV_SIZE)
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/korat.h
b/include/configs/korat.h
index
b6984da
..
214cb42
100644
(file)
--- a/
include/configs/korat.h
+++ b/
include/configs/korat.h
@@
-127,13
+127,13
@@
#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_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
-#define C
FG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
-#define C
FG_ENV_ADDR (CFG_FLASH1_TOP - CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR (CFG_FLASH1_TOP - CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR - CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND CF
G_ENV_SIZE
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND CONFI
G_ENV_SIZE
/*
* DDR SDRAM
/*
* DDR SDRAM
diff --git
a/include/configs/kvme080.h
b/include/configs/kvme080.h
index
7d903aa
..
098b92b
100644
(file)
--- a/
include/configs/kvme080.h
+++ b/
include/configs/kvme080.h
@@
-160,9
+160,9
@@
#define CONFIG_ENV_IS_IN_NVRAM 1
#define CONFIG_ENV_OVERWRITE 1
#define CFG_NVRAM_ACCESS_ROUTINE
#define CONFIG_ENV_IS_IN_NVRAM 1
#define CONFIG_ENV_OVERWRITE 1
#define CFG_NVRAM_ACCESS_ROUTINE
-#define C
FG_ENV_ADDR
CFG_NVRAM_BASE_ADDR
-#define C
FG_ENV_SIZE
0x400
-#define C
FG_ENV_OFFSET
0
+#define C
ONFIG_ENV_ADDR
CFG_NVRAM_BASE_ADDR
+#define C
ONFIG_ENV_SIZE
0x400
+#define C
ONFIG_ENV_OFFSET
0
#define CFG_NS16550
#define CFG_NS16550_SERIAL
#define CFG_NS16550
#define CFG_NS16550_SERIAL
diff --git
a/include/configs/lart.h
b/include/configs/lart.h
index
f38e5da
..
d7b8cfc
100644
(file)
--- a/
include/configs/lart.h
+++ b/
include/configs/lart.h
@@
-39,7
+39,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-153,7
+153,7
@@
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/linkstation.h
b/include/configs/linkstation.h
index
01ae317
..
be2f71c
100644
(file)
--- a/
include/configs/linkstation.h
+++ b/
include/configs/linkstation.h
@@
-456,9
+456,9
@@
* We use the last sector of this area to store the environment
* which leaves max. 384 kB for the U-Boot itself
*/
* We use the last sector of this area to store the environment
* which leaves max. 384 kB for the U-Boot itself
*/
-#define C
FG_ENV_ADDR
0xFFF60000
-#define C
FG_ENV_SIZE
0x00010000
-#define C
FG_ENV_SECT_SIZE
0x00010000
+#define C
ONFIG_ENV_ADDR
0xFFF60000
+#define C
ONFIG_ENV_SIZE
0x00010000
+#define C
ONFIG_ENV_SECT_SIZE
0x00010000
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/logodl.h
b/include/configs/logodl.h
index
5e51d81
..
dcbae97
100644
(file)
--- a/
include/configs/logodl.h
+++ b/
include/configs/logodl.h
@@
-289,7
+289,7
@@
/* FIXME */
#define CONFIG_ENV_IS_IN_FLASH 1
/* FIXME */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
F
G_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */
-#define C
F
G_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
+#define C
ONFI
G_ENV_ADDR (PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */
+#define C
ONFI
G_ENV_SIZE 0x4000 /* Total Size of Environment Sector */
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/lpc2292sodimm.h
b/include/configs/lpc2292sodimm.h
index
2f2a3e8
..
3d173d7
100644
(file)
--- a/
include/configs/lpc2292sodimm.h
+++ b/
include/configs/lpc2292sodimm.h
@@
-49,7
+49,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-151,8
+151,8
@@
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(0x0 + 0x3C000) /* Addr of Environment Sector */
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_ADDR
(0x0 + 0x3C000) /* Addr of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
diff --git
a/include/configs/lpd7a400.h
b/include/configs/lpd7a400.h
index
ae9503f
..
9e6ea1a
100644
(file)
--- a/
include/configs/lpd7a400.h
+++ b/
include/configs/lpd7a400.h
@@
-37,7
+37,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-113,7
+113,7
@@
#define CONFIG_ENV_IS_IN_FLASH 1
/* Address and size of Primary Environment Sector */
#define CONFIG_ENV_IS_IN_FLASH 1
/* Address and size of Primary Environment Sector */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0xFC0000)
-#define C
FG_ENV_SIZE
0x40000
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0xFC0000)
+#define C
ONFIG_ENV_SIZE
0x40000
#endif /* __LPD7A400_H_ */
#endif /* __LPD7A400_H_ */
diff --git
a/include/configs/lpd7a404.h
b/include/configs/lpd7a404.h
index
7ea4342
..
9c95913
100644
(file)
--- a/
include/configs/lpd7a404.h
+++ b/
include/configs/lpd7a404.h
@@
-37,7
+37,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-113,7
+113,7
@@
#define CONFIG_ENV_IS_IN_FLASH 1
/* Address and size of Primary Environment Sector */
#define CONFIG_ENV_IS_IN_FLASH 1
/* Address and size of Primary Environment Sector */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0xFC0000)
-#define C
FG_ENV_SIZE
0x40000
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0xFC0000)
+#define C
ONFIG_ENV_SIZE
0x40000
#endif /* __LPD7A404_H_ */
#endif /* __LPD7A404_H_ */
diff --git
a/include/configs/luan.h
b/include/configs/luan.h
index
9aef77c
..
2259ec3
100644
(file)
--- a/
include/configs/luan.h
+++ b/
include/configs/luan.h
@@
-115,13
+115,13
@@
#define CFG_FLASH_WORD_SIZE unsigned char
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_WORD_SIZE unsigned char
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
-#define C
FG_ENV_ADDR (CFG_MONITOR_BASE-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
diff --git
a/include/configs/lubbock.h
b/include/configs/lubbock.h
index
7e0c4a2
..
3c921c0
100644
(file)
--- a/
include/configs/lubbock.h
+++ b/
include/configs/lubbock.h
@@
-49,7
+49,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-232,9
+232,9
@@
*/
#define CFG_MONITOR_LEN PHYS_FLASH_SECT_SIZE
#define CONFIG_ENV_IS_IN_FLASH 1
*/
#define CFG_MONITOR_LEN PHYS_FLASH_SECT_SIZE
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE)
-#define C
FG_ENV_SECT_SIZE
PHYS_FLASH_SECT_SIZE
-#define C
FG_ENV_SIZE
(PHYS_FLASH_SECT_SIZE / 16)
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + PHYS_FLASH_SECT_SIZE)
+#define C
ONFIG_ENV_SECT_SIZE
PHYS_FLASH_SECT_SIZE
+#define C
ONFIG_ENV_SIZE
(PHYS_FLASH_SECT_SIZE / 16)
/*
/*
diff --git
a/include/configs/lwmon.h
b/include/configs/lwmon.h
index
73b988f
..
e4ee099
100644
(file)
--- a/
include/configs/lwmon.h
+++ b/
include/configs/lwmon.h
@@
-316,9
+316,9
@@
/* Put environment in flash which is much faster to boot than using the EEPROM */
#define CONFIG_ENV_IS_IN_FLASH 1
/* Put environment in flash which is much faster to boot than using the EEPROM */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
0x40040000 /* Address of Environment Sector */
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment */
-#define C
FG_ENV_SECT_SIZE
0x40000 /* we have BIG sectors only :-( */
+#define C
ONFIG_ENV_ADDR
0x40040000 /* Address of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment */
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* we have BIG sectors only :-( */
/*-----------------------------------------------------------------------
* I2C/EEPROM Configuration
/*-----------------------------------------------------------------------
* I2C/EEPROM Configuration
diff --git
a/include/configs/lwmon5.h
b/include/configs/lwmon5.h
index
8413615
..
c09e301
100644
(file)
--- a/
include/configs/lwmon5.h
+++ b/
include/configs/lwmon5.h
@@
-142,13
+142,13
@@
#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_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
-#define C
FG_ENV_SECT_SIZE
0x40000 /* size of one complete sector */
-#define C
FG_ENV_ADDR ((-CFG_MONITOR_LEN)-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR ((-CFG_MONITOR_LEN)-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*-----------------------------------------------------------------------
* DDR SDRAM
/*-----------------------------------------------------------------------
* DDR SDRAM
diff --git
a/include/configs/m501sk.h
b/include/configs/m501sk.h
index
bbc2b4e
..
32403f7
100644
(file)
--- a/
include/configs/m501sk.h
+++ b/
include/configs/m501sk.h
@@
-45,7
+45,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* Bytes reserved for initial data */
#define CONFIG_BAUDRATE 115200
#define CFG_GBL_DATA_SIZE 128 /* Bytes reserved for initial data */
#define CONFIG_BAUDRATE 115200
@@
-58,7
+58,7
@@
*/
#define CFG_FLASH_CFI 1
#define CONFIG_FLASH_CFI_DRIVER 1
*/
#define CFG_FLASH_CFI 1
#define CONFIG_FLASH_CFI_DRIVER 1
-#define C
FG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
#define CFG_FLASH_USE_BUFFER_WRITE
#define CFG_FLASH_PROTECTION /*for Intel P30 Flash*/
#define CONFIG_HARD_I2C
#define CFG_FLASH_USE_BUFFER_WRITE
#define CFG_FLASH_PROTECTION /*for Intel P30 Flash*/
#define CONFIG_HARD_I2C
@@
-155,18
+155,18
@@
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
#ifdef CONFIG_ENV_IS_IN_DATAFLASH
#define CFG_FLASH_WRITE_TOUT (2*CFG_HZ) /* Timeout for Flash Write */
#ifdef CONFIG_ENV_IS_IN_DATAFLASH
-#define C
FG_ENV_OFFSET
0x20000
-#define C
FG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CF
G_ENV_OFFSET)
-#define C
FG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_OFFSET
0x20000
+#define C
ONFIG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CONFI
G_ENV_OFFSET)
+#define C
ONFIG_ENV_SIZE
0x2000
#else
#define CONFIG_ENV_IS_IN_FLASH
#else
#define CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + 0x00020000)
-#define C
FG_ENV_SIZE
2048
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + 0x00020000)
+#define C
ONFIG_ENV_SIZE
2048
#endif
#ifdef CONFIG_ENV_IS_IN_EEPROM
#endif
#ifdef CONFIG_ENV_IS_IN_EEPROM
-#define C
FG_ENV_OFFSET
1024
-#define C
FG_ENV_SIZE
1024
+#define C
ONFIG_ENV_OFFSET
1024
+#define C
ONFIG_ENV_SIZE
1024
#endif
#define CFG_LOAD_ADDR 0x21000000 /* default load address */
#endif
#define CFG_LOAD_ADDR 0x21000000 /* default load address */
diff --git
a/include/configs/makalu.h
b/include/configs/makalu.h
index
97715a3
..
b7dddb7
100644
(file)
--- a/
include/configs/makalu.h
+++ b/
include/configs/makalu.h
@@
-138,13
+138,13
@@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
-#define C
FG_ENV_ADDR (CFG_MONITOR_BASE-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
diff --git
a/include/configs/mcc200.h
b/include/configs/mcc200.h
index
4e8c0d1
..
c3a600e
100644
(file)
--- a/
include/configs/mcc200.h
+++ b/
include/configs/mcc200.h
@@
-229,13
+229,13
@@
#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
-#define C
FG_ENV_SECT_SIZE
0x40000 /* size of one complete sector */
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CONFIG_ENV_OVERWRITE 1 /* allow modification of vendor params */
#define CONFIG_ENV_OVERWRITE 1 /* allow modification of vendor params */
diff --git
a/include/configs/mcu25.h
b/include/configs/mcu25.h
index
67c8485
..
9a83f08
100644
(file)
--- a/
include/configs/mcu25.h
+++ b/
include/configs/mcu25.h
@@
-128,19
+128,19
@@
#ifdef CONFIG_ENV_IS_IN_EEPROM
/* Put the environment after the SDRAM configuration */
#define PROM_SIZE 2048
#ifdef CONFIG_ENV_IS_IN_EEPROM
/* Put the environment after the SDRAM configuration */
#define PROM_SIZE 2048
-#define C
FG_ENV_OFFSET
512
-#define C
FG_ENV_SIZE (PROM_SIZE-CF
G_ENV_OFFSET)
+#define C
ONFIG_ENV_OFFSET
512
+#define C
ONFIG_ENV_SIZE (PROM_SIZE-CONFI
G_ENV_OFFSET)
#endif
#ifdef CONFIG_ENV_IS_IN_FLASH
/* Put the environment in Flash */
#endif
#ifdef CONFIG_ENV_IS_IN_FLASH
/* Put the environment in Flash */
-#define C
FG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
-#define C
FG_ENV_ADDR ((-CFG_MONITOR_LEN)-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
8*1024 /* 8 KB Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR ((-CFG_MONITOR_LEN)-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
8*1024 /* 8 KB Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/mecp5200.h
b/include/configs/mecp5200.h
index
e0bd6e3
..
8b13fc0
100644
(file)
--- a/
include/configs/mecp5200.h
+++ b/
include/configs/mecp5200.h
@@
-180,7
+180,7
@@
*/
#define CFG_FLASH_BASE 0xFFC00000
#define CFG_FLASH_SIZE 0x00400000
*/
#define CFG_FLASH_BASE 0xFFC00000
#define CFG_FLASH_SIZE 0x00400000
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x003E0000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x003E0000)
#define CFG_MAX_FLASH_BANKS 1 /* max num of memory banks */
#define CFG_MAX_FLASH_SECT 512
#define CFG_MAX_FLASH_BANKS 1 /* max num of memory banks */
#define CFG_MAX_FLASH_SECT 512
@@
-192,13
+192,13
@@
*/
#if 1 /* test-only */
#define CONFIG_ENV_IS_IN_FLASH 1
*/
#if 1 /* test-only */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x10000
-#define C
FG_ENV_SECT_SIZE
0x10000
+#define C
ONFIG_ENV_SIZE
0x10000
+#define C
ONFIG_ENV_SECT_SIZE
0x10000
#define CONFIG_ENV_OVERWRITE 1
#else
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#define CONFIG_ENV_OVERWRITE 1
#else
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x0000 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x0400 /* 8192 bytes may be used for env vars*/
+#define C
ONFIG_ENV_OFFSET
0x0000 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x0400 /* 8192 bytes may be used for env vars*/
/* total size of a CAT24WC32 is 8192 bytes */
#define CONFIG_ENV_OVERWRITE 1
#endif
/* total size of a CAT24WC32 is 8192 bytes */
#define CONFIG_ENV_OVERWRITE 1
#endif
diff --git
a/include/configs/mgcoge.h
b/include/configs/mgcoge.h
index
015e4dc
..
23af3ec
100644
(file)
--- a/
include/configs/mgcoge.h
+++ b/
include/configs/mgcoge.h
@@
-172,8
+172,8
@@
#define CONFIG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x20000
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#endif /* CONFIG_ENV_IS_IN_FLASH */
#define CFG_IMMR 0xF0000000
#endif /* CONFIG_ENV_IS_IN_FLASH */
#define CFG_IMMR 0xF0000000
diff --git
a/include/configs/mgsuvd.h
b/include/configs/mgsuvd.h
index
7fd5a47
..
740767e
100644
(file)
--- a/
include/configs/mgsuvd.h
+++ b/
include/configs/mgsuvd.h
@@
-197,13
+197,13
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x40000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x08000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x40000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x40000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x08000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git
a/include/configs/mimc200.h
b/include/configs/mimc200.h
index
69e99a6
..
da307ac
100644
(file)
--- a/
include/configs/mimc200.h
+++ b/
include/configs/mimc200.h
@@
-150,8
+150,8
@@
#define CFG_FRAM_SIZE 0x20000
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FRAM_SIZE 0x20000
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
65536
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
65536
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_FLASH_SIZE - CONFI
G_ENV_SIZE)
#define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
#define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
diff --git
a/include/configs/ml300.h
b/include/configs/ml300.h
index
67129a5
..
8d48221
100644
(file)
--- a/
include/configs/ml300.h
+++ b/
include/configs/ml300.h
@@
-68,7
+68,7
@@
#ifdef CONFIG_ENV_IS_IN_EEPROM
#define CFG_I2C_EEPROM_ADDR XPAR_PERSISTENT_0_IIC_0_EEPROMADDR
#define CFG_I2C_EEPROM_ADDR_LEN 1
#ifdef CONFIG_ENV_IS_IN_EEPROM
#define CFG_I2C_EEPROM_ADDR XPAR_PERSISTENT_0_IIC_0_EEPROMADDR
#define CFG_I2C_EEPROM_ADDR_LEN 1
-#define C
FG_ENV_OFFSET
XPAR_PERSISTENT_0_IIC_0_BASEADDR
+#define C
ONFIG_ENV_OFFSET
XPAR_PERSISTENT_0_IIC_0_BASEADDR
#define CONFIG_MISC_INIT_R 1 /* used to call out convert_env() */
#define CONFIG_ENV_OVERWRITE 1 /* allow users to update ethaddr and serial# */
#endif
#define CONFIG_MISC_INIT_R 1 /* used to call out convert_env() */
#define CONFIG_ENV_OVERWRITE 1 /* allow users to update ethaddr and serial# */
#endif
@@
-76,7
+76,7
@@
#include "../board/xilinx/ml300/xparameters.h"
#define CFG_NO_FLASH 1 /* no flash */
#include "../board/xilinx/ml300/xparameters.h"
#define CFG_NO_FLASH 1 /* no flash */
-#define C
FG_ENV_SIZE
XPAR_PERSISTENT_0_IIC_0_HIGHADDR - XPAR_PERSISTENT_0_IIC_0_BASEADDR + 1
+#define C
ONFIG_ENV_SIZE
XPAR_PERSISTENT_0_IIC_0_HIGHADDR - XPAR_PERSISTENT_0_IIC_0_BASEADDR + 1
#define CONFIG_BAUDRATE 9600
#define CONFIG_BOOTDELAY 3 /* autoboot after 3 seconds */
#define CONFIG_BAUDRATE 9600
#define CONFIG_BOOTDELAY 3 /* autoboot after 3 seconds */
diff --git
a/include/configs/ml401.h
b/include/configs/ml401.h
index
75fcb6a
..
2a6c68c
100644
(file)
--- a/
include/configs/ml401.h
+++ b/
include/configs/ml401.h
@@
-162,21
+162,21
@@
#ifdef RAMENV
#define CONFIG_ENV_IS_NOWHERE 1
#ifdef RAMENV
#define CONFIG_ENV_IS_NOWHERE 1
- #define C
FG_ENV_SIZE
0x1000
- #define C
FG_ENV_ADDR (CFG_MONITOR_BASE - CF
G_ENV_SIZE)
+ #define C
ONFIG_ENV_SIZE
0x1000
+ #define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE - CONFI
G_ENV_SIZE)
#else /* !RAMENV */
#define CONFIG_ENV_IS_IN_FLASH 1
#else /* !RAMENV */
#define CONFIG_ENV_IS_IN_FLASH 1
- #define C
FG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
- #define C
FG_ENV_ADDR (CFG_FLASH_BASE + (2 * CF
G_ENV_SECT_SIZE))
- #define C
FG_ENV_SIZE
0x40000
+ #define C
ONFIG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
+ #define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + (2 * CONFI
G_ENV_SECT_SIZE))
+ #define C
ONFIG_ENV_SIZE
0x40000
#endif /* !RAMBOOT */
#else /* !FLASH */
/* ENV in RAM */
#define CFG_NO_FLASH 1
#define CONFIG_ENV_IS_NOWHERE 1
#endif /* !RAMBOOT */
#else /* !FLASH */
/* ENV in RAM */
#define CFG_NO_FLASH 1
#define CONFIG_ENV_IS_NOWHERE 1
- #define C
FG_ENV_SIZE
0x1000
- #define C
FG_ENV_ADDR (CFG_MONITOR_BASE - CF
G_ENV_SIZE)
+ #define C
ONFIG_ENV_SIZE
0x1000
+ #define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE - CONFI
G_ENV_SIZE)
#define CFG_FLASH_PROTECTION /* hardware flash protection */
#endif /* !FLASH */
#define CFG_FLASH_PROTECTION /* hardware flash protection */
#endif /* !FLASH */
diff --git
a/include/configs/ml507.h
b/include/configs/ml507.h
index
e34e43a
..
22a972f
100644
(file)
--- a/
include/configs/ml507.h
+++ b/
include/configs/ml507.h
@@
-28,10
+28,10
@@
/*Env*/
#define CONFIG_ENV_IS_IN_FLASH 1
/*Env*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x20000
-#define C
FG_ENV_SECT_SIZE
0x20000
-#define C
FG_ENV_OFFSET
0x340000
-#define C
FG_ENV_ADDR (XPAR_FLASH_MEM0_BASEADDR+CF
G_ENV_OFFSET)
+#define C
ONFIG_ENV_SIZE
0x20000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_OFFSET
0x340000
+#define C
ONFIG_ENV_ADDR (XPAR_FLASH_MEM0_BASEADDR+CONFI
G_ENV_OFFSET)
/*Misc*/
#define CFG_PROMPT "ml507:/# " /* Monitor Command Prompt */
/*Misc*/
#define CFG_PROMPT "ml507:/# " /* Monitor Command Prompt */
diff --git
a/include/configs/modnet50.h
b/include/configs/modnet50.h
index
7cfd4fa
..
8f4011a
100644
(file)
--- a/
include/configs/modnet50.h
+++ b/
include/configs/modnet50.h
@@
-45,7
+45,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128
/*
#define CFG_GBL_DATA_SIZE 128
/*
@@
-173,9
+173,9
@@
#define CONFIG_ENV_IS_IN_FLASH
#undef CONFIG_ENV_IS_NOWHERE
#define CONFIG_ENV_IS_IN_FLASH
#undef CONFIG_ENV_IS_NOWHERE
-#define C
FG_ENV_ADDR
0x1001C000 /* environment start address */
-#define C
F
G_ENV_SECT_SIZE 0x10000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* max size for environment */
+#define C
ONFIG_ENV_ADDR
0x1001C000 /* environment start address */
+#define C
ONFI
G_ENV_SECT_SIZE 0x10000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* max size for environment */
/*
* JFFS2 partitions
/*
* JFFS2 partitions
diff --git
a/include/configs/motionpro.h
b/include/configs/motionpro.h
index
8692ab8
..
73a03a8
100644
(file)
--- a/
include/configs/motionpro.h
+++ b/
include/configs/motionpro.h
@@
-355,13
+355,13
@@
extern void __led_set(led_id_t id, int state);
*/
#define CONFIG_ENV_IS_IN_FLASH 1
/* This has to be a multiple of the Flash sector size */
*/
#define CONFIG_ENV_IS_IN_FLASH 1
/* This has to be a multiple of the Flash sector size */
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
-#define C
FG_ENV_SIZE
0x1000
-#define C
FG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SIZE
0x1000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
/* Configuration of redundant environment */
/* Configuration of redundant environment */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*
* Pin multiplexing configuration
/*
* Pin multiplexing configuration
diff --git
a/include/configs/mp2usb.h
b/include/configs/mp2usb.h
index
f0b5c9f
..
ba1ed0d
100644
(file)
--- a/
include/configs/mp2usb.h
+++ b/
include/configs/mp2usb.h
@@
-81,7
+81,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
#define CONFIG_BAUDRATE 115200
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
#define CONFIG_BAUDRATE 115200
@@
-200,9
+200,9
@@
#define CFG_FLASH_PROTECTION /* "Real" (hardware) sectors protection */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_PROTECTION /* "Real" (hardware) sectors protection */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x20000 /* after u-boot.bin */
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE+CF
G_ENV_OFFSET)
-#define C
FG_ENV_SIZE
0x20000
+#define C
ONFIG_ENV_OFFSET
0x20000 /* after u-boot.bin */
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE+CONFI
G_ENV_OFFSET)
+#define C
ONFIG_ENV_SIZE
0x20000
#define CFG_LOAD_ADDR 0x21000000 /* default load address */
#define CFG_LOAD_ADDR 0x21000000 /* default load address */
diff --git
a/include/configs/mpc7448hpc2.h
b/include/configs/mpc7448hpc2.h
index
7fd06a6
..
308a7b9
100644
(file)
--- a/
include/configs/mpc7448hpc2.h
+++ b/
include/configs/mpc7448hpc2.h
@@
-382,10
+382,10
@@
#define CFG_MAX_FLASH_SECT (128)
#define CONFIG_ENV_IS_IN_NVRAM
#define CFG_MAX_FLASH_SECT (128)
#define CONFIG_ENV_IS_IN_NVRAM
-#define C
FG_ENV_ADDR
0xFC000000
+#define C
ONFIG_ENV_ADDR
0xFC000000
-#define C
FG_ENV_OFFSET
0x00000000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x00000400 /* Total Size of Environment Space */
+#define C
ONFIG_ENV_OFFSET
0x00000000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x00000400 /* Total Size of Environment Space */
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/mpr2.h
b/include/configs/mpr2.h
index
6e0721e
..
6b378ac
100644
(file)
--- a/
include/configs/mpr2.h
+++ b/
include/configs/mpr2.h
@@
-74,9
+74,9
@@
#define CFG_MAX_FLASH_BANKS 1
#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE }
#define CONFIG_ENV_IS_IN_FLASH
#define CFG_MAX_FLASH_BANKS 1
#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE }
#define CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
(128 * 1024)
-#define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SECT_SIZE
(128 * 1024)
+#define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#define CFG_FLASH_ERASE_TOUT 120000
#define CFG_FLASH_WRITE_TOUT 500
#define CFG_FLASH_ERASE_TOUT 120000
#define CFG_FLASH_WRITE_TOUT 500
diff --git
a/include/configs/ms7720se.h
b/include/configs/ms7720se.h
index
ee19b02
..
f308460
100644
(file)
--- a/
include/configs/ms7720se.h
+++ b/
include/configs/ms7720se.h
@@
-93,9
+93,9
@@
#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE }
#define CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE }
#define CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
(64 * 1024)
-#define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SECT_SIZE
(64 * 1024)
+#define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#define CFG_FLASH_ERASE_TOUT 120000
#define CFG_FLASH_WRITE_TOUT 500
#define CFG_FLASH_ERASE_TOUT 120000
#define CFG_FLASH_WRITE_TOUT 500
diff --git
a/include/configs/ms7722se.h
b/include/configs/ms7722se.h
index
55f264c
..
5f5970b
100644
(file)
--- a/
include/configs/ms7722se.h
+++ b/
include/configs/ms7722se.h
@@
-116,12
+116,12
@@
#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OVERWRITE 1
#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OVERWRITE 1
-#define C
FG_ENV_SECT_SIZE
(8 * 1024)
-#define C
FG_ENV_SIZE (CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE + (1 * CF
G_ENV_SECT_SIZE))
-#define C
FG_ENV_OFFSET (CFG_ENV_ADDR - CFG_FLASH_BASE)
/* Offset of env Flash sector relative to CFG_FLASH_BASE */
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_ADDR_REDUND (CFG_FLASH_BASE + (2 * CF
G_ENV_SECT_SIZE))
+#define C
ONFIG_ENV_SECT_SIZE
(8 * 1024)
+#define C
ONFIG_ENV_SIZE (CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + (1 * CONFI
G_ENV_SECT_SIZE))
+#define C
ONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CFG_FLASH_BASE)
/* Offset of env Flash sector relative to CFG_FLASH_BASE */
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CFG_FLASH_BASE + (2 * CONFI
G_ENV_SECT_SIZE))
/* Board Clock */
#define CONFIG_SYS_CLK_FREQ 33333333
/* Board Clock */
#define CONFIG_SYS_CLK_FREQ 33333333
diff --git
a/include/configs/ms7750se.h
b/include/configs/ms7750se.h
index
c4a1f54
..
acb4d6d
100644
(file)
--- a/
include/configs/ms7750se.h
+++ b/
include/configs/ms7750se.h
@@
-93,9
+93,9
@@
#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x20000
-#define C
FG_ENV_SIZE (CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_SIZE (CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#define CFG_FLASH_ERASE_TOUT 120000
#define CFG_FLASH_WRITE_TOUT 500
#define CFG_FLASH_ERASE_TOUT 120000
#define CFG_FLASH_WRITE_TOUT 500
diff --git
a/include/configs/muas3001.h
b/include/configs/muas3001.h
index
ded0f4c
..
c661829
100644
(file)
--- a/
include/configs/muas3001.h
+++ b/
include/configs/muas3001.h
@@
-230,8
+230,8
@@
#define CONFIG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_IS_IN_FLASH
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x10000
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SECT_SIZE
0x10000
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*
diff --git
a/include/configs/mucmc52.h
b/include/configs/mucmc52.h
index
d3546c7
..
8971f0b
100644
(file)
--- a/
include/configs/mucmc52.h
+++ b/
include/configs/mucmc52.h
@@
-160,7
+160,7
@@
#define CFG_FLASH_SIZE 0x00800000 /* 8 MByte */
#define CFG_MAX_FLASH_SECT 67 /* max num of sects on one chip */
#define CFG_FLASH_SIZE 0x00800000 /* 8 MByte */
#define CFG_MAX_FLASH_SECT 67 /* max num of sects on one chip */
-#define C
FG_ENV_ADDR
(TEXT_BASE+0x40000) /* second sector */
+#define C
ONFIG_ENV_ADDR
(TEXT_BASE+0x40000) /* second sector */
#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks
(= chip selects) */
#define CFG_FLASH_ERASE_TOUT 240000 /* Flash Erase Timeout (in ms) */
#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks
(= chip selects) */
#define CFG_FLASH_ERASE_TOUT 240000 /* Flash Erase Timeout (in ms) */
@@
-175,10
+175,10
@@
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x4000
-#define C
FG_ENV_SECT_SIZE
0x20000
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
0x4000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*
* Memory map
/*
* Memory map
diff --git
a/include/configs/munices.h
b/include/configs/munices.h
index
6d39580
..
8f3071a
100644
(file)
--- a/
include/configs/munices.h
+++ b/
include/configs/munices.h
@@
-153,13
+153,13
@@
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x40000
-#define C
FG_ENV_ADDR (TEXT_BASE + CF
G_ENV_OFFSET)
-#define C
FG_ENV_SECT_SIZE
0x20000
-#define C
FG_ENV_SIZE
0x4000
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET + CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_ADDR_REDUND (TEXT_BASE + CF
G_ENV_OFFSET_REDUND)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET
0x40000
+#define C
ONFIG_ENV_ADDR (TEXT_BASE + CONFI
G_ENV_OFFSET)
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_SIZE
0x4000
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (TEXT_BASE + CONFI
G_ENV_OFFSET_REDUND)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CONFIG_ENV_OVERWRITE 1
/*
#define CONFIG_ENV_OVERWRITE 1
/*
diff --git
a/include/configs/mx1ads.h
b/include/configs/mx1ads.h
index
bf43dad
..
2eb43bf
100644
(file)
--- a/
include/configs/mx1ads.h
+++ b/
include/configs/mx1ads.h
@@
-57,7
+57,7
@@
* Size of malloc() pool
*/
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
@@
-172,11
+172,11
@@
#define CONFIG_SYNCFLASH 1
#define PHYS_FLASH_SIZE 0x01000000
#define CFG_MAX_FLASH_SECT (16)
#define CONFIG_SYNCFLASH 1
#define PHYS_FLASH_SIZE 0x01000000
#define CFG_MAX_FLASH_SECT (16)
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE+0x00ff8000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE+0x00ff8000)
#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x04000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x100000
+#define C
ONFIG_ENV_SIZE
0x04000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x100000
/*-----------------------------------------------------------------------
* Enable passing ATAGS
/*-----------------------------------------------------------------------
* Enable passing ATAGS
diff --git
a/include/configs/mx1fs2.h
b/include/configs/mx1fs2.h
index
8f4b42c
..
39950dc
100644
(file)
--- a/
include/configs/mx1fs2.h
+++ b/
include/configs/mx1fs2.h
@@
-98,7
+98,7
@@
/*
* Malloc pool need to host env + 128 Kb reserve for other allocations.
*/
/*
* Malloc pool need to host env + 128 Kb reserve for other allocations.
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + (128<<10) )
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + (128<<10) )
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
@@
-208,8
+208,8
@@
#define CFG_MONITOR_BASE 0x10000000
#define CFG_MONITOR_LEN 0x20000 /* 128b ( 1 flash sector ) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MONITOR_BASE 0x10000000
#define CFG_MONITOR_LEN 0x20000 /* 128b ( 1 flash sector ) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
0x10020000 /* absolute address for now */
-#define C
FG_ENV_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR
0x10020000 /* absolute address for now */
+#define C
ONFIG_ENV_SIZE
0x20000
#define CONFIG_ENV_OVERWRITE 1 /* env is not writable now */
#define CONFIG_ENV_OVERWRITE 1 /* env is not writable now */
diff --git
a/include/configs/mx31ads.h
b/include/configs/mx31ads.h
index
0bb0568
..
314856c
100644
(file)
--- a/
include/configs/mx31ads.h
+++ b/
include/configs/mx31ads.h
@@
-50,7
+50,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128 * 1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128 * 1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-168,18
+168,18
@@
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256KiB */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256KiB */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SECT_SIZE
(32 * 1024)
-#define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+#define C
ONFIG_ENV_SECT_SIZE
(32 * 1024)
+#define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET + CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND CF
G_ENV_SIZE
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND CONFI
G_ENV_SIZE
/* S29WS256N NOR flash has 4 32KiB small sectors at the beginning and at the end.
* The rest of 32MiB is in 128KiB big sectors. U-Boot occupies the low 4 sectors,
* if we put environment next to it, we will have to occupy 128KiB for it.
* Putting it at the top of flash we use only 32KiB. */
/* S29WS256N NOR flash has 4 32KiB small sectors at the beginning and at the end.
* The rest of 32MiB is in 128KiB big sectors. U-Boot occupies the low 4 sectors,
* if we put environment next to it, we will have to occupy 128KiB for it.
* Putting it at the top of flash we use only 32KiB. */
-#define C
FG_ENV_ADDR (CFG_MONITOR_BASE + CF
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE + CONFI
G_ENV_SECT_SIZE)
/*-----------------------------------------------------------------------
* CFI FLASH driver setup
/*-----------------------------------------------------------------------
* CFI FLASH driver setup
diff --git
a/include/configs/netstar.h
b/include/configs/netstar.h
index
76d025c
..
23fd18b
100644
(file)
--- a/
include/configs/netstar.h
+++ b/
include/configs/netstar.h
@@
-76,11
+76,11
@@
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_ADDR
0x4000
-#define C
FG_ENV_SIZE
(8 * 1024)
-#define C
FG_ENV_SECT_SIZE
(8 * 1024)
-#define C
FG_ENV_ADDR_REDUND
0x6000
-#define C
FG_ENV_SIZE_REDUND CF
G_ENV_SIZE
+#define C
ONFIG_ENV_ADDR
0x4000
+#define C
ONFIG_ENV_SIZE
(8 * 1024)
+#define C
ONFIG_ENV_SECT_SIZE
(8 * 1024)
+#define C
ONFIG_ENV_ADDR_REDUND
0x6000
+#define C
ONFIG_ENV_SIZE_REDUND CONFI
G_ENV_SIZE
#define CONFIG_ENV_OVERWRITE
/*
#define CONFIG_ENV_OVERWRITE
/*
diff --git
a/include/configs/ns9750dev.h
b/include/configs/ns9750dev.h
index
f8200f9
..
5b5c6eb
100644
(file)
--- a/
include/configs/ns9750dev.h
+++ b/
include/configs/ns9750dev.h
@@
-49,7
+49,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial
* data */
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial
* data */
@@
-172,12
+172,12
@@
#ifdef CONFIG_AMD_LV800
#define PHYS_FLASH_SIZE 0x00100000 /* 1MB */
#define CFG_MAX_FLASH_SECT (19) /* max number of sectors on one chip */
#ifdef CONFIG_AMD_LV800
#define PHYS_FLASH_SIZE 0x00100000 /* 1MB */
#define CFG_MAX_FLASH_SECT (19) /* max number of sectors on one chip */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x0F0000) /* addr of environment */
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x0F0000) /* addr of environment */
#endif
#ifdef CONFIG_AMD_LV400
#define PHYS_FLASH_SIZE 0x00080000 /* 512KB */
#define CFG_MAX_FLASH_SECT (11) /* max number of sectors on one chip */
#endif
#ifdef CONFIG_AMD_LV400
#define PHYS_FLASH_SIZE 0x00080000 /* 512KB */
#define CFG_MAX_FLASH_SECT (11) /* max number of sectors on one chip */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x070000) /* addr of environment */
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x070000) /* addr of environment */
#endif
/* timeout values are in ticks */
#endif
/* timeout values are in ticks */
@@
-187,7
+187,7
@@
/* @TODO */
/*#define CONFIG_ENV_IS_IN_FLASH 1*/
#define CONFIG_ENV_IS_NOWHERE
/* @TODO */
/*#define CONFIG_ENV_IS_IN_FLASH 1*/
#define CONFIG_ENV_IS_NOWHERE
-#define C
FG_ENV_SIZE
0x10000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x10000 /* Total Size of Environment Sector */
#ifdef CONFIG_STATUS_LED
#ifdef CONFIG_STATUS_LED
diff --git
a/include/configs/o2dnt.h
b/include/configs/o2dnt.h
index
09995e8
..
b515388
100644
(file)
--- a/
include/configs/o2dnt.h
+++ b/
include/configs/o2dnt.h
@@
-190,7
+190,7
@@
*/
#define CFG_FLASH_BASE 0xFF000000
#define CFG_FLASH_SIZE 0x01000000
*/
#define CFG_FLASH_BASE 0xFF000000
#define CFG_FLASH_SIZE 0x01000000
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00040000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00040000)
#define CFG_MAX_FLASH_BANKS 1 /* max num of memory banks */
#define CFG_MAX_FLASH_SECT 128 /* max num of sects on one chip */
#define CFG_MAX_FLASH_BANKS 1 /* max num of memory banks */
#define CFG_MAX_FLASH_SECT 128 /* max num of sects on one chip */
@@
-204,8
+204,8
@@
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x20000
-#define C
FG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_SIZE
0x20000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
#define CONFIG_ENV_OVERWRITE 1
/*
#define CONFIG_ENV_OVERWRITE 1
/*
diff --git
a/include/configs/ocotea.h
b/include/configs/ocotea.h
index
b0a2e5d
..
6a8665e
100644
(file)
--- a/
include/configs/ocotea.h
+++ b/
include/configs/ocotea.h
@@
-113,9
+113,9
@@
#define CONFIG_RTC_DS174x 1 /* DS1743 RTC */
#ifdef CONFIG_ENV_IS_IN_NVRAM
#define CONFIG_RTC_DS174x 1 /* DS1743 RTC */
#ifdef CONFIG_ENV_IS_IN_NVRAM
-#define C
FG_ENV_SIZE
0x1000 /* Size of Environment vars */
-#define C
FG_ENV_ADDR
\
- (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
F
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
0x1000 /* Size of Environment vars */
+#define C
ONFIG_ENV_ADDR
\
+ (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
ONFI
G_ENV_SIZE)
#endif /* CONFIG_ENV_IS_IN_NVRAM */
/*-----------------------------------------------------------------------
#endif /* CONFIG_ENV_IS_IN_NVRAM */
/*-----------------------------------------------------------------------
@@
-133,13
+133,13
@@
#define CFG_FLASH_WORD_SIZE unsigned char
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_WORD_SIZE unsigned char
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
-#define C
FG_ENV_ADDR (CFG_MONITOR_BASE-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
diff --git
a/include/configs/omap1510inn.h
b/include/configs/omap1510inn.h
index
fe6a0db
..
d390d85
100644
(file)
--- a/
include/configs/omap1510inn.h
+++ b/
include/configs/omap1510inn.h
@@
-49,7
+49,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-170,7
+170,7
@@
#define PHYS_FLASH_SIZE 0x01000000 /* 16MB */
#define PHYS_FLASH_SECT_SIZE (128*1024) /* Size of a sector (128kB) */
#define CFG_MAX_FLASH_SECT (128) /* max number of sectors on one chip */
#define PHYS_FLASH_SIZE 0x01000000 /* 16MB */
#define PHYS_FLASH_SECT_SIZE (128*1024) /* Size of a sector (128kB) */
#define CFG_MAX_FLASH_SECT (128) /* max number of sectors on one chip */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + PHYS_FLASH_SECT_SIZE)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + PHYS_FLASH_SECT_SIZE)
#define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at beginning of flash */
#define CFG_MONITOR_LEN PHYS_FLASH_SECT_SIZE /* Reserve 1 sector */
#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE, CFG_FLASH_BASE + PHYS_FLASH_SIZE }
#define CFG_MONITOR_BASE CFG_FLASH_BASE /* Monitor at beginning of flash */
#define CFG_MONITOR_LEN PHYS_FLASH_SECT_SIZE /* Reserve 1 sector */
#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE, CFG_FLASH_BASE + PHYS_FLASH_SIZE }
@@
-188,8
+188,8
@@
#define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT (20*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SECT_SIZE
PHYS_FLASH_SECT_SIZE /* Total Size of Environment Sector */
-#define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
-#define C
FG_ENV_OFFSET
( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */
+#define C
ONFIG_ENV_SECT_SIZE
PHYS_FLASH_SECT_SIZE /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
+#define C
ONFIG_ENV_OFFSET
( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/omap1610h2.h
b/include/configs/omap1610h2.h
index
9d2051d
..
aeb2fec
100644
(file)
--- a/
include/configs/omap1610h2.h
+++ b/
include/configs/omap1610h2.h
@@
-51,7
+51,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-181,14
+181,14
@@
extern unsigned long omap_flash_base; /* set in flash__init */
#define PHYS_FLASH_SIZE 0x02000000 /* 32MB */
#define CFG_MAX_FLASH_SECT (259) /* max number of sectors on one chip */
/* addr of environment */
#define PHYS_FLASH_SIZE 0x02000000 /* 32MB */
#define CFG_MAX_FLASH_SECT (259) /* max number of sectors on one chip */
/* addr of environment */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x020000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x020000)
/* timeout values are in ticks */
#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 CONFIG_ENV_IS_IN_FLASH 1
/* timeout values are in ticks */
#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 CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x20000 /* Total Size of Environment Sector */
-#define C
FG_ENV_OFFSET
0x20000 /* environment starts here */
+#define C
ONFIG_ENV_SIZE
0x20000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x20000 /* environment starts here */
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/omap1610inn.h
b/include/configs/omap1610inn.h
index
edc42e4
..
68cf91c
100644
(file)
--- a/
include/configs/omap1610inn.h
+++ b/
include/configs/omap1610inn.h
@@
-50,7
+50,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-186,14
+186,14
@@
extern unsigned long omap_flash_base; /* set in flash__init */
#define PHYS_FLASH_SIZE 0x02000000 /* 32MB */
#define CFG_MAX_FLASH_SECT (259) /* max number of sectors on one chip */
/* addr of environment */
#define PHYS_FLASH_SIZE 0x02000000 /* 32MB */
#define CFG_MAX_FLASH_SECT (259) /* max number of sectors on one chip */
/* addr of environment */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x020000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x020000)
/* timeout values are in ticks */
#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 CONFIG_ENV_IS_IN_FLASH 1
/* timeout values are in ticks */
#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 CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x20000 /* Total Size of Environment Sector */
-#define C
FG_ENV_OFFSET
0x20000 /* environment starts here */
+#define C
ONFIG_ENV_SIZE
0x20000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x20000 /* environment starts here */
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/omap2420h4.h
b/include/configs/omap2420h4.h
index
ac98fb5
..
9018440
100644
(file)
--- a/
include/configs/omap2420h4.h
+++ b/
include/configs/omap2420h4.h
@@
-70,8
+70,8
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define C
F
G_ENV_SIZE SZ_128K /* Total Size of Environment Sector */
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + SZ_128K)
+#define C
ONFI
G_ENV_SIZE SZ_128K /* Total Size of Environment Sector */
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + SZ_128K)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-271,12
+271,12
@@
#ifdef CFG_NAND_BOOT
#define CONFIG_ENV_IS_IN_NAND 1
#ifdef CFG_NAND_BOOT
#define CONFIG_ENV_IS_IN_NAND 1
-#define C
FG_ENV_OFFSET
0x80000 /* environment starts here */
+#define C
ONFIG_ENV_OFFSET
0x80000 /* environment starts here */
#else
#else
-#define C
F
G_ENV_ADDR (CFG_FLASH_BASE + SZ_128K)
+#define C
ONFI
G_ENV_ADDR (CFG_FLASH_BASE + SZ_128K)
#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SECT_SIZE
PHYS_FLASH_SECT_SIZE
-#define C
FG_ENV_OFFSET
( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */
+#define C
ONFIG_ENV_SECT_SIZE
PHYS_FLASH_SECT_SIZE
+#define C
ONFIG_ENV_OFFSET
( CFG_MONITOR_BASE + CFG_MONITOR_LEN ) /* Environment after Monitor */
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/omap5912osk.h
b/include/configs/omap5912osk.h
index
0f56279
..
dd3f7de
100644
(file)
--- a/
include/configs/omap5912osk.h
+++ b/
include/configs/omap5912osk.h
@@
-53,7
+53,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-196,9
+196,9
@@
*/
#define CONFIG_ENV_IS_IN_FLASH 1
/* addr of environment */
*/
#define CONFIG_ENV_IS_IN_FLASH 1
/* addr of environment */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x020000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x020000)
-#define C
FG_ENV_SIZE
0x20000 /* Total Size of Environment Sector */
-#define C
FG_ENV_OFFSET
0x20000 /* environment starts here */
+#define C
ONFIG_ENV_SIZE
0x20000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x20000 /* environment starts here */
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/omap730p2.h
b/include/configs/omap730p2.h
index
b781f72
..
b1c4a30
100644
(file)
--- a/
include/configs/omap730p2.h
+++ b/
include/configs/omap730p2.h
@@
-58,7
+58,7
@@
* Size of malloc() pool
*/
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-193,14
+193,14
@@
#define PHYS_FLASH_SIZE 0x02000000 /* 32MB */
#define CFG_MAX_FLASH_SECT (259) /* max number of sectors on one chip */
/* addr of environment */
#define PHYS_FLASH_SIZE 0x02000000 /* 32MB */
#define CFG_MAX_FLASH_SECT (259) /* max number of sectors on one chip */
/* addr of environment */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x020000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x020000)
/* timeout values are in ticks */
#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 CONFIG_ENV_IS_IN_FLASH 1
/* timeout values are in ticks */
#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 CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x20000 /* Total Size of Environment Sector */
-#define C
FG_ENV_OFFSET
0x20000 /* environment starts here */
+#define C
ONFIG_ENV_SIZE
0x20000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x20000 /* environment starts here */
#endif /* ! __CONFIG_H */
#endif /* ! __CONFIG_H */
diff --git
a/include/configs/p3mx.h
b/include/configs/p3mx.h
index
1128c4e
..
2df1d9d
100644
(file)
--- a/
include/configs/p3mx.h
+++ b/
include/configs/p3mx.h
@@
-139,12
+139,12
@@
#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#if defined (CONFIG_P3M750)
#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#if defined (CONFIG_P3M750)
-#define C
FG_ENV_SECT_SIZE
0x20000 /* one sector (1 device) */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* one sector (1 device) */
#elif defined (CONFIG_P3M7448)
#elif defined (CONFIG_P3M7448)
-#define C
FG_ENV_SECT_SIZE
0x40000 /* two sectors (2 devices parallel */
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* two sectors (2 devices parallel */
#endif
#endif
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
/*-----------------------------------------------------------------------
* DDR SDRAM
/*-----------------------------------------------------------------------
* DDR SDRAM
diff --git
a/include/configs/p3p440.h
b/include/configs/p3p440.h
index
046ec25
..
5cef3ea
100644
(file)
--- a/
include/configs/p3p440.h
+++ b/
include/configs/p3p440.h
@@
-297,13
+297,13
@@
#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
-#define C
FG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
-#define C
FG_ENV_ADDR (CFG_MONITOR_BASE-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*
* For booting Linux, the board info and command line data
/*
* For booting Linux, the board info and command line data
diff --git
a/include/configs/pb1x00.h
b/include/configs/pb1x00.h
index
4ec520f
..
480a59f
100644
(file)
--- a/
include/configs/pb1x00.h
+++ b/
include/configs/pb1x00.h
@@
-119,8
+119,8
@@
#define CONFIG_ENV_IS_NOWHERE 1
/* Address and size of Primary Environment Sector */
#define CONFIG_ENV_IS_NOWHERE 1
/* Address and size of Primary Environment Sector */
-#define C
FG_ENV_ADDR
0xB0030000
-#define C
FG_ENV_SIZE
0x10000
+#define C
ONFIG_ENV_ADDR
0xB0030000
+#define C
ONFIG_ENV_SIZE
0x10000
#define CONFIG_FLASH_16BIT
#define CONFIG_FLASH_16BIT
diff --git
a/include/configs/pcs440ep.h
b/include/configs/pcs440ep.h
index
368a66b
..
62f13f2
100644
(file)
--- a/
include/configs/pcs440ep.h
+++ b/
include/configs/pcs440ep.h
@@
-110,15
+110,15
@@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
-#define C
FG_ENV_ADDR (CFG_MONITOR_BASE-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
#define CONFIG_ENV_OVERWRITE 1
/* Address and size of Redundant Environment Sector */
#define CONFIG_ENV_OVERWRITE 1
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif /* CONFIG_ENV_IS_IN_FLASH */
#define ENV_NAME_REVLEV "revision_level"
#endif /* CONFIG_ENV_IS_IN_FLASH */
#define ENV_NAME_REVLEV "revision_level"
diff --git
a/include/configs/pcu_e.h
b/include/configs/pcu_e.h
index
1a3bf1c
..
664a885
100644
(file)
--- a/
include/configs/pcu_e.h
+++ b/
include/configs/pcu_e.h
@@
-228,17
+228,17
@@
#if 0
/* Start port with environment in flash; switch to SPI EEPROM later */
#define CONFIG_ENV_IS_IN_FLASH 1
#if 0
/* Start port with environment in flash; switch to SPI EEPROM later */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment */
-#define C
FG_ENV_ADDR
0xFFFFE000 /* Address of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x2000 /* use the top-most 8k boot sector */
-#define C
FG_ENV_IS_EMBEDDED
1 /* short-cut compile-time test */
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment */
+#define C
ONFIG_ENV_ADDR
0xFFFFE000 /* Address of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x2000 /* use the top-most 8k boot sector */
+#define C
ONFIG_ENV_IS_EMBEDDED
1 /* short-cut compile-time test */
#else
/* Final version: environment in EEPROM */
#define CONFIG_ENV_IS_IN_EEPROM 1
#define CFG_I2C_EEPROM_ADDR 0
#define CFG_I2C_EEPROM_ADDR_LEN 2
#else
/* Final version: environment in EEPROM */
#define CONFIG_ENV_IS_IN_EEPROM 1
#define CFG_I2C_EEPROM_ADDR 0
#define CFG_I2C_EEPROM_ADDR_LEN 2
-#define C
FG_ENV_OFFSET
1024
-#define C
FG_ENV_SIZE
1024
+#define C
ONFIG_ENV_OFFSET
1024
+#define C
ONFIG_ENV_SIZE
1024
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/pdnb3.h
b/include/configs/pdnb3.h
index
0b7b6d4
..
856917e
100644
(file)
--- a/
include/configs/pdnb3.h
+++ b/
include/configs/pdnb3.h
@@
-245,18
+245,18
@@
#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + CFG_MONITOR_LEN)
#if defined(CONFIG_SCPU)
/* no redundant environment on SCPU */
#if defined(CONFIG_SCPU)
/* no redundant environment on SCPU */
-#define C
FG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
#else
#else
-#define C
FG_ENV_SECT_SIZE
0x1000 /* size of one complete sector */
-#define C
FG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x1000 /* size of one complete sector */
+#define C
ONFIG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif
#if !defined(CONFIG_SCPU)
#endif
#if !defined(CONFIG_SCPU)
diff --git
a/include/configs/pf5200.h
b/include/configs/pf5200.h
index
6120f58
..
66ad01f
100644
(file)
--- a/
include/configs/pf5200.h
+++ b/
include/configs/pf5200.h
@@
-194,7
+194,7
@@
*/
#define CFG_FLASH_BASE 0xFE000000
#define CFG_FLASH_SIZE 0x02000000
*/
#define CFG_FLASH_BASE 0xFE000000
#define CFG_FLASH_SIZE 0x02000000
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00000000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00000000)
#define CFG_MAX_FLASH_BANKS 1 /* max num of memory banks */
#define CFG_MAX_FLASH_SECT 512
#define CFG_MAX_FLASH_BANKS 1 /* max num of memory banks */
#define CFG_MAX_FLASH_SECT 512
@@
-206,13
+206,13
@@
*/
#if 1 /* test-only */
#define CONFIG_ENV_IS_IN_FLASH
*/
#if 1 /* test-only */
#define CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SIZE
0x10000
-#define C
FG_ENV_SECT_SIZE
0x10000
+#define C
ONFIG_ENV_SIZE
0x10000
+#define C
ONFIG_ENV_SECT_SIZE
0x10000
#define CONFIG_ENV_OVERWRITE 1
#else
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
#define CONFIG_ENV_OVERWRITE 1
#else
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use EEPROM for environment vars */
-#define C
FG_ENV_OFFSET
0x0000 /* environment starts at the beginning of the EEPROM */
-#define C
FG_ENV_SIZE
0x0400 /* 8192 bytes may be used for env vars */
+#define C
ONFIG_ENV_OFFSET
0x0000 /* environment starts at the beginning of the EEPROM */
+#define C
ONFIG_ENV_SIZE
0x0400 /* 8192 bytes may be used for env vars */
/* total size of a CAT24WC32 is 8192 bytes */
#define CONFIG_ENV_OVERWRITE 1
#endif
/* total size of a CAT24WC32 is 8192 bytes */
#define CONFIG_ENV_OVERWRITE 1
#endif
diff --git
a/include/configs/pleb2.h
b/include/configs/pleb2.h
index
799cf76
..
66e76e8
100644
(file)
--- a/
include/configs/pleb2.h
+++ b/
include/configs/pleb2.h
@@
-45,7
+45,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-247,9
+247,9
@@
/* FIXME */
#define CONFIG_ENV_IS_IN_FLASH 1
/* FIXME */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + 0x3C000) /* Addr of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment */
-#define C
FG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + 0x3C000) /* Addr of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
/* Option added to get around byte ordering issues in the flash driver */
#define CFG_LITTLE_ENDIAN 1
/* Option added to get around byte ordering issues in the flash driver */
#define CFG_LITTLE_ENDIAN 1
diff --git
a/include/configs/ppmc7xx.h
b/include/configs/ppmc7xx.h
index
cd5ef94
..
fd05c7e
100644
(file)
--- a/
include/configs/ppmc7xx.h
+++ b/
include/configs/ppmc7xx.h
@@
-275,17
+275,17
@@
* Environment config - see memory map details above
*
* CONFIG_ENV_IS_IN_FLASH - The env variables are stored in flash
* Environment config - see memory map details above
*
* CONFIG_ENV_IS_IN_FLASH - The env variables are stored in flash
- * C
FG_ENV_ADDR
- Address of the sector containing env vars
- * C
FG_ENV_SIZE
- Ammount of RAM for env vars (used to save RAM, 4KB)
- * C
FG_ENV_SECT_SIZE
- Size of sector containing env vars (32KB)
+ * C
ONFIG_ENV_ADDR
- Address of the sector containing env vars
+ * C
ONFIG_ENV_SIZE
- Ammount of RAM for env vars (used to save RAM, 4KB)
+ * C
ONFIG_ENV_SECT_SIZE
- Size of sector containing env vars (32KB)
*/
#define CONFIG_ENV_IS_IN_FLASH 1
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
0xFFFE0000
-#define C
FG_ENV_SIZE
0x1000
-#define C
FG_ENV_ADDR_REDUND
0xFFFE8000
-#define C
FG_ENV_SIZE_REDUND
0x1000
-#define C
FG_ENV_SECT_SIZE
0x8000
+#define C
ONFIG_ENV_ADDR
0xFFFE0000
+#define C
ONFIG_ENV_SIZE
0x1000
+#define C
ONFIG_ENV_ADDR_REDUND
0xFFFE8000
+#define C
ONFIG_ENV_SIZE_REDUND
0x1000
+#define C
ONFIG_ENV_SECT_SIZE
0x8000
/*
/*
diff --git
a/include/configs/ppmc8260.h
b/include/configs/ppmc8260.h
index
a045f22
..
dd71862
100644
(file)
--- a/
include/configs/ppmc8260.h
+++ b/
include/configs/ppmc8260.h
@@
-137,7
+137,7
@@
* Monitor Stack Buffer (0x80)
* 0x0FF5 FFB0 Board Info Data
* 0x0FF6 0000 Malloc Arena
* Monitor Stack Buffer (0x80)
* 0x0FF5 FFB0 Board Info Data
* 0x0FF6 0000 Malloc Arena
- * : C
F
G_ENV_SECT_SIZE, 256k
+ * : C
ONFI
G_ENV_SECT_SIZE, 256k
* : CFG_MALLOC_LEN, 128k
* 0x0FFC 0000 RAM Copy of Monitor Code
* : CFG_MONITOR_LEN, 256k
* : CFG_MALLOC_LEN, 128k
* 0x0FFC 0000 RAM Copy of Monitor Code
* : CFG_MONITOR_LEN, 256k
@@
-200,7
+200,7
@@
* put in the same sector as U-Boot, and changing variables
* will erase U-Boot temporarily
*/
* put in the same sector as U-Boot, and changing variables
* will erase U-Boot temporarily
*/
-#define C
FG_ENV_IN_OWN_SECT
1
+#define C
ONFIG_ENV_IN_OWN_SECT
1
/* Define to allow the user to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
/* Define to allow the user to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
@@
-334,7
+334,7
@@
#define CFG_STACK_USAGE 0x10000 /* Reserve 64k for the stack usage */
#define CFG_MEM_END_USAGE ( CFG_MONITOR_LEN \
+ CFG_MALLOC_LEN \
#define CFG_STACK_USAGE 0x10000 /* Reserve 64k for the stack usage */
#define CFG_MEM_END_USAGE ( CFG_MONITOR_LEN \
+ CFG_MALLOC_LEN \
- + C
F
G_ENV_SECT_SIZE \
+ + C
ONFI
G_ENV_SECT_SIZE \
+ CFG_STACK_USAGE )
#define CFG_MEMTEST_END ( CFG_SDRAM_SIZE * 1024 * 1024 \
+ CFG_STACK_USAGE )
#define CFG_MEMTEST_END ( CFG_SDRAM_SIZE * 1024 * 1024 \
@@
-463,20
+463,20
@@
#ifndef CFG_RAMBOOT
# define CONFIG_ENV_IS_IN_FLASH 1
#ifndef CFG_RAMBOOT
# define CONFIG_ENV_IS_IN_FLASH 1
-# ifdef C
F
G_ENV_IN_OWN_SECT
-# define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
-# define C
FG_ENV_SECT_SIZE
0x40000
+# ifdef C
ONFI
G_ENV_IN_OWN_SECT
+# define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
+# define C
ONFIG_ENV_SECT_SIZE
0x40000
# else
# else
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CF
G_ENV_SECT_SIZE)
-# define C
FG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
-# define C
FG_ENV_SECT_SIZE
0x40000 /* see README - env sect real size */
-# endif /* C
F
G_ENV_IN_OWN_SECT */
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CONFI
G_ENV_SECT_SIZE)
+# define C
ONFIG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
+# define C
ONFIG_ENV_SECT_SIZE
0x40000 /* see README - env sect real size */
+# endif /* C
ONFI
G_ENV_IN_OWN_SECT */
#else
# define CONFIG_ENV_IS_IN_FLASH 1
#else
# define CONFIG_ENV_IS_IN_FLASH 1
-# define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x40000)
-#define C
FG_ENV_SIZE
0x1000
-# define C
FG_ENV_SECT_SIZE
0x40000
+# define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x40000)
+#define C
ONFIG_ENV_SIZE
0x1000
+# define C
ONFIG_ENV_SECT_SIZE
0x40000
#endif /* CFG_RAMBOOT */
/*-----------------------------------------------------------------------
#endif /* CFG_RAMBOOT */
/*-----------------------------------------------------------------------
diff --git
a/include/configs/purple.h
b/include/configs/purple.h
index
59743df
..
5cc4fc7
100644
(file)
--- a/
include/configs/purple.h
+++ b/
include/configs/purple.h
@@
-146,8
+146,8
@@
#define CONFIG_ENV_IS_IN_FLASH 1
/* Address and size of Primary Environment Sector */
#define CONFIG_ENV_IS_IN_FLASH 1
/* Address and size of Primary Environment Sector */
-#define C
FG_ENV_ADDR
0xB0008000
-#define C
FG_ENV_SIZE
0x4000
+#define C
ONFIG_ENV_ADDR
0xB0008000
+#define C
ONFIG_ENV_SIZE
0x4000
#define CONFIG_FLASH_32BIT
#define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_FLASH_32BIT
#define CONFIG_NR_DRAM_BANKS 1
diff --git
a/include/configs/pxa255_idp.h
b/include/configs/pxa255_idp.h
index
9f83c7d
..
1afff5e
100644
(file)
--- a/
include/configs/pxa255_idp.h
+++ b/
include/configs/pxa255_idp.h
@@
-71,7
+71,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-350,8
+350,8
@@
/* put cfg at end of flash for now */
#define CONFIG_ENV_IS_IN_FLASH 1
/* Addr of Environment Sector */
/* put cfg at end of flash for now */
#define CONFIG_ENV_IS_IN_FLASH 1
/* Addr of Environment Sector */
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + PHYS_FLASH_SIZE - 0x40000)
-#define C
FG_ENV_SIZE
PHYS_FLASH_SECT_SIZE /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
(PHYS_FLASH_SECT_SIZE / 16)
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + PHYS_FLASH_SIZE - 0x40000)
+#define C
ONFIG_ENV_SIZE
PHYS_FLASH_SECT_SIZE /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
(PHYS_FLASH_SECT_SIZE / 16)
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/qemu-mips.h
b/include/configs/qemu-mips.h
index
e03e710
..
faaa889
100644
(file)
--- a/
include/configs/qemu-mips.h
+++ b/
include/configs/qemu-mips.h
@@
-150,10
+150,10
@@
#define CFG_FLASH_USE_BUFFER_WRITE 1
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_USE_BUFFER_WRITE 1
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x40000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x40000)
/* Address and size of Primary Environment Sector */
/* Address and size of Primary Environment Sector */
-#define C
FG_ENV_SIZE
0x8000
+#define C
ONFIG_ENV_SIZE
0x8000
#define CONFIG_ENV_OVERWRITE 1
#define CONFIG_ENV_OVERWRITE 1
diff --git
a/include/configs/quad100hd.h
b/include/configs/quad100hd.h
index
ad7f290
..
3d78ac4
100644
(file)
--- a/
include/configs/quad100hd.h
+++ b/
include/configs/quad100hd.h
@@
-199,18
+199,18
@@
#define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
/* the environment is located before u-boot */
/* the environment is located before u-boot */
-#define C
FG_ENV_ADDR (TEXT_BASE - CF
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_ADDR (TEXT_BASE - CONFI
G_ENV_SECT_SIZE)
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR - CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SECT_SIZE)
#endif
#ifdef CONFIG_ENV_IS_IN_EEPROM
#endif
#ifdef CONFIG_ENV_IS_IN_EEPROM
-#define C
FG_ENV_SIZE
0x400 /* Size of Environment vars */
-#define C
FG_ENV_OFFSET
0x00000000
+#define C
ONFIG_ENV_SIZE
0x400 /* Size of Environment vars */
+#define C
ONFIG_ENV_OFFSET
0x00000000
#define CFG_ENABLE_CRC_16 1 /* Intrinsyc formatting used crc16 */
#endif
#define CFG_ENABLE_CRC_16 1 /* Intrinsyc formatting used crc16 */
#endif
diff --git
a/include/configs/quantum.h
b/include/configs/quantum.h
index
a35418f
..
f264615
100644
(file)
--- a/
include/configs/quantum.h
+++ b/
include/configs/quantum.h
@@
-209,14
+209,14
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x00F40000 /* Offset of Environment Sector absolute address 0xfff40000*/
-#define C
FG_ENV_SECT_SIZE
0x40000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+#define C
ONFIG_ENV_OFFSET
0x00F40000 /* Offset of Environment Sector absolute address 0xfff40000*/
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/* FPGA */
#define CONFIG_MISC_INIT_R
/* FPGA */
#define CONFIG_MISC_INIT_R
diff --git
a/include/configs/r2dplus.h
b/include/configs/r2dplus.h
index
666219e
..
41a2a15
100644
(file)
--- a/
include/configs/r2dplus.h
+++ b/
include/configs/r2dplus.h
@@
-72,9
+72,9
@@
#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE }
#define CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE }
#define CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x40000
-#define C
FG_ENV_SIZE (CF
G_ENV_SECT_SIZE)
-#define C
F
G_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SECT_SIZE
0x40000
+#define C
ONFIG_ENV_SIZE (CONFI
G_ENV_SECT_SIZE)
+#define C
ONFI
G_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
/*
* SuperH Clock setting
/*
* SuperH Clock setting
diff --git
a/include/configs/r7780mp.h
b/include/configs/r7780mp.h
index
7123a83
..
4f3f8e5
100644
(file)
--- a/
include/configs/r7780mp.h
+++ b/
include/configs/r7780mp.h
@@
-113,9
+113,9
@@
#define CFG_FLASH_EMPTY_INFO
#define CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_EMPTY_INFO
#define CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
(256 * 1024)
-#define C
FG_ENV_SIZE (CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SECT_SIZE
(256 * 1024)
+#define C
ONFIG_ENV_SIZE (CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#define CFG_FLASH_ERASE_TOUT 120000
#define CFG_FLASH_WRITE_TOUT 500
#define CFG_FLASH_ERASE_TOUT 120000
#define CFG_FLASH_WRITE_TOUT 500
diff --git
a/include/configs/redwood.h
b/include/configs/redwood.h
index
c825f13
..
dac323b
100644
(file)
--- a/
include/configs/redwood.h
+++ b/
include/configs/redwood.h
@@
-176,9
+176,9
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
-#define C
FG_ENV_ADDR
0xfffa0000
-#define C
FG_ENV_SIZE
0x10000 /* Size of Environment vars */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR
0xfffa0000
+#define C
ONFIG_ENV_SIZE
0x10000 /* Size of Environment vars */
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*---------------------------------------------------------------------------*/
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*---------------------------------------------------------------------------*/
diff --git
a/include/configs/rmu.h
b/include/configs/rmu.h
index
46f94da
..
0c0b206
100644
(file)
--- a/
include/configs/rmu.h
+++ b/
include/configs/rmu.h
@@
-189,12
+189,12
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
((TEXT_BASE) + 0x40000)
-#define C
FG_ENV_SIZE
0x40000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_ADDR
((TEXT_BASE) + 0x40000)
+#define C
ONFIG_ENV_SIZE
0x40000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR+CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*-----------------------------------------------------------------------
* Reset address
/*-----------------------------------------------------------------------
* Reset address
diff --git
a/include/configs/rsdproto.h
b/include/configs/rsdproto.h
index
89db35b
..
09913a9
100644
(file)
--- a/
include/configs/rsdproto.h
+++ b/
include/configs/rsdproto.h
@@
-292,8
+292,8
@@
#undef CONFIG_NVRAM_ENV
#define CONFIG_ENV_IS_IN_FLASH 1
#undef CONFIG_NVRAM_ENV
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(PHYS_FLASH + 0x28000) /* Addr of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x8000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH + 0x28000) /* Addr of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x8000 /* Total Size of Environment Sector */
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/rsk7203.h
b/include/configs/rsk7203.h
index
f6b013c
..
d99e4f3
100644
(file)
--- a/
include/configs/rsk7203.h
+++ b/
include/configs/rsk7203.h
@@
-93,9
+93,9
@@
#define CFG_MAX_FLASH_BANKS 1
#define CONFIG_ENV_IS_IN_FLASH
#define CFG_MAX_FLASH_BANKS 1
#define CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
(64 * 1024)
-#define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SECT_SIZE
(64 * 1024)
+#define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#define CFG_FLASH_ERASE_TOUT 12000
#define CFG_FLASH_WRITE_TOUT 500
#define CFG_FLASH_ERASE_TOUT 12000
#define CFG_FLASH_WRITE_TOUT 500
diff --git
a/include/configs/sacsng.h
b/include/configs/sacsng.h
index
bce8c9c
..
560bf05
100644
(file)
--- a/
include/configs/sacsng.h
+++ b/
include/configs/sacsng.h
@@
-124,7
+124,7
@@
* Monitor Stack Buffer (0x80)
* 0x03F5 FFB0 Board Info Data
* 0x03F6 0000 Malloc Arena
* Monitor Stack Buffer (0x80)
* 0x03F5 FFB0 Board Info Data
* 0x03F6 0000 Malloc Arena
- * : C
F
G_ENV_SECT_SIZE, 16k
+ * : C
ONFI
G_ENV_SECT_SIZE, 16k
* : CFG_MALLOC_LEN, 128k
* 0x03FC 0000 RAM Copy of Monitor Code
* : CFG_MONITOR_LEN, 256k
* : CFG_MALLOC_LEN, 128k
* 0x03FC 0000 RAM Copy of Monitor Code
* : CFG_MONITOR_LEN, 256k
@@
-316,7
+316,7
@@
* put in the same sector as U-Boot, and changing variables
* will erase U-Boot temporarily
*/
* put in the same sector as U-Boot, and changing variables
* will erase U-Boot temporarily
*/
-#define C
FG_ENV_IN_OWN_SECT
1
+#define C
ONFIG_ENV_IN_OWN_SECT
1
/* Define this to contain any number of null terminated strings that
* will be part of the default enviroment compiled into the boot image.
/* Define this to contain any number of null terminated strings that
* will be part of the default enviroment compiled into the boot image.
@@
-610,7
+610,7
@@
#define CFG_STACK_USAGE 0x10000 /* Reserve 64k for the stack usage */
#define CFG_MEM_END_USAGE ( CFG_MONITOR_LEN \
+ CFG_MALLOC_LEN \
#define CFG_STACK_USAGE 0x10000 /* Reserve 64k for the stack usage */
#define CFG_MEM_END_USAGE ( CFG_MONITOR_LEN \
+ CFG_MALLOC_LEN \
- + C
F
G_ENV_SECT_SIZE \
+ + C
ONFI
G_ENV_SECT_SIZE \
+ CFG_STACK_USAGE )
#define CFG_MEMTEST_END ( CFG_SDRAM_SIZE * 1024 * 1024 \
+ CFG_STACK_USAGE )
#define CFG_MEMTEST_END ( CFG_SDRAM_SIZE * 1024 * 1024 \
@@
-709,19
+709,19
@@
#ifndef CFG_RAMBOOT
# define CONFIG_ENV_IS_IN_FLASH 1
#ifndef CFG_RAMBOOT
# define CONFIG_ENV_IS_IN_FLASH 1
-# ifdef C
F
G_ENV_IN_OWN_SECT
-# define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
-# define C
FG_ENV_SECT_SIZE
0x10000
+# ifdef C
ONFI
G_ENV_IN_OWN_SECT
+# define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+# define C
ONFIG_ENV_SECT_SIZE
0x10000
# else
# else
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CF
G_ENV_SECT_SIZE)
-# define C
FG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
-# define C
FG_ENV_SECT_SIZE
0x10000 /* see README - env sect real size */
-# endif /* C
F
G_ENV_IN_OWN_SECT */
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CONFI
G_ENV_SECT_SIZE)
+# define C
ONFIG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
+# define C
ONFIG_ENV_SECT_SIZE
0x10000 /* see README - env sect real size */
+# endif /* C
ONFI
G_ENV_IN_OWN_SECT */
#else
# define CONFIG_ENV_IS_IN_NVRAM 1
#else
# define CONFIG_ENV_IS_IN_NVRAM 1
-# define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
-# define C
FG_ENV_SIZE
0x200
+# define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+# define C
ONFIG_ENV_SIZE
0x200
#endif /* CFG_RAMBOOT */
/*-----------------------------------------------------------------------
#endif /* CFG_RAMBOOT */
/*-----------------------------------------------------------------------
diff --git
a/include/configs/sbc2410x.h
b/include/configs/sbc2410x.h
index
8c14e8b
..
110ab39
100644
(file)
--- a/
include/configs/sbc2410x.h
+++ b/
include/configs/sbc2410x.h
@@
-57,7
+57,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-180,13
+180,13
@@
#ifdef CONFIG_AMD_LV800
#define PHYS_FLASH_SIZE 0x00100000 /* 1MB */
#define CFG_MAX_FLASH_SECT (19) /* max number of sectors on one chip */
#ifdef CONFIG_AMD_LV800
#define PHYS_FLASH_SIZE 0x00100000 /* 1MB */
#define CFG_MAX_FLASH_SECT (19) /* max number of sectors on one chip */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x0F0000) /* addr of environment */
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x0F0000) /* addr of environment */
#endif
#ifdef CONFIG_AMD_LV400
#define PHYS_FLASH_SIZE 0x00080000 /* 512KB */
#define CFG_MAX_FLASH_SECT (11) /* max number of sectors on one chip */
#endif
#ifdef CONFIG_AMD_LV400
#define PHYS_FLASH_SIZE 0x00080000 /* 512KB */
#define CFG_MAX_FLASH_SECT (11) /* max number of sectors on one chip */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x070000) /* addr of environment */
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x070000) /* addr of environment */
#endif
/* timeout values are in ticks */
#endif
/* timeout values are in ticks */
@@
-194,7
+194,7
@@
#define CFG_FLASH_WRITE_TOUT (5*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT (5*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x10000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x10000 /* Total Size of Environment Sector */
/*-----------------------------------------------------------------------
* NAND flash settings
/*-----------------------------------------------------------------------
* NAND flash settings
diff --git
a/include/configs/sbc405.h
b/include/configs/sbc405.h
index
33eeca2
..
759e4e2
100644
(file)
--- a/
include/configs/sbc405.h
+++ b/
include/configs/sbc405.h
@@
-227,11
+227,11
@@
/*-----------------------------------------------------------------------
* Environment Variable setup
*/
/*-----------------------------------------------------------------------
* Environment Variable setup
*/
-#define C
FG_ENV_ADDR
CFG_FLASH_BASE /* starting right at the beginning */
+#define C
ONFIG_ENV_ADDR
CFG_FLASH_BASE /* starting right at the beginning */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0 /* starting right at the beginning */
-#define C
FG_ENV_SECT_SIZE
0x40000 /* see README - env sector total size */
-#define C
FG_ENV_SIZE
0x40000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0 /* starting right at the beginning */
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* see README - env sector total size */
+#define C
ONFIG_ENV_SIZE
0x40000 /* Total Size of Environment Sector */
/*-----------------------------------------------------------------------
* External Bus Controller (EBC) Setup
/*-----------------------------------------------------------------------
* External Bus Controller (EBC) Setup
diff --git
a/include/configs/sbc8240.h
b/include/configs/sbc8240.h
index
6e3c160
..
10ff7ab
100644
(file)
--- a/
include/configs/sbc8240.h
+++ b/
include/configs/sbc8240.h
@@
-340,10
+340,10
@@
typedef unsigned int led_id_t;
* It's stored in flash separately.
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* It's stored in flash separately.
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
0xFFF70000
-#define C
FG_ENV_SIZE
0x4000 /* Size of the Environment */
-#define C
FG_ENV_OFFSET
0 /* starting right at the beginning */
-#define C
FG_ENV_SECT_SIZE
0x40000 /* Size of the Environment Sector */
+#define C
ONFIG_ENV_ADDR
0xFFF70000
+#define C
ONFIG_ENV_SIZE
0x4000 /* Size of the Environment */
+#define C
ONFIG_ENV_OFFSET
0 /* starting right at the beginning */
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* Size of the Environment Sector */
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/sbc8260.h
b/include/configs/sbc8260.h
index
3a031de
..
e96adb9
100644
(file)
--- a/
include/configs/sbc8260.h
+++ b/
include/configs/sbc8260.h
@@
-127,7
+127,7
@@
* Monitor Stack Buffer (0x80)
* 0x00F5 FFB0 Board Info Data
* 0x00F6 0000 Malloc Arena
* Monitor Stack Buffer (0x80)
* 0x00F5 FFB0 Board Info Data
* 0x00F6 0000 Malloc Arena
- * : C
F
G_ENV_SECT_SIZE, 256k
+ * : C
ONFI
G_ENV_SECT_SIZE, 256k
* : CFG_MALLOC_LEN, 128k
* 0x00FC 0000 RAM Copy of Monitor Code
* : CFG_MONITOR_LEN, 256k
* : CFG_MALLOC_LEN, 128k
* 0x00FC 0000 RAM Copy of Monitor Code
* : CFG_MONITOR_LEN, 256k
@@
-150,7
+150,7
@@
* Monitor Stack Buffer (0x80)
* 0x03F5 FFB0 Board Info Data
* 0x03F6 0000 Malloc Arena
* Monitor Stack Buffer (0x80)
* 0x03F5 FFB0 Board Info Data
* 0x03F6 0000 Malloc Arena
- * : C
F
G_ENV_SECT_SIZE, 256k
+ * : C
ONFI
G_ENV_SECT_SIZE, 256k
* : CFG_MALLOC_LEN, 128k
* 0x03FC 0000 RAM Copy of Monitor Code
* : CFG_MONITOR_LEN, 256k
* : CFG_MALLOC_LEN, 128k
* 0x03FC 0000 RAM Copy of Monitor Code
* : CFG_MONITOR_LEN, 256k
@@
-275,7
+275,7
@@
* put in the same sector as U-Boot, and changing variables
* will erase U-Boot temporarily
*/
* put in the same sector as U-Boot, and changing variables
* will erase U-Boot temporarily
*/
-#define C
FG_ENV_IN_OWN_SECT
1
+#define C
ONFIG_ENV_IN_OWN_SECT
1
/* Define to allow the user to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
/* Define to allow the user to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
@@
-509,7
+509,7
@@
#define CFG_STACK_USAGE 0x10000 /* Reserve 64k for the stack usage */
#define CFG_MEM_END_USAGE ( CFG_MONITOR_LEN \
+ CFG_MALLOC_LEN \
#define CFG_STACK_USAGE 0x10000 /* Reserve 64k for the stack usage */
#define CFG_MEM_END_USAGE ( CFG_MONITOR_LEN \
+ CFG_MALLOC_LEN \
- + C
F
G_ENV_SECT_SIZE \
+ + C
ONFI
G_ENV_SECT_SIZE \
+ CFG_STACK_USAGE )
#define CFG_MEMTEST_END ( CFG_SDRAM_SIZE * 1024 * 1024 \
+ CFG_STACK_USAGE )
#define CFG_MEMTEST_END ( CFG_SDRAM_SIZE * 1024 * 1024 \
@@
-605,19
+605,19
@@
#ifndef CFG_RAMBOOT
# define CONFIG_ENV_IS_IN_FLASH 1
#ifndef CFG_RAMBOOT
# define CONFIG_ENV_IS_IN_FLASH 1
-# ifdef C
F
G_ENV_IN_OWN_SECT
-# define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
-# define C
FG_ENV_SECT_SIZE
0x40000
+# ifdef C
ONFI
G_ENV_IN_OWN_SECT
+# define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
+# define C
ONFIG_ENV_SECT_SIZE
0x40000
# else
# else
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CF
G_ENV_SECT_SIZE)
-# define C
FG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
-# define C
FG_ENV_SECT_SIZE
0x10000 /* see README - env sect real size */
-# endif /* C
F
G_ENV_IN_OWN_SECT */
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CFG_MONITOR_LEN - CONFI
G_ENV_SECT_SIZE)
+# define C
ONFIG_ENV_SIZE
0x1000 /* Total Size of Environment Sector */
+# define C
ONFIG_ENV_SECT_SIZE
0x10000 /* see README - env sect real size */
+# endif /* C
ONFI
G_ENV_IN_OWN_SECT */
#else
# define CONFIG_ENV_IS_IN_NVRAM 1
#else
# define CONFIG_ENV_IS_IN_NVRAM 1
-# define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
-# define C
FG_ENV_SIZE
0x200
+# define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+# define C
ONFIG_ENV_SIZE
0x200
#endif /* CFG_RAMBOOT */
/*-----------------------------------------------------------------------
#endif /* CFG_RAMBOOT */
/*-----------------------------------------------------------------------
diff --git
a/include/configs/sbc8349.h
b/include/configs/sbc8349.h
index
fa0ccd8
..
dc5a101
100644
(file)
--- a/
include/configs/sbc8349.h
+++ b/
include/configs/sbc8349.h
@@
-414,19
+414,19
@@
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
- #define C
FG_ENV_SECT_SIZE
0x20000 /* 128K(one sector) for env */
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
+ #define C
ONFIG_ENV_SECT_SIZE
0x20000 /* 128K(one sector) for env */
+ #define C
ONFIG_ENV_SIZE
0x2000
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+ #define C
ONFIG_ENV_SIZE
0x2000
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
diff --git
a/include/configs/sbc8548.h
b/include/configs/sbc8548.h
index
1f6dc3f
..
9d436c6
100644
(file)
--- a/
include/configs/sbc8548.h
+++ b/
include/configs/sbc8548.h
@@
-435,9
+435,9
@@
* Environment
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
-#define C
FG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
-#define C
FG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
+#define C
ONFIG_ENV_SIZE
0x2000
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
diff --git
a/include/configs/sbc8560.h
b/include/configs/sbc8560.h
index
72e4791
..
38ae1b1
100644
(file)
--- a/
include/configs/sbc8560.h
+++ b/
include/configs/sbc8560.h
@@
-333,19
+333,19
@@
#if !defined(CFG_RAMBOOT)
#if defined(CONFIG_RAM_AS_FLASH)
#define CONFIG_ENV_IS_NOWHERE
#if !defined(CFG_RAMBOOT)
#if defined(CONFIG_RAM_AS_FLASH)
#define CONFIG_ENV_IS_NOWHERE
- #define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x100000)
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x100000)
+ #define C
ONFIG_ENV_SIZE
0x2000
#else
#define CONFIG_ENV_IS_IN_FLASH 1
#else
#define CONFIG_ENV_IS_IN_FLASH 1
- #define C
FG_ENV_SECT_SIZE
0x20000 /* 128K(one sector) for env */
- #define C
FG_ENV_ADDR (CFG_MONITOR_BASE - CF
G_ENV_SECT_SIZE)
- #define C
FG_ENV_SIZE 0x2000 /* CF
G_ENV_SECT_SIZE */
+ #define C
ONFIG_ENV_SECT_SIZE
0x20000 /* 128K(one sector) for env */
+ #define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE - CONFI
G_ENV_SECT_SIZE)
+ #define C
ONFIG_ENV_SIZE 0x2000 /* CONFI
G_ENV_SECT_SIZE */
#endif
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#endif
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+ #define C
ONFIG_ENV_SIZE
0x2000
#endif
#define CONFIG_BOOTARGS "root=/dev/nfs rw ip=dhcp console=ttyS0,9600"
#endif
#define CONFIG_BOOTARGS "root=/dev/nfs rw ip=dhcp console=ttyS0,9600"
diff --git
a/include/configs/sbc8641d.h
b/include/configs/sbc8641d.h
index
40211a0
..
01003a3
100644
(file)
--- a/
include/configs/sbc8641d.h
+++ b/
include/configs/sbc8641d.h
@@
-470,9
+470,9
@@
* Environment
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
-#define C
FG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
-#define C
FG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + 0x40000)
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* 256K(one sector) for env */
+#define C
ONFIG_ENV_SIZE
0x2000
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
diff --git
a/include/configs/sc3.h
b/include/configs/sc3.h
index
1a614fd
..
88a24b8
100644
(file)
--- a/
include/configs/sc3.h
+++ b/
include/configs/sc3.h
@@
-406,13
+406,13
@@
extern unsigned long offsetOfEnvironment;
#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_OFFSET
0x00000000 /* Offset of Environment Sector in bottom type */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x4000 /* see README - env sector total size */
+#define C
ONFIG_ENV_OFFSET
0x00000000 /* Offset of Environment Sector in bottom type */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x4000 /* see README - env sector total size */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif
/* let us changing anything in our environment */
#endif
/* let us changing anything in our environment */
diff --git
a/include/configs/sc520_cdp.h
b/include/configs/sc520_cdp.h
index
ecfd749
..
0042e30
100644
(file)
--- a/
include/configs/sc520_cdp.h
+++ b/
include/configs/sc520_cdp.h
@@
-63,7
+63,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CONFIG_MALLOC_SIZE (C
F
G_ENV_SIZE + 128*1024)
+#define CONFIG_MALLOC_SIZE (C
ONFI
G_ENV_SIZE + 128*1024)
#define CONFIG_BAUDRATE 9600
#define CONFIG_BAUDRATE 9600
@@
-146,8
+146,8
@@
/* Environment in EEPROM */
#define CONFIG_ENV_IS_IN_EEPROM 1
#define CONFIG_SPI
/* Environment in EEPROM */
#define CONFIG_ENV_IS_IN_EEPROM 1
#define CONFIG_SPI
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment EEPROM 16k is SPI is used or 128 bytes if MW is used*/
-#define C
F
G_ENV_OFFSET 0
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment EEPROM 16k is SPI is used or 128 bytes if MW is used*/
+#define C
ONFI
G_ENV_OFFSET 0
#define CONFIG_SC520_CDP_USE_SPI /* Store configuration in the SPI part */
#undef CONFIG_SC520_CDP_USE_MW /* Store configuration in the MicroWire part */
#define CONFIG_SPI_X 1
#define CONFIG_SC520_CDP_USE_SPI /* Store configuration in the SPI part */
#undef CONFIG_SC520_CDP_USE_MW /* Store configuration in the MicroWire part */
#define CONFIG_SPI_X 1
diff --git
a/include/configs/sc520_spunk.h
b/include/configs/sc520_spunk.h
index
a8f520c
..
4e5798c
100644
(file)
--- a/
include/configs/sc520_spunk.h
+++ b/
include/configs/sc520_spunk.h
@@
-59,7
+59,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CONFIG_MALLOC_SIZE (C
F
G_ENV_SIZE + 128*1024)
+#define CONFIG_MALLOC_SIZE (C
ONFI
G_ENV_SIZE + 128*1024)
#define CONFIG_BAUDRATE 9600
#define CONFIG_BAUDRATE 9600
@@
-154,9
+154,9
@@
#if 0
/* Environment in flash */
#define CONFIG_ENV_IS_IN_FLASH 1
#if 0
/* Environment in flash */
#define CONFIG_ENV_IS_IN_FLASH 1
-# define C
FG_ENV_ADDR
(0x387a0000) /* Addr of Environment Sector */
-# define C
FG_ENV_SIZE
0x20000 /* Total Size of Environment Sector (or 0x10000) */
-# define C
F
G_ENV_OFFSET 0
+# define C
ONFIG_ENV_ADDR
(0x387a0000) /* Addr of Environment Sector */
+# define C
ONFIG_ENV_SIZE
0x20000 /* Total Size of Environment Sector (or 0x10000) */
+# define C
ONFI
G_ENV_OFFSET 0
#else
/* Environment in EEPROM */
#else
/* Environment in EEPROM */
@@
-164,8
+164,8
@@
# define CONFIG_ENV_IS_IN_EEPROM 1
# define CONFIG_SPI
# define CONFIG_SPI_X 1
# define CONFIG_ENV_IS_IN_EEPROM 1
# define CONFIG_SPI
# define CONFIG_SPI_X 1
-# define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment EEPROM */
-# define C
F
G_ENV_OFFSET 0x1c00
+# define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment EEPROM */
+# define C
ONFI
G_ENV_OFFSET 0x1c00
#endif
#endif
diff --git
a/include/configs/scb9328.h
b/include/configs/scb9328.h
index
51826d7
..
1279955
100644
(file)
--- a/
include/configs/scb9328.h
+++ b/
include/configs/scb9328.h
@@
-105,7
+105,7
@@
/*
* Malloc pool need to host env + 128 Kb reserve for other allocations.
*/
/*
* Malloc pool need to host env + 128 Kb reserve for other allocations.
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + (128<<10) )
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + (128<<10) )
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
@@
-216,8
+216,8
@@
#define CFG_MONITOR_BASE 0x10000000
#define CFG_MONITOR_LEN 0x20000 /* 128b ( 1 flash sector ) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MONITOR_BASE 0x10000000
#define CFG_MONITOR_LEN 0x20000 /* 128b ( 1 flash sector ) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
0x10020000 /* absolute address for now */
-#define C
FG_ENV_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR
0x10020000 /* absolute address for now */
+#define C
ONFIG_ENV_SIZE
0x20000
#define CONFIG_ENV_OVERWRITE 1 /* env is not writable now */
#define CONFIG_ENV_OVERWRITE 1 /* env is not writable now */
diff --git
a/include/configs/sequoia.h
b/include/configs/sequoia.h
index
3574a6f
..
d39a894
100644
(file)
--- a/
include/configs/sequoia.h
+++ b/
include/configs/sequoia.h
@@
-116,7
+116,7
@@
#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 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 C
FG_ENV_IS_EMBEDDED
1 /* use embedded environment */
+#define C
ONFIG_ENV_IS_EMBEDDED
1 /* use embedded environment */
#endif
/*
#endif
/*
@@
-140,13
+140,13
@@
#define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
-#define C
FG_ENV_ADDR ((-CFG_MONITOR_LEN)-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR ((-CFG_MONITOR_LEN)-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif
/*
#endif
/*
@@
-202,9
+202,9
@@
* For NAND booting the environment is embedded in the U-Boot image. Please take
* look at the file board/amcc/sequoia/u-boot-nand.lds for details.
*/
* For NAND booting the environment is embedded in the U-Boot image. Please take
* look at the file board/amcc/sequoia/u-boot-nand.lds for details.
*/
-#define C
FG_ENV_SIZE
CFG_NAND_BLOCK_SIZE
-#define C
FG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CF
G_ENV_SIZE)
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET + CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
CFG_NAND_BLOCK_SIZE
+#define C
ONFIG_ENV_OFFSET (CFG_NAND_U_BOOT_OFFS + CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFI
G_ENV_SIZE)
#endif
/*
#endif
/*
diff --git
a/include/configs/sh7763rdp.h
b/include/configs/sh7763rdp.h
index
05e3f96
..
2daaeb0
100644
(file)
--- a/
include/configs/sh7763rdp.h
+++ b/
include/configs/sh7763rdp.h
@@
-104,13
+104,13
@@
#undef CFG_FLASH_PROTECTION
#undef CFG_DIRECT_FLASH_TFTP
#define CONFIG_ENV_IS_IN_FLASH
#undef CFG_FLASH_PROTECTION
#undef CFG_DIRECT_FLASH_TFTP
#define CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
(128 * 1024)
-#define C
FG_ENV_SIZE (CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE + (1 * CF
G_ENV_SECT_SIZE))
+#define C
ONFIG_ENV_SECT_SIZE
(128 * 1024)
+#define C
ONFIG_ENV_SIZE (CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + (1 * CONFI
G_ENV_SECT_SIZE))
/* Offset of env Flash sector relative to CFG_FLASH_BASE */
/* Offset of env Flash sector relative to CFG_FLASH_BASE */
-#define C
FG_ENV_OFFSET (CF
G_ENV_ADDR - CFG_FLASH_BASE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_ADDR_REDUND (CFG_FLASH_BASE + (2 * CF
G_ENV_SECT_SIZE))
+#define C
ONFIG_ENV_OFFSET (CONFI
G_ENV_ADDR - CFG_FLASH_BASE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CFG_FLASH_BASE + (2 * CONFI
G_ENV_SECT_SIZE))
/* Clock */
#define CONFIG_SYS_CLK_FREQ 66666666
/* Clock */
#define CONFIG_SYS_CLK_FREQ 66666666
diff --git
a/include/configs/sh7785lcr.h
b/include/configs/sh7785lcr.h
index
f9bbb4d
..
bf06f62
100644
(file)
--- a/
include/configs/sh7785lcr.h
+++ b/
include/configs/sh7785lcr.h
@@
-152,11
+152,11
@@
/* ENV setting */
#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OVERWRITE 1
/* ENV setting */
#define CONFIG_ENV_IS_IN_FLASH
#define CONFIG_ENV_OVERWRITE 1
-#define C
FG_ENV_SECT_SIZE
(256 * 1024)
-#define C
FG_ENV_SIZE (CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + CFG_MONITOR_LEN)
-#define C
FG_ENV_OFFSET (CF
G_ENV_ADDR - CFG_FLASH_BASE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SECT_SIZE
(256 * 1024)
+#define C
ONFIG_ENV_SIZE (CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_OFFSET (CONFI
G_ENV_ADDR - CFG_FLASH_BASE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SECT_SIZE)
/* Board Clock */
/* The SCIF used external clock. system clock only used timer. */
/* Board Clock */
/* The SCIF used external clock. system clock only used timer. */
diff --git
a/include/configs/shannon.h
b/include/configs/shannon.h
index
28fecf1
..
edc9a2e
100644
(file)
--- a/
include/configs/shannon.h
+++ b/
include/configs/shannon.h
@@
-48,7
+48,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-161,11
+161,11
@@
#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 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 C
FG_ENV_ADDR
(PHYS_FLASH_1 + 0x003E0000) /* Addr of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + 0x003E0000) /* Addr of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
#else
#else
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + 0x1C000) /* Addr of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/smdk2400.h
b/include/configs/smdk2400.h
index
35eebeb
..
15ae3da
100644
(file)
--- a/
include/configs/smdk2400.h
+++ b/
include/configs/smdk2400.h
@@
-50,7
+50,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-181,11
+181,11
@@
#define CONFIG_ENV_IS_IN_FLASH 1
/* Address and size of Primary Environment Sector */
#define CONFIG_ENV_IS_IN_FLASH 1
/* Address and size of Primary Environment Sector */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x40000)
-#define C
FG_ENV_SIZE
0x40000
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x40000)
+#define C
ONFIG_ENV_SIZE
0x40000
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/smdk2410.h
b/include/configs/smdk2410.h
index
86ebcba
..
cd0093e
100644
(file)
--- a/
include/configs/smdk2410.h
+++ b/
include/configs/smdk2410.h
@@
-47,7
+47,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-166,12
+166,12
@@
#ifdef CONFIG_AMD_LV800
#define PHYS_FLASH_SIZE 0x00100000 /* 1MB */
#define CFG_MAX_FLASH_SECT (19) /* max number of sectors on one chip */
#ifdef CONFIG_AMD_LV800
#define PHYS_FLASH_SIZE 0x00100000 /* 1MB */
#define CFG_MAX_FLASH_SECT (19) /* max number of sectors on one chip */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x0F0000) /* addr of environment */
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x0F0000) /* addr of environment */
#endif
#ifdef CONFIG_AMD_LV400
#define PHYS_FLASH_SIZE 0x00080000 /* 512KB */
#define CFG_MAX_FLASH_SECT (11) /* max number of sectors on one chip */
#endif
#ifdef CONFIG_AMD_LV400
#define PHYS_FLASH_SIZE 0x00080000 /* 512KB */
#define CFG_MAX_FLASH_SECT (11) /* max number of sectors on one chip */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x070000) /* addr of environment */
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x070000) /* addr of environment */
#endif
/* timeout values are in ticks */
#endif
/* timeout values are in ticks */
@@
-179,6
+179,6
@@
#define CFG_FLASH_WRITE_TOUT (5*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_WRITE_TOUT (5*CFG_HZ) /* Timeout for Flash Write */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x10000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x10000 /* Total Size of Environment Sector */
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/smdk6400.h
b/include/configs/smdk6400.h
index
4c5602b
..
ea65c0e
100644
(file)
--- a/
include/configs/smdk6400.h
+++ b/
include/configs/smdk6400.h
@@
-68,7
+68,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 1024 * 1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 1024 * 1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes for initial data */
/*
@@
-196,7
+196,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_FLASH_ERASE_TOUT (5 * CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (5 * CFG_HZ) /* Timeout for Flash Write */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/*
* SMDK6400 board specific data
/*
* SMDK6400 board specific data
@@
-222,7
+222,7
@@
/* NAND U-Boot load and start address */
#define CFG_UBOOT_BASE (CFG_MAPPED_RAM_BASE + 0x07e00000)
/* NAND U-Boot load and start address */
#define CFG_UBOOT_BASE (CFG_MAPPED_RAM_BASE + 0x07e00000)
-#define C
FG_ENV_OFFSET
0x0040000
+#define C
ONFIG_ENV_OFFSET
0x0040000
/* NAND configuration */
#define CFG_MAX_NAND_DEVICE 1
/* NAND configuration */
#define CFG_MAX_NAND_DEVICE 1
diff --git
a/include/configs/smmaco4.h
b/include/configs/smmaco4.h
index
cf92fa7
..
fd13dcd
100644
(file)
--- a/
include/configs/smmaco4.h
+++ b/
include/configs/smmaco4.h
@@
-204,9
+204,9
@@
#undef CFG_FLASH_USE_BUFFER_WRITE /* not supported yet for AMD */
#if !defined(CFG_LOWBOOT)
#undef CFG_FLASH_USE_BUFFER_WRITE /* not supported yet for AMD */
#if !defined(CFG_LOWBOOT)
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00760000 + 0x00800000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00760000 + 0x00800000)
#else /* CFG_LOWBOOT */
#else /* CFG_LOWBOOT */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00060000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00060000)
#endif /* CFG_LOWBOOT */
#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks
(= chip selects) */
#endif /* CFG_LOWBOOT */
#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks
(= chip selects) */
@@
-227,10
+227,10
@@
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x10000
-#define C
FG_ENV_SECT_SIZE
0x20000
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
0x10000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*
* Memory map
/*
* Memory map
diff --git
a/include/configs/socrates.h
b/include/configs/socrates.h
index
09e1c8c
..
867eb35
100644
(file)
--- a/
include/configs/socrates.h
+++ b/
include/configs/socrates.h
@@
-309,11
+309,11
@@
* Environment
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SECT_SIZE
0x20000 /* 128K(one sector) for env */
-#define C
FG_ENV_ADDR (CFG_MONITOR_BASE - CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x4000
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* 128K(one sector) for env */
+#define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE - CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x4000
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
diff --git
a/include/configs/sorcery.h
b/include/configs/sorcery.h
index
fef722b
..
4bc4afb
100644
(file)
--- a/
include/configs/sorcery.h
+++ b/
include/configs/sorcery.h
@@
-198,11
+198,11
@@
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x8000000 - 0x40000)
-#define C
FG_ENV_SIZE
0x4000 /* 16K */
-#define C
FG_ENV_SECT_SIZE
0x20000
-#define C
FG_ENV_ADDR_REDUND (CF
G_ENV_ADDR + 0x20000)
-#define C
FG_ENV_SIZE_REDUND CF
G_ENV_SIZE
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x8000000 - 0x40000)
+#define C
ONFIG_ENV_SIZE
0x4000 /* 16K */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR_REDUND (CONFI
G_ENV_ADDR + 0x20000)
+#define C
ONFIG_ENV_SIZE_REDUND CONFI
G_ENV_SIZE
#define CONFIG_ENV_OVERWRITE 1
#define CONFIG_ENV_OVERWRITE 1
diff --git
a/include/configs/spc1920.h
b/include/configs/spc1920.h
index
73fa97f
..
592cef1
100644
(file)
--- a/
include/configs/spc1920.h
+++ b/
include/configs/spc1920.h
@@
-186,8
+186,8
@@
/* Environment is in flash */
#define CONFIG_ENV_IS_IN_FLASH
/* Environment is in flash */
#define CONFIG_ENV_IS_IN_FLASH
-#define C
F
G_ENV_SECT_SIZE 0x40000 /* We use one complete sector */
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define C
ONFI
G_ENV_SECT_SIZE 0x40000 /* We use one complete sector */
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
#define CONFIG_ENV_OVERWRITE
#define CONFIG_ENV_OVERWRITE
diff --git
a/include/configs/spieval.h
b/include/configs/spieval.h
index
8df56e3
..
ab1c6f4
100644
(file)
--- a/
include/configs/spieval.h
+++ b/
include/configs/spieval.h
@@
-295,9
+295,9
@@
#undef CFG_FLASH_USE_BUFFER_WRITE /* not supported yet for AMD */
#if !defined(CFG_LOWBOOT)
#undef CFG_FLASH_USE_BUFFER_WRITE /* not supported yet for AMD */
#if !defined(CFG_LOWBOOT)
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00760000 + 0x00800000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00760000 + 0x00800000)
#else /* CFG_LOWBOOT */
#else /* CFG_LOWBOOT */
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00060000)
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00060000)
#endif /* CFG_LOWBOOT */
#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks
(= chip selects) */
#endif /* CFG_LOWBOOT */
#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks
(= chip selects) */
@@
-309,10
+309,10
@@
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x10000
-#define C
FG_ENV_SECT_SIZE
0x20000
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
0x10000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*
* Memory map
/*
* Memory map
diff --git
a/include/configs/stxgp3.h
b/include/configs/stxgp3.h
index
95230ac
..
e06256d
100644
(file)
--- a/
include/configs/stxgp3.h
+++ b/
include/configs/stxgp3.h
@@
-289,14
+289,14
@@
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
*/
#ifndef CFG_RAMBOOT
#define CONFIG_ENV_IS_IN_FLASH 1
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + 0x60000)
- #define C
FG_ENV_SECT_SIZE
0x4000 /* 16K (one top sector) for env */
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + 0x60000)
+ #define C
ONFIG_ENV_SECT_SIZE
0x4000 /* 16K (one top sector) for env */
+ #define C
ONFIG_ENV_SIZE
0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+ #define C
ONFIG_ENV_SIZE
0x2000
#endif
#define CONFIG_BOOTARGS "root=/dev/nfs rw ip=any console=ttyS1,38400"
#endif
#define CONFIG_BOOTARGS "root=/dev/nfs rw ip=any console=ttyS1,38400"
diff --git
a/include/configs/stxssa.h
b/include/configs/stxssa.h
index
21bb279
..
5926943
100644
(file)
--- a/
include/configs/stxssa.h
+++ b/
include/configs/stxssa.h
@@
-314,19
+314,19
@@
/* Environment - default config is in flash, see below */
#if 0 /* in EEPROM */
# define CONFIG_ENV_IS_IN_EEPROM 1
/* Environment - default config is in flash, see below */
#if 0 /* in EEPROM */
# define CONFIG_ENV_IS_IN_EEPROM 1
-# define C
FG_ENV_OFFSET
0
-# define C
FG_ENV_SIZE
2048
+# define C
ONFIG_ENV_OFFSET
0
+# define C
ONFIG_ENV_SIZE
2048
#else /* in flash */
# define CONFIG_ENV_IS_IN_FLASH 1
# ifdef CONFIG_STXSSA_4M
#else /* in flash */
# define CONFIG_ENV_IS_IN_FLASH 1
# ifdef CONFIG_STXSSA_4M
-# define C
FG_ENV_SECT_SIZE
0x20000
+# define C
ONFIG_ENV_SECT_SIZE
0x20000
# else /* default configuration - 64 MiB flash */
# else /* default configuration - 64 MiB flash */
-# define C
FG_ENV_SECT_SIZE
0x40000
+# define C
ONFIG_ENV_SECT_SIZE
0x40000
# endif
# endif
-# define C
FG_ENV_ADDR (CFG_MONITOR_BASE - CF
G_ENV_SECT_SIZE)
-# define C
FG_ENV_SIZE
0x4000
-# define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR - CF
G_ENV_SECT_SIZE)
-# define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+# define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE - CONFI
G_ENV_SECT_SIZE)
+# define C
ONFIG_ENV_SIZE
0x4000
+# define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFI
G_ENV_SECT_SIZE)
+# define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
diff --git
a/include/configs/stxxtc.h
b/include/configs/stxxtc.h
index
c8b54bf
..
7ba8b77
100644
(file)
--- a/
include/configs/stxxtc.h
+++ b/
include/configs/stxxtc.h
@@
-202,15
+202,15
@@
* FLASH organization
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* FLASH organization
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SECT_SIZE
0x10000
+#define C
ONFIG_ENV_SECT_SIZE
0x10000
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00000000)
-#define C
FG_ENV_OFFSET
0
-#define C
FG_ENV_SIZE
0x4000
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00000000)
+#define C
ONFIG_ENV_OFFSET
0
+#define C
ONFIG_ENV_SIZE
0x4000
-#define C
FG_ENV_ADDR_REDUND
(CFG_FLASH_BASE + 0x00010000)
-#define C
FG_ENV_OFFSET_REDUND
0
-#define C
FG_ENV_SIZE_REDUND CF
G_ENV_SIZE
+#define C
ONFIG_ENV_ADDR_REDUND
(CFG_FLASH_BASE + 0x00010000)
+#define C
ONFIG_ENV_OFFSET_REDUND
0
+#define C
ONFIG_ENV_SIZE_REDUND CONFI
G_ENV_SIZE
#define CFG_FLASH_CFI 1
#define CONFIG_FLASH_CFI_DRIVER 1
#define CFG_FLASH_CFI 1
#define CONFIG_FLASH_CFI_DRIVER 1
diff --git
a/include/configs/suzaku.h
b/include/configs/suzaku.h
index
5299733
..
cc9f6bd
100644
(file)
--- a/
include/configs/suzaku.h
+++ b/
include/configs/suzaku.h
@@
-91,8
+91,8
@@
* NVRAM organization
*/
#define CONFIG_ENV_IS_NOWHERE 1
* NVRAM organization
*/
#define CONFIG_ENV_IS_NOWHERE 1
-#define C
FG_ENV_SIZE
0x10000 /* Total Size of Environment Sector */
-#define C
FG_ENV_SECT_SIZE
0x10000 /* see README - env sector total size */
+#define C
ONFIG_ENV_SIZE
0x10000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* see README - env sector total size */
/*-----------------------------------------------------------------------
* Definitions for initial stack pointer and data area (in DPRAM)
/*-----------------------------------------------------------------------
* Definitions for initial stack pointer and data area (in DPRAM)
diff --git
a/include/configs/svm_sc8xx.h
b/include/configs/svm_sc8xx.h
index
b7831b4
..
9507846
100644
(file)
--- a/
include/configs/svm_sc8xx.h
+++ b/
include/configs/svm_sc8xx.h
@@
-230,19
+230,19
@@
#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_BOOT_8B
#define CONFIG_ENV_IS_IN_FLASH 1
#ifdef CONFIG_BOOT_8B
-#define C
FG_ENV_OFFSET
0x10000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x10000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x10000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x10000 /* Total Size of Environment Sector */
#elif defined (CONFIG_BOOT_16B)
#elif defined (CONFIG_BOOT_16B)
-#define C
FG_ENV_OFFSET
0x10000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x10000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x10000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x10000 /* Total Size of Environment Sector */
#elif defined (CONFIG_BOOT_32B)
#elif defined (CONFIG_BOOT_32B)
-#define C
FG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
#endif
/* Address and size of Redundant Environment Sector */
#endif
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*-----------------------------------------------------------------------
/*-----------------------------------------------------------------------
diff --git
a/include/configs/taihu.h
b/include/configs/taihu.h
index
ad0f5a9
..
bcb8732
100644
(file)
--- a/
include/configs/taihu.h
+++ b/
include/configs/taihu.h
@@
-206,13
+206,13
@@
unsigned char spi_read(void);
#define CFG_FLASH_WORD_SIZE unsigned short
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_WORD_SIZE unsigned short
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
-#define C
FG_ENV_ADDR (CFG_MONITOR_BASE-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
@@
-222,9
+222,9
@@
unsigned char spi_read(void);
#define CFG_NVRAM_SIZE 0x1ff8 /* NVRAM size */
#ifdef CONFIG_ENV_IS_IN_NVRAM
#define CFG_NVRAM_SIZE 0x1ff8 /* NVRAM size */
#ifdef CONFIG_ENV_IS_IN_NVRAM
-#define C
FG_ENV_SIZE
0x0ff8 /* Size of Environment vars */
-#define C
FG_ENV_ADDR
\
- (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
FG_ENV_SIZE)
/* Env*/
+#define C
ONFIG_ENV_SIZE
0x0ff8 /* Size of Environment vars */
+#define C
ONFIG_ENV_ADDR
\
+ (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
ONFIG_ENV_SIZE)
/* Env*/
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/taishan.h
b/include/configs/taishan.h
index
9bac0e2
..
08ec14c
100644
(file)
--- a/
include/configs/taishan.h
+++ b/
include/configs/taishan.h
@@
-101,13
+101,13
@@
#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_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
-#define C
FG_ENV_SECT_SIZE
0x40000 /* size of one complete sector */
-#define C
FG_ENV_ADDR (CFG_MONITOR_BASE-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*-----------------------------------------------------------------------
* E2PROM bootstrap configure value
/*-----------------------------------------------------------------------
* E2PROM bootstrap configure value
diff --git
a/include/configs/tb0229.h
b/include/configs/tb0229.h
index
cf2af93
..
bfb32fb
100644
(file)
--- a/
include/configs/tb0229.h
+++ b/
include/configs/tb0229.h
@@
-156,8
+156,8
@@
#define CONFIG_ENV_IS_IN_FLASH 1
/* Address and size of Primary Environment Sector */
#define CONFIG_ENV_IS_IN_FLASH 1
/* Address and size of Primary Environment Sector */
-#define C
FG_ENV_ADDR
0xBFC40000
-#define C
FG_ENV_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR
0xBFC40000
+#define C
ONFIG_ENV_SIZE
0x20000
#define CFG_DIRECT_FLASH_TFTP
#define CFG_DIRECT_FLASH_TFTP
diff --git
a/include/configs/trab.h
b/include/configs/trab.h
index
1c8d3ce
..
d6d463a
100644
(file)
--- a/
include/configs/trab.h
+++ b/
include/configs/trab.h
@@
-94,7
+94,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-407,18
+407,18
@@
/* Address and size of Primary Environment Sector */
#ifndef CONFIG_FLASH_8MB
/* Address and size of Primary Environment Sector */
#ifndef CONFIG_FLASH_8MB
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x60000)
-#define C
FG_ENV_SIZE
0x4000
-#define C
FG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x60000)
+#define C
ONFIG_ENV_SIZE
0x4000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
#else
#else
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x4000)
-#define C
FG_ENV_SIZE
0x4000
-#define C
FG_ENV_SECT_SIZE
0x4000
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x4000)
+#define C
ONFIG_ENV_SIZE
0x4000
+#define C
ONFIG_ENV_SECT_SIZE
0x4000
#endif
/* Address and size of Redundant Environment Sector */
#endif
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_ADDR+CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git
a/include/configs/trizepsiv.h
b/include/configs/trizepsiv.h
index
dcfb73c
..
b24979b
100644
(file)
--- a/
include/configs/trizepsiv.h
+++ b/
include/configs/trizepsiv.h
@@
-54,7
+54,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-310,12
+310,12
@@
/* Flash environment locations */
#define CONFIG_ENV_IS_IN_FLASH 1
/* Flash environment locations */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + CFG_MONITOR_LEN) /* Addr of Environment Sector */
-#define C
FG_ENV_SIZE
0x40000 /* Total Size of Environment */
-#define C
FG_ENV_SECT_SIZE
0x40000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + CFG_MONITOR_LEN) /* Addr of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x40000 /* Total Size of Environment */
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR+CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/uc100.h
b/include/configs/uc100.h
index
cdd7bdf
..
22ebf07
100644
(file)
--- a/
include/configs/uc100.h
+++ b/
include/configs/uc100.h
@@
-242,13
+242,13
@@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_MONITOR_BASE+CFG_MONITOR_LEN)
-#define C
FG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE+CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR+CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR+CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/uc101.h
b/include/configs/uc101.h
index
ac5285a
..
c709033
100644
(file)
--- a/
include/configs/uc101.h
+++ b/
include/configs/uc101.h
@@
-162,7
+162,7
@@
#define CFG_FLASH_SIZE 0x00800000 /* 8 MByte */
#define CFG_MAX_FLASH_SECT 140 /* max num of sects on one chip */
#define CFG_FLASH_SIZE 0x00800000 /* 8 MByte */
#define CFG_MAX_FLASH_SECT 140 /* max num of sects on one chip */
-#define C
FG_ENV_ADDR
(TEXT_BASE+0x40000) /* second sector */
+#define C
ONFIG_ENV_ADDR
(TEXT_BASE+0x40000) /* second sector */
#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks
(= chip selects) */
#define CFG_FLASH_ERASE_TOUT 240000 /* Flash Erase Timeout (in ms) */
#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks
(= chip selects) */
#define CFG_FLASH_ERASE_TOUT 240000 /* Flash Erase Timeout (in ms) */
@@
-177,10
+177,10
@@
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x4000
-#define C
FG_ENV_SECT_SIZE
0x10000
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
0x4000
+#define C
ONFIG_ENV_SECT_SIZE
0x10000
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
/*
* Memory map
/*
* Memory map
diff --git
a/include/configs/utx8245.h
b/include/configs/utx8245.h
index
2844c63
..
4355e1c
100644
(file)
--- a/
include/configs/utx8245.h
+++ b/
include/configs/utx8245.h
@@
-396,16
+396,16
@@
protect on ${u-boot_startaddr} ${u-boot_endaddr}"
#if 1 /* AMD AM29LV033C */
#define CFG_MAX_FLASH_SECT 64 /* Max number of sectors in one bank */
#if 1 /* AMD AM29LV033C */
#define CFG_MAX_FLASH_SECT 64 /* Max number of sectors in one bank */
-#define C
FG_ENV_ADDR
0xFFBF0000 /* flash sector SA63 */
-#define C
FG_ENV_SECT_SIZE
(64*1024) /* Size of the Environment Sector */
+#define C
ONFIG_ENV_ADDR
0xFFBF0000 /* flash sector SA63 */
+#define C
ONFIG_ENV_SECT_SIZE
(64*1024) /* Size of the Environment Sector */
#else /* AMD AM29LV116D */
#define CFG_MAX_FLASH_SECT 35 /* Max number of sectors in one bank */
#else /* AMD AM29LV116D */
#define CFG_MAX_FLASH_SECT 35 /* Max number of sectors in one bank */
-#define C
FG_ENV_ADDR
0xFF9FA000 /* flash sector SA33 */
-#define C
FG_ENV_SECT_SIZE
(8*1024) /* Size of the Environment Sector */
+#define C
ONFIG_ENV_ADDR
0xFF9FA000 /* flash sector SA33 */
+#define C
ONFIG_ENV_SECT_SIZE
(8*1024) /* Size of the Environment Sector */
#endif /* #if */
#endif /* #if */
-#define C
FG_ENV_SIZE CFG_ENV_SECT_SIZE
/* Size of the Environment */
-#define C
FG_ENV_OFFSET
0 /* starting right at the beginning */
+#define C
ONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
/* Size of the Environment */
+#define C
ONFIG_ENV_OFFSET
0 /* starting right at the beginning */
#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_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
diff --git
a/include/configs/v37.h
b/include/configs/v37.h
index
7e5f804
..
7504fa3
100644
(file)
--- a/
include/configs/v37.h
+++ b/
include/configs/v37.h
@@
-196,10
+196,10
@@
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_NVRAM 1
#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */
#define CONFIG_ENV_IS_IN_NVRAM 1
-#define C
FG_ENV_ADDR
0x80000000/* Address of Environment */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_ADDR
0x80000000/* Address of Environment */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
-#define C
FG_ENV_OFFSET
0
+#define C
ONFIG_ENV_OFFSET
0
/*-----------------------------------------------------------------------
* Cache Configuration
/*-----------------------------------------------------------------------
* Cache Configuration
diff --git
a/include/configs/v38b.h
b/include/configs/v38b.h
index
e0bd8c7
..
0f8d5a9
100644
(file)
--- a/
include/configs/v38b.h
+++ b/
include/configs/v38b.h
@@
-214,9
+214,9
@@
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(CFG_FLASH_BASE + 0x00040000)
-#define C
FG_ENV_SIZE
0x10000
-#define C
FG_ENV_SECT_SIZE
0x10000
+#define C
ONFIG_ENV_ADDR
(CFG_FLASH_BASE + 0x00040000)
+#define C
ONFIG_ENV_SIZE
0x10000
+#define C
ONFIG_ENV_SECT_SIZE
0x10000
#define CONFIG_ENV_OVERWRITE 1
/*
#define CONFIG_ENV_OVERWRITE 1
/*
diff --git
a/include/configs/v5fx30teval.h
b/include/configs/v5fx30teval.h
index
5132293
..
1636d42
100644
(file)
--- a/
include/configs/v5fx30teval.h
+++ b/
include/configs/v5fx30teval.h
@@
-28,10
+28,10
@@
/*Env*/
#define CONFIG_ENV_IS_IN_FLASH 1
/*Env*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x20000
-#define C
FG_ENV_SECT_SIZE
0x20000
-#define C
FG_ENV_OFFSET
0x1A0000
-#define C
FG_ENV_ADDR (XPAR_FLASH_MEM0_BASEADDR+CF
G_ENV_OFFSET)
+#define C
ONFIG_ENV_SIZE
0x20000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_OFFSET
0x1A0000
+#define C
ONFIG_ENV_ADDR (XPAR_FLASH_MEM0_BASEADDR+CONFI
G_ENV_OFFSET)
/*Misc*/
#define CFG_PROMPT "v5fx30t:/# " /* Monitor Command Prompt */
/*Misc*/
#define CFG_PROMPT "v5fx30t:/# " /* Monitor Command Prompt */
diff --git
a/include/configs/versatile.h
b/include/configs/versatile.h
index
4a54b90
..
6034cb7
100644
(file)
--- a/
include/configs/versatile.h
+++ b/
include/configs/versatile.h
@@
-71,7
+71,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-186,9
+186,9
@@
#define PHYS_FLASH_1 (CFG_FLASH_BASE)
#define CONFIG_ENV_IS_IN_FLASH 1 /* env in flash instead of CONFIG_ENV_IS_NOWHERE */
#define PHYS_FLASH_1 (CFG_FLASH_BASE)
#define CONFIG_ENV_IS_IN_FLASH 1 /* env in flash instead of CONFIG_ENV_IS_NOWHERE */
-#define C
F
G_ENV_SECT_SIZE 0x00020000 /* 256 KB sectors (x2) */
-#define C
F
G_ENV_SIZE 0x10000 /* Total Size of Environment Sector */
-#define C
F
G_ENV_OFFSET 0x01f00000 /* environment starts here */
-#define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+#define C
ONFI
G_ENV_SECT_SIZE 0x00020000 /* 256 KB sectors (x2) */
+#define C
ONFI
G_ENV_SIZE 0x10000 /* Total Size of Environment Sector */
+#define C
ONFI
G_ENV_OFFSET 0x01f00000 /* environment starts here */
+#define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/configs/virtlab2.h
b/include/configs/virtlab2.h
index
6250926
..
10dbed9
100644
(file)
--- a/
include/configs/virtlab2.h
+++ b/
include/configs/virtlab2.h
@@
-210,12
+210,12
@@
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MAX_FLASH_SECT 71 /* max number of sectors on one chip */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_OFFSET
0x8000 /* Offset of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_OFFSET_REDUND (CFG_ENV_OFFSET+CF
G_ENV_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET+CONFI
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
#define CFG_USE_PPCENV /* Environment embedded in sect .ppcenv */
diff --git
a/include/configs/voiceblue.h
b/include/configs/voiceblue.h
index
fee3ab9
..
312f720
100644
(file)
--- a/
include/configs/voiceblue.h
+++ b/
include/configs/voiceblue.h
@@
-75,11
+75,11
@@
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH
* Environment settings
*/
#define CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + CFG_MONITOR_LEN)
-#define C
FG_ENV_SIZE
(8 * 1024)
-#define C
FG_ENV_SECT_SIZE
(64 * 1024)
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR + CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND CF
G_ENV_SIZE
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + CFG_MONITOR_LEN)
+#define C
ONFIG_ENV_SIZE
(8 * 1024)
+#define C
ONFIG_ENV_SECT_SIZE
(64 * 1024)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND CONFI
G_ENV_SIZE
#define CONFIG_ENV_OVERWRITE
#define CONFIG_ENV_OVERWRITE
diff --git
a/include/configs/walnut.h
b/include/configs/walnut.h
index
fc267d1
..
9676cd6
100644
(file)
--- a/
include/configs/walnut.h
+++ b/
include/configs/walnut.h
@@
-161,13
+161,13
@@
#define CFG_FLASH_WORD_SIZE unsigned char
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_WORD_SIZE unsigned char
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
-#define C
FG_ENV_ADDR (CFG_MONITOR_BASE-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x4000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
@@
-177,9
+177,9
@@
#define CFG_NVRAM_SIZE 0x1ff8 /* NVRAM size */
#ifdef CONFIG_ENV_IS_IN_NVRAM
#define CFG_NVRAM_SIZE 0x1ff8 /* NVRAM size */
#ifdef CONFIG_ENV_IS_IN_NVRAM
-#define C
FG_ENV_SIZE
0x1000 /* Size of Environment vars */
-#define C
FG_ENV_ADDR
\
- (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
FG_ENV_SIZE)
/* Env */
+#define C
ONFIG_ENV_SIZE
0x1000 /* Size of Environment vars */
+#define C
ONFIG_ENV_ADDR
\
+ (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-C
ONFIG_ENV_SIZE)
/* Env */
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/wepep250.h
b/include/configs/wepep250.h
index
9baf730
..
2072f6e
100644
(file)
--- a/
include/configs/wepep250.h
+++ b/
include/configs/wepep250.h
@@
-98,7
+98,7
@@
/*
* Malloc pool need to host env + 128 Kb reserve for other allocations.
*/
/*
* Malloc pool need to host env + 128 Kb reserve for other allocations.
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + (128<<10) )
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + (128<<10) )
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
#define CONFIG_STACKSIZE (120<<10) /* stack size */
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
#define CONFIG_STACKSIZE (120<<10) /* stack size */
@@
-179,8
+179,8
@@
#define CFG_MONITOR_BASE PHYS_FLASH_1
#define CFG_MONITOR_LEN 0x20000 /* 128kb ( 1 flash sector ) */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_MONITOR_BASE PHYS_FLASH_1
#define CFG_MONITOR_LEN 0x20000 /* 128kb ( 1 flash sector ) */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
0x20000 /* absolute address for now */
-#define C
FG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
0x20000 /* absolute address for now */
+#define C
ONFIG_ENV_SIZE
0x2000
#undef CONFIG_ENV_OVERWRITE /* env is not writable now */
#undef CONFIG_ENV_OVERWRITE /* env is not writable now */
diff --git
a/include/configs/xaeniax.h
b/include/configs/xaeniax.h
index
3c32d9f
..
ec73224
100644
(file)
--- a/
include/configs/xaeniax.h
+++ b/
include/configs/xaeniax.h
@@
-109,7
+109,7
@@
* Size of malloc() pool; this lives below the uppermost 128 KiB which are
* used for the RAM copy of the uboot code
*/
* Size of malloc() pool; this lives below the uppermost 128 KiB which are
* used for the RAM copy of the uboot code
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-177,8
+177,8
@@
/* FIXME */
#define CONFIG_ENV_IS_IN_FLASH 1
/* FIXME */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + 0x40000)/* Addr of Environment Sector */
-#define C
FG_ENV_SIZE
0x40000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + 0x40000)/* Addr of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x40000 /* Total Size of Environment Sector */
/*
* Stack sizes
/*
* Stack sizes
diff --git
a/include/configs/xilinx-ppc440-generic.h
b/include/configs/xilinx-ppc440-generic.h
index
fdefc4e
..
e968651
100644
(file)
--- a/
include/configs/xilinx-ppc440-generic.h
+++ b/
include/configs/xilinx-ppc440-generic.h
@@
-28,10
+28,10
@@
/*Env*/
#define CONFIG_ENV_IS_IN_FLASH 1
/*Env*/
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_SIZE
0x20000
-#define C
FG_ENV_SECT_SIZE
0x20000
-#define C
FG_ENV_OFFSET
0x340000
-#define C
FG_ENV_ADDR (XPAR_FLASH_MEM0_BASEADDR+CF
G_ENV_OFFSET)
+#define C
ONFIG_ENV_SIZE
0x20000
+#define C
ONFIG_ENV_SECT_SIZE
0x20000
+#define C
ONFIG_ENV_OFFSET
0x340000
+#define C
ONFIG_ENV_ADDR (XPAR_FLASH_MEM0_BASEADDR+CONFI
G_ENV_OFFSET)
/*Misc*/
#define CFG_PROMPT "board:/# " /* Monitor Command Prompt */
/*Misc*/
#define CFG_PROMPT "board:/# " /* Monitor Command Prompt */
diff --git
a/include/configs/xilinx-ppc440.h
b/include/configs/xilinx-ppc440.h
index
40293cd
..
6c7abb2
100644
(file)
--- a/
include/configs/xilinx-ppc440.h
+++ b/
include/configs/xilinx-ppc440.h
@@
-30,7
+30,7
@@
#define CFG_SDRAM_BASE 0x0
#define CFG_MONITOR_BASE TEXT_BASE
#define CFG_MONITOR_LEN (192 * 1024)
#define CFG_SDRAM_BASE 0x0
#define CFG_MONITOR_BASE TEXT_BASE
#define CFG_MONITOR_LEN (192 * 1024)
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128 * 1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128 * 1024)
/*Uart*/
#define CONFIG_XILINX_UARTLITE
/*Uart*/
#define CONFIG_XILINX_UARTLITE
diff --git
a/include/configs/xm250.h
b/include/configs/xm250.h
index
d01898f
..
aac03a1
100644
(file)
--- a/
include/configs/xm250.h
+++ b/
include/configs/xm250.h
@@
-185,9
+185,9
@@
#define CFG_FLASH_PROTECTION /* "Real" (hardware) sectors protection */
#define CONFIG_ENV_IS_IN_FLASH 1
#define CFG_FLASH_PROTECTION /* "Real" (hardware) sectors protection */
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + 0x40000) /* Addr of Environment Sector */
-#define C
FG_ENV_SIZE
0x4000
-#define C
FG_ENV_SECT_SIZE
0x40000 /* Size of the Environment Sector */
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + 0x40000) /* Addr of Environment Sector */
+#define C
ONFIG_ENV_SIZE
0x4000
+#define C
ONFIG_ENV_SECT_SIZE
0x40000 /* Size of the Environment Sector */
#define CFG_MONITOR_LEN 0x20000 /* 128 KiB */
/******************************************************************************
#define CFG_MONITOR_LEN 0x20000 /* 128 KiB */
/******************************************************************************
diff --git
a/include/configs/xsengine.h
b/include/configs/xsengine.h
index
709423d
..
443392f
100644
(file)
--- a/
include/configs/xsengine.h
+++ b/
include/configs/xsengine.h
@@
-81,16
+81,16
@@
/* Environment settings */
#define CONFIG_ENV_OVERWRITE
#define CONFIG_ENV_IS_IN_FLASH 1
/* Environment settings */
#define CONFIG_ENV_OVERWRITE
#define CONFIG_ENV_IS_IN_FLASH 1
-#define C
FG_ENV_ADDR (PHYS_FLASH_1 + 0x40000)
/* Addr of Environment Sector (after monitor)*/
-#define C
FG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE
/* Size of the Environment Sector */
-#define C
FG_ENV_SIZE 0x4000
/* 16kB Total Size of Environment Sector */
+#define C
ONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x40000)
/* Addr of Environment Sector (after monitor)*/
+#define C
ONFIG_ENV_SECT_SIZE PHYS_FLASH_SECT_SIZE
/* Size of the Environment Sector */
+#define C
ONFIG_ENV_SIZE 0x4000
/* 16kB Total Size of Environment Sector */
/* timeout values are in ticks */
#define CFG_FLASH_ERASE_TOUT (75*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (50*CFG_HZ) /* Timeout for Flash Write */
/* Size of malloc() pool */
/* timeout values are in ticks */
#define CFG_FLASH_ERASE_TOUT (75*CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (50*CFG_HZ) /* Timeout for Flash Write */
/* Size of malloc() pool */
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 256*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 256*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/* Hardware drivers */
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/* Hardware drivers */
diff --git
a/include/configs/xupv2p.h
b/include/configs/xupv2p.h
index
7bd1424
..
0e33714
100644
(file)
--- a/
include/configs/xupv2p.h
+++ b/
include/configs/xupv2p.h
@@
-151,8
+151,8
@@
#define CFG_NO_FLASH 1
#define CONFIG_ENV_IS_NOWHERE 1
#define CFG_NO_FLASH 1
#define CONFIG_ENV_IS_NOWHERE 1
-#define C
FG_ENV_SIZE
0x1000
-#define C
FG_ENV_ADDR (CFG_MONITOR_BASE - CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_SIZE
0x1000
+#define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE - CONFI
G_ENV_SIZE)
/*
* BOOTP options
/*
* BOOTP options
diff --git
a/include/configs/yosemite.h
b/include/configs/yosemite.h
index
528776a
..
afdce82
100644
(file)
--- a/
include/configs/yosemite.h
+++ b/
include/configs/yosemite.h
@@
-119,13
+119,13
@@
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
-#define C
FG_ENV_ADDR (CFG_MONITOR_BASE-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
@@
-148,8
+148,8
@@
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
#ifdef CONFIG_ENV_IS_IN_EEPROM
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
#ifdef CONFIG_ENV_IS_IN_EEPROM
-#define C
FG_ENV_SIZE
0x200 /* Size of Environment vars */
-#define C
FG_ENV_OFFSET
0x0
+#define C
ONFIG_ENV_SIZE
0x200 /* Size of Environment vars */
+#define C
ONFIG_ENV_OFFSET
0x0
#endif /* CONFIG_ENV_IS_IN_EEPROM */
/* I2C SYSMON (LM75, AD7414 is almost compatible) */
#endif /* CONFIG_ENV_IS_IN_EEPROM */
/* I2C SYSMON (LM75, AD7414 is almost compatible) */
diff --git
a/include/configs/yucca.h
b/include/configs/yucca.h
index
d85da94
..
92d45d0
100644
(file)
--- a/
include/configs/yucca.h
+++ b/
include/configs/yucca.h
@@
-189,10
+189,10
@@
#define CFG_FLASH_2ND_ADDR 0xe7c00000 /* evb440SPe has 8 and 16bit device*/
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_2ND_ADDR 0xe7c00000 /* evb440SPe has 8 and 16bit device*/
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
-#define C
FG_ENV_ADDR
0xfffa0000
-/* #define C
FG_ENV_ADDR (CFG_MONITOR_BASE-CF
G_ENV_SECT_SIZE) */
-#define C
FG_ENV_SIZE
0x10000 /* Size of Environment vars */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR
0xfffa0000
+/* #define C
ONFIG_ENV_ADDR (CFG_MONITOR_BASE-CONFI
G_ENV_SECT_SIZE) */
+#define C
ONFIG_ENV_SIZE
0x10000 /* Size of Environment vars */
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
* PCI stuff
#endif /* CONFIG_ENV_IS_IN_FLASH */
/*-----------------------------------------------------------------------
* PCI stuff
diff --git
a/include/configs/zeus.h
b/include/configs/zeus.h
index
fdb4e37
..
ac4f813
100644
(file)
--- a/
include/configs/zeus.h
+++ b/
include/configs/zeus.h
@@
-227,13
+227,13
@@
#define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
#ifdef CONFIG_ENV_IS_IN_FLASH
#define CFG_FLASH_QUIET_TEST 1 /* don't warn upon unknown flash */
#ifdef CONFIG_ENV_IS_IN_FLASH
-#define C
FG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
-#define C
FG_ENV_ADDR ((-CFG_MONITOR_LEN)-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x20000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR ((-CFG_MONITOR_LEN)-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
0x2000 /* Total Size of Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------
diff --git
a/include/configs/zylonite.h
b/include/configs/zylonite.h
index
47ce15d
..
148079c
100644
(file)
--- a/
include/configs/zylonite.h
+++ b/
include/configs/zylonite.h
@@
-50,7
+50,7
@@
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (C
F
G_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (C
ONFI
G_ENV_SIZE + 128*1024)
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
/*
@@
-232,9
+232,9
@@
#define CFG_NO_FLASH 1
#define CONFIG_ENV_IS_IN_NAND 1
#define CFG_NO_FLASH 1
#define CONFIG_ENV_IS_IN_NAND 1
-#define C
FG_ENV_OFFSET
0x40000
-#define C
FG_ENV_OFFSET_REDUND
0x44000
-#define C
FG_ENV_SIZE
0x4000
+#define C
ONFIG_ENV_OFFSET
0x40000
+#define C
ONFIG_ENV_OFFSET_REDUND
0x44000
+#define C
ONFIG_ENV_SIZE
0x4000
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */
diff --git
a/include/environment.h
b/include/environment.h
index
6fcc8ec
..
1479eb6
100644
(file)
--- a/
include/environment.h
+++ b/
include/environment.h
@@
-38,48
+38,48
@@
*/
#if defined(CONFIG_ENV_IS_IN_FLASH)
*/
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_OFFSET
-# define C
FG_ENV_OFFSET (CF
G_ENV_ADDR - CFG_FLASH_BASE)
+# ifndef C
ONFI
G_ENV_OFFSET
+# define C
ONFIG_ENV_OFFSET (CONFI
G_ENV_ADDR - CFG_FLASH_BASE)
# endif
# endif
-# if !defined(C
FG_ENV_ADDR_REDUND) && defined(CF
G_ENV_OFFSET_REDUND)
-# define C
FG_ENV_ADDR_REDUND (CFG_FLASH_BASE + CF
G_ENV_OFFSET_REDUND)
+# if !defined(C
ONFIG_ENV_ADDR_REDUND) && defined(CONFI
G_ENV_OFFSET_REDUND)
+# define C
ONFIG_ENV_ADDR_REDUND (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET_REDUND)
# endif
# endif
-# if defined(C
FG_ENV_SECT_SIZE) || defined(CF
G_ENV_SIZE)
-# ifndef C
F
G_ENV_SECT_SIZE
-# define C
FG_ENV_SECT_SIZE CF
G_ENV_SIZE
+# if defined(C
ONFIG_ENV_SECT_SIZE) || defined(CONFI
G_ENV_SIZE)
+# ifndef C
ONFI
G_ENV_SECT_SIZE
+# define C
ONFIG_ENV_SECT_SIZE CONFI
G_ENV_SIZE
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# else
# endif
# else
-# error "Both C
FG_ENV_SECT_SIZE and CF
G_ENV_SIZE undefined"
+# error "Both C
ONFIG_ENV_SECT_SIZE and CONFI
G_ENV_SIZE undefined"
# endif
# endif
-# if defined(C
FG_ENV_ADDR_REDUND) && !defined(CF
G_ENV_SIZE_REDUND)
-# define C
FG_ENV_SIZE_REDUND CF
G_ENV_SIZE
+# if defined(C
ONFIG_ENV_ADDR_REDUND) && !defined(CONFI
G_ENV_SIZE_REDUND)
+# define C
ONFIG_ENV_SIZE_REDUND CONFI
G_ENV_SIZE
# endif
# endif
-# if (C
F
G_ENV_ADDR >= CFG_MONITOR_BASE) && \
- (C
FG_ENV_ADDR+CF
G_ENV_SIZE) <= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+# if (C
ONFI
G_ENV_ADDR >= CFG_MONITOR_BASE) && \
+ (C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE) <= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
# define ENV_IS_EMBEDDED 1
# endif
# define ENV_IS_EMBEDDED 1
# endif
-# if defined(C
FG_ENV_ADDR_REDUND) || defined(CF
G_ENV_OFFSET_REDUND)
+# if defined(C
ONFIG_ENV_ADDR_REDUND) || defined(CONFI
G_ENV_OFFSET_REDUND)
# define CFG_REDUNDAND_ENVIRONMENT 1
# endif
#endif /* CONFIG_ENV_IS_IN_FLASH */
#if defined(CONFIG_ENV_IS_IN_NAND)
# define CFG_REDUNDAND_ENVIRONMENT 1
# endif
#endif /* CONFIG_ENV_IS_IN_FLASH */
#if defined(CONFIG_ENV_IS_IN_NAND)
-# ifndef C
F
G_ENV_OFFSET
-# error "Need to define C
F
G_ENV_OFFSET when using CONFIG_ENV_IS_IN_NAND"
+# ifndef C
ONFI
G_ENV_OFFSET
+# error "Need to define C
ONFI
G_ENV_OFFSET when using CONFIG_ENV_IS_IN_NAND"
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# error "Need to define C
F
G_ENV_SIZE when using CONFIG_ENV_IS_IN_NAND"
+# ifndef C
ONFI
G_ENV_SIZE
+# error "Need to define C
ONFI
G_ENV_SIZE when using CONFIG_ENV_IS_IN_NAND"
# endif
# endif
-# ifdef C
F
G_ENV_OFFSET_REDUND
+# ifdef C
ONFI
G_ENV_OFFSET_REDUND
# define CFG_REDUNDAND_ENVIRONMENT
# endif
# define CFG_REDUNDAND_ENVIRONMENT
# endif
-# ifdef C
F
G_ENV_IS_EMBEDDED
+# ifdef C
ONFI
G_ENV_IS_EMBEDDED
# define ENV_IS_EMBEDDED 1
# endif
#endif /* CONFIG_ENV_IS_IN_NAND */
# define ENV_IS_EMBEDDED 1
# endif
#endif /* CONFIG_ENV_IS_IN_NAND */
@@
-97,7
+97,7
@@
#endif
#endif
-#define ENV_SIZE (C
F
G_ENV_SIZE - ENV_HEADER_SIZE)
+#define ENV_SIZE (C
ONFI
G_ENV_SIZE - ENV_HEADER_SIZE)
typedef struct environment_s {
uint32_t crc; /* CRC32 over data bytes */
typedef struct environment_s {
uint32_t crc; /* CRC32 over data bytes */
diff --git
a/lib_m68k/board.c
b/lib_m68k/board.c
index
428a241
..
fa6ab6b
100644
(file)
--- a/
lib_m68k/board.c
+++ b/
lib_m68k/board.c
@@
-75,10
+75,10
@@
extern flash_info_t flash_info[];
#include <environment.h>
#include <environment.h>
-#if ( ((C
FG_ENV_ADDR+CF
G_ENV_SIZE) < CFG_MONITOR_BASE) || \
- (C
F
G_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \
+#if ( ((C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE) < CFG_MONITOR_BASE) || \
+ (C
ONFI
G_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \
defined(CONFIG_ENV_IS_IN_NVRAM)
defined(CONFIG_ENV_IS_IN_NVRAM)
-#define TOTAL_MALLOC_LEN (CFG_MALLOC_LEN + C
F
G_ENV_SIZE)
+#define TOTAL_MALLOC_LEN (CFG_MALLOC_LEN + C
ONFI
G_ENV_SIZE)
#else
#define TOTAL_MALLOC_LEN CFG_MALLOC_LEN
#endif
#else
#define TOTAL_MALLOC_LEN CFG_MALLOC_LEN
#endif
diff --git
a/lib_mips/board.c
b/lib_mips/board.c
index
fb31e33
..
8c1af76
100644
(file)
--- a/
lib_mips/board.c
+++ b/
lib_mips/board.c
@@
-33,10
+33,10
@@
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
-#if ( ((C
FG_ENV_ADDR+CF
G_ENV_SIZE) < CFG_MONITOR_BASE) || \
- (C
F
G_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \
+#if ( ((C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE) < CFG_MONITOR_BASE) || \
+ (C
ONFI
G_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \
defined(CONFIG_ENV_IS_IN_NVRAM)
defined(CONFIG_ENV_IS_IN_NVRAM)
-#define TOTAL_MALLOC_LEN (CFG_MALLOC_LEN + C
F
G_ENV_SIZE)
+#define TOTAL_MALLOC_LEN (CFG_MALLOC_LEN + C
ONFI
G_ENV_SIZE)
#else
#define TOTAL_MALLOC_LEN CFG_MALLOC_LEN
#endif
#else
#define TOTAL_MALLOC_LEN CFG_MALLOC_LEN
#endif
diff --git
a/lib_ppc/board.c
b/lib_ppc/board.c
index
cf6239f
..
c02ac62
100644
(file)
--- a/
lib_ppc/board.c
+++ b/
lib_ppc/board.c
@@
-106,12
+106,12
@@
extern int board_start_ide(void);
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
-#if defined(C
F
G_ENV_IS_EMBEDDED)
+#if defined(C
ONFI
G_ENV_IS_EMBEDDED)
#define TOTAL_MALLOC_LEN CFG_MALLOC_LEN
#define TOTAL_MALLOC_LEN CFG_MALLOC_LEN
-#elif ( ((C
FG_ENV_ADDR+CF
G_ENV_SIZE) < CFG_MONITOR_BASE) || \
- (C
F
G_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \
+#elif ( ((C
ONFIG_ENV_ADDR+CONFI
G_ENV_SIZE) < CFG_MONITOR_BASE) || \
+ (C
ONFI
G_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \
defined(CONFIG_ENV_IS_IN_NVRAM)
defined(CONFIG_ENV_IS_IN_NVRAM)
-#define TOTAL_MALLOC_LEN (CFG_MALLOC_LEN + C
F
G_ENV_SIZE)
+#define TOTAL_MALLOC_LEN (CFG_MALLOC_LEN + C
ONFI
G_ENV_SIZE)
#else
#define TOTAL_MALLOC_LEN CFG_MALLOC_LEN
#endif
#else
#define TOTAL_MALLOC_LEN CFG_MALLOC_LEN
#endif
diff --git
a/lib_sparc/board.c
b/lib_sparc/board.c
index
3c57fcb
..
9780bf2
100644
(file)
--- a/
lib_sparc/board.c
+++ b/
lib_sparc/board.c
@@
-267,7
+267,7
@@
void board_init_f(ulong bootflag)
*/
#ifdef DEBUG_MEM_LAYOUT
printf("CFG_MONITOR_BASE: 0x%lx\n", CFG_MONITOR_BASE);
*/
#ifdef DEBUG_MEM_LAYOUT
printf("CFG_MONITOR_BASE: 0x%lx\n", CFG_MONITOR_BASE);
- printf("C
FG_ENV_ADDR: 0x%lx\n", CF
G_ENV_ADDR);
+ printf("C
ONFIG_ENV_ADDR: 0x%lx\n", CONFI
G_ENV_ADDR);
printf("CFG_RELOC_MONITOR_BASE: 0x%lx (%d)\n", CFG_RELOC_MONITOR_BASE,
CFG_MONITOR_LEN);
printf("CFG_MALLOC_BASE: 0x%lx (%d)\n", CFG_MALLOC_BASE,
printf("CFG_RELOC_MONITOR_BASE: 0x%lx (%d)\n", CFG_RELOC_MONITOR_BASE,
CFG_MONITOR_LEN);
printf("CFG_MALLOC_BASE: 0x%lx (%d)\n", CFG_MALLOC_BASE,
diff --git
a/tools/env/fw_env.c
b/tools/env/fw_env.c
index
b6036c8
..
46747d3
100644
(file)
--- a/
tools/env/fw_env.c
+++ b/
tools/env/fw_env.c
@@
-80,7
+80,7
@@
static int dev_current;
#define ENVSECTORS(i) envdevices[(i)].env_sectors
#define DEVTYPE(i) envdevices[(i)].mtd_type
#define ENVSECTORS(i) envdevices[(i)].env_sectors
#define DEVTYPE(i) envdevices[(i)].mtd_type
-#define C
F
G_ENV_SIZE ENVSIZE(dev_current)
+#define C
ONFI
G_ENV_SIZE ENVSIZE(dev_current)
#define ENV_SIZE getenvsize()
#define ENV_SIZE getenvsize()
@@
-212,7
+212,7
@@
static int get_config (char *);
#endif
static inline ulong getenvsize (void)
{
#endif
static inline ulong getenvsize (void)
{
- ulong rc = C
F
G_ENV_SIZE - sizeof (long);
+ ulong rc = C
ONFI
G_ENV_SIZE - sizeof (long);
if (HaveRedundEnv)
rc -= sizeof (char);
if (HaveRedundEnv)
rc -= sizeof (char);
@@
-401,7
+401,7
@@
int fw_setenv (int argc, char *argv[])
++env;
/*
* Overflow when:
++env;
/*
* Overflow when:
- * "name" + "=" + "val" +"\0\0" > C
F
G_ENV_SIZE - (env-environment)
+ * "name" + "=" + "val" +"\0\0" > C
ONFI
G_ENV_SIZE - (env-environment)
*/
len = strlen (name) + 2;
/* add '=' for first arg, ' ' for all others */
*/
len = strlen (name) + 2;
/* add '=' for first arg, ' ' for all others */
@@
-753,7
+753,7
@@
static int flash_write (int fd_current, int fd_target, int dev_target)
DEVOFFSET (dev_target), DEVNAME (dev_target));
#endif
rc = flash_write_buf (dev_target, fd_target, environment.image,
DEVOFFSET (dev_target), DEVNAME (dev_target));
#endif
rc = flash_write_buf (dev_target, fd_target, environment.image,
- C
F
G_ENV_SIZE, DEVOFFSET (dev_target),
+ C
ONFI
G_ENV_SIZE, DEVOFFSET (dev_target),
DEVTYPE(dev_target));
if (rc < 0)
return rc;
DEVTYPE(dev_target));
if (rc < 0)
return rc;
@@
-790,10
+790,10
@@
static int flash_read (int fd)
DEVTYPE(dev_current) = mtdinfo.type;
DEVTYPE(dev_current) = mtdinfo.type;
- rc = flash_read_buf (dev_current, fd, environment.image, C
F
G_ENV_SIZE,
+ rc = flash_read_buf (dev_current, fd, environment.image, C
ONFI
G_ENV_SIZE,
DEVOFFSET (dev_current), mtdinfo.type);
DEVOFFSET (dev_current), mtdinfo.type);
- return (rc != C
F
G_ENV_SIZE) ? -1 : 0;
+ return (rc != C
ONFI
G_ENV_SIZE) ? -1 : 0;
}
static int flash_io (int mode)
}
static int flash_io (int mode)
@@
-890,11
+890,11
@@
static int env_init (void)
if (parse_config ()) /* should fill envdevices */
return -1;
if (parse_config ()) /* should fill envdevices */
return -1;
- addr0 = calloc (1, C
F
G_ENV_SIZE);
+ addr0 = calloc (1, C
ONFI
G_ENV_SIZE);
if (addr0 == NULL) {
fprintf (stderr,
"Not enough memory for environment (%ld bytes)\n",
if (addr0 == NULL) {
fprintf (stderr,
"Not enough memory for environment (%ld bytes)\n",
- C
F
G_ENV_SIZE);
+ C
ONFI
G_ENV_SIZE);
return -1;
}
return -1;
}
@@
-929,11
+929,11
@@
static int env_init (void)
flag0 = *environment.flags;
dev_current = 1;
flag0 = *environment.flags;
dev_current = 1;
- addr1 = calloc (1, C
F
G_ENV_SIZE);
+ addr1 = calloc (1, C
ONFI
G_ENV_SIZE);
if (addr1 == NULL) {
fprintf (stderr,
"Not enough memory for environment (%ld bytes)\n",
if (addr1 == NULL) {
fprintf (stderr,
"Not enough memory for environment (%ld bytes)\n",
- C
F
G_ENV_SIZE);
+ C
ONFI
G_ENV_SIZE);
return -1;
}
redundant = addr1;
return -1;
}
redundant = addr1;
diff --git
a/tools/envcrc.c
b/tools/envcrc.c
index
2f40051
..
ba28fa0
100644
(file)
--- a/
tools/envcrc.c
+++ b/
tools/envcrc.c
@@
-34,26
+34,26
@@
#undef __ASSEMBLY__
#if defined(CONFIG_ENV_IS_IN_FLASH)
#undef __ASSEMBLY__
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef C
F
G_ENV_ADDR
-# define C
FG_ENV_ADDR (CFG_FLASH_BASE + CF
G_ENV_OFFSET)
+# ifndef C
ONFI
G_ENV_ADDR
+# define C
ONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET)
# endif
# endif
-# ifndef C
F
G_ENV_OFFSET
-# define C
FG_ENV_OFFSET (CF
G_ENV_ADDR - CFG_FLASH_BASE)
+# ifndef C
ONFI
G_ENV_OFFSET
+# define C
ONFIG_ENV_OFFSET (CONFI
G_ENV_ADDR - CFG_FLASH_BASE)
# endif
# endif
-# if !defined(C
FG_ENV_ADDR_REDUND) && defined(CF
G_ENV_OFFSET_REDUND)
-# define C
FG_ENV_ADDR_REDUND (CFG_FLASH_BASE + CF
G_ENV_OFFSET_REDUND)
+# if !defined(C
ONFIG_ENV_ADDR_REDUND) && defined(CONFI
G_ENV_OFFSET_REDUND)
+# define C
ONFIG_ENV_ADDR_REDUND (CFG_FLASH_BASE + CONFI
G_ENV_OFFSET_REDUND)
# endif
# endif
-# ifndef C
F
G_ENV_SIZE
-# define C
FG_ENV_SIZE CF
G_ENV_SECT_SIZE
+# ifndef C
ONFI
G_ENV_SIZE
+# define C
ONFIG_ENV_SIZE CONFI
G_ENV_SECT_SIZE
# endif
# endif
-# if defined(C
FG_ENV_ADDR_REDUND) && !defined(CF
G_ENV_SIZE_REDUND)
-# define C
FG_ENV_SIZE_REDUND CF
G_ENV_SIZE
+# if defined(C
ONFIG_ENV_ADDR_REDUND) && !defined(CONFI
G_ENV_SIZE_REDUND)
+# define C
ONFIG_ENV_SIZE_REDUND CONFI
G_ENV_SIZE
# endif
# endif
-# if (C
F
G_ENV_ADDR >= CFG_MONITOR_BASE) && \
- ((C
FG_ENV_ADDR + CF
G_ENV_SIZE) <= (CFG_MONITOR_BASE + CFG_MONITOR_LEN))
+# if (C
ONFI
G_ENV_ADDR >= CFG_MONITOR_BASE) && \
+ ((C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE) <= (CFG_MONITOR_BASE + CFG_MONITOR_LEN))
# define ENV_IS_EMBEDDED 1
# endif
# define ENV_IS_EMBEDDED 1
# endif
-# if defined(C
FG_ENV_ADDR_REDUND) || defined(CF
G_ENV_OFFSET_REDUND)
+# if defined(C
ONFIG_ENV_ADDR_REDUND) || defined(CONFI
G_ENV_OFFSET_REDUND)
# define CFG_REDUNDAND_ENVIRONMENT 1
# endif
#endif /* CONFIG_ENV_IS_IN_FLASH */
# define CFG_REDUNDAND_ENVIRONMENT 1
# endif
#endif /* CONFIG_ENV_IS_IN_FLASH */
@@
-64,7
+64,7
@@
# define ENV_HEADER_SIZE (sizeof(uint32_t))
#endif
# define ENV_HEADER_SIZE (sizeof(uint32_t))
#endif
-#define ENV_SIZE (C
F
G_ENV_SIZE - ENV_HEADER_SIZE)
+#define ENV_SIZE (C
ONFI
G_ENV_SIZE - ENV_HEADER_SIZE)
extern uint32_t crc32 (uint32_t, const unsigned char *, unsigned int);
extern uint32_t crc32 (uint32_t, const unsigned char *, unsigned int);
diff --git
a/tools/updater/flash_hw.c
b/tools/updater/flash_hw.c
index
50b4df0
..
638844e
100644
(file)
--- a/
tools/updater/flash_hw.c
+++ b/
tools/updater/flash_hw.c
@@
-126,8
+126,8
@@
unsigned long flash_init (void)
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
#ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SECT_SIZE - 1,
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SECT_SIZE - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif