diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-09-10 22:47:59 +0200 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-09-10 22:47:59 +0200 |
| commit | 9656138ff1a34d4c4768db6b490deffc40ee674b (patch) | |
| tree | 641363f1fb29e9b27a02804bc54ab5f331001916 | |
| parent | 957a0e69575683efd70ace147746bbb3d8e7c501 (diff) | |
| download | u-boot-9656138ff1a34d4c4768db6b490deffc40ee674b.tar.gz u-boot-9656138ff1a34d4c4768db6b490deffc40ee674b.tar.xz u-boot-9656138ff1a34d4c4768db6b490deffc40ee674b.zip | |
rename CFG_ENV_IS_IN_ONENAND in CONFIG_ENV_IS_IN_ONENAND
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| -rw-r--r-- | common/cmd_nvedit.c | 2 | ||||
| -rw-r--r-- | common/env_onenand.c | 4 | ||||
| -rw-r--r-- | 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 08671f271b..bfd097f95f 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 d5c907c6f0..4e466eaa4e 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 c93e77a2e2..6e34ddfef1 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 */ |