Skip to contentSkip to conversation

Makefile cleanup secound step

U-Boot Superseded Jean-Christophe PLAGNIOL-VILLARD 2 participants 28 messages Aug 31, 2008 – Sep 6, 2008

Subsystems (5)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

Hi,

The following patch series continues the Move conditional compilation to Makefile. it's apply after the patch series
"Makefile cleanup and u-boot size reduction"

It's available at git://git.denx.de/u-boot-arm.git branch Makefile-next

Best Regards,
J.

#1 lore raw

PATCH 1/25 cmd_vfd: Move conditional compilation to Makefile

---
 common/Makefile  |    2 +-
 common/cmd_vfd.c |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)
common/Makefile +1 -1
index 0fe9c8b..98b4dd4 100644
@@ -142,7 +142,7 @@ COBJS-$(CONFIG_USB_STORAGE) += usb_storage.o
 endif
 COBJS-$(CONFIG_CMD_XIMG) += cmd_ximg.o
 COBJS-$(CONFIG_YAFFS2) += cmd_yaffs2.o
-COBJS-y += cmd_vfd.o
+COBJS-$(CONFIG_VFD) += cmd_vfd.o
 COBJS-$(CONFIG_CMD_DOC) += docecc.o
 COBJS-y += flash.o
 COBJS-y += kgdb.o
common/cmd_vfd.c +0 -2
index 104c310..45f4271 100644
@@ -75,7 +75,6 @@ U_BOOT_CMD(
 );
 #endif
 
-#ifdef CONFIG_VFD
 int trab_vfd (ulong bitmap)
 {
 	uchar *addr;
@@ -103,4 +102,3 @@ int trab_vfd (ulong bitmap)
 	transfer_pic(3, addr, VFD_LOGO_HEIGHT, VFD_LOGO_WIDTH);
 	return 0;
 }
-#endif	/* CONFIG_VFD */
Signature · 1 line
1.5.6.3
#2 lore raw

PATCH 2/25 common/Makefile: add core command section

---
 common/Makefile |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
common/Makefile +5 -3
index 98b4dd4..5ba4561 100644
@@ -42,6 +42,11 @@ COBJS-y += s_record.o
 COBJS-y += serial.o
 COBJS-y += xyzModem.o
 
+#core command
+COBJS-y += cmd_boot.o
+COBJS-y += cmd_bootm.o
+COBJS-y += cmd_nvedit.o
+
 # environment
 COBJS-y += environment.o
 COBJS-y += env_common.o
@@ -60,9 +65,7 @@ COBJS-$(CONFIG_AUTOSCRIPT)$(CONFIG_CMD_AUTOSCRIPT) += cmd_autoscript.o
 COBJS-$(CONFIG_CMD_BDI) += cmd_bdinfo.o
 COBJS-$(CONFIG_CMD_BEDBUG) += bedbug.o cmd_bedbug.o
 COBJS-$(CONFIG_CMD_BMP) += cmd_bmp.o
-COBJS-y += cmd_boot.o
 COBJS-$(CONFIG_CMD_BOOTLDR) += cmd_bootldr.o
-COBJS-y += cmd_bootm.o
 COBJS-$(CONFIG_CMD_CACHE) += cmd_cache.o
 COBJS-$(CONFIG_CMD_CONSOLE) += cmd_console.o
 COBJS-$(CONFIG_CMD_CPLBINFO) += cmd_cplbinfo.o
@@ -117,7 +120,6 @@ COBJS-$(CONFIG_CMD_MMC) += cmd_mmc.o
 COBJS-$(CONFIG_MP) += cmd_mp.o
 COBJS-y += cmd_nand.o
 COBJS-$(CONFIG_CMD_NET) += cmd_net.o
-COBJS-y += cmd_nvedit.o
 COBJS-$(CONFIG_CMD_ONENAND) += cmd_onenand.o
 COBJS-$(CONFIG_CMD_OTP) += cmd_otp.o
 ifdef CONFIG_PCI
Signature · 1 line
1.5.6.3
#3 lore raw

PATCH 3/25 cmd_fdc: Move conditional compilation to Makefile

---
 common/Makefile  |    2 +-
 common/cmd_fdc.c |   12 ------------
 2 files changed, 1 insertions(+), 13 deletions(-)
common/Makefile +1 -1
index 5ba4561..9fa1157 100644
@@ -83,7 +83,7 @@ COBJS-y += cmd_eeprom.o
 COBJS-$(CONFIG_CMD_ELF) += cmd_elf.o
 COBJS-$(CONFIG_CMD_EXT2) += cmd_ext2.o
 COBJS-$(CONFIG_CMD_FAT) += cmd_fat.o
-COBJS-y += cmd_fdc.o
+COBJS-$(CONFIG_CMD_FDC)$(CONFIG_CMD_FDOS) += cmd_fdc.o
 COBJS-$(CONFIG_OF_LIBFDT) += cmd_fdt.o fdt_support.o
 COBJS-$(CONFIG_CMD_FDOS) += cmd_fdos.o
 COBJS-$(CONFIG_CMD_FLASH) += cmd_flash.o
common/cmd_fdc.c +0 -12
index 8493def..b663d60 100644
@@ -50,8 +50,6 @@
 /*#include <rtc.h> */
 /*#endif */
 
-#if defined(CONFIG_CMD_FDC) || defined(CONFIG_CMD_FDOS)
-
 typedef struct {
 	int		flags;		/* connected drives ect */
 	unsigned long	blnr;		/* Logical block nr */
@@ -705,7 +703,6 @@ int fdc_setup(int drive, FDC_COMMAND_STRUCT *pCMD, FD_GEO_STRUCT *pFG)
 
 	return TRUE;
 }
-#endif
 
 #if defined(CONFIG_CMD_FDOS)
 
@@ -903,15 +900,6 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	return rcode;
 }
 
-
-#endif
-
-
-/***************************************************/
-
-
-#if defined(CONFIG_CMD_FDC)
-
 U_BOOT_CMD(
 	fdcboot,	3,	1,	do_fdcboot,
 	"fdcboot - boot from floppy device\n",
Signature · 1 line
1.5.6.3
#4 lore raw

PATCH 4/25 cmd_mac: Move conditional compilation to Makefile

finish remaning CFG_ID_EEPROM in CONFIG_ID_EEPROM start in commit ad8f8687b78c3e917b173f038926695383c55555

---
 common/Makefile               |    2 +-
 common/cmd_mac.c              |    3 ---
 include/configs/MPC8536DS.h   |    4 ++--
 include/configs/MPC8610HPCD.h |    2 +-
 include/configs/MPC8641HPCN.h |    2 +-
 include/configs/sbc8641d.h    |    2 +-
 lib_ppc/board.c               |    2 +-
 lib_sparc/board.c             |    2 +-
 8 files changed, 8 insertions(+), 11 deletions(-)
common/Makefile +1 -1
index 9fa1157..3a20926 100644
@@ -110,7 +110,7 @@ COBJS-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o
 COBJS-$(CONFIG_CMD_LICENSE) += cmd_license.o
 COBJS-y += cmd_load.o
 COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o
-COBJS-y += cmd_mac.o
+COBJS-$(CONFIG_ID_EEPROM) += cmd_mac.o
 COBJS-y += cmd_mem.o
 COBJS-$(CONFIG_CMD_MFSL) += cmd_mfsl.o
 COBJS-$(CONFIG_MII)$(CONFIG_CMD_MII) += miiphyutil.o
common/cmd_mac.c +0 -3
index faed8f7..4453299 100644
@@ -24,8 +24,6 @@
 #include <common.h>
 #include <command.h>
 
-#ifdef CFG_ID_EEPROM
-
 extern int do_mac(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 
 U_BOOT_CMD(
@@ -63,4 +61,3 @@ U_BOOT_CMD(
 	"mac 7\n"
 	"    - program the MAC address for port 7\n"
 );
-#endif /* CFG_ID_EEPROM */
include/configs/MPC8536DS.h +2 -2
index 17cc934..dc304e7 100644
@@ -301,8 +301,8 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 /*
  * I2C2 EEPROM
  */
-#define CFG_ID_EEPROM
-#ifdef CFG_ID_EEPROM
+#define CONFIG_ID_EEPROM
+#ifdef CONFIG_ID_EEPROM
 #define CONFIG_ID_EEPROM
 #define CFG_I2C_EEPROM_NXID
 #endif
include/configs/MPC8610HPCD.h +1 -1
index 0c1c4fc..7c69582 100644
@@ -139,7 +139,7 @@
 
 #define CONFIG_ID_EEPROM
 #define CFG_I2C_EEPROM_NXID
-#define CFG_ID_EEPROM
+#define CONFIG_ID_EEPROM
 #define CFG_I2C_EEPROM_ADDR     0x57
 #define CFG_I2C_EEPROM_ADDR_LEN 1
 
include/configs/MPC8641HPCN.h +1 -1
index 54a0461..a57c303 100644
@@ -151,7 +151,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #define CONFIG_ID_EEPROM
 #define CFG_I2C_EEPROM_NXID
-#define CFG_ID_EEPROM
+#define CONFIG_ID_EEPROM
 #define CFG_I2C_EEPROM_ADDR     0x57
 #define CFG_I2C_EEPROM_ADDR_LEN 1
 
include/configs/sbc8641d.h +1 -1
index ddca527..c84240e 100644
@@ -179,7 +179,7 @@
 
 #endif
 
-/* #define CFG_ID_EEPROM	1
+/* #define CONFIG_ID_EEPROM	1
 #define ID_EEPROM_ADDR 0x57 */
 
 /*
lib_ppc/board.c +1 -1
index c8f075f..4d02eb2 100644
@@ -873,7 +873,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 	sc3_read_eeprom();
 #endif
 
-#if defined (CFG_ID_EEPROM) || defined (CFG_I2C_MAC_OFFSET)
+#if defined (CONFIG_ID_EEPROM) || defined (CFG_I2C_MAC_OFFSET)
 	mac_read_from_eeprom();
 #endif
 
lib_sparc/board.c +1 -1
index 205a8ca..15d6935 100644
@@ -409,7 +409,7 @@ void board_init_f(ulong bootflag)
 	}
 #endif
 
-#ifdef CFG_ID_EEPROM
+#ifdef CONFIG_ID_EEPROM
 	mac_read_from_eeprom();
 #endif
 
Signature · 1 line
1.5.6.3
#5 lore raw

PATCH 5/25 rename CFG_ENV_IS_IN_EEPROM in CONFIG_ENV_IS_IN_EEPROM

---
 README                                |    2 +-
 board/Marvell/common/bootseq.txt      |    2 +-
 board/evb64260/bootseq.txt            |    2 +-
 board/netstal/hcu5/README.txt         |    2 +-
 board/xilinx/ml300/ml300.c            |    2 +-
 board/xilinx/xilinx_iic/iic_adapter.c |    2 +-
 common/cmd_eeprom.c                   |    4 ++--
 common/cmd_nvedit.c                   |    6 +++---
 common/env_eeprom.c                   |    4 ++--
 include/configs/APC405.h              |    2 +-
 include/configs/ASH405.h              |    2 +-
 include/configs/Alaska8220.h          |    8 ++++----
 include/configs/B2.h                  |    2 +-
 include/configs/CANBT.h               |    2 +-
 include/configs/CCM.h                 |    2 +-
 include/configs/CMS700.h              |    2 +-
 include/configs/CPCI2DP.h             |    2 +-
 include/configs/CPCI405.h             |    2 +-
 include/configs/CPCI4052.h            |    2 +-
 include/configs/CPCI405AB.h           |    2 +-
 include/configs/CPCI405DT.h           |    2 +-
 include/configs/CPCI750.h             |    2 +-
 include/configs/CPCIISER4.h           |    2 +-
 include/configs/CPU86.h               |    2 +-
 include/configs/CPU87.h               |    2 +-
 include/configs/DP405.h               |    2 +-
 include/configs/DU405.h               |    2 +-
 include/configs/DU440.h               |    4 ++--
 include/configs/ELPT860.h             |    2 +-
 include/configs/ERIC.h                |    8 ++++----
 include/configs/EXBITGEN.h            |    4 ++--
 include/configs/G2000.h               |    2 +-
 include/configs/GEN860T.h             |    4 ++--
 include/configs/GTH.h                 |    2 +-
 include/configs/HH405.h               |    2 +-
 include/configs/HUB405.h              |    2 +-
 include/configs/IP860.h               |    6 +++---
 include/configs/JSE.h                 |    2 +-
 include/configs/KAREF.h               |    2 +-
 include/configs/METROBOX.h            |    2 +-
 include/configs/MIP405.h              |    2 +-
 include/configs/OCRTC.h               |    2 +-
 include/configs/ORSG.h                |    2 +-
 include/configs/PATI.h                |    4 ++--
 include/configs/PCI405.h              |    2 +-
 include/configs/PIP405.h              |    2 +-
 include/configs/PLU405.h              |    2 +-
 include/configs/PM826.h               |    2 +-
 include/configs/PM828.h               |    2 +-
 include/configs/PMC405.h              |    2 +-
 include/configs/PMC440.h              |    4 ++--
 include/configs/PPChameleonEVB.h      |    2 +-
 include/configs/SCM.h                 |    2 +-
 include/configs/SXNI855T.h            |    2 +-
 include/configs/TOP5200.h             |    2 +-
 include/configs/TOP860.h              |    2 +-
 include/configs/TQM8260.h             |    2 +-
 include/configs/VCMA9.h               |    2 +-
 include/configs/VOH405.h              |    2 +-
 include/configs/VOM405.h              |    2 +-
 include/configs/WUH405.h              |    2 +-
 include/configs/XPEDITE1K.h           |    2 +-
 include/configs/Yukon8220.h           |    8 ++++----
 include/configs/atc.h                 |    2 +-
 include/configs/bamboo.h              |    4 ++--
 include/configs/bf533-stamp.h         |    2 +-
 include/configs/bf537-stamp.h         |    2 +-
 include/configs/cpci5200.h            |    2 +-
 include/configs/csb272.h              |    2 +-
 include/configs/csb472.h              |    2 +-
 include/configs/ep82xxm.h             |    6 +++---
 include/configs/hcu4.h                |    2 +-
 include/configs/hcu5.h                |    4 ++--
 include/configs/imx31_phycore.h       |    2 +-
 include/configs/innokom.h             |    2 +-
 include/configs/kb9202.h              |    2 +-
 include/configs/m501sk.h              |    4 ++--
 include/configs/mcu25.h               |    2 +-
 include/configs/mecp5200.h            |    2 +-
 include/configs/ml300.h               |    4 ++--
 include/configs/pcu_e.h               |    2 +-
 include/configs/pf5200.h              |    2 +-
 include/configs/quad100hd.h           |    4 ++--
 include/configs/redwood.h             |    2 +-
 include/configs/sc520_cdp.h           |    2 +-
 include/configs/sc520_spunk.h         |    2 +-
 include/configs/sorcery.h             |    6 +++---
 include/configs/stxssa.h              |    6 +++---
 include/configs/yosemite.h            |    6 +++---
 include/configs/yucca.h               |    2 +-
 lib_blackfin/board.c                  |    2 +-
 lib_m68k/board.c                      |    2 +-
 lib_ppc/board.c                       |    2 +-
 lib_sparc/board.c                     |    2 +-
 94 files changed, 127 insertions(+), 127 deletions(-)
README +1 -1
index 37449d1..0c501cc 100644
@@ -2193,7 +2193,7 @@ keep settings there always unmodified except somebody uses "saveenv"
 to save the current settings.
 
 
-- CFG_ENV_IS_IN_EEPROM:
+- CONFIG_ENV_IS_IN_EEPROM:
 
 	Use this if you have an EEPROM or similar serial access
 	device and a driver for it.
board/Marvell/common/bootseq.txt +1 -1
index 290aed9..e4fefb3 100644
@@ -88,7 +88,7 @@ in_flash:
 		    nothing
 		mem_malloc_init
 		malloc_bin_reloc
-		spi_init (r or f)??? (CFG_ENV_IS_IN_EEPROM)
+		spi_init (r or f)??? (CONFIG_ENV_IS_IN_EEPROM)
 		env_relocated
 		misc_init_r(bd): (board/evb64260/evb64260.c)
 		    mpsc_init2
board/evb64260/bootseq.txt +1 -1
index 290aed9..e4fefb3 100644
@@ -88,7 +88,7 @@ in_flash:
 		    nothing
 		mem_malloc_init
 		malloc_bin_reloc
-		spi_init (r or f)??? (CFG_ENV_IS_IN_EEPROM)
+		spi_init (r or f)??? (CONFIG_ENV_IS_IN_EEPROM)
 		env_relocated
 		misc_init_r(bd): (board/evb64260/evb64260.c)
 		    mpsc_init2
board/netstal/hcu5/README.txt +1 -1
index c205108..75c0dd7 100644
@@ -152,7 +152,7 @@ From now on our copy is in RAM and we will run from there,
 	    CFG_EBC_PB0A, CFG_EBC_PB0C from hcu5.h
 	mem_malloc_init
 	malloc_bin_reloc
-	spi_init (r or f)??? (CFG_ENV_IS_IN_EEPROM)
+	spi_init (r or f)??? (CONFIG_ENV_IS_IN_EEPROM)
 	env_relocated
 	misc_init_r(bd): (board/netstal/hcu5.c)
 	    ethaddr mit serial number erg?nzen
board/xilinx/ml300/ml300.c +1 -1
index 5d493ee..e64becc 100644
@@ -42,7 +42,7 @@
 #include <common.h>
 #include <asm/processor.h>
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 extern void convert_env(void);
 #endif
 
board/xilinx/xilinx_iic/iic_adapter.c +1 -1
index 37dce03..5d84ca7 100644
@@ -42,7 +42,7 @@
 #include <environment.h>
 #include <net.h>
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #include <i2c.h>
 #include "xiic_l.h"
 
common/cmd_eeprom.c +2 -2
index e5000e9..5034b5e 100644
@@ -42,7 +42,7 @@
 #include <command.h>
 #include <i2c.h>
 
-#if defined(CFG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM)
+#if defined(CONFIG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM)
 
 extern void eeprom_init  (void);
 extern int  eeprom_read  (unsigned dev_addr, unsigned offset,
@@ -121,7 +121,7 @@ int do_eeprom ( cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
  *   0x00000nxx for EEPROM address selectors and page number at n.
  */
 
-#if defined(CFG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM)
+#if defined(CONFIG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM)
 
 #ifndef CONFIG_SPI
 #if !defined(CFG_I2C_EEPROM_ADDR_LEN) || CFG_I2C_EEPROM_ADDR_LEN < 1 || CFG_I2C_EEPROM_ADDR_LEN > 2
common/cmd_nvedit.c +3 -3
index 7089706..8b6b46b 100644
@@ -53,7 +53,7 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 #if !defined(CFG_ENV_IS_IN_NVRAM)	&& \
-    !defined(CFG_ENV_IS_IN_EEPROM)	&& \
+    !defined(CONFIG_ENV_IS_IN_EEPROM)	&& \
     !defined(CFG_ENV_IS_IN_FLASH)	&& \
     !defined(CFG_ENV_IS_IN_DATAFLASH)	&& \
     !defined(CFG_ENV_IS_IN_NAND)	&& \
@@ -540,7 +540,7 @@ int getenv_r (char *name, char *buf, unsigned len)
 	return (-1);
 }
 
-#if ((defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) \
+#if ((defined(CFG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \
@@ -596,7 +596,7 @@ U_BOOT_CMD(
 	"    - delete environment variable 'name'\n"
 );
 
-#if ((defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) \
+#if ((defined(CFG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \
common/env_eeprom.c +2 -2
index 9e1a201..1a03f43 100644
@@ -26,7 +26,7 @@
 
 #include <common.h>
 
-#if defined(CFG_ENV_IS_IN_EEPROM) /* Environment is in EEPROM */
+#if defined(CONFIG_ENV_IS_IN_EEPROM) /* Environment is in EEPROM */
 
 #include <command.h>
 #include <environment.h>
@@ -107,4 +107,4 @@ int env_init(void)
 	return (0);
 }
 
-#endif /* CFG_ENV_IS_IN_EEPROM */
+#endif /* CONFIG_ENV_IS_IN_EEPROM */
include/configs/APC405.h +1 -1
index 6ee0a36..882d188 100644
@@ -291,7 +291,7 @@ extern int flash_banks;
 /*
  * Environment Variable setup
  */
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x000	/* environment starts at the */
 					/* beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x800	/* 2048 bytes may be used for env vars*/
include/configs/ASH405.h +1 -1
index 85c6a99..56ae708 100644
@@ -233,7 +233,7 @@
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x100	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x700	/* 2048 bytes may be used for env vars*/
 				   /* total size of a CAT24WC16 is 2048 bytes */
include/configs/Alaska8220.h +4 -4
index 38b962f..0c2e6ae 100644
@@ -133,7 +133,7 @@
 #define CFG_EEPROM_PAGE_WRITE_BITS	3
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS	70
 /*
-#define CFG_ENV_IS_IN_EEPROM	1
+#define CONFIG_ENV_IS_IN_EEPROM	1
 #define CFG_ENV_OFFSET		0
 #define CFG_ENV_SIZE		256
 */
@@ -226,11 +226,11 @@
 
 #if defined CFG_ENV_IS_IN_FLASH
 #undef CFG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
 #elif defined CFG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_EEPROM
-#elif defined CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
+#elif defined CONFIG_ENV_IS_IN_EEPROM
 #undef CFG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #endif
include/configs/B2.h +1 -1
index d6ab1ad..1c4b6fe 100644
@@ -176,7 +176,7 @@
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x0	/* environment starts at the beginning of the EEPROM */
 
 /*-----------------------------------------------------------------------
include/configs/CANBT.h +1 -1
index 7029dbd..a4afcca 100644
@@ -163,7 +163,7 @@
 
 #else /* Use EEPROM for environment variables */
 
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x000	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x400	/* 1024 bytes may be used for env vars */
 				   /* total size of a CAT24WC08 is 1024 bytes */
include/configs/CCM.h +1 -1
index 6194c5c..57c1223 100644
@@ -227,7 +227,7 @@
 #define CFG_ENV_SIZE_REDUND	(CFG_ENV_SIZE)
 #else
 /* Final version: environment in EEPROM */
-#define CFG_ENV_IS_IN_EEPROM	1
+#define CONFIG_ENV_IS_IN_EEPROM	1
 #define CFG_ENV_OFFSET		2048
 #define CFG_ENV_SIZE		2048
 #endif
include/configs/CMS700.h +1 -1
index 285cd5c..f157b5f 100644
@@ -248,7 +248,7 @@
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x100	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x700	/* 2048 bytes may be used for env vars*/
 				   /* total size of a CAT24WC16 is 2048 bytes */
include/configs/CPCI2DP.h +1 -1
index 58900c3..8b205c7 100644
@@ -200,7 +200,7 @@
 
 #define CFG_FLASH_EMPTY_INFO		/* print 'E' for empty sector on flinfo */
 
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x000	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x400	/* 1024 bytes may be used for env vars */
 
include/configs/CPCI405.h +1 -1
index bd43e1d..bc514b0 100644
@@ -243,7 +243,7 @@
 
 #else /* Use EEPROM for environment variables */
 
-#define CFG_ENV_IS_IN_EEPROM    1       /* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM    1       /* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET          0x000   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE            0x400   /* 1024 bytes may be used for env vars */
 				   /* total size of a CAT24WC08 is 1024 bytes */
include/configs/CPCI4052.h +1 -1
index fd49f56..04a8030 100644
@@ -252,7 +252,7 @@
 
 #else /* Use EEPROM for environment variables */
 
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x000	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x800	/* 2048 bytes may be used for env vars*/
 				   /* total size of a CAT24WC16 is 2048 bytes */
include/configs/CPCI405AB.h +1 -1
index 55dd629..54c7746 100644
@@ -257,7 +257,7 @@
 
 /* Use EEPROM for environment variables */
 
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x000	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x800	/* 2048 bytes may be used for env vars*/
 				   /* total size of a CAT24WC32 is 4096 bytes */
include/configs/CPCI405DT.h +1 -1
index c173539..6c5a3fe 100644
@@ -261,7 +261,7 @@
 
 #else /* Use EEPROM for environment variables */
 
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x000	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x800	/* 2048 bytes may be used for env vars*/
 				   /* total size of a CAT24WC16 is 2048 bytes */
include/configs/CPCI750.h +1 -1
index 03756c3..4818aed 100644
@@ -579,7 +579,7 @@
 /* #define CFG_ENV_ADDR	   (CFG_FLASH_BASE+CFG_MONITOR_LEN-CFG_ENV_SECT_SIZE) */
 #endif
 
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#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
include/configs/CPCIISER4.h +1 -1
index 78b754c..958b111 100644
@@ -200,7 +200,7 @@
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS	10   /* and takes up to 10 msec */
 #define CFG_EEPROM_PAGE_WRITE_ENABLE
 
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x000	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x300	/* 768 bytes may be used for env vars */
 				   /* total size of a CAT24WC08 is 1024 bytes */
include/configs/CPU86.h +1 -1
index 10cebc9..742ea46 100644
@@ -332,7 +332,7 @@
 #endif
 #else
 /* environment is in EEPROM */
-#define CFG_ENV_IS_IN_EEPROM	1
+#define CONFIG_ENV_IS_IN_EEPROM	1
 #define CFG_I2C_EEPROM_ADDR	0x58	/* EEPROM X24C16		*/
 #define CFG_I2C_EEPROM_ADDR_LEN	1
 /* mask of address bits that overflow into the "EEPROM chip address"    */
include/configs/CPU87.h +1 -1
index d325c4d..db423a0 100644
@@ -347,7 +347,7 @@
 #endif
 #else
 /* environment is in EEPROM */
-#define CFG_ENV_IS_IN_EEPROM	1
+#define CONFIG_ENV_IS_IN_EEPROM	1
 #define CFG_I2C_EEPROM_ADDR	0x58	/* EEPROM X24C16		*/
 #define CFG_I2C_EEPROM_ADDR_LEN 1
 /* mask of address bits that overflow into the "EEPROM chip address"	*/
include/configs/DP405.h +1 -1
index 912fb2a..50d44a0 100644
@@ -216,7 +216,7 @@
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x100	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x700	/* 2048 bytes may be used for env vars*/
 				   /* total size of a CAT24WC16 is 2048 bytes */
include/configs/DU405.h +1 -1
index c8bf67f..811b9c3 100644
@@ -227,7 +227,7 @@
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS	10   /* and takes up to 10 msec */
 #define CFG_EEPROM_PAGE_WRITE_ENABLE
 
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x000	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x400	/* 1024 bytes may be used for env vars */
 				   /* total size of a CAT24WC08 is 1024 bytes */
include/configs/DU440.h +2 -2
index c757523..b1d4ff3 100644
@@ -113,7 +113,7 @@
 /*
  * Environment
  */
-#define CFG_ENV_IS_IN_EEPROM    1	/* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM    1	/* use FLASH for environment vars */
 
 /*
  * FLASH related
@@ -146,7 +146,7 @@
 #define CFG_ENV_SIZE_REDUND	(CFG_ENV_SIZE)
 #endif
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_OFFSET		0	/* environment starts at */
 					/* the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x1000 /* 4096 bytes may be used for env vars */
include/configs/ELPT860.h +1 -1
index f927a2c..828dd9f 100644
@@ -138,7 +138,7 @@
 #define CONFIG_ENV_OVERWRITE	1  /* Allow Overwrite of serial# & ethaddr */
 
 #undef	  CFG_ENV_IS_IN_NVRAM	       /* Environment is in NVRAM	*/
-#undef	  CFG_ENV_IS_IN_EEPROM	       /* Environment is in I2C EEPROM	*/
+#undef	  CONFIG_ENV_IS_IN_EEPROM	       /* Environment is in I2C EEPROM	*/
 #define CFG_ENV_IS_IN_FLASH	1      /* Environment is in FLASH	*/
 
 #define CONFIG_BAUDRATE		9600   /* console baudrate = 9600 bps	*/
include/configs/ERIC.h +4 -4
index bfdcf6a..dfbbc95 100644
@@ -48,7 +48,7 @@
 #define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
 #endif
 #if 0
-#define CFG_ENV_IS_IN_EEPROM	1	/* use I2C RTC X1240 for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use I2C RTC X1240 for environment vars */
 #define CFG_ENV_OFFSET		0x000	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x800	/* 2048 bytes may be used for env vars */
 #endif					/* total size of a X1240 is 2048 bytes */
@@ -64,13 +64,13 @@
 
 #ifdef CFG_ENV_IS_IN_FLASH
 #undef CFG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
 #else
 #ifdef CFG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
 #else
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #undef CFG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #endif
include/configs/EXBITGEN.h +2 -2
index 99d1cf2..cee0be4 100644
@@ -47,11 +47,11 @@
 #define CFG_I2C_SLAVE		0x7F	/* I2C slave address		*/
 
 /* environment is in EEPROM */
-#define CFG_ENV_IS_IN_EEPROM    1
+#define CONFIG_ENV_IS_IN_EEPROM    1
 #undef CFG_ENV_IS_IN_FLASH
 #undef CFG_ENV_IS_IN_NVRAM
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_I2C_EEPROM_ADDR		0x56    /* 1010110 */
 #define CFG_I2C_EEPROM_ADDR_LEN		1	/* 8-bit internal addressing */
 #define CFG_I2C_EEPROM_ADDR_OVERFLOW	1	/* ... and 1 bit in I2C address */
include/configs/G2000.h +1 -1
index c12ce48..74e6ef7 100644
@@ -299,7 +299,7 @@
  * Environment Variable setup
  */
 #if 1 /* test-only */
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x100	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x700	/* 2048 bytes may be used for env vars*/
 				   /* total size of a CAT24WC16 is 2048 bytes */
include/configs/GEN860T.h +2 -2
index 422ed32..51cf579 100644
@@ -435,9 +435,9 @@
  * be edited if this is changed!
  */
 #undef	CFG_ENV_IS_IN_FLASH
-#define CFG_ENV_IS_IN_EEPROM
+#define CONFIG_ENV_IS_IN_EEPROM
 
-#if defined(CFG_ENV_IS_IN_EEPROM)
+#if defined(CONFIG_ENV_IS_IN_EEPROM)
 #define CFG_ENV_SIZE			(2 * 1024)
 #define CFG_ENV_OFFSET			(CFG_ENV_EEPROM_SIZE - (8 * 1024))
 #else
include/configs/GTH.h +1 -1
index 461670a..4a98c40 100644
@@ -195,7 +195,7 @@
 #define CFG_FLASH_WRITE_TOUT	500		/* Timeout for Flash Write (in ms)	*/
 
 #define	CFG_ENV_IS_IN_FLASH 1
-#undef CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_OFFSET		0x000E0000
 #define	CFG_ENV_SIZE		0x4000	/* Total Size of Environment Sector	*/
 
include/configs/HH405.h +1 -1
index 9bcbfe3..cf5fcf1 100644
@@ -320,7 +320,7 @@
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */
-#define CFG_ENV_IS_IN_EEPROM    1       /* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM    1       /* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET          0x100   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE            0x700   /* 2048 bytes may be used for env vars*/
 				   /* total size of a CAT24WC16 is 2048 bytes */
include/configs/HUB405.h +1 -1
index a389d58..8992706 100644
@@ -232,7 +232,7 @@
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x100	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x700	/* 2048 bytes may be used for env vars*/
 				   /* total size of a CAT24WC16 is 2048 bytes */
include/configs/IP860.h +3 -3
index e6c7fe6..67f8833 100644
@@ -190,17 +190,17 @@
 #undef	CFG_ENV_IS_IN_NVRAM
 #undef  CFG_ENV_IS_IN_NVRAM
 #undef	DEBUG_I2C
-#define	CFG_ENV_IS_IN_EEPROM
+#define	CONFIG_ENV_IS_IN_EEPROM
 
 #ifdef	CFG_ENV_IS_IN_NVRAM
 #define CFG_ENV_ADDR		0x20000000	/* use SRAM	*/
 #define CFG_ENV_SIZE		(16<<10)	/* use 16 kB	*/
 #endif	/* CFG_ENV_IS_IN_NVRAM */
 
-#ifdef	CFG_ENV_IS_IN_EEPROM
+#ifdef	CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_OFFSET		 512	/* Leave 512 bytes free for other data	*/
 #define CFG_ENV_SIZE		1536	/* Use remaining space			*/
-#endif	/* CFG_ENV_IS_IN_EEPROM */
+#endif	/* CONFIG_ENV_IS_IN_EEPROM */
 
 /*-----------------------------------------------------------------------
  * Cache Configuration
include/configs/JSE.h +1 -1
index 5b40ef6..b08301e 100644
@@ -79,7 +79,7 @@
   /* JSE has EEPROM chips that are good for environment. */
 #undef	CFG_ENV_IS_IN_NVRAM
 #undef	CFG_ENV_IS_IN_FLASH
-#define CFG_ENV_IS_IN_EEPROM 1
+#define CONFIG_ENV_IS_IN_EEPROM 1
 #undef	CFG_ENV_IS_NOWHERE
 
   /* This is the 7bit address of the device, not including P. */
include/configs/KAREF.h +1 -1
index 816e63b..5b21b90 100644
@@ -143,7 +143,7 @@
  *----------------------------------------------------------------------*/
 #define CFG_ENV_IS_IN_NVRAM   1		     /* Environment uses NVRAM	*/
 #undef	CFG_ENV_IS_IN_FLASH		     /* ... not in flash	*/
-#undef	CFG_ENV_IS_IN_EEPROM		     /* ... not in EEPROM	*/
+#undef	CONFIG_ENV_IS_IN_EEPROM		     /* ... not in EEPROM	*/
 #define CONFIG_ENV_OVERWRITE  1		     /* allow env overwrite	*/
 
 #define CFG_ENV_SIZE	      0x1000	     /* Size of Env vars	*/
include/configs/METROBOX.h +1 -1
index d61b49e..2afb3ff 100644
@@ -205,7 +205,7 @@
  *----------------------------------------------------------------------*/
 #define CFG_ENV_IS_IN_NVRAM   1		     /* Environment uses NVRAM	*/
 #undef	CFG_ENV_IS_IN_FLASH		     /* ... not in flash	*/
-#undef	CFG_ENV_IS_IN_EEPROM		     /* ... not in EEPROM	*/
+#undef	CONFIG_ENV_IS_IN_EEPROM		     /* ... not in EEPROM	*/
 #define CONFIG_ENV_OVERWRITE  1		     /* allow env overwrite	*/
 
 #define CFG_ENV_SIZE	      0x1000	     /* Size of Env vars	*/
include/configs/MIP405.h +1 -1
index 66235e3..e0f9386 100644
@@ -114,7 +114,7 @@
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS	10	/* and takes up to 10 msec */
 
 
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x00000	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x00800	/* 2k bytes may be used for env vars */
 
include/configs/OCRTC.h +1 -1
index 94b5bc9..c561e15 100644
@@ -199,7 +199,7 @@
 
 #else /* Use EEPROM for environment variables */
 
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x000	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x300	/* 768 bytes may be used for env vars */
 				   /* total size of a CAT24WC08 is 1024 bytes */
include/configs/ORSG.h +1 -1
index 4e03088..fd14088 100644
@@ -197,7 +197,7 @@
 
 #else /* Use EEPROM for environment variables */
 
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x000	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x300	/* 768 bytes may be used for env vars */
 				   /* total size of a CAT24WC08 is 1024 bytes */
include/configs/PATI.h +2 -2
index 4b37eca..2676c78 100644
@@ -172,8 +172,8 @@
 #define CFG_FLASH_WRITE_TOUT	600		/* Timeout for Flash Write (in ms)	*/
 
 
-#define	CFG_ENV_IS_IN_EEPROM
-#ifdef	CFG_ENV_IS_IN_EEPROM
+#define	CONFIG_ENV_IS_IN_EEPROM
+#ifdef	CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_OFFSET		0
 #define CFG_ENV_SIZE		2048
 #endif
include/configs/PCI405.h +1 -1
index e70c0d3..dea59b6 100644
@@ -225,7 +225,7 @@
 
 #else /* Use EEPROM for environment variables */
 
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x000	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x400	/* 1024 bytes may be used for env vars*/
 				   /* total size of a CAT24WC08 is 1024 bytes */
include/configs/PIP405.h +1 -1
index 2ceda00..9b5b370 100644
@@ -95,7 +95,7 @@
 
 #define CFG_I2C_EEPROM_ADDR	0x53
 #define CFG_I2C_EEPROM_ADDR_LEN	2
-#define CFG_ENV_IS_IN_EEPROM    1       /* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM    1       /* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET          0x000   /* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE            0x800   /* 2 kBytes may be used for env vars */
 
include/configs/PLU405.h +1 -1
index a3d1c56..b99491c 100644
@@ -276,7 +276,7 @@
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x100	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x700	/* 2048 bytes may be used for env vars*/
 				   /* total size of a CAT24WC16 is 2048 bytes */
include/configs/PM826.h +1 -1
index 190e2a4..de1ecde 100644
@@ -263,7 +263,7 @@
 #define CFG_ENV_SECT_SIZE	0x40000
 #else
 /* Final version: environment in EEPROM */
-#define CFG_ENV_IS_IN_EEPROM	1
+#define CONFIG_ENV_IS_IN_EEPROM	1
 #define CFG_I2C_EEPROM_ADDR	0x58
 #define CFG_I2C_EEPROM_ADDR_LEN	1
 #define CFG_EEPROM_PAGE_WRITE_BITS	4
include/configs/PM828.h +1 -1
index 96c0edf..cac8f27 100644
@@ -256,7 +256,7 @@
 #define CFG_ENV_SECT_SIZE	0x40000
 #else
 /* Final version: environment in EEPROM */
-#define CFG_ENV_IS_IN_EEPROM	1
+#define CONFIG_ENV_IS_IN_EEPROM	1
 #define CFG_I2C_EEPROM_ADDR	0x58
 #define CFG_I2C_EEPROM_ADDR_LEN 1
 #define CFG_EEPROM_PAGE_WRITE_BITS	4
include/configs/PMC405.h +1 -1
index 966bbf9..f627422 100644
@@ -244,7 +244,7 @@
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x000	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x800	/* 2048 bytes may be used for env vars*/
 				   /* total size of a CAT24WC16 is 2048 bytes */
include/configs/PMC440.h +2 -2
index 9140287..071ba10 100644
@@ -105,7 +105,7 @@
  * Environment
  *----------------------------------------------------------------------*/
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
-#define CFG_ENV_IS_IN_EEPROM	1	/* use FLASH for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use FLASH for environment vars */
 #else
 #define CFG_ENV_IS_IN_NAND	1	/* use NAND for environment vars */
 #define CFG_ENV_IS_EMBEDDED	1	/* use embedded environment */
@@ -146,7 +146,7 @@
 #define CFG_ENV_SIZE_REDUND	(CFG_ENV_SIZE)
 #endif
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_OFFSET		0	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x1000	/* 4096 bytes may be used for env vars */
 #endif
include/configs/PPChameleonEVB.h +1 -1
index cf98324..a33bc3b 100644
@@ -417,7 +417,7 @@
  */
 #ifdef ENVIRONMENT_IN_EEPROM
 
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x100	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x700	/* 2048-256 bytes may be used for env vars (total size of a CAT24WC16 is 2048 bytes)*/
 
include/configs/SCM.h +1 -1
index febfc39..2c7e55f 100644
@@ -276,7 +276,7 @@
 #define CFG_ENV_SECT_SIZE	0x40000
 #else
 /* Final version: environment in EEPROM */
-#define CFG_ENV_IS_IN_EEPROM	1
+#define CONFIG_ENV_IS_IN_EEPROM	1
 #define CFG_ENV_OFFSET		0
 #define CFG_ENV_SIZE		2048
 #endif
include/configs/SXNI855T.h +1 -1
index c5d5386..85b3a9f 100644
@@ -458,7 +458,7 @@
   #define CFG_ENV_SIZE		0x00002000
 #else
   /* environment is in EEPROM */
-  #define CFG_ENV_IS_IN_EEPROM		1
+  #define CONFIG_ENV_IS_IN_EEPROM		1
   #define CFG_ENV_OFFSET		0	/* at beginning of EEPROM */
   #define CFG_ENV_SIZE		     1024	/* Use only a part of it*/
 #endif
include/configs/TOP5200.h +1 -1
index 4c44735..083686c 100644
@@ -271,7 +271,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_EEPROM	1	/* turn on EEPROM env feature */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* turn on EEPROM env feature */
 #define CFG_ENV_OFFSET		0x1000
 #define CFG_ENV_SIZE		0x0700
 
include/configs/TOP860.h +1 -1
index 151c407..288019f 100644
@@ -160,7 +160,7 @@
  * only the first 6k in EEPROM are available for user. Of that we use 256b
  */
 #define	CONFIG_SOFT_I2C
-#define CFG_ENV_IS_IN_EEPROM	1	/* turn on EEPROM env feature */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* turn on EEPROM env feature */
 #define CFG_ENV_OFFSET		0x1000
 #define CFG_ENV_SIZE		0x0700
 #define CFG_I2C_EEPROM_ADDR 0x57
include/configs/TQM8260.h +1 -1
index ced87b5..a77b119 100644
@@ -312,7 +312,7 @@
 #define CFG_ENV_SECT_SIZE	0x40000
 #else
 /* Final version: environment in EEPROM */
-#define CFG_ENV_IS_IN_EEPROM	1
+#define CONFIG_ENV_IS_IN_EEPROM	1
 #define CFG_ENV_OFFSET		0
 #define CFG_ENV_SIZE		2048
 #endif
include/configs/VCMA9.h +1 -1
index 02cabb2..50dd7aa 100644
@@ -89,7 +89,7 @@
 
 #define CFG_I2C_EEPROM_ADDR	0x50
 #define CFG_I2C_EEPROM_ADDR_LEN	2
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x000	/* environment starts at offset 0 */
 #define CFG_ENV_SIZE		0x800	/* 2KB should be more than enough */
 
include/configs/VOH405.h +1 -1
index 3ca928e..5d36f24 100644
@@ -266,7 +266,7 @@
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x100	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x700	/* 2048 bytes may be used for env vars*/
 				   /* total size of a CAT24WC16 is 2048 bytes */
include/configs/VOM405.h +1 -1
index ec6f205..55b06e9 100644
@@ -222,7 +222,7 @@
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x100	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x700	/* 2048 bytes may be used for env vars*/
 				   /* total size of a CAT24WC16 is 2048 bytes */
include/configs/WUH405.h +1 -1
index 582d8cf..9c0bd43 100644
@@ -229,7 +229,7 @@
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x100	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x700	/* 2048 bytes may be used for env vars*/
 				   /* total size of a CAT24WC16 is 2048 bytes */
include/configs/XPEDITE1K.h +1 -1
index 38ea576..c3b0e08 100644
@@ -151,7 +151,7 @@ extern void out32(unsigned int, unsigned long);
 /*-----------------------------------------------------------------------
  * Environment
  *----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_EEPROM 1
+#define CONFIG_ENV_IS_IN_EEPROM 1
 #define CFG_ENV_SIZE		0x100	    /* Size of Environment vars */
 #define CFG_ENV_OFFSET		0x100
 #define CFG_I2C_EEPROM_ADDR	0x50		/* this is actually the second page of the eeprom */
include/configs/Yukon8220.h +4 -4
index 1b4195a..60f2343 100644
@@ -133,7 +133,7 @@
 #define CFG_EEPROM_PAGE_WRITE_BITS	3
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS	70
 /*
-#define CFG_ENV_IS_IN_EEPROM	1
+#define CONFIG_ENV_IS_IN_EEPROM	1
 #define CFG_ENV_OFFSET		0
 #define CFG_ENV_SIZE		256
 */
@@ -226,11 +226,11 @@
 
 #if defined CFG_ENV_IS_IN_FLASH
 #undef CFG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
 #elif defined CFG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_EEPROM
-#elif defined CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
+#elif defined CONFIG_ENV_IS_IN_EEPROM
 #undef CFG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #endif
include/configs/atc.h +1 -1
index 285b4e4..1e393a2 100644
@@ -275,7 +275,7 @@
 # define CFG_ENV_SIZE		0x10000
 # define CFG_ENV_SECT_SIZE	0x10000
 #else
-#define CFG_ENV_IS_IN_EEPROM	1
+#define CONFIG_ENV_IS_IN_EEPROM	1
 #define CFG_ENV_OFFSET		0
 #define CFG_ENV_SIZE		2048
 #define CFG_EEPROM_PAGE_WRITE_BITS	4	/* 16-byte page size	*/
include/configs/bamboo.h +2 -2
index 41058f8..7caa403 100644
@@ -233,10 +233,10 @@
 #define CFG_EEPROM_PAGE_WRITE_BITS 3
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_SIZE		0x200	    /* Size of Environment vars */
 #define CFG_ENV_OFFSET		0x0
-#endif /* CFG_ENV_IS_IN_EEPROM */
+#endif /* CONFIG_ENV_IS_IN_EEPROM */
 
 /*
  * Default environment variables
include/configs/bf533-stamp.h +1 -1
index 9f5667b..842207f 100644
@@ -102,7 +102,7 @@
 #define CFG_MAX_FLASH_SECT	67	/* max number of sectors on one chip */
 
 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
-#define CFG_ENV_IS_IN_EEPROM	1
+#define CONFIG_ENV_IS_IN_EEPROM	1
 #define CFG_ENV_OFFSET		0x4000
 #define CFG_ENV_HEADER		(CFG_ENV_OFFSET + 0x12A)	/* 0x12A is the length of LDR file header */
 #else
include/configs/bf537-stamp.h +1 -1
index a06c1dc..6d43839 100644
@@ -235,7 +235,7 @@
 #define CONFIG_STACKBASE	(CFG_GBL_DATA_ADDR  - 4)
 
 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_SPI_MASTER)
