diff options
author | Wolfgang Denk <wd@denx.de> | 2009-03-09 00:41:48 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-03-09 00:41:48 +0100 |
commit | 014c595f12d4f7e14cb10188f856465b2d41718f (patch) | |
tree | 9130a01fbb5499975530a20a559dbaba9a1f2a89 /include/configs/keymile-common.h | |
parent | 9c2d63ec0e9520948b6d598ea32e9aa4e0de847f (diff) | |
parent | f70fd13e2fe4cf58e251271c27f9c06e141d7f9a (diff) | |
download | u-boot-imx-014c595f12d4f7e14cb10188f856465b2d41718f.zip u-boot-imx-014c595f12d4f7e14cb10188f856465b2d41718f.tar.gz u-boot-imx-014c595f12d4f7e14cb10188f856465b2d41718f.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Conflicts:
lib_ppc/board.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/configs/keymile-common.h')
-rw-r--r-- | include/configs/keymile-common.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/configs/keymile-common.h b/include/configs/keymile-common.h index d70bc48..c7f6ba3 100644 --- a/include/configs/keymile-common.h +++ b/include/configs/keymile-common.h @@ -42,13 +42,9 @@ #define CONFIG_CMD_IMMAP #define CONFIG_CMD_MII #define CONFIG_CMD_PING - -/* should go away, if kmeter I2C support is enabled */ -#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD) #define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_I2C -#endif #undef CONFIG_WATCHDOG /* disable platform specific watchdog */ @@ -73,10 +69,7 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ #define CONFIG_CMDLINE_EDITING 1 /* add command line history */ -/* should go away, if kmeter I2C support is enabled */ -#if defined(CONFIG_MGCOGE) || defined(CONFIG_MGSUVD) #define CONFIG_HUSH_INIT_VAR 1 -#endif #define CONFIG_SYS_ALT_MEMTEST /* memory test, takes time */ #define CONFIG_SYS_MEMTEST_START 0x00100000 /* memtest works on */ |