diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-09-12 16:13:12 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-09-12 16:13:12 +0200 |
| commit | afbc526336447a7357e9c82852df0377d09a8089 (patch) | |
| tree | 63360d749d3f02916a1239b3862c68d41d3f3d19 /include/configs/ML2.h | |
| parent | b476b032562aae5a09985f7e22232a5ee7042746 (diff) | |
| parent | deeec4991a55de243787002ede24d2331d234fc8 (diff) | |
| download | talos-obmc-uboot-afbc526336447a7357e9c82852df0377d09a8089.tar.gz talos-obmc-uboot-afbc526336447a7357e9c82852df0377d09a8089.zip | |
Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/ML2.h')
| -rw-r--r-- | include/configs/ML2.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/include/configs/ML2.h b/include/configs/ML2.h index 66dae21924..11323dbe84 100644 --- a/include/configs/ML2.h +++ b/include/configs/ML2.h @@ -31,13 +31,13 @@ #define CONFIG_ML2 1 /* ...on a ML2 board */ -#define CFG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_IS_IN_FLASH 1 -#ifdef CFG_ENV_IS_IN_NVRAM -#undef CFG_ENV_IS_IN_FLASH +#ifdef CONFIG_ENV_IS_IN_NVRAM +#undef CONFIG_ENV_IS_IN_FLASH #else -#ifdef CFG_ENV_IS_IN_FLASH -#undef CFG_ENV_IS_IN_NVRAM +#ifdef CONFIG_ENV_IS_IN_FLASH +#undef CONFIG_ENV_IS_IN_NVRAM #endif #endif @@ -184,10 +184,10 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ /* BEG ENVIRONNEMENT FLASH */ -#ifdef CFG_ENV_IS_IN_FLASH -#define CFG_ENV_OFFSET 0x00050000 /* Offset of Environment Sector */ -#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ -#define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */ +#ifdef CONFIG_ENV_IS_IN_FLASH +#define CONFIG_ENV_OFFSET 0x00050000 /* Offset of Environment Sector */ +#define CONFIG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ +#define CONFIG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */ #endif /* END ENVIRONNEMENT FLASH */ /*----------------------------------------------------------------------- @@ -196,10 +196,10 @@ #define CFG_NVRAM_BASE_ADDR 0xf0000000 /* NVRAM base address */ #define CFG_NVRAM_SIZE 0x1ff8 /* NVRAM size */ -#ifdef CFG_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 */ +#ifdef CONFIG_ENV_IS_IN_NVRAM +#define CONFIG_ENV_SIZE 0x1000 /* Size of Environment vars */ +#define CONFIG_ENV_ADDR \ + (CFG_NVRAM_BASE_ADDR+CFG_NVRAM_SIZE-CONFIG_ENV_SIZE) /* Env */ #endif /* |
