Patchwork [U-Boot,v3,23/23] keymile-common.h: remove IO mux stuff

login
register
mail settings
Submitter Heiko Schocher
Date March 21, 2011, 7:02 a.m.
Message ID <1300690939-31511-24-git-send-email-hs@denx.de>
Download mbox | patch
Permalink /patch/87705/
State Superseded
Headers show

Comments

Heiko Schocher - March 21, 2011, 7:02 a.m.
From: Holger Brunck <holger.brunck@keymile.com>

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>
---
Changes for v2:
  - fix checkpatch.pl errors and warnings
Changes for v3:
  - rebased only

 include/configs/keymile-common.h |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

Patch

diff --git a/include/configs/keymile-common.h b/include/configs/keymile-common.h
index e9a97b7..cb6d0fb 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"		\
 	""