diff options
| author | wdenk <wdenk> | 2003-12-06 23:55:10 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-12-06 23:55:10 +0000 |
| commit | 5779d8d985d95104ad74332f5fa3cb6c67645509 (patch) | |
| tree | fe9c2bacd2e097b24c4968ae8e929bd28d74c167 /common/cmd_nvedit.c | |
| parent | 8bf3b005ddee3eee179ec961e1c2bd0693e3b79d (diff) | |
| download | u-boot-imx-5779d8d985d95104ad74332f5fa3cb6c67645509.zip u-boot-imx-5779d8d985d95104ad74332f5fa3cb6c67645509.tar.gz u-boot-imx-5779d8d985d95104ad74332f5fa3cb6c67645509.tar.bz2 | |
* Patch by Nicolas Lacressonnière, 12 Nov 2003:
update for for Atmel AT91RM9200DK development kit:
- support for environment variables in DataFlash
- Atmel DataFlash AT45DB1282 support
* Patch by Jeff Carr, 11 Nov 2003:
add support for new version of 8270 processors
* Patches by George G. Davis, 05 Nov 2003:
- only pass the ARM linux initrd tag to the kernel when an initrd
is actually present
- update omap1510inn configuration file
Diffstat (limited to 'common/cmd_nvedit.c')
| -rw-r--r-- | common/cmd_nvedit.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 53df582..a3898dd 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -49,8 +49,12 @@ #include <net.h> #endif -#if !defined(CFG_ENV_IS_IN_NVRAM) && !defined(CFG_ENV_IS_IN_EEPROM) && !defined(CFG_ENV_IS_IN_FLASH) && !defined(CFG_ENV_IS_NOWHERE) -# error Define one of CFG_ENV_IS_IN_NVRAM, CFG_ENV_IS_IN_EEPROM, CFG_ENV_IS_IN_FLASH, CFG_ENV_IS_NOWHERE +#if !defined(CFG_ENV_IS_IN_NVRAM) && \ + !defined(CFG_ENV_IS_IN_EEPROM) && \ + !defined(CFG_ENV_IS_IN_FLASH) && \ + !defined(CFG_ENV_IS_IN_DATAFLASH) && \ + !defined(CFG_ENV_IS_NOWHERE) +# error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|NOWHERE} #endif #define XMK_STR(x) #x |