-#define CFG_ENV_IS_IN_EEPROM	1
+#define CONFIG_ENV_IS_IN_EEPROM	1
 #define CFG_ENV_OFFSET		0x4000
 #define CFG_ENV_HEADER		(CFG_ENV_OFFSET + 0x16e) /* 0x12A is the length of LDR file header */
 #else
include/configs/cpci5200.h +1 -1
index fffd1fe..7974491 100644
@@ -224,7 +224,7 @@
 #define CFG_ENV_SECT_SIZE	0x20000
 #define CONFIG_ENV_OVERWRITE	1
 #else
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x0000	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x0400	/* 8192 bytes may be used for env vars */
 				   /* total size of a CAT24WC32 is 8192 bytes */
include/configs/csb272.h +1 -1
index 5145c00..701d3c8 100644
@@ -232,7 +232,7 @@
  */
 #define CFG_ENV_IS_IN_FLASH	1	/* environment is in FLASH	*/
 #undef CFG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
 
 /*
  * General Memory organization
include/configs/csb472.h +1 -1
index d3e5ea8..4fef2f6 100644
@@ -231,7 +231,7 @@
  */
 #define CFG_ENV_IS_IN_FLASH	1	/* environment is in FLASH	*/
 #undef CFG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
 
 /*
  * General Memory organization
include/configs/ep82xxm.h +3 -3
index ac68c86..4de879a 100644
@@ -194,7 +194,7 @@
 #if 1
 #define CFG_ENV_IS_IN_FLASH     1	/* use FLASH for environment vars	*/
 #else
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars	*/
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars	*/
 #endif
 
 /*-----------------------------------------------------------------------
@@ -223,10 +223,10 @@
 #define CFG_EEPROM_PAGE_WRITE_ENABLE
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS	10
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_SIZE		0x200	    /* Size of Environment vars */
 #define CFG_ENV_OFFSET		0x0
-#endif /* CFG_ENV_IS_IN_EEPROM */
+#endif /* CONFIG_ENV_IS_IN_EEPROM */
 
 /* RTC Configuration */
 #define CONFIG_RTC_M41T11	1	/* uses a M41T81 */
include/configs/hcu4.h +1 -1
index d99ac53..f03f9b9 100644
@@ -125,7 +125,7 @@
 #define CFG_ENV_IS_IN_FLASH
 #undef  CFG_ENV_IS_NOWHERE
 
-#ifdef  CFG_ENV_IS_IN_EEPROM
+#ifdef  CONFIG_ENV_IS_IN_EEPROM
 /* Put the environment after the SDRAM configuration */
 #define PROM_SIZE	2048
 #define CFG_ENV_OFFSET	 512
include/configs/hcu5.h +2 -2
index 54d6721..d274223 100644
@@ -108,10 +108,10 @@
 
 #undef	CFG_ENV_IS_IN_NVRAM
 #define  CFG_ENV_IS_IN_FLASH
-#undef	CFG_ENV_IS_IN_EEPROM
+#undef	CONFIG_ENV_IS_IN_EEPROM
 #undef  CFG_ENV_IS_NOWHERE
 
-#ifdef  CFG_ENV_IS_IN_EEPROM
+#ifdef  CONFIG_ENV_IS_IN_EEPROM
 /* Put the environment after the SDRAM and bootstrap configuration */
 #define PROM_SIZE	2048
 #define CFG_BOOSTRAP_OPTION_OFFSET	 512
include/configs/imx31_phycore.h +1 -1
index 237f361..18ff450 100644
@@ -152,7 +152,7 @@
 #define CFG_MAX_FLASH_SECT	259	     /* max number of sectors on one chip */
 #define CFG_MONITOR_BASE	CFG_FLASH_BASE /* Monitor at beginning of flash */
 
-#define	CFG_ENV_IS_IN_EEPROM		1
+#define	CONFIG_ENV_IS_IN_EEPROM		1
 #define CFG_ENV_OFFSET			0x00	/* environment starts here     */
 #define CFG_ENV_SIZE			4096
 #define CFG_I2C_EEPROM_ADDR		0x52
include/configs/innokom.h +1 -1
index 2b65052..1435d04 100644
@@ -140,7 +140,7 @@
 #define CFG_I2C_SPEED			50000
 #define CFG_I2C_SLAVE			0xfe
 
-#define CFG_ENV_IS_IN_EEPROM		1
+#define CONFIG_ENV_IS_IN_EEPROM		1
 
 #define CFG_ENV_OFFSET			0x00	/* environment starts here  */
 #define CFG_ENV_SIZE			1024	/* 1 KiB                    */
include/configs/kb9202.h +1 -1
index e775e60..8df222b 100644
@@ -128,7 +128,7 @@
 
 #define	CONFIG_HARD_I2C
 
-#define	CFG_ENV_IS_IN_EEPROM
+#define	CONFIG_ENV_IS_IN_EEPROM
 
 #ifdef CONFIG_KB9202
 #define CFG_ENV_OFFSET			0x3E00
include/configs/m501sk.h +2 -2
index bc94cf4..7fc460a 100644
@@ -65,7 +65,7 @@
 #define CFG_I2C_SPEED		100
 #define CFG_I2C_SLAVE		0
 #define CFG_CONSOLE_INFO_QUIET
-#undef CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_I2C_EEPROM_ADDR	0x50
 #define CFG_I2C_EEPROM_ADDR_LEN	1
 #define CFG_EEPROM_AT24C16
@@ -164,7 +164,7 @@
 #define CFG_ENV_SIZE		2048
 #endif
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_OFFSET		1024
 #define CFG_ENV_SIZE		1024
 #endif
include/configs/mcu25.h +1 -1
index 6adba96..d146537 100644
@@ -125,7 +125,7 @@
 #define CFG_ENV_IS_IN_FLASH
 #undef  CFG_ENV_IS_NOWHERE
 
-#ifdef  CFG_ENV_IS_IN_EEPROM
+#ifdef  CONFIG_ENV_IS_IN_EEPROM
 /* Put the environment after the SDRAM configuration */
 #define PROM_SIZE	2048
 #define CFG_ENV_OFFSET	 512
include/configs/mecp5200.h +1 -1
index 75040fe..1c2f1a2 100644
@@ -196,7 +196,7 @@
 #define CFG_ENV_SECT_SIZE	0x10000
 #define CONFIG_ENV_OVERWRITE	1
 #else
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x0000	/* environment starts at the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x0400	/* 8192 bytes may be used for env vars*/
 				   /* total size of a CAT24WC32 is 8192 bytes */
include/configs/ml300.h +2 -2
index 319923a..67129a5 100644
@@ -62,10 +62,10 @@
 #define CFG_SYSTEMACE_BASE	XPAR_OPB_SYSACE_0_BASEADDR
 #define CFG_SYSTEMACE_WIDTH	XPAR_XSYSACE_MEM_WIDTH
 
-#define CFG_ENV_IS_IN_EEPROM	1	/* environment is in EEPROM */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* environment is in EEPROM */
 
 /* following are used only if env is in EEPROM */
-#ifdef	CFG_ENV_IS_IN_EEPROM
+#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 CFG_ENV_OFFSET		XPAR_PERSISTENT_0_IIC_0_BASEADDR
include/configs/pcu_e.h +1 -1
index 7e393f7..f15ce99 100644
@@ -234,7 +234,7 @@
 #define	CFG_ENV_IS_EMBEDDED	1	/* short-cut compile-time test		*/
 #else
 /* Final version: environment in EEPROM */
-#define CFG_ENV_IS_IN_EEPROM	1
+#define CONFIG_ENV_IS_IN_EEPROM	1
 #define CFG_I2C_EEPROM_ADDR	0
 #define CFG_I2C_EEPROM_ADDR_LEN	2
 #define CFG_ENV_OFFSET		1024
include/configs/pf5200.h +1 -1
index c065d33..4ed8a21 100644
@@ -210,7 +210,7 @@
 #define CFG_ENV_SECT_SIZE	0x10000
 #define CONFIG_ENV_OVERWRITE	1
 #else
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars */
 #define CFG_ENV_OFFSET		0x0000	/* environment starts@the beginning of the EEPROM */
 #define CFG_ENV_SIZE		0x0400	/* 8192 bytes may be used for env vars */
 				   /* total size of a CAT24WC32 is 8192 bytes */
include/configs/quad100hd.h +2 -2
index d464734..94bdd8c 100644
@@ -42,7 +42,7 @@
 #define PLLMR1_DEFAULT		PLLMR1_266_133_66 /* no PCI */
 
 /* the environment is in the EEPROM by default */
