Index: BOOK/introduction/mips/changelog.xml
===================================================================
--- BOOK/introduction/mips/changelog.xml	(revision aaead79a4430071a546271664adaee52c10e3925)
+++ BOOK/introduction/mips/changelog.xml	(revision dedf4274393016485c3b2032ec762268aeb47949)
@@ -35,4 +35,13 @@
 
     <listitem>
+      <para>November 21, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Updated to Colo 1.22.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>October 26, 2006</para>
       <itemizedlist>
Index: BOOK/introduction/mips64-64/changelog.xml
===================================================================
--- BOOK/introduction/mips64-64/changelog.xml	(revision aaead79a4430071a546271664adaee52c10e3925)
+++ BOOK/introduction/mips64-64/changelog.xml	(revision dedf4274393016485c3b2032ec762268aeb47949)
@@ -35,4 +35,13 @@
 
     <listitem>
+      <para>November 21, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Updated to Colo 1.22.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>October 26, 2006</para>
       <itemizedlist>
Index: BOOK/introduction/mips64/changelog.xml
===================================================================
--- BOOK/introduction/mips64/changelog.xml	(revision aaead79a4430071a546271664adaee52c10e3925)
+++ BOOK/introduction/mips64/changelog.xml	(revision dedf4274393016485c3b2032ec762268aeb47949)
@@ -35,4 +35,13 @@
 
     <listitem>
+      <para>November 21, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Updated to Colo 1.22.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>October 26, 2006</para>
       <itemizedlist>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision aaead79a4430071a546271664adaee52c10e3925)
+++ BOOK/packages.ent	(revision dedf4274393016485c3b2032ec762268aeb47949)
@@ -73,8 +73,8 @@
 <!ENTITY clfs-bootscripts-home " ">
 
-<!ENTITY colo-version "1.21">
-<!ENTITY colo-size "250 KB">
+<!ENTITY colo-version "1.22">
+<!ENTITY colo-size "253 KB">
 <!ENTITY colo-url "http://www.colonel-panic.org/cobalt-mips/colo/colo-&colo-version;.tar.gz">
-<!ENTITY colo-md5 "9d8a37ad4984ec6660ff159e83f15404">
+<!ENTITY colo-md5 "52c16ad31f3b88f710f0fdb5abed0457">
 <!ENTITY colo-home "http://www.linux-mips.org/wiki/CoLo">
 
