summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Brunck <holger.brunck@keymile.com>2011-03-04 10:16:00 +0100
committerWolfgang Denk <wd@denx.de>2011-04-30 00:45:30 +0200
commitec9a3740415ba613d0d84890fdb426e576a7eeef (patch)
tree2a44054410cd1910f7b7005dc39d95131c574fdd
parent48d9539ad2408da644f0b58c157b25a3e1d4341d (diff)
downloadblackbird-obmc-uboot-ec9a3740415ba613d0d84890fdb426e576a7eeef.tar.gz
blackbird-obmc-uboot-ec9a3740415ba613d0d84890fdb426e576a7eeef.zip
keymile-common.h: remove IO mux stuff
Signed-off-by: Holger Brunck <holger.brunck@keymile.com> cc: Wolfgang Denk <wd@denx.de> cc: Valentin Longchamp <valentin.longchamp@keymile.com> cc: Heiko Schocher <hs@denx.de>
-rw-r--r--include/configs/keymile-common.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/include/configs/keymile-common.h b/include/configs/keymile-common.h
index e9a97b7f38..cb6d0fb6c8 100644
--- a/include/configs/keymile-common.h
+++ b/include/configs/keymile-common.h
@@ -137,11 +137,6 @@
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_CONCAT
-#define CONFIG_KM_DEF_ENV_IOMUX \
- "stderr=serial \0" \
- "stdin=serial \0" \
- "stdout=serial \0"
-
/* common powerpc specific env settings */
#ifndef CONFIG_KM_DEF_ENV_BOOTPARAMS
#define CONFIG_KM_DEF_ENV_BOOTPARAMS \
@@ -428,7 +423,6 @@
#ifndef CONFIG_KM_DEF_ENV
#define CONFIG_KM_DEF_ENV \
CONFIG_KM_DEF_ENV_BOOTPARAMS \
- CONFIG_KM_DEF_ENV_IOMUX \
CONFIG_KM_DEF_NETDEV \
CONFIG_KM_DEF_ENV_CPU \
CONFIG_KM_DEF_ENV_BOOTRUNNER \
@@ -448,6 +442,9 @@
"load=tftpboot ${u-boot_addr_r} ${u-boot}\0" \
"mtdids=" MTDIDS_DEFAULT "\0" \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
+ "stderr=serial\0" \
+ "stdin=serial\0" \
+ "stdout=serial\0" \
"u-boot="xstr(CONFIG_HOSTNAME) "/u-boot.bin\0" \
"u-boot_addr_r="xstr(CONFIG_KM_KERNEL_ADDR) "\0" \
""
OpenPOWER on IntegriCloud