-#define CFG_ENV_IS_IN_EEPROM
+#define CONFIG_ENV_IS_IN_EEPROM
 #undef CFG_ENV_IS_IN_FLASH
 
 #define CONFIG_NET_MULTI	1
@@ -208,7 +208,7 @@
 #define CFG_ENV_SIZE_REDUND	(CFG_ENV_SECT_SIZE)
 #endif
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_SIZE		0x400		/* Size of Environment vars */
 #define CFG_ENV_OFFSET		0x00000000
 #define CFG_ENABLE_CRC_16	1       /* Intrinsyc formatting used crc16 */
include/configs/redwood.h +1 -1
index 35e9f8b..ebb2921 100644
@@ -121,7 +121,7 @@
  *----------------------------------------------------------------------*/
 #undef	CFG_ENV_IS_IN_NVRAM		/* ... not in NVRAM		*/
 #define	CFG_ENV_IS_IN_FLASH	1	/* Environment uses flash	*/
-#undef	CFG_ENV_IS_IN_EEPROM		/* ... not in EEPROM		*/
+#undef	CONFIG_ENV_IS_IN_EEPROM		/* ... not in EEPROM		*/
 
 #define CONFIG_PREBOOT	"echo;"	\
 	"echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
include/configs/sc520_cdp.h +1 -1
index e29655e..029597f 100644
@@ -139,7 +139,7 @@
 #define CONFIG_ENV_OVERWRITE
 
 /* Environment in EEPROM */
-#define CFG_ENV_IS_IN_EEPROM   1
+#define CONFIG_ENV_IS_IN_EEPROM   1
 #define CONFIG_SPI
 #define CFG_ENV_SIZE	       0x4000	/* Total Size of Environment EEPROM 16k is SPI is used or 128 bytes if MW is used*/
 #define CFG_ENV_OFFSET         0
include/configs/sc520_spunk.h +1 -1
index 072675b..aa9dc97 100644
@@ -161,7 +161,7 @@
 #else
 /* Environment in EEPROM */
 
-# define CFG_ENV_IS_IN_EEPROM   1
+# define CONFIG_ENV_IS_IN_EEPROM   1
 # define CONFIG_SPI
 # define CONFIG_SPI_X 1
 # define CFG_ENV_SIZE		0x2000	/* Total Size of Environment EEPROM	*/
include/configs/sorcery.h +3 -3
index f4e4608..0d07560 100644
@@ -208,11 +208,11 @@
 
 #if defined CFG_ENV_IS_IN_FLASH
 #undef CFG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
 #elif defined CFG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_EEPROM
-#elif defined CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_EEPROM
+#elif defined CONFIG_ENV_IS_IN_EEPROM
 #undef CFG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #endif
include/configs/stxssa.h +3 -3
index ac349df..4f1d70c 100644
@@ -313,7 +313,7 @@
 
 /* Environment - default config is in flash, see below */
 #if 0	/* in EEPROM */
-# define CFG_ENV_IS_IN_EEPROM	1
+# define CONFIG_ENV_IS_IN_EEPROM	1
 # define CFG_ENV_OFFSET		0
 # define CFG_ENV_SIZE		2048
 #else	/* in flash */
@@ -426,7 +426,7 @@
  * but only little space is available, so we use a very simple setup.
  * With environment in flash, we use a more powerful default configuration.
  */
-#ifdef CFG_ENV_IS_IN_EEPROM		/* use restricted "standard" environment */
+#ifdef CONFIG_ENV_IS_IN_EEPROM		/* use restricted "standard" environment */
 
 #define CONFIG_BAUDRATE		38400
 
@@ -480,6 +480,6 @@
 	""
 #define CONFIG_BOOTCOMMAND	"run flash_self"
 
-#endif	/* CFG_ENV_IS_IN_EEPROM */
+#endif	/* CONFIG_ENV_IS_IN_EEPROM */
 
 #endif	/* __CONFIG_H */
include/configs/yosemite.h +3 -3
index cb2042c..f90e9ec 100644
@@ -98,7 +98,7 @@
 #if 1
 #define CFG_ENV_IS_IN_FLASH     1	/* use FLASH for environment vars	*/
 #else
-#define CFG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars	*/
+#define CONFIG_ENV_IS_IN_EEPROM	1	/* use EEPROM for environment vars	*/
 #endif
 
 /*-----------------------------------------------------------------------
@@ -147,10 +147,10 @@
 #define CFG_EEPROM_PAGE_WRITE_BITS 3
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
 
-#ifdef CFG_ENV_IS_IN_EEPROM
+#ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_SIZE		0x200	    /* Size of Environment vars */
 #define CFG_ENV_OFFSET		0x0
-#endif /* CFG_ENV_IS_IN_EEPROM */
+#endif /* CONFIG_ENV_IS_IN_EEPROM */
 
 /* I2C SYSMON (LM75, AD7414 is almost compatible)			*/
 #define CONFIG_DTT_LM75		1		/* ON Semi's LM75	*/
include/configs/yucca.h +1 -1
index 026fef6..0c09a1d 100644
@@ -141,7 +141,7 @@
 
 #undef  CFG_ENV_IS_IN_NVRAM		/* ... not in NVRAM		*/
 #define	CFG_ENV_IS_IN_FLASH	1	/* Environment uses flash	*/
-#undef	CFG_ENV_IS_IN_EEPROM		/* ... not in EEPROM		*/
+#undef	CONFIG_ENV_IS_IN_EEPROM		/* ... not in EEPROM		*/
 #define CONFIG_ENV_OVERWRITE	1
 
 /*
lib_blackfin/board.c +1 -1
index 43d8be8..0b8e664 100644
@@ -378,7 +378,7 @@ void board_init_r(gd_t * id, ulong dest_addr)
 	malloc_bin_reloc();
 
 #ifdef CONFIG_SPI
-# if ! defined(CFG_ENV_IS_IN_EEPROM)
+# if ! defined(CONFIG_ENV_IS_IN_EEPROM)
 	spi_init_f();
 # endif
 	spi_init_r();
lib_m68k/board.c +1 -1
index e59c6b0..d0e63b6 100644
@@ -566,7 +566,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 	malloc_bin_reloc ();
 
 #ifdef CONFIG_SPI
-# if !defined(CFG_ENV_IS_IN_EEPROM)
+# if !defined(CONFIG_ENV_IS_IN_EEPROM)
 	spi_init_f ();
 # endif
 	spi_init_r ();
lib_ppc/board.c +1 -1
index 4d02eb2..1e00404 100644
@@ -822,7 +822,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 	malloc_bin_reloc ();
 
 #ifdef CONFIG_SPI
-# if !defined(CFG_ENV_IS_IN_EEPROM)
+# if !defined(CONFIG_ENV_IS_IN_EEPROM)
 	spi_init_f ();
 # endif
 	spi_init_r ();
lib_sparc/board.c +1 -1
index 15d6935..3c57fcb 100644
@@ -377,7 +377,7 @@ void board_init_f(ulong bootflag)
 	malloc_bin_reloc();
 
 #ifdef CONFIG_SPI
-# if !defined(CFG_ENV_IS_IN_EEPROM)
+# if !defined(CONFIG_ENV_IS_IN_EEPROM)
 	spi_init_f();
 # endif
 	spi_init_r();
Signature · 1 line
1.5.6.3
#6 lore raw

PATCH 6/25 env_eeprom: Move conditional compilation to Makefile

---
 common/Makefile     |    2 +-
 common/env_eeprom.c |    5 -----
 2 files changed, 1 insertions(+), 6 deletions(-)
common/Makefile +1 -1
index 3a20926..3f601e8 100644
@@ -51,7 +51,7 @@ COBJS-y += cmd_nvedit.o
 COBJS-y += environment.o
 COBJS-y += env_common.o
 COBJS-y += env_dataflash.o
-COBJS-y += env_eeprom.o
+COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
 COBJS-y += env_flash.o
 COBJS-y += env_nand.o
 COBJS-y += env_nvram.o
common/env_eeprom.c +0 -5
index 1a03f43..df3e31e 100644
@@ -25,9 +25,6 @@
  */
 
 #include <common.h>
-
-#if defined(CONFIG_ENV_IS_IN_EEPROM) /* Environment is in EEPROM */
-
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
@@ -106,5 +103,3 @@ int env_init(void)
 
 	return (0);
 }
-
-#endif /* CONFIG_ENV_IS_IN_EEPROM */
Signature · 1 line
1.5.6.3
#7 lore raw

PATCH 7/25 cmd_eeprom: Move conditional compilation to Makefile

---
 common/Makefile     |    2 +-
 common/cmd_eeprom.c |    6 ------
 2 files changed, 1 insertions(+), 7 deletions(-)
common/Makefile +1 -1
index 3f601e8..a7d5b59 100644
@@ -79,7 +79,7 @@ endif
 COBJS-$(CONFIG_CMD_DISPLAY) += cmd_display.o
 COBJS-$(CONFIG_CMD_DOC) += cmd_doc.o
 COBJS-$(CONFIG_CMD_DTT) += cmd_dtt.o
-COBJS-y += cmd_eeprom.o
+COBJS-$(CONFIG_ENV_IS_IN_EEPROM)$(CONFIG_CMD_EEPROM) += cmd_eeprom.o
 COBJS-$(CONFIG_CMD_ELF) += cmd_elf.o
 COBJS-$(CONFIG_CMD_EXT2) += cmd_ext2.o
 COBJS-$(CONFIG_CMD_FAT) += cmd_fat.o
common/cmd_eeprom.c +0 -6
index 5034b5e..44d44fe 100644
@@ -42,8 +42,6 @@
 #include <command.h>
 #include <i2c.h>
 
-#if defined(CONFIG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM)
-
 extern void eeprom_init  (void);
 extern int  eeprom_read  (unsigned dev_addr, unsigned offset,
 			  uchar *buffer, unsigned cnt);
@@ -52,7 +50,6 @@ extern int  eeprom_write (unsigned dev_addr, unsigned offset,
 #if defined(CFG_EEPROM_WREN)
 extern int eeprom_write_enable (unsigned dev_addr, int state);
 #endif
-#endif
 
 
 #if defined(CFG_EEPROM_X40430)
@@ -121,8 +118,6 @@ int do_eeprom ( cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
  *   0x00000nxx for EEPROM address selectors and page number at n.
  */
 
-#if defined(CONFIG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM)
-
 #ifndef CONFIG_SPI
 #if !defined(CFG_I2C_EEPROM_ADDR_LEN) || CFG_I2C_EEPROM_ADDR_LEN < 1 || CFG_I2C_EEPROM_ADDR_LEN > 2
 #error CFG_I2C_EEPROM_ADDR_LEN must be 1 or 2
@@ -422,7 +417,6 @@ void eeprom_init  (void)
 }
 /*-----------------------------------------------------------------------
  */
-#endif
 
 /***************************************************/
 
Signature · 1 line
1.5.6.3
#8 lore raw

PATCH 8/25 rename CFG_ENV_IS_IN_DATAFLASH in CONFIG_ENV_IS_IN_DATAFLASH

---
 README                          |    2 +-
 common/cmd_nvedit.c             |    2 +-
 common/env_dataflash.c          |    4 ++--
 include/configs/at91cap9adk.h   |    2 +-
 include/configs/at91rm9200dk.h  |    6 +++---
 include/configs/at91sam9260ek.h |    4 ++--
 include/configs/at91sam9261ek.h |    2 +-
 include/configs/at91sam9263ek.h |    2 +-
 include/configs/at91sam9rlek.h  |    2 +-
 include/configs/csb637.h        |    6 +++---
 include/configs/m501sk.h        |    2 +-
 11 files changed, 17 insertions(+), 17 deletions(-)
README +1 -1
index 0c501cc..406cc62 100644
@@ -2236,7 +2236,7 @@ to save the current settings.
 	  The size in bytes of the EEPROM device.
 
 
-- CFG_ENV_IS_IN_DATAFLASH:
+- CONFIG_ENV_IS_IN_DATAFLASH:
 
 	Define this if you have a DataFlash memory device which you
 	want to use for the environment.
common/cmd_nvedit.c +1 -1
index 8b6b46b..f3d8408 100644
@@ -55,7 +55,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #if !defined(CFG_ENV_IS_IN_NVRAM)	&& \
     !defined(CONFIG_ENV_IS_IN_EEPROM)	&& \
     !defined(CFG_ENV_IS_IN_FLASH)	&& \
-    !defined(CFG_ENV_IS_IN_DATAFLASH)	&& \
+    !defined(CONFIG_ENV_IS_IN_DATAFLASH)	&& \
     !defined(CFG_ENV_IS_IN_NAND)	&& \
     !defined(CFG_ENV_IS_IN_ONENAND)	&& \
     !defined(CFG_ENV_IS_IN_SPI_FLASH)	&& \
common/env_dataflash.c +2 -2
index 2945364..1d55a27 100644
@@ -19,7 +19,7 @@
  */
 #include <common.h>
 
-#if defined(CFG_ENV_IS_IN_DATAFLASH) /* Environment is in DataFlash */
+#if defined(CONFIG_ENV_IS_IN_DATAFLASH) /* Environment is in DataFlash */
 
 #include <command.h>
 #include <environment.h>
@@ -101,4 +101,4 @@ int env_init(void)
 	return (0);
 }
 
-#endif /* CFG_ENV_IS_IN_DATAFLASH */
+#endif /* CONFIG_ENV_IS_IN_DATAFLASH */
include/configs/at91cap9adk.h +1 -1
index 520c676..acf452b 100644
@@ -148,7 +148,7 @@
 #ifdef CFG_USE_DATAFLASH
 
 /* bootstrap + u-boot + env + linux in dataflash */
-#define CFG_ENV_IS_IN_DATAFLASH	1
+#define CONFIG_ENV_IS_IN_DATAFLASH	1
 #define CFG_MONITOR_BASE	(CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
 #define CFG_ENV_OFFSET		0x4200
 #define CFG_ENV_ADDR		(CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
include/configs/at91rm9200dk.h +3 -3
index fca431e..92724ab 100644
@@ -179,9 +179,9 @@
 #define CFG_FLASH_ERASE_TOUT		(2*CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT		(2*CFG_HZ) /* Timeout for Flash Write */
 
-#undef	CFG_ENV_IS_IN_DATAFLASH
+#undef	CONFIG_ENV_IS_IN_DATAFLASH
 
-#ifdef CFG_ENV_IS_IN_DATAFLASH
+#ifdef CONFIG_ENV_IS_IN_DATAFLASH
 #define CFG_ENV_OFFSET			0x20000
 #define CFG_ENV_ADDR			(CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
 #define CFG_ENV_SIZE			0x2000  /* 0x8000 */
@@ -194,7 +194,7 @@
 #define CFG_ENV_ADDR			(PHYS_FLASH_1 + 0x60000)  /* after u-boot.bin */
 #define CFG_ENV_SIZE			0x10000 /* sectors are 64K here */
 #endif	/* CONFIG_SKIP_LOWLEVEL_INIT */
-#endif	/* CFG_ENV_IS_IN_DATAFLASH */
+#endif	/* CONFIG_ENV_IS_IN_DATAFLASH */
 
 
 #define CFG_LOAD_ADDR		0x21000000  /* default load address */
include/configs/at91sam9260ek.h +2 -2
index 675224e..f419363 100644
@@ -134,7 +134,7 @@
 #ifdef CFG_USE_DATAFLASH_CS0
 
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CFG_ENV_IS_IN_DATAFLASH	1
+#define CONFIG_ENV_IS_IN_DATAFLASH	1
 #define CFG_MONITOR_BASE	(CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
 #define CFG_ENV_OFFSET		0x4200
 #define CFG_ENV_ADDR		(CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
@@ -148,7 +148,7 @@
 #elif CFG_USE_DATAFLASH_CS1
 
 /* bootstrap + u-boot + env + linux in dataflash on CS1 */
-#define CFG_ENV_IS_IN_DATAFLASH	1
+#define CONFIG_ENV_IS_IN_DATAFLASH	1
 #define CFG_MONITOR_BASE	(CFG_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
 #define CFG_ENV_OFFSET		0x4200
 #define CFG_ENV_ADDR		(CFG_DATAFLASH_LOGIC_ADDR_CS1 + CFG_ENV_OFFSET)
include/configs/at91sam9261ek.h +1 -1
index e53a23f..2929149 100644
@@ -148,7 +148,7 @@
 #ifdef CFG_USE_DATAFLASH_CS0
 
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CFG_ENV_IS_IN_DATAFLASH	1
+#define CONFIG_ENV_IS_IN_DATAFLASH	1
 #define CFG_MONITOR_BASE	(CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
 #define CFG_ENV_OFFSET		0x4200
 #define CFG_ENV_ADDR		(CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
include/configs/at91sam9263ek.h +1 -1
index 5f90d39..c91e076 100644
@@ -154,7 +154,7 @@
 #ifdef CFG_USE_DATAFLASH
 
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CFG_ENV_IS_IN_DATAFLASH	1
+#define CONFIG_ENV_IS_IN_DATAFLASH	1
 #define CFG_MONITOR_BASE	(CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
 #define CFG_ENV_OFFSET		0x4200
 #define CFG_ENV_ADDR		(CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
include/configs/at91sam9rlek.h +1 -1
index 2ad8d05..0bf0ace 100644
@@ -123,7 +123,7 @@
 #ifdef CFG_USE_DATAFLASH
 
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CFG_ENV_IS_IN_DATAFLASH	1
+#define CONFIG_ENV_IS_IN_DATAFLASH	1
 #define CFG_MONITOR_BASE	(CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
 #define CFG_ENV_OFFSET		0x4200
 #define CFG_ENV_ADDR		(CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
include/configs/csb637.h +3 -3
index 88c8fdb..6626524 100644
@@ -191,9 +191,9 @@
 #define CFG_JFFS2_FIRST_SECTOR	3
 #define CFG_JFFS2_NUM_BANKS	1
 
-#undef	CFG_ENV_IS_IN_DATAFLASH
+#undef	CONFIG_ENV_IS_IN_DATAFLASH
 
-#ifdef CFG_ENV_IS_IN_DATAFLASH
+#ifdef CONFIG_ENV_IS_IN_DATAFLASH
 #define CFG_ENV_OFFSET			0x20000
 #define CFG_ENV_ADDR			(CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
 #define CFG_ENV_SIZE			0x2000  /* 0x8000 */
@@ -201,7 +201,7 @@
 #define CFG_ENV_IS_IN_FLASH		1
 #define CFG_ENV_ADDR			(PHYS_FLASH_1 + 0x20000)  /* after u-boot.bin */
 #define CFG_ENV_SIZE			0x20000 /* sectors are 128K here */
-#endif	/* CFG_ENV_IS_IN_DATAFLASH */
+#endif	/* CONFIG_ENV_IS_IN_DATAFLASH */
 
 
 #define CFG_LOAD_ADDR		0x21000000  /* default load address */
include/configs/m501sk.h +1 -1
index 7fc460a..7024a83 100644
@@ -154,7 +154,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 */
 
-#ifdef CFG_ENV_IS_IN_DATAFLASH
+#ifdef CONFIG_ENV_IS_IN_DATAFLASH
 #define CFG_ENV_OFFSET		0x20000
 #define CFG_ENV_ADDR		(CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
 #define CFG_ENV_SIZE		0x2000
Signature · 1 line
1.5.6.3
#9 lore raw

PATCH 9/25 env_dataflash: Move conditional compilation to Makefile

---
 common/Makefile        |    2 +-
 common/env_dataflash.c |    5 -----
 2 files changed, 1 insertions(+), 6 deletions(-)
common/Makefile +1 -1
index a7d5b59..53e20e6 100644
@@ -50,7 +50,7 @@ COBJS-y += cmd_nvedit.o
 # environment
 COBJS-y += environment.o
 COBJS-y += env_common.o
-COBJS-y += env_dataflash.o
+COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o
 COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
 COBJS-y += env_flash.o
 COBJS-y += env_nand.o
common/env_dataflash.c +0 -5
index 1d55a27..2254b9b 100644
@@ -18,9 +18,6 @@
  *
  */
 #include <common.h>
-
-#if defined(CONFIG_ENV_IS_IN_DATAFLASH) /* Environment is in DataFlash */
-
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
@@ -100,5 +97,3 @@ int env_init(void)
 
 	return (0);
 }
-
-#endif /* CONFIG_ENV_IS_IN_DATAFLASH */
Signature · 1 line
1.5.6.3
#10 lore raw

PATCH 10/25 rename CFG_ENV_IS_IN_NAND in CONFIG_ENV_IS_IN_NAND

---
 README                              |    2 +-
 common/cmd_nvedit.c                 |    2 +-
 common/env_common.c                 |    2 +-
 common/env_nand.c                   |    4 ++--
 include/configs/MPC8313ERDB.h       |    2 +-
 include/configs/PMC440.h            |    4 ++--
 include/configs/acadia.h            |    4 ++--
 include/configs/at91sam9260ek.h     |    2 +-
 include/configs/at91sam9261ek.h     |    2 +-
 include/configs/at91sam9263ek.h     |    2 +-
 include/configs/at91sam9rlek.h      |    2 +-
 include/configs/bamboo.h            |    4 ++--
 include/configs/canyonlands.h       |    4 ++--
 include/configs/davinci_dvevm.h     |    2 +-
 include/configs/davinci_schmoogie.h |    2 +-
 include/configs/davinci_sffsdr.h    |    2 +-
 include/configs/davinci_sonata.h    |    2 +-
 include/configs/delta.h             |    2 +-
 include/configs/kilauea.h           |    4 ++--
 include/configs/omap2420h4.h        |    2 +-
 include/configs/sequoia.h           |    4 ++--
 include/configs/smdk6400.h          |    2 +-
 include/configs/zylonite.h          |    2 +-
 include/environment.h               |    8 ++++----
 24 files changed, 34 insertions(+), 34 deletions(-)
README +1 -1
index 406cc62..d462b52 100644
@@ -2249,7 +2249,7 @@ to save the current settings.
 	  environment area within the total memory of your DataFlash placed
 	  at the specified address.
 
-- CFG_ENV_IS_IN_NAND:
+- CONFIG_ENV_IS_IN_NAND:
 
 	Define this if you have a NAND device which you want to use
 	for the environment.
common/cmd_nvedit.c +1 -1
index f3d8408..dc6d13a 100644
@@ -56,7 +56,7 @@ DECLARE_GLOBAL_DATA_PTR;
     !defined(CONFIG_ENV_IS_IN_EEPROM)	&& \
     !defined(CFG_ENV_IS_IN_FLASH)	&& \
     !defined(CONFIG_ENV_IS_IN_DATAFLASH)	&& \
-    !defined(CFG_ENV_IS_IN_NAND)	&& \
+    !defined(CONFIG_ENV_IS_IN_NAND)	&& \
     !defined(CFG_ENV_IS_IN_ONENAND)	&& \
     !defined(CFG_ENV_IS_IN_SPI_FLASH)	&& \
     !defined(CFG_ENV_IS_NOWHERE)
common/env_common.c +1 -1
index d51c211..e89f192 100644
@@ -133,7 +133,7 @@ uchar default_environment[] = {
 	"\0"
 };
 
-#if defined(CFG_ENV_IS_IN_NAND)		/* Environment is in Nand Flash */ \
+#if defined(CONFIG_ENV_IS_IN_NAND)		/* Environment is in Nand Flash */ \
 	|| defined(CFG_ENV_IS_IN_SPI_FLASH)
 int default_environment_size = sizeof(default_environment);
 #endif
common/env_nand.c +2 -2
index a8f0de7..53e3183 100644
@@ -34,7 +34,7 @@
 
 #include <common.h>
 
-#if defined(CFG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */
+#if defined(CONFIG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */
 
 #include <command.h>
 #include <environment.h>
@@ -367,4 +367,4 @@ static void use_default()
 }
 #endif
 
-#endif /* CFG_ENV_IS_IN_NAND */
+#endif /* CONFIG_ENV_IS_IN_NAND */
include/configs/MPC8313ERDB.h +1 -1
index 95ba840..c17a2ea 100644
@@ -385,7 +385,7 @@
  * Environment
  */
 #if defined(CONFIG_NAND_U_BOOT)
-	#define CFG_ENV_IS_IN_NAND	1
+	#define CONFIG_ENV_IS_IN_NAND	1
 	#define CFG_ENV_OFFSET		(512 * 1024)
 	#define CFG_ENV_SECT_SIZE	CFG_NAND_BLOCK_SIZE
 	#define CFG_ENV_SIZE		CFG_ENV_SECT_SIZE
include/configs/PMC440.h +2 -2
index 071ba10..5b25323 100644
@@ -107,7 +107,7 @@
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
 #define CONFIG_ENV_IS_IN_EEPROM	1	/* use FLASH for environment vars */
 #else
-#define CFG_ENV_IS_IN_NAND	1	/* use NAND for environment vars */
+#define CONFIG_ENV_IS_IN_NAND	1	/* use NAND for environment vars */
 #define CFG_ENV_IS_EMBEDDED	1	/* use embedded environment */
 #endif
 
@@ -200,7 +200,7 @@
 #define CFG_NAND_ECCPOS		{0, 1, 2, 3, 6, 7}
 #endif
 
-#ifdef CFG_ENV_IS_IN_NAND
+#ifdef CONFIG_ENV_IS_IN_NAND
 /*
  * 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.
include/configs/acadia.h +2 -2
index ed2754d..894a62b 100644
@@ -98,7 +98,7 @@
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
 #define CFG_ENV_IS_IN_FLASH     1	/* use FLASH for environment vars	*/
 #else
-#define CFG_ENV_IS_IN_NAND	1	/* use NAND for environment vars	*/
+#define CONFIG_ENV_IS_IN_NAND	1	/* use NAND for environment vars	*/
 #define CFG_ENV_IS_EMBEDDED	1	/* use embedded environment */
 #endif
 
@@ -180,7 +180,7 @@
 #define CFG_NAND_ECCTOTAL	(CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
 #define CFG_NAND_ECCPOS		{0, 1, 2, 3, 6, 7}
 
-#ifdef CFG_ENV_IS_IN_NAND
+#ifdef CONFIG_ENV_IS_IN_NAND
 /*
  * 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.
include/configs/at91sam9260ek.h +1 -1
index f419363..0ddc079 100644
@@ -162,7 +162,7 @@
 #else /* CFG_USE_NANDFLASH */
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CFG_ENV_IS_IN_NAND	1
+#define CONFIG_ENV_IS_IN_NAND	1
 #define CFG_ENV_OFFSET		0x60000
 #define CFG_ENV_OFFSET_REDUND	0x80000
 #define CFG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */
include/configs/at91sam9261ek.h +1 -1
index 2929149..a4a0831 100644
@@ -162,7 +162,7 @@
 #else /* CFG_USE_NANDFLASH */
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CFG_ENV_IS_IN_NAND	1
+#define CONFIG_ENV_IS_IN_NAND	1
 #define CFG_ENV_OFFSET		0x60000
 #define CFG_ENV_OFFSET_REDUND	0x80000
 #define CFG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */
