From a7090b993d3d4d2221ac3f33e6cb1d1b2ccc6bf0 Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@denx.de>
Date: Tue, 13 Mar 2007 16:05:55 +0100
Subject: Make SC3 board build with 'make O='; use 'addcons' consistently (SC3
 and Jupiter used to use 'addcon' instead).

Signed-off-by: Wolfgang Denk wd@denx.de
---
 include/configs/jupiter.h | 6 +++---
 include/configs/sc3.h     | 9 ++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'include')

diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index 64dbd9b9f9..5b97526fc4 100644
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -116,14 +116,14 @@
 	"addip=setenv bootargs ${bootargs} "				\
 		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"	\
 		":${hostname}:${netdev}:off panic=1\0"			\
-	"flash_nfs=run nfsargs addip addcon;"				\
+	"flash_nfs=run nfsargs addip addcons;"				\
 		"bootm ${kernel_addr}\0"				\
 	"flash_self=run ramargs addip;"					\
 		"bootm ${kernel_addr} ${ramdisk_addr}\0"		\
-	"addcon=setenv bootargs ${bootargs} console=${contyp},"		\
+	"addcons=setenv bootargs ${bootargs} console=${contyp},"	\
 		"${baudrate}\0"						\
 	"contyp=ttyS0\0"						\
-	"net_nfs=tftp 200000 ${bootfile};run nfsargs addip addcon;"	\
+	"net_nfs=tftp 200000 ${bootfile};run nfsargs addip addcons;"	\
 		"bootm\0"						\
 	"rootpath=/opt/eldk/ppc_6xx\0"					\
 	"bootfile=/tftpboot/jupiter/uImage\0"				\
diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index f2f059863d..8298084f1e 100644
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -113,10 +113,13 @@
 	"addip=setenv bootargs ${bootargs} "				\
 		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"	\
 		":${hostname}:${netdev}:off panic=1\0"			\
-	"flash_nfs=run nfsargs addip;"					\
+	"addcons=setenv bootargs ${bootargs} "				\
+		"console=ttyS0,${baudrate}\0"				\
+	"flash_nfs=run nfsargs addip addcons;"				\
 		"bootm ${kernel_addr}\0"				\
-	"flash_nand=run nand_args addip addcon;bootm ${kernel_addr}\0"	\
-	"net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"	\
+	"flash_nand=run nand_args addip addcons;bootm ${kernel_addr}\0"	\
+	"net_nfs=tftp 200000 ${bootfile};run nfsargs addip addcons;"	\
+		"bootm\0"						\
 	"rootpath=/opt/eldk/ppc_4xx\0"					\
 	"bootfile=/tftpboot/sc3/uImage\0"				\
 	"u-boot=/tftpboot/sc3/u-boot.bin\0"				\
-- 
cgit v1.2.1