Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- common/Makefile | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/Makefile b/common/Makefile index 98b4dd4..5ba4561 100644 --- a/common/Makefile +++ b/common/Makefile @@ -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

finish remaning CFG_ID_EEPROM in CONFIG_ID_EEPROM start in commit ad8f8687b78c3e917b173f038926695383c55555

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- 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(-)

diff --git a/common/Makefile b/common/Makefile index 9fa1157..3a20926 100644 --- a/common/Makefile +++ b/common/Makefile @@ -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 diff --git a/common/cmd_mac.c b/common/cmd_mac.c index faed8f7..4453299 100644 --- a/common/cmd_mac.c +++ b/common/cmd_mac.c @@ -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 */ diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 17cc934..dc304e7 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -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 diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 0c1c4fc..7c69582 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -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

diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 54a0461..a57c303 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -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

diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index ddca527..c84240e 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -179,7 +179,7 @@

#endif

-/* #define CFG_ID_EEPROM 1 +/* #define CONFIG_ID_EEPROM 1 #define ID_EEPROM_ADDR 0x57 */

/* diff --git a/lib_ppc/board.c b/lib_ppc/board.c index c8f075f..4d02eb2 100644 --- a/lib_ppc/board.c +++ b/lib_ppc/board.c @@ -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

diff --git a/lib_sparc/board.c b/lib_sparc/board.c index 205a8ca..15d6935 100644 --- a/lib_sparc/board.c +++ b/lib_sparc/board.c @@ -409,7 +409,7 @@ void board_init_f(ulong bootflag) } #endif

-#ifdef CFG_ID_EEPROM +#ifdef CONFIG_ID_EEPROM mac_read_from_eeprom(); #endif

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- common/Makefile | 2 +- common/env_eeprom.c | 5 ----- 2 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/common/Makefile b/common/Makefile index 3a20926..3f601e8 100644 --- a/common/Makefile +++ b/common/Makefile @@ -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 diff --git a/common/env_eeprom.c b/common/env_eeprom.c index 1a03f43..df3e31e 100644 --- a/common/env_eeprom.c +++ b/common/env_eeprom.c @@ -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 */

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- 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(-)

diff --git a/README b/README index 0c501cc..406cc62 100644 --- a/README +++ b/README @@ -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. diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 8b6b46b..f3d8408 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -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) && \ diff --git a/common/env_dataflash.c b/common/env_dataflash.c index 2945364..1d55a27 100644 --- a/common/env_dataflash.c +++ b/common/env_dataflash.c @@ -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 */ diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h index 520c676..acf452b 100644 --- a/include/configs/at91cap9adk.h +++ b/include/configs/at91cap9adk.h @@ -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) diff --git a/include/configs/at91rm9200dk.h b/include/configs/at91rm9200dk.h index fca431e..92724ab 100644 --- a/include/configs/at91rm9200dk.h +++ b/include/configs/at91rm9200dk.h @@ -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 */ diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 675224e..f419363 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -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) diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index e53a23f..2929149 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -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) diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 5f90d39..c91e076 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -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) diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 2ad8d05..0bf0ace 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -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) diff --git a/include/configs/csb637.h b/include/configs/csb637.h index 88c8fdb..6626524 100644 --- a/include/configs/csb637.h +++ b/include/configs/csb637.h @@ -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 */ diff --git a/include/configs/m501sk.h b/include/configs/m501sk.h index 7fc460a..7024a83 100644 --- a/include/configs/m501sk.h +++ b/include/configs/m501sk.h @@ -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

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- 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(-)

