From: Holger Brunck <holger.brunck@keymile.com>
Date: Fri, 4 Mar 2011 09:16:00 +0000 (+0100)
Subject: keymile-common.h: remove IO mux stuff
X-Git-Tag: v2011.06-rc1~96
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ec9a3740415ba613d0d84890fdb426e576a7eeef;p=oweals%2Fu-boot.git

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>
---

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"		\
 	""