Index: tches/colo-1.21-make_fix-1.patch
===================================================================
--- patches/colo-1.21-make_fix-1.patch	(revision aaead79a4430071a546271664adaee52c10e3925)
+++ 	(revision )
@@ -1,57 +1,0 @@
-Submitted By: Joe Ciccone <joeciccone@crazyeyesoft.com>
-Date: 2005-11-23
-Initial Package Version: 1.19
-Upstream Status: Sent
-Origin: Joe Ciccone <joeciccone@crazyeyesoft.com
-Description: Adds flags to the stage1, stage2, and chain Makefiles
-             forcing them to build as 32bit.
-
-	     2-2-06 Updated for Colo 1.21 
-diff -Naur colo-1.21.orig/chain/Makefile colo-1.21/chain/Makefile
---- colo-1.21.orig/chain/Makefile	2006-01-17 23:03:58.000000000 +0000
-+++ colo-1.21/chain/Makefile	2006-02-02 15:43:32.000000000 +0000
-@@ -18,9 +18,9 @@
- 
- DEPS=$(OBJS:.o=.d)
- 
--LDFLAGS= -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
--CFLAGS= -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
--CPPFLAGS= -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
-+LDFLAGS= -mabi=32 -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
-+CFLAGS= -mabi=32 -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
-+CPPFLAGS= -mabi=32 -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
- 
- all:
- 	$(MAKE) -C .. binary
-diff -Naur colo-1.21.orig/stage1/Makefile colo-1.21/stage1/Makefile
---- colo-1.21.orig/stage1/Makefile	2006-01-17 23:03:58.000000000 +0000
-+++ colo-1.21/stage1/Makefile	2006-02-02 15:44:18.000000000 +0000
-@@ -21,9 +21,9 @@
- 
- DEPS=$(OBJS:.o=.d)
- 
--LDFLAGS= -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
--CFLAGS= -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
--CPPFLAGS= -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
-+LDFLAGS= -mabi=32 -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
-+CFLAGS= -mabi=32 -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
-+CPPFLAGS= -mabi=32 -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
- 
- all:
- 	$(MAKE) -C .. binary
-diff -Naur colo-1.21.orig/stage2/Makefile colo-1.21/stage2/Makefile
---- colo-1.21.orig/stage2/Makefile	2006-01-17 23:03:58.000000000 +0000
-+++ colo-1.21/stage2/Makefile	2006-02-02 15:44:02.000000000 +0000
-@@ -54,9 +54,9 @@
- 
- DEPS=$(OBJS:.o=.d)
- 
--LDFLAGS= -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map,--emit-relocs
--CFLAGS= -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
--CPPFLAGS= -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
-+LDFLAGS= -mabi=32 -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map,--emit-relocs
-+CFLAGS= -mabi=32 -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
-+CPPFLAGS= -mabi=32 -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
- 
- LOADADDR= $(shell $(CROSS_COMPILE)readelf -l $(TARG) | awk '$$1 ~ /^LOAD$$/ { print $$3 }')
- 
Index: tches/colo-1.21-relocation_fix-1.patch
===================================================================
--- patches/colo-1.21-relocation_fix-1.patch	(revision aaead79a4430071a546271664adaee52c10e3925)
+++ 	(revision )
@@ -1,21 +1,0 @@
-Submitted By: Joe Ciccone <jciccone@linuxfromscratch.org>
-Date: 2006-06-11
-Initial Package Version: 1.21
-Upstream Status: Unknown
-Origin: Joe Ciccone
-Description: Fixes relocation errors when linking.
-
-diff -Naur colo-1.21.orig/stage1/include/lib.h colo-1.21/stage1/include/lib.h
---- colo-1.21.orig/stage1/include/lib.h	2006-01-17 18:03:58.000000000 -0500
-+++ colo-1.21/stage1/include/lib.h	2006-07-11 01:01:29.000000000 -0400
-@@ -47,8 +47,8 @@
- 
- /* fast.c */
- 
--extern void * __attribute__((section(".data"))) _memcpy_w(void *, const void *, size_t);
--extern void * __attribute__((section(".data"))) _memset_w(void *, int, size_t);
-+extern void * _memcpy_w(void *, const void *, size_t);
-+extern void * _memset_w(void *, int, size_t);
- 
- #endif
- 
Index: patches/colo-1.22-make_fix-1.patch
===================================================================
--- patches/colo-1.22-make_fix-1.patch	(revision dedf4274393016485c3b2032ec762268aeb47949)
+++ patches/colo-1.22-make_fix-1.patch	(revision dedf4274393016485c3b2032ec762268aeb47949)
@@ -0,0 +1,57 @@
+Submitted By: Joe Ciccone <joeciccone@crazyeyesoft.com>
+Date: 2005-11-23
+Initial Package Version: 1.19
+Upstream Status: Sent
+Origin: Joe Ciccone <joeciccone@crazyeyesoft.com
+Description: Adds flags to the stage1, stage2, and chain Makefiles
+             forcing them to build as 32bit.
+
+	     2-2-06 Updated for Colo 1.21 
+diff -Naur colo-1.21.orig/chain/Makefile colo-1.21/chain/Makefile
+--- colo-1.21.orig/chain/Makefile	2006-01-17 23:03:58.000000000 +0000
++++ colo-1.21/chain/Makefile	2006-02-02 15:43:32.000000000 +0000
+@@ -18,9 +18,9 @@
+ 
+ DEPS=$(OBJS:.o=.d)
+ 
+-LDFLAGS= -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
+-CFLAGS= -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
+-CPPFLAGS= -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
++LDFLAGS= -mabi=32 -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
++CFLAGS= -mabi=32 -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
++CPPFLAGS= -mabi=32 -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
+ 
+ all:
+ 	$(MAKE) -C .. binary
+diff -Naur colo-1.21.orig/stage1/Makefile colo-1.21/stage1/Makefile
+--- colo-1.21.orig/stage1/Makefile	2006-01-17 23:03:58.000000000 +0000
++++ colo-1.21/stage1/Makefile	2006-02-02 15:44:18.000000000 +0000
+@@ -21,9 +21,9 @@
+ 
+ DEPS=$(OBJS:.o=.d)
+ 
+-LDFLAGS= -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
+-CFLAGS= -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
+-CPPFLAGS= -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
++LDFLAGS= -mabi=32 -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
++CFLAGS= -mabi=32 -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
++CPPFLAGS= -mabi=32 -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
+ 
+ all:
+ 	$(MAKE) -C .. binary
+diff -Naur colo-1.21.orig/stage2/Makefile colo-1.21/stage2/Makefile
+--- colo-1.21.orig/stage2/Makefile	2006-01-17 23:03:58.000000000 +0000
++++ colo-1.21/stage2/Makefile	2006-02-02 15:44:02.000000000 +0000
+@@ -54,9 +54,9 @@
+ 
+ DEPS=$(OBJS:.o=.d)
+ 
+-LDFLAGS= -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map,--emit-relocs
+-CFLAGS= -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
+-CPPFLAGS= -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
++LDFLAGS= -mabi=32 -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map,--emit-relocs
++CFLAGS= -mabi=32 -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
++CPPFLAGS= -mabi=32 -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
+ 
+ LOADADDR= $(shell $(CROSS_COMPILE)readelf -l $(TARG) | awk '$$1 ~ /^LOAD$$/ { print $$3 }')
+ 
Index: patches/colo-1.22-relocation_fix-1.patch
===================================================================
--- patches/colo-1.22-relocation_fix-1.patch	(revision dedf4274393016485c3b2032ec762268aeb47949)
+++ patches/colo-1.22-relocation_fix-1.patch	(revision dedf4274393016485c3b2032ec762268aeb47949)
@@ -0,0 +1,21 @@
+Submitted By: Joe Ciccone <jciccone@linuxfromscratch.org>
+Date: 2006-06-11
+Initial Package Version: 1.21
+Upstream Status: Unknown
+Origin: Joe Ciccone
+Description: Fixes relocation errors when linking.
+
+diff -Naur colo-1.21.orig/stage1/include/lib.h colo-1.21/stage1/include/lib.h
+--- colo-1.21.orig/stage1/include/lib.h	2006-01-17 18:03:58.000000000 -0500
++++ colo-1.21/stage1/include/lib.h	2006-07-11 01:01:29.000000000 -0400
+@@ -47,8 +47,8 @@
+ 
+ /* fast.c */
+ 
+-extern void * __attribute__((section(".data"))) _memcpy_w(void *, const void *, size_t);
+-extern void * __attribute__((section(".data"))) _memset_w(void *, int, size_t);
++extern void * _memcpy_w(void *, const void *, size_t);
++extern void * _memset_w(void *, int, size_t);
+ 
+ #endif
+ 