diff --git a/README b/README index 406cc62..d462b52 100644 --- a/README +++ b/README @@ -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. diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index f3d8408..dc6d13a 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -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) diff --git a/common/env_common.c b/common/env_common.c index d51c211..e89f192 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -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 diff --git a/common/env_nand.c b/common/env_nand.c index a8f0de7..53e3183 100644 --- a/common/env_nand.c +++ b/common/env_nand.c @@ -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 */ diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 95ba840..c17a2ea 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -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 diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index 071ba10..5b25323 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -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. diff --git a/include/configs/acadia.h b/include/configs/acadia.h index ed2754d..894a62b 100644 --- a/include/configs/acadia.h +++ b/include/configs/acadia.h @@ -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. diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index f419363..0ddc079 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -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 */ diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 2929149..a4a0831 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -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 */ diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index c91e076..1d24311 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -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 */ diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 0bf0ace..8162475 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -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 */ diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h index 7caa403..20ebc3f 100644 --- a/include/configs/bamboo.h +++ b/include/configs/bamboo.h @@ -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. diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h index 3b5b280..1891074 100644 --- a/include/configs/canyonlands.h +++ b/include/configs/canyonlands.h @@ -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. diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h index c27ce18..9d79e3c 100644 --- a/include/configs/davinci_dvevm.h +++ b/include/configs/davinci_dvevm.h @@ -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 diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h index 10166a1..4aed843 100644 --- a/include/configs/davinci_schmoogie.h +++ b/include/configs/davinci_schmoogie.h @@ -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 */ diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h index 7c860e5..c46a430 100644 --- a/include/configs/davinci_sffsdr.h +++ b/include/configs/davinci_sffsdr.h @@ -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 */ diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h index c55766c..9c54f08 100644 --- a/include/configs/davinci_sonata.h +++ b/include/configs/davinci_sonata.h @@ -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 */ diff --git a/include/configs/delta.h b/include/configs/delta.h index 1db962a..5a5240e 100644 --- a/include/configs/delta.h +++ b/include/configs/delta.h @@ -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 diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h index a475f97..d38e5c8 100644 --- a/include/configs/kilauea.h +++ b/include/configs/kilauea.h @@ -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. diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h index afdcba4..461362f 100644 --- a/include/configs/omap2420h4.h +++ b/include/configs/omap2420h4.h @@ -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) diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index 18675c2..d7b6d16 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -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. diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h index f0c146e..4c5602b 100644 --- a/include/configs/smdk6400.h +++ b/include/configs/smdk6400.h @@ -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) diff --git a/include/configs/zylonite.h b/include/configs/zylonite.h index 517ecb1..47ce15d 100644 --- a/include/configs/zylonite.h +++ b/include/configs/zylonite.h @@ -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 diff --git a/include/environment.h b/include/environment.h index 481ea73..047f5f0 100644 --- a/include/environment.h +++ b/include/environment.h @@ -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>

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- 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(-)

diff --git a/Makefile b/Makefile index 005da41..2d4bf14 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/README b/README index d462b52..35b8ac2 100644 --- a/README +++ b/README @@ -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 diff --git a/board/LEOX/elpt860/README.LEOX b/board/LEOX/elpt860/README.LEOX index 9052b09..25524af 100644 --- a/board/LEOX/elpt860/README.LEOX +++ b/board/LEOX/elpt860/README.LEOX @@ -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 diff --git a/board/RPXlite_dw/README b/board/RPXlite_dw/README index 28bcb31..60580c9 100644 --- a/board/RPXlite_dw/README +++ b/board/RPXlite_dw/README @@ -21,7 +21,7 @@ make distclean make RPXlite_DW_64_config make all

-2. CFG_ENV_IS_IN_FLASH/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 diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index dc6d13a..08671f2 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -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))) \ diff --git a/common/env_nvram.c b/common/env_nvram.c index fa77719..c877f00 100644 --- a/common/env_nvram.c +++ b/common/env_nvram.c @@ -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 */ diff --git a/cpu/mpc8xx/cpu_init.c b/cpu/mpc8xx/cpu_init.c index fb3414a..5c43eca 100644 --- a/cpu/mpc8xx/cpu_init.c +++ b/cpu/mpc8xx/cpu_init.c @@ -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

diff --git a/include/configs/ADCIOP.h b/include/configs/ADCIOP.h index 5d28168..148c905 100644 --- a/include/configs/ADCIOP.h +++ b/include/configs/ADCIOP.h @@ -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 */ diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h index baa9741..f0e0282 100644 --- a/include/configs/AP1000.h +++ b/include/configs/AP1000.h @@ -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 */ diff --git a/include/configs/Alaska8220.h b/include/configs/Alaska8220.h index 0c2e6ae..3d4cd36 100644 --- a/include/configs/Alaska8220.h +++ b/include/configs/Alaska8220.h @@ -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

