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/MPC8610HPCD.h | |
parent | 6b8be3e58e9cc1badb7a709b0f3568d4d8eca4b7 (diff) | |
parent | afbc526336447a7357e9c82852df0377d09a8089 (diff) | |
download | u-boot-imx-225f0eaa745adfae05931848543d99942798756a.zip u-boot-imx-225f0eaa745adfae05931848543d99942798756a.tar.gz u-boot-imx-225f0eaa745adfae05931848543d99942798756a.tar.bz2 |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'include/configs/MPC8610HPCD.h')
-rw-r--r-- | include/configs/MPC8610HPCD.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 0c1c4fc..4eee21c 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -139,7 +139,7 @@ #define CONFIG_ID_EEPROM #define CFG_I2C_EEPROM_NXID -#define CFG_ID_EEPROM +#define CONFIG_ID_EEPROM #define CFG_I2C_EEPROM_ADDR 0x57 #define CFG_I2C_EEPROM_ADDR_LEN 1 @@ -438,14 +438,14 @@ * Environment */ #ifndef CFG_RAMBOOT -#define CFG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) -#define CFG_ENV_SECT_SIZE 0x20000 /* 126k (one sector) for env */ -#define CFG_ENV_SIZE 0x2000 +#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) +#define CONFIG_ENV_SECT_SIZE 0x20000 /* 126k (one sector) for env */ +#define CONFIG_ENV_SIZE 0x2000 #else -#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ -#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) -#define CFG_ENV_SIZE 0x2000 +#define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ +#define CONFIG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) +#define CONFIG_ENV_SIZE 0x2000 #endif #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ |