update

2007-06-15 15:12:22 +02:00 · 2007-06-15 15:12:02 +02:00
21 changed files with 6291 additions and 285 deletions
--- a/603
+++ b/603
@ -1,42 +1,36 @@
-PATH := /opt/brcm/hndtools-mipsel-uclibc-3.2.3/bin:/opt/brcm/hndtools-mipsel-linux-3.2.3/bin:$(PATH)
-export PATH
+CROSS_COMPILE := mipsel-linux-uclibc-
+CROSS_TOOLS := CC=$(CROSS_COMPILE)gcc \
+	AR=$(CROSS_COMPILE)ar \
+	AS=$(CROSS_COMPILE)as \
+	LD=$(CROSS_COMPILE)ld \
+	LDD=$(CROSS_COMPILE)ldd \
+	NM=$(CROSS_COMPILE)nm \
+	RANLIB=$(CROSS_COMPILE)ranlib \
+	STRIP=$(CROSS_COMPILE)strip \
+	SIZE=$(CROSS_COMPILE)size

-export TOOLCHAIN := /opt/brcm/hndtools-mipsel-uclibc-3.2.3
+CROSS_CONFIGURE := ./configure --target=mipsel-linux-uclibc --build=i386-pc-linux-gnu --host=mipsel-linux-uclibc $(CROSS_TOOLS)
+CROSS_STRIP := $(CROSS_COMPILE)strip

-# #####################################################################
-
-export BUILD := i386-pc-linux-gnu
-export TARGET := mipsel-uclibc
-export HOST := mipsel-linux
-
-export CROSS_COMPILE := mipsel-uclibc-
-export CONFIGURE := ./configure --target=$(TARGET) --build=$(BUILD) --host=$(HOST)
-
-export CC := $(CROSS_COMPILE)gcc
-export AR := $(CROSS_COMPILE)ar
-export AS := $(CROSS_COMPILE)as
-export LD := $(CROSS_COMPILE)ld
-export LDD := $(CROSS_COMPILE)ldd
-export NM := $(CROSS_COMPILE)nm
-export RANLIB := $(CROSS_COMPILE)ranlib
-export STRIP := $(CROSS_COMPILE)strip
-export SIZE := $(CROSS_COMPILE)size
-
-export WGET := /usr/bin/wget --passive-ftp -nd
+WGET := /usr/bin/wget --passive-ftp -nd

 _SRCBASE=$(shell /bin/pwd)
 _CONFIGS=$(_SRCBASE)/configs
 _DOWNLOAD_DIR=$(_SRCBASE)/download
+_PATCHES=$(_SRCBASE)/patches
 _SOURCE=$(_SRCBASE)/source
-_STATE=$(_SRCBASE)/state
 _TOOLS=$(_SRCBASE)/tools

+_TOOLCHAIN=$(_SRCBASE)/toolchain
+
 _STAGE1_SKEL=stage1.skel
 _STAGE1=$(shell /bin/pwd)/stage1
 _STAGE1_IMG=stage1.img
 _STAGE2_SKEL=stage2.skel
 _STAGE2=$(shell /bin/pwd)/stage2

+export PATH := $(_TOOLCHAIN)/bin:$(PATH)
+
 # #####################################################################

 # build firmware and filesystem
@ -49,7 +43,7 @@ _STAGE1_TARGETS=kernel-zImage busybox-stage1 cramfs tools
 _STAGE2_TARGETS=kernel-modules busybox-stage2 strace bridge-utils iproute2 pppd

 # fetch all needed sources
-fetch: stage1-fetch stage2-fetch
+fetch: toolchain-fetch stage1-fetch stage2-fetch

 # trigger rebuild of all packages
 clean: stage1-clean stage2-clean
@ -58,67 +52,54 @@ clean: stage1-clean stage2-clean
 distclean: stage1-distclean stage2-distclean

 # #####################################################################
-_BUILD_TOOLS=$(_TOOLS)
-
-tools: tools-clean $(_STATE)/tools.all-done
-
-tools-fetch:
-
-$(_STATE)/tools.all-done:
-	make -C $(_BUILD_TOOLS) all
-	touch $(_STATE)/tools.all-done
-
-tools-install: $(_STATE)/tools.all-done
-
-tools-clean:
-	rm -f $(_STATE)/tools.*
-
-tools-distclean: tools-clean
-	make -C $(_BUILD_TOOLS) clean
-
+# TARGET HOST KERNEL
 # #####################################################################
 _PACKAGE_KERNEL=$(_DOWNLOAD_DIR)/linux-2.4.20.tar.bz2
 _DOWNLOAD_KERNEL=ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-2.4.20.tar.bz2
 _BUILD_KERNEL=$(_SOURCE)/linux-2.4.20
 _KERNELHEADERS=$(_BUILD_KERNEL)/include

-kernel: $(_STATE)/kernel-zImage.all-done $(_STATE)/kernel-modules.all-done
+kernel: $(_BUILD_KERNEL)/.zImage.all-done $(_BUILD_KERNEL)/.modules.all-done

-kernel-zImage: kernel-zImage-clean $(_STATE)/kernel-zImage.all-done
-kernel-modules: kernel-modules-clean $(_STATE)/kernel-modules.all-done
+kernel-zImage: kernel-zImage-clean $(_BUILD_KERNEL)/.zImage.all-done
+kernel-modules: kernel-modules-clean $(_BUILD_KERNEL)/.modules.all-done

+kernel-fetch: $(_PACKAGE_KERNEL)
 kernel-zImage-fetch: $(_PACKAGE_KERNEL)
 kernel-modules-fetch: $(_PACKAGE_KERNEL)

 $(_PACKAGE_KERNEL):
 	$(WGET) -P $(_DOWNLOAD_DIR) $(_DOWNLOAD_KERNEL)

-$(_STATE)/kernel.unpacked: $(_PACKAGE_KERNEL)
+$(_BUILD_KERNEL)/.unpacked: $(_PACKAGE_KERNEL)
 	tar -C $(_SOURCE) -xjf $(_PACKAGE_KERNEL)
-	(cd $(_BUILD_KERNEL); bzcat $(_CONFIGS)/kernel-vanilla2siemens_small.patch.bz2 | patch -lp1 );
+	touch $(_BUILD_KERNEL)/.unpacked
+
+$(_BUILD_KERNEL)/.patched: $(_BUILD_KERNEL)/.unpacked
+	(cd $(_BUILD_KERNEL); bzcat $(_PATCHES)/???_kernel*.patch.bz2 | patch -lp1 );
 	(cd $(_BUILD_KERNEL); tar -xjf $(_CONFIGS)/wl-rel_3_01_05.tar.bz2 );
-	touch $(_STATE)/kernel.unpacked
+	touch $(_BUILD_KERNEL)/.patched

-$(_STATE)/kernel.configured: $(_STATE)/kernel.unpacked
+$(_BUILD_KERNEL)/.configured: $(_BUILD_KERNEL)/.patched
 	cp $(_CONFIGS)/kernel-config $(_BUILD_KERNEL)/.config
-	make -C $(_BUILD_KERNEL) oldconfig
-	touch $(_STATE)/kernel.configured
+	make -C $(_BUILD_KERNEL) oldconfig include/linux/version.h
+	touch $(_BUILD_KERNEL)/.configured

-$(_STATE)/kernel.dep: $(_STATE)/kernel.configured
+$(_BUILD_KERNEL)/.dep: $(_BUILD_KERNEL)/.configured
 	make -C $(_BUILD_KERNEL) dep
-	touch $(_STATE)/kernel.dep
+	touch $(_BUILD_KERNEL)/.dep

-$(_STATE)/kernel-zImage.all-done: $(_STATE)/kernel.dep
+$(_BUILD_KERNEL)/.zImage.all-done: $(_BUILD_KERNEL)/.dep
 	make -C $(_BUILD_KERNEL) zImage
-	touch $(_STATE)/kernel-zImage.all-done
+	touch $(_BUILD_KERNEL)/.zImage.all-done

-$(_STATE)/kernel-modules.all-done: $(_STATE)/kernel-zImage.all-done
+$(_BUILD_KERNEL)/.modules.all-done: $(_BUILD_KERNEL)/.zImage.all-done
 	make -C $(_BUILD_KERNEL) modules
-	touch $(_STATE)/kernel-modules.all-done
+	touch $(_BUILD_KERNEL)/.modules.all-done

-kernel-zImage-install: $(_STAGE1) $(_STATE)/kernel-zImage.all-done
+kernel-zImage-install: $(_STAGE1) $(_BUILD_KERNEL)/.zImage.all-done

-kernel-modules-install: $(_STAGE2) $(_STATE)/kernel-modules.all-done
+kernel-modules-install: $(_STAGE2) $(_BUILD_KERNEL)/.modules.all-done
 	make -C $(_BUILD_KERNEL) modules_install DEPMOD=/bin/true INSTALL_MOD_PATH=$(_STAGE2)
 	rm -rf $(_STAGE2)/lib/modules/2.4.20/build
 	rm -rf $(_STAGE2)/lib/modules/2.4.20/pcmcia
@ -126,121 +107,96 @@ kernel-modules-install: $(_STAGE2) $(_STATE)/kernel-modules.all-done
 kernel-clean: kernel-zImage-clean kernel-modules-clean

 kernel-distclean:
-	rm -r $(_STATE)/kernel.*
-	make -C $(_BUILD_KERNEL) mrproper
+	rm -rf $(_BUILD_KERNEL)

 kernel-zImage-clean:
-	rm -f $(_STATE)/kernel-zImage.all-done
+	rm -f $(_BUILD_KERNEL)/.zImage.all-done

 kernel-zImage-distclean: kernel-distclean

 kernel-modules-clean:
-	rm -f $(_STATE)/kernel-modules.all-done
+	rm -f $(_BUILD_KERNEL)/.modules.all-done

 kernel-modules-distclean: kernel-distclean

 # #####################################################################
-_PACKAGE_CRAMFS=$(_DOWNLOAD_DIR)/cramfs-1.1.tar.gz
-_DOWNLOAD_CRAMFS=http://mesh.dl.sourceforge.net/sourceforge/cramfs/cramfs-1.1.tar.gz
-_BUILD_CRAMFS=$(_SOURCE)/cramfs-1.1
-
-cramfs: cramfs-clean $(_STATE)/cramfs.all_done
-
-cramfs-fetch: $(_PACKAGE_CRAMFS)
-
-$(_PACKAGE_CRAMFS):
-	$(WGET) -P $(_DOWNLOAD_DIR) $(_DOWNLOAD_CRAMFS)
-
-$(_STATE)/cramfs.unpacked: $(_PACKAGE_CRAMFS)
-	tar -C $(_SOURCE) -xzf $(_PACKAGE_CRAMFS)
-	touch $(_STATE)/cramfs.unpacked
-
-$(_STATE)/cramfs.all_done: $(_STATE)/cramfs.unpacked
-	make -C $(_BUILD_CRAMFS) all
-	touch $(_STATE)/cramfs.all_done
-
-cramfs-install: $(_STATE)/cramfs.all_done
-
-cramfs-clean:
-	rm -f $(_STATE)/cramfs.*
-
-cramfs-distclean: strace-clean
-	rm -rf $(_BUILD_CRAMFS)
-
+# TARGET HOST
 # #####################################################################
 _PACKAGE_BUSYBOX=$(_DOWNLOAD_DIR)/busybox-1.00.tar.bz2
 _DOWNLOAD_BUSYBOX=http://www.busybox.net/downloads/busybox-1.00.tar.bz2
 _BUILD_BUSYBOX=$(_SOURCE)/busybox-1.00
 _BUILD_BUSYBOX_STAGE1=$(_SOURCE)/busybox-stage1

-busybox-stage1: busybox-stage1-clean $(_STATE)/busybox-stage1.all_done
+busybox-stage1: busybox-stage1-clean $(_BUILD_BUSYBOX_STAGE1)/.all_done

 busybox-stage1-fetch: $(_PACKAGE_BUSYBOX)

 $(_PACKAGE_BUSYBOX):
 	$(WGET) -P $(_DOWNLOAD_DIR) $(_DOWNLOAD_BUSYBOX)

-$(_STATE)/busybox-stage1.unpacked: $(_PACKAGE_BUSYBOX)
+$(_BUILD_BUSYBOX_STAGE1)/.unpacked: $(_PACKAGE_BUSYBOX)
 	tar -C $(_SOURCE) -xjf $(_PACKAGE_BUSYBOX)
 	rm -rf $(_BUILD_BUSYBOX_STAGE1)
 	mv $(_BUILD_BUSYBOX) $(_BUILD_BUSYBOX_STAGE1)
-	touch $(_STATE)/busybox-stage1.unpacked
+	touch $(_BUILD_BUSYBOX_STAGE1)/.unpacked

-$(_STATE)/busybox-stage1.configured: $(_STATE)/busybox-stage1.unpacked
+$(_BUILD_BUSYBOX_STAGE1)/.configured: $(_BUILD_BUSYBOX_STAGE1)/.unpacked
 	cp $(_CONFIGS)/busybox-stage1.conf $(_BUILD_BUSYBOX_STAGE1)/.config
-	touch $(_STATE)/busybox-stage1.configured
+	touch $(_BUILD_BUSYBOX_STAGE1)/.configured

-$(_STATE)/busybox-stage1.compiled: $(_STATE)/busybox-stage1.configured
-	make -C $(_BUILD_BUSYBOX_STAGE1) all
-	touch $(_STATE)/busybox-stage1.compiled
+$(_BUILD_BUSYBOX_STAGE1)/.compiled: $(_BUILD_BUSYBOX_STAGE1)/.configured
+	make -C $(_BUILD_BUSYBOX_STAGE1) $(CROSS_TOOLS) all
+	touch $(_BUILD_BUSYBOX_STAGE1)/.compiled

-$(_STATE)/busybox-stage1.all_done: $(_STATE)/busybox-stage1.compiled
-	make -C $(_BUILD_BUSYBOX_STAGE1) install
+$(_BUILD_BUSYBOX_STAGE1)/.all_done: $(_BUILD_BUSYBOX_STAGE1)/.compiled
+	make -C $(_BUILD_BUSYBOX_STAGE1) $(CROSS_TOOLS) install
 	chmod 4775 $(_BUILD_BUSYBOX_STAGE1)/_install/bin/busybox
-	touch $(_STATE)/busybox-stage1.all_done
+	touch $(_BUILD_BUSYBOX_STAGE1)/.all_done