diff --git a/include/configs/AmigaOneG3SE.h b/include/configs/AmigaOneG3SE.h index 84efd2f..17f5909 100644 --- a/include/configs/AmigaOneG3SE.h +++ b/include/configs/AmigaOneG3SE.h @@ -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. diff --git a/include/configs/BAB7xx.h b/include/configs/BAB7xx.h index 26a1a2d..c19f1e9 100644 --- a/include/configs/BAB7xx.h +++ b/include/configs/BAB7xx.h @@ -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) */ /* diff --git a/include/configs/BMW.h b/include/configs/BMW.h index 11d19c6..5ba3e6d 100644 --- a/include/configs/BMW.h +++ b/include/configs/BMW.h @@ -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 */ diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h index bc514b0..9a076ba 100644 --- a/include/configs/CPCI405.h +++ b/include/configs/CPCI405.h @@ -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 */ diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index 04a8030..32bd9a1 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -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 */ diff --git a/include/configs/CPCI405DT.h b/include/configs/CPCI405DT.h index 6c5a3fe..53228c1 100644 --- a/include/configs/CPCI405DT.h +++ b/include/configs/CPCI405DT.h @@ -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 */ diff --git a/include/configs/ELPPC.h b/include/configs/ELPPC.h index c64537f..8c68400 100644 --- a/include/configs/ELPPC.h +++ b/include/configs/ELPPC.h @@ -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 diff --git a/include/configs/ELPT860.h b/include/configs/ELPT860.h index 828dd9f..b917806 100644 --- a/include/configs/ELPT860.h +++ b/include/configs/ELPT860.h @@ -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 diff --git a/include/configs/ERIC.h b/include/configs/ERIC.h index dfbbc95..c699855 100644 --- a/include/configs/ERIC.h +++ b/include/configs/ERIC.h @@ -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 */ diff --git a/include/configs/EXBITGEN.h b/include/configs/EXBITGEN.h index cee0be4..4193492 100644 --- a/include/configs/EXBITGEN.h +++ b/include/configs/EXBITGEN.h @@ -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 */ diff --git a/include/configs/IP860.h b/include/configs/IP860.h index 67f8833..63e7e5d 100644 --- a/include/configs/IP860.h +++ b/include/configs/IP860.h @@ -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 */ diff --git a/include/configs/JSE.h b/include/configs/JSE.h index b08301e..fccf880 100644 --- a/include/configs/JSE.h +++ b/include/configs/JSE.h @@ -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 diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h index 5b21b90..7208444 100644 --- a/include/configs/KAREF.h +++ b/include/configs/KAREF.h @@ -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 */ diff --git a/include/configs/MBX.h b/include/configs/MBX.h index d9f2add..44e1861 100644 --- a/include/configs/MBX.h +++ b/include/configs/MBX.h @@ -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

diff --git a/include/configs/MBX860T.h b/include/configs/MBX860T.h index 3b88507..4a537e8 100644 --- a/include/configs/MBX860T.h +++ b/include/configs/MBX860T.h @@ -143,7 +143,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

diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h index 2afb3ff..fdb840e 100644 --- a/include/configs/METROBOX.h +++ b/include/configs/METROBOX.h @@ -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 */ diff --git a/include/configs/ML2.h b/include/configs/ML2.h index 66dae21..3ce1807 100644 --- a/include/configs/ML2.h +++ b/include/configs/ML2.h @@ -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 */ diff --git a/include/configs/MOUSSE.h b/include/configs/MOUSSE.h index 021729b..4052e78 100644 --- a/include/configs/MOUSSE.h +++ b/include/configs/MOUSSE.h @@ -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 */ diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h index 59d0bdb..735cfaa 100644 --- a/include/configs/MPC8260ADS.h +++ b/include/configs/MPC8260ADS.h @@ -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 */ diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h index 3659002..4429e99 100644 --- a/include/configs/MPC8266ADS.h +++ b/include/configs/MPC8266ADS.h @@ -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 */ diff --git a/include/configs/OCRTC.h b/include/configs/OCRTC.h index c561e15..f839ead 100644 --- a/include/configs/OCRTC.h +++ b/include/configs/OCRTC.h @@ -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 */ diff --git a/include/configs/ORSG.h b/include/configs/ORSG.h index fd14088..18f14bc 100644 --- a/include/configs/ORSG.h +++ b/include/configs/ORSG.h @@ -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 */ diff --git a/include/configs/PCI405.h b/include/configs/PCI405.h index dea59b6..6c6a470 100644 --- a/include/configs/PCI405.h +++ b/include/configs/PCI405.h @@ -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 */ diff --git a/include/configs/QS860T.h b/include/configs/QS860T.h index c980901..9dfceef 100644 --- a/include/configs/QS860T.h +++ b/include/configs/QS860T.h @@ -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

