More au1000 fixes.

Clean up patch
Add mount_root specific (different partition naming)
Add an init script to kernel command line to set up OpenWrt at boot time


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3730 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 27 insertions, 933 deletions

diff --git a/openwrt/target/linux/au1000-2.6/config b/openwrt/target/linux/au1000-2.6/config
index 41a2d0352..b274fcfd5 100644
--- a/openwrt/target/linux/au1000-2.6/config
+++ b/openwrt/target/linux/au1000-2.6/config
@@ -1421,7 +1421,7 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_CROSSCOMPILE=y
-CONFIG_CMDLINE=""
+CONFIG_CMDLINE="init=/etc/preinit"
 
 #
 # Security options
diff --git a/openwrt/target/linux/au1000-2.6/patches/003-zImage.patch b/openwrt/target/linux/au1000-2.6/patches/003-zImage.patch
index 685b8548a..1d4c6ad5d 100644
--- a/openwrt/target/linux/au1000-2.6/patches/003-zImage.patch
+++ b/openwrt/target/linux/au1000-2.6/patches/003-zImage.patch
@@ -1327,63 +1327,6 @@ diff -urN linux-2.6.16.7/arch/mips/boot/Makefile linux-2.6.16.7.new/arch/mips/bo
 +$(bootdir-y): $(addprefix $(obj)/,$(subdir-y)) \
 +		$(addprefix $(obj)/,$(hostprogs-y))
 +	$(Q)$(MAKE) $(build)=$(obj)/$@ $(MAKECMDGOALS)
-diff -urN linux-2.6.16.7/arch/mips/boot/Makefile.orig linux-2.6.16.7.new/arch/mips/boot/Makefile.orig
---- linux-2.6.16.7/arch/mips/boot/Makefile.orig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16.7.new/arch/mips/boot/Makefile.orig	2006-05-04 23:08:18.000000000 +0200
-@@ -0,0 +1,53 @@
-+#
-+# This file is subject to the terms and conditions of the GNU General Public
-+# License.  See the file "COPYING" in the main directory of this archive
-+# for more details.
-+#
-+# Copyright (C) 1995, 1998, 2001, 2002 by Ralf Baechle
-+# Copyright (C) 2004  Maciej W. Rozycki
-+#
-+
-+#
-+# Some DECstations need all possible sections of an ECOFF executable
-+#
-+ifdef CONFIG_MACH_DECSTATION
-+  E2EFLAGS = -a
-+else
-+  E2EFLAGS =
-+endif
-+
-+#
-+# Drop some uninteresting sections in the kernel.
-+# This is only relevant for ELF kernels but doesn't hurt a.out
-+#
-+drop-sections	= .reginfo .mdebug .comment .note .pdr .options .MIPS.options
-+strip-flags	= $(addprefix --remove-section=,$(drop-sections))
-+
-+VMLINUX = vmlinux
-+
-+all: vmlinux.ecoff vmlinux.srec addinitrd
-+
-+vmlinux.ecoff: $(obj)/elf2ecoff $(VMLINUX)
-+	$(obj)/elf2ecoff $(VMLINUX) vmlinux.ecoff $(E2EFLAGS)
-+
-+$(obj)/elf2ecoff: $(obj)/elf2ecoff.c
-+	$(HOSTCC) -o $@ $^
-+
-+vmlinux.bin: $(VMLINUX)
-+	$(OBJCOPY) -O binary $(strip-flags) $(VMLINUX) $(obj)/vmlinux.bin
-+
-+vmlinux.srec: $(VMLINUX)
-+	$(OBJCOPY) -S -O srec $(strip-flags) $(VMLINUX) $(obj)/vmlinux.srec
-+
-+$(obj)/addinitrd: $(obj)/addinitrd.c
-+	$(HOSTCC) -o $@ $^
-+
-+archhelp:
-+	@echo	'* vmlinux.ecoff	- ECOFF boot image'
-+	@echo	'* vmlinux.srec		- SREC boot image'
-+
-+clean-files += addinitrd \
-+	       elf2ecoff \
-+	       vmlinux.bin \
-+	       vmlinux.ecoff \
-+	       vmlinux.srec
 diff -urN linux-2.6.16.7/arch/mips/Makefile linux-2.6.16.7.new/arch/mips/Makefile
 --- linux-2.6.16.7/arch/mips/Makefile	2006-04-17 23:53:25.000000000 +0200
 +++ linux-2.6.16.7.new/arch/mips/Makefile	2006-05-04 23:09:44.000000000 +0200
@@ -1419,869 +1362,3 @@ diff -urN linux-2.6.16.7/arch/mips/Makefile linux-2.6.16.7.new/arch/mips/Makefil
  
  CLEAN_FILES += vmlinux.32 \
  	       vmlinux.64 \
