r746 - in trunk/BOOK: . boot boot/mips boot/mips64 boot/mips64-64 final-system final-system/mips final-system/mips64 final-system/mips64-64 introduction/mips introduction/mips64 introduction/mips64-64 materials/mips64 materials/mips64-64

jim at linuxfromscratch.org jim at linuxfromscratch.org
Wed Nov 23 16:59:46 PST 2005


Author: jim
Date: 2005-11-23 17:59:43 -0700 (Wed, 23 Nov 2005)
New Revision: 746

Removed:
   trunk/BOOK/boot/mips64-64/colo-build.xml
   trunk/BOOK/final-system/mips64-64/colo.xml
Modified:
   trunk/BOOK/
   trunk/BOOK/boot/mips/colo-build.xml
   trunk/BOOK/boot/mips64-64-chapter.xml
   trunk/BOOK/boot/mips64/colo-build.xml
   trunk/BOOK/final-system/mips/colo.xml
   trunk/BOOK/final-system/mips64-64-chapter.xml
   trunk/BOOK/final-system/mips64/colo.xml
   trunk/BOOK/introduction/mips/changelog.xml
   trunk/BOOK/introduction/mips64-64/changelog.xml
   trunk/BOOK/introduction/mips64/changelog.xml
   trunk/BOOK/materials/mips64-64/patches.xml
   trunk/BOOK/materials/mips64/patches.xml
   trunk/BOOK/patches.ent
Log:
 r770 at server:  jim | 2005-11-23 16:59:11 -0800
 Updates to colo for MIPS - RaQ2



Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:769
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:770
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/boot/mips/colo-build.xml
===================================================================
--- trunk/BOOK/boot/mips/colo-build.xml	2005-11-24 00:59:35 UTC (rev 745)
+++ trunk/BOOK/boot/mips/colo-build.xml	2005-11-24 00:59:43 UTC (rev 746)
@@ -35,7 +35,7 @@
     href="../../final-system/mips/colo.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="c"><userinput>cp binaries/colo-chain.elf ${LFS}/boot/vmlinux
+<screen os="c"><userinput>cp chain/colo-chain.elf ${LFS}/boot/vmlinux
 gzip -9 ${LFS}/boot/vmlinux</userinput></screen>
 
   </sect2>

Modified: trunk/BOOK/boot/mips64/colo-build.xml
===================================================================
--- trunk/BOOK/boot/mips64/colo-build.xml	2005-11-24 00:59:35 UTC (rev 745)
+++ trunk/BOOK/boot/mips64/colo-build.xml	2005-11-24 00:59:43 UTC (rev 746)
@@ -23,13 +23,21 @@
     <title>Installation of Colo</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/mips64/colo.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/mips64/colo.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/colo-build.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen><userinput>cd tools/elf2rfx
 make CC=gcc
 cd ../..
-make CC="${CC} ${BUILD32)" CROSS_COMPILE="${LFS_TARGET}-" binary</userinput></screen>
+make CROSS_COMPILE="${LFS_TARGET}-" binary</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/colo-build.xml"

Deleted: trunk/BOOK/boot/mips64-64/colo-build.xml
===================================================================
--- trunk/BOOK/boot/mips64-64/colo-build.xml	2005-11-24 00:59:35 UTC (rev 745)
+++ trunk/BOOK/boot/mips64-64/colo-build.xml	2005-11-24 00:59:43 UTC (rev 746)
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-colo-build" role="wrap">
-  <?dbhtml filename="colo-build.html"?>
-
-  <title>Colo-&colo-version;</title>
-
-  <indexterm zone="ch-boot-colo-build">
-    <primary sortas="a-Colo">Colo</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/mips/colo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Colo</title>
-
-    <para>We install the precompiled binary since 64 bit version is
-    not available currently.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/colo-build.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/colo-build.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-colo" role="."/></para>
-
-  </sect2>
-
-</sect1>

Modified: trunk/BOOK/boot/mips64-64-chapter.xml
===================================================================
--- trunk/BOOK/boot/mips64-64-chapter.xml	2005-11-24 00:59:35 UTC (rev 745)
+++ trunk/BOOK/boot/mips64-64-chapter.xml	2005-11-24 00:59:43 UTC (rev 746)
@@ -23,7 +23,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/colo-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/colo-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/colo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>

Modified: trunk/BOOK/final-system/mips/colo.xml
===================================================================
--- trunk/BOOK/final-system/mips/colo.xml	2005-11-24 00:59:35 UTC (rev 745)
+++ trunk/BOOK/final-system/mips/colo.xml	2005-11-24 00:59:43 UTC (rev 746)
@@ -45,23 +45,16 @@
     <para os="c">Install the package:</para>
 
 <screen os="d"><userinput>install -d  /usr/lib/colo/examples
