From: Eric Edgar Date: Sat, 15 Oct 2005 01:15:53 +0000 (+0000) Subject: Fix MIPS Serial Detection X-Git-Tag: CATALYST_2_0_6_916~630 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=512259975577eb5967b8ea59743785d4b0a6971c;p=catalyst.git 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 917e79ab..4d552d53 100644 --- 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 + targets/support/mips-arcload_conf.sh: + Fix MIPS Serial Detection 13 Oct 2005; Eric Edgar 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 07820f65..7e933f63 100644 --- 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\