-diff -urN linux-2.6.16.7/arch/mips/Makefile.orig linux-2.6.16.7.new/arch/mips/Makefile.orig
---- linux-2.6.16.7/arch/mips/Makefile.orig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16.7.new/arch/mips/Makefile.orig	2006-05-04 23:09:55.000000000 +0200
-@@ -0,0 +1,862 @@
-+#
-+# This file is subject to the terms and conditions of the GNU General Public
-+# License.  See the file "COPYING" in the main directory of this archive
-+# for more details.
-+#
-+# Copyright (C) 1994, 95, 96, 2003 by Ralf Baechle
-+# DECStation modifications by Paul M. Antoine, 1996
-+# Copyright (C) 2002, 2003, 2004  Maciej W. Rozycki
-+#
-+# This file is included by the global makefile so that you can add your own
-+# architecture-specific flags and dependencies. Remember to do have actions
-+# for "archclean" cleaning up for this architecture.
-+#
-+
-+as-option = $(shell if $(CC) $(CFLAGS) $(1) -Wa,-Z -c -o /dev/null \
-+	     -xassembler /dev/null > /dev/null 2>&1; then echo "$(1)"; \
-+	     else echo "$(2)"; fi ;)
-+
-+cflags-y :=
-+
-+#
-+# Select the object file format to substitute into the linker script.
-+#
-+ifdef CONFIG_CPU_LITTLE_ENDIAN
-+32bit-tool-prefix	= mipsel-linux-
-+64bit-tool-prefix	= mips64el-linux-
-+32bit-bfd		= elf32-tradlittlemips
-+64bit-bfd		= elf64-tradlittlemips
-+32bit-emul		= elf32ltsmip
-+64bit-emul		= elf64ltsmip
-+else
-+32bit-tool-prefix	= mips-linux-
-+64bit-tool-prefix	= mips64-linux-
-+32bit-bfd		= elf32-tradbigmips
-+64bit-bfd		= elf64-tradbigmips
-+32bit-emul		= elf32btsmip
-+64bit-emul		= elf64btsmip
-+endif
-+
-+ifdef CONFIG_32BIT
-+gcc-abi			= 32
-+tool-prefix		= $(32bit-tool-prefix)
-+UTS_MACHINE		:= mips
-+endif
-+ifdef CONFIG_64BIT
-+gcc-abi			= 64
-+tool-prefix		= $(64bit-tool-prefix)
-+UTS_MACHINE		:= mips64
-+endif
-+
-+ifdef CONFIG_CROSSCOMPILE
-+CROSS_COMPILE		:= $(tool-prefix)
-+endif
-+
-+CHECKFLAGS-y				+= -D__linux__ -D__mips__ \
-+					   -D_MIPS_SZINT=32 \
-+					   -D_ABIO32=1 \
-+					   -D_ABIN32=2 \
-+					   -D_ABI64=3
-+CHECKFLAGS-$(CONFIG_32BIT)		+= -D_MIPS_SIM=_ABIO32 \
-+					   -D_MIPS_SZLONG=32 \
-+					   -D_MIPS_SZPTR=32 \
-+					   -D__PTRDIFF_TYPE__=int
-+CHECKFLAGS-$(CONFIG_64BIT)		+= -m64 -D_MIPS_SIM=_ABI64 \
-+					   -D_MIPS_SZLONG=64 \
-+					   -D_MIPS_SZPTR=64 \
-+					   -D__PTRDIFF_TYPE__="long int"
-+CHECKFLAGS-$(CONFIG_CPU_BIG_ENDIAN)	+= -D__MIPSEB__
-+CHECKFLAGS-$(CONFIG_CPU_LITTLE_ENDIAN)	+= -D__MIPSEL__
-+
-+CHECKFLAGS				= $(CHECKFLAGS-y)
-+
-+ifdef CONFIG_BUILD_ELF64
-+gas-abi			= 64
-+ld-emul			= $(64bit-emul)
-+vmlinux-32		= vmlinux.32
-+vmlinux-64		= vmlinux
-+else
-+gas-abi			= 32
-+ld-emul			= $(32bit-emul)
-+vmlinux-32		= vmlinux
-+vmlinux-64		= vmlinux.64
-+
-+cflags-$(CONFIG_64BIT)	+= $(call cc-option,-mno-explicit-relocs)
-+endif
-+
-+#
-+# GCC uses -G 0 -mabicalls -fpic as default.  We don't want PIC in the kernel
-+# code since it only slows down the whole thing.  At some point we might make
-+# use of global pointer optimizations but their use of $28 conflicts with
-+# the current pointer optimization.
-+#
-+# The DECStation requires an ECOFF kernel for remote booting, other MIPS
-+# machines may also.  Since BFD is incredibly buggy with respect to
-+# crossformat linking we rely on the elf2ecoff tool for format conversion.
-+#
-+cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
-+cflags-y			+= -msoft-float
-+LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib
-+MODFLAGS			+= -mlong-calls
-+
-+#
-+# We explicitly add the endianness specifier if needed, this allows
-+# to compile kernels with a toolchain for the other endianness. We
-+# carefully avoid to add it redundantly because gcc 3.3/3.4 complains
-+# when fed the toolchain default!
-+#
-+cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' && echo -EB)
-+cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' || echo -EL)
-+
-+cflags-$(CONFIG_SB1XXX_CORELIS)	+= $(call cc-option,-mno-sched-prolog) \
-+				   -fno-omit-frame-pointer
-+
-+#
-+# Use: $(call set_gccflags,<cpu0>,<isa0>,<cpu1>,<isa1>,<isa2>)
-+#
-+# <cpu0>,<isa0> -- preferred CPU and ISA designations (may require
-+#                  recent tools)
-+# <cpu1>,<isa1> -- fallback CPU and ISA designations (have to work
-+#                  with up to the oldest supported tools)
-+# <isa2>        -- an ISA designation used as an ABI selector for
-+#                  gcc versions that do not support "-mabi=32"
-+#                  (depending on the CPU type, either "mips1" or
-+#                  "mips2")
-+#
-+set_gccflags = $(shell \
-+while :; do \
-+	cpu=$(1); isa=-$(2); \
-+	for gcc_opt in -march= -mcpu=; do \
-+		$(CC) $$gcc_opt$$cpu $$isa -S -o /dev/null \
-+			-xc /dev/null > /dev/null 2>&1 && \
-+			break 2; \
-+	done; \
-+	cpu=$(3); isa=-$(4); \
-+	for gcc_opt in -march= -mcpu=; do \
-+		$(CC) $$gcc_opt$$cpu $$isa -S -o /dev/null \
-+			-xc /dev/null > /dev/null 2>&1 && \
-+			break 2; \
-+	done; \
-+	break; \
-+done; \
-+gcc_abi=-mabi=$(gcc-abi); gcc_cpu=$$cpu; \
-+if $(CC) $$gcc_abi -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then \
-+	gcc_isa=$$isa; \
-+else \
-+	gcc_abi=; gcc_isa=-$(5); \
-+fi; \
-+gas_abi=-Wa,-$(gcc-abi); gas_cpu=$$cpu; gas_isa=-Wa,$$isa; \
-+while :; do \
-+	for gas_opt in -Wa,-march= -Wa,-mcpu=; do \
-+		$(CC) $$gas_abi $$gas_opt$$cpu $$gas_isa -Wa,-Z -c \
-+			-o /dev/null -xassembler /dev/null > /dev/null 2>&1 && \
-+			break 2; \
-+	done; \
-+	gas_abi=; gas_opt=; gas_cpu=; gas_isa=; \
-+	break; \
-+done; \
-+if test "$(gcc-abi)" != "$(gas-abi)"; then \
-+	gas_abi="-Wa,-$(gas-abi) -Wa,-mgp$(gcc-abi)"; \
-+fi; \
-+if test "$$gcc_opt" = -march= && test -n "$$gcc_abi"; then \
-+	$(CC) $$gcc_abi $$gcc_opt$$gcc_cpu -S -o /dev/null \
-+		-xc /dev/null > /dev/null 2>&1 && \
-+		gcc_isa=; \
-+fi; \
-+echo $$gcc_abi $$gcc_opt$$gcc_cpu $$gcc_isa $$gas_abi $$gas_opt$$gas_cpu $$gas_isa)
-+
-+#
-+# CPU-dependent compiler/assembler options for optimization.
-+#
-+cflags-$(CONFIG_CPU_R3000)	+= \
-+			$(call set_gccflags,r3000,mips1,r3000,mips1,mips1)
-+CHECKFLAGS-$(CONFIG_CPU_R3000)	+= -D_MIPS_ISA=_MIPS_ISA_MIPS1
-+
-+cflags-$(CONFIG_CPU_TX39XX)	+= \
-+			$(call set_gccflags,r3900,mips1,r3000,mips1,mips1)
-+CHECKFLAGS-$(CONFIG_CPU_TX39XX)	+= -D_MIPS_ISA=_MIPS_ISA_MIPS1
-+
-+cflags-$(CONFIG_CPU_R6000)	+= \
-+			$(call set_gccflags,r6000,mips2,r6000,mips2,mips2) \
-+			-Wa,--trap
-+CHECKFLAGS-$(CONFIG_CPU_R6000)	+= -D_MIPS_ISA=_MIPS_ISA_MIPS2
-+
-+cflags-$(CONFIG_CPU_R4300)	+= \
-+			$(call set_gccflags,r4300,mips3,r4300,mips3,mips2) \
-+			-Wa,--trap
-+CHECKFLAGS-$(CONFIG_CPU_R4300)	+= -D_MIPS_ISA=_MIPS_ISA_MIPS3
-+
-+cflags-$(CONFIG_CPU_VR41XX)	+= \
-+			$(call set_gccflags,r4100,mips3,r4600,mips3,mips2) \
-+			-Wa,--trap
-+CHECKFLAGS-$(CONFIG_CPU_VR41XX)	+= -D_MIPS_ISA=_MIPS_ISA_MIPS3
-+
-+cflags-$(CONFIG_CPU_R4X00)	+= \
-+			$(call set_gccflags,r4600,mips3,r4600,mips3,mips2) \
-+			-Wa,--trap
-+CHECKFLAGS-$(CONFIG_CPU_R4X00)	+= -D_MIPS_ISA=_MIPS_ISA_MIPS3
-+
-+cflags-$(CONFIG_CPU_TX49XX)	+= \
-+			$(call set_gccflags,r4600,mips3,r4600,mips3,mips2)  \
-+			-Wa,--trap
-+CHECKFLAGS-$(CONFIG_CPU_TX49XX)	+= -D_MIPS_ISA=_MIPS_ISA_MIPS3
-+
-+cflags-$(CONFIG_CPU_MIPS32_R1)	+= \
-+			$(call set_gccflags,mips32,mips32,r4600,mips3,mips2) \
-+			-Wa,--trap
-+CHECKFLAGS-$(CONFIG_CPU_MIPS32_R1)	+= -D_MIPS_ISA=_MIPS_ISA_MIPS32
-+
-+cflags-$(CONFIG_CPU_MIPS32_R2)	+= \
-+			$(call set_gccflags,mips32r2,mips32r2,r4600,mips3,mips2) \
-+			-Wa,--trap
-+CHECKFLAGS-$(CONFIG_CPU_MIPS32_R2)	+= -D_MIPS_ISA=_MIPS_ISA_MIPS32
-+
-+cflags-$(CONFIG_CPU_MIPS64_R1)	+= \
-+			$(call set_gccflags,mips64,mips64,r4600,mips3,mips2) \
-+			-Wa,--trap
-+CHECKFLAGS-$(CONFIG_CPU_MIPS64_R1)	+= -D_MIPS_ISA=_MIPS_ISA_MIPS64
-+
-+cflags-$(CONFIG_CPU_MIPS64_R2)	+= \
-+			$(call set_gccflags,mips64r2,mips64r2,r4600,mips3,mips2) \
-+			-Wa,--trap
-+CHECKFLAGS-$(CONFIG_CPU_MIPS64_R2)	+= -D_MIPS_ISA=_MIPS_ISA_MIPS64
-+
-+cflags-$(CONFIG_CPU_R5000)	+= \
-+			$(call set_gccflags,r5000,mips4,r5000,mips4,mips2) \
-+			-Wa,--trap
-+CHECKFLAGS-$(CONFIG_CPU_R5000)	+= -D_MIPS_ISA=_MIPS_ISA_MIPS4
-+
-+cflags-$(CONFIG_CPU_R5432)	+= \
-+			$(call set_gccflags,r5400,mips4,r5000,mips4,mips2) \
-+			-Wa,--trap
-+CHECKFLAGS-$(CONFIG_CPU_R5432)	+= -D_MIPS_ISA=_MIPS_ISA_MIPS4
-+
-+cflags-$(CONFIG_CPU_NEVADA)	+= \
-+			$(call set_gccflags,rm5200,mips4,r5000,mips4,mips2) \
-+			-Wa,--trap
-+CHECKFLAGS-$(CONFIG_CPU_NEVADA)	+= -D_MIPS_ISA=_MIPS_ISA_MIPS4
-+
-+cflags-$(CONFIG_CPU_RM7000)	+= \
-+			$(call set_gccflags,rm7000,mips4,r5000,mips4,mips2) \
-+			-Wa,--trap
-+CHECKFLAGS-$(CONFIG_CPU_RM7000)	+= -D_MIPS_ISA=_MIPS_ISA_MIPS4
-+
-+cflags-$(CONFIG_CPU_RM9000)	+= \
-+			$(call set_gccflags,rm9000,mips4,r5000,mips4,mips2) \
-+			-Wa,--trap
-+CHECKFLAGS-$(CONFIG_CPU_RM9000)	+= -D_MIPS_ISA=_MIPS_ISA_MIPS4
-+
-+
-+cflags-$(CONFIG_CPU_SB1)	+= \
-+			$(call set_gccflags,sb1,mips64,r5000,mips4,mips2) \
-+			-Wa,--trap
-+CHECKFLAGS-$(CONFIG_CPU_SB1)	+= -D_MIPS_ISA=_MIPS_ISA_MIPS64
-+
-+cflags-$(CONFIG_CPU_R8000)	+= \
-+			$(call set_gccflags,r8000,mips4,r8000,mips4,mips2) \
-+			-Wa,--trap
-+CHECKFLAGS-$(CONFIG_CPU_R8000)	+= -D_MIPS_ISA=_MIPS_ISA_MIPS4
-+
-+cflags-$(CONFIG_CPU_R10000)	+= \
-+			$(call set_gccflags,r10000,mips4,r8000,mips4,mips2) \
-+			-Wa,--trap
-+CHECKFLAGS-$(CONFIG_CPU_R10000)	+= -D_MIPS_ISA=_MIPS_ISA_MIPS4
-+
-+ifdef CONFIG_CPU_SB1
-+ifdef CONFIG_SB1_PASS_1_WORKAROUNDS
-+MODFLAGS	+= -msb1-pass1-workarounds
-+endif
-+endif
-+
-+#
-+# Firmware support
-+#
-+libs-$(CONFIG_ARC)		+= arch/mips/arc/
-+libs-$(CONFIG_SIBYTE_CFE)	+= arch/mips/sibyte/cfe/
-+
-+#
-+# Board-dependent options and extra files
-+#
-+
-+#
-+# Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
-+#
-+core-$(CONFIG_MACH_JAZZ)	+= arch/mips/jazz/
-+cflags-$(CONFIG_MACH_JAZZ)	+= -Iinclude/asm-mips/mach-jazz
-+load-$(CONFIG_MACH_JAZZ)	+= 0xffffffff80080000
-+
-+#
-+# Common Alchemy Au1x00 stuff
-+#
-+core-$(CONFIG_SOC_AU1X00)	+= arch/mips/au1000/common/
-+cflags-$(CONFIG_SOC_AU1X00)	+= -Iinclude/asm-mips/mach-au1x00
-+
-+#
-+# AMD Alchemy Pb1000 eval board
-+#
-+libs-$(CONFIG_MIPS_PB1000)	+= arch/mips/au1000/pb1000/
-+cflags-$(CONFIG_MIPS_PB1000)	+= -Iinclude/asm-mips/mach-pb1x00
-+load-$(CONFIG_MIPS_PB1000)	+= 0xffffffff80100000
-+
-+#
-+# AMD Alchemy Pb1100 eval board
-+#
-+libs-$(CONFIG_MIPS_PB1100)	+= arch/mips/au1000/pb1100/
-+cflags-$(CONFIG_MIPS_PB1100)	+= -Iinclude/asm-mips/mach-pb1x00
-+load-$(CONFIG_MIPS_PB1100)	+= 0xffffffff80100000
-+
-+#
-+# AMD Alchemy Pb1500 eval board
-+#
-+libs-$(CONFIG_MIPS_PB1500)	+= arch/mips/au1000/pb1500/
-+cflags-$(CONFIG_MIPS_PB1500)	+= -Iinclude/asm-mips/mach-pb1x00
-+load-$(CONFIG_MIPS_PB1500)	+= 0xffffffff80100000
-+
-+#
-+# AMD Alchemy Pb1550 eval board
-+#
-+libs-$(CONFIG_MIPS_PB1550)	+= arch/mips/au1000/pb1550/
-+cflags-$(CONFIG_MIPS_PB1550)	+= -Iinclude/asm-mips/mach-pb1x00
-+load-$(CONFIG_MIPS_PB1550)	+= 0xffffffff80100000
-+
-+#
-+# AMD Alchemy Pb1200 eval board
-+#
-+libs-$(CONFIG_MIPS_PB1200)	+= arch/mips/au1000/pb1200/
-+cflags-$(CONFIG_MIPS_PB1200)	+= -Iinclude/asm-mips/mach-pb1x00
-+load-$(CONFIG_MIPS_PB1200)	+= 0xffffffff80100000
-+
-+#
-+# AMD Alchemy Db1000 eval board
-+#
-+libs-$(CONFIG_MIPS_DB1000)	+= arch/mips/au1000/db1x00/
-+cflags-$(CONFIG_MIPS_DB1000)	+= -Iinclude/asm-mips/mach-db1x00
-+load-$(CONFIG_MIPS_DB1000)	+= 0xffffffff80100000
-+
-+#
-+# AMD Alchemy Db1100 eval board
-+#
-+libs-$(CONFIG_MIPS_DB1100)	+= arch/mips/au1000/db1x00/
-+cflags-$(CONFIG_MIPS_DB1100)	+= -Iinclude/asm-mips/mach-db1x00
-+load-$(CONFIG_MIPS_DB1100)	+= 0xffffffff80100000
-+
-+#
-+# AMD Alchemy Db1500 eval board
-+#
-+libs-$(CONFIG_MIPS_DB1500)	+= arch/mips/au1000/db1x00/
-+cflags-$(CONFIG_MIPS_DB1500)	+= -Iinclude/asm-mips/mach-db1x00
-+load-$(CONFIG_MIPS_DB1500)	+= 0xffffffff80100000
-+
-+#
-+# AMD Alchemy Db1550 eval board
-+#
-+libs-$(CONFIG_MIPS_DB1550)	+= arch/mips/au1000/db1x00/
-+cflags-$(CONFIG_MIPS_DB1550)	+= -Iinclude/asm-mips/mach-db1x00
-+load-$(CONFIG_MIPS_DB1550)	+= 0xffffffff80100000
-+
-+#
-+# AMD Alchemy Db1200 eval board
-+#
-+libs-$(CONFIG_MIPS_DB1200)	+= arch/mips/au1000/pb1200/
-+cflags-$(CONFIG_MIPS_DB1200)	+= -Iinclude/asm-mips/mach-db1x00
-+load-$(CONFIG_MIPS_DB1200)	+= 0xffffffff80100000
-+
-+#
-+# AMD Alchemy Bosporus eval board
-+#
-+libs-$(CONFIG_MIPS_BOSPORUS)	+= arch/mips/au1000/db1x00/
-+cflags-$(CONFIG_MIPS_BOSPORUS)	+= -Iinclude/asm-mips/mach-db1x00
-+load-$(CONFIG_MIPS_BOSPORUS)	+= 0xffffffff80100000
-+
-+#
-+# AMD Alchemy Mirage eval board
-+#
-+libs-$(CONFIG_MIPS_MIRAGE)	+= arch/mips/au1000/db1x00/
-+cflags-$(CONFIG_MIPS_MIRAGE)	+= -Iinclude/asm-mips/mach-db1x00
-+load-$(CONFIG_MIPS_MIRAGE)	+= 0xffffffff80100000
-+
-+#
-+# 4G-Systems eval board
-+#
-+libs-$(CONFIG_MIPS_MTX1)	+= arch/mips/au1000/mtx-1/
-+load-$(CONFIG_MIPS_MTX1)	+= 0xffffffff80100000
-+
-+#
-+# MyCable eval board
-+#
-+libs-$(CONFIG_MIPS_XXS1500)	+= arch/mips/au1000/xxs1500/
-+load-$(CONFIG_MIPS_XXS1500)	+= 0xffffffff80100000
-+
-+#
-+# Cobalt Server
-+#
-+core-$(CONFIG_MIPS_COBALT)	+= arch/mips/cobalt/
-+cflags-$(CONFIG_MIPS_COBALT)	+= -Iinclude/asm-mips/mach-cobalt
-+load-$(CONFIG_MIPS_COBALT)	+= 0xffffffff80080000
-+
-+#
-+# DECstation family
-+#
-+core-$(CONFIG_MACH_DECSTATION)	+= arch/mips/dec/
-+cflags-$(CONFIG_MACH_DECSTATION)+= -Iinclude/asm-mips/mach-dec
-+libs-$(CONFIG_MACH_DECSTATION)	+= arch/mips/dec/prom/
-+load-$(CONFIG_MACH_DECSTATION)	+= 0xffffffff80040000
-+CLEAN_FILES			+= drivers/tc/lk201-map.c
-+
-+#
-+# Galileo EV64120 Board
-+#
-+core-$(CONFIG_MIPS_EV64120)	+= arch/mips/gt64120/ev64120/
-+core-$(CONFIG_MIPS_EV64120)	+= arch/mips/gt64120/common/
-+cflags-$(CONFIG_MIPS_EV64120)	+= -Iinclude/asm-mips/mach-ev64120
-+load-$(CONFIG_MIPS_EV64120)	+= 0xffffffff80100000
-+
-+#
-+# Galileo EV96100 Board
-+#
-+core-$(CONFIG_MIPS_EV96100)	+= arch/mips/galileo-boards/ev96100/
-+cflags-$(CONFIG_MIPS_EV96100)	+= -Iinclude/asm-mips/mach-ev96100
-+load-$(CONFIG_MIPS_EV96100)	+= 0xffffffff80100000
-+
-+#
-+# Globespan IVR eval board with QED 5231 CPU
-+#
-+core-$(CONFIG_ITE_BOARD_GEN)	+= arch/mips/ite-boards/generic/
-+core-$(CONFIG_MIPS_IVR)		+= arch/mips/ite-boards/ivr/
-+load-$(CONFIG_MIPS_IVR)		+= 0xffffffff80100000
-+
-+#
-+# ITE 8172 eval board with QED 5231 CPU
-+#
-+core-$(CONFIG_MIPS_ITE8172)	+= arch/mips/ite-boards/qed-4n-s01b/
-+load-$(CONFIG_MIPS_ITE8172)	+= 0xffffffff80100000
-+
-+#
-+# For all MIPS, Inc. eval boards
-+#
-+core-$(CONFIG_MIPS_BOARDS_GEN)	+= arch/mips/mips-boards/generic/
-+
-+#
-+# MIPS Atlas board
-+#
-+core-$(CONFIG_MIPS_ATLAS)	+= arch/mips/mips-boards/atlas/
-+cflags-$(CONFIG_MIPS_ATLAS)	+= -Iinclude/asm-mips/mach-atlas
-+cflags-$(CONFIG_MIPS_ATLAS)	+= -Iinclude/asm-mips/mach-mips
-+load-$(CONFIG_MIPS_ATLAS)	+= 0xffffffff80100000
-+
-+#
-+# MIPS Malta board
-+#
-+core-$(CONFIG_MIPS_MALTA)	+= arch/mips/mips-boards/malta/
-+cflags-$(CONFIG_MIPS_MALTA)	+= -Iinclude/asm-mips/mach-mips
-+load-$(CONFIG_MIPS_MALTA)	+= 0xffffffff80100000
-+
-+#
-+# MIPS SEAD board
-+#
-+core-$(CONFIG_MIPS_SEAD)	+= arch/mips/mips-boards/sead/
-+load-$(CONFIG_MIPS_SEAD)	+= 0xffffffff80100000
-+
-+#
-+# MIPS SIM
-+#
-+core-$(CONFIG_MIPS_SIM)		+= arch/mips/mips-boards/sim/
-+cflags-$(CONFIG_MIPS_SIM)	+= -Iinclude/asm-mips/mach-sim
-+load-$(CONFIG_MIPS_SIM)		+= 0x80100000
-+
-+#
-+# Momentum Ocelot board
-+#
-+# The Ocelot setup.o must be linked early - it does the ioremap() for the
-+# mips_io_port_base.
-+#
-+core-$(CONFIG_MOMENCO_OCELOT)	+= arch/mips/gt64120/common/ \
-+				   arch/mips/gt64120/momenco_ocelot/
-+cflags-$(CONFIG_MOMENCO_OCELOT)	+= -Iinclude/asm-mips/mach-ocelot
-+load-$(CONFIG_MOMENCO_OCELOT)	+= 0xffffffff80100000
-+
-+#
-+# Momentum Ocelot-G board
-+#
-+# The Ocelot-G setup.o must be linked early - it does the ioremap() for the
-+# mips_io_port_base.
-+#
-+core-$(CONFIG_MOMENCO_OCELOT_G)	+= arch/mips/momentum/ocelot_g/
-+load-$(CONFIG_MOMENCO_OCELOT_G)	+= 0xffffffff80100000
-+
-+#
-+# Momentum Ocelot-C and -CS boards
-+#
-+# The Ocelot-C[S] setup.o must be linked early - it does the ioremap() for the
-+# mips_io_port_base.
-+core-$(CONFIG_MOMENCO_OCELOT_C)	+= arch/mips/momentum/ocelot_c/
-+load-$(CONFIG_MOMENCO_OCELOT_C)	+= 0xffffffff80100000
-+
-+#
-+# PMC-Sierra Yosemite
-+#
-+core-$(CONFIG_PMC_YOSEMITE)	+= arch/mips/pmc-sierra/yosemite/
-+cflags-$(CONFIG_PMC_YOSEMITE)	+= -Iinclude/asm-mips/mach-yosemite
-+load-$(CONFIG_PMC_YOSEMITE)	+= 0xffffffff80100000
-+
-+# Qemu simulating MIPS32 4Kc
-+#
-+core-$(CONFIG_QEMU)		+= arch/mips/qemu/
-+cflags-$(CONFIG_QEMU)		+= -Iinclude/asm-mips/mach-qemu
-+load-$(CONFIG_QEMU)		+= 0xffffffff80010000
-+
-+#
-+# Momentum Ocelot-3
-+#
-+core-$(CONFIG_MOMENCO_OCELOT_3) 	+= arch/mips/momentum/ocelot_3/
-+cflags-$(CONFIG_MOMENCO_OCELOT_3)	+= -Iinclude/asm-mips/mach-ocelot3
-+load-$(CONFIG_MOMENCO_OCELOT_3) 	+= 0xffffffff80100000
-+
-+#
-+# Momentum Jaguar ATX
-+#
-+core-$(CONFIG_MOMENCO_JAGUAR_ATX)	+= arch/mips/momentum/jaguar_atx/
-+cflags-$(CONFIG_MOMENCO_JAGUAR_ATX)	+= -Iinclude/asm-mips/mach-ja
-+#ifdef CONFIG_JAGUAR_DMALOW
-+#load-$(CONFIG_MOMENCO_JAGUAR_ATX)	+= 0xffffffff88000000
-+#else
-+load-$(CONFIG_MOMENCO_JAGUAR_ATX)	+= 0xffffffff80100000
-+#endif
-+
-+#
-+# NEC DDB
-+#
-+core-$(CONFIG_DDB5XXX_COMMON)	+= arch/mips/ddb5xxx/common/
-+
-+#
-+# NEC DDB Vrc-5074
-+#
-+core-$(CONFIG_DDB5074)		+= arch/mips/ddb5xxx/ddb5074/
-+load-$(CONFIG_DDB5074)		+= 0xffffffff80080000
-+
-+#
-+# NEC DDB Vrc-5476
-+#
-+core-$(CONFIG_DDB5476)		+= arch/mips/ddb5xxx/ddb5476/
-+load-$(CONFIG_DDB5476)		+= 0xffffffff80080000
-+
-+#
-+# NEC DDB Vrc-5477
-+#
-+core-$(CONFIG_DDB5477)		+= arch/mips/ddb5xxx/ddb5477/
-+load-$(CONFIG_DDB5477)		+= 0xffffffff80100000
-+
-+core-$(CONFIG_LASAT)		+= arch/mips/lasat/
-+cflags-$(CONFIG_LASAT)		+= -Iinclude/asm-mips/mach-lasat
-+load-$(CONFIG_LASAT)		+= 0xffffffff80000000
-+
-+#
-+# Common VR41xx
-+#
-+core-$(CONFIG_MACH_VR41XX)	+= arch/mips/vr41xx/common/
-+cflags-$(CONFIG_MACH_VR41XX)	+= -Iinclude/asm-mips/mach-vr41xx
-+
-+#
-+# NEC VR4133
-+#
-+core-$(CONFIG_NEC_CMBVR4133)	+= arch/mips/vr41xx/nec-cmbvr4133/
-+load-$(CONFIG_NEC_CMBVR4133)	+= 0xffffffff80100000
-+
-+#
-+# ZAO Networks Capcella (VR4131)
-+#
-+load-$(CONFIG_ZAO_CAPCELLA)	+= 0xffffffff80000000
-+
-+#
-+# Victor MP-C303/304 (VR4122)
-+#
-+load-$(CONFIG_VICTOR_MPC30X)	+= 0xffffffff80001000
-+
-+#
-+# IBM WorkPad z50 (VR4121)
-+#
-+core-$(CONFIG_IBM_WORKPAD)	+= arch/mips/vr41xx/ibm-workpad/
-+load-$(CONFIG_IBM_WORKPAD)	+= 0xffffffff80004000
-+
-+#
-+# CASIO CASSIPEIA E-55/65 (VR4111)
-+#
-+core-$(CONFIG_CASIO_E55)	+= arch/mips/vr41xx/casio-e55/
-+load-$(CONFIG_CASIO_E55)	+= 0xffffffff80004000
-+
-+#
-+# TANBAC VR4131 multichip module(TB0225) and TANBAC VR4131DIMM(TB0229) (VR4131)
-+#
-+load-$(CONFIG_TANBAC_TB022X)	+= 0xffffffff80000000
-+
-+#
-+# Common Philips PNX8550
-+#
-+core-$(CONFIG_SOC_PNX8550)	+= arch/mips/philips/pnx8550/common/
-+cflags-$(CONFIG_SOC_PNX8550)	+= -Iinclude/asm-mips/mach-pnx8550
-+
-+#
-+# Philips PNX8550 JBS board
-+#
-+libs-$(CONFIG_PNX8550_JBS)	+= arch/mips/philips/pnx8550/jbs/
-+#cflags-$(CONFIG_PNX8550_JBS)	+= -Iinclude/asm-mips/mach-pnx8550
-+load-$(CONFIG_PNX8550_JBS)	+= 0xffffffff80060000
-+
-+#
-+# SGI IP22 (Indy/Indigo2)
-+#
-+# Set the load address to >= 0xffffffff88069000 if you want to leave space for
-+# symmon, 0xffffffff80002000 for production kernels.  Note that the value must
-+# be aligned to a multiple of the kernel stack size or the handling of the
-+# current variable will break so for 64-bit kernels we have to raise the start
-+# address by 8kb.
-+#
-+core-$(CONFIG_SGI_IP22)		+= arch/mips/sgi-ip22/
-+cflags-$(CONFIG_SGI_IP22)	+= -Iinclude/asm-mips/mach-ip22
-+ifdef CONFIG_32BIT
-+load-$(CONFIG_SGI_IP22)		+= 0xffffffff88002000
-+endif
-+ifdef CONFIG_64BIT
-+load-$(CONFIG_SGI_IP22)		+= 0xffffffff88004000
-+endif
-+
-+#
-+# SGI-IP27 (Origin200/2000)
-+#
-+# Set the load address to >= 0xc000000000300000 if you want to leave space for
-+# symmon, 0xc00000000001c000 for production kernels.  Note that the value must
-+# be 16kb aligned or the handling of the current variable will break.
-+#
-+ifdef CONFIG_SGI_IP27
-+core-$(CONFIG_SGI_IP27)		+= arch/mips/sgi-ip27/
-+cflags-$(CONFIG_SGI_IP27)	+= -Iinclude/asm-mips/mach-ip27
-+ifdef CONFIG_BUILD_ELF64
-+ifdef CONFIG_MAPPED_KERNEL
-+load-$(CONFIG_SGI_IP27)		+= 0xc00000004001c000
-+OBJCOPYFLAGS			:= --change-addresses=0x3fffffff80000000
-+dataoffset-$(CONFIG_SGI_IP27)	+= 0x01000000
-+else
-+load-$(CONFIG_SGI_IP27)		+= 0xa80000000001c000
-+OBJCOPYFLAGS			:= --change-addresses=0x57ffffff80000000
-+endif
-+else
-+ifdef CONFIG_MAPPED_KERNEL
-+load-$(CONFIG_SGI_IP27)		+= 0xffffffffc001c000
-+OBJCOPYFLAGS			:= --change-addresses=0xc000000080000000
-+dataoffset-$(CONFIG_SGI_IP27)	+= 0x01000000
-+else
-+load-$(CONFIG_SGI_IP27)		+= 0xffffffff8001c000
-+OBJCOPYFLAGS			:= --change-addresses=0xa800000080000000
-+endif
-+endif
-+endif
-+
-+#
-+# SGI-IP32 (O2)
-+#
-+# Set the load address to >= 80069000 if you want to leave space for symmon,
-+# 0xffffffff80004000 for production kernels.  Note that the value must be aligned to
-+# a multiple of the kernel stack size or the handling of the current variable
-+# will break.
-+#
-+core-$(CONFIG_SGI_IP32)		+= arch/mips/sgi-ip32/
-+cflags-$(CONFIG_SGI_IP32)	+= -Iinclude/asm-mips/mach-ip32
-+load-$(CONFIG_SGI_IP32)		+= 0xffffffff80004000
-+
-+#
-+# Sibyte SB1250 SOC
-+#
-+# This is a LIB so that it links at the end, and initcalls are later
-+# the sequence; but it is built as an object so that modules don't get
-+# removed (as happens, even if they have __initcall/module_init)
-+#
-+core-$(CONFIG_SIBYTE_BCM112X)	+= arch/mips/sibyte/sb1250/
-+cflags-$(CONFIG_SIBYTE_BCM112X)	+= -Iinclude/asm-mips/mach-sibyte \
-+			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL
-+
-+core-$(CONFIG_SIBYTE_SB1250)	+= arch/mips/sibyte/sb1250/
-+cflags-$(CONFIG_SIBYTE_SB1250)	+= -Iinclude/asm-mips/mach-sibyte \
-+			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL
-+
-+core-$(CONFIG_SIBYTE_BCM1x55)	+= arch/mips/sibyte/bcm1480/
-+cflags-$(CONFIG_SIBYTE_BCM1x55)	+= -Iinclude/asm-mips/mach-sibyte \
-+			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL
-+
-+core-$(CONFIG_SIBYTE_BCM1x80)	+= arch/mips/sibyte/bcm1480/
-+cflags-$(CONFIG_SIBYTE_BCM1x80)	+= -Iinclude/asm-mips/mach-sibyte \
-+			-DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL
-+
-+#
-+# Sibyte BCM91120x (Carmel) board
-+# Sibyte BCM91120C (CRhine) board
-+# Sibyte BCM91125C (CRhone) board
-+# Sibyte BCM91125E (Rhone) board
-+# Sibyte SWARM board
-+# Sibyte BCM91x80 (BigSur) board
-+#
-+libs-$(CONFIG_SIBYTE_CARMEL)	+= arch/mips/sibyte/swarm/
-+load-$(CONFIG_SIBYTE_CARMEL)	:= 0xffffffff80100000
-+libs-$(CONFIG_SIBYTE_CRHINE)	+= arch/mips/sibyte/swarm/
-+load-$(CONFIG_SIBYTE_CRHINE)	:= 0xffffffff80100000
-+libs-$(CONFIG_SIBYTE_CRHONE)	+= arch/mips/sibyte/swarm/
-+load-$(CONFIG_SIBYTE_CRHONE)	:= 0xffffffff80100000
-+libs-$(CONFIG_SIBYTE_RHONE)	+= arch/mips/sibyte/swarm/
-+load-$(CONFIG_SIBYTE_RHONE)	:= 0xffffffff80100000
-+libs-$(CONFIG_SIBYTE_SENTOSA)	+= arch/mips/sibyte/swarm/
-+load-$(CONFIG_SIBYTE_SENTOSA)	:= 0xffffffff80100000
-+libs-$(CONFIG_SIBYTE_SWARM)	+= arch/mips/sibyte/swarm/
-+load-$(CONFIG_SIBYTE_SWARM)	:= 0xffffffff80100000
-+libs-$(CONFIG_SIBYTE_BIGSUR)	+= arch/mips/sibyte/swarm/
-+load-$(CONFIG_SIBYTE_BIGSUR)	:= 0xffffffff80100000
-+
-+#
-+# SNI RM200 PCI
-+#
-+core-$(CONFIG_SNI_RM200_PCI)	+= arch/mips/sni/
-+cflags-$(CONFIG_SNI_RM200_PCI)	+= -Iinclude/asm-mips/mach-rm200
-+load-$(CONFIG_SNI_RM200_PCI)	+= 0xffffffff80600000
-+
-+#
-+# Toshiba JMR-TX3927 board
-+#
-+core-$(CONFIG_TOSHIBA_JMR3927)	+= arch/mips/jmr3927/rbhma3100/ \
-+				   arch/mips/jmr3927/common/
-+cflags-$(CONFIG_TOSHIBA_JMR3927) += -Iinclude/asm-mips/mach-jmr3927
-+load-$(CONFIG_TOSHIBA_JMR3927)	+= 0xffffffff80050000
-+
-+#
-+# Toshiba RBTX4927 board or
-+# Toshiba RBTX4937 board
-+#
-+core-$(CONFIG_TOSHIBA_RBTX4927)	+= arch/mips/tx4927/toshiba_rbtx4927/
-+core-$(CONFIG_TOSHIBA_RBTX4927)	+= arch/mips/tx4927/common/
-+load-$(CONFIG_TOSHIBA_RBTX4927)	+= 0xffffffff80020000
-+
-+#
-+# Toshiba RBTX4938 board
-+#
-+core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/toshiba_rbtx4938/
-+core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/tx4938/common/
-+load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000
-+
-+cflags-y			+= -Iinclude/asm-mips/mach-generic
-+drivers-$(CONFIG_PCI)		+= arch/mips/pci/
-+
-+ifdef CONFIG_32BIT
-+ifdef CONFIG_CPU_LITTLE_ENDIAN
-+JIFFIES			= jiffies_64
-+else
-+JIFFIES			= jiffies_64 + 4
-+endif
-+else
-+JIFFIES			= jiffies_64
-+endif
-+
-+AFLAGS		+= $(cflags-y)
-+CFLAGS		+= $(cflags-y)
-+
-+LDFLAGS			+= -m $(ld-emul)
-+
-+OBJCOPYFLAGS		+= --remove-section=.reginfo
-+
-+#
-+# Choosing incompatible machines durings configuration will result in
-+# error messages during linking.  Select a default linkscript if
-+# none has been choosen above.
-+#
-+
-+CPPFLAGS_vmlinux.lds := \
-+	$(CFLAGS) \
-+	-D"LOADADDR=$(load-y)" \
-+	-D"JIFFIES=$(JIFFIES)" \
-+	-D"DATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0)"
-+
-+head-y := arch/mips/kernel/head.o arch/mips/kernel/init_task.o
-+
-+libs-y			+= arch/mips/lib/
-+libs-$(CONFIG_32BIT)	+= arch/mips/lib-32/
-+libs-$(CONFIG_64BIT)	+= arch/mips/lib-64/
-+
-+core-y			+= arch/mips/kernel/ arch/mips/mm/ arch/mips/math-emu/
-+
-+drivers-$(CONFIG_OPROFILE)	+= arch/mips/oprofile/
-+
-+ifdef CONFIG_LASAT
-+rom.bin rom.sw: vmlinux
-+	$(Q)$(MAKE) $(build)=arch/mips/lasat/image $@
-+endif
-+
-+#
-+# Some machines like the Indy need 32-bit ELF binaries for booting purposes.
-+# Other need ECOFF, so we build a 32-bit ELF binary for them which we then
-+# convert to ECOFF using elf2ecoff.
-+#
-+vmlinux.32: vmlinux
-+	$(OBJCOPY) -O $(32bit-bfd) $(OBJCOPYFLAGS) $< $@
-+
-+#
-+# The 64-bit ELF tools are pretty broken so at this time we generate 64-bit
-+# ELF files from 32-bit files by conversion.
-+#
-+vmlinux.64: vmlinux
-+	$(OBJCOPY) -O $(64bit-bfd) $(OBJCOPYFLAGS) $< $@
-+
-+makeboot =$(Q)$(MAKE) $(build)=arch/mips/boot VMLINUX=$(vmlinux-32) $(1)
-+
-+ifdef CONFIG_BOOT_ELF32
-+all:	$(vmlinux-32)
-+endif
-+
-+ifdef CONFIG_BOOT_ELF64
-+all:	$(vmlinux-64)
-+endif
-+
-+ifdef CONFIG_MIPS_ATLAS
-+all:	vmlinux.srec
-+endif
-+
-+ifdef CONFIG_MIPS_MALTA
-+all:	vmlinux.srec
-+endif
-+
-+ifdef CONFIG_MIPS_SEAD
-+all:	vmlinux.srec
-+endif
-+
-+ifdef CONFIG_QEMU
-+all:	vmlinux.bin
-+endif
-+
-+ifdef CONFIG_SNI_RM200_PCI
-+all:	vmlinux.ecoff
-+endif
-+
-+ifdef CONFIG_MIPS_MTX1
-+all:    vmlinux.srec zImage zImage.flash
-+endif
-+
-+vmlinux.bin: $(vmlinux-32)
-+	+@$(call makeboot,$@)
-+
-+vmlinux.ecoff vmlinux.rm200: $(vmlinux-32)
-+	+@$(call makeboot,$@)
-+
-+vmlinux.srec: $(vmlinux-32)
-+	+@$(call makeboot,$@)
-+
-+zImage: vmlinux
-+	+@$(call makeboot,$@)
-+
-+CLEAN_FILES += vmlinux.ecoff \
-+	       vmlinux.srec \
-+	       vmlinux.rm200.tmp \
-+	       vmlinux.rm200
-+
-+archclean:
-+	@$(MAKE) $(clean)=arch/mips/boot
-+	@$(MAKE) $(clean)=arch/mips/lasat
-+	@$(MAKE) $(clean)=arch/mips/boot/compressed
-+
-+CLEAN_FILES += vmlinux.32 \
-+	       vmlinux.64 \
-+	       vmlinux.ecoff
diff --git a/openwrt/target/linux/image/au1000/Makefile b/openwrt/target/linux/image/au1000/Makefile
index 414873189..c7158ca76 100644
--- a/openwrt/target/linux/image/au1000/Makefile
+++ b/openwrt/target/linux/image/au1000/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 LOADADDR = 0x8108c8f4		# RAM start + 16M 
-KERNEL_ENTRY = 0x80100000
-RAMSIZE = 0x04000000		# 1MB
+KERNEL_ENTRY = 0x80100000	# Default kernel entry in arch/mips/Makefile
+RAMSIZE = 0x04000000		# 64MB
 
 LOADER_MAKEOPTS= \
 		KDIR=$(KDIR) \