-busybox-stage1-install: $(_STAGE1) $(_STATE)/busybox-stage1.all_done
+busybox-stage1-install: $(_STAGE1) $(_BUILD_BUSYBOX_STAGE1)/.all_done
 	cp -r $(_BUILD_BUSYBOX_STAGE1)/_install/* $(_STAGE1)

 busybox-stage1-clean:
-	rm -f $(_STATE)/busybox-stage1.*
+	rm -f $(_BUILD_BUSYBOX_STAGE1)/.configured $(_BUILD_BUSYBOX_STAGE1)/.compiled \
+		$(_BUILD_BUSYBOX_STAGE1)/.all_done

-busybox-stage1-distclean: busybox-stage1-clean
+busybox-stage1-distclean:
 	rm -rf $(_BUILD_BUSYBOX_STAGE1)

 # #####################################################################
 _BUILD_BUSYBOX_STAGE2=$(_SOURCE)/busybox-stage2

-busybox-stage2: busybox-stage2-clean $(_STATE)/busybox-stage2.all_done
+busybox-stage2: busybox-stage2-clean $(_BUILD_BUSYBOX_STAGE2)/.all_done

 busybox-stage2-fetch: $(_PACKAGE_BUSYBOX)

-$(_STATE)/busybox-stage2.unpacked: $(_PACKAGE_BUSYBOX)
+$(_BUILD_BUSYBOX_STAGE2)/.unpacked: $(_PACKAGE_BUSYBOX)
 	tar -C $(_SOURCE) -xjf $(_PACKAGE_BUSYBOX)
 	rm -rf $(_BUILD_BUSYBOX_STAGE2)
 	mv $(_BUILD_BUSYBOX) $(_BUILD_BUSYBOX_STAGE2)
-	touch $(_STATE)/busybox-stage2.unpacked
+	touch $(_BUILD_BUSYBOX_STAGE2)/.unpacked

-$(_STATE)/busybox-stage2.configured: $(_STATE)/busybox-stage2.unpacked
+$(_BUILD_BUSYBOX_STAGE2)/.configured: $(_BUILD_BUSYBOX_STAGE2)/.unpacked
 	cp $(_CONFIGS)/busybox-stage2.conf $(_BUILD_BUSYBOX_STAGE2)/.config
-	touch $(_STATE)/busybox-stage2.configured
+	touch $(_BUILD_BUSYBOX_STAGE2)/.configured

-$(_STATE)/busybox-stage2.compiled: $(_STATE)/busybox-stage2.configured
-	make -C $(_BUILD_BUSYBOX_STAGE2) all
-	touch $(_STATE)/busybox-stage2.compiled
+$(_BUILD_BUSYBOX_STAGE2)/.compiled: $(_BUILD_BUSYBOX_STAGE2)/.configured
+	make -C $(_BUILD_BUSYBOX_STAGE2) $(CROSS_TOOLS) all
+	touch $(_BUILD_BUSYBOX_STAGE2)/.compiled

-$(_STATE)/busybox-stage2.all_done: $(_STATE)/busybox-stage2.compiled
-	make -C $(_BUILD_BUSYBOX_STAGE2) install
+$(_BUILD_BUSYBOX_STAGE2)/.all_done: $(_BUILD_BUSYBOX_STAGE2)/.compiled
+	make -C $(_BUILD_BUSYBOX_STAGE2) $(CROSS_TOOLS) install
 	chmod 4775 $(_BUILD_BUSYBOX_STAGE2)/_install/bin/busybox
-	touch $(_STATE)/busybox-stage2.all_done
+	touch $(_BUILD_BUSYBOX_STAGE2)/.all_done

-busybox-stage2-install: $(_STAGE2) $(_STATE)/busybox-stage2.all_done
+busybox-stage2-install: $(_STAGE2) $(_BUILD_BUSYBOX_STAGE2)/.all_done
 	cp -r $(_BUILD_BUSYBOX_STAGE2)/_install/* $(_STAGE2)

 busybox-stage2-clean:
-	rm -f $(_STATE)/busybox-stage2.*
+	rm -f $(_BUILD_BUSYBOX_STAGE2)/.configured $(_BUILD_BUSYBOX_STAGE2)/.compiled \
+		$(_BUILD_BUSYBOX_STAGE2)/.all_done

-busybox-stage2-distclean: busybox-stage2-clean
+busybox-stage2-distclean: 
 	rm -rf $(_BUILD_BUSYBOX_STAGE2)

 # #####################################################################
@ -248,36 +204,37 @@ _PACKAGE_STRACE=$(_DOWNLOAD_DIR)/strace-4.5.7.tar.bz2
 _DOWNLOAD_STRACE=http://mesh.dl.sourceforge.net/sourceforge/strace/strace-4.5.7.tar.bz2
 _BUILD_STRACE=$(_SOURCE)/strace-4.5.7

-strace: strace-clean $(_STATE)/strace.all_done
+strace: strace-clean $(_BUILD_STRACE)/.all_done

 strace-fetch: $(_PACKAGE_STRACE)

 $(_PACKAGE_STRACE):
 	$(WGET) -P $(_DOWNLOAD_DIR) $(_DOWNLOAD_STRACE)

-$(_STATE)/strace.unpacked: $(_PACKAGE_STRACE)
+$(_BUILD_STRACE)/.unpacked: $(_PACKAGE_STRACE)
 	tar -C $(_SOURCE) -xjf $(_PACKAGE_STRACE)
-	touch $(_STATE)/strace.unpacked
+	touch $(_BUILD_STRACE)/.unpacked

-$(_STATE)/strace.configured: $(_STATE)/strace.unpacked
-	(cd $(_BUILD_STRACE); $(CONFIGURE) --prefix=/usr );
-	touch $(_STATE)/strace.configured
+$(_BUILD_STRACE)/.configured: $(_BUILD_STRACE)/.unpacked
+	(cd $(_BUILD_STRACE); $(CROSS_CONFIGURE) --prefix=/usr );
+	touch $(_BUILD_STRACE)/.configured

-$(_STATE)/strace.compiled: $(_STATE)/strace.configured
-	make -C $(_BUILD_STRACE) all
-	touch $(_STATE)/strace.compiled
+$(_BUILD_STRACE)/.compiled: $(_BUILD_STRACE)/.configured
+	make -C $(_BUILD_STRACE) $(CROSS_TOOLS) all
+	touch $(_BUILD_STRACE)/.compiled

-$(_STATE)/strace.all_done: $(_STATE)/strace.compiled
-	$(STRIP) --strip-all $(_BUILD_STRACE)/strace
-	touch $(_STATE)/strace.all_done
+$(_BUILD_STRACE)/.all_done: $(_BUILD_STRACE)/.compiled
+	$(CROSS_STRIP) --strip-all $(_BUILD_STRACE)/strace
+	touch $(_BUILD_STRACE)/.all_done

-strace-install: $(_STAGE2) $(_STATE)/strace.all_done
+strace-install: $(_STAGE2) $(_BUILD_STRACE)/.all_done
 	cp $(_BUILD_STRACE)/strace $(_STAGE2)/usr/bin

 strace-clean:
-	rm -f $(_STATE)/strace.*
+	rm -f $(_BUILD_STRACE)/.configured $(_BUILD_STRACE)/.compiled \
+		$(_BUILD_STRACE)/.all_done

-strace-distclean: strace-clean
+strace-distclean: 
 	rm -rf $(_BUILD_STRACE)

 # #####################################################################
@ -285,36 +242,37 @@ _PACKAGE_BRIDGE_UTILS=$(_DOWNLOAD_DIR)/bridge-utils-1.0.4.tar.gz
 _DOWNLOAD_BRIDGE_UTILS=http://mesh.dl.sourceforge.net/sourceforge/bridge/bridge-utils-1.0.4.tar.gz
 _BUILD_BRIDGE_UTILS=$(_SOURCE)/bridge-utils-1.0.4

-bridge-utils: bridge-utils-clean $(_STATE)/bridge-utils.all_done
+bridge-utils: bridge-utils-clean $(_BUILD_BRIDGE_UTILS)/.all_done

 bridge-utils-fetch: $(_PACKAGE_BRIDGE_UTILS)

 $(_PACKAGE_BRIDGE_UTILS):
 	$(WGET) -P $(_DOWNLOAD_DIR) $(_DOWNLOAD_BRIDGE_UTILS)

-$(_STATE)/bridge-utils.unpacked: $(_PACKAGE_BRIDGE_UTILS)
+$(_BUILD_BRIDGE_UTILS)/.unpacked: $(_PACKAGE_BRIDGE_UTILS)
 	tar -C $(_SOURCE) -xzf $(_PACKAGE_BRIDGE_UTILS)
-	touch $(_STATE)/bridge-utils.unpacked
+	touch $(_BUILD_BRIDGE_UTILS)/.unpacked

-$(_STATE)/bridge-utils.configured: $(_STATE)/bridge-utils.unpacked
-	(cd $(_BUILD_BRIDGE_UTILS); $(CONFIGURE) --prefix=/usr --with-linux-headers=$(_KERNELHEADERS));
-	touch $(_STATE)/bridge-utils.configured
+$(_BUILD_BRIDGE_UTILS)/.configured: $(_BUILD_BRIDGE_UTILS)/.unpacked
+	(cd $(_BUILD_BRIDGE_UTILS); $(CROSS_CONFIGURE) --prefix=/usr --with-linux-headers=$(_KERNELHEADERS));
+	touch $(_BUILD_BRIDGE_UTILS)/.configured

-$(_STATE)/bridge-utils.compiled: $(_STATE)/bridge-utils.configured
-	make -C $(_BUILD_BRIDGE_UTILS) all
-	touch $(_STATE)/bridge-utils.compiled
+$(_BUILD_BRIDGE_UTILS)/.compiled: $(_BUILD_BRIDGE_UTILS)/.configured
+	make -C $(_BUILD_BRIDGE_UTILS) $(CROSS_TOOLS) all
+	touch $(_BUILD_BRIDGE_UTILS)/.compiled

-$(_STATE)/bridge-utils.all_done: $(_STATE)/bridge-utils.compiled
-	$(STRIP) --strip-all $(_BUILD_BRIDGE_UTILS)/brctl/brctl
-	touch $(_STATE)/bridge-utils.all_done
+$(_BUILD_BRIDGE_UTILS)/.all_done: $(_BUILD_BRIDGE_UTILS)/.compiled
+	$(CROSS_STRIP) --strip-all $(_BUILD_BRIDGE_UTILS)/brctl/brctl
+	touch $(_BUILD_BRIDGE_UTILS)/.all_done

-bridge-utils-install: $(_STAGE2) $(_STATE)/bridge-utils.all_done
+bridge-utils-install: $(_STAGE2) $(_BUILD_BRIDGE_UTILS)/.all_done
 	cp $(_BUILD_BRIDGE_UTILS)/brctl/brctl $(_STAGE2)/usr/sbin

 bridge-utils-clean:
-	rm -f $(_STATE)/bridge-utils.*
+	rm -f $(_BUILD_BRIDGE_UTILS)/.configured $(_BUILD_BRIDGE_UTILS)/.compiled \
+		$(_BUILD_BRIDGE_UTILS)/.all_done

-bridge-utils-distclean: bridge-utils-clean
+bridge-utils-distclean: 
 	rm -rf $(_BUILD_BRIDGE_UTILS)

 # #####################################################################
@ -322,38 +280,39 @@ _PACKAGE_IPROUTE2=$(_DOWNLOAD_DIR)/iproute2-2.6.10-050209.tar.gz
 _DOWNLOAD_IPROUTE2=http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.10-050209.tar.gz
 _BUILD_IPROUTE2=$(_SOURCE)/iproute2-2.6.9-050209

-iproute2: iproute2-clean $(_STATE)/iproute2.all_done
+iproute2: iproute2-clean $(_BUILD_IPROUTE2)/.all_done

 iproute2-fetch: $(_PACKAGE_IPROUTE2)

 $(_PACKAGE_IPROUTE2):
 	$(WGET) -P $(_DOWNLOAD_DIR) $(_DOWNLOAD_IPROUTE2)

-$(_STATE)/iproute2.unpacked: $(_PACKAGE_IPROUTE2)
+$(_BUILD_IPROUTE2)/.unpacked: $(_PACKAGE_IPROUTE2)
 	tar -C $(_SOURCE) -xzf $(_PACKAGE_IPROUTE2)
-	touch $(_STATE)/iproute2.unpacked
+	touch $(_BUILD_IPROUTE2)/.unpacked

-$(_STATE)/iproute2.configured: $(_STATE)/iproute2.unpacked
-	(cd $(_BUILD_IPROUTE2); $(CONFIGURE) --prefix=/usr);
-	touch $(_STATE)/iproute2.configured
+$(_BUILD_IPROUTE2)/.configured: $(_BUILD_IPROUTE2)/.unpacked
+	(cd $(_BUILD_IPROUTE2); $(CROSS_CONFIGURE) --prefix=/usr);
+	touch $(_BUILD_IPROUTE2)/.configured

-$(_STATE)/iproute2.compiled: $(_STATE)/iproute2.configured
-	make -C $(_BUILD_IPROUTE2) CC=$(CC) all
-	touch $(_STATE)/iproute2.compiled
+$(_BUILD_IPROUTE2)/.compiled: $(_BUILD_IPROUTE2)/.configured
+	make -C $(_BUILD_IPROUTE2) $(CROSS_TOOLS) all
+	touch $(_BUILD_IPROUTE2)/.compiled

-$(_STATE)/iproute2.all_done: $(_STATE)/iproute2.compiled
-	$(STRIP) --strip-all $(_BUILD_IPROUTE2)/ip/ip
-	$(STRIP) --strip-all $(_BUILD_IPROUTE2)/tc/tc
-	touch $(_STATE)/iproute2.all_done
+$(_BUILD_IPROUTE2)/.all_done: $(_BUILD_IPROUTE2)/.compiled
+	$(CROSS_STRIP) --strip-all $(_BUILD_IPROUTE2)/ip/ip
+	$(CROSS_STRIP) --strip-all $(_BUILD_IPROUTE2)/tc/tc
+	touch $(_BUILD_IPROUTE2)/.all_done

-iproute2-install: $(_STAGE2) $(_STATE)/iproute2.all_done
+iproute2-install: $(_STAGE2) $(_BUILD_IPROUTE2)/.all_done
 	cp $(_BUILD_IPROUTE2)/ip/ip $(_STAGE2)/sbin
 	cp $(_BUILD_IPROUTE2)/tc/tc $(_STAGE2)/sbin

 iproute2-clean:
-	rm -f $(_STATE)/iproute2.*
+	rm -f $(_BUILD_IPROUTE2)/.configured $(_BUILD_IPROUTE2)/.compiled \
+		$(_BUILD_IPROUTE2)/.all_done

-iproute2-distclean: iproute2-clean
+iproute2-distclean:
 	rm -rf $(_BUILD_IPROUTE2)

 # #####################################################################
@ -361,47 +320,308 @@ _PACKAGE_PPPD=$(_DOWNLOAD_DIR)/ppp-2.4.2.tar.gz
 _DOWNLOAD_PPPD=ftp://ftp.samba.org/pub/ppp/ppp-2.4.2.tar.gz
 _BUILD_PPPD=$(_SOURCE)/ppp-2.4.2

-pppd: pppd-clean $(_STATE)/pppd.all_done
+pppd: pppd-clean $(_BUILD_PPPD)/.all_done

 pppd-fetch: $(_PACKAGE_PPPD)

 $(_PACKAGE_PPPD):
 	$(WGET) -P $(_DOWNLOAD_DIR) $(_DOWNLOAD_PPPD)

-$(_STATE)/pppd.unpacked: $(_PACKAGE_PPPD)
+$(_BUILD_PPPD)/.unpacked: $(_PACKAGE_PPPD)
 	tar -C $(_SOURCE) -xzf $(_PACKAGE_PPPD)
-	touch $(_STATE)/pppd.unpacked
+	touch $(_BUILD_PPPD)/.unpacked

-$(_STATE)/pppd.configured: $(_STATE)/pppd.unpacked
-	(cd $(_BUILD_PPPD); $(CONFIGURE) --prefix=/usr);
-	sed -i -e "s/^FILTER=y/#FILTER=y/" $(_BUILD_PPPD)/pppd/Makefile
-	sed -i -e "s/^CC\t= gcc/#CC\t= gcc/" $(_BUILD_PPPD)/pppd/plugins/Makefile
-	sed -i -e "s/^\tgcc/\t\$$\(CC\)/" -e "s/^\tar/\t\$$\(AR\)/" $(_BUILD_PPPD)/pppd/plugins/rp-pppoe/Makefile
-	touch $(_STATE)/pppd.configured
+$(_BUILD_PPPD)/.patched: $(_BUILD_PPPD)/.unpacked
+	(cd $(_BUILD_PPPD); cat $(_PATCHES)/???_ppp-*.patch | patch -p1 );
+	touch $(_BUILD_PPPD)/.patched

-$(_STATE)/pppd.compiled: $(_STATE)/pppd.configured
-	make -C $(_BUILD_PPPD) all
-	touch $(_STATE)/pppd.compiled
+$(_BUILD_PPPD)/.configured: $(_BUILD_PPPD)/.patched
+	(cd $(_BUILD_PPPD); $(CROSS_CONFIGURE) --prefix=/usr);
+	touch $(_BUILD_PPPD)/.configured

-$(_STATE)/pppd.all_done: $(_STATE)/pppd.compiled
-	$(STRIP) --strip-all $(_BUILD_PPPD)/chat/chat
-	$(STRIP) --strip-all $(_BUILD_PPPD)/pppd/pppd
-	$(STRIP) --strip-all $(_BUILD_PPPD)/pppd/plugins/rp-pppoe/rp-pppoe.so
-	$(STRIP) --strip-all $(_BUILD_PPPD)/pppstats/pppstats
-	touch $(_STATE)/pppd.all_done
+$(_BUILD_PPPD)/.compiled: $(_BUILD_PPPD)/.configured
+	make -C $(_BUILD_PPPD) $(CROSS_TOOLS) all
+	touch $(_BUILD_PPPD)/.compiled

-pppd-install: $(_STAGE2) $(_STATE)/pppd.all_done
+$(_BUILD_PPPD)/.all_done: $(_BUILD_PPPD)/.compiled
+	$(CROSS_STRIP) --strip-all $(_BUILD_PPPD)/chat/chat
+	$(CROSS_STRIP) --strip-all $(_BUILD_PPPD)/pppd/pppd
+	$(CROSS_STRIP) --strip-all $(_BUILD_PPPD)/pppd/plugins/rp-pppoe/rp-pppoe.so
+	$(CROSS_STRIP) --strip-all $(_BUILD_PPPD)/pppstats/pppstats
+	touch $(_BUILD_PPPD)/.all_done
+
+pppd-install: $(_STAGE2) $(_BUILD_PPPD)/.all_done
 	cp $(_BUILD_PPPD)/chat/chat $(_STAGE2)/usr/bin
 	cp $(_BUILD_PPPD)/pppd/pppd $(_STAGE2)/usr/sbin
 	cp $(_BUILD_PPPD)/pppd/plugins/rp-pppoe/rp-pppoe.so $(_STAGE2)/etc/ppp/plugins/
 	cp $(_BUILD_PPPD)/pppstats/pppstats $(_STAGE2)/usr/bin

 pppd-clean:
-	rm -f $(_STATE)/pppd.*
+	rm -f $(_BUILD_PPPD)/.configured $(_BUILD_PPPD)/.compiled $(_BUILD_PPPD)/.all_done

-pppd-distclean: pppd-clean
+pppd-distclean:
 	rm -rf $(_BUILD_PPPD)

+# #####################################################################
+# BUILD HOST TOOLCHAIN 
+# #####################################################################
+_PACKAGE_BINUTILS=$(_DOWNLOAD_DIR)/binutils-2.13.2.1.tar.bz2
+_DOWNLOAD_BINUTILS=ftp://ftp.fu-berlin.de/unix/gnu/binutils/binutils-2.13.2.1.tar.bz2
+_BUILD_BINUTILS_SRC=$(_SOURCE)/binutils-2.13.2.1
+_BUILD_BINUTILS=$(_SOURCE)/binutils-2.13.2.1-host
+
+binutils: binutils-clean $(_BUILD_BINUTILS)/.all-done
+
+binutils-fetch: $(_PACKAGE_BINUTILS)
+
+$(_PACKAGE_BINUTILS):
+	$(WGET) -P $(_DOWNLOAD_DIR) $(_DOWNLOAD_BINUTILS)
+
+$(_BUILD_BINUTILS_SRC)/.unpacked: $(_PACKAGE_BINUTILS)
+	tar -C $(_SOURCE) -xjf $(_PACKAGE_BINUTILS)
+	touch $(_BUILD_BINUTILS_SRC)/.unpacked
+
+$(_BUILD_BINUTILS_SRC)/.patched: $(_BUILD_BINUTILS_SRC)/.unpacked
+	(cd $(_BUILD_BINUTILS_SRC); cat $(_PATCHES)/???_binutils-*.patch | patch -p1 );
+	touch $(_BUILD_BINUTILS_SRC)/.patched
+
+$(_BUILD_BINUTILS)/.configured: $(_BUILD_BINUTILS_SRC)/.patched
+	mkdir -p $(_BUILD_BINUTILS)
+	(cd $(_BUILD_BINUTILS); $(_BUILD_BINUTILS_SRC)/configure \
+		--build=i386-pc-linux-gnu \
+		--host=i386-pc-linux-gnu \
+		--target=mipsel-linux-uclibc \
+		--prefix=$(_TOOLCHAIN) \
+		--disable-nls \
+		--with-bcm4710a0 );
+	touch $(_BUILD_BINUTILS)/.configured
+
+$(_BUILD_BINUTILS)/.all-done: $(_BUILD_BINUTILS)/.configured
+	make -C $(_BUILD_BINUTILS) all
+	touch $(_BUILD_BINUTILS)/.all-done
+
+binutils-install: $(_BUILD_BINUTILS)/.all-done
+	mkdir -p $(_TOOLCHAIN)/lib $(_TOOLCHAIN)/mipsel-linux-uclibc
+	(cd $(_TOOLCHAIN)/mipsel-linux-uclibc; ln -s ../lib lib);
+	make -C $(_BUILD_BINUTILS) install
+
+binutils-clean:
+	rm -f $(_BUILD_BINUTILS)/.configured $(_BUILD_BINUTILS)/.compiled $(_BUILD_BINUTILS)/.all-done
+
+binutils-distclean:
+	rm -rf $(_BUILD_BINUTILS)
+
+# #####################################################################
+_PACKAGE_GCC=$(_DOWNLOAD_DIR)/gcc-3.2.3.tar.gz
+_DOWNLOAD_GCC=ftp://ftp.fu-berlin.de/unix/gnu/gcc/gcc-3.2.3.tar.gz
+_BUILD_GCC_SRC=$(_SOURCE)/gcc-3.2.3
+_BUILD_GCC1=$(_BUILD_GCC_SRC)-initial
+
+gcc-initial: $(_BUILD_GCC1)/.all-done
+
+gcc-fetch: $(_PACKAGE_GCC)
+gcc-initial-fetch: $(_PACKAGE_GCC)
+
+$(_PACKAGE_GCC):
+	$(WGET) -P $(_DOWNLOAD_DIR) $(_DOWNLOAD_GCC)
+
+$(_BUILD_GCC_SRC)/.unpacked: $(_PACKAGE_GCC)
+	tar -C $(_SOURCE) -xzf $(_PACKAGE_GCC)
+	touch $(_BUILD_GCC_SRC)/.unpacked
+
+$(_BUILD_GCC_SRC)/.patched: $(_BUILD_GCC_SRC)/.unpacked
+	(cd $(_BUILD_GCC_SRC); cat $(_PATCHES)/???_gcc-*.patch | patch -p1 );
+	touch $(_BUILD_GCC_SRC)/.patched
+
+$(_BUILD_GCC1)/.configured: $(_BUILD_GCC_SRC)/.patched
+	mkdir -p $(_BUILD_GCC1)
+	(cd $(_BUILD_GCC1); $(_BUILD_GCC_SRC)/configure \
+		--build=i386-pc-linux-gnu \
+		--host=i386-pc-linux-gnu \
+		--target=mipsel-linux-uclibc \
+		--prefix=$(_TOOLCHAIN) \
+		--enable-languages=c \
+		--disable-shared \
+		--disable-threads \
+		--disable-nls \
+		--with-gnu-ld \
+		--with-gnu-as \
+		--with-bcm4710a0 );
+	touch $(_BUILD_GCC1)/.configured
+
+$(_BUILD_GCC1)/.all-done: $(_BUILD_GCC1)/.configured
+	make -C $(_BUILD_GCC1) all-gcc
+	touch $(_BUILD_GCC1)/.all-done
+
+gcc-initial-install: $(_BUILD_GCC1)/.all-done
+	make -C $(_BUILD_GCC1) install-gcc
+
+gcc-initial-clean:
+	rm -f $(_BUILD_GCC1)/.configured $(_BUILD_GCC1)/.compiled $(_BUILD_GCC1)/.all-done
+
+gcc-initial-distclean:
+	rm -rf $(_BUILD_GCC1)
+
+# #####################################################################
+_PACKAGE_UCLIBC=$(_DOWNLOAD_DIR)/uClibc-0.9.27.tar.bz2
+_DOWNLOAD_UCLIBC=http://www.uclibc.org/downloads/uClibc-0.9.27.tar.bz2
+_BUILD_UCLIBC=$(_SOURCE)/uClibc-0.9.27
+
+uclibc: $(_BUILD_UCLIBC)/.all-done
+
+uclibc-fetch: $(_PACKAGE_UCLIBC)
+
+$(_PACKAGE_UCLIBC):
+	$(WGET) -P $(_DOWNLOAD_DIR) $(_DOWNLOAD_UCLIBC)
+
+$(_BUILD_UCLIBC)/.unpacked: $(_PACKAGE_UCLIBC)
+	tar -C $(_SOURCE) -xjf $(_PACKAGE_UCLIBC)
+	touch $(_BUILD_UCLIBC)/.unpacked
+
+$(_BUILD_UCLIBC)/.configured: $(_BUILD_UCLIBC)/.unpacked
+	cp $(_CONFIGS)/uclibc.conf $(_BUILD_UCLIBC)/.config
+	sed -i -e 's:KERNEL_SOURCE=.*:KERNEL_SOURCE=\"$(_BUILD_KERNEL)\":g' $(_BUILD_UCLIBC)/.config
+	sed -i -e 's:RUNTIME_PREFIX=.*:RUNTIME_PREFIX=\"$(_TOOLCHAIN)\":g' $(_BUILD_UCLIBC)/.config
+	sed -i -e 's:DEVEL_PREFIX=.*:DEVEL_PREFIX=\"$(_TOOLCHAIN)\":g' $(_BUILD_UCLIBC)/.config
+	make -C $(_BUILD_UCLIBC) oldconfig
+	touch $(_BUILD_UCLIBC)/.configured
+
+$(_BUILD_UCLIBC)/.all-done: $(_BUILD_UCLIBC)/.configured
+	make -C $(_BUILD_UCLIBC) CROSS=mipsel-linux-uclibc- DEVEL_PREFIX=$(_TOOLCHAIN) all
+	make -C $(_BUILD_UCLIBC)/utils RUNTIME_PREFIX=$(_TOOLCHAIN) hostutils
+	touch $(_BUILD_UCLIBC)/.all-done
+
+uclibc-install: $(_BUILD_UCLIBC)/.all-done
+	make -C $(_BUILD_UCLIBC) install
+	cp $(_BUILD_UCLIBC)/utils/ldd.host $(_TOOLCHAIN)/bin/mipsel-linux-uclibc-ldd
+
+uclibc-clean:
+	rm -f $(_BUILD_UCLIBC)/.configured $$(_BUILD_UCLIBC)/.compiled $(_BUILD_UCLIBC)/.all-done
+
+uclibc-distclean:
+	rm -rf $(_BUILD_UCLIBC)
+
+# #####################################################################
+_BUILD_GCC2=$(_BUILD_GCC_SRC)-final
+
+gcc-final: $(_BUILD_GCC2)/.all-done
+
+$(_BUILD_GCC2)/.configured: $(_BUILD_GCC_SRC)/.patched
+	mkdir -p $(_BUILD_GCC2)
+	(cd $(_TOOLCHAIN)/mipsel-linux-uclibc; ln -s ../include sys-include);
+	(cd $(_BUILD_GCC2); $(_BUILD_GCC_SRC)/configure \
+		--build=i386-pc-linux-gnu \
+		--host=i386-pc-linux-gnu \
+		--target=mipsel-linux-uclibc \
+		--prefix=$(_TOOLCHAIN) \
+		--enable-languages=c,c++ \
+		--enable-shared \
+		--disable-nls \
+		--with-gnu-ld \
+		--with-gnu-as \
+		--with-bcm4710a0 );
+	touch $(_BUILD_GCC2)/.configured
+
+$(_BUILD_GCC2)/.all-done: $(_BUILD_GCC2)/.configured
+	make -C $(_BUILD_GCC2) all
+	touch $(_BUILD_GCC2)/.all-done
+
+gcc-final-install: $(_BUILD_GCC2)/.all-done
+	make -C $(_BUILD_GCC2) install
+	set -e; (cd $(_TOOLCHAIN); \
+		ln -sf mipsel-linux-uclibc mipsel-linux; \
+		cd bin; \
+		for app in mipsel-linux-uclibc-* ; do \
+			ln -sf $${app} mipsel-linux$${app##mipsel-linux-uclibc}; \
+		done; \
+	);
+
+gcc-final-clean:
+	rm -f $(_BUILD_GCC2)/.configured $(_BUILD_GCC2)/.compiled $(_BUILD_GCC2)/.all-done
+
+gcc-final-distclean:
+	rm -rf $(_BUILD_GCC2)
+
+# #####################################################################
+# BUILD HOST UTILS
+# #####################################################################
+_PACKAGE_CRAMFS=$(_DOWNLOAD_DIR)/cramfs-1.1.tar.gz
+_DOWNLOAD_CRAMFS=http://mesh.dl.sourceforge.net/sourceforge/cramfs/cramfs-1.1.tar.gz
+_BUILD_CRAMFS=$(_SOURCE)/cramfs-1.1
+
+cramfs: cramfs-clean $(_BUILD_CRAMFS)/.all_done
+
+cramfs-fetch: $(_PACKAGE_CRAMFS)
+
+$(_PACKAGE_CRAMFS):
+	$(WGET) -P $(_DOWNLOAD_DIR) $(_DOWNLOAD_CRAMFS)
+
+$(_BUILD_CRAMFS)/.unpacked: $(_PACKAGE_CRAMFS)
+	tar -C $(_SOURCE) -xzf $(_PACKAGE_CRAMFS)
+	touch $(_BUILD_CRAMFS)/.unpacked
+
+$(_BUILD_CRAMFS)/.all_done: $(_BUILD_CRAMFS)/.unpacked
+	make -C $(_BUILD_CRAMFS) all
+	touch $(_BUILD_CRAMFS)/.all_done
+
+cramfs-install: $(_BUILD_CRAMFS)/.all_done
+
+cramfs-clean:
+	rm -f $(_BUILD_CRAMFS)/.all_done
+
+cramfs-distclean:
+	rm -rf $(_BUILD_CRAMFS)
+
+# #####################################################################
+_BUILD_TOOLS=$(_TOOLS)
+
+tools: tools-clean $(_BUILD_TOOLS)/.all-done
+
+tools-fetch:
+
+$(_BUILD_TOOLS)/.all-done:
+	make -C $(_BUILD_TOOLS) all
+	touch $(_BUILD_TOOLS)/.all-done
+
+tools-install: $(_BUILD_TOOLS)/.all-done
+
+tools-clean:
+	rm -f $(_BUILD_TOOLS)/.all-done
+
+tools-distclean: tools-clean
+	make -C $(_BUILD_TOOLS) clean
+
+# #####################################################################
+# MAIN TARGETS
+# #####################################################################
+toolchain: $(_TOOLCHAIN)/.all-done
+
+toolchain-fetch: binutils-fetch gcc-fetch uclibc-fetch kernel-fetch
+
+# binutils (+ extracted patches from broadcom hnd-tools + uclibc buildroot patches)
+$(_TOOLCHAIN)/.step1: binutils-install
+	touch $(_TOOLCHAIN)/.step1
+
+# static gcc (+ extracted patches from broadcom hnd-tools + uclibc buildroot patches)
+$(_TOOLCHAIN)/.step2: $(_TOOLCHAIN)/.step1 gcc-initial-install
+	touch $(_TOOLCHAIN)/.step2
+
+# kernel header
+$(_TOOLCHAIN)/.step3: $(_TOOLCHAIN)/.step2 $(_BUILD_KERNEL)/.configured
+	touch $(_TOOLCHAIN)/.step3
+
+# uclibc 
+$(_TOOLCHAIN)/.step4: $(_TOOLCHAIN)/.step3 uclibc-install
+	touch $(_TOOLCHAIN)/.step4
+
+# shared gcc (+ extracted patches from broadcom hnd-tools + uclibc buildroot patches)
+$(_TOOLCHAIN)/.step5: $(_TOOLCHAIN)/.step4 gcc-final-install
+	touch $(_TOOLCHAIN)/.step5
+
+# final
+$(_TOOLCHAIN)/.all-done: $(_TOOLCHAIN)/.step5
+	touch $(_TOOLCHAIN)/.all-done
+
 # #####################################################################
 _STAGE1_REAL_TARGETS:=$(patsubst %,%-install,$(_STAGE1_TARGETS))
 _STAGE1_FETCH_TARGETS:=$(patsubst %,%-fetch,$(_STAGE1_TARGETS))
@ -417,9 +637,9 @@ $(_STAGE1_IMG):

 stage1: $(_STAGE1) $(_STAGE1_IMG) $(_STAGE1_REAL_TARGETS)
 	$(_BUILD_CRAMFS)/mkcramfs $(_STAGE1) $(_STAGE1_IMG)/stage1.cramfs
-	$(_TOOLS)/trx -o $(_STAGE1_IMG)/firmware.trx \
-		$(_BUILD_KERNEL)/arch/mips/brcm-boards/bcm947xx/compressed/vmlinuz \
-		$(_STAGE1_IMG)/stage1.cramfs
+	$(_TOOLS)/trx $(_BUILD_KERNEL)/arch/mips/brcm-boards/bcm947xx/compressed/vmlinuz \
+		$(_STAGE1_IMG)/stage1.cramfs > \
+		$(_STAGE1_IMG)/firmware.trx 
 	$(_TOOLS)/gen_image $(_STAGE1_IMG)/firmware.trx > $(_STAGE1_IMG)/firmware.img

 stage1-fetch: $(_STAGE1_FETCH_TARGETS)
@ -442,7 +662,7 @@ $(_STAGE2):

 stage2: $(_STAGE2) $(_STAGE2_REAL_TARGETS)
 	cp -r $(_STAGE2_SKEL)/* $(_STAGE2)
-	cp -r $(TOOLCHAIN)/lib/*.so* $(_STAGE2)/lib/
+	cp -r $(_TOOLCHAIN)/lib/*.so* $(_STAGE2)/lib/

 stage2-fetch: $(_STAGE2_FETCH_TARGETS)

@ -452,7 +672,8 @@ stage2-distclean: $(_STAGE2_DISTCLEAN_TARGETS)
 	rm -rf $(_STAGE2)

 # #####################################################################
-
+# SUPPORT
+# #####################################################################
 sync:
 	mount /dev/sda1 /mnt/usbdisk
 	rsync -a -c --delete --progress --stats $(_STAGE2)/ /mnt/usbdisk
--- a/configs/busybox-stage1.conf
+++ b/configs/busybox-stage1.conf
@ -24,7 +24,7 @@ CONFIG_FEATURE_DEVFS=y
 CONFIG_STATIC=y
 # CONFIG_LFS is not set
 USING_CROSS_COMPILER=y
-CROSS_COMPILER_PREFIX="mipsel-uclibc-"
+CROSS_COMPILER_PREFIX="mipsel-linux-uclibc-"
 EXTRA_CFLAGS_OPTIONS=""

 #
--- a/configs/busybox-stage2.conf
+++ b/configs/busybox-stage2.conf
@ -25,7 +25,7 @@ CONFIG_FEATURE_SUID=y
 # CONFIG_STATIC is not set
 # CONFIG_LFS is not set
 USING_CROSS_COMPILER=y
-CROSS_COMPILER_PREFIX="mipsel-uclibc-"
+CROSS_COMPILER_PREFIX="mipsel-linux-uclibc-"
 EXTRA_CFLAGS_OPTIONS=""

 #
--- a/configs/kernel-vanilla2siemens_small.patch.bz2
+++ b/configs/kernel-vanilla2siemens_small.patch.bz2
--- a/configs/uclibc.conf
+++ b/configs/uclibc.conf
@ -0,0 +1,155 @@
+#
+# Automatically generated make config: don't edit
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+TARGET_mips=y
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+
+#
+# Target Architecture Features and Options
+#
+HAVE_ELF=y
+ARCH_SUPPORTS_LITTLE_ENDIAN=y
+TARGET_ARCH="mips"
+ARCH_CFLAGS="-mno-split-addresses"
+ARCH_SUPPORTS_BIG_ENDIAN=y
+CONFIG_MIPS_ISA_1=y
+# CONFIG_MIPS_ISA_2 is not set
+# CONFIG_MIPS_ISA_3 is not set
+# CONFIG_MIPS_ISA_4 is not set
+# CONFIG_MIPS_ISA_MIPS32 is not set
+# CONFIG_MIPS_ISA_MIPS64 is not set
+ARCH_LITTLE_ENDIAN=y
+# ARCH_BIG_ENDIAN is not set
+# ARCH_HAS_NO_MMU is not set
+ARCH_HAS_MMU=y
+UCLIBC_HAS_FLOATS=y
+HAS_FPU=y
+DO_C99_MATH=y
+WARNINGS="-Wall"
+KERNEL_SOURCE="/usr/src/linux"
+C_SYMBOL_PREFIX=""
+HAVE_DOT_CONFIG=y
+
+#
+# General Library Settings
+#
+# HAVE_NO_PIC is not set
+DOPIC=y
+# HAVE_NO_SHARED is not set
+HAVE_SHARED=y
+# ARCH_HAS_NO_LDSO is not set
+BUILD_UCLIBC_LDSO=y
+# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
+LDSO_LDD_SUPPORT=y
+# LDSO_CACHE_SUPPORT is not set
+# LDSO_PRELOAD_FILE_SUPPORT is not set
+UCLIBC_CTOR_DTOR=y
+# HAS_NO_THREADS is not set
+UCLIBC_HAS_THREADS=y
+# PTHREADS_DEBUG_SUPPORT is not set
+UCLIBC_HAS_LFS=y
+# MALLOC is not set
+# MALLOC_SIMPLE is not set
+MALLOC_STANDARD=y
+# MALLOC_GLIBC_COMPAT is not set
+UCLIBC_DYNAMIC_ATEXIT=y
+HAS_SHADOW=y
+UNIX98PTY_ONLY=y
+ASSUME_DEVPTS=y
+UCLIBC_HAS_TM_EXTENSIONS=y
+UCLIBC_HAS_TZ_CACHING=y
+UCLIBC_HAS_TZ_FILE=y
+# UCLIBC_HAS_TZ_FILE_READ_MANY is not set
+UCLIBC_TZ_FILE_PATH="/etc/TZ"
+
+#
+# Networking Support
+#
+# UCLIBC_HAS_IPV6 is not set
+UCLIBC_HAS_RPC=y
+# UCLIBC_HAS_FULL_RPC is not set
+
+#
+# String and Stdio Support
+#
+UCLIBC_HAS_STRING_GENERIC_OPT=y
+UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_CTYPE_TABLES=y
+UCLIBC_HAS_CTYPE_SIGNED=y
+UCLIBC_HAS_CTYPE_UNSAFE=y
+# UCLIBC_HAS_CTYPE_CHECKED is not set
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
+# UCLIBC_HAS_WCHAR is not set
+# UCLIBC_HAS_LOCALE is not set
+# UCLIBC_HAS_HEXADECIMAL_FLOATS is not set
+# UCLIBC_HAS_GLIBC_CUSTOM_PRINTF is not set
+# USE_OLD_VFPRINTF is not set
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+# UCLIBC_HAS_SCANF_GLIBC_A_FLAG is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+UCLIBC_HAS_STDIO_BUFSIZ_4096=y
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+UCLIBC_HAS_STDIO_GETC_MACRO=y
+UCLIBC_HAS_STDIO_PUTC_MACRO=y
+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
+# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+# UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE is not set
+# UCLIBC_HAS_GLIBC_CUSTOM_STREAMS is not set
+# UCLIBC_HAS_PRINTF_M_SPEC is not set
+UCLIBC_HAS_ERRNO_MESSAGES=y
+# UCLIBC_HAS_SYS_ERRLIST is not set
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+# UCLIBC_HAS_SYS_SIGLIST is not set
+UCLIBC_HAS_GNU_GETOPT=y
+
+#
+# Big and Tall
+#
+UCLIBC_HAS_REGEX=y
+# UCLIBC_HAS_WORDEXP is not set
+# UCLIBC_HAS_FTW is not set
+UCLIBC_HAS_GLOB=y
+
+#
+# Library Installation Options
+#
+SHARED_LIB_LOADER_PREFIX="/lib"
+RUNTIME_PREFIX="/"
+DEVEL_PREFIX="/"
+
+#
+# uClibc security related options
+#
+# UCLIBC_SECURITY is not set
+
+#
+# uClibc development/debugging options
+#
+# DODEBUG is not set
+# DOASSERTS is not set
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
+# UCLIBC_MJN3_ONLY is not set
--- a/patches/001_binutils-uclibc-conf.patch
+++ b/patches/001_binutils-uclibc-conf.patch
@ -0,0 +1,132 @@
+diff -uNr binutils-2.13.2.1.org/bfd/configure binutils-2.13.2.1/bfd/configure
+--- binutils-2.13.2.1.org/bfd/configure	2003-01-02 02:23:03.000000000 +0100
+++ binutils-2.13.2.1/bfd/configure	2005-02-16 23:00:44.042810464 +0100
+@@ -1677,6 +1677,11 @@
+   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+   ;;
+ 
+linux-uclibc*)
+  lt_cv_deplibs_check_method=pass_all
+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
+  ;;
+
+ netbsd*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
+diff -uNr binutils-2.13.2.1.org/config.sub binutils-2.13.2.1/config.sub
+--- binutils-2.13.2.1.org/config.sub	2002-07-14 03:14:52.000000000 +0200
+++ binutils-2.13.2.1/config.sub	2005-02-16 22:58:22.251366040 +0100
+@@ -118,7 +118,7 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-uclibc* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
+@@ -1085,7 +1085,7 @@
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+diff -uNr binutils-2.13.2.1.org/gas/configure binutils-2.13.2.1/gas/configure
+--- binutils-2.13.2.1.org/gas/configure	2002-10-30 18:07:37.000000000 +0100
+++ binutils-2.13.2.1/gas/configure	2005-02-16 23:01:33.837240560 +0100
+@@ -1554,6 +1554,11 @@
+   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+   ;;
+ 
+linux-uclibc*)
+  lt_cv_deplibs_check_method=pass_all
+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
+  ;;
+
+ netbsd*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
+diff -uNr binutils-2.13.2.1.org/ld/configure binutils-2.13.2.1/ld/configure
+--- binutils-2.13.2.1.org/ld/configure	2002-07-14 03:14:44.000000000 +0200
+++ binutils-2.13.2.1/ld/configure	2005-02-16 23:02:21.460000800 +0100
+@@ -1552,6 +1552,11 @@
+   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+   ;;
+ 
+linux-uclibc*)
+  lt_cv_deplibs_check_method=pass_all
+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
+  ;;
+
+ netbsd*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
+diff -uNr binutils-2.13.2.1.org/ld/configure.tgt binutils-2.13.2.1/ld/configure.tgt
+--- binutils-2.13.2.1.org/ld/configure.tgt	2002-10-28 16:58:12.000000000 +0100
+++ binutils-2.13.2.1/ld/configure.tgt	2005-02-16 23:03:29.906595336 +0100
+@@ -388,9 +388,11 @@
+ mips*-*-rtems*)		targ_emul=elf32ebmip ;;
+ mips*el-*-vxworks*)	targ_emul=elf32elmip ;;
+ mips*-*-vxworks*)	targ_emul=elf32ebmip ;;
+mips*el-*-linux-uclibc | \
+ mips*el-*-linux-gnu*)	targ_emul=elf32ltsmip
+ 			targ_extra_emuls="elf32btsmip elf64ltsmip elf64btsmip"
+ 			;;
+mips*-*-linux-uclibc | \
+ mips*-*-linux-gnu*)	targ_emul=elf32btsmip
+ 			targ_extra_emuls="elf32ltsmip elf64btsmip elf64ltsmip"
+ 			;;
+diff -uNr binutils-2.13.2.1.org/libtool.m4 binutils-2.13.2.1/libtool.m4
+--- binutils-2.13.2.1.org/libtool.m4	2002-01-28 05:59:30.000000000 +0100
+++ binutils-2.13.2.1/libtool.m4	2005-02-16 23:04:07.106940024 +0100
+@@ -631,6 +631,11 @@
+   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+   ;;
+ 
+linux-uclibc*)
+  lt_cv_deplibs_check_method=pass_all
+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
+  ;;
+
+ netbsd*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
+diff -uNr binutils-2.13.2.1.org/ltconfig binutils-2.13.2.1/ltconfig
+--- binutils-2.13.2.1.org/ltconfig	2002-01-28 05:59:30.000000000 +0100
+++ binutils-2.13.2.1/ltconfig	2005-02-16 23:05:24.156226752 +0100
+@@ -603,6 +603,7 @@
+ # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+ case $host_os in
+ linux-gnu*) ;;
+linux-uclibc*) ;;
+ linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+ esac
+ 
+@@ -1239,6 +1240,24 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+linux-uclibc*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  # Note: copied from linux-gnu, and may not be appropriate.
+  hardcode_into_libs=yes
+  # Assume using the uClibc dynamic linker.
+  dynamic_linker="uClibc ld.so"
+  ;;
+
+ netbsd*)
+   need_lib_prefix=no
+   need_version=no
--- a/patches/001_gcc-uclibc-conf.patch
+++ b/patches/001_gcc-uclibc-conf.patch
--- a/patches/001_kernel-vanilla2siemens.patch.bz2
+++ b/patches/001_kernel-vanilla2siemens.patch.bz2
--- a/patches/001_ppp-build.patch
+++ b/patches/001_ppp-build.patch
@ -0,0 +1,60 @@
+diff -uNr ppp-2.4.2.org/pppd/Makefile.linux ppp-2.4.2/pppd/Makefile.linux
+--- ppp-2.4.2.org/pppd/Makefile.linux	2003-11-27 22:55:19.000000000 +0100
+++ ppp-2.4.2/pppd/Makefile.linux	2005-03-01 21:19:06.881724768 +0100
+@@ -47,7 +47,7 @@
+ # Uncomment the next line to include support for PPP packet filtering.
+ # This requires that the libpcap library and headers be installed
+ # and that the kernel driver support PPP packet filtering.
+-FILTER=y
+#FILTER=y
+ 
+ # Uncomment the next line to enable multilink PPP (enabled by default)
+ # Linux distributions: Please leave multilink ENABLED in your builds
+diff -uNr ppp-2.4.2.org/pppd/plugins/Makefile.linux ppp-2.4.2/pppd/plugins/Makefile.linux
+--- ppp-2.4.2.org/pppd/plugins/Makefile.linux	2004-01-13 04:56:24.000000000 +0100
+++ ppp-2.4.2/pppd/plugins/Makefile.linux	2005-03-01 21:19:26.237782200 +0100
+@@ -1,4 +1,4 @@
+-CC	= gcc
+#CC	= gcc
+ COPTS	= -O2 -g
+ CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
+ LDFLAGS	= -shared
+diff -uNr ppp-2.4.2.org/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.2/pppd/plugins/rp-pppoe/Makefile.linux
+--- ppp-2.4.2.org/pppd/plugins/rp-pppoe/Makefile.linux	2004-01-13 04:57:55.000000000 +0100
+++ ppp-2.4.2/pppd/plugins/rp-pppoe/Makefile.linux	2005-03-01 21:20:26.099681808 +0100
+@@ -21,7 +21,7 @@
+ all: rp-pppoe.so
+ 
+ rp-pppoe.so: libplugin.a plugin.o
+-	gcc -o rp-pppoe.so -shared plugin.o libplugin.a
+	$(CC) -o rp-pppoe.so -shared plugin.o libplugin.a
+ 
+ install: all
+ 	$(INSTALL) -d -m 755 $(LIBDIR)
+@@ -31,20 +31,20 @@
+ 	rm -f *.o *.so
+ 
+ plugin.o: plugin.c
+-	gcc '-DRP_VERSION="$(VERSION)"' $(CFLAGS) -I../../..  -c -o plugin.o -fPIC plugin.c
+	$(CC) '-DRP_VERSION="$(VERSION)"' $(CFLAGS) -I../../..  -c -o plugin.o -fPIC plugin.c
+ 
+ libplugin.a: discovery.o if.o common.o debug.o
+-	ar -rc $@ $^
+	$(AR) -rc $@ $^
+ 
+ discovery.o: discovery.c
+-	gcc $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o discovery.o -fPIC discovery.c
+	$(CC) $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o discovery.o -fPIC discovery.c
+ 
+ if.o: if.c
+-	gcc $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o if.o -fPIC if.c
+	$(CC) $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o if.o -fPIC if.c
+ 
+ debug.o: debug.c
+-	gcc $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o debug.o -fPIC debug.c
+	$(CC) $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o debug.o -fPIC debug.c
+ 
+ common.o: common.c
+-	gcc $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o common.o -fPIC common.c
+	$(CC) $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o common.o -fPIC common.c
+ 
--- a/patches/002_gcc-uclibc-locale.patch
+++ b/patches/002_gcc-uclibc-locale.patch
--- a/patches/010_binutils-2.13.2.1-broadcom.patch
+++ b/patches/010_binutils-2.13.2.1-broadcom.patch
@ -0,0 +1,333 @@
+diff -uNrbB binutils-2.13.2.1/gas/as.c binutils/gas/as.c
+--- binutils-2.13.2.1/gas/as.c	2002-12-20 22:19:05.000000000 +0100
+++ binutils/gas/as.c	2004-03-31 22:47:52.000000000 +0200
+@@ -212,6 +212,7 @@
+ #else
+   fprintf (stderr, _("GNU assembler version %s (%s)"), VERSION, TARGET_ALIAS);
+ #endif
+  fprintf (stderr, _(" with Broadcom modifications"));
+   fprintf (stderr, "\n");
+ }
+ 
+@@ -529,10 +530,11 @@
+ 	case OPTION_VERSION:
+ 	  /* This output is intended to follow the GNU standards document.  */
+ #ifdef BFD_ASSEMBLER
+-	  printf (_("GNU assembler %s\n"), BFD_VERSION_STRING);
+	  printf (_("GNU assembler %s"), BFD_VERSION_STRING);
+ #else
+-	  printf (_("GNU assembler %s\n"), VERSION);
+	  printf (_("GNU assembler %s"), VERSION);
+ #endif
+	  printf (_(" with Broadcom modifications\n"));
+ 	  printf (_("Copyright 2002 Free Software Foundation, Inc.\n"));
+ 	  printf (_("\
+ This program is free software; you may redistribute it under the terms of\n\
+diff -uNrbB binutils-2.13.2.1/gas/config/tc-mips.c binutils/gas/config/tc-mips.c
+--- binutils-2.13.2.1/gas/config/tc-mips.c	2002-11-05 23:03:40.000000000 +0100
+++ binutils/gas/config/tc-mips.c	2004-03-31 22:47:54.000000000 +0200
+@@ -106,6 +106,13 @@
+ 
+ extern int target_big_endian;
+ 
+/* WA_BCM4710A0 */
+#if BCM4710A0
+static int wa_bcm4710a0 = 1;
+#else
+#define wa_bcm4710a0 0
+#endif
+
+ /* The name of the readonly data section.  */
+ #define RDATA_SECTION_NAME (OUTPUT_FLAVOR == bfd_target_aout_flavour \
+ 			    ? ".data" \
+@@ -2130,6 +2137,8 @@
+ 	  || (pinfo & INSN_COND_BRANCH_DELAY))
+ 	{
+ 	  if (mips_optimize < 2
+	      /* WA_BCM4710A0: Shortcut the whole conditional and always add nops */
+	      || wa_bcm4710a0 == 1
+ 	      /* If we have seen .set volatile or .set nomove, don't
+ 		 optimize.  */
+ 	      || mips_opts.nomove != 0
+@@ -2342,6 +2351,11 @@
+ 		 instruction at the destination, put it in the delay
+ 		 slot, and bump the destination address.  */
+ 	      emit_nop ();
+
+	      /* WA_BCM4710A0: Add another nop */
+	      if (wa_bcm4710a0)
+		emit_nop ();
+
+ 	      /* Update the previous insn information.  */
+ 	      prev_prev_insn = *ip;
+ 	      prev_insn.insn_mo = &dummy_opcode;
+@@ -2456,6 +2470,11 @@
+ 	     into the delay slot, and increment the branch to jump to
+ 	     the next instruction.  */
+ 	  emit_nop ();
+
+	  /* WA_BCM4710A0: Add another nop */
+	  if (wa_bcm4710a0)
+	    emit_nop ();
+
+ 	  /* Update the previous insn information.  */
+ 	  prev_prev_insn = *ip;
+ 	  prev_insn.insn_mo = &dummy_opcode;
+@@ -2500,6 +2519,167 @@
+     }
+   else if (place == NULL)
+     {
+      if(wa_bcm4710a0) {
+	/* We took care above of adding noops when reordering, now
+	   need to do the same when not reordering. Unless this
+	   is already a nop.
+	   This means swapping the insn in the delay slot with the
+	   jump and adding the nops. */
+
+#define	MIPS_INSN_MOVE		0x00000021
+#define	MIPS_INSN_MOVE2		0x00000025
+#define	GLIBC_SET_GP		0x04100000
+
+	if (prev_pinfo & (INSN_UNCOND_BRANCH_DELAY | INSN_COND_BRANCH_DELAY | INSN_COND_BRANCH_LIKELY)) {
+
+	  /* Special case for glibc SET_GP macro */
+	  if (prev_insn.insn_opcode == GLIBC_SET_GP) {
+	    as_warn (_("bcm4710a0: NOT adding nop to glibc SET_GP macro (0x%lx %s)"),
+		     prev_insn.insn_opcode, prev_insn.insn_mo->name);
+	    goto skip_nop;
+	  }
+
+	  /* If it is a nop or just a move, let it go. XXX: we should add a flag to
+	     pinfo to let us know which insn's are ok, i.e. they don't
+	     cause any stalls. */
+	  if ((ip->insn_opcode != 0)
+	      && ((ip->insn_opcode & ip->insn_mo->mask) != MIPS_INSN_MOVE)
+	      && ((ip->insn_opcode & ip->insn_mo->mask) != MIPS_INSN_MOVE2)) {
+
+	    int	wreg = 0, wrsh = 0, rs = 0, rt = 0;
+	    unsigned long wrmsk = 0, temp;
+	    char	*prev_f;
+
+	    /* Bad case: we cannot move a trap */
+	    if (pinfo & INSN_TRAP) {
+	      as_warn (_("bcm4710a0: Current insn (%s) is a trap, cannot swap with %s"),
+		       ip->insn_mo->name, prev_insn.insn_mo->name);
+	      goto skip_swap;
+	    }
+
+	    /* Another bad case: we cannot move stuff after a branch likely */
+	    if (pinfo &  INSN_COND_BRANCH_LIKELY) {
+	      as_warn (_("bcm4710a0: Current insn (%s) cannot be swaped with branch likely %s"),
+		       ip->insn_mo->name, prev_insn.insn_mo->name);
+	      goto skip_swap;
+	    }
+	    /* Also, we cannot move if there is a cc conflict */
+	    if ((pinfo & INSN_WRITE_COND_CODE) && (prev_pinfo & INSN_READ_COND_CODE)) {
+	      as_warn (_("bcm4710a0: Current insn (%s) writes CC, cannot swap with %s which reads CC"),
+		       ip->insn_mo->name, prev_insn.insn_mo->name);
+	      goto skip_swap;
+	    }
+
+	    /* or a hi conflict */
+	    if ((pinfo & INSN_WRITE_HI) && (prev_pinfo & INSN_READ_HI)) {
+	      as_warn (_("bcm4710a0: Current insn (%s) writes HI, cannot swap with %s which reads HI"),
+		       ip->insn_mo->name, prev_insn.insn_mo->name);
+	      goto skip_swap;
+	    }
+
+	    /* or a lo conflict */
+	    if ((pinfo & INSN_WRITE_LO) && (prev_pinfo & INSN_READ_LO)) {
+	      as_warn (_("bcm4710a0: Current insn (%s) writes LO, cannot swap with %s which reads LO"),
+		       ip->insn_mo->name, prev_insn.insn_mo->name);
+	      goto skip_swap;
+	    }
+
+	    /* Which register if any is modified by the current insn? */
+	    if (pinfo & INSN_WRITE_GPR_D) {
+	      wreg = (ip->insn_opcode >> OP_SH_RD) & OP_MASK_RD;
+	      wrsh = OP_SH_RD;
+	      wrmsk = OP_MASK_RD;
+	    } else if (pinfo & INSN_WRITE_GPR_T) {
+	      wreg = (ip->insn_opcode >> OP_SH_RT) & OP_MASK_RT;
+	      wrsh = OP_SH_RT;
+	      wrmsk = OP_MASK_RT;
+	    } else if (pinfo & INSN_WRITE_GPR_31)
+	      wreg = RA;
+
+	    if (wreg) {
+	      /* Is that reg used by the previous insn? */
+	      if (prev_pinfo & INSN_READ_GPR_S)
+		rs = (prev_insn.insn_opcode >> OP_SH_RS) & OP_MASK_RS;
+	      if (prev_pinfo & INSN_READ_GPR_T)
+		rt = (prev_insn.insn_opcode >> OP_SH_RT) & OP_MASK_RT;
+	      if ((wreg != rs) && (wreg != rt)) {
+		/* Nope, We *can* do the swap */
+		wreg = 0;
+	      } else {
+		/* Cannot swap without some more surgery,
+		   but do not swap at all if it is $at */
+		if (wreg == AT) {
+		  as_warn (_("bcm4710a0: Current insn (%s) uses reg%d, cannot swap with %s"),
+			   ip->insn_mo->name, wreg, prev_insn.insn_mo->name);
+		  goto skip_swap;
+		}
+		/* or if $at is not avaliable */
+		if (mips_opts.noat) {
+		  as_warn (_("bcm4710a0: .set noat in effect, cannot swap %s with %s"),
+			   ip->insn_mo->name, prev_insn.insn_mo->name);
+		  goto skip_swap;
+		}
+	      }
+	    }
+
+	    /* Swap the previous insn (a jump) and the current one */
+	    assert (prev_insn_frag != NULL);
+	    prev_f = prev_insn_frag->fr_literal + prev_insn_where;
+	    memcpy (&temp, f, 4);
+	    if (wreg) {
+	      /* Modify the instruction to use at */
+	      temp = (temp & ~(wrmsk << wrsh)) | (AT << wrsh);
+	    }
+	    memcpy (f, prev_f, 4);
+	    memcpy (prev_f, &temp, 4);
+	    if (prev_insn_fixp[0]) {
+	      prev_insn_fixp[0]->fx_frag = frag_now;
+	      prev_insn_fixp[0]->fx_where = f - frag_now->fr_literal;
+	    }
+	    if (prev_insn_fixp[1]) {
+	      prev_insn_fixp[1]->fx_frag = frag_now;
+	      prev_insn_fixp[1]->fx_where = f - frag_now->fr_literal;
+	    }
+	    if (prev_insn_fixp[2]) {
+	      prev_insn_fixp[2]->fx_frag = frag_now;
+	      prev_insn_fixp[2]->fx_where = f - frag_now->fr_literal;
+	    }
+	    if (fixp[0]) {
+	      fixp[0]->fx_frag = prev_insn_frag;
+	      fixp[0]->fx_where = prev_insn_where;
+	    }
+	    if (fixp[1]) {
+	      fixp[1]->fx_frag = prev_insn_frag;
+	      fixp[1]->fx_where = prev_insn_where;
+	    }
+	    if (fixp[2]) {
+	      fixp[2]->fx_frag = prev_insn_frag;
+	      fixp[2]->fx_where = prev_insn_where;
+	    }
+	    /* Now put a nop or move after the jump ... */
+	    if (wreg) {
+	      /* A move if we modified the insn we moved. */
+	      md_number_to_chars (frag_more (4),
+				  (MIPS_INSN_MOVE | (wreg << OP_SH_RD) | (AT << OP_SH_RS)),
+				  4);
+	    } else {
+	      emit_nop ();
+	    }
+	  }
+skip_swap:
+	  /* And another nop */
+	  emit_nop ();
+	}
+skip_nop:
+	/* Remember stuff that is not normally remembered in the not-reordering
+	   case so we can swap with next insn */
+	prev_insn_fixp[0] = fixp[0];
+	prev_insn_fixp[1] = fixp[1];
+	prev_insn_fixp[2] = fixp[2];
+	prev_insn_frag = frag_now;
+	prev_insn_where = f - frag_now->fr_literal;
+      }
+
+       /* We need to record a bit of information even when we are not
+          reordering, in order to determine the base address for mips16
+          PC relative relocs.  */
+@@ -10003,8 +10183,14 @@
+   {"mdmx", no_argument, NULL, OPTION_MDMX},
+ #define OPTION_NO_MDMX (OPTION_MD_BASE + 36)
+   {"no-mdmx", no_argument, NULL, OPTION_NO_MDMX},
+#define OPTION_M4710A0 (OPTION_MD_BASE + 37)
+  {"m4710a0", no_argument, NULL, OPTION_M4710A0},
+#define OPTION_NO_M4710A0 (OPTION_MD_BASE + 38)
+  {"no-m4710a0", no_argument, NULL, OPTION_NO_M4710A0},
+  {"mno-4710a0", no_argument, NULL, OPTION_NO_M4710A0},
+  {"m4710a0kern", no_argument, NULL, OPTION_NO_M4710A0},
+ #ifdef OBJ_ELF
+-#define OPTION_ELF_BASE    (OPTION_MD_BASE + 37)
+#define OPTION_ELF_BASE    (OPTION_MD_BASE + 39)
+ #define OPTION_CALL_SHARED (OPTION_ELF_BASE + 0)
+   {"KPIC",        no_argument, NULL, OPTION_CALL_SHARED},
+   {"call_shared", no_argument, NULL, OPTION_CALL_SHARED},
+@@ -10213,6 +10399,16 @@
+     case OPTION_NO_M3900:
+       break;
+ 
+#if BCM4710A0
+    case OPTION_M4710A0:
+      wa_bcm4710a0 = 1;
+      break;
+
+    case OPTION_NO_M4710A0:
+      wa_bcm4710a0 = 0;
+      break;
+#endif
+
+     case OPTION_MDMX:
+       mips_opts.ase_mdmx = 1;
+       break;
+diff -uNrbB binutils-2.13.2.1/gas/config.in binutils/gas/config.in
+--- binutils-2.13.2.1/gas/config.in	2002-07-14 03:14:19.000000000 +0200
+++ binutils/gas/config.in	2004-03-31 22:47:52.000000000 +0200
+@@ -271,3 +271,5 @@
+ /* Define if errno is not declared in system header files. */
+ #undef NEED_DECLARATION_ERRNO
+ 
+/* Define to 1 for BCM4710A0 compiler workarounds */
+#undef BCM4710A0
+diff -uNrbB binutils-2.13.2.1/gas/configure binutils/gas/configure
+--- binutils-2.13.2.1/gas/configure	2002-10-30 18:07:37.000000000 +0100
+++ binutils/gas/configure	2004-03-31 22:47:52.000000000 +0200
+@@ -32,6 +32,8 @@
+ ac_help="$ac_help
+   --enable-build-warnings Enable build-time compiler warnings if gcc is used"
+ ac_help="$ac_help
+  --with-bcm4710a0        enable BCM4710A0 compiler workarounds"
+ac_help="$ac_help
+   --disable-nls           do not use Native Language Support"
+ ac_help="$ac_help
+   --with-included-gettext use the GNU gettext library included here"
+@@ -2936,6 +2938,18 @@
+     ;;
+ esac
+ 
+# Enable BCM4710A0 compiler workarounds
+# Check whether --with-bcm4710a0 or --without-bcm4710a0 was given.
+if test "${with_bcm4710a0+set}" = set; then
+  withval="$with_bcm4710a0"
+  case "${withval}" in
+  yes) cat >> confdefs.h <<\EOF
+#define BCM4710A0 1
+EOF
+ ;;
+esac
+fi
+
+ # Getting this done right is going to be a bitch.  Each configuration specified
+ # with --enable-targets=... should be checked for environment, format, cpu, and
+ # bfd_gas setting.
+diff -uNrbB binutils-2.13.2.1/gas/configure.in binutils/gas/configure.in
+--- binutils-2.13.2.1/gas/configure.in	2002-10-30 18:07:32.000000000 +0100
+++ binutils/gas/configure.in	2004-03-31 22:47:52.000000000 +0200
+@@ -762,6 +762,13 @@
+     ;;
+ esac
+ 
+# With BCM4710A0 compiler workarounds
+AC_ARG_WITH(bcm4710a0,
+[  --with-bcm4710a0        enable BCM4710A0 compiler workarounds],
+[case "${withval}" in
+  yes) AC_DEFINE(BCM4710A0, 1, [BCM4710A0 support?]) ;;
+esac])
+
+ # Getting this done right is going to be a bitch.  Each configuration specified
+ # with --enable-targets=... should be checked for environment, format, cpu, and
+ # bfd_gas setting.
--- a/patches/010_gcc-3.2.3-broadcom.patch
+++ b/patches/010_gcc-3.2.3-broadcom.patch
@ -0,0 +1,290 @@
+diff -uNrbB gcc-3.2.3/gcc/ada/final.c gcc/gcc/ada/final.c
+--- gcc-3.2.3/gcc/ada/final.c	1970-01-01 01:00:00.000000000 +0100
+++ gcc/gcc/ada/final.c	2004-03-31 22:46:33.000000000 +0200
+@@ -0,0 +1,57 @@
+/****************************************************************************
+ *                                                                          *
+ *                         GNAT COMPILER COMPONENTS                         *
+ *                                                                          *
+ *                               F I N A L                                  *
+ *                                                                          *
+ *                            $Revision$
+ *                                                                          *
+ *                          C Implementation File                           *
+ *                                                                          *
+ *          Copyright (C) 1992-2001 Free Software Foundation, Inc.          *
+ *                                                                          *
+ * GNAT is free software;  you can  redistribute it  and/or modify it under *
+ * terms of the  GNU General Public License as published  by the Free Soft- *
+ * ware  Foundation;  either version 2,  or (at your option) any later ver- *
+ * sion.  GNAT is distributed in the hope that it will be useful, but WITH- *
+ * OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY *
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License *
+ * for  more details.  You should have  received  a copy of the GNU General *
+ * Public License  distributed with GNAT;  see file COPYING.  If not, write *
+ * to  the Free Software Foundation,  59 Temple Place - Suite 330,  Boston, *
+ * MA 02111-1307, USA.                                                      *
+ *                                                                          *
+ * As a  special  exception,  if you  link  this file  with other  files to *
+ * produce an executable,  this file does not by itself cause the resulting *
+ * executable to be covered by the GNU General Public License. This except- *
+ * ion does not  however invalidate  any other reasons  why the  executable *
+ * file might be covered by the  GNU Public License.                        *
+ *                                                                          *
+ * GNAT was originally developed  by the GNAT team at  New York University. *
+ * Extensive contributions were provided by Ada Core Technologies Inc.      *
+ *                                                                          *
+ ****************************************************************************/
+
+#ifdef __alpha_vxworks
+#include "vxWorks.h"
+#endif
+
+#ifdef IN_RTS
+#include "tconfig.h"
+#include "tsystem.h"
+#else
+#include "config.h"
+#include "system.h"
+#endif
+
+#include "raise.h"
+
+/* This routine is called at the extreme end of execution of an Ada program
+   (the call is generated by the binder). The standard routine does nothing
+   at all, the intention is that this be replaced by system specific code
+   where finalization is required. */
+
+void
+__gnat_finalize ()
+{
+}
+diff -uNrbB gcc-3.2.3/gcc/configure gcc/gcc/configure
+--- gcc-3.2.3/gcc/configure	2003-02-04 01:17:46.000000000 +0100
+++ gcc/gcc/configure	2004-03-31 22:46:44.000000000 +0200
+@@ -24,6 +24,8 @@
+ ac_help="$ac_help
+   --with-elf              arrange to use ELF instead of host debug format"
+ ac_help="$ac_help
+  --with-bcm4710a0        enable BCM4710A0 compiler workarounds"
+ac_help="$ac_help
+   --with-local-prefix=DIR specifies directory to put local include"
+ ac_help="$ac_help
+   --with-gxx-include-dir=DIR
+@@ -109,7 +111,6 @@
+ program_transform_name=s,x,x,
+ silent=
+ site=
+-sitefile=
+ srcdir=
+ target=NONE
+ verbose=
+@@ -224,7 +225,6 @@
+   --help                  print this message
+   --no-create             do not create output files
+   --quiet, --silent       do not print \`checking...' messages
+-  --site-file=FILE        use FILE as the site file
+   --version               print the version of autoconf that created configure
+ Directory and file names:
+   --prefix=PREFIX         install architecture-independent files in PREFIX
+@@ -395,11 +395,6 @@
+   -site=* | --site=* | --sit=*)
+     site="$ac_optarg" ;;
+ 
+-  -site-file | --site-file | --site-fil | --site-fi | --site-f)
+-    ac_prev=sitefile ;;
+-  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
+-    sitefile="$ac_optarg" ;;
+-
+   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+     ac_prev=srcdir ;;
+   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+@@ -565,16 +560,12 @@
+ srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+ 
+ # Prefer explicitly selected file to automatically selected ones.
+-if test -z "$sitefile"; then
+-  if test -z "$CONFIG_SITE"; then
+if test -z "$CONFIG_SITE"; then
+     if test "x$prefix" != xNONE; then
+       CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+     else
+       CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+     fi
+-  fi
+-else
+-  CONFIG_SITE="$sitefile"
+ fi
+ for ac_site_file in $CONFIG_SITE; do
+   if test -r "$ac_site_file"; then
+@@ -750,6 +741,19 @@
+ fi
+ 
+ 
+# With BCM4710A0 compiler workarounds
+# Check whether --with-bcm4710a0 or --without-bcm4710a0 was given.
+if test "${with_bcm4710a0+set}" = set; then
+  withval="$with_bcm4710a0"
+  case "${withval}" in
+  yes) cat >> confdefs.h <<\EOF
+#define BCM4710A0 1
+EOF
+ ;;
+esac
+fi
+
+
+ # Specify the local prefix
+ local_prefix=
+ # Check whether --with-local-prefix or --without-local-prefix was given.
+diff -uNrbB gcc-3.2.3/gcc/version.c gcc/gcc/version.c
+--- gcc-3.2.3/gcc/version.c	2003-04-22 08:16:03.000000000 +0200
+++ gcc/gcc/version.c	2004-03-31 22:46:45.000000000 +0200
+@@ -1,4 +1,4 @@
+ #include "ansidecl.h"
+ #include "version.h"
+ 
+-const char *const version_string = "3.2.3";
+const char *const version_string = "3.2.3 with Broadcom modifications";
+diff -uNrbB gcc-3.2.3/gcc/config.gcc gcc/gcc/config.gcc
+--- gcc-3.2.3/gcc/config.gcc	2003-02-28 19:38:19.000000000 +0100
+++ gcc/gcc/config.gcc	2004-03-31 22:46:44.000000000 +0200
+@@ -2216,7 +2216,7 @@
+ #	fi
+ 	;;
+ mips-wrs-vxworks)
+-	tm_file="mips/elf.h mips/vxworks.h"
+	tm_file="mips/elf.h mips/vxmips.h"
+ 	tmake_file=mips/t-ecoff
+ 	gas=yes
+ 	gnu_ld=yes
+diff -uNrbB gcc-3.2.3/gcc/config/mips/vxmips.h gcc/gcc/config/mips/vxmips.h
+--- gcc-3.2.3/gcc/config/mips/vxmips.h	1970-01-01 01:00:00.000000000 +0100
+++ gcc/gcc/config/mips/vxmips.h	2004-03-31 22:46:50.000000000 +0200
+@@ -0,0 +1,44 @@
+/* Definitions of target machine for GNU compiler.  VxWorks MIPS version.
+   Copyright (C) 1996,2001 Free Software Foundation, Inc.
+
+This file is part of GNU CC.
+
+GNU CC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU CC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+
+#undef SUBTARGET_CPP_SPEC
+#define SUBTARGET_CPP_SPEC "%{!DCPU=*:			\
+  %{!mips1: %{!mips2: %{!mips3: %{!mips4:  -DCPU=MIPS32}}}}     \
+  %{mips1: -DCPU=MIPS32}                                        \
+  %{mips2: -DCPU=MIPS32}                                        \
+  %{mips3: -DCPU=MIPS64}                                        \
+  %{mips4: -DCPU=MIPS64}} -D__CPU__=CPU"
+
+#undef CPP_PREDEFINES
+#define CPP_PREDEFINES "-D__vxworks -D__mips__ -D__MIPSEB__ -Asystem(vxworks)"
+
+/* There is no OS support for this, yet.  */
+#undef MIPS_DEFAULT_GVALUE
+#define MIPS_DEFAULT_GVALUE	0
+
+/* VxWorks uses object files, not loadable images.  make linker just
+   combine objects. */
+#undef LINK_SPEC
+#define LINK_SPEC "-r"
+
+  /* Use GNU soft FP naming conventions */
+#undef INIT_SUBTARGET_OPTABS
+#define INIT_SUBTARGET_OPTABS
+diff -uNrbB gcc-3.2.3/gcc/config/mips/mips.h gcc/gcc/config/mips/mips.h
+--- gcc-3.2.3/gcc/config/mips/mips.h	2003-02-12 16:25:48.000000000 +0100
+++ gcc/gcc/config/mips/mips.h	2004-03-31 22:46:50.000000000 +0200
+@@ -232,6 +232,7 @@
+ 					   consts in rodata */
+ #define MASK_NO_FUSED_MADD 0x01000000   /* Don't generate floating point
+ 					   multiply-add operations.  */
+#define MASK_NO_4710A0     0x02000000   /* WA_BCM4710A0: Don't work-around BCM4710A0 CPU bugs */
+ 
+ 					/* Debug switches, not documented */
+ #define MASK_DEBUG	0		/* unused */
+@@ -327,6 +328,13 @@
+ #define TARGET_NO_CHECK_ZERO_DIV (target_flags & MASK_NO_CHECK_ZERO_DIV)
+ #define TARGET_CHECK_RANGE_DIV  (target_flags & MASK_CHECK_RANGE_DIV)
+ 
+/* WA_BCM4710A0 */
+#if BCM4710A0
+#define TARGET_4710A0		!(target_flags & MASK_NO_4710A0)
+#else
+#define TARGET_4710A0 0
+#endif
+
+ /* This is true if we must enable the assembly language file switching
+    code.  */
+ 
+@@ -460,6 +468,12 @@
+      N_("Work around early 4300 hardware bug")},			\
+   {"no-fix4300",         -MASK_4300_MUL_FIX,				\
+      N_("Don't work around early 4300 hardware bug")},			\
+  {"4710a0",             -MASK_NO_4710A0,                               \
+     N_("Work around BCM4710A0 hardware bugs")},                        \
+  {"no-4710a0",           MASK_NO_4710A0,                               \
+     N_("Don't work around BCM4710A0 hardware bugs")},                  \
+  {"4710a0kern",          MASK_NO_4710A0,                               \
+     N_("Don't work around BCM4710A0 hardware bugs")},                  \
+   {"3900",		  0,				                \
+      N_("Optimize for 3900")},						\
+   {"4650",		  0,                    			\
+@@ -636,6 +650,7 @@
+ /* Disable branchlikely for tx39 until compare rewrite.  They haven't
+    been generated up to this point.  */
+ #define ISA_HAS_BRANCHLIKELY	(mips_isa != 1                          \
+                                 && !TARGET_4710A0                      \
+ 				 /* || TARGET_MIPS3900 */)
+ 
+ /* ISA has the conditional move instructions introduced in mips4.  */
+@@ -847,7 +862,7 @@
+ /* GAS_ASM_SPEC is passed when using gas, rather than the MIPS
+    assembler.  */
+ 
+-#define GAS_ASM_SPEC "%{march=*} %{mtune=*} %{mcpu=*} %{m4650} %{mmad:-m4650} %{m3900} %{v} %{mgp32} %{mgp64} %(abi_gas_asm_spec) %{mabi=32:%{!mips*:-mips1}}"
+#define GAS_ASM_SPEC "%{march=*} %{mtune=*} %{mcpu=*} %{m4650} %{m4710a0} %{mno-4710a0:-no-m4710a0} %{m4710a0kern} %{mmad:-m4650} %{m3900} %{v} %{mgp32} %{mgp64} %(abi_gas_asm_spec) %{mabi=32:%{!mips*:-mips1}}"
+ 
+ 
+ extern int mips_abi;
+diff -uNrbB gcc-3.2.3/gcc/configure.in gcc/gcc/configure.in
+--- gcc-3.2.3/gcc/configure.in	2003-02-04 01:17:41.000000000 +0100
+++ gcc/gcc/configure.in	2004-03-31 22:46:44.000000000 +0200
+@@ -136,6 +136,13 @@
+ elf="$with_elf",
+ elf=no)
+ 
+# With BCM4710A0 compiler workarounds
+AC_ARG_WITH(bcm4710a0,
+[  --with-bcm4710a0        enable BCM4710A0 compiler workarounds],
+[case "${withval}" in
+  yes) AC_DEFINE(BCM4710A0, 1, [BCM4710A0 support?]) ;;
+esac])
+
+ # Specify the local prefix
+ local_prefix=
+ AC_ARG_WITH(local-prefix,
+diff -uNrbB gcc-3.2.3/gcc/config.in gcc/gcc/config.in
+--- gcc-3.2.3/gcc/config.in	2003-04-22 08:56:18.000000000 +0200
+++ gcc/gcc/config.in	2004-03-31 22:46:44.000000000 +0200
+@@ -572,3 +572,6 @@
+ #define const
+ #endif
+ #endif
+
+/* Define to 1 for BCM4710A0 compiler workarounds */
+#undef BCM4710A0
--- a/stage1.skel/etc/init.d/rcS
+++ b/stage1.skel/etc/init.d/rcS
@ -1,15 +1,15 @@
 #!/bin/sh

-sleep 2
+sleep 5

 mount -t proc proc /proc
 mount -t ext2 /dev/scsi/host0/bus0/target0/lun0/part1 /mnt/

-while [ $? -ne 0 ]; do
-    sleep 5
-    mount -t ext2 /dev/scsi/host0/bus0/target0/lun0/part1 /mnt/
-    sleep 5
-done
+#while [ $? -ne 0 ]; do
+#    sleep 5
+#    mount -t ext2 /dev/scsi/host0/bus0/target0/lun0/part1 /mnt/
+#    sleep 5
+#done

 cd /mnt
 /sbin/pivot_root . initrd
--- a/stage2.skel/etc/inittab
+++ b/stage2.skel/etc/inittab
@ -2,4 +2,4 @@
 ::askfirst:/bin/sh
 ::ctrlaltdel:/sbin/reboot
 ::shutdown:/bin/umount -a -r
-::restart:/sbin/init						
+::restart:/sbin/init
--- a/tools/Makefile
+++ b/tools/Makefile
@ -1,19 +1,25 @@
 CFLAGS := -O2 -Wall

-all: gen_image split_image untrx split_linux
+all: gen_image split_image untrx trx split_linux

-gen_image: gen_image.o crc32.o
-	gcc gen_image.o crc32.o -o gen_image
+gen_image: gen_image.o crc.o
+	gcc gen_image.o crc.o -o gen_image

 gen_image.o: gen_image.c
 	gcc $(CFLAGS) -I. -c gen_image.c

-crc32.o: crc32.c
-	gcc $(CFLAGS) -c crc32.c
+crc.o: crc.c
+	gcc $(CFLAGS) -c crc.c

 split_image: split_image.c
 	gcc $(CFLAGS) -I. split_image.c -o split_image

+trx: trx.o crc.o
+	gcc trx.o crc.o -o trx
+
+trx.o: trx.c
+	gcc $(CFLAGS) -I. -c trx.c
+
 untrx: untrx.c
 	gcc $(CFLAGS) -I. untrx.c -o untrx

@ -21,7 +27,12 @@ split_linux: split_linux.c
 	gcc $(CFLAGS) -I. split_linux.c -o split_linux

 clean:
-	rm -f gen_image.o crc32.o gen_image split_image untrx split_linux
+	rm -f *.o gen_image split_image trx untrx split_linux

 dist:
-	tar -czf image-tools.tar.gz Makefile trxhdr.h typedefs.h gen_image.c crc32.c split_image.c untrx.c split_linux.c
+	tar -czf image-tools.tar.gz Makefile *.c *.h
+
+testcrc: trx
+	./trx.org trx.o | xxd > _test1.hex
+	./trx trx.o | xxd > _test2.hex
+	diff _test1.hex _test2.hex
--- a/tools/crc.c
+++ b/tools/crc.c
@ -0,0 +1,290 @@
+/*******************************************************************************
+ * $Id$
+ * Copyright 2004, Broadcom Corporation      
+ * All Rights Reserved.      
+ *       
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY      
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM      
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS      
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.      
+ * crc.c: utility function to compute various CRCs
+ ******************************************************************************/
+
+#include "typedefs.h"
+#include "crc.h"
+
+/*******************************************************************************
+ * hcs
+ *
+ * Computes and inserts a header check sum based on crc8 polynomial
+ * below.  Unlike a typical crc, the header check sum is inserted 13
+ * bytes from the end of the byte stream (rather than appended to the
+ * end of the byte stream) such that at the receiver a normal checksum
+ * computation over all of the bytes results in a known good value.
+ * Given a constant 12 bytes after the header checksum to the end of
+ * the header, a lookup table can be used to provide the actual value
+ * inserted.
+ ******************************************************************************/
+
+static uint8 hcs_table[8] = { 0x16, 0x2c, 0x58, 0xb0, 0x37, 0x6e, 0xdc, 0xef};
+
+void
+hcs(
+    uint8 *pheader, /* pointer to array of data to process */
+    uint nbytes   /* number of input data bytes to process */
+)
+{
+    uint8 hcs0, hcs1;
+    int i;
+
+    /* run once with zeros in hcs position, 13th byte from the end */
+    pheader[nbytes - 12 - 1] = 0;
+    hcs0 = crc8(pheader, nbytes, CRC8_INIT_VALUE);
+ 
+    /* now compute real hcs to insert in place of zeros */
+    hcs1 = 0;
+    for (i = 0; i < 8; i++) {
+        hcs1 ^= ((hcs0 & (1 << i)) != 0 ? hcs_table[i] : 0);
+    }
+    pheader[nbytes - 12 - 1] = hcs1 ^ 0xff;
+    return;
+}
+
+/*******************************************************************************
+ * crc8
+ *
+ * Computes a crc8 over the input data using the polynomial:
+ *
+ *       x^8 + x^7 +x^6 + x^4 + x^2 + 1
+ *
+ * The caller provides the initial value (either CRC8_INIT_VALUE
+ * or the previous returned value) to allow for processing of 
+ * discontiguous blocks of data.  When generating the CRC the
+ * caller is responsible for complementing the final return value
+ * and inserting it into the byte stream.  When checking, a final
+ * return value of CRC8_GOOD_VALUE indicates a valid CRC.
+ *
+ * Reference: Dallas Semiconductor Application Note 27
+ *   Williams, Ross N., "A Painless Guide to CRC Error Detection Algorithms", 
+ *     ver 3, Aug 1993, ross@guest.adelaide.edu.au, Rocksoft Pty Ltd.,
+ *     ftp://ftp.rocksoft.com/clients/rocksoft/papers/crc_v3.txt
+ *
+ ******************************************************************************/
+
+static uint8 crc8_table[256] = {
+    0x00, 0xF7, 0xB9, 0x4E, 0x25, 0xD2, 0x9C, 0x6B,
+    0x4A, 0xBD, 0xF3, 0x04, 0x6F, 0x98, 0xD6, 0x21,
+    0x94, 0x63, 0x2D, 0xDA, 0xB1, 0x46, 0x08, 0xFF,
+    0xDE, 0x29, 0x67, 0x90, 0xFB, 0x0C, 0x42, 0xB5,
+    0x7F, 0x88, 0xC6, 0x31, 0x5A, 0xAD, 0xE3, 0x14,
+    0x35, 0xC2, 0x8C, 0x7B, 0x10, 0xE7, 0xA9, 0x5E,
+    0xEB, 0x1C, 0x52, 0xA5, 0xCE, 0x39, 0x77, 0x80,
+    0xA1, 0x56, 0x18, 0xEF, 0x84, 0x73, 0x3D, 0xCA,
+    0xFE, 0x09, 0x47, 0xB0, 0xDB, 0x2C, 0x62, 0x95,
+    0xB4, 0x43, 0x0D, 0xFA, 0x91, 0x66, 0x28, 0xDF,
+    0x6A, 0x9D, 0xD3, 0x24, 0x4F, 0xB8, 0xF6, 0x01,
+    0x20, 0xD7, 0x99, 0x6E, 0x05, 0xF2, 0xBC, 0x4B,
+    0x81, 0x76, 0x38, 0xCF, 0xA4, 0x53, 0x1D, 0xEA,
+    0xCB, 0x3C, 0x72, 0x85, 0xEE, 0x19, 0x57, 0xA0,
+    0x15, 0xE2, 0xAC, 0x5B, 0x30, 0xC7, 0x89, 0x7E,
+    0x5F, 0xA8, 0xE6, 0x11, 0x7A, 0x8D, 0xC3, 0x34,
+    0xAB, 0x5C, 0x12, 0xE5, 0x8E, 0x79, 0x37, 0xC0,
+    0xE1, 0x16, 0x58, 0xAF, 0xC4, 0x33, 0x7D, 0x8A,
+    0x3F, 0xC8, 0x86, 0x71, 0x1A, 0xED, 0xA3, 0x54,
+    0x75, 0x82, 0xCC, 0x3B, 0x50, 0xA7, 0xE9, 0x1E,
+    0xD4, 0x23, 0x6D, 0x9A, 0xF1, 0x06, 0x48, 0xBF,
+    0x9E, 0x69, 0x27, 0xD0, 0xBB, 0x4C, 0x02, 0xF5,
+    0x40, 0xB7, 0xF9, 0x0E, 0x65, 0x92, 0xDC, 0x2B,
+    0x0A, 0xFD, 0xB3, 0x44, 0x2F, 0xD8, 0x96, 0x61,
+    0x55, 0xA2, 0xEC, 0x1B, 0x70, 0x87, 0xC9, 0x3E,
+    0x1F, 0xE8, 0xA6, 0x51, 0x3A, 0xCD, 0x83, 0x74,
+    0xC1, 0x36, 0x78, 0x8F, 0xE4, 0x13, 0x5D, 0xAA,
+    0x8B, 0x7C, 0x32, 0xC5, 0xAE, 0x59, 0x17, 0xE0,
+    0x2A, 0xDD, 0x93, 0x64, 0x0F, 0xF8, 0xB6, 0x41,
+    0x60, 0x97, 0xD9, 0x2E, 0x45, 0xB2, 0xFC, 0x0B,
+    0xBE, 0x49, 0x07, 0xF0, 0x9B, 0x6C, 0x22, 0xD5,
+    0xF4, 0x03, 0x4D, 0xBA, 0xD1, 0x26, 0x68, 0x9F
+};
+
+#define CRC_INNER_LOOP(n, c, x) \
+    (c) = ((c) >> 8) ^ crc##n##_table[((c) ^ (x)) & 0xff]
+
+uint8
+crc8(
+    uint8 *pdata,  /* pointer to array of data to process */
+    uint nbytes, /* number of input data bytes to process */
+    uint8 crc      /* either CRC8_INIT_VALUE or previous return value */
+)
+{
+    while (nbytes-- > 0)
+        CRC_INNER_LOOP(8, crc, *pdata++);
+    return crc;
+}
+
+/*******************************************************************************
+ * crc16
+ *
+ * Computes a crc16 over the input data using the polynomial:
+ *
+ *       x^16 + x^12 +x^5 + 1
+ *
+ * The caller provides the initial value (either CRC16_INIT_VALUE
+ * or the previous returned value) to allow for processing of 
+ * discontiguous blocks of data.  When generating the CRC the
+ * caller is responsible for complementing the final return value
+ * and inserting it into the byte stream.  When checking, a final
+ * return value of CRC16_GOOD_VALUE indicates a valid CRC.
+ *
+ * Reference: Dallas Semiconductor Application Note 27
+ *   Williams, Ross N., "A Painless Guide to CRC Error Detection Algorithms", 
+ *     ver 3, Aug 1993, ross@guest.adelaide.edu.au, Rocksoft Pty Ltd.,
+ *     ftp://ftp.rocksoft.com/clients/rocksoft/papers/crc_v3.txt
+ *
+ ******************************************************************************/
+
+static uint16 crc16_table[256] = {
+    0x0000, 0x1189, 0x2312, 0x329B, 0x4624, 0x57AD, 0x6536, 0x74BF,
+    0x8C48, 0x9DC1, 0xAF5A, 0xBED3, 0xCA6C, 0xDBE5, 0xE97E, 0xF8F7,
+    0x1081, 0x0108, 0x3393, 0x221A, 0x56A5, 0x472C, 0x75B7, 0x643E,
+    0x9CC9, 0x8D40, 0xBFDB, 0xAE52, 0xDAED, 0xCB64, 0xF9FF, 0xE876,
+    0x2102, 0x308B, 0x0210, 0x1399, 0x6726, 0x76AF, 0x4434, 0x55BD,
+    0xAD4A, 0xBCC3, 0x8E58, 0x9FD1, 0xEB6E, 0xFAE7, 0xC87C, 0xD9F5,
+    0x3183, 0x200A, 0x1291, 0x0318, 0x77A7, 0x662E, 0x54B5, 0x453C,
+    0xBDCB, 0xAC42, 0x9ED9, 0x8F50, 0xFBEF, 0xEA66, 0xD8FD, 0xC974,
+    0x4204, 0x538D, 0x6116, 0x709F, 0x0420, 0x15A9, 0x2732, 0x36BB,
+    0xCE4C, 0xDFC5, 0xED5E, 0xFCD7, 0x8868, 0x99E1, 0xAB7A, 0xBAF3,
+    0x5285, 0x430C, 0x7197, 0x601E, 0x14A1, 0x0528, 0x37B3, 0x263A,
+    0xDECD, 0xCF44, 0xFDDF, 0xEC56, 0x98E9, 0x8960, 0xBBFB, 0xAA72,
+    0x6306, 0x728F, 0x4014, 0x519D, 0x2522, 0x34AB, 0x0630, 0x17B9,
+    0xEF4E, 0xFEC7, 0xCC5C, 0xDDD5, 0xA96A, 0xB8E3, 0x8A78, 0x9BF1,
+    0x7387, 0x620E, 0x5095, 0x411C, 0x35A3, 0x242A, 0x16B1, 0x0738,
+    0xFFCF, 0xEE46, 0xDCDD, 0xCD54, 0xB9EB, 0xA862, 0x9AF9, 0x8B70,
+    0x8408, 0x9581, 0xA71A, 0xB693, 0xC22C, 0xD3A5, 0xE13E, 0xF0B7,
+    0x0840, 0x19C9, 0x2B52, 0x3ADB, 0x4E64, 0x5FED, 0x6D76, 0x7CFF,
+    0x9489, 0x8500, 0xB79B, 0xA612, 0xD2AD, 0xC324, 0xF1BF, 0xE036,
+    0x18C1, 0x0948, 0x3BD3, 0x2A5A, 0x5EE5, 0x4F6C, 0x7DF7, 0x6C7E,
+    0xA50A, 0xB483, 0x8618, 0x9791, 0xE32E, 0xF2A7, 0xC03C, 0xD1B5,
+    0x2942, 0x38CB, 0x0A50, 0x1BD9, 0x6F66, 0x7EEF, 0x4C74, 0x5DFD,
+    0xB58B, 0xA402, 0x9699, 0x8710, 0xF3AF, 0xE226, 0xD0BD, 0xC134,
+    0x39C3, 0x284A, 0x1AD1, 0x0B58, 0x7FE7, 0x6E6E, 0x5CF5, 0x4D7C,
+    0xC60C, 0xD785, 0xE51E, 0xF497, 0x8028, 0x91A1, 0xA33A, 0xB2B3,
+    0x4A44, 0x5BCD, 0x6956, 0x78DF, 0x0C60, 0x1DE9, 0x2F72, 0x3EFB,
+    0xD68D, 0xC704, 0xF59F, 0xE416, 0x90A9, 0x8120, 0xB3BB, 0xA232,
+    0x5AC5, 0x4B4C, 0x79D7, 0x685E, 0x1CE1, 0x0D68, 0x3FF3, 0x2E7A,
+    0xE70E, 0xF687, 0xC41C, 0xD595, 0xA12A, 0xB0A3, 0x8238, 0x93B1,
+    0x6B46, 0x7ACF, 0x4854, 0x59DD, 0x2D62, 0x3CEB, 0x0E70, 0x1FF9,
+    0xF78F, 0xE606, 0xD49D, 0xC514, 0xB1AB, 0xA022, 0x92B9, 0x8330,
+    0x7BC7, 0x6A4E, 0x58D5, 0x495C, 0x3DE3, 0x2C6A, 0x1EF1, 0x0F78
+};
+
+uint16
+crc16(
+    uint8 *pdata,  /* pointer to array of data to process */
+    uint nbytes, /* number of input data bytes to process */
+    uint16 crc     /* either CRC16_INIT_VALUE or previous return value */
+)
+{
+    while (nbytes-- > 0)
+        CRC_INNER_LOOP(16, crc, *pdata++);
+    return crc;
+}
+
+/*******************************************************************************
+ * crc32
+ *
+ * Computes a crc32 over the input data using the polynomial:
+ *
+ *       x^32+x^26+x^23+x^22+x^16+x^12+x^11+X^10+x^8+x^7+x^5+x^4+x^2+x+1
+ *
+ * The caller provides the initial value (either CRC32_INIT_VALUE
+ * or the previous returned value) to allow for processing of 
+ * discontiguous blocks of data.  When generating the CRC the
+ * caller is responsible for complementing the final return value
+ * and inserting it into the byte stream.  When checking, a final
+ * return value of CRC32_GOOD_VALUE indicates a valid CRC.
+ *
+ * Reference: Dallas Semiconductor Application Note 27
+ *   Williams, Ross N., "A Painless Guide to CRC Error Detection Algorithms", 
+ *     ver 3, Aug 1993, ross@guest.adelaide.edu.au, Rocksoft Pty Ltd.,
+ *     ftp://ftp.rocksoft.com/clients/rocksoft/papers/crc_v3.txt
+ *
+ ******************************************************************************/
+
+static uint32 crc32_table[256] = {
+    0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
+    0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
+    0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
+    0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
+    0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
+    0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
+    0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
+    0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
+    0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
+    0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
+    0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
+    0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
+    0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
+    0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
+    0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
+    0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
+    0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
+    0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
+    0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
+    0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
+    0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
+    0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
+    0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
+    0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
+    0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
+    0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
+    0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
+    0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
+    0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
+    0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
+    0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
+    0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
+    0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
+    0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
+    0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
+    0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
+    0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
+    0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
+    0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
+    0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
+    0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
+    0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
+    0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
+    0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
+    0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
+    0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
+    0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
+    0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
+    0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
+    0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
+    0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
+    0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
+    0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
+    0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
+    0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
+    0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
+    0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
+    0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
+    0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
+    0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
+    0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
+    0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
+    0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
+    0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
+};
+
+uint32
+crc32(
+    uint8 *pdata,  /* pointer to array of data to process */
+    uint nbytes, /* number of input data bytes to process */
+    uint32 crc     /* either CRC32_INIT_VALUE or previous return value */
+)
+{
+    while (nbytes-- > 0)
+        CRC_INNER_LOOP(32, crc, *pdata++);
+    return crc;
+}
--- a/tools/crc.h
+++ b/tools/crc.h
@ -0,0 +1,69 @@
+/*******************************************************************************
+ * $Id$
+ * Copyright 2004, Broadcom Corporation      
+ * All Rights Reserved.      
+ *       
+ * THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY      
+ * KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM      
+ * SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS      
+ * FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE.      
+ * crc.h - a function to compute crc for iLine10 headers
+ ******************************************************************************/
+
+#ifndef _RTS_CRC_H_
+#define _RTS_CRC_H_ 1
+
+#include "typedefs.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#define CRC8_INIT_VALUE  0xff       /* Initial CRC8 checksum value */
+#define CRC8_GOOD_VALUE  0x9f       /* Good final CRC8 checksum value */
+#define HCS_GOOD_VALUE   0x39       /* Good final header checksum value */
+
+#define CRC16_INIT_VALUE 0xffff     /* Initial CRC16 checksum value */
+#define CRC16_GOOD_VALUE 0xf0b8     /* Good final CRC16 checksum value */
+
+#define CRC32_INIT_VALUE 0xffffffff /* Initial CRC32 checksum value */
+#define CRC32_GOOD_VALUE 0xdebb20e3 /* Good final CRC32 checksum value */
+
+void   hcs(uint8 *, uint);
+uint8  crc8(uint8 *, uint, uint8);
+uint16 crc16(uint8 *, uint, uint16);
+uint32 crc32(uint8 *, uint, uint32);
+
+/* macros for common usage */
+
+#define APPEND_CRC8(pbytes, nbytes)                           \
+do {                                                          \
+    uint8 tmp = crc8(pbytes, nbytes, CRC8_INIT_VALUE) ^ 0xff; \
+    (pbytes)[(nbytes)] = tmp;                                 \
+    (nbytes) += 1;                                            \
+} while (0)
+
+#define APPEND_CRC16(pbytes, nbytes)                               \
+do {                                                               \
+    uint16 tmp = crc16(pbytes, nbytes, CRC16_INIT_VALUE) ^ 0xffff; \
+    (pbytes)[(nbytes) + 0] = (tmp >> 0) & 0xff;                    \
+    (pbytes)[(nbytes) + 1] = (tmp >> 8) & 0xff;                    \
+    (nbytes) += 2;                                                 \
+} while (0)
+
+#define APPEND_CRC32(pbytes, nbytes)                                   \
+do {                                                                   \
+    uint32 tmp = crc32(pbytes, nbytes, CRC32_INIT_VALUE) ^ 0xffffffff; \
+    (pbytes)[(nbytes) + 0] = (tmp >>  0) & 0xff;                       \
+    (pbytes)[(nbytes) + 1] = (tmp >>  8) & 0xff;                       \
+    (pbytes)[(nbytes) + 2] = (tmp >> 16) & 0xff;                       \
+    (pbytes)[(nbytes) + 3] = (tmp >> 24) & 0xff;                       \
+    (nbytes) += 4;                                                     \
+} while (0)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTS_CRC_H_ */
--- a/tools/crc32.c
+++ b/tools/crc32.c
@ -1,63 +0,0 @@
-/*
- * efone - Distributed internet phone system.
- *
- * (c) 1999,2000 Krzysztof Dabrowski
- * (c) 1999,2000 ElysiuM deeZine
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- *
- * based on implementation by Finn Yannick Jacobs 
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-/* crc_tab[] 
- * this crcTable is being build by chksum_crc32GenTab().
- * so make sure, you call it before using the other
- * functions!
- */
-u_int32_t crc_tab[256];
-
-/* chksum_crc() 
- * to a given block, this one calculates the
- * crc32-checksum until the length is
- * reached. the crc32-checksum will be
- * the result.
- */
-u_int32_t chksum_crc32 (unsigned char *block, unsigned int length) {
-   register unsigned long crc;
-   unsigned long i;
-
-   crc = 0xFFFFFFFF;
-   for (i = 0; i < length; i++) {
-      crc = ((crc >> 8) & 0x00FFFFFF) ^ crc_tab[(crc ^ *block++) & 0xFF];
-   }
-   return (crc ^ 0xFFFFFFFF);
-}
-
-/* chksum_crc32gentab()
- * to a global crc_tab[256], this one will
- * calculate the crcTable for crc32-checksums.
- * it is generated to the polynom [..]
- */
-void chksum_crc32gentab () {
-   unsigned long crc, poly;
-   int i, j;
-
-   poly = 0xEDB88320L;
-   for (i = 0; i < 256; i++) {
-      crc = i;
-      for (j = 8; j > 0; j--) {
-	 if (crc & 1) {
-	    crc = (crc >> 1) ^ poly;
-	 } else {
-	    crc >>= 1;
-	 }
-      }
-      crc_tab[i] = crc;
-   }
-}
--- a/tools/gen_image.c
+++ b/tools/gen_image.c
@ -11,12 +11,10 @@

 #include <sys/types.h>
 #include "trxhdr.h"
-
-extern u_int32_t chksum_crc32(unsigned char *block, unsigned int length);
-extern void chksum_crc32gentab();
+#include "crc.h"

 int main(int argc, char *argv[]) {
-	struct trx_header trx;
+	struct trx_header *loadtrx, trx;
 	int i, cnt;
 	FILE *fp;
 	char *buf;
@ -33,11 +31,12 @@ int main(int argc, char *argv[]) {
 	}

 	// init main header
-	memset(&trx, 0, sizeof(struct trx_header));
-	trx.magic = FILE_MAGIC;
+	loadtrx = (void *)buf;
+	memset(loadtrx, 0, sizeof(struct trx_header));
+	loadtrx->magic = FILE_MAGIC;
+	// dunno
+	loadtrx->flag_version = 0x8000;

-	// copy header
-	memcpy(buf, &trx, sizeof(struct trx_header));
 	cnt = sizeof(struct trx_header);

 	for (i = 1; i < argc; i++) {
@ -104,15 +103,11 @@ int main(int argc, char *argv[]) {
 		fclose(fp);
 	}

-	chksum_crc32gentab();
-
-	// copy main header again
-	memcpy(&trx, buf, sizeof(struct trx_header));
-	trx.len = cnt;
+	// overall length
+	loadtrx->len = cnt;

 	// create chksum without first 3 fields
-	trx.crc32 = chksum_crc32(buf +12, cnt);
-	memcpy(buf, &trx, sizeof(struct trx_header));
+	loadtrx->crc32 = crc32(buf +12, cnt -12, CRC32_INIT_VALUE);

 	// flush to output
 	write(1, buf, cnt);
--- a/tools/trx
+++ b/tools/trx
--- a/tools/trx.c
+++ b/tools/trx.c
@ -0,0 +1,88 @@
+/*
+ * creates LOAD/Flash images for Siemens SE505
+ *
+ * (c) 01/2005 Olaf Rempel <razzor at kopf minus tisch dot de>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include <sys/types.h>
+#include "trxhdr.h"
+
+#include "crc.h"
+
+int main(int argc, char *argv[]) {
+	struct trx_header *trx;
+	int i, cnt, fcnt = 0;
+	FILE *fp;
+	char *buf;
+
+	if (argc <= 1) {
+		printf("USAGE: trx file1 [file2] [file3] > outfile.trx\n");
+		exit(-1);
+	}
+
+	// this is.. ugly, but works :)
+	if ((buf = malloc(TRX_MAX_LEN)) == NULL) {
+		perror("malloc");
+		exit(-1);
+	}
+
+	// init main header
+	trx = (void *)buf;
+	memset(trx, 0, sizeof(struct trx_header));
+	trx->magic = TRX_MAGIC;
+	trx->flag_version = TRX_VERSION << 16;
+
+	// copy header
+	cnt = sizeof(struct trx_header);
+
+	for (i = 1; i < argc; i++) {
+		
+		if (fcnt == 2) {
+		    fprintf(stdout, "max. 3 Files\n");
+		    free(buf);
+		    exit(-1);
+		}
+	
+		// align offsets
+		while (cnt % 4)
+		    buf[cnt++] = 0;
+
+		trx->offsets[fcnt++] = cnt;
+		
+		// open file
+		if ((fp = fopen(argv[i], "r")) < 0) {
+			perror(argv[i]);
+			free(buf);
+			exit(-1);
+		}
+
+		// copy file to buffer
+		while (!feof(fp))
+			cnt += fread(buf + cnt, 1, 65536, fp);
+
+		// close file
+		fclose(fp);
+	}
+
+	// align size (to page?)
+	while (cnt % 0x1000)
+	    buf[cnt++] = 0;
+	    
+	trx->len = cnt;
+
+	// calc crc32 
+	trx->crc32 = crc32(buf +12, cnt -12, CRC32_INIT_VALUE);
+
+	// flush to output
+	write(1, buf, cnt);
+
+	free(buf);
+
+	return 0;
+}
+
Author	SHA1	Message	Date
Olaf Rempel	2233739907	update	2007-06-15 15:12:22 +02:00
Olaf Rempel	e4c96397e6	update	2007-06-15 15:12:02 +02:00