include/configs/at91sam9263ek.h +1 -1
index c91e076..1d24311 100644
@@ -168,7 +168,7 @@
 #else /* CFG_USE_NANDFLASH */
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CFG_ENV_IS_IN_NAND	1
+#define CONFIG_ENV_IS_IN_NAND	1
 #define CFG_ENV_OFFSET		0x60000
 #define CFG_ENV_OFFSET_REDUND	0x80000
 #define CFG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */
include/configs/at91sam9rlek.h +1 -1
index 0bf0ace..8162475 100644
@@ -137,7 +137,7 @@
 #else /* CFG_USE_NANDFLASH */
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CFG_ENV_IS_IN_NAND	1
+#define CONFIG_ENV_IS_IN_NAND	1
 #define CFG_ENV_OFFSET		0x60000
 #define CFG_ENV_OFFSET_REDUND	0x80000
 #define CFG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */
include/configs/bamboo.h +2 -2
index 7caa403..20ebc3f 100644
@@ -105,7 +105,7 @@
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
 #define CFG_ENV_IS_IN_FLASH     1	/* use FLASH for environment vars	*/
 #else
-#define CFG_ENV_IS_IN_NAND	1	/* use NAND for environment vars	*/
+#define CONFIG_ENV_IS_IN_NAND	1	/* use NAND for environment vars	*/
 #define CFG_ENV_IS_EMBEDDED	1	/* use embedded environment */
 #endif
 
@@ -183,7 +183,7 @@
 #define CFG_NAND_ECCTOTAL	(CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
 #define CFG_NAND_ECCPOS		{0, 1, 2, 3, 6, 7}
 
-#ifdef CFG_ENV_IS_IN_NAND
+#ifdef CONFIG_ENV_IS_IN_NAND
 /*
  * 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.
include/configs/canyonlands.h +2 -2
index 3b5b280..1891074 100644
@@ -115,7 +115,7 @@
 #define	CFG_ENV_IS_IN_FLASH	1	/* use FLASH for environment vars */
 #define CFG_NAND_CS		3	/* NAND chip connected to CSx */
 #else
-#define	CFG_ENV_IS_IN_NAND	1	/* use NAND for environment vars  */
+#define	CONFIG_ENV_IS_IN_NAND	1	/* use NAND for environment vars  */
 #define CFG_NAND_CS		0	/* NAND chip connected to CSx */
 #define CFG_ENV_IS_EMBEDDED	1	/* use embedded environment */
 #endif
@@ -174,7 +174,7 @@
 				 48, 49, 50, 51, 52, 53, 54, 55, \
 				 56, 57, 58, 59, 60, 61, 62, 63}
 
-#ifdef CFG_ENV_IS_IN_NAND
+#ifdef CONFIG_ENV_IS_IN_NAND
 /*
  * 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.
include/configs/davinci_dvevm.h +1 -1
index c27ce18..9d79e3c 100644
@@ -114,7 +114,7 @@
 #ifdef CFG_USE_NAND
 #undef CFG_ENV_IS_IN_FLASH
 #define CFG_NO_FLASH
-#define CFG_ENV_IS_IN_NAND		/* U-Boot env in NAND Flash  */
+#define CONFIG_ENV_IS_IN_NAND		/* U-Boot env in NAND Flash  */
 #ifdef CFG_NAND_SMALLPAGE
 #define CFG_ENV_SECT_SIZE	512	/* Env sector Size */
 #define CFG_ENV_SIZE		SZ_16K
include/configs/davinci_schmoogie.h +1 -1
index 10166a1..4aed843 100644
@@ -81,7 +81,7 @@
 /*=====================*/
 #undef CFG_ENV_IS_IN_FLASH
 #define CFG_NO_FLASH
-#define CFG_ENV_IS_IN_NAND		/* U-Boot env in NAND Flash  */
+#define CONFIG_ENV_IS_IN_NAND		/* U-Boot env in NAND Flash  */
 #define CFG_ENV_SECT_SIZE	2048	/* Env sector Size */
 #define CFG_ENV_SIZE		SZ_128K
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* U-Boot is loaded by a bootloader */
include/configs/davinci_sffsdr.h +1 -1
index 7c860e5..c46a430 100644
@@ -77,7 +77,7 @@
 /* Flash & Environment */
 #undef CFG_ENV_IS_IN_FLASH
 #define CFG_NO_FLASH
-#define CFG_ENV_IS_IN_NAND		/* U-Boot env in NAND Flash  */
+#define CONFIG_ENV_IS_IN_NAND		/* U-Boot env in NAND Flash  */
 #define CFG_ENV_SECT_SIZE	2048	/* Env sector Size */
 #define CFG_ENV_SIZE		SZ_128K
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* U-Boot is loaded by a bootloader */
include/configs/davinci_sonata.h +1 -1
index c55766c..9c54f08 100644
@@ -114,7 +114,7 @@
 #ifdef CFG_USE_NAND
 #undef CFG_ENV_IS_IN_FLASH
 #define CFG_NO_FLASH
-#define CFG_ENV_IS_IN_NAND		/* U-Boot env in NAND Flash  */
+#define CONFIG_ENV_IS_IN_NAND		/* U-Boot env in NAND Flash  */
 #define CFG_ENV_SECT_SIZE	512	/* Env sector Size */
 #define CFG_ENV_SIZE		SZ_16K
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* U-Boot is loaded by a bootloader */
include/configs/delta.h +1 -1
index 1db962a..5a5240e 100644
@@ -262,7 +262,7 @@
 
 #define CFG_NO_FLASH		1
 
-#define CFG_ENV_IS_IN_NAND	1
+#define CONFIG_ENV_IS_IN_NAND	1
 #define CFG_ENV_OFFSET		0x40000
 #define CFG_ENV_OFFSET_REDUND	0x44000
 #define CFG_ENV_SIZE		0x4000
include/configs/kilauea.h +2 -2
index a475f97..d38e5c8 100644
@@ -123,7 +123,7 @@
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
 #define CFG_ENV_IS_IN_FLASH     1	/* use FLASH for environment vars	*/
 #else
-#define CFG_ENV_IS_IN_NAND	1	/* use NAND for environment vars	*/
+#define CONFIG_ENV_IS_IN_NAND	1	/* use NAND for environment vars	*/
 #define CFG_ENV_IS_EMBEDDED	1	/* use embedded environment */
 #endif
 
@@ -200,7 +200,7 @@
 #define CFG_NAND_ECCTOTAL	(CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
 #define CFG_NAND_ECCPOS		{0, 1, 2, 3, 6, 7}
 
-#ifdef CFG_ENV_IS_IN_NAND
+#ifdef CONFIG_ENV_IS_IN_NAND
 /*
  * 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.
include/configs/omap2420h4.h +1 -1
index afdcba4..461362f 100644
@@ -270,7 +270,7 @@
 #define CFG_FLASH_BANKS_LIST	{ CFG_FLASH_BASE, CFG_FLASH_BASE + PHYS_FLASH_SIZE_1 }
 
 #ifdef CFG_NAND_BOOT
-#define CFG_ENV_IS_IN_NAND	1
+#define CONFIG_ENV_IS_IN_NAND	1
 #define CFG_ENV_OFFSET	0x80000	/* environment starts here  */
 #else
 #define CFG_ENV_ADDR             (CFG_FLASH_BASE + SZ_128K)
include/configs/sequoia.h +2 -2
index 18675c2..d7b6d16 100644
@@ -115,7 +115,7 @@
 #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
 #define CFG_ENV_IS_IN_FLASH	1	/* use FLASH for environ vars	*/
 #else
-#define CFG_ENV_IS_IN_NAND	1	/* use NAND for environ vars	*/
+#define CONFIG_ENV_IS_IN_NAND	1	/* use NAND for environ vars	*/
 #define CFG_ENV_IS_EMBEDDED	1	/* use embedded environment	*/
 #endif
 
@@ -197,7 +197,7 @@
 #define CFG_NAND_ECCTOTAL	(CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
 #define CFG_NAND_ECCPOS		{0, 1, 2, 3, 6, 7}
 
-#ifdef CFG_ENV_IS_IN_NAND
+#ifdef CONFIG_ENV_IS_IN_NAND
 /*
  * 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.
include/configs/smdk6400.h +1 -1
index f0c146e..4c5602b 100644
@@ -284,7 +284,7 @@
 */
 
 /* Settings as above boot configuration */
-#define CFG_ENV_IS_IN_NAND
+#define CONFIG_ENV_IS_IN_NAND
 #define CONFIG_BOOTARGS		"console=ttySAC,115200"
 
 #if !defined(CONFIG_ENABLE_MMU)
include/configs/zylonite.h +1 -1
index 517ecb1..47ce15d 100644
@@ -231,7 +231,7 @@
 
 #define CFG_NO_FLASH		1
 
-#define CFG_ENV_IS_IN_NAND	1
+#define CONFIG_ENV_IS_IN_NAND	1
 #define CFG_ENV_OFFSET		0x40000
 #define CFG_ENV_OFFSET_REDUND	0x44000
 #define CFG_ENV_SIZE		0x4000
include/environment.h +4 -4
index 481ea73..047f5f0 100644
@@ -69,12 +69,12 @@
 # endif
 #endif	/* CFG_ENV_IS_IN_FLASH */
 
-#if defined(CFG_ENV_IS_IN_NAND)
+#if defined(CONFIG_ENV_IS_IN_NAND)
 # ifndef CFG_ENV_OFFSET
-#  error "Need to define CFG_ENV_OFFSET when using CFG_ENV_IS_IN_NAND"
+#  error "Need to define CFG_ENV_OFFSET when using CONFIG_ENV_IS_IN_NAND"
 # endif
 # ifndef CFG_ENV_SIZE
-#  error "Need to define CFG_ENV_SIZE when using CFG_ENV_IS_IN_NAND"
+#  error "Need to define CFG_ENV_SIZE when using CONFIG_ENV_IS_IN_NAND"
 # endif
 # ifdef CFG_ENV_OFFSET_REDUND
 #  define CFG_REDUNDAND_ENVIRONMENT
@@ -82,7 +82,7 @@
 # ifdef CFG_ENV_IS_EMBEDDED
 #  define ENV_IS_EMBEDDED	1
 # endif
-#endif /* CFG_ENV_IS_IN_NAND */
+#endif /* CONFIG_ENV_IS_IN_NAND */
 
 #ifdef USE_HOSTCC
 # include <stdint.h>
Signature · 1 line
1.5.6.3
#11 lore raw

PATCH 11/25 env_nand: Move conditional compilation to Makefile

---
 common/Makefile   |    2 +-
 common/env_nand.c |    5 -----
 2 files changed, 1 insertions(+), 6 deletions(-)
common/Makefile +1 -1
index 53e20e6..e7c3a8a 100644
@@ -53,7 +53,7 @@ COBJS-y += env_common.o
 COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o
 COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
 COBJS-y += env_flash.o
-COBJS-y += env_nand.o
+COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
 COBJS-y += env_nvram.o
 COBJS-y += env_onenand.o
 COBJS-y += env_sf.o
common/env_nand.c +0 -5
index 53e3183..9d01d7c 100644
@@ -33,9 +33,6 @@
 /* #define DEBUG */
 
 #include <common.h>
-
-#if defined(CONFIG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */
-
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
@@ -366,5 +363,3 @@ static void use_default()
 	set_default_env();
 }
 #endif
-
-#endif /* CONFIG_ENV_IS_IN_NAND */
Signature · 1 line
1.5.6.3
#12 lore raw

PATCH 12/25 rename CFG_ENV_IS_IN_NVRAM in CONFIG_ENV_IS_IN_NVRAM

---
 Makefile                       |    2 +-
 README                         |    2 +-
 board/LEOX/elpt860/README.LEOX |    2 +-
 board/RPXlite_dw/README        |    2 +-
 common/cmd_nvedit.c            |    6 +++---
 common/env_nvram.c             |    4 ++--
 cpu/mpc8xx/cpu_init.c          |    2 +-
 include/configs/ADCIOP.h       |    2 +-
 include/configs/AP1000.h       |    6 +++---
 include/configs/Alaska8220.h   |    6 +++---
 include/configs/AmigaOneG3SE.h |    2 +-
 include/configs/BAB7xx.h       |    2 +-
 include/configs/BMW.h          |    2 +-
 include/configs/CPCI405.h      |    2 +-
 include/configs/CPCI4052.h     |    2 +-
 include/configs/CPCI405DT.h    |    2 +-
 include/configs/ELPPC.h        |    2 +-
 include/configs/ELPT860.h      |    4 ++--
 include/configs/ERIC.h         |   10 +++++-----
 include/configs/EXBITGEN.h     |    2 +-
 include/configs/IP860.h        |    8 ++++----
 include/configs/JSE.h          |    2 +-
 include/configs/KAREF.h        |    2 +-
 include/configs/MBX.h          |    2 +-
 include/configs/MBX860T.h      |    2 +-
 include/configs/METROBOX.h     |    2 +-
 include/configs/ML2.h          |    6 +++---
 include/configs/MOUSSE.h       |    2 +-
 include/configs/MPC8260ADS.h   |    2 +-
 include/configs/MPC8266ADS.h   |    2 +-
 include/configs/OCRTC.h        |    2 +-
 include/configs/ORSG.h         |    2 +-
 include/configs/PCI405.h       |    2 +-
 include/configs/QS860T.h       |    2 +-
 include/configs/RPXClassic.h   |    2 +-
 include/configs/RPXlite_DW.h   |    4 ++--
 include/configs/RPXsuper.h     |    2 +-
 include/configs/W7OLMC.h       |    2 +-
 include/configs/W7OLMG.h       |    2 +-
 include/configs/Yukon8220.h    |    6 +++---
 include/configs/ZPC1900.h      |    4 ++--
 include/configs/bubinga.h      |    4 ++--
 include/configs/csb272.h       |    2 +-
 include/configs/csb472.h       |    2 +-
 include/configs/debris.h       |    2 +-
 include/configs/ebony.h        |    6 +++---
 include/configs/ep8260.h       |    2 +-
 include/configs/hcu4.h         |    2 +-
 include/configs/hcu5.h         |    2 +-
 include/configs/kvme080.h      |    2 +-
 include/configs/mcu25.h        |    2 +-
 include/configs/mpc7448hpc2.h  |    2 +-
 include/configs/ocotea.h       |    6 +++---
 include/configs/redwood.h      |    2 +-
 include/configs/sacsng.h       |    2 +-
 include/configs/sbc8260.h      |    2 +-
 include/configs/sorcery.h      |    6 +++---
 include/configs/taihu.h        |    2 +-
 include/configs/v37.h          |    2 +-
 include/configs/walnut.h       |    4 ++--
 include/configs/yucca.h        |    2 +-
 lib_m68k/board.c               |    2 +-
 lib_mips/board.c               |    2 +-
 lib_ppc/board.c                |    2 +-
 64 files changed, 93 insertions(+), 93 deletions(-)
Makefile +1 -1
index 005da41..2d4bf14 100644
@@ -1059,7 +1059,7 @@ RPXlite_DW_config:	unconfig
 		  $(XECHO) "... with LCD display ..."; \
 		}
 	@[ -z "$(findstring _NVRAM,$@)" ] || \
-		{ echo "#define  CFG_ENV_IS_IN_NVRAM"	>>$(obj)include/config.h ; \
+		{ echo "#define  CONFIG_ENV_IS_IN_NVRAM"	>>$(obj)include/config.h ; \
 		  $(XECHO) "... with ENV in NVRAM ..."; \
 		}
 	@$(MKCONFIG) -a RPXlite_DW ppc mpc8xx RPXlite_dw
README +1 -1
index d462b52..35b8ac2 100644
@@ -2168,7 +2168,7 @@ source code will make it necessary to adapt <board>/u-boot.lds*
 accordingly!
 
 
-- CFG_ENV_IS_IN_NVRAM:
+- CONFIG_ENV_IS_IN_NVRAM:
 
 	Define this if you have some non-volatile memory device
 	(NVRAM, battery buffered SRAM) which you want to use for the
board/LEOX/elpt860/README.LEOX +1 -1
index 9052b09..25524af 100644
@@ -106,7 +106,7 @@ version - print monitor version
 ?       - alias for 'help'
 
 ##################################################
-# Environment Variables (CFG_ENV_IS_IN_NVRAM)
+# Environment Variables (CONFIG_ENV_IS_IN_NVRAM)
 ##############################
 
 LEOX_elpt860: printenv
board/RPXlite_dw/README +1 -1
index 28bcb31..60580c9 100644
@@ -21,7 +21,7 @@ make distclean
 make RPXlite_DW_64_config
 make all
 
-2. CFG_ENV_IS_IN_FLASH/CFG_ENV_IS_IN_NVRAM
+2. CFG_ENV_IS_IN_FLASH/CONFIG_ENV_IS_IN_NVRAM
 
 The default environment parameter is stored in FLASH because it is a common choice for
 environment parameter.So I make NVRAM as backup parameter storeage.The reason why I
common/cmd_nvedit.c +3 -3
index dc6d13a..08671f2 100644
@@ -52,7 +52,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if !defined(CFG_ENV_IS_IN_NVRAM)	&& \
+#if !defined(CONFIG_ENV_IS_IN_NVRAM)	&& \
     !defined(CONFIG_ENV_IS_IN_EEPROM)	&& \
     !defined(CFG_ENV_IS_IN_FLASH)	&& \
     !defined(CONFIG_ENV_IS_IN_DATAFLASH)	&& \
@@ -540,7 +540,7 @@ int getenv_r (char *name, char *buf, unsigned len)
 	return (-1);
 }
 
-#if ((defined(CFG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \
+#if ((defined(CONFIG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \
@@ -596,7 +596,7 @@ U_BOOT_CMD(
 	"    - delete environment variable 'name'\n"
 );
 
-#if ((defined(CFG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \
+#if ((defined(CONFIG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \
common/env_nvram.c +2 -2
index fa77719..c877f00 100644
@@ -44,7 +44,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CFG_ENV_IS_IN_NVRAM /* Environment is in NVRAM */
+#ifdef CONFIG_ENV_IS_IN_NVRAM /* Environment is in NVRAM */
 
 #include <command.h>
 #include <environment.h>
@@ -157,4 +157,4 @@ int env_init (void)
 	return (0);
 }
 
-#endif /* CFG_ENV_IS_IN_NVRAM */
+#endif /* CONFIG_ENV_IS_IN_NVRAM */
cpu/mpc8xx/cpu_init.c +1 -1
index fb3414a..5c43eca 100644
@@ -245,7 +245,7 @@ void cpu_init_f (volatile immap_t * immr)
 	rpxclassic_init ();
 #endif
 
-#if defined(CONFIG_RPXLITE) && defined(CFG_ENV_IS_IN_NVRAM)
+#if defined(CONFIG_RPXLITE) && defined(CONFIG_ENV_IS_IN_NVRAM)
 	rpxlite_init ();
 #endif
 
include/configs/ADCIOP.h +1 -1
index 5d28168..148c905 100644
@@ -160,7 +160,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#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 CFG_ENV_SIZE		0x0400		/* Size of Environment vars	*/
include/configs/AP1000.h +3 -3
index baa9741..f0e0282 100644
@@ -40,11 +40,11 @@
 #define CFG_ENV_IS_IN_FLASH	1
 #define CFG_FLASH_USE_BUFFER_WRITE
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #else
 #ifdef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #endif
 #endif
 
@@ -186,7 +186,7 @@
 #define CFG_NVRAM_BASE_ADDR	0xf0000000	/* NVRAM base address	*/
 #define CFG_NVRAM_SIZE		0x1ff8		/* NVRAM size	*/
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_SIZE		0x1000		/* Size of Environment vars */
 #define CFG_ENV_ADDR	    \
     (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)	/* Env	*/
include/configs/Alaska8220.h +3 -3
index 0c2e6ae..3d4cd36 100644
@@ -225,13 +225,13 @@
 #define CONFIG_ENV_OVERWRITE	1
 
 #if defined CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CONFIG_ENV_IS_IN_EEPROM
-#elif defined CFG_ENV_IS_IN_NVRAM
+#elif defined CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_IN_EEPROM
 #elif defined CONFIG_ENV_IS_IN_EEPROM
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #endif
 
include/configs/AmigaOneG3SE.h +1 -1
index 84efd2f..17f5909 100644
@@ -240,7 +240,7 @@
 /*
  * Environment is stored in NVRAM.
  */
-#define CFG_ENV_IS_IN_NVRAM	1
+#define CONFIG_ENV_IS_IN_NVRAM	1
 #define CFG_ENV_ADDR		0xFD0E0000 /* This should be 0xFD0E0000, but we skip bytes to
 					    * protect softex's settings for now.
 					    * Original 768 bytes where not enough.
include/configs/BAB7xx.h +1 -1
index 26a1a2d..c19f1e9 100644
@@ -243,7 +243,7 @@
  * Environment settings
  */
 #define CONFIG_ENV_OVERWRITE
-#define CFG_ENV_IS_IN_NVRAM     1           /* use NVRAM for environment vars */
+#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 CFG_ENV_SIZE            0x400       /* Size of Environment vars (1kB) */
 /*
include/configs/BMW.h +1 -1
index 11d19c6..5ba3e6d 100644
@@ -289,7 +289,7 @@
  * Warining: environment is not EMBEDDED in the U-Boot code.
  * It's stored in flash separately.
  */
-#define CFG_ENV_IS_IN_NVRAM      1
+#define CONFIG_ENV_IS_IN_NVRAM      1
 #define CONFIG_ENV_OVERWRITE     1
 #define CFG_NVRAM_ACCESS_ROUTINE 1
 #define CFG_ENV_ADDR		0x7c004000 /* right at the start of NVRAM  */
include/configs/CPCI405.h +1 -1
index bc514b0..9a076ba 100644
@@ -236,7 +236,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
 #define CFG_ENV_SIZE		0x1000		/* Size of Environment vars	*/
 #define CFG_ENV_ADDR		\
 	(CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)	/* Env	*/
include/configs/CPCI4052.h +1 -1
index 04a8030..32bd9a1 100644
@@ -245,7 +245,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
 #define CFG_ENV_SIZE		0x0ff8		/* Size of Environment vars	*/
 #define CFG_ENV_ADDR		\
 	(CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(CFG_ENV_SIZE+8))	/* Env	*/
include/configs/CPCI405DT.h +1 -1
index 6c5a3fe..53228c1 100644
@@ -254,7 +254,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
 #define CFG_ENV_SIZE		0x0ff8		/* Size of Environment vars	*/
 #define CFG_ENV_ADDR		\
 	(CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(CFG_ENV_SIZE+8))	/* Env	*/
include/configs/ELPPC.h +1 -1
index c64537f..8c68400 100644
@@ -218,7 +218,7 @@
  * Environment settings
  */
 #define CONFIG_ENV_OVERWRITE
-#define CFG_ENV_IS_IN_NVRAM     1           /* use NVRAM for environment vars */
+#define CONFIG_ENV_IS_IN_NVRAM     1           /* use NVRAM for environment vars */
 #define CFG_NVRAM_SIZE          0x800       /* NVRAM size (2kB) */
 #define CFG_ENV_SIZE            0x400       /* Size of Environment vars (1kB) */
 #define CFG_ENV_ADDR            0x0
include/configs/ELPT860.h +2 -2
index 828dd9f..b917806 100644
@@ -137,7 +137,7 @@
  */
 #define CONFIG_ENV_OVERWRITE	1  /* Allow Overwrite of serial# & ethaddr */
 
-#undef	  CFG_ENV_IS_IN_NVRAM	       /* Environment is in NVRAM	*/
+#undef	  CONFIG_ENV_IS_IN_NVRAM	       /* Environment is in NVRAM	*/
 #undef	  CONFIG_ENV_IS_IN_EEPROM	       /* Environment is in I2C EEPROM	*/
 #define CFG_ENV_IS_IN_FLASH	1      /* Environment is in FLASH	*/
 
@@ -225,7 +225,7 @@
 #define CFG_NVRAM_SIZE		((128*1024)-8) /* clock regs resident in the */
 					       /*   8 top NVRAM locations    */
 
-#if defined(CFG_ENV_IS_IN_NVRAM)
+#if defined(CONFIG_ENV_IS_IN_NVRAM)
 #  define CFG_ENV_ADDR		CFG_NVRAM_BASE /* Base address of NVRAM area */
 #  define CFG_ENV_SIZE		0x4000	/* Total Size of Environment Sector  */
 #endif
include/configs/ERIC.h +5 -5
index dfbbc95..c699855 100644
@@ -45,7 +45,7 @@
 #define CFG_ENV_IS_IN_FLASH	1	/* use FLASH for environment vars	*/
 #endif
 #if 0
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
 #endif
 #if 0
 #define CONFIG_ENV_IS_IN_EEPROM	1	/* use I2C RTC X1240 for environment vars */
@@ -63,15 +63,15 @@
 #define CFG_I2C_RTC_ADDR	0x6F	/*                                and one for RTC */
 
 #ifdef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CONFIG_ENV_IS_IN_EEPROM
 #else
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_IN_EEPROM
 #else
 #ifdef CONFIG_ENV_IS_IN_EEPROM
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #endif
 #endif
@@ -318,7 +318,7 @@
 #define CFG_NVRAM_BASE_ADDR	CFG_NVRAM_REG_BASE_ADDR	/* NVRAM base address	*/
 #define CFG_NVRAM_SIZE		0x7F8		/* NVRAM size 2kByte - 8 Byte for RTC */
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_SIZE		0x7F8		/* Size of Environment vars	*/
 #define CFG_ENV_ADDR		\
 	(CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)	/* Env	*/
include/configs/EXBITGEN.h +1 -1
index cee0be4..4193492 100644
@@ -49,7 +49,7 @@
 /* environment is in EEPROM */
 #define CONFIG_ENV_IS_IN_EEPROM    1
 #undef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 
 #ifdef CONFIG_ENV_IS_IN_EEPROM
 #define CFG_I2C_EEPROM_ADDR		0x56    /* 1010110 */
include/configs/IP860.h +4 -4
index 67f8833..63e7e5d 100644
@@ -187,15 +187,15 @@
 #define CFG_FLASH_WRITE_TOUT	500	/* Timeout for Flash Write (in ms)	*/
 
 #undef	CFG_ENV_IS_IN_FLASH
-#undef	CFG_ENV_IS_IN_NVRAM
-#undef  CFG_ENV_IS_IN_NVRAM
+#undef	CONFIG_ENV_IS_IN_NVRAM
+#undef  CONFIG_ENV_IS_IN_NVRAM
 #undef	DEBUG_I2C
 #define	CONFIG_ENV_IS_IN_EEPROM
 
-#ifdef	CFG_ENV_IS_IN_NVRAM
+#ifdef	CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_ADDR		0x20000000	/* use SRAM	*/
 #define CFG_ENV_SIZE		(16<<10)	/* use 16 kB	*/
-#endif	/* CFG_ENV_IS_IN_NVRAM */
+#endif	/* CONFIG_ENV_IS_IN_NVRAM */
 
 #ifdef	CONFIG_ENV_IS_IN_EEPROM
 #define CFG_ENV_OFFSET		 512	/* Leave 512 bytes free for other data	*/
include/configs/JSE.h +1 -1
index b08301e..fccf880 100644
@@ -77,7 +77,7 @@
 #define CONFIG_MISC_INIT_R 1
 
   /* JSE has EEPROM chips that are good for environment. */
