r6657 - in branches/cross-lfs/BOOK: . boot/mips boot/mips64 boot/mips64-64 final-system final-system/mips64 final-system/mips64-64

jim at linuxfromscratch.org jim at linuxfromscratch.org
Thu Aug 11 20:19:50 PDT 2005


Author: jim
Date: 2005-08-11 21:19:48 -0600 (Thu, 11 Aug 2005)
New Revision: 6657

Added:
   branches/cross-lfs/BOOK/final-system/mips64-64/colo.xml
Modified:
   branches/cross-lfs/BOOK/
   branches/cross-lfs/BOOK/boot/mips/colo-build.xml
   branches/cross-lfs/BOOK/boot/mips64-64/colo-build.xml
   branches/cross-lfs/BOOK/boot/mips64/colo-build.xml
   branches/cross-lfs/BOOK/final-system/mips64-64-chapter.xml
   branches/cross-lfs/BOOK/final-system/mips64/colo.xml
Log:
 r7105 at server:  jim | 2005-08-11 19:33:53 -0700
 Make MIPS bootloader Colo work on all version of Cross-LFS. On the 32 bit build it builds everything. On the multilib build, it builds the bootloader as 32 bit and the tools as 64 bit. On the 64 bit build it builds the tools as 64bit and uses the precompiled version.



Property changes on: branches/cross-lfs/BOOK
___________________________________________________________________
Name: svk:merge
   - 7321b066-45f8-0310-a5e2-f63eff31be55:/cross-lfs:7103
dfc39d96-41f8-0310-9e44-b84af8e7c7f6:/books/local:5516
   + 7321b066-45f8-0310-a5e2-f63eff31be55:/cross-lfs:7105
dfc39d96-41f8-0310-9e44-b84af8e7c7f6:/books/local:5516

Modified: branches/cross-lfs/BOOK/boot/mips/colo-build.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/mips/colo-build.xml	2005-08-11 22:08:24 UTC (rev 6656)
+++ branches/cross-lfs/BOOK/boot/mips/colo-build.xml	2005-08-12 03:19:48 UTC (rev 6657)
@@ -48,7 +48,7 @@
 <screen><userinput>cd tools/elf2rfx
 make CC=gcc
 cd ../..
-make CROSS_COMPILE="${LFS_TARGET}-" toolsdirs</userinput></screen>
+make CROSS_COMPILE="${LFS_TARGET}-" binary</userinput></screen>
 
     <para>Install the package:</para>
 

Modified: branches/cross-lfs/BOOK/boot/mips64/colo-build.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/mips64/colo-build.xml	2005-08-11 22:08:24 UTC (rev 6656)
+++ branches/cross-lfs/BOOK/boot/mips64/colo-build.xml	2005-08-12 03:19:48 UTC (rev 6657)
@@ -48,7 +48,7 @@
 <screen><userinput>cd tools/elf2rfx
 make CC=gcc
 cd ../..
-make CC="${CC} ${BUILD64}" CROSS_COMPILE="${LFS_TARGET}-" tooldirs</userinput></screen>
+make CC="${CC} ${BUILD32)" CROSS_COMPILE="${LFS_TARGET}-" binary</userinput></screen>
 
   <para>Install the package:</para>
 

Modified: branches/cross-lfs/BOOK/boot/mips64-64/colo-build.xml
===================================================================
--- branches/cross-lfs/BOOK/boot/mips64-64/colo-build.xml	2005-08-11 22:08:24 UTC (rev 6656)
+++ branches/cross-lfs/BOOK/boot/mips64-64/colo-build.xml	2005-08-12 03:19:48 UTC (rev 6657)
@@ -43,13 +43,9 @@
   <sect2 role="installation">
     <title>Installation of Colo</title>
 
-  <para>Compile the Colo package:</para>
+  <para>We install the precompiled binary since 64 bit version is
+  no available currently.</para>
 
-<screen><userinput>cd tools/elf2rfx
-make CC=gcc
-cd ../..
-make CC="${CC} ${BUILD64}" CROSS_COMPILE="${LFS_TARGET}-" tooldirs</userinput></screen>
-
   <para>Install the package:</para>
 
 <screen><userinput>cp binaries/colo-chain.elf ${LFS}/boot/vmlinux

Modified: branches/cross-lfs/BOOK/final-system/mips64/colo.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64/colo.xml	2005-08-11 22:08:24 UTC (rev 6656)
+++ branches/cross-lfs/BOOK/final-system/mips64/colo.xml	2005-08-12 03:19:48 UTC (rev 6657)
@@ -44,7 +44,8 @@
 
     <para>Compile the Colo package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen><userinput>make CC="gcc ${BUILD32}" binary
+make CC="gcc ${BUILD64}" tooldirs</userinput></screen>
 
     <para>Install the package:</para>
 

Added: branches/cross-lfs/BOOK/final-system/mips64-64/colo.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64-64/colo.xml	2005-08-11 22:08:24 UTC (rev 6656)
+++ branches/cross-lfs/BOOK/final-system/mips64-64/colo.xml	2005-08-12 03:19:48 UTC (rev 6657)
@@ -0,0 +1,82 @@
+<?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">
+  <!ENTITY % patches-entities SYSTEM "../../patches.ent">
+  %general-entities;
+  %patches-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>
+
+  <sect2 role="package">
+    <title/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/colo.xml"
+    xpointer="xpointer(id('package-colo')/para[1])"/>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>Not checked yet</seg>
+        <seg>Not checked yet</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/colo.xml"
+    xpointer="xpointer(id('package-colo')/segmentedlist[2])"/>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Colo</title>
+
+    <para>Since 64 bit version doesn't work currently we are going to
+    compile the utils as 64 bit and using the precompiled bootloader.</para>
+
+    <para>Compile the Colo package:</para>
+
+<screen><userinput>make CC="gcc ${BUILD64}" tooldirs</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><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 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 tools/md5rom/md5rom /sbin
+install tools/md5rom/md5rom.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
+gzip -9 /boot/vmlinux</userinput></screen>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../mips/colo.xml"
+  xpointer="xpointer(id('contents-colo'))"/>
+
+</sect1>

Modified: branches/cross-lfs/BOOK/final-system/mips64-64-chapter.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64-64-chapter.xml	2005-08-11 22:08:24 UTC (rev 6656)
+++ branches/cross-lfs/BOOK/final-system/mips64-64-chapter.xml	2005-08-12 03:19:48 UTC (rev 6657)
@@ -62,7 +62,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/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="common/iana-etc.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-64/colo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/stripping.xml"/>
 




More information about the lfs-book mailing list