diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-23 00:48:20 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-23 00:48:20 +0200 |
| commit | 46edbc545d1d0ae166271488e89c9967fb54393f (patch) | |
| tree | 90da2f5ff33a6fb194d83bea8a8ce4efd1f74e61 /include/configs/kmeter1.h | |
| parent | f15f14e52879711be1d1bba2634dec684eda722e (diff) | |
| parent | caf72ff329759b4da71352ab098537c7698c0e9f (diff) | |
| download | u-boot-imx-46edbc545d1d0ae166271488e89c9967fb54393f.zip u-boot-imx-46edbc545d1d0ae166271488e89c9967fb54393f.tar.gz u-boot-imx-46edbc545d1d0ae166271488e89c9967fb54393f.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/master/
Diffstat (limited to 'include/configs/kmeter1.h')
| -rw-r--r-- | include/configs/kmeter1.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h index 41dbd0d..7e16c56 100644 --- a/include/configs/kmeter1.h +++ b/include/configs/kmeter1.h @@ -158,7 +158,6 @@ #endif #define CONFIG_SYS_MONITOR_LEN (384 * 1024) /* Reserve 384 kB for Mon */ -#define CONFIG_SYS_MALLOC_LEN (128 * 1024) /* Reserved for malloc */ /* * Initial RAM Base Address Setup @@ -292,7 +291,6 @@ #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */ -#define CONFIG_ENV_SIZE 0x20000 #define CONFIG_ENV_OFFSET (CONFIG_SYS_MONITOR_LEN) /* Address and size of Redundant Environment Sector */ @@ -314,7 +312,6 @@ #define CONFIG_SYS_I2C_SLAVE 0x7F #define CONFIG_SYS_I2C_OFFSET 0x3000 #define CONFIG_I2C_MULTI_BUS 1 -#define CONFIG_SYS_MAX_I2C_BUS 2 #define CONFIG_I2C_MUX 1 /* EEprom support */ @@ -326,7 +323,7 @@ #define CONFIG_SYS_DTT_MAX_TEMP 70 #define CONFIG_SYS_DTT_LOW_TEMP -30 #define CONFIG_SYS_DTT_HYSTERESIS 3 -#define CONFIG_SYS_DTT_BUS_NUM (2) +#define CONFIG_SYS_DTT_BUS_NUM (CONFIG_SYS_MAX_I2C_BUS) #if defined(CONFIG_PCI) #define CONFIG_CMD_PCI @@ -433,7 +430,7 @@ #define CONFIG_PRAM 512 /* protected RAM [KBytes] */ -#define MTDIDS_DEFAULT "nor0=app" +#define MTDIDS_DEFAULT "nor2=app" #define MTDPARTS_DEFAULT \ "mtdparts=app:256k(u-boot),128k(env),128k(envred)," \ "1536k(esw0),8704k(rootfs0),1536k(esw1),2432k(rootfs1),640k(var),768k(cfg)" |