diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-09-12 16:14:28 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-09-12 16:14:28 +0200 |
| commit | 225f0eaa745adfae05931848543d99942798756a (patch) | |
| tree | f5c2b1a7ddb5f2c64063b5ef3ccae0f5ded41fb8 /include/configs/ZPC1900.h | |
| parent | 6b8be3e58e9cc1badb7a709b0f3568d4d8eca4b7 (diff) | |
| parent | afbc526336447a7357e9c82852df0377d09a8089 (diff) | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'include/configs/ZPC1900.h')
| -rw-r--r-- | include/configs/ZPC1900.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h index 388c747681..59cca0b607 100644 --- a/include/configs/ZPC1900.h +++ b/include/configs/ZPC1900.h @@ -220,16 +220,16 @@ #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(CONFIG_ENV_IS_IN_FLASH) && !defined(CONFIG_ENV_IS_IN_NVRAM) +#define CONFIG_ENV_IS_IN_NVRAM 1 #endif -#ifdef CFG_ENV_IS_IN_FLASH -# define CFG_ENV_SECT_SIZE 0x10000 -# define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#ifdef CONFIG_ENV_IS_IN_FLASH +# define CONFIG_ENV_SECT_SIZE 0x10000 +# define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #else -# define CFG_ENV_ADDR (CFG_EEPROM + 0x400) -# define CFG_ENV_SIZE 0x1000 +# define CONFIG_ENV_ADDR (CFG_EEPROM + 0x400) +# define CONFIG_ENV_SIZE 0x1000 # define CFG_NVRAM_ACCESS_ROUTINE #endif |