-#undef	CFG_ENV_IS_IN_NVRAM
+#undef	CONFIG_ENV_IS_IN_NVRAM
 #undef	CFG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_IS_IN_EEPROM 1
 #undef	CFG_ENV_IS_NOWHERE
include/configs/KAREF.h +1 -1
index 5b21b90..7208444 100644
@@ -141,7 +141,7 @@
 /*-----------------------------------------------------------------------
  * Environment
  *----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_NVRAM   1		     /* Environment uses NVRAM	*/
+#define CONFIG_ENV_IS_IN_NVRAM   1		     /* Environment uses NVRAM	*/
 #undef	CFG_ENV_IS_IN_FLASH		     /* ... not in flash	*/
 #undef	CONFIG_ENV_IS_IN_EEPROM		     /* ... not in EEPROM	*/
 #define CONFIG_ENV_OVERWRITE  1		     /* allow env overwrite	*/
include/configs/MBX.h +1 -1
index d9f2add..44e1861 100644
@@ -193,7 +193,7 @@
  * board: EPPC-Bug from Motorola. To avoid collisions in NVRAM Usage, we
  * access the NVRAM at the offset 0x1000.
  */
-#define CFG_ENV_IS_IN_NVRAM	1	/* turn on NVRAM env feature */
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* turn on NVRAM env feature */
 #define CFG_ENV_ADDR		(CFG_NVRAM_BASE + 0x1000)
 #define CFG_ENV_SIZE		0x1000
 
include/configs/MBX860T.h +1 -1
index 3b88507..4a537e8 100644
@@ -143,7 +143,7 @@
  * board: EPPC-Bug from Motorola. To avoid collisions in NVRAM Usage, we
  * access the NVRAM@the offset 0x1000.
  */
-#define CFG_ENV_IS_IN_NVRAM	1	/* turn on NVRAM env feature */
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* turn on NVRAM env feature */
 #define CFG_ENV_ADDR		(CFG_NVRAM_BASE + 0x1000)
 #define CFG_ENV_SIZE		0x1000
 
include/configs/METROBOX.h +1 -1
index 2afb3ff..fdb840e 100644
@@ -203,7 +203,7 @@
 /*-----------------------------------------------------------------------
  * Environment
  *----------------------------------------------------------------------*/
-#define CFG_ENV_IS_IN_NVRAM   1		     /* Environment uses NVRAM	*/
+#define CONFIG_ENV_IS_IN_NVRAM   1		     /* Environment uses NVRAM	*/
 #undef	CFG_ENV_IS_IN_FLASH		     /* ... not in flash	*/
 #undef	CONFIG_ENV_IS_IN_EEPROM		     /* ... not in EEPROM	*/
 #define CONFIG_ENV_OVERWRITE  1		     /* allow env overwrite	*/
include/configs/ML2.h +3 -3
index 66dae21..3ce1807 100644
@@ -33,11 +33,11 @@
 
 #define CFG_ENV_IS_IN_FLASH     1
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #else
 #ifdef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #endif
 #endif
 
@@ -196,7 +196,7 @@
 #define CFG_NVRAM_BASE_ADDR	0xf0000000	/* NVRAM base address	*/
 #define CFG_NVRAM_SIZE		0x1ff8		/* NVRAM size	*/
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_SIZE		0x1000		/* Size of Environment vars	*/
 #define CFG_ENV_ADDR		\
 	(CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)	/* Env	*/
include/configs/MOUSSE.h +1 -1
index 021729b..4052e78 100644
@@ -302,7 +302,7 @@
 #define CFG_ENV_OFFSET          0x8000  /* Offset of the Environment Sector	*/
 #define CFG_ENV_SIZE            0x4000  /* Size of the Environment Sector    */
 #else
-#define CFG_ENV_IS_IN_NVRAM          1
+#define CONFIG_ENV_IS_IN_NVRAM          1
 #define CFG_ENV_ADDR            NV_OFF_U_BOOT_ADDR /* PortX NVM Free addr*/
 #define CFG_ENV_OFFSET          CFG_ENV_ADDR
 #define CFG_ENV_SIZE            NV_U_BOOT_ENV_SIZE /* 2K */
include/configs/MPC8260ADS.h +1 -1
index 59d0bdb..735cfaa 100644
@@ -384,7 +384,7 @@
 #  define CFG_ENV_SECT_SIZE	0x40000
 #  define CFG_ENV_ADDR		(CFG_MONITOR_BASE + CFG_ENV_SECT_SIZE)
 #else
-#  define CFG_ENV_IS_IN_NVRAM	1
+#  define CONFIG_ENV_IS_IN_NVRAM	1
 #  define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 #  define CFG_ENV_SIZE		0x200
 #endif /* CFG_RAMBOOT */
include/configs/MPC8266ADS.h +1 -1
index 3659002..4429e99 100644
@@ -431,7 +431,7 @@
 #    define CFG_ENV_ADDR	(CFG_MONITOR_BASE + 0x40000)
 #    define CFG_ENV_SECT_SIZE	0x40000
 #else
-#  define CFG_ENV_IS_IN_NVRAM	1
+#  define CONFIG_ENV_IS_IN_NVRAM	1
 #  define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 #  define CFG_ENV_SIZE		0x200
 #endif /* CFG_RAMBOOT */
include/configs/OCRTC.h +1 -1
index c561e15..f839ead 100644
@@ -189,7 +189,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#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 CFG_ENV_SIZE		0x1000		/* Size of Environment vars	*/
include/configs/ORSG.h +1 -1
index fd14088..18f14bc 100644
@@ -187,7 +187,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#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 CFG_ENV_SIZE		0x1000		/* Size of Environment vars	*/
include/configs/PCI405.h +1 -1
index dea59b6..6c6a470 100644
@@ -218,7 +218,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
 #define CFG_ENV_SIZE		0x0ff8		/* Size of Environment vars	*/
 #define CFG_ENV_ADDR		\
 	(CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-(CFG_ENV_SIZE+8))	/* Env	*/
include/configs/QS860T.h +1 -1
index c980901..9dfceef 100644
@@ -132,7 +132,7 @@ CONFIG_SPI
 /*
  * Environment variable storage is in NVRAM
  */
-#define CFG_ENV_IS_IN_NVRAM	1
+#define CONFIG_ENV_IS_IN_NVRAM	1
 #define CFG_ENV_SIZE		0x00001000	/* We use only the last 4K for PPCBoot */
 #define CFG_ENV_ADDR		0xD100E000
 
include/configs/RPXClassic.h +1 -1
index 706e2aa..3762391 100644
@@ -224,7 +224,7 @@
 #define CFG_ENV_SECT_SIZE       0x8000
 #define	CFG_ENV_SIZE		0x8000	/* Total Size of Environment Sector  */
 #else
-#define CFG_ENV_IS_IN_NVRAM     1
+#define CONFIG_ENV_IS_IN_NVRAM     1
 #define CFG_ENV_ADDR            0xfa000100
 #define CFG_ENV_SIZE            0x1000
 #endif
include/configs/RPXlite_DW.h +2 -2
index faae407..d135818 100644
@@ -229,14 +229,14 @@
 #define CFG_FLASH_ERASE_TOUT	120000	/* Timeout for Flash Erase (in ms)	*/
 #define CFG_FLASH_WRITE_TOUT	500	/* Timeout for Flash Write (in ms)	*/
 
-#ifdef	CFG_ENV_IS_IN_NVRAM
+#ifdef	CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_ADDR		0xFA000100
 #define CFG_ENV_SIZE		0x1000
 #else
 #define CFG_ENV_IS_IN_FLASH
 #define CFG_ENV_OFFSET		0x30000 /* Offset of Environment Sector		*/
 #define CFG_ENV_SIZE		0x8000	/* Total Size of Environment Sector	*/
-#endif	/* CFG_ENV_IS_IN_NVRAM */
+#endif	/* CONFIG_ENV_IS_IN_NVRAM */
 
 #define CFG_RESET_ADDRESS	((ulong)((((immap_t *)CFG_IMMR)->im_clkrst.res)))
 
include/configs/RPXsuper.h +1 -1
index dfadd2a..2a9c627 100644
@@ -311,7 +311,7 @@
 #    define CFG_ENV_SECT_SIZE  0x10000 /* see README - env sect real size */
 #  endif /* CFG_ENV_IN_OWN_SECT */
 #else
-#  define CFG_ENV_IS_IN_NVRAM  1
+#  define CONFIG_ENV_IS_IN_NVRAM  1
 #  define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
 #  define CFG_ENV_SIZE         0x200
 #endif /* CFG_RAMBOOT */
include/configs/W7OLMC.h +1 -1
index bb6b6b9..d4ec03e 100644
@@ -249,7 +249,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM	1		/* use NVRAM for env vars	*/
+#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 CFG_ENV_SIZE		0x1000		/* Size of Environment vars	*/
include/configs/W7OLMG.h +1 -1
index 3050caf..ac52e39 100644
@@ -256,7 +256,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_IN_NVRAM	1		/* use NVRAM for env vars	*/
+#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 CFG_ENV_SIZE		0x1000		/* Size of Environment vars	*/
include/configs/Yukon8220.h +3 -3
index 60f2343..9ace43e 100644
@@ -225,13 +225,13 @@
 #define CONFIG_ENV_OVERWRITE	1
 
 #if defined CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CONFIG_ENV_IS_IN_EEPROM
-#elif defined CFG_ENV_IS_IN_NVRAM
+#elif defined CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_IN_EEPROM
 #elif defined CONFIG_ENV_IS_IN_EEPROM
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #endif
 
include/configs/ZPC1900.h +2 -2
index 388c747..4217900 100644
@@ -220,8 +220,8 @@
 #define CFG_MALLOC_LEN		(4096 << 10)	/* Reserve 4 MB for malloc()	*/
 #define CFG_BOOTMAPSZ		(8 << 20)	/* Initial Memory map for Linux */
 
-#if !defined(CFG_ENV_IS_IN_FLASH) && !defined(CFG_ENV_IS_IN_NVRAM)
-#define CFG_ENV_IS_IN_NVRAM	1
+#if !defined(CFG_ENV_IS_IN_FLASH) && !defined(CONFIG_ENV_IS_IN_NVRAM)
+#define CONFIG_ENV_IS_IN_NVRAM	1
 #endif
 
 #ifdef CFG_ENV_IS_IN_FLASH
include/configs/bubinga.h +2 -2
index acce82f..4b42f8b 100644
@@ -83,7 +83,7 @@
 #if 1
 #define CFG_ENV_IS_IN_FLASH     1	/* use FLASH for environment vars	*/
 #else
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
 #endif
 
 /*
@@ -210,7 +210,7 @@
 #define CFG_NVRAM_BASE_ADDR	0xf0000000	/* NVRAM base address	*/
 #define CFG_NVRAM_SIZE		0x1ff8		/* NVRAM size	*/
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_SIZE		0x0ff8		/* Size of Environment vars	*/
 #define CFG_ENV_ADDR		\
 	(CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)	/* Env	*/
include/configs/csb272.h +1 -1
index 701d3c8..880bee8 100644
@@ -231,7 +231,7 @@
  *
  */
 #define CFG_ENV_IS_IN_FLASH	1	/* environment is in FLASH	*/
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CONFIG_ENV_IS_IN_EEPROM
 
 /*
include/configs/csb472.h +1 -1
index 4fef2f6..e343632 100644
@@ -230,7 +230,7 @@
  *
  */
 #define CFG_ENV_IS_IN_FLASH	1	/* environment is in FLASH	*/
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CONFIG_ENV_IS_IN_EEPROM
 
 /*
include/configs/debris.h +1 -1
index 7667e5e..68c9e54 100644
@@ -251,7 +251,7 @@
 #define MTDPARTS_DEFAULT	"mtdparts=debris-0:-(jffs2)"
 */
 
-#define CFG_ENV_IS_IN_NVRAM      1
+#define CONFIG_ENV_IS_IN_NVRAM      1
 #define CONFIG_ENV_OVERWRITE     1
 #define CFG_NVRAM_ACCESS_ROUTINE 1
 #define CFG_ENV_ADDR		0xFF000000 /* right@the start of NVRAM  */
include/configs/ebony.h +3 -3
index df444d8..21c0866 100644
@@ -51,7 +51,7 @@
 #if 1
 #define CFG_ENV_IS_IN_FLASH     1	/* use FLASH for environment vars	*/
 #else
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
 #endif
 
 /*-----------------------------------------------------------------------
@@ -97,11 +97,11 @@
 #define CFG_NVRAM_SIZE	    (0x2000 - 8)    /* NVRAM size(8k)- RTC regs */
 #define CONFIG_RTC_DS174x	1		    /* DS1743 RTC		*/
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_SIZE		0x1000	    /* Size of Environment vars */
 #define CFG_ENV_ADDR		\
 	(CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_NVRAM */
+#endif /* CONFIG_ENV_IS_IN_NVRAM */
 
 /*-----------------------------------------------------------------------
  * FLASH related
include/configs/ep8260.h +1 -1
index 0ce6b80..094a14c 100644
@@ -485,7 +485,7 @@
 #    define CFG_ENV_SECT_SIZE  0x10000 /* see README - env sect real size */
 #  endif /* CFG_ENV_IN_OWN_SECT */
 #else
-#  define CFG_ENV_IS_IN_NVRAM  1
+#  define CONFIG_ENV_IS_IN_NVRAM  1
 #  define CFG_ENV_ADDR         (CFG_MONITOR_BASE - 0x1000)
 #  define CFG_ENV_SIZE         0x200
 #endif /* CFG_RAMBOOT */
include/configs/hcu4.h +1 -1
index f03f9b9..0dd9787 100644
@@ -121,7 +121,7 @@
  * Environment
  *----------------------------------------------------------------------*/
 
-#undef	CFG_ENV_IS_IN_NVRAM
+#undef	CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_IS_IN_FLASH
 #undef  CFG_ENV_IS_NOWHERE
 
include/configs/hcu5.h +1 -1
index d274223..0796a7d 100644
@@ -106,7 +106,7 @@
  * Environment
  *----------------------------------------------------------------------*/
 
-#undef	CFG_ENV_IS_IN_NVRAM
+#undef	CONFIG_ENV_IS_IN_NVRAM
 #define  CFG_ENV_IS_IN_FLASH
 #undef	CONFIG_ENV_IS_IN_EEPROM
 #undef  CFG_ENV_IS_NOWHERE
include/configs/kvme080.h +1 -1
index 819e456..7d903aa 100644
@@ -157,7 +157,7 @@
 #define CFG_JFFS2_FIRST_BANK	0
 #define CFG_JFFS2_NUM_BANKS	1
 
-#define CFG_ENV_IS_IN_NVRAM	1
+#define CONFIG_ENV_IS_IN_NVRAM	1
 #define CONFIG_ENV_OVERWRITE	1
 #define CFG_NVRAM_ACCESS_ROUTINE
 #define CFG_ENV_ADDR		CFG_NVRAM_BASE_ADDR
include/configs/mcu25.h +1 -1
index d146537..5c234df 100644
@@ -121,7 +121,7 @@
  * Environment
  *----------------------------------------------------------------------*/
 
-#undef	CFG_ENV_IS_IN_NVRAM
+#undef	CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_IS_IN_FLASH
 #undef  CFG_ENV_IS_NOWHERE
 
include/configs/mpc7448hpc2.h +1 -1
index d379b1f..7fd06a6 100644
@@ -381,7 +381,7 @@
 #define PHYS_FLASH_SIZE		0x01000000
 #define CFG_MAX_FLASH_SECT	(128)
 
-#define CFG_ENV_IS_IN_NVRAM
+#define CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_ADDR		0xFC000000
 
 #define CFG_ENV_OFFSET	0x00000000	/* Offset of Environment Sector */
include/configs/ocotea.h +3 -3
index 407aae7..e8549e9 100644
@@ -95,7 +95,7 @@
 #if 1
 #define CFG_ENV_IS_IN_FLASH     1	/* use FLASH for environment vars	*/
 #else
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
 #endif
 
 
@@ -112,11 +112,11 @@
 #define CFG_NVRAM_SIZE	    (0x2000 - 8)    /* NVRAM size(8k)- RTC regs */
 #define CONFIG_RTC_DS174x	1		    /* DS1743 RTC		*/
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_SIZE		0x1000	    /* Size of Environment vars */
 #define CFG_ENV_ADDR		\
 	(CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)
-#endif /* CFG_ENV_IS_IN_NVRAM */
+#endif /* CONFIG_ENV_IS_IN_NVRAM */
 
 /*-----------------------------------------------------------------------
  * FLASH related
include/configs/redwood.h +1 -1
index ebb2921..b791589 100644
@@ -119,7 +119,7 @@
 /*-----------------------------------------------------------------------
  * Environment
  *----------------------------------------------------------------------*/
-#undef	CFG_ENV_IS_IN_NVRAM		/* ... not in NVRAM		*/
+#undef	CONFIG_ENV_IS_IN_NVRAM		/* ... not in NVRAM		*/
 #define	CFG_ENV_IS_IN_FLASH	1	/* Environment uses flash	*/
 #undef	CONFIG_ENV_IS_IN_EEPROM		/* ... not in EEPROM		*/
 
include/configs/sacsng.h +1 -1
index 8427752..5c6ddc6 100644
@@ -719,7 +719,7 @@
 #  endif /* CFG_ENV_IN_OWN_SECT */
 
 #else
-#  define CFG_ENV_IS_IN_NVRAM	1
+#  define CONFIG_ENV_IS_IN_NVRAM	1
 #  define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 #  define CFG_ENV_SIZE		0x200
 #endif /* CFG_RAMBOOT */
include/configs/sbc8260.h +1 -1
index b92344c..6068c23 100644
@@ -615,7 +615,7 @@
 #  endif /* CFG_ENV_IN_OWN_SECT */
 
 #else
-#  define CFG_ENV_IS_IN_NVRAM	1
+#  define CONFIG_ENV_IS_IN_NVRAM	1
 #  define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 #  define CFG_ENV_SIZE		0x200
 #endif /* CFG_RAMBOOT */
include/configs/sorcery.h +3 -3
index 0d07560..b4da4ce 100644
@@ -207,13 +207,13 @@
 #define CONFIG_ENV_OVERWRITE	1
 
 #if defined CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CONFIG_ENV_IS_IN_EEPROM
-#elif defined CFG_ENV_IS_IN_NVRAM
+#elif defined CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #undef CONFIG_ENV_IS_IN_EEPROM
 #elif defined CONFIG_ENV_IS_IN_EEPROM
-#undef CFG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_NVRAM
 #undef CFG_ENV_IS_IN_FLASH
 #endif
 
include/configs/taihu.h +1 -1
index 86f776d..2ef4545 100644
@@ -221,7 +221,7 @@ unsigned char spi_read(void);
 #define CFG_NVRAM_BASE_ADDR	0xf0000000	/* NVRAM base address */
 #define CFG_NVRAM_SIZE		0x1ff8		/* NVRAM size */
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_SIZE		0x0ff8		/* Size of Environment vars */
 #define CFG_ENV_ADDR		\
 	(CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)	/* Env*/
include/configs/v37.h +1 -1
index 751d702..7e5f804 100644
@@ -195,7 +195,7 @@
 #define CFG_FLASH_ERASE_TOUT	120000	/* Timeout for Flash Erase (in ms)	*/
 #define CFG_FLASH_WRITE_TOUT	500	/* Timeout for Flash Write (in ms)	*/
 
-#define	CFG_ENV_IS_IN_NVRAM	1
+#define	CONFIG_ENV_IS_IN_NVRAM	1
 #define	CFG_ENV_ADDR		0x80000000/* Address of Environment */
 #define	CFG_ENV_SIZE		0x4000	/* Total Size of Environment Sector	*/
 
include/configs/walnut.h +2 -2
index e19c5f3..4eecf77 100644
@@ -139,7 +139,7 @@
 #if 1
 #define CFG_ENV_IS_IN_FLASH	1	/* use FLASH for environment vars	*/
 #else
-#define CFG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
+#define CONFIG_ENV_IS_IN_NVRAM	1	/* use NVRAM for environment vars	*/
 #endif
 
 /*-----------------------------------------------------------------------
@@ -176,7 +176,7 @@
 #define CFG_NVRAM_BASE_ADDR	0xf0000000	/* NVRAM base address	*/
 #define CFG_NVRAM_SIZE		0x1ff8		/* NVRAM size	*/
 
-#ifdef CFG_ENV_IS_IN_NVRAM
+#ifdef CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_SIZE		0x1000		/* Size of Environment vars	*/
 #define CFG_ENV_ADDR		\
 	(CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CFG_ENV_SIZE)	/* Env	*/
include/configs/yucca.h +1 -1
index 0c09a1d..9ccd308 100644
@@ -139,7 +139,7 @@
  *----------------------------------------------------------------------*/
 /* #define CFG_NVRAM_SIZE	(0x2000 - 8) */	/* NVRAM size(8k)- RTC regs */
 
-#undef  CFG_ENV_IS_IN_NVRAM		/* ... not in NVRAM		*/
+#undef  CONFIG_ENV_IS_IN_NVRAM		/* ... not in NVRAM		*/
 #define	CFG_ENV_IS_IN_FLASH	1	/* Environment uses flash	*/
 #undef	CONFIG_ENV_IS_IN_EEPROM		/* ... not in EEPROM		*/
 #define CONFIG_ENV_OVERWRITE	1
lib_m68k/board.c +1 -1
index d0e63b6..4e566d5 100644
@@ -75,7 +75,7 @@ extern flash_info_t flash_info[];
 
 #if ( ((CFG_ENV_ADDR+CFG_ENV_SIZE) < CFG_MONITOR_BASE) || \
       (CFG_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \
-    defined(CFG_ENV_IS_IN_NVRAM)
+    defined(CONFIG_ENV_IS_IN_NVRAM)
 #define	TOTAL_MALLOC_LEN	(CFG_MALLOC_LEN + CFG_ENV_SIZE)
 #else
 #define	TOTAL_MALLOC_LEN	CFG_MALLOC_LEN
lib_mips/board.c +1 -1
index 09b8b3b..64ca200 100644
@@ -35,7 +35,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #if ( ((CFG_ENV_ADDR+CFG_ENV_SIZE) < CFG_MONITOR_BASE) || \
       (CFG_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \
-    defined(CFG_ENV_IS_IN_NVRAM)
+    defined(CONFIG_ENV_IS_IN_NVRAM)
 #define	TOTAL_MALLOC_LEN	(CFG_MALLOC_LEN + CFG_ENV_SIZE)
 #else
 #define	TOTAL_MALLOC_LEN	CFG_MALLOC_LEN
lib_ppc/board.c +1 -1
index 1e00404..a757ffd 100644
@@ -110,7 +110,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #define TOTAL_MALLOC_LEN	CFG_MALLOC_LEN
 #elif ( ((CFG_ENV_ADDR+CFG_ENV_SIZE) < CFG_MONITOR_BASE) || \
 	(CFG_ENV_ADDR >= (CFG_MONITOR_BASE + CFG_MONITOR_LEN)) ) || \
-      defined(CFG_ENV_IS_IN_NVRAM)
+      defined(CONFIG_ENV_IS_IN_NVRAM)
 #define	TOTAL_MALLOC_LEN	(CFG_MALLOC_LEN + CFG_ENV_SIZE)
 #else
 #define	TOTAL_MALLOC_LEN	CFG_MALLOC_LEN
Signature · 1 line
1.5.6.3
#13 lore raw

PATCH 13/25 env_nvram: Move conditional compilation to Makefile

---
 common/Makefile    |    2 +-
 common/env_nvram.c |    9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)
common/Makefile +1 -1
index e7c3a8a..93bcd03 100644
@@ -54,7 +54,7 @@ COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o
 COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
 COBJS-y += env_flash.o
 COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
-COBJS-y += env_nvram.o
+COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o
 COBJS-y += env_onenand.o
 COBJS-y += env_sf.o
 COBJS-y += env_nowhere.o
common/env_nvram.c +2 -7
index c877f00..c59bf9f 100644
@@ -41,15 +41,12 @@
  */
 
 #include <common.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#ifdef CONFIG_ENV_IS_IN_NVRAM /* Environment is in NVRAM */
-
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #ifdef CFG_NVRAM_ACCESS_ROUTINE
 extern void *nvram_read(void *dest, const long src, size_t count);
 extern void nvram_write(long dest, const void *src, size_t count);
@@ -156,5 +153,3 @@ int env_init (void)
 #endif
 	return (0);
 }
-
-#endif /* CONFIG_ENV_IS_IN_NVRAM */
Signature · 1 line
1.5.6.3
#14 lore raw

PATCH 14/25 rename CFG_ENV_IS_IN_ONENAND in CONFIG_ENV_IS_IN_ONENAND

---
 common/cmd_nvedit.c       |    2 +-
 common/env_onenand.c      |    4 ++--
 include/configs/apollon.h |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
common/cmd_nvedit.c +1 -1
index 08671f2..bfd097f 100644
@@ -57,7 +57,7 @@ DECLARE_GLOBAL_DATA_PTR;
     !defined(CFG_ENV_IS_IN_FLASH)	&& \
     !defined(CONFIG_ENV_IS_IN_DATAFLASH)	&& \
     !defined(CONFIG_ENV_IS_IN_NAND)	&& \
-    !defined(CFG_ENV_IS_IN_ONENAND)	&& \
+    !defined(CONFIG_ENV_IS_IN_ONENAND)	&& \
     !defined(CFG_ENV_IS_IN_SPI_FLASH)	&& \
     !defined(CFG_ENV_IS_NOWHERE)
 # error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE}
common/env_onenand.c +2 -2
index d5c907c..4e466ea 100644
@@ -23,7 +23,7 @@
 
 #include <common.h>
 
-#if defined(CFG_ENV_IS_IN_ONENAND)	/* Environment is in OneNAND */
+#if defined(CONFIG_ENV_IS_IN_ONENAND)	/* Environment is in OneNAND */
 
 #include <command.h>
 #include <environment.h>
@@ -127,4 +127,4 @@ int env_init(void)
 	return 0;
 }
 
-#endif /* CFG_ENV_IS_IN_ONENAND */
+#endif /* CONFIG_ENV_IS_IN_ONENAND */
include/configs/apollon.h +1 -1
index c93e77a..6e34ddf 100644
@@ -225,7 +225,7 @@
 
 /* OneNAND boot, OneNAND has CS0, NOR boot ONeNAND has CS2 */
 #define	CFG_ONENAND_BASE	0x00000000
-#define	CFG_ENV_IS_IN_ONENAND	1
+#define	CONFIG_ENV_IS_IN_ONENAND	1
 #define CFG_ENV_ADDR		0x00020000
 
 #endif /* __CONFIG_H */
Signature · 1 line
1.5.6.3
#15 lore raw

PATCH 15/25 env_onenand: Move conditional compilation to Makefile

---
 common/Makefile      |    2 +-
 common/env_onenand.c |    5 -----
 2 files changed, 1 insertions(+), 6 deletions(-)
common/Makefile +1 -1
index 93bcd03..4f333df 100644
@@ -55,7 +55,7 @@ COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
 COBJS-y += env_flash.o
 COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
 COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o