@@ -28,9 +28,6 @@ $(KDIR)/vmlinux.lzma: $(KDIR)/vmlinux
 install: $(KDIR)/vmlinux.lzma
 endif
 
-ifeq ($(KERNEL),2.6)
-FSNAME:=$(patsubst jffs2-%,jffs2,$(FS))
-
 ifeq ($(FS),jffs2-8MB)
 
 $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin: $(KDIR)/root.$(FS)
@@ -58,9 +55,6 @@ $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin: $(KDIR)/root.$(FS)
 
 endif
 
-install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin
-endif
-
 $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz: $(KDIR)/zImage.flash
 	$(CP) $^ $@
 
@@ -78,5 +72,5 @@ install-ib:
 	mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)
 	$(CP) $(KDIR)/loader.elf $(IB_DIR)/build_$(ARCH)/
 	$(CP) $(KDIR)/vmlinux.lzma $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/
-	$(TARGET_CROSS)objcopy -O srec $(KDIR)/loader.elf $(KDIR)/loader.srec
+	$(TARGET_CROSS)objcopy -O srec -I binary --adjust-vma 0xbe000000 $(KDIR)/loader.elf $(KDIR)/loader.srec
 	grep -v S0 $(KDIR)/loader.srec > $(KDIR)/kernel.srec
diff --git a/openwrt/target/linux/package/base-files/files/au1000-2.6/sbin/mount_root b/openwrt/target/linux/package/base-files/files/au1000-2.6/sbin/mount_root
new file mode 100755
index 000000000..5dd1b0c56
--- /dev/null
+++ b/openwrt/target/linux/package/base-files/files/au1000-2.6/sbin/mount_root
@@ -0,0 +1,23 @@
+#!/bin/sh
+size=$(awk '/Mem:/ {l=5242880;print((s=$2/2)<l)?$2-l:s}' /proc/meminfo)
+mount none /tmp -t tmpfs -o size=$size
+
+if [ "$1" != "failsafe" ]; then 
+	mtd unlock filesystem
+	mount | grep jffs2 >&-
+	if [ $? = 0 ] ; then
+		if [ $(cat /proc/mtd | wc -l) = 6 ]; then
+			mtd erase filesystem
+			jffs2root --move
+		else
+			mount -o remount,rw /dev/root /
+		fi
+	else
+		. /bin/firstboot
+	fi
+fi
+
+mount none /tmp -t tmpfs -o remount,nosuid,nodev,mode=1777
+mkdir -p /dev/pts
+mount none /dev/pts -t devpts
+mount -t sysfs none /sys 2>&-