Fix MIPS Serial Detection

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@864 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 917e79ab18c8d2ff447ef28472f48d15164b1aac..4d552d5339c1e21363fdd8838facb78bbf58b538 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.356 2005/10/13 19:01:21 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.357 2005/10/15 01:15:53 rocket Exp $
+
+  15 Oct 2005; Eric Edgar <rocket@gentoo.org>
+  targets/support/mips-arcload_conf.sh:
+  Fix MIPS Serial Detection
 
   13 Oct 2005; Eric Edgar <rocket@gentoo.org>
   targets/support/bootloader-setup.sh, targets/support/create-iso.sh,

diff --git a/targets/support/mips-arcload_conf.sh b/targets/support/mips-arcload_conf.sh
index 07820f65685e9b38f4b281bfe42fd5981dd69c43..7e933f635658cafbb3bbbb219607e05e6ed3e29c 100644 (file)
--- a/targets/support/mips-arcload_conf.sh
+++ b/targets/support/mips-arcload_conf.sh
@@ -7,15 +7,32 @@
 topofconfig="# Gentoo/MIPS LiveCD Prototype\n# ARCLoad Configuration\n\ndetect;\n\n\
 # Global options\ncomment\t\t\"Global Options (not bootable):\\\n\\\r\\\n\\\r\";\n\n"
 
-s9600="serial=9600 {\n\
-\tdescription\t\"Serial Console - 9600 baud\";\n\
-\timage\t\t\"\";\n\
-\tappend\t\t\"console=ttyS0,9600\";\n}\n\n"
-
-s38400="serial=38400 {\n\
-\tdescription\t\"Serial Console - 38400 baud\";\n\
-\timage\t\t\"\";\n\
-\tappend\t\t\"console=ttyS0,38400\";\n}\n\n"
+serial="serial {\n\
+\tbaud=9600 {\n\
+\t\tport1 {\n\
+\t\t\tdescription\t\"Serial Console, Port 1, 9600 Baud\";\n\
+\t\t\timage\t\t\"\";\n\
+\t\t\tappend\t\t\"console=ttyS0,9600\";\n\
+\t\t}\n\n\
+\t\tport2 {\n\
+\t\t\tdescription\t\"Serial Console, Port 2, 9600 Baud\";\n\
+\t\t\timage\t\t\"\";\n\
+\t\t\tappend\t\t\"console=ttyS1,9600\";\n\
+\t\t}\n\
+\t}\n\n\
+\tbaud=38400 {\n\
+\t\tport1 {\n\
+\t\t\tdescription\t\"Serial Console, Port 1, 38400 Baud\";\n\
+\t\t\timage\t\t\"\";\n\
+\t\t\tappend\t\t\"console=ttyS0,38400\";\n\
+\t\t}\n\n\
+\t\tport2 {\n\
+\t\t\tdescription\t\"Serial Console, Port 2, 38400 Baud\";\n\
+\t\t\timage\t\t\"\";\n\
+\t\t\tappend\t\t\"console=ttyS1,38400\";\n\
+\t\t}\n\
+\t}\n\
+}\n\n\n"
 
 dbg="debug {\n\
 \tdescription\t\"Debug Shell\";\n\