diff --git a/include/configs/RPXClassic.h b/include/configs/RPXClassic.h index 706e2aa..3762391 100644 --- a/include/configs/RPXClassic.h +++ b/include/configs/RPXClassic.h @@ -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 diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h index faae407..d135818 100644 --- a/include/configs/RPXlite_DW.h +++ b/include/configs/RPXlite_DW.h @@ -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)))

diff --git a/include/configs/RPXsuper.h b/include/configs/RPXsuper.h index dfadd2a..2a9c627 100644 --- a/include/configs/RPXsuper.h +++ b/include/configs/RPXsuper.h @@ -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 */ diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h index bb6b6b9..d4ec03e 100644 --- a/include/configs/W7OLMC.h +++ b/include/configs/W7OLMC.h @@ -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 */ diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h index 3050caf..ac52e39 100644 --- a/include/configs/W7OLMG.h +++ b/include/configs/W7OLMG.h @@ -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 */ diff --git a/include/configs/Yukon8220.h b/include/configs/Yukon8220.h index 60f2343..9ace43e 100644 --- a/include/configs/Yukon8220.h +++ b/include/configs/Yukon8220.h @@ -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

diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h index 388c747..4217900 100644 --- a/include/configs/ZPC1900.h +++ b/include/configs/ZPC1900.h @@ -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 diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h index acce82f..4b42f8b 100644 --- a/include/configs/bubinga.h +++ b/include/configs/bubinga.h @@ -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 */ diff --git a/include/configs/csb272.h b/include/configs/csb272.h index 701d3c8..880bee8 100644 --- a/include/configs/csb272.h +++ b/include/configs/csb272.h @@ -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

/* diff --git a/include/configs/csb472.h b/include/configs/csb472.h index 4fef2f6..e343632 100644 --- a/include/configs/csb472.h +++ b/include/configs/csb472.h @@ -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

/* diff --git a/include/configs/debris.h b/include/configs/debris.h index 7667e5e..68c9e54 100644 --- a/include/configs/debris.h +++ b/include/configs/debris.h @@ -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 at the start of NVRAM */ diff --git a/include/configs/ebony.h b/include/configs/ebony.h index df444d8..21c0866 100644 --- a/include/configs/ebony.h +++ b/include/configs/ebony.h @@ -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 diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h index 0ce6b80..094a14c 100644 --- a/include/configs/ep8260.h +++ b/include/configs/ep8260.h @@ -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 */ diff --git a/include/configs/hcu4.h b/include/configs/hcu4.h index f03f9b9..0dd9787 100644 --- a/include/configs/hcu4.h +++ b/include/configs/hcu4.h @@ -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

diff --git a/include/configs/hcu5.h b/include/configs/hcu5.h index d274223..0796a7d 100644 --- a/include/configs/hcu5.h +++ b/include/configs/hcu5.h @@ -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 diff --git a/include/configs/kvme080.h b/include/configs/kvme080.h index 819e456..7d903aa 100644 --- a/include/configs/kvme080.h +++ b/include/configs/kvme080.h @@ -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 diff --git a/include/configs/mcu25.h b/include/configs/mcu25.h index d146537..5c234df 100644 --- a/include/configs/mcu25.h +++ b/include/configs/mcu25.h @@ -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

diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h index d379b1f..7fd06a6 100644 --- a/include/configs/mpc7448hpc2.h +++ b/include/configs/mpc7448hpc2.h @@ -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 */ diff --git a/include/configs/ocotea.h b/include/configs/ocotea.h index 407aae7..e8549e9 100644 --- a/include/configs/ocotea.h +++ b/include/configs/ocotea.h @@ -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 diff --git a/include/configs/redwood.h b/include/configs/redwood.h index ebb2921..b791589 100644 --- a/include/configs/redwood.h +++ b/include/configs/redwood.h @@ -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 */

diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h index 8427752..5c6ddc6 100644 --- a/include/configs/sacsng.h +++ b/include/configs/sacsng.h @@ -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 */ diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h index b92344c..6068c23 100644 --- a/include/configs/sbc8260.h +++ b/include/configs/sbc8260.h @@ -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 */ diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h index 0d07560..b4da4ce 100644 --- a/include/configs/sorcery.h +++ b/include/configs/sorcery.h @@ -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