-COBJS-y += env_onenand.o
+COBJS-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o
 COBJS-y += env_sf.o
 COBJS-y += env_nowhere.o
 
common/env_onenand.c +0 -5
index 4e466ea..09a79d0 100644
@@ -22,9 +22,6 @@
  */
 
 #include <common.h>
-
-#if defined(CONFIG_ENV_IS_IN_ONENAND)	/* Environment is in OneNAND */
-
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
@@ -126,5 +123,3 @@ int env_init(void)
 
 	return 0;
 }
-
-#endif /* CONFIG_ENV_IS_IN_ONENAND */
Signature · 1 line
1.5.6.3
#16 lore raw

PATCH 16/25 rename CFG_ENV_IS_IN_SPI_FLASH in CONFIG_ENV_IS_IN_SPI_FLASH

---
 common/cmd_nvedit.c         |    2 +-
 common/env_common.c         |    2 +-
 common/env_sf.c             |    4 ++--
 include/configs/M54451EVB.h |    2 +-
 include/configs/M54455EVB.h |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
common/cmd_nvedit.c +1 -1
index bfd097f..85d7108 100644
@@ -58,7 +58,7 @@ DECLARE_GLOBAL_DATA_PTR;
     !defined(CONFIG_ENV_IS_IN_DATAFLASH)	&& \
     !defined(CONFIG_ENV_IS_IN_NAND)	&& \
     !defined(CONFIG_ENV_IS_IN_ONENAND)	&& \
-    !defined(CFG_ENV_IS_IN_SPI_FLASH)	&& \
+    !defined(CONFIG_ENV_IS_IN_SPI_FLASH)	&& \
     !defined(CFG_ENV_IS_NOWHERE)
 # error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE}
 #endif
common/env_common.c +1 -1
index e89f192..36c46f0 100644
@@ -134,7 +134,7 @@ uchar default_environment[] = {
 };
 
 #if defined(CONFIG_ENV_IS_IN_NAND)		/* Environment is in Nand Flash */ \
-	|| defined(CFG_ENV_IS_IN_SPI_FLASH)
+	|| defined(CONFIG_ENV_IS_IN_SPI_FLASH)
 int default_environment_size = sizeof(default_environment);
 #endif
 
common/env_sf.c +2 -2
index 9077d78..a442776 100644
@@ -27,7 +27,7 @@
  */
 #include <common.h>
 
-#ifdef CFG_ENV_IS_IN_SPI_FLASH
+#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
 
 #include <environment.h>
 #include <spi_flash.h>
@@ -136,4 +136,4 @@ int env_init(void)
 	return 0;
 }
 
-#endif /* CFG_ENV_IS_IN_SPI_FLASH */
+#endif /* CONFIG_ENV_IS_IN_SPI_FLASH */
include/configs/M54451EVB.h +1 -1
index 588c00c..fa1ef0b 100644
@@ -267,7 +267,7 @@
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #if defined(CONFIG_CF_SBF)
-#	define CFG_ENV_IS_IN_SPI_FLASH	1
+#	define CONFIG_ENV_IS_IN_SPI_FLASH	1
 #	define CFG_ENV_SPI_CS		1
 #	define CFG_ENV_OFFSET		0x20000
 #	define CFG_ENV_SIZE		0x2000
include/configs/M54455EVB.h +1 -1
index 476aba3..8b51148 100644
@@ -331,7 +331,7 @@
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #ifdef CONFIG_CF_SBF
-#	define CFG_ENV_IS_IN_SPI_FLASH
+#	define CONFIG_ENV_IS_IN_SPI_FLASH
 #	define CFG_ENV_SPI_CS		1
 #else
 #	define CFG_ENV_IS_IN_FLASH	1
Signature · 1 line
1.5.6.3
#17 lore raw

PATCH 17/25 env_sf: Move conditional compilation to Makefile

---
 common/Makefile |    2 +-
 common/env_sf.c |    5 -----
 2 files changed, 1 insertions(+), 6 deletions(-)
common/Makefile +1 -1
index 4f333df..bc89741 100644
@@ -56,7 +56,7 @@ COBJS-y += env_flash.o
 COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
 COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o
 COBJS-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o
-COBJS-y += env_sf.o
+COBJS-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
 COBJS-y += env_nowhere.o
 
 # command
common/env_sf.c +0 -5
index a442776..faf6260 100644
@@ -26,9 +26,6 @@
  * MA 02111-1307 USA
  */
 #include <common.h>
-
-#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
-
 #include <environment.h>
 #include <spi_flash.h>
 
@@ -135,5 +132,3 @@ int env_init(void)
 
 	return 0;
 }
-
-#endif /* CONFIG_ENV_IS_IN_SPI_FLASH */
Signature · 1 line
1.5.6.3
#18 lore raw

PATCH 18/25 rename CFG_ENV_IS_NOWHERE in CONFIG_ENV_IS_NOWHERE

---
 board/xilinx/xilinx_enet/emac_adapter.c |    4 ++--
 common/cmd_nvedit.c                     |    6 +++---
 common/env_common.c                     |    2 +-
 common/env_nowhere.c                    |    4 ++--
 drivers/net/xilinx_emaclite.c           |    2 +-
 include/configs/ADNPESC1.h              |    2 +-
 include/configs/DK1C20.h                |    2 +-
 include/configs/DK1S10.h                |    2 +-
 include/configs/JSE.h                   |    2 +-
 include/configs/MPC8313ERDB.h           |    2 +-
 include/configs/MPC8315ERDB.h           |    2 +-
 include/configs/MPC8323ERDB.h           |    2 +-
 include/configs/MPC832XEMDS.h           |    2 +-
 include/configs/MPC8349EMDS.h           |    2 +-
 include/configs/MPC8349ITX.h            |    2 +-
 include/configs/MPC8360EMDS.h           |    2 +-
 include/configs/MPC8360ERDK.h           |    2 +-
 include/configs/MPC837XEMDS.h           |    2 +-
 include/configs/MPC837XERDB.h           |    2 +-
 include/configs/MPC8540ADS.h            |    2 +-
 include/configs/MPC8540EVAL.h           |    4 ++--
 include/configs/MPC8560ADS.h            |    2 +-
 include/configs/MPC8610HPCD.h           |    2 +-
 include/configs/MPC8641HPCN.h           |    2 +-
 include/configs/PM854.h                 |    2 +-
 include/configs/PM856.h                 |    2 +-
 include/configs/PN62.h                  |    2 +-
 include/configs/SBC8540.h               |    4 ++--
 include/configs/TQM834x.h               |    2 +-
 include/configs/cm4008.h                |    2 +-
 include/configs/cm41xx.h                |    2 +-
 include/configs/dbau1x00.h              |    2 +-
 include/configs/evb4510.h               |    2 +-
 include/configs/gr_cpci_ax2000.h        |    2 +-
 include/configs/gr_ep2s60.h             |    2 +-
 include/configs/gr_xc3s_1500.h          |    2 +-
 include/configs/grsim.h                 |    2 +-
 include/configs/grsim_leon2.h           |    2 +-
 include/configs/gth2.h                  |    2 +-
 include/configs/hcu4.h                  |    2 +-
 include/configs/hcu5.h                  |    2 +-
 include/configs/integratorap.h          |    2 +-
 include/configs/mcu25.h                 |    2 +-
 include/configs/ml401.h                 |    4 ++--
 include/configs/modnet50.h              |    2 +-
 include/configs/ns9750dev.h             |    2 +-
 include/configs/pb1x00.h                |    2 +-
 include/configs/sbc8349.h               |    2 +-
 include/configs/sbc8560.h               |    4 ++--
 include/configs/stxgp3.h                |    2 +-
 include/configs/suzaku.h                |    2 +-
 include/configs/versatile.h             |    2 +-
 include/configs/xupv2p.h                |    2 +-
 lib_avr32/board.c                       |    4 ++--
 lib_m68k/board.c                        |    4 ++--
 lib_mips/board.c                        |    4 ++--
 lib_ppc/board.c                         |    4 ++--
 57 files changed, 69 insertions(+), 69 deletions(-)
board/xilinx/xilinx_enet/emac_adapter.c +2 -2
index d340303..0b100d2 100644
@@ -56,7 +56,7 @@ static XEmac Emac;
 static char etherrxbuff[PKTSIZE_ALIGN];	/* Receive buffer */
 
 /* hardcoded MAC address for the Xilinx EMAC Core when env is nowhere*/
-#ifdef CFG_ENV_IS_NOWHERE
+#ifdef CONFIG_ENV_IS_NOWHERE
 static u8 EMACAddr[ENET_ADDR_LENGTH] = { 0x00, 0x0a, 0x35, 0x00, 0x22, 0x01 };
 #endif
 
@@ -87,7 +87,7 @@ eth_init(bd_t * bis)
 	/* make sure the Emac is stopped before it is started */
 	(void) XEmac_Stop(&Emac);
 
-#ifdef CFG_ENV_IS_NOWHERE
+#ifdef CONFIG_ENV_IS_NOWHERE
 	memcpy(bis->bi_enetaddr, EMACAddr, 6);
 #endif
 
common/cmd_nvedit.c +3 -3
index 85d7108..fc9b94e 100644
@@ -59,7 +59,7 @@ DECLARE_GLOBAL_DATA_PTR;
     !defined(CONFIG_ENV_IS_IN_NAND)	&& \
     !defined(CONFIG_ENV_IS_IN_ONENAND)	&& \
     !defined(CONFIG_ENV_IS_IN_SPI_FLASH)	&& \
-    !defined(CFG_ENV_IS_NOWHERE)
+    !defined(CONFIG_ENV_IS_NOWHERE)
 # error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE}
 #endif
 
@@ -544,7 +544,7 @@ int getenv_r (char *name, char *buf, unsigned len)
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \
-    && !defined(CFG_ENV_IS_NOWHERE))
+    && !defined(CONFIG_ENV_IS_NOWHERE))
 int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
 	extern char * env_name_spec;
@@ -600,7 +600,7 @@ U_BOOT_CMD(
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \
-    && !defined(CFG_ENV_IS_NOWHERE))
+    && !defined(CONFIG_ENV_IS_NOWHERE))
 U_BOOT_CMD(
 	saveenv, 1, 0,	do_saveenv,
 	"saveenv - save environment variables to persistent storage\n",
common/env_common.c +1 -1
index 36c46f0..c3946f0 100644
@@ -246,7 +246,7 @@ void env_relocate (void)
 #endif
 
 	if (gd->env_valid == 0) {
-#if defined(CONFIG_GTH)	|| defined(CFG_ENV_IS_NOWHERE)	/* Environment not changable */
+#if defined(CONFIG_GTH)	|| defined(CONFIG_ENV_IS_NOWHERE)	/* Environment not changable */
 		puts ("Using default environment\n\n");
 #else
 		puts ("*** Warning - bad CRC, using default environment\n\n");
common/env_nowhere.c +2 -2
index 17ecc77..8dd4867 100644
@@ -26,7 +26,7 @@
 
 #include <common.h>
 
-#if defined(CFG_ENV_IS_NOWHERE) /* Environment is nowhere */
+#if defined(CONFIG_ENV_IS_NOWHERE) /* Environment is nowhere */
 
 #include <command.h>
 #include <environment.h>
@@ -62,4 +62,4 @@ int  env_init(void)
 	return (0);
 }
 
-#endif /* CFG_ENV_IS_NOWHERE) */
+#endif /* CONFIG_ENV_IS_NOWHERE) */
drivers/net/xilinx_emaclite.c +1 -1
index 9ba4096..88cd0f9 100644
@@ -73,7 +73,7 @@ static xemaclite emaclite;
 static char etherrxbuff[PKTSIZE_ALIGN/4]; /* Receive buffer */
 
 /* hardcoded MAC address for the Xilinx EMAC Core when env is nowhere*/
-#ifdef CFG_ENV_IS_NOWHERE
+#ifdef CONFIG_ENV_IS_NOWHERE
 static u8 emacaddr[ENET_ADDR_LENGTH] = { 0x00, 0x0a, 0x35, 0x00, 0x22, 0x01 };
 #else
 static u8 emacaddr[ENET_ADDR_LENGTH];
include/configs/ADNPESC1.h +1 -1
index 01ee72b..cc91c8d 100644
@@ -129,7 +129,7 @@
 #define CONFIG_ENV_OVERWRITE			/* Serial/eth change Ok */
 
 #else
-#define	CFG_ENV_IS_NOWHERE	1		/* NO Environment	*/
+#define	CONFIG_ENV_IS_NOWHERE	1		/* NO Environment	*/
 #endif
 
 /*------------------------------------------------------------------------
include/configs/DK1C20.h +1 -1
index fb06689..9658278 100644
@@ -117,7 +117,7 @@
 #define CONFIG_ENV_OVERWRITE			/* Serial/eth change Ok */
 
 #else
-#define	CFG_ENV_IS_NOWHERE	1		/* NO Environment	*/
+#define	CONFIG_ENV_IS_NOWHERE	1		/* NO Environment	*/
 #endif
 
 /*------------------------------------------------------------------------
include/configs/DK1S10.h +1 -1
index 7a9ef79..e5bf8c7 100644
@@ -133,7 +133,7 @@
 #define CONFIG_ENV_OVERWRITE			/* Serial/eth change Ok */
 
 #else
-#define	CFG_ENV_IS_NOWHERE	1		/* NO Environment	*/
+#define	CONFIG_ENV_IS_NOWHERE	1		/* NO Environment	*/
 #endif
 
 /*------------------------------------------------------------------------
include/configs/JSE.h +1 -1
index fccf880..ecc344d 100644
@@ -80,7 +80,7 @@
 #undef	CONFIG_ENV_IS_IN_NVRAM
 #undef	CFG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_IS_IN_EEPROM 1
-#undef	CFG_ENV_IS_NOWHERE
+#undef	CONFIG_ENV_IS_NOWHERE
 
   /* This is the 7bit address of the device, not including P. */
 #define CFG_I2C_EEPROM_ADDR 0x50
include/configs/MPC8313ERDB.h +1 -1
index c17a2ea..776fe99 100644
@@ -400,7 +400,7 @@
 
 /* Address and size of Redundant Environment Sector */
 #else
-	#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+	#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 	#define CFG_ENV_SIZE		0x2000
 #endif
include/configs/MPC8315ERDB.h +1 -1
index 006b93a..1edd9ce 100644
@@ -383,7 +383,7 @@
 	#define CFG_ENV_SIZE		0x2000
 #else
 	#define CFG_NO_FLASH		1	/* Flash is not usable now */
-	#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+	#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 	#define CFG_ENV_SIZE		0x2000
 #endif
include/configs/MPC8323ERDB.h +1 -1
index 94b3d5a..308f102 100644
@@ -397,7 +397,7 @@
 	#define CFG_ENV_SIZE		0x2000
 #else
 	#define CFG_NO_FLASH		1	/* Flash is not usable now */
-	#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+	#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 	#define CFG_ENV_SIZE		0x2000
 #endif
include/configs/MPC832XEMDS.h +1 -1
index 401d0af..b98f3ee 100644
@@ -409,7 +409,7 @@
 	#define CFG_ENV_SIZE		0x2000
 #else
 	#define CFG_NO_FLASH		1	/* Flash is not usable now */
-	#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+	#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 	#define CFG_ENV_SIZE		0x2000
 #endif
include/configs/MPC8349EMDS.h +1 -1
index c8870b5..e03f5ca 100644
@@ -476,7 +476,7 @@
 
 #else
 	#define CFG_NO_FLASH		1	/* Flash is not usable now */
-	#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+	#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 	#define CFG_ENV_SIZE		0x2000
 #endif
include/configs/MPC8349ITX.h +1 -1
index 45ddd5c..7f5d303 100644
@@ -420,7 +420,7 @@ boards, we say we have two, but don't display a message if we find only one. */
 #else
   #define CFG_NO_FLASH		/* Flash is not usable now */
   #undef  CONFIG_FLASH_CFI_DRIVER
-  #define CFG_ENV_IS_NOWHERE	/* Store ENV in memory only */
+  #define CONFIG_ENV_IS_NOWHERE	/* Store ENV in memory only */
   #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE		0x2000
 #endif
include/configs/MPC8360EMDS.h +1 -1
index 43d4118..c532eb1 100644
@@ -440,7 +440,7 @@
 	#define CFG_ENV_SIZE		0x2000
 #else
 	#define CFG_NO_FLASH		1	/* Flash is not usable now */
-	#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+	#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 	#define CFG_ENV_SIZE		0x2000
 #endif
include/configs/MPC8360ERDK.h +1 -1
index 6898495..4701600 100644
@@ -345,7 +345,7 @@
 #define CFG_ENV_SIZE		0x20000
 #else /* CFG_RAMBOOT */
 #define CFG_NO_FLASH		1	/* Flash is not usable now */
-#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 #define CFG_ENV_SIZE		0x2000
 #endif /* CFG_RAMBOOT */
include/configs/MPC837XEMDS.h +1 -1
index f9c1b17..220c148 100644
@@ -427,7 +427,7 @@
 	#define CFG_ENV_SIZE		0x2000
 #else
 	#define CFG_NO_FLASH		1	/* Flash is not usable now */
-	#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+	#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 	#define CFG_ENV_SIZE		0x2000
 #endif
include/configs/MPC837XERDB.h +1 -1
index 82b3353..289bcfa 100644
@@ -448,7 +448,7 @@
 	#define CFG_ENV_SIZE		0x4000
 #else
 	#define CFG_NO_FLASH		1	/* Flash is not usable now */
-	#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+	#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE-0x1000)
 	#define CFG_ENV_SIZE		0x2000
 #endif
include/configs/MPC8540ADS.h +1 -1
index 74f8605..c23dcf6 100644
@@ -387,7 +387,7 @@
   #define CFG_ENV_SIZE		0x2000
 #else
   #define CFG_NO_FLASH		1	/* Flash is not usable now */
-  #define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+  #define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
   #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE		0x2000
 #endif
include/configs/MPC8540EVAL.h +2 -2
index 1073e23..04bec2d 100644
@@ -256,7 +256,7 @@
 /* Environment */
 #ifndef CFG_RAMBOOT
 #if defined(CONFIG_RAM_AS_FLASH)
-#define CFG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_NOWHERE
 #define CFG_ENV_ADDR		(CFG_FLASH_BASE + 0x100000)
 #define CFG_ENV_SIZE		0x2000
 #else
@@ -267,7 +267,7 @@
 #define CFG_ENV_SIZE		0x2000
 #else
 /* #define CFG_NO_FLASH		1 */	/* Flash is not usable now	*/
-#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only	*/
+#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only	*/
 #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 #define CFG_ENV_SIZE		0x2000
 #endif
include/configs/MPC8560ADS.h +1 -1
index a8e7c0a..f661c8e 100644
@@ -418,7 +418,7 @@
   #define CFG_ENV_SIZE		0x2000
 #else
   #define CFG_NO_FLASH		1	/* Flash is not usable now */
-  #define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+  #define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
   #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE		0x2000
 #endif
include/configs/MPC8610HPCD.h +1 -1
index 7c69582..2ee8d57 100644
@@ -443,7 +443,7 @@
 #define CFG_ENV_SECT_SIZE	0x20000	/* 126k (one sector) for env */
 #define CFG_ENV_SIZE		0x2000
 #else
-#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 #define CFG_ENV_SIZE		0x2000
 #endif
include/configs/MPC8641HPCN.h +1 -1
index a57c303..170fbd6 100644
@@ -509,7 +509,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
     #define CFG_ENV_SECT_SIZE		0x10000	/* 64K(one sector) for env */
     #define CFG_ENV_SIZE		0x2000
 #else
-    #define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+    #define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
     #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
     #define CFG_ENV_SIZE		0x2000
 #endif
include/configs/PM854.h +1 -1
index aa6095f..1212bcd 100644
@@ -299,7 +299,7 @@
   #define CFG_ENV_SIZE		0x2000
 #else
   #define CFG_NO_FLASH		1	/* Flash is not usable now */
-  #define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+  #define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
   #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE		0x2000
 #endif
include/configs/PM856.h +1 -1
index 244f09a..75dba3b 100644
@@ -299,7 +299,7 @@
   #define CFG_ENV_SIZE		0x2000
 #else
   #define CFG_NO_FLASH		1	/* Flash is not usable now */
-  #define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+  #define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
   #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE		0x2000
 #endif
include/configs/PN62.h +1 -1
index da7d8b8..074e8a1 100644
@@ -160,7 +160,7 @@
 
 #define CFG_NO_FLASH		1		/* There is no FLASH memory	*/
 
-#define CFG_ENV_IS_NOWHERE	1		/* Store ENV in memory only	*/
+#define CONFIG_ENV_IS_NOWHERE	1		/* Store ENV in memory only	*/
 #define CFG_ENV_OFFSET		0x00004000	/* Offset of Environment Sector */
 #define CFG_ENV_SIZE		0x00002000	/* Total Size of Environment Sector */
 
include/configs/SBC8540.h +2 -2
index 93509ee..6b25d56 100644
@@ -333,7 +333,7 @@
 /* Environment */
 #if !defined(CFG_RAMBOOT)
   #if defined(CONFIG_RAM_AS_FLASH)
-    #define CFG_ENV_IS_NOWHERE
+    #define CONFIG_ENV_IS_NOWHERE
     #define CFG_ENV_ADDR	(CFG_FLASH_BASE + 0x100000)
     #define CFG_ENV_SIZE	0x2000
   #else
@@ -344,7 +344,7 @@
   #endif
 #else
   #define CFG_NO_FLASH		1	/* Flash is not usable now	*/
-  #define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only	*/
+  #define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only	*/
   #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE		0x2000
 #endif
include/configs/TQM834x.h +1 -1
index e8f69f6..2ab6991 100644
@@ -306,7 +306,7 @@ extern int tqm834x_num_flash_banks;
 	#define CFG_ENV_SIZE		0x2000
 #else
 	#define CFG_NO_FLASH		1	/* Flash is not usable now */
-	#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+	#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 	#define CFG_ENV_SIZE		0x2000
 #endif
include/configs/cm4008.h +1 -1
index ae40b35..85f45b7 100644
@@ -52,7 +52,7 @@
 /*
  * select serial console configuration
  */
-#define CFG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_NOWHERE
 #define	CONFIG_SERIAL1
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
include/configs/cm41xx.h +1 -1
index c1dd33d..f34dc5c 100644
@@ -52,7 +52,7 @@
 /*
  * select serial console configuration
  */
-#define CFG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_NOWHERE
 #define	CONFIG_SERIAL1
 #define CONFIG_CONS_INDEX	1
 #define CONFIG_BAUDRATE		115200
include/configs/dbau1x00.h +1 -1
index 8941c5e..d422cce 100644
@@ -198,7 +198,7 @@
 #define CFG_FLASH_ERASE_TOUT	(2 * CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT	(2 * CFG_HZ) /* Timeout for Flash Write */
 
-#define	CFG_ENV_IS_NOWHERE	1
+#define	CONFIG_ENV_IS_NOWHERE	1
 
 /* Address and size of Primary Environment Sector	*/
 #define CFG_ENV_ADDR		0xB0030000
include/configs/evb4510.h +1 -1
index 1571477..f2ed0df 100644
@@ -172,7 +172,7 @@
 
 /* environment settings */
 #define CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_NOWHERE
+#undef CONFIG_ENV_IS_NOWHERE
 
 #define CFG_ENV_ADDR		(CFG_FLASH_BASE + 0x20000) /* environment start address */
 #define CFG_ENV_SECT_SIZE	0x10000	   /* Total Size of Environment Sector */
include/configs/gr_cpci_ax2000.h +1 -1
index 942609f..7fee1d2 100644
@@ -218,7 +218,7 @@
 /*
  * Environment settings
  */
-/*#define CFG_ENV_IS_NOWHERE 1*/
+/*#define CONFIG_ENV_IS_NOWHERE 1*/
 #define CFG_ENV_IS_IN_FLASH	1
 /* CFG_ENV_ADDR need to be at sector boundary */
 #define CFG_ENV_SIZE		0x8000
include/configs/gr_ep2s60.h +1 -1
index ae25fb2..776fe40 100644
@@ -206,7 +206,7 @@
 /*
  * Environment settings
  */
-/*#define CFG_ENV_IS_NOWHERE 1*/
+/*#define CONFIG_ENV_IS_NOWHERE 1*/
 #define CFG_ENV_IS_IN_FLASH	1
 /* CFG_ENV_ADDR need to be at sector boundary */
 #define CFG_ENV_SIZE		0x8000
include/configs/gr_xc3s_1500.h +1 -1
index f019bb4..f0f770c 100644
@@ -182,7 +182,7 @@
 /*
  * Environment settings
  */
-/*#define CFG_ENV_IS_NOWHERE 1*/
+/*#define CONFIG_ENV_IS_NOWHERE 1*/
 #define CFG_ENV_IS_IN_FLASH	1
 /* CFG_ENV_ADDR need to be at sector boundary */
 #define CFG_ENV_SIZE		0x8000
include/configs/grsim.h +1 -1
index f880a7b..c6d3666 100644
@@ -209,7 +209,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_NOWHERE 1
+#define CONFIG_ENV_IS_NOWHERE 1
 /*#define CFG_ENV_IS_IN_FLASH	0*/
 /*#define CFG_ENV_SIZE		0x8000*/
 #define CFG_ENV_SECT_SIZE	0x40000
include/configs/grsim_leon2.h +1 -1
index e5af9a6..945a163 100644
@@ -206,7 +206,7 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_NOWHERE 1
+#define CONFIG_ENV_IS_NOWHERE 1
 /*#define CFG_ENV_IS_IN_FLASH	0*/
 /*#define CFG_ENV_SIZE		0x8000*/
 #define CFG_ENV_SECT_SIZE	0x40000
include/configs/gth2.h +1 -1
index 7f7190b..ad8bb59 100644
@@ -153,7 +153,7 @@
 #define CFG_FLASH_ERASE_TOUT	(2 * CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT	(2 * CFG_HZ) /* Timeout for Flash Write */
 
-#define CFG_ENV_IS_NOWHERE	1
+#define CONFIG_ENV_IS_NOWHERE	1
 
 /* Address and size of Primary Environment Sector	*/
 #define CFG_ENV_ADDR		0xB0030000
include/configs/hcu4.h +1 -1
index 0dd9787..7f262cb 100644
@@ -123,7 +123,7 @@
 
 #undef	CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_IS_IN_FLASH
-#undef  CFG_ENV_IS_NOWHERE
+#undef  CONFIG_ENV_IS_NOWHERE
 
 #ifdef  CONFIG_ENV_IS_IN_EEPROM
 /* Put the environment after the SDRAM configuration */
include/configs/hcu5.h +1 -1
index 0796a7d..af0f7f4 100644
@@ -109,7 +109,7 @@
 #undef	CONFIG_ENV_IS_IN_NVRAM
 #define  CFG_ENV_IS_IN_FLASH
 #undef	CONFIG_ENV_IS_IN_EEPROM
-#undef  CFG_ENV_IS_NOWHERE
+#undef  CONFIG_ENV_IS_NOWHERE
 
 #ifdef  CONFIG_ENV_IS_IN_EEPROM
 /* Put the environment after the SDRAM and bootstrap configuration */
include/configs/integratorap.h +1 -1
index 1452bf2..77fee21 100644
@@ -128,7 +128,7 @@
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
  */
-#define CFG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_NOWHERE
 #define CFG_MAX_FLASH_BANKS	1		/* max number of memory banks */
 #define PHYS_FLASH_SIZE		0x01000000	/* 16MB */
 /* timeout values are in ticks */
include/configs/mcu25.h +1 -1
index 5c234df..35ecc65 100644
@@ -123,7 +123,7 @@
 
 #undef	CONFIG_ENV_IS_IN_NVRAM
 #define CFG_ENV_IS_IN_FLASH
-#undef  CFG_ENV_IS_NOWHERE
+#undef  CONFIG_ENV_IS_NOWHERE
 
 #ifdef  CONFIG_ENV_IS_IN_EEPROM
 /* Put the environment after the SDRAM configuration */
include/configs/ml401.h +2 -2
index 36a42ba..c626702 100644
@@ -161,7 +161,7 @@
 	#define	CFG_FLASH_PROTECTION		/* hardware flash protection */
 
 	#ifdef	RAMENV
-		#define	CFG_ENV_IS_NOWHERE	1
+		#define	CONFIG_ENV_IS_NOWHERE	1
 		#define	CFG_ENV_SIZE		0x1000
 		#define	CFG_ENV_ADDR		(CFG_MONITOR_BASE - CFG_ENV_SIZE)
 
@@ -174,7 +174,7 @@
 #else /* !FLASH */
 	/* ENV in RAM */
 	#define	CFG_NO_FLASH		1
-	#define	CFG_ENV_IS_NOWHERE	1
+	#define	CONFIG_ENV_IS_NOWHERE	1
 	#define	CFG_ENV_SIZE		0x1000
 	#define	CFG_ENV_ADDR		(CFG_MONITOR_BASE - CFG_ENV_SIZE)
 	#define	CFG_FLASH_PROTECTION		/* hardware flash protection */
include/configs/modnet50.h +1 -1
index 5159897..84540f5 100644
@@ -171,7 +171,7 @@
 
 /* environment settings */
 #define	CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_NOWHERE
+#undef CONFIG_ENV_IS_NOWHERE
 
 #define CFG_ENV_ADDR		0x1001C000 /* environment start address */
 #define CFG_ENV_SECT_SIZE       0x10000 /* Total Size of Environment Sector */
include/configs/ns9750dev.h +1 -1
index 746a56e..b9eec62 100644
@@ -186,7 +186,7 @@
 
 /* @TODO */
 /*#define	CFG_ENV_IS_IN_FLASH	1*/
-#define CFG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_NOWHERE
 #define CFG_ENV_SIZE		0x10000	/* Total Size of Environment Sector */
 
 #ifdef CONFIG_STATUS_LED
include/configs/pb1x00.h +1 -1
index 2caa641..4ec520f 100644
@@ -116,7 +116,7 @@
 #define CFG_FLASH_ERASE_TOUT	(2 * CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT	(2 * CFG_HZ) /* Timeout for Flash Write */
 
-#define	CFG_ENV_IS_NOWHERE	1
+#define	CONFIG_ENV_IS_NOWHERE	1
 
 /* Address and size of Primary Environment Sector	*/
 #define CFG_ENV_ADDR		0xB0030000
include/configs/sbc8349.h +1 -1
index 261229c..264f5ab 100644
@@ -424,7 +424,7 @@
 
 #else
 	#define CFG_NO_FLASH		1	/* Flash is not usable now */
-	#define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+	#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
 	#define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
 	#define CFG_ENV_SIZE		0x2000
 #endif
include/configs/sbc8560.h +2 -2
index 99d328c..f39867f 100644
@@ -332,7 +332,7 @@
 /* Environment */
 #if !defined(CFG_RAMBOOT)
   #if defined(CONFIG_RAM_AS_FLASH)
-    #define CFG_ENV_IS_NOWHERE
+    #define CONFIG_ENV_IS_NOWHERE
     #define CFG_ENV_ADDR	(CFG_FLASH_BASE + 0x100000)
     #define CFG_ENV_SIZE	0x2000
   #else
@@ -343,7 +343,7 @@
   #endif
 #else
   #define CFG_NO_FLASH		1	/* Flash is not usable now	*/
-  #define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only	*/
+  #define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only	*/
   #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE		0x2000
 #endif
include/configs/stxgp3.h +1 -1
index ea79de7..f4a8fa5 100644
@@ -294,7 +294,7 @@
   #define CFG_ENV_SIZE		0x2000
 #else
   #define CFG_NO_FLASH		1	/* Flash is not usable now	*/
-  #define CFG_ENV_IS_NOWHERE	1	/* Store ENV in memory only	*/
+  #define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only	*/
   #define CFG_ENV_ADDR		(CFG_MONITOR_BASE - 0x1000)
   #define CFG_ENV_SIZE		0x2000
 #endif
include/configs/suzaku.h +1 -1
index 020ed02..5299733 100644
@@ -90,7 +90,7 @@
 /*-----------------------------------------------------------------------
  * NVRAM organization
  */
-#define CFG_ENV_IS_NOWHERE	1
+#define CONFIG_ENV_IS_NOWHERE	1
 #define	CFG_ENV_SIZE		0x10000	/* Total Size of Environment Sector	*/
 #define CFG_ENV_SECT_SIZE	0x10000	/* see README - env sector total size	*/
 
include/configs/versatile.h +1 -1
index a88d356..f3a8b31 100644
@@ -185,7 +185,7 @@
 
 #define PHYS_FLASH_1		(CFG_FLASH_BASE)
 
-#define CFG_ENV_IS_IN_FLASH     1               /* env in flash instead of CFG_ENV_IS_NOWHERE */
+#define CFG_ENV_IS_IN_FLASH     1               /* env in flash instead of CONFIG_ENV_IS_NOWHERE */
 #define CFG_ENV_SECT_SIZE       0x00020000      /* 256 KB sectors (x2) */
 #define CFG_ENV_SIZE            0x10000         /* Total Size of Environment Sector */
 #define CFG_ENV_OFFSET          0x01f00000      /* environment starts here  */
include/configs/xupv2p.h +1 -1
index 570d6a8..7bd1424 100644
@@ -150,7 +150,7 @@
 #define	CFG_INIT_SP_OFFSET	CFG_MALLOC_BASE
 
 #define	CFG_NO_FLASH		1
-#define	CFG_ENV_IS_NOWHERE	1
+#define	CONFIG_ENV_IS_NOWHERE	1
 #define	CFG_ENV_SIZE		0x1000
 #define	CFG_ENV_ADDR		(CFG_MONITOR_BASE - CFG_ENV_SIZE)
 
lib_avr32/board.c +2 -2
index d6423d4..f3d0c52 100644
@@ -261,7 +261,7 @@ void board_init_f(ulong board_type)
 void board_init_r(gd_t *new_gd, ulong dest_addr)
 {
 	extern void malloc_bin_reloc (void);
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
 	extern char * env_name_spec;
 #endif
 	char *s;
@@ -302,7 +302,7 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
 	}
 
 	/* there are some other pointer constants we must deal with */
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
 	env_name_spec += gd->reloc_off;
 #endif
 
lib_m68k/board.c +2 -2
index 4e566d5..b8067a5 100644
@@ -441,7 +441,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 	int i;
 	extern void malloc_bin_reloc (void);
 
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
 	extern char * env_name_spec;
 #endif
 #ifndef CFG_NO_FLASH
@@ -492,7 +492,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 #endif
 	}
 	/* there are some other pointer constants we must deal with */
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
 	env_name_spec += gd->reloc_off;
 #endif
 