-install binaries/colo-chain.elf /usr/lib/colo
-install binaries/colo-rom-image.bin /usr/lib/colo
-install tools/colo-perm/colo-perm /sbin
-install tools/colo-perm/colo-perm.8 /usr/man/man8
-install tools/elf2rfx/elf2rfx /sbin
-install tools/flash-tool/flash-tool /sbin
-install tools/flash-tool/flash-tool.8 /usr/man/man8
+install chain/colo-chain.elf /usr/lib/colo
 install tools/lcdtools/e2fsck-lcd/e2fsck-lcd /sbin
 install tools/lcdtools/e2fsck-lcd/e2fsck-lcd.8 /usr/man/man8
-install tools/lcdtools/liblcd/liblcd.a /lib
 install tools/lcdtools/paneld/paneld /sbin
 install tools/lcdtools/paneld/paneld.8 /usr/man/man8
 install tools/lcdtools/putlcd/putlcd /sbin
 install tools/lcdtools/putlcd/putlcd.8 /usr/man/man8
 install examples/menu.colo /usr/lib/colo/examples
 install examples/simple.colo /usr/lib/colo/examples
-cp binaries/colo-chain.elf /boot/vmlinux
+cp chain/colo-chain.elf /boot/vmlinux
 gzip -9 /boot/vmlinux</userinput></screen>
 
   </sect2>
@@ -73,8 +66,7 @@
       <segtitle>Installed programs</segtitle>
 
       <seglistitem>
-        <seg>colo-chain.elf, colo-rom-image.bin, colo-perm, elf2rfx,
-        flash-tool, e2fsck-lcd, paneld and putlcd</seg>
+        <seg>colo-chain.elf, e2fsck-lcd, paneld and putlcd</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -96,50 +88,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="colo-rom-image.bin">
-        <term><command>colo-rom-image.bin</command></term>
-        <listitem>
-          <para>Is a replacement firmware for the Cobalt's standard
-          firmware</para>
-          <indexterm zone="ch-system-colo colo-rom-image.bin">
-            <primary sortas="b-colo-rom-image.bin">colo-rom-image.bin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="colo-perm">
-        <term><command>colo-perm</command></term>
-        <listitem>
-          <para>Is a tool which looks in the ROM of a Cobalt machine for a
-          magic string identifying CoLo. This way, it can be determined if
-          the original Cobalt firmware is used or whether CoLo has been
-          flashed to the ROM</para>
-          <indexterm zone="ch-system-colo colo-perm">
-            <primary sortas="b-colo-perm">colo-perm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="elf2rfx">
-        <term><command>elf2rfx</command></term>
-        <listitem>
-          <para>UNKNOWN</para>
-          <indexterm zone="ch-system-colo elf2rfx">
-            <primary sortas="b-elf2rfx">elf2rfx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="flash-tool">
-        <term><command>flash-tool</command></term>
-        <listitem>
-          <para>Read or write Cobalt's firmware flash memory</para>
-          <indexterm zone="ch-system-colo flash-tool">
-            <primary sortas="b-flash-tool">flash-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="e2fsck-lcd">
         <term><command>e2fsck-lcd</command></term>
         <listitem>

Modified: trunk/BOOK/final-system/mips64/colo.xml
===================================================================
--- trunk/BOOK/final-system/mips64/colo.xml	2005-11-24 00:59:35 UTC (rev 745)
+++ trunk/BOOK/final-system/mips64/colo.xml	2005-11-24 00:59:43 UTC (rev 746)
@@ -21,6 +21,11 @@
   <sect2 role="installation">
     <title>Installation of Colo</title>
 
+    <para os="p1">This patch updates the Colo bootloader to build under
+    64 bit:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&colo-make-patch;</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/colo.xml"
     xpointer="xpointer(//*[@os='a'])"/>
@@ -29,7 +34,7 @@
     href="../mips/colo.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>make CC="gcc ${BUILD32}" binary
+<screen><userinput>make binary
 make CC="gcc ${BUILD64}" tooldirs</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Deleted: trunk/BOOK/final-system/mips64-64/colo.xml