diff --git a/include/configs/taihu.h b/include/configs/taihu.h index 86f776d..2ef4545 100644 --- a/include/configs/taihu.h +++ b/include/configs/taihu.h @@ -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*/ diff --git a/include/configs/v37.h b/include/configs/v37.h index 751d702..7e5f804 100644 --- a/include/configs/v37.h +++ b/include/configs/v37.h @@ -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 */

diff --git a/include/configs/walnut.h b/include/configs/walnut.h index e19c5f3..4eecf77 100644 --- a/include/configs/walnut.h +++ b/include/configs/walnut.h @@ -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 */ diff --git a/include/configs/yucca.h b/include/configs/yucca.h index 0c09a1d..9ccd308 100644 --- a/include/configs/yucca.h +++ b/include/configs/yucca.h @@ -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 diff --git a/lib_m68k/board.c b/lib_m68k/board.c index d0e63b6..4e566d5 100644 --- a/lib_m68k/board.c +++ b/lib_m68k/board.c @@ -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 diff --git a/lib_mips/board.c b/lib_mips/board.c index 09b8b3b..64ca200 100644 --- a/lib_mips/board.c +++ b/lib_mips/board.c @@ -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 diff --git a/lib_ppc/board.c b/lib_ppc/board.c index 1e00404..a757ffd 100644 --- a/lib_ppc/board.c +++ b/lib_ppc/board.c @@ -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

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- common/cmd_nvedit.c | 2 +- common/env_onenand.c | 4 ++-- include/configs/apollon.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 08671f2..bfd097f 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -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} diff --git a/common/env_onenand.c b/common/env_onenand.c index d5c907c..4e466ea 100644 --- a/common/env_onenand.c +++ b/common/env_onenand.c @@ -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 */ diff --git a/include/configs/apollon.h b/include/configs/apollon.h index c93e77a..6e34ddf 100644 --- a/include/configs/apollon.h +++ b/include/configs/apollon.h @@ -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 */

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- 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(-)

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index bfd097f..85d7108 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -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 diff --git a/common/env_common.c b/common/env_common.c index e89f192..36c46f0 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -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

diff --git a/common/env_sf.c b/common/env_sf.c index 9077d78..a442776 100644 --- a/common/env_sf.c +++ b/common/env_sf.c @@ -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 */ diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index 588c00c..fa1ef0b 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -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 diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index 476aba3..8b51148 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -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

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- 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(-)

diff --git a/board/xilinx/xilinx_enet/emac_adapter.c b/board/xilinx/xilinx_enet/emac_adapter.c index d340303..0b100d2 100644 --- a/board/xilinx/xilinx_enet/emac_adapter.c +++ b/board/xilinx/xilinx_enet/emac_adapter.c @@ -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

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 85d7108..fc9b94e 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -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", diff --git a/common/env_common.c b/common/env_common.c index 36c46f0..c3946f0 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -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"); diff --git a/common/env_nowhere.c b/common/env_nowhere.c index 17ecc77..8dd4867 100644 --- a/common/env_nowhere.c +++ b/common/env_nowhere.c @@ -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) */ diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index 9ba4096..88cd0f9 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c @@ -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]; diff --git a/include/configs/ADNPESC1.h b/include/configs/ADNPESC1.h index 01ee72b..cc91c8d 100644 --- a/include/configs/ADNPESC1.h +++ b/include/configs/ADNPESC1.h @@ -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