lib_mips/board.c +2 -2
index 64ca200..fb31e33 100644
@@ -308,7 +308,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 	ulong size;
 #endif
 	extern void malloc_bin_reloc (void);
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
 	extern char * env_name_spec;
 #endif
 	char *s, *e;
@@ -353,7 +353,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 #endif
 	}
 	/* there are some other pointer constants we must deal with */
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
 	env_name_spec += gd->reloc_off;
 #endif
 
lib_ppc/board.c +2 -2
index a757ffd..cf6239f 100644
@@ -651,7 +651,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 	bd_t *bd;
 	int i;
 	extern void malloc_bin_reloc (void);
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
 	extern char * env_name_spec;
 #endif
 
@@ -713,7 +713,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 #endif
 	}
 	/* there are some other pointer constants we must deal with */
-#ifndef CFG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
 	env_name_spec += gd->reloc_off;
 #endif
 
Signature · 1 line
1.5.6.3
#19 lore raw

PATCH 19/25 nv_nowhere: Move conditional compilation to Makefile

---
 common/Makefile      |    2 +-
 common/env_nowhere.c |    5 -----
 2 files changed, 1 insertions(+), 6 deletions(-)
common/Makefile +1 -1
index bc89741..45f856f 100644
@@ -57,7 +57,7 @@ COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
 COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o
 COBJS-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o
 COBJS-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
-COBJS-y += env_nowhere.o
+COBJS-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
 
 # command
 COBJS-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o
common/env_nowhere.c +0 -5
index 8dd4867..78e8f8e 100644
@@ -25,9 +25,6 @@
  */
 
 #include <common.h>
-
-#if defined(CONFIG_ENV_IS_NOWHERE) /* Environment is nowhere */
-
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
@@ -61,5 +58,3 @@ int  env_init(void)
 
 	return (0);
 }
-
-#endif /* CONFIG_ENV_IS_NOWHERE) */
Signature · 1 line
1.5.6.3
#20 lore raw

PATCH 20/25 rename environment.c in env_embedded.c to reflect is functionality

---
 common/Makefile                          |    2 +-
 common/{environment.c => env_embedded.c} |    0 
 2 files changed, 1 insertions(+), 1 deletions(-)
 rename common/{environment.c => env_embedded.c} (100%)
common/Makefile +1 -1
index 45f856f..9074f93 100644
@@ -48,10 +48,10 @@ COBJS-y += cmd_bootm.o
 COBJS-y += cmd_nvedit.o
 
 # environment
-COBJS-y += environment.o
 COBJS-y += env_common.o
 COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o
 COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
+COBJS-y += env_embedded.o
 COBJS-y += env_flash.o
 COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
 COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o
common/env_embedded.c renamed from common/environment.c +0 -0
similarity index 100%
rename from common/environment.c
rename to common/env_embedded.c
Signature · 1 line
1.5.6.3
#21 lore raw

PATCH 21/25 cleanup use of CFG_ENV_IS_IN_FLASH

- #if CFG_ENV_IS_IN_FLASH
- #if (CFG_ENV_IS_IN_FLASH == 1)
- #define CFG_ENV_IS_IN_FLASH 0

---
 board/barco/flash.c           |    2 +-
 board/bmw/flash.c             |    2 +-
 board/cpc45/flash.c           |    2 +-
 board/cpu86/flash.c           |    2 +-
 board/cpu87/flash.c           |    2 +-
 board/cu824/flash.c           |    2 +-
 board/ep8260/flash.c          |    2 +-
 board/exbitgen/flash.c        |    2 +-
 board/gw8260/flash.c          |    2 +-
 board/hidden_dragon/flash.c   |    2 +-
 board/oxc/flash.c             |    2 +-
 board/pm826/flash.c           |    2 +-
 board/pm828/flash.c           |    2 +-
 board/ppmc7xx/flash.c         |    2 +-
 board/rpxsuper/flash.c        |    2 +-
 board/rsdproto/flash.c        |    2 +-
 board/sandpoint/flash.c       |    2 +-
 board/sbc8260/flash.c         |    2 +-
 board/siemens/SCM/flash.c     |    2 +-
 board/sl8245/flash.c          |    2 +-
 board/tqc/tqm8260/flash.c     |    2 +-
 board/utx8245/flash.c         |    2 +-
 include/configs/CPCI750.h     |    2 +-
 include/configs/grsim.h       |    2 +-
 include/configs/grsim_leon2.h |    2 +-
 include/configs/pf5200.h      |    2 +-
 include/configs/sc3.h         |    2 +-
 27 files changed, 27 insertions(+), 27 deletions(-)
board/barco/flash.c +1 -1
index 6cb19b7..9502560 100644
@@ -224,7 +224,7 @@ unsigned long flash_init(void)
 				&flash_info[0]);
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 		flash_protect(FLAG_PROTECT_SET,
 				CFG_ENV_ADDR,
 				CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
board/bmw/flash.c +1 -1
index 7fba174..6d3cfab 100644
@@ -224,7 +224,7 @@ unsigned long flash_init (void)
 			       &flash_info[0]);
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 		flash_protect (FLAG_PROTECT_SET,
 			       CFG_ENV_ADDR,
 			       CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
board/cpc45/flash.c +1 -1
index 37dd182..9a39868 100644
@@ -174,7 +174,7 @@ unsigned long flash_init (void)
 		       &flash_info[0]);
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 #if CFG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE
 	flash_protect (FLAG_PROTECT_SET,
 		       CFG_ENV_ADDR,
board/cpu86/flash.c +1 -1
index 1535a6b..b1048a3 100644
@@ -230,7 +230,7 @@ unsigned long flash_init (void)
 #endif
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
board/cpu87/flash.c +1 -1
index 076c2f9..925a0e6 100644
@@ -236,7 +236,7 @@ unsigned long flash_init (void)
 #endif
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
board/cu824/flash.c +1 -1
index 7368176..ec1a586 100644
@@ -135,7 +135,7 @@ unsigned long flash_init(void)
 #endif
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 #if CFG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE
     flash_protect(FLAG_PROTECT_SET,
 	      CFG_ENV_ADDR,
board/ep8260/flash.c +1 -1
index 966a345..167f316 100644
@@ -157,7 +157,7 @@ unsigned long flash_init (void)
 		      &flash_info[0]);
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
board/exbitgen/flash.c +1 -1
index 4dd5382..401eead 100644
@@ -126,7 +126,7 @@ unsigned long flash_init (void)
 #endif
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 	flash_protect(FLAG_PROTECT_SET,
 		CFG_ENV_ADDR,
 		CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
board/gw8260/flash.c +1 -1
index 5620a1d..015ea7d 100644
@@ -100,7 +100,7 @@ unsigned long flash_init (void)
 		  &flash_info[0]);
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
board/hidden_dragon/flash.c +1 -1
index 21c5a01..a2ed3bd 100644
@@ -212,7 +212,7 @@ unsigned long flash_init (void)
 			       &flash_info[0]);
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 		flash_protect (FLAG_PROTECT_SET,
 			       CFG_ENV_ADDR,
 			       CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
board/oxc/flash.c +1 -1
index 296c01d..4559b80 100644
@@ -73,7 +73,7 @@ unsigned long flash_init (void)
 		  &flash_info[0]);
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
board/pm826/flash.c +1 -1
index fee07cf..92a433a 100644
@@ -144,7 +144,7 @@ unsigned long flash_init (void)
 # endif
 #endif	/* CONFIG_BOOT_ROM */
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
board/pm828/flash.c +1 -1
index 1f21b3e..0e7bfe8 100644
@@ -144,7 +144,7 @@ unsigned long flash_init (void)
 # endif
 #endif	/* CONFIG_BOOT_ROM */
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
board/ppmc7xx/flash.c +1 -1
index 4be6f13..4d13612 100644
@@ -197,7 +197,7 @@ unsigned long flash_init (void)
 		       CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
board/rpxsuper/flash.c +1 -1
index d80e778..b29032b 100644
@@ -71,7 +71,7 @@ unsigned long flash_init (void)
 		  &flash_info[0]);
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
board/rsdproto/flash.c +1 -1
index 4e43b29..d9f6b3b 100644
@@ -131,7 +131,7 @@ unsigned long flash_init (void)
 		      &flash_info[1]);
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
board/sandpoint/flash.c +1 -1
index a9f73ff..cf06679 100644
@@ -230,7 +230,7 @@ flash_init(void)
 		&flash_info[0]);
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
     flash_protect(FLAG_PROTECT_SET,
 		CFG_ENV_ADDR,
 		CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
board/sbc8260/flash.c +1 -1
index 9a8b952..c43435f 100644
@@ -67,7 +67,7 @@ unsigned long flash_init (void)
 		  &flash_info[0]);
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
board/siemens/SCM/flash.c +1 -1
index 056fe81..063972d 100644
@@ -207,7 +207,7 @@ unsigned long flash_init (void)
 		       CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