===================================================================
--- trunk/BOOK/final-system/mips64-64/colo.xml	2005-11-24 00:59:35 UTC (rev 745)
+++ trunk/BOOK/final-system/mips64-64/colo.xml	2005-11-24 00:59:43 UTC (rev 746)
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-colo" role="wrap">
-  <?dbhtml filename="colo.html"?>
-
-  <title>Colo-&colo-version;</title>
-
-  <indexterm zone="ch-system-colo">
-    <primary sortas="a-Colo">Colo</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/colo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Colo</title>
-
-    <para>Since 64 bit version doesn't work currently we are going to
-    compile the utilities as 64 bit and use the precompiled bootloader.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/colo.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/colo.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen><userinput>make CC="gcc ${BUILD64}" tooldirs</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/colo.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/colo.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/colo.xml"
-  xpointer="xpointer(id('contents-colo'))"/>
-
-</sect1>

Modified: trunk/BOOK/final-system/mips64-64-chapter.xml
===================================================================
--- trunk/BOOK/final-system/mips64-64-chapter.xml	2005-11-24 00:59:35 UTC (rev 745)
+++ trunk/BOOK/final-system/mips64-64-chapter.xml	2005-11-24 00:59:43 UTC (rev 746)
@@ -62,7 +62,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/mktemp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hotplug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/colo.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/colo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/dvhtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/arcload.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>

Modified: trunk/BOOK/introduction/mips/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips/changelog.xml	2005-11-24 00:59:35 UTC (rev 745)
+++ trunk/BOOK/introduction/mips/changelog.xml	2005-11-24 00:59:43 UTC (rev 746)
@@ -34,6 +34,15 @@
 -->
 
     <listitem>
+      <para>November 23, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Removed uneeded programs from Colo.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 20, 2005</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/introduction/mips64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips64/changelog.xml	2005-11-24 00:59:35 UTC (rev 745)
+++ trunk/BOOK/introduction/mips64/changelog.xml	2005-11-24 00:59:43 UTC (rev 746)
@@ -34,6 +34,18 @@
 -->
 
     <listitem>
+      <para>November 23, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Removed uneeded programs from Colo.</para>
+        </listitem>
+        <listitem>
+          <para>[jim] - Colo will now build under 64-Bit. Thanx Joe Ciccone.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 20, 2005</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/introduction/mips64-64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips64-64/changelog.xml	2005-11-24 00:59:35 UTC (rev 745)
+++ trunk/BOOK/introduction/mips64-64/changelog.xml	2005-11-24 00:59:43 UTC (rev 746)
@@ -34,6 +34,18 @@
 -->
 
     <listitem>
+      <para>November 23, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Removed uneeded programs from Colo.</para>
+        </listitem>
+        <listitem>
+          <para>[jim] - Colo will now build under 64-Bit. Thanx Joe Ciccone.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 20, 2005</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/materials/mips64/patches.xml
===================================================================
--- trunk/BOOK/materials/mips64/patches.xml	2005-11-24 00:59:35 UTC (rev 745)
+++ trunk/BOOK/materials/mips64/patches.xml	2005-11-24 00:59:43 UTC (rev 746)
@@ -20,6 +20,13 @@
     href="../x86_64/patches.xml"
     xpointer="xpointer(//*[@os='binutils-multilib-patch'])"/>
 
+    <varlistentry os="colo-mips-patch">
+      <term>Colo Make Patch - 3 KB:</term> <listitem>
+        <para><ulink
+        url="&patches-root;colo/&colo-make-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='dvhtool-fixes-patch'])"/>

Modified: trunk/BOOK/materials/mips64-64/patches.xml
===================================================================
--- trunk/BOOK/materials/mips64-64/patches.xml	2005-11-24 00:59:35 UTC (rev 745)
+++ trunk/BOOK/materials/mips64-64/patches.xml	2005-11-24 00:59:43 UTC (rev 746)
@@ -17,6 +17,10 @@
     xpointer="xpointer(//*[@os='arcload-fixes-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips64/patches.xml"
+    xpointer="xpointer(//*[@os='colo-mips-patch'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='dvhtool-fixes-patch'])"/>
 

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2005-11-24 00:59:35 UTC (rev 745)
+++ trunk/BOOK/patches.ent	2005-11-24 00:59:43 UTC (rev 746)
@@ -93,6 +93,8 @@
 
 <!ENTITY arcload-fixes-patch "arcload-&arcload-version;-fixes-1.patch">
 
+<!ENTITY colo-make-patch "colo-&colo-version;-make_fix-1.patch">
+
 <!ENTITY dvhtool-fixes-patch "dvhtool-&dvhtool-version;-fixes-1.patch">
 
 <!ENTITY flex-mips_update-patch "flex-&flex-version;-mips_config_update-1.patch">




More information about the cross-lfs mailing list