/*------------------------------------------------------------------------ diff --git a/include/configs/DK1C20.h b/include/configs/DK1C20.h index fb06689..9658278 100644 --- a/include/configs/DK1C20.h +++ b/include/configs/DK1C20.h @@ -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

/*------------------------------------------------------------------------ diff --git a/include/configs/DK1S10.h b/include/configs/DK1S10.h index 7a9ef79..e5bf8c7 100644 --- a/include/configs/DK1S10.h +++ b/include/configs/DK1S10.h @@ -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

/*------------------------------------------------------------------------ diff --git a/include/configs/JSE.h b/include/configs/JSE.h index fccf880..ecc344d 100644 --- a/include/configs/JSE.h +++ b/include/configs/JSE.h @@ -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 diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index c17a2ea..776fe99 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -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 diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index 006b93a..1edd9ce 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -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 diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index 94b3d5a..308f102 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -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 diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index 401d0af..b98f3ee 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -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 diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index c8870b5..e03f5ca 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -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 diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 45ddd5c..7f5d303 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -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 diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h index 43d4118..c532eb1 100644 --- a/include/configs/MPC8360EMDS.h +++ b/include/configs/MPC8360EMDS.h @@ -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 diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h index 6898495..4701600 100644 --- a/include/configs/MPC8360ERDK.h +++ b/include/configs/MPC8360ERDK.h @@ -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 */ diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index f9c1b17..220c148 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -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 diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 82b3353..289bcfa 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -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 diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 74f8605..c23dcf6 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -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 diff --git a/include/configs/MPC8540EVAL.h b/include/configs/MPC8540EVAL.h index 1073e23..04bec2d 100644 --- a/include/configs/MPC8540EVAL.h +++ b/include/configs/MPC8540EVAL.h @@ -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 diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index a8e7c0a..f661c8e 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -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 diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 7c69582..2ee8d57 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -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 diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index a57c303..170fbd6 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -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 diff --git a/include/configs/PM854.h b/include/configs/PM854.h index aa6095f..1212bcd 100644 --- a/include/configs/PM854.h +++ b/include/configs/PM854.h @@ -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 diff --git a/include/configs/PM856.h b/include/configs/PM856.h index 244f09a..75dba3b 100644 --- a/include/configs/PM856.h +++ b/include/configs/PM856.h @@ -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 diff --git a/include/configs/PN62.h b/include/configs/PN62.h index da7d8b8..074e8a1 100644 --- a/include/configs/PN62.h +++ b/include/configs/PN62.h @@ -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 */

diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h index 93509ee..6b25d56 100644 --- a/include/configs/SBC8540.h +++ b/include/configs/SBC8540.h @@ -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 diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index e8f69f6..2ab6991 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -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 diff --git a/include/configs/cm4008.h b/include/configs/cm4008.h index ae40b35..85f45b7 100644 --- a/include/configs/cm4008.h +++ b/include/configs/cm4008.h @@ -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 diff --git a/include/configs/cm41xx.h b/include/configs/cm41xx.h index c1dd33d..f34dc5c 100644 --- a/include/configs/cm41xx.h +++ b/include/configs/cm41xx.h @@ -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 diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h index 8941c5e..d422cce 100644 --- a/include/configs/dbau1x00.h +++ b/include/configs/dbau1x00.h @@ -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 diff --git a/include/configs/evb4510.h b/include/configs/evb4510.h index 1571477..f2ed0df 100644 --- a/include/configs/evb4510.h +++ b/include/configs/evb4510.h @@ -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 */ diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h index 942609f..7fee1d2 100644 --- a/include/configs/gr_cpci_ax2000.h +++ b/include/configs/gr_cpci_ax2000.h @@ -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 diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h index ae25fb2..776fe40 100644 --- a/include/configs/gr_ep2s60.h +++ b/include/configs/gr_ep2s60.h @@ -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 diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h index f019bb4..f0f770c 100644 --- a/include/configs/gr_xc3s_1500.h +++ b/include/configs/gr_xc3s_1500.h @@ -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 diff --git a/include/configs/grsim.h b/include/configs/grsim.h index f880a7b..c6d3666 100644 --- a/include/configs/grsim.h +++ b/include/configs/grsim.h @@ -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 diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h index e5af9a6..945a163 100644 --- a/include/configs/grsim_leon2.h +++ b/include/configs/grsim_leon2.h @@ -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 diff --git a/include/configs/gth2.h b/include/configs/gth2.h index 7f7190b..ad8bb59 100644 --- a/include/configs/gth2.h +++ b/include/configs/gth2.h @@ -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 diff --git a/include/configs/hcu4.h b/include/configs/hcu4.h index 0dd9787..7f262cb 100644 --- a/include/configs/hcu4.h +++ b/include/configs/hcu4.h @@ -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 */ diff --git a/include/configs/hcu5.h b/include/configs/hcu5.h index 0796a7d..af0f7f4 100644 --- a/include/configs/hcu5.h +++ b/include/configs/hcu5.h @@ -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 */ diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index 1452bf2..77fee21 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -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 */ diff --git a/include/configs/mcu25.h b/include/configs/mcu25.h index 5c234df..35ecc65 100644 --- a/include/configs/mcu25.h +++ b/include/configs/mcu25.h @@ -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 */ diff --git a/include/configs/ml401.h b/include/configs/ml401.h index 36a42ba..c626702 100644 --- a/include/configs/ml401.h +++ b/include/configs/ml401.h @@ -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 */ diff --git a/include/configs/modnet50.h b/include/configs/modnet50.h index 5159897..84540f5 100644 --- a/include/configs/modnet50.h +++ b/include/configs/modnet50.h @@ -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 */ diff --git a/include/configs/ns9750dev.h b/include/configs/ns9750dev.h index 746a56e..b9eec62 100644 --- a/include/configs/ns9750dev.h +++ b/include/configs/ns9750dev.h @@ -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 diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h index 2caa641..4ec520f 100644 --- a/include/configs/pb1x00.h +++ b/include/configs/pb1x00.h @@ -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 diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index 261229c..264f5ab 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -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 diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h index 99d328c..f39867f 100644 --- a/include/configs/sbc8560.h +++ b/include/configs/sbc8560.h @@ -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 diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h index ea79de7..f4a8fa5 100644 --- a/include/configs/stxgp3.h +++ b/include/configs/stxgp3.h @@ -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 diff --git a/include/configs/suzaku.h b/include/configs/suzaku.h index 020ed02..5299733 100644 --- a/include/configs/suzaku.h +++ b/include/configs/suzaku.h @@ -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 */