board/sl8245/flash.c +1 -1
index 553dc98..7fb9463 100644
@@ -139,7 +139,7 @@ unsigned long flash_init (void)
 #endif
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 #if CFG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE
 	flash_protect ( FLAG_PROTECT_SET,
 			CFG_ENV_ADDR,
board/tqc/tqm8260/flash.c +1 -1
index 056fe81..063972d 100644
@@ -207,7 +207,7 @@ unsigned long flash_init (void)
 		       CFG_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 # ifndef  CFG_ENV_SIZE
 #  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
 # endif
board/utx8245/flash.c +1 -1
index 199f619..ae0e659 100644
@@ -169,7 +169,7 @@ unsigned long flash_init (void)
 				   &flash_info[0]);
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
+#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
 	flash_protect (FLAG_PROTECT_SET, CFG_ENV_ADDR,
 			CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
 #endif
include/configs/CPCI750.h +1 -1
index 4818aed..48f308c 100644
@@ -572,7 +572,7 @@
 #define CFG_FLASH_LOCK_TOUT	500	/* Timeout for Flash Lock (in ms) */
 
 #if 0
-#define CFG_ENV_IS_IN_FLASH	0
+#define CFG_ENV_IS_IN_FLASH
 #define CFG_ENV_SIZE		0x1000	/* Total Size of Environment Sector */
 #define CFG_ENV_SECT_SIZE	0x10000
 #define CFG_ENV_ADDR		0xFFF78000 /* Marvell 8-Bit Bootflash last sector */
include/configs/grsim.h +1 -1
index c6d3666..a23ac9c 100644
@@ -210,7 +210,7 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_NOWHERE 1
-/*#define CFG_ENV_IS_IN_FLASH	0*/
+/*#define CFG_ENV_IS_IN_FLASH*/
 /*#define CFG_ENV_SIZE		0x8000*/
 #define CFG_ENV_SECT_SIZE	0x40000
 #define CONFIG_ENV_OVERWRITE	1
include/configs/grsim_leon2.h +1 -1
index 945a163..c45b258 100644
@@ -207,7 +207,7 @@
  * Environment settings
  */
 #define CONFIG_ENV_IS_NOWHERE 1
-/*#define CFG_ENV_IS_IN_FLASH	0*/
+/*#define CFG_ENV_IS_IN_FLASH*/
 /*#define CFG_ENV_SIZE		0x8000*/
 #define CFG_ENV_SECT_SIZE	0x40000
 #define CONFIG_ENV_OVERWRITE	1
include/configs/pf5200.h +1 -1
index 4ed8a21..a709d0e 100644
@@ -205,7 +205,7 @@
  * Environment settings
  */
 #if 1				/* test-only */
-#define CFG_ENV_IS_IN_FLASH	0
+#define CFG_ENV_IS_IN_FLASH
 #define CFG_ENV_SIZE		0x10000
 #define CFG_ENV_SECT_SIZE	0x10000
 #define CONFIG_ENV_OVERWRITE	1
include/configs/sc3.h +1 -1
index 659f74e..4205f46 100644
@@ -405,7 +405,7 @@ extern unsigned long offsetOfEnvironment;
 #define CFG_WRITE_SWAPPED_DATA		/* swap Databytes between reading/writing */
 
 #define CFG_ENV_IS_IN_FLASH	1
-#if CFG_ENV_IS_IN_FLASH
+#ifdef CFG_ENV_IS_IN_FLASH
 #define CFG_ENV_OFFSET		0x00000000  /* Offset of Environment Sector in bottom type */
 #define CFG_ENV_SIZE		0x4000	    /* Total Size of Environment Sector	*/
 #define CFG_ENV_SECT_SIZE	0x4000	    /* see README - env sector total size	*/
Signature · 1 line
1.5.6.3
#22 lore raw

PATCH 22/25 rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH

---
 README                              |    4 ++--
 board/LEOX/elpt860/flash.c          |    2 +-
 board/MAI/AmigaOneG3SE/flash_new.c  |    2 +-
 board/RPXlite_dw/README             |    2 +-
 board/RRvision/flash.c              |    2 +-
 board/a3000/flash.c                 |    4 ++--
 board/amcc/bamboo/flash.c           |    4 ++--
 board/amcc/bubinga/flash.c          |    2 +-
 board/amcc/ebony/flash.c            |    2 +-
 board/amcc/kilauea/kilauea.c        |    2 +-
 board/amcc/luan/flash.c             |    2 +-
 board/amcc/makalu/makalu.c          |    2 +-
 board/amcc/ocotea/flash.c           |    2 +-
 board/amcc/sequoia/sequoia.c        |    2 +-
 board/amcc/taihu/flash.c            |    2 +-
 board/amcc/walnut/flash.c           |    2 +-
 board/amcc/yucca/flash.c            |    2 +-
 board/atc/flash.c                   |    2 +-
 board/barco/flash.c                 |    4 ++--
 board/bmw/flash.c                   |    4 ++--
 board/c2mon/flash.c                 |    4 ++--
 board/cmc_pu2/flash.c               |    2 +-
 board/cmi/flash.c                   |    4 ++--
 board/cogent/flash.c                |    4 ++--
 board/cpc45/flash.c                 |    4 ++--
 board/cpu86/flash.c                 |    2 +-
 board/cpu87/flash.c                 |    2 +-
 board/cu824/flash.c                 |    4 ++--
 board/emk/common/flash.c            |    2 +-
 board/ep8260/flash.c                |    2 +-
 board/esd/pf5200/flash.c            |    2 +-
 board/esd/pmc440/pmc440.c           |    2 +-
 board/evb64260/flash.c              |    2 +-
 board/exbitgen/flash.c              |    2 +-
 board/fads/fads.h                   |    2 +-
 board/fads/flash.c                  |    4 ++--
 board/flagadm/flash.c               |    2 +-
 board/freescale/mpc8260ads/flash.c  |    2 +-
 board/freescale/mpc8266ads/flash.c  |    4 ++--
 board/funkwerk/vovpn-gw/flash.c     |    2 +-
 board/gen860t/flash.c               |    4 ++--
 board/gw8260/flash.c                |    2 +-
 board/hidden_dragon/flash.c         |    4 ++--
 board/icecube/flash.c               |    2 +-
 board/icu862/flash.c                |    4 ++--
 board/ids8247/flash.c               |    4 ++--
 board/incaip/flash.c                |    2 +-
 board/innokom/flash.c               |    2 +-
 board/integratorcp/flash.c          |    2 +-
 board/ip860/flash.c                 |    4 ++--
 board/iphase4539/flash.c            |    2 +-
 board/ivm/flash.c                   |    4 ++--
 board/kup/common/flash.c            |    2 +-
 board/lantec/flash.c                |    6 +++---
 board/lwmon/flash.c                 |    6 +++---
 board/mpc8540eval/flash.c           |    4 ++--
 board/mpl/common/flash.c            |    2 +-
 board/musenki/flash.c               |    6 +++---
 board/nc650/flash.c                 |    4 ++--
 board/netstal/hcu5/hcu5.c           |    2 +-
 board/o2dnt/flash.c                 |    2 +-
 board/oxc/flash.c                   |    2 +-
 board/pcippc2/flash.c               |    2 +-
 board/pm520/flash.c                 |    2 +-
 board/pm826/flash.c                 |    2 +-
 board/pm828/flash.c                 |    2 +-
 board/ppmc7xx/flash.c               |    2 +-
 board/purple/flash.c                |    2 +-
 board/r360mpi/flash.c               |    4 ++--
 board/rmu/flash.c                   |    2 +-
 board/rpxsuper/flash.c              |    2 +-
 board/rsdproto/flash.c              |    2 +-
 board/sacsng/flash.c                |    4 ++--
 board/sandpoint/flash.c             |    4 ++--
 board/sbc8260/flash.c               |    2 +-
 board/siemens/SCM/flash.c           |    2 +-
 board/siemens/pcu_e/flash.c         |    6 +++---
 board/sl8245/flash.c                |    4 ++--
 board/stxgp3/flash.c                |    4 ++--
 board/svm_sc8xx/flash.c             |    4 ++--
 board/tqc/tqm5200/cam5200_flash.c   |    2 +-
 board/tqc/tqm8260/flash.c           |    2 +-
 board/tqc/tqm8xx/flash.c            |    4 ++--
 board/utx8245/flash.c               |    4 ++--
 board/westel/amx860/flash.c         |    6 +++---
 common/cmd_nvedit.c                 |    2 +-
 common/env_flash.c                  |    4 ++--
 drivers/mtd/cfi_flash.c             |    4 ++--
 include/configs/A3000.h             |    2 +-
 include/configs/ADCIOP.h            |    2 +-
 include/configs/ADNPESC1.h          |    2 +-
 include/configs/AMX860.h            |    2 +-
 include/configs/AP1000.h            |    8 ++++----
 include/configs/AR405.h             |    2 +-
 include/configs/ATUM8548.h          |    2 +-
 include/configs/Adder.h             |    2 +-
 include/configs/Alaska8220.h        |    8 ++++----
 include/configs/BC3450.h            |    2 +-
 include/configs/CANBT.h             |    2 +-
 include/configs/CATcenter.h         |    2 +-
 include/configs/CCM.h               |    2 +-
 include/configs/CPC45.h             |    2 +-
 include/configs/CPCI750.h           |    2 +-
 include/configs/CPU86.h             |    2 +-
 include/configs/CPU87.h             |    2 +-
 include/configs/CRAYL1.h            |    2 +-
 include/configs/CU824.h             |    2 +-
 include/configs/DASA_SIM.h          |    2 +-
 include/configs/DB64360.h           |    2 +-
 include/configs/DB64460.h           |    2 +-
 include/configs/DK1C20.h            |    2 +-
 include/configs/DK1S10.h            |    2 +-
 include/configs/DU440.h             |    2 +-
 include/configs/EB+MCF-EV123.h      |    4 ++--
 include/configs/ELPT860.h           |    6 +++---
 include/configs/EP1C20.h            |    2 +-
 include/configs/EP1S10.h            |    2 +-
 include/configs/EP1S40.h            |    2 +-
 include/configs/EP88x.h             |    2 +-
 include/configs/ERIC.h              |   10 +++++-----
 include/configs/ESTEEM192E.h        |    2 +-
 include/configs/ETX094.h            |    2 +-
 include/configs/EVB64260.h          |    2 +-
 include/configs/EXBITGEN.h          |    4 ++--
 include/configs/FADS823.h           |    2 +-
 include/configs/FADS850SAR.h        |    2 +-
 include/configs/FLAGADM.h           |    2 +-
 include/configs/FPS850L.h           |    2 +-
 include/configs/FPS860L.h           |    2 +-
 include/configs/G2000.h             |    2 +-
 include/configs/GEN860T.h           |    2 +-
 include/configs/GENIETV.h           |    2 +-
 include/configs/GTH.h               |    2 +-
 include/configs/HIDDEN_DRAGON.h     |    2 +-
 include/configs/HMI10.h             |    2 +-
 include/configs/IAD210.h            |    2 +-
 include/configs/ICU862.h            |    2 +-
 include/configs/IDS8247.h           |    2 +-
 include/configs/IP860.h             |    2 +-
 include/configs/IPHASE4539.h        |    2 +-
 include/configs/ISPAN.h             |    2 +-
 include/configs/IVML24.h            |    2 +-
 include/configs/IVMS8.h             |    2 +-
 include/configs/IceCube.h           |    2 +-
 include/configs/JSE.h               |    2 +-
 include/configs/KAREF.h             |    2 +-
 include/configs/KUP4K.h             |    2 +-
 include/configs/KUP4X.h             |    2 +-
 include/configs/LANTEC.h            |    2 +-
 include/configs/M52277EVB.h         |    2 +-
 include/configs/M5235EVB.h          |    2 +-
 include/configs/M5249EVB.h          |    2 +-
 include/configs/M5253DEMO.h         |    4 ++--
 include/configs/M5253EVBE.h         |    4 ++--
 include/configs/M5271EVB.h          |    2 +-
 include/configs/M5272C3.h           |    4 ++--
 include/configs/M5275EVB.h          |    4 ++--
 include/configs/M5282EVB.h          |    2 +-
 include/configs/M5329EVB.h          |    2 +-
 include/configs/M5373EVB.h          |    2 +-
 include/configs/M54451EVB.h         |    2 +-
 include/configs/M54455EVB.h         |    2 +-
 include/configs/M5475EVB.h          |    2 +-
 include/configs/M5485EVB.h          |    2 +-
 include/configs/METROBOX.h          |    2 +-
 include/configs/MHPC.h              |    2 +-
 include/configs/ML2.h               |    8 ++++----
 include/configs/MOUSSE.h            |    2 +-
 include/configs/MPC8260ADS.h        |    2 +-
 include/configs/MPC8266ADS.h        |    2 +-
 include/configs/MPC8313ERDB.h       |    2 +-
 include/configs/MPC8315ERDB.h       |    2 +-
 include/configs/MPC8323ERDB.h       |    2 +-
 include/configs/MPC832XEMDS.h       |    2 +-
 include/configs/MPC8349EMDS.h       |    2 +-
 include/configs/MPC8349ITX.h        |    2 +-
 include/configs/MPC8360EMDS.h       |    2 +-
 include/configs/MPC8360ERDK.h       |    2 +-
 include/configs/MPC837XEMDS.h       |    2 +-
 include/configs/MPC837XERDB.h       |    2 +-
 include/configs/MPC8536DS.h         |    2 +-
 include/configs/MPC8540ADS.h        |    2 +-
 include/configs/MPC8540EVAL.h       |    2 +-
 include/configs/MPC8541CDS.h        |    2 +-
 include/configs/MPC8544DS.h         |    2 +-
 include/configs/MPC8548CDS.h        |    2 +-
 include/configs/MPC8555CDS.h        |    2 +-
 include/configs/MPC8560ADS.h        |    2 +-
 include/configs/MPC8568MDS.h        |    2 +-
 include/configs/MPC8572DS.h         |    2 +-
 include/configs/MPC8610HPCD.h       |    2 +-
 include/configs/MPC8641HPCN.h       |    2 +-
 include/configs/MUSENKI.h           |    2 +-
 include/configs/MVBC_P.h            |    2 +-
 include/configs/MVBLM7.h            |    2 +-
 include/configs/MVBLUE.h            |    2 +-
 include/configs/MVS1.h              |    2 +-
 include/configs/MigoR.h             |    2 +-
 include/configs/NC650.h             |    2 +-
 include/configs/NETPHONE.h          |    2 +-
 include/configs/NETTA.h             |    2 +-
 include/configs/NETTA2.h            |    2 +-
 include/configs/NETVIA.h            |    2 +-
 include/configs/NSCU.h              |    2 +-
 include/configs/NX823.h             |    2 +-
 include/configs/OXC.h               |    2 +-
 include/configs/P3G4.h              |    2 +-
 include/configs/PATI.h              |    4 ++--
 include/configs/PCI5441.h           |    2 +-
 include/configs/PCIPPC2.h           |    2 +-
 include/configs/PCIPPC6.h           |    2 +-
 include/configs/PK1C20.h            |    2 +-
 include/configs/PM520.h             |    2 +-
 include/configs/PM826.h             |    2 +-
 include/configs/PM828.h             |    2 +-
 include/configs/PM854.h             |    2 +-
 include/configs/PM856.h             |    2 +-
 include/configs/PMC440.h            |    2 +-
 include/configs/PPChameleonEVB.h    |    2 +-
 include/configs/QS823.h             |    2 +-
 include/configs/QS850.h             |    2 +-
 include/configs/QS860T.h            |    2 +-
 include/configs/R360MPI.h           |    2 +-
 include/configs/RBC823.h            |    2 +-
 include/configs/RPXClassic.h        |    2 +-
 include/configs/RPXlite.h           |    2 +-
 include/configs/RPXlite_DW.h        |    2 +-
 include/configs/RPXsuper.h          |    2 +-
 include/configs/RRvision.h          |    2 +-
 include/configs/Rattler.h           |    6 +++---
 include/configs/SBC8540.h           |    2 +-
 include/configs/SCM.h               |    2 +-
 include/configs/SL8245.h            |    2 +-
 include/configs/SM850.h             |    2 +-
 include/configs/SMN42.h             |    2 +-
 include/configs/SPD823TS.h          |    2 +-
 include/configs/SX1.h               |    2 +-
 include/configs/SXNI855T.h          |    4 ++--
 include/configs/Sandpoint8240.h     |    2 +-
 include/configs/Sandpoint8245.h     |    2 +-
 include/configs/TASREG.h            |    2 +-
 include/configs/TB5200.h            |    2 +-
 include/configs/TK885D.h            |    2 +-
 include/configs/TQM5200.h           |    2 +-
 include/configs/TQM823L.h           |    2 +-
 include/configs/TQM823M.h           |    2 +-
 include/configs/TQM8260.h           |    2 +-
 include/configs/TQM8272.h           |    2 +-
 include/configs/TQM834x.h           |    2 +-
 include/configs/TQM850L.h           |    2 +-
 include/configs/TQM850M.h           |    2 +-
 include/configs/TQM855L.h           |    2 +-
 include/configs/TQM855M.h           |    2 +-
 include/configs/TQM85xx.h           |    2 +-
 include/configs/TQM860L.h           |    2 +-
 include/configs/TQM860M.h           |    2 +-
 include/configs/TQM862L.h           |    2 +-
 include/configs/TQM862M.h           |    2 +-
 include/configs/TQM866M.h           |    2 +-
 include/configs/TQM885D.h           |    2 +-
 include/configs/Total5200.h         |    2 +-
 include/configs/VCMA9.h             |    2 +-
 include/configs/VoVPN-GW.h          |    2 +-
 include/configs/W7OLMC.h            |    2 +-
 include/configs/W7OLMG.h            |    2 +-
 include/configs/Yukon8220.h         |    8 ++++----
 include/configs/ZPC1900.h           |    4 ++--
 include/configs/ZUMA.h              |    2 +-
 include/configs/acadia.h            |    4 ++--
 include/configs/actux1.h            |    2 +-
 include/configs/actux2.h            |    2 +-
 include/configs/actux3.h            |    2 +-
 include/configs/actux4.h            |    2 +-
 include/configs/ads5121.h           |    2 +-
 include/configs/aev.h               |    2 +-
 include/configs/alpr.h              |    2 +-
 include/configs/armadillo.h         |    2 +-
 include/configs/assabet.h           |    4 ++--
 include/configs/at91cap9adk.h       |    2 +-
 include/configs/at91rm9200dk.h      |    2 +-
 include/configs/atc.h               |    2 +-
 include/configs/atngw100.h          |    2 +-
 include/configs/atstk1002.h         |    2 +-
 include/configs/atstk1003.h         |    2 +-
 include/configs/atstk1004.h         |    2 +-
 include/configs/atstk1006.h         |    2 +-
 include/configs/bamboo.h            |    6 +++---
 include/configs/barco.h             |    2 +-
 include/configs/bf533-ezkit.h       |    2 +-
 include/configs/bf533-stamp.h       |    2 +-
 include/configs/bf537-stamp.h       |    2 +-
 include/configs/bf561-ezkit.h       |    2 +-
 include/configs/bubinga.h           |    6 +++---
 include/configs/c2mon.h             |    2 +-
 include/configs/canmb.h             |    2 +-
 include/configs/canyonlands.h       |    6 +++---
 include/configs/cerf250.h           |    2 +-
 include/configs/cm5200.h            |    2 +-
 include/configs/cmc_pu2.h           |    2 +-
 include/configs/cmi_mpc5xx.h        |    4 ++--
 include/configs/cobra5272.h         |    4 ++--
 include/configs/cogent_mpc8260.h    |    2 +-
 include/configs/cogent_mpc8xx.h     |    2 +-
 include/configs/cpci5200.h          |    2 +-
 include/configs/cradle.h            |    2 +-
 include/configs/csb226.h            |    2 +-
 include/configs/csb272.h            |    4 ++--
 include/configs/csb472.h            |    4 ++--
 include/configs/csb637.h            |    2 +-
 include/configs/davinci_dvevm.h     |    4 ++--
 include/configs/davinci_schmoogie.h |    2 +-
 include/configs/davinci_sffsdr.h    |    2 +-
 include/configs/davinci_sonata.h    |    4 ++--
 include/configs/dnp1110.h           |    2 +-
 include/configs/eXalion.h           |    2 +-
 include/configs/ebony.h             |    6 +++---
 include/configs/ep7312.h            |    2 +-
 include/configs/ep8248.h            |    6 +++---
 include/configs/ep8260.h            |    2 +-
 include/configs/ep82xxm.h           |    6 +++---
 include/configs/evb4510.h           |    2 +-
 include/configs/favr-32-ezkit.h     |    2 +-
 include/configs/gcplus.h            |    2 +-
 include/configs/gr_cpci_ax2000.h    |    2 +-
 include/configs/gr_ep2s60.h         |    2 +-
 include/configs/gr_xc3s_1500.h      |    2 +-
 include/configs/grsim.h             |    2 +-
 include/configs/grsim_leon2.h       |    2 +-
 include/configs/gw8260.h            |    2 +-
 include/configs/hammerhead.h        |    2 +-
 include/configs/hcu4.h              |    4 ++--
 include/configs/hcu5.h              |    4 ++--
 include/configs/hermes.h            |    2 +-
 include/configs/hmi1001.h           |    2 +-
 include/configs/hymod.h             |    2 +-
 include/configs/idmr.h              |    4 ++--
 include/configs/impa7.h             |    2 +-
 include/configs/imx31_litekit.h     |    2 +-
 include/configs/incaip.h            |    2 +-
 include/configs/inka4x0.h           |    2 +-
 include/configs/integratorcp.h      |    2 +-
 include/configs/ixdp425.h           |    2 +-
 include/configs/ixdpg425.h          |    2 +-
 include/configs/jupiter.h           |    2 +-
 include/configs/katmai.h            |    2 +-
 include/configs/kilauea.h           |    6 +++---
 include/configs/korat.h             |    2 +-
 include/configs/lart.h              |    2 +-
 include/configs/linkstation.h       |    2 +-
 include/configs/logodl.h            |    2 +-
 include/configs/lpc2292sodimm.h     |    2 +-
 include/configs/lpd7a400.h          |    2 +-
 include/configs/lpd7a404.h          |    2 +-
 include/configs/luan.h              |    6 +++---
 include/configs/lubbock.h           |    2 +-
 include/configs/lwmon.h             |    2 +-
 include/configs/lwmon5.h            |    2 +-
 include/configs/m501sk.h            |    2 +-
 include/configs/makalu.h            |    6 +++---
 include/configs/mcc200.h            |    2 +-
 include/configs/mcu25.h             |    4 ++--
 include/configs/mecp5200.h          |    2 +-
 include/configs/mgcoge.h            |    6 +++---
 include/configs/mgsuvd.h            |    2 +-
 include/configs/mimc200.h           |    2 +-
 include/configs/ml401.h             |    2 +-
 include/configs/ml507.h             |    2 +-
 include/configs/modnet50.h          |    2 +-
 include/configs/motionpro.h         |    2 +-
 include/configs/mp2usb.h            |    2 +-
 include/configs/mpr2.h              |    2 +-
 include/configs/ms7720se.h          |    2 +-
 include/configs/ms7722se.h          |    2 +-
 include/configs/ms7750se.h          |    2 +-
 include/configs/muas3001.h          |    6 +++---
 include/configs/mucmc52.h           |    2 +-
 include/configs/munices.h           |    2 +-
 include/configs/mx1ads.h            |    2 +-
 include/configs/mx1fs2.h            |    2 +-
 include/configs/mx31ads.h           |    2 +-
 include/configs/netstar.h           |    2 +-
 include/configs/ns9750dev.h         |    2 +-
 include/configs/o2dnt.h             |    2 +-
 include/configs/ocotea.h            |    6 +++---
 include/configs/omap1510inn.h       |    2 +-
 include/configs/omap1610h2.h        |    2 +-
 include/configs/omap1610inn.h       |    2 +-
 include/configs/omap2420h4.h        |    2 +-
 include/configs/omap5912osk.h       |    2 +-
 include/configs/omap730p2.h         |    2 +-
 include/configs/p3mx.h              |    2 +-
 include/configs/p3p440.h            |    2 +-
 include/configs/pcs440ep.h          |    6 +++---
 include/configs/pcu_e.h             |    2 +-
 include/configs/pdnb3.h             |    2 +-
 include/configs/pf5200.h            |    2 +-
 include/configs/pleb2.h             |    2 +-
 include/configs/ppmc7xx.h           |    4 ++--
 include/configs/ppmc8260.h          |    4 ++--
 include/configs/purple.h            |    2 +-
 include/configs/pxa255_idp.h        |    2 +-
 include/configs/qemu-mips.h         |    2 +-
 include/configs/quad100hd.h         |    4 ++--
 include/configs/quantum.h           |    2 +-
 include/configs/r2dplus.h           |    2 +-
 include/configs/r7780mp.h           |    2 +-
 include/configs/redwood.h           |    6 +++---
 include/configs/rmu.h               |    2 +-
 include/configs/rsdproto.h          |    2 +-
 include/configs/sacsng.h            |    2 +-
 include/configs/sbc2410x.h          |    2 +-
 include/configs/sbc405.h            |    2 +-
 include/configs/sbc8240.h           |    2 +-
 include/configs/sbc8260.h           |    2 +-
 include/configs/sbc8349.h           |    2 +-
 include/configs/sbc8548.h           |    2 +-
 include/configs/sbc8560.h           |    2 +-
 include/configs/sbc8641d.h          |    2 +-
 include/configs/sc3.h               |    4 ++--
 include/configs/sc520_spunk.h       |    2 +-
 include/configs/scb9328.h           |    2 +-
 include/configs/sequoia.h           |    4 ++--
 include/configs/sh7763rdp.h         |    2 +-
 include/configs/shannon.h           |    2 +-
 include/configs/smdk2400.h          |    2 +-
 include/configs/smdk2410.h          |    2 +-
 include/configs/smmaco4.h           |    2 +-
 include/configs/socrates.h          |    2 +-
 include/configs/sorcery.h           |    8 ++++----
 include/configs/spc1920.h           |    2 +-
 include/configs/spieval.h           |    2 +-
 include/configs/stxgp3.h            |    2 +-
 include/configs/stxssa.h            |    2 +-
 include/configs/stxxtc.h            |    2 +-
 include/configs/svm_sc8xx.h         |    2 +-
 include/configs/taihu.h             |    6 +++---
 include/configs/taishan.h           |    2 +-
 include/configs/tb0229.h            |    2 +-
 include/configs/trab.h              |    2 +-
 include/configs/trizepsiv.h         |    2 +-
 include/configs/uc100.h             |    2 +-
 include/configs/uc101.h             |    2 +-
 include/configs/utx8245.h           |    2 +-
 include/configs/v38b.h              |    2 +-
 include/configs/versatile.h         |    2 +-
 include/configs/virtlab2.h          |    2 +-
 include/configs/voiceblue.h         |    2 +-
 include/configs/walnut.h            |    6 +++---
 include/configs/wepep250.h          |    2 +-
 include/configs/xaeniax.h           |    2 +-
 include/configs/xm250.h             |    2 +-
 include/configs/xsengine.h          |    2 +-
 include/configs/yosemite.h          |    6 +++---
 include/configs/yucca.h             |    6 +++---
 include/configs/zeus.h              |    4 ++--
 include/environment.h               |    4 ++--
 tools/envcrc.c                      |    4 ++--
 tools/updater/flash_hw.c            |    2 +-
 458 files changed, 586 insertions(+), 586 deletions(-)

due to ML limitation (patch size 267K)

http://git.denx.de/?p=u-boot/u-boot-arm.git;a=commit;h=78cf54767938d7dfcefe206a45b2bd4edfa4ce6d
and in raw
http://git.denx.de/?p=u-boot/u-boot-arm.git;a=commitdiff_plain;h=78cf54767938d7dfcefe206a45b2bd4edfa4ce6d

Best Regards,
J.

#23 lore raw

PATCH 23/25 env_flash: Move conditional compilation to Makefile

---
 common/Makefile    |    2 +-
 common/env_flash.c |    5 -----
 2 files changed, 1 insertions(+), 6 deletions(-)
common/Makefile +1 -1
index 9074f93..00e9551 100644
@@ -52,7 +52,7 @@ COBJS-y += env_common.o
 COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o
 COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
 COBJS-y += env_embedded.o
-COBJS-y += env_flash.o
+COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
 COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
 COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o
 COBJS-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o
common/env_flash.c +0 -5
index c287b17..84166af 100644
@@ -27,9 +27,6 @@
 /* #define DEBUG */
 
 #include <common.h>
-
-#if defined(CONFIG_ENV_IS_IN_FLASH) /* Environment is in Flash */
-
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
@@ -383,5 +380,3 @@ void env_relocate_spec (void)
 #endif
 #endif /* ! ENV_IS_EMBEDDED || CFG_ENV_ADDR_REDUND */
 }
-
-#endif /* CONFIG_ENV_IS_IN_FLASH */
Signature · 1 line
1.5.6.3
#24 lore raw

PATCH 24/25 move cmd_get_data_size to command.c

add CMD_DATA_SIZE macro to enable it

---
 board/amcc/yucca/cmd_yucca.c |    2 --
 common/cmd_i2c.c             |    1 -
 common/cmd_itest.c           |    2 --
 common/cmd_mem.c             |   29 -----------------------------
 common/cmd_pci.c             |    2 --
 common/cmd_portio.c          |    2 --
 common/command.c             |   24 ++++++++++++++++++++++++
 include/command.h            |    9 +++++++++
 8 files changed, 33 insertions(+), 38 deletions(-)
board/amcc/yucca/cmd_yucca.c +0 -2
index e698b20..bd42c5d 100644
@@ -33,8 +33,6 @@ extern void print_evb440spe_info(void);
 static int setBootStrapClock(cmd_tbl_t *cmdtp, int incrflag,
 		int flag, int argc, char *argv[]);
 
-extern int cmd_get_data_size(char* arg, int default_size);
-
 /* ------------------------------------------------------------------------- */
 int do_evb440spe(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
common/cmd_i2c.c +0 -1
index 91bf25b..ef3928e 100644
@@ -127,7 +127,6 @@ static uchar i2c_no_probes[] = CFG_I2C_NOPROBES;
 
 static int
 mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[]);
-extern int cmd_get_data_size(char* arg, int default_size);
 
 /*
  * Syntax:
common/cmd_itest.c +0 -2
index ce98872..9e77fa9 100644
@@ -64,8 +64,6 @@ op_tbl_t op_table [] = {
 
 #define op_tbl_size (sizeof(op_table)/sizeof(op_table[0]))
 
-extern int cmd_get_data_size(char* arg, int default_size);
-
 static long evalexp(char *s, int w)
 {
 	long l, *p;
common/cmd_mem.c +0 -29
index 4766c24..c17cae7 100644
@@ -37,35 +37,6 @@
 #endif
 #include <watchdog.h>
 
-#if defined(CONFIG_CMD_MEMORY)		\
-    || defined(CONFIG_CMD_I2C)		\
-    || defined(CONFIG_CMD_ITEST)	\
-    || defined(CONFIG_CMD_PCI)		\
-    || defined(CONFIG_CMD_PORTIO)
-
-int cmd_get_data_size(char* arg, int default_size)
-{
-	/* Check for a size specification .b, .w or .l.
-	 */
-	int len = strlen(arg);
-	if (len > 2 && arg[len-2] == '.') {
-		switch(arg[len-1]) {
-		case 'b':
-			return 1;
-		case 'w':
-			return 2;
-		case 'l':
-			return 4;
-		case 's':
-			return -2;
-		default:
-			return -1;
-		}
-	}
-	return default_size;
-}
-#endif
-
 #if defined(CONFIG_CMD_MEMORY)
 
 #ifdef	CMD_MEM_DEBUG
common/cmd_pci.c +0 -2
index 8968701..b2aa833 100644
@@ -35,8 +35,6 @@
 #include <asm/io.h>
 #include <pci.h>
 
-extern int cmd_get_data_size(char* arg, int default_size);
-
 unsigned char	ShortPCIListing = 1;
 
 /*
common/cmd_portio.c +0 -2
index a06cac0..c88fcd5 100644
@@ -30,8 +30,6 @@
 #include <common.h>
 #include <command.h>
 
-extern int cmd_get_data_size (char *arg, int default_size);
-
 /* Display values from last command.
  * Memory modify remembered values are different from display memory.
  */
common/command.c +24 -0
index 861796d..aca57b2 100644
@@ -654,3 +654,27 @@ int cmd_auto_complete(const char *const prompt, char *buf, int *np, int *colp)
 }
 
 #endif
+
+#ifdef CMD_DATA_SIZE
+int cmd_get_data_size(char* arg, int default_size)
+{
+	/* Check for a size specification .b, .w or .l.
+	 */
+	int len = strlen(arg);
+	if (len > 2 && arg[len-2] == '.') {
+		switch(arg[len-1]) {
+		case 'b':
+			return 1;
+		case 'w':
+			return 2;
+		case 'l':
+			return 4;
+		case 's':
+			return -2;
+		default:
+			return -1;
+		}
+	}
+	return default_size;
+}
+#endif
include/command.h +9 -0
index 4a27e97..8daa45f 100644
@@ -100,4 +100,13 @@ cmd_tbl_t __u_boot_cmd_##name Struct_Section = {#name, maxargs, rep, cmd, usage}
 
 #endif	/* CFG_LONGHELP */
 
+#if defined(CONFIG_CMD_MEMORY)		\
+    || defined(CONFIG_CMD_I2C)		\
+    || defined(CONFIG_CMD_ITEST)	\
+    || defined(CONFIG_CMD_PCI)		\
+    || defined(CONFIG_CMD_PORTIO)
+#define CMD_DATA_SIZE
+int cmd_get_data_size(char* arg, int default_size);
+#endif
+
 #endif	/* __COMMAND_H */
Signature · 1 line
1.5.6.3
#25 lore raw

PATCH 25/25 cmd_mem: Move conditional compilation to Makefile

---
 common/Makefile  |    2 +-
 common/cmd_mem.c |    6 ------
 2 files changed, 1 insertions(+), 7 deletions(-)
common/Makefile +1 -1
index 00e9551..c4a11de 100644
@@ -111,7 +111,7 @@ COBJS-$(CONFIG_CMD_LICENSE) += cmd_license.o
 COBJS-y += cmd_load.o
 COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o
 COBJS-$(CONFIG_ID_EEPROM) += cmd_mac.o
-COBJS-y += cmd_mem.o
+COBJS-$(CONFIG_CMD_MEMORY) += cmd_mem.o
 COBJS-$(CONFIG_CMD_MFSL) += cmd_mfsl.o
 COBJS-$(CONFIG_MII)$(CONFIG_CMD_MII) += miiphyutil.o
 COBJS-$(CONFIG_CMD_MII) += cmd_mii.o
common/cmd_mem.c +0 -6
index c17cae7..07b08fb 100644
@@ -37,8 +37,6 @@
 #endif
 #include <watchdog.h>
 
-#if defined(CONFIG_CMD_MEMORY)
-
 #ifdef	CMD_MEM_DEBUG
 #define	PRINTF(fmt,args...)	printf (fmt ,##args)
 #else
@@ -1198,7 +1196,6 @@ int do_unzip ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 
 /**************************************************/
-#if defined(CONFIG_CMD_MEMORY)
 U_BOOT_CMD(
 	md,	3,	1,	do_mem_md,
 	"md	- memory display\n",
@@ -1307,6 +1304,3 @@ U_BOOT_CMD(
 	"srcaddr dstaddr [dstsize]\n"
 );
 #endif /* CONFIG_CMD_UNZIP */
-
-#endif
-#endif
Signature · 1 line
1.5.6.3
#26 lore raw

PATCH 1/1 nvedit: rename error comment to CONFIG_ENV_IS_IN_

---
 common/cmd_nvedit.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
common/cmd_nvedit.c +1 -1
index f5b93df..f449715 100644
@@ -60,7 +60,7 @@ DECLARE_GLOBAL_DATA_PTR;
     !defined(CONFIG_ENV_IS_IN_ONENAND)	&& \
     !defined(CONFIG_ENV_IS_IN_SPI_FLASH)	&& \
     !defined(CONFIG_ENV_IS_NOWHERE)
-# error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE}
+# error Define one of CONFIG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE}
 #endif
 
 #define XMK_STR(x)	#x
Signature · 1 line
1.5.6.3
#27 lore raw

PATCH 1/1 nvedit: rename error comment to CONFIG_ENV_IS_IN_

Dear Jean-Christophe PLAGNIOL-VILLARD,

Quoted 10 lines · In message <[email protected]> you wrote:
---
 common/cmd_nvedit.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
common/cmd_nvedit.c +0 -0
index f5b93df..f449715 100644

common/cmd_nvedit.c DECLARE_GLOBAL_DATA_PTR; · line 64

Quoted 6 lines
common/cmd_nvedit.c +1 -1
@@ -60,7 +60,7 @@ DECLARE_GLOBAL_DATA_PTR;
     !defined(CONFIG_ENV_IS_IN_ONENAND)	&& \
     !defined(CONFIG_ENV_IS_IN_SPI_FLASH)	&& \
     !defined(CONFIG_ENV_IS_NOWHERE)
-# error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE}
+# error Define one of CONFIG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE}
 #endif

Sorry:

Applying nvedit: rename error comment to CONFIG_ENV_IS_IN_
error: patch failed: common/cmd_nvedit.c:60
error: common/cmd_nvedit.c: patch does not apply
fatal: sha1 information is lacking or useless (common/cmd_nvedit.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge.
Patch failed at 0001.

Please rebase and resubmit.

Best regards,

Wolfgang Denk

Signature · 7 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"There's always been Tower of Babel sort of  bickering  inside  Unix,
but  this  is the most extreme form ever. This means at least several
years of confusion." - Bill Gates, founder and chairman of Microsoft,
about the Open Systems Foundation