diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-09-05 09:19:30 +0200 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-09-10 21:09:38 +0200 |
| commit | bb1f8b4f8bb0bfce52e0faa4637b975b745824b3 (patch) | |
| tree | 41ed6f454bbd33bdfa485fcc427ea8e9af5cf114 /common | |
| parent | 32628c5008105a732212003d83b75f05e5243bb2 (diff) | |
| download | u-boot-imx-bb1f8b4f8bb0bfce52e0faa4637b975b745824b3.zip u-boot-imx-bb1f8b4f8bb0bfce52e0faa4637b975b745824b3.tar.gz u-boot-imx-bb1f8b4f8bb0bfce52e0faa4637b975b745824b3.tar.bz2 | |
rename CFG_ENV_IS_IN_EEPROM in CONFIG_ENV_IS_IN_EEPROM
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_eeprom.c | 4 | ||||
| -rw-r--r-- | common/cmd_nvedit.c | 6 | ||||
| -rw-r--r-- | common/env_eeprom.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c index e5000e9..5034b5e 100644 --- a/common/cmd_eeprom.c +++ b/common/cmd_eeprom.c @@ -42,7 +42,7 @@ #include <command.h> #include <i2c.h> -#if defined(CFG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM) +#if defined(CONFIG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM) extern void eeprom_init (void); extern int eeprom_read (unsigned dev_addr, unsigned offset, @@ -121,7 +121,7 @@ int do_eeprom ( cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) * 0x00000nxx for EEPROM address selectors and page number at n. */ -#if defined(CFG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM) +#if defined(CONFIG_ENV_IS_IN_EEPROM) || defined(CONFIG_CMD_EEPROM) #ifndef CONFIG_SPI #if !defined(CFG_I2C_EEPROM_ADDR_LEN) || CFG_I2C_EEPROM_ADDR_LEN < 1 || CFG_I2C_EEPROM_ADDR_LEN > 2 diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 7089706..8b6b46b 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -53,7 +53,7 @@ DECLARE_GLOBAL_DATA_PTR; #if !defined(CFG_ENV_IS_IN_NVRAM) && \ - !defined(CFG_ENV_IS_IN_EEPROM) && \ + !defined(CONFIG_ENV_IS_IN_EEPROM) && \ !defined(CFG_ENV_IS_IN_FLASH) && \ !defined(CFG_ENV_IS_IN_DATAFLASH) && \ !defined(CFG_ENV_IS_IN_NAND) && \ @@ -540,7 +540,7 @@ int getenv_r (char *name, char *buf, unsigned len) return (-1); } -#if ((defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) \ +#if ((defined(CFG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \ || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \ || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \ || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \ @@ -596,7 +596,7 @@ U_BOOT_CMD( " - delete environment variable 'name'\n" ); -#if ((defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) \ +#if ((defined(CFG_ENV_IS_IN_NVRAM) || defined(CONFIG_ENV_IS_IN_EEPROM) \ || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \ || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \ || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \ diff --git a/common/env_eeprom.c b/common/env_eeprom.c index 9e1a201..1a03f43 100644 --- a/common/env_eeprom.c +++ b/common/env_eeprom.c @@ -26,7 +26,7 @@ #include <common.h> -#if defined(CFG_ENV_IS_IN_EEPROM) /* Environment is in EEPROM */ +#if defined(CONFIG_ENV_IS_IN_EEPROM) /* Environment is in EEPROM */ #include <command.h> #include <environment.h> @@ -107,4 +107,4 @@ int env_init(void) return (0); } -#endif /* CFG_ENV_IS_IN_EEPROM */ +#endif /* CONFIG_ENV_IS_IN_EEPROM */ |