diff --git a/include/configs/versatile.h b/include/configs/versatile.h index a88d356..f3a8b31 100644 --- a/include/configs/versatile.h +++ b/include/configs/versatile.h @@ -185,7 +185,7 @@

#define PHYS_FLASH_1 (CFG_FLASH_BASE)

-#define CFG_ENV_IS_IN_FLASH 1 /* env in flash instead of 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 */ diff --git a/include/configs/xupv2p.h b/include/configs/xupv2p.h index 570d6a8..7bd1424 100644 --- a/include/configs/xupv2p.h +++ b/include/configs/xupv2p.h @@ -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)

diff --git a/lib_avr32/board.c b/lib_avr32/board.c index d6423d4..f3d0c52 100644 --- a/lib_avr32/board.c +++ b/lib_avr32/board.c @@ -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

diff --git a/lib_m68k/board.c b/lib_m68k/board.c index 4e566d5..b8067a5 100644 --- a/lib_m68k/board.c +++ b/lib_m68k/board.c @@ -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

diff --git a/lib_mips/board.c b/lib_mips/board.c index 64ca200..fb31e33 100644 --- a/lib_mips/board.c +++ b/lib_mips/board.c @@ -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

diff --git a/lib_ppc/board.c b/lib_ppc/board.c index a757ffd..cf6239f 100644 --- a/lib_ppc/board.c +++ b/lib_ppc/board.c @@ -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

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- 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%)

diff --git a/common/Makefile b/common/Makefile index 45f856f..9074f93 100644 --- a/common/Makefile +++ b/common/Makefile @@ -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 diff --git a/common/environment.c b/common/env_embedded.c similarity index 100% rename from common/environment.c rename to common/env_embedded.c

add CMD_DATA_SIZE macro to enable it

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- 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(-)

diff --git a/board/amcc/yucca/cmd_yucca.c b/board/amcc/yucca/cmd_yucca.c index e698b20..bd42c5d 100644 --- a/board/amcc/yucca/cmd_yucca.c +++ b/board/amcc/yucca/cmd_yucca.c @@ -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[]) { diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index 91bf25b..ef3928e 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -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: diff --git a/common/cmd_itest.c b/common/cmd_itest.c index ce98872..9e77fa9 100644 --- a/common/cmd_itest.c +++ b/common/cmd_itest.c @@ -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; diff --git a/common/cmd_mem.c b/common/cmd_mem.c index 4766c24..c17cae7 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -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 diff --git a/common/cmd_pci.c b/common/cmd_pci.c index 8968701..b2aa833 100644 --- a/common/cmd_pci.c +++ b/common/cmd_pci.c @@ -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;

/* diff --git a/common/cmd_portio.c b/common/cmd_portio.c index a06cac0..c88fcd5 100644 --- a/common/cmd_portio.c +++ b/common/cmd_portio.c @@ -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. */ diff --git a/common/command.c b/common/command.c index 861796d..aca57b2 100644 --- a/common/command.c +++ b/common/command.c @@ -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 diff --git a/include/command.h b/include/command.h index 4a27e97..8daa45f 100644 --- a/include/command.h +++ b/include/command.h @@ -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 */

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagnioj@jcrosoft.com --- common/cmd_nvedit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index f5b93df..f449715 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -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