summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-06-02 19:56:56 +0200
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-06-02 19:56:56 +0200
commitd8f493384b36672dd6fd35356ea122f30bdf56e1 (patch)
tree580d84c4cd51f19138cf5876c5448e91dbb8be52 /target/linux
parentf516fba11d74ea04677642e9681d208a920cb686 (diff)
update to latest stable kernels
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/patches/3.0.30/brcm.patch (renamed from target/linux/patches/3.0.25/brcm.patch)0
-rw-r--r--target/linux/patches/3.0.30/bsd-compatibility.patch (renamed from target/linux/patches/3.0.25/bsd-compatibility.patch)0
-rw-r--r--target/linux/patches/3.0.30/cris-etrax.patch (renamed from target/linux/patches/3.0.25/cris-etrax.patch)0
-rw-r--r--target/linux/patches/3.0.30/defaults.patch (renamed from target/linux/patches/3.0.25/defaults.patch)0
-rw-r--r--target/linux/patches/3.0.30/fon2100.patch (renamed from target/linux/patches/3.0.25/fon2100.patch)0
-rw-r--r--target/linux/patches/3.0.30/gemalto.patch (renamed from target/linux/patches/3.0.25/gemalto.patch)0
-rw-r--r--target/linux/patches/3.0.30/mips-malta.patch (renamed from target/linux/patches/3.0.25/mips-malta.patch)0
-rw-r--r--target/linux/patches/3.0.30/mmc-host.patch (renamed from target/linux/patches/3.0.25/mmc-host.patch)0
-rw-r--r--target/linux/patches/3.0.30/mtd-rootfs.patch (renamed from target/linux/patches/3.0.25/mtd-rootfs.patch)0
-rw-r--r--target/linux/patches/3.0.30/non-static.patch (renamed from target/linux/patches/3.0.25/non-static.patch)0
-rw-r--r--target/linux/patches/3.0.30/sparc-include.patch (renamed from target/linux/patches/3.0.25/sparc-include.patch)0
-rw-r--r--target/linux/patches/3.0.30/startup.patch (renamed from target/linux/patches/3.0.25/startup.patch)0
-rw-r--r--target/linux/patches/3.0.30/usb-defaults-off.patch (renamed from target/linux/patches/3.0.25/usb-defaults-off.patch)0
-rw-r--r--target/linux/patches/3.0.30/uuid.patch (renamed from target/linux/patches/3.0.25/uuid.patch)0
-rw-r--r--target/linux/patches/3.0.30/vga-cons-default-off.patch (renamed from target/linux/patches/3.0.25/vga-cons-default-off.patch)0
-rw-r--r--target/linux/patches/3.0.30/wlan-cf.patch (renamed from target/linux/patches/3.0.25/wlan-cf.patch)0
-rw-r--r--target/linux/patches/3.0.30/x86-build.patch (renamed from target/linux/patches/3.0.25/x86-build.patch)0
-rw-r--r--target/linux/patches/3.0.30/zlib-inflate.patch (renamed from target/linux/patches/3.0.25/zlib-inflate.patch)0
-rw-r--r--target/linux/patches/3.2.18/bsd-compatibility.patch (renamed from target/linux/patches/3.2.12/bsd-compatibility.patch)0
-rw-r--r--target/linux/patches/3.2.18/cris-etrax.patch (renamed from target/linux/patches/3.2.12/cris-etrax.patch)0
-rw-r--r--target/linux/patches/3.2.18/defaults.patch (renamed from target/linux/patches/3.2.12/defaults.patch)0
-rw-r--r--target/linux/patches/3.2.18/gemalto.patch (renamed from target/linux/patches/3.2.12/gemalto.patch)0
-rw-r--r--target/linux/patches/3.2.18/mmc-host.patch (renamed from target/linux/patches/3.2.12/mmc-host.patch)0
-rw-r--r--target/linux/patches/3.2.18/non-static.patch (renamed from target/linux/patches/3.2.12/non-static.patch)0
-rw-r--r--target/linux/patches/3.2.18/sparc-include.patch (renamed from target/linux/patches/3.2.12/sparc-include.patch)0
-rw-r--r--target/linux/patches/3.2.18/startup.patch (renamed from target/linux/patches/3.2.12/startup.patch)0
-rw-r--r--target/linux/patches/3.2.18/usb-defaults-off.patch (renamed from target/linux/patches/3.2.12/usb-defaults-off.patch)0
-rw-r--r--target/linux/patches/3.2.18/uuid.patch (renamed from target/linux/patches/3.2.12/uuid.patch)0
-rw-r--r--target/linux/patches/3.2.18/vga-cons-default-off.patch (renamed from target/linux/patches/3.2.12/vga-cons-default-off.patch)0
-rw-r--r--target/linux/patches/3.2.18/wlan-cf.patch (renamed from target/linux/patches/3.2.12/wlan-cf.patch)0
-rw-r--r--target/linux/patches/3.2.18/x86-build.patch (renamed from target/linux/patches/3.2.12/x86-build.patch)0
-rw-r--r--target/linux/patches/3.2.18/zlib-inflate.patch (renamed from target/linux/patches/3.2.12/zlib-inflate.patch)0
-rw-r--r--target/linux/patches/3.3.7/brcm.patch457
-rw-r--r--target/linux/patches/3.3.7/bsd-compatibility.patch (renamed from target/linux/patches/3.3/bsd-compatibility.patch)0
-rw-r--r--target/linux/patches/3.3.7/cris-etrax.patch (renamed from target/linux/patches/3.3/cris-etrax.patch)0
-rw-r--r--target/linux/patches/3.3.7/defaults.patch (renamed from target/linux/patches/3.3/defaults.patch)0
-rw-r--r--target/linux/patches/3.3.7/gemalto.patch (renamed from target/linux/patches/3.3/gemalto.patch)0
-rw-r--r--target/linux/patches/3.3.7/lemote-rfkill.patch (renamed from target/linux/patches/3.3/lemote-rfkill.patch)0
-rw-r--r--target/linux/patches/3.3.7/mmc-host.patch (renamed from target/linux/patches/3.3/mmc-host.patch)0
-rw-r--r--target/linux/patches/3.3.7/module-alloc-size-check.patch (renamed from target/linux/patches/3.3/module-alloc-size-check.patch)0
-rw-r--r--target/linux/patches/3.3.7/non-static.patch (renamed from target/linux/patches/3.3/non-static.patch)0
-rw-r--r--target/linux/patches/3.3.7/sparc-include.patch (renamed from target/linux/patches/3.3/sparc-include.patch)0
-rw-r--r--target/linux/patches/3.3.7/startup.patch (renamed from target/linux/patches/3.3/startup.patch)0
-rw-r--r--target/linux/patches/3.3.7/usb-defaults-off.patch (renamed from target/linux/patches/3.3/usb-defaults-off.patch)0
-rw-r--r--target/linux/patches/3.3.7/uuid.patch (renamed from target/linux/patches/3.3/uuid.patch)0
-rw-r--r--target/linux/patches/3.3.7/vga-cons-default-off.patch (renamed from target/linux/patches/3.3/vga-cons-default-off.patch)0
-rw-r--r--target/linux/patches/3.3.7/wlan-cf.patch (renamed from target/linux/patches/3.3/wlan-cf.patch)0
-rw-r--r--target/linux/patches/3.3.7/x86-build.patch (renamed from target/linux/patches/3.3/x86-build.patch)0
-rw-r--r--target/linux/patches/3.3.7/zlib-inflate.patch (renamed from target/linux/patches/3.3/zlib-inflate.patch)0
49 files changed, 457 insertions, 0 deletions
diff --git a/target/linux/patches/3.0.25/brcm.patch b/target/linux/patches/3.0.30/brcm.patch
index 87f30da1d..87f30da1d 100644
--- a/target/linux/patches/3.0.25/brcm.patch
+++ b/target/linux/patches/3.0.30/brcm.patch
diff --git a/target/linux/patches/3.0.25/bsd-compatibility.patch b/target/linux/patches/3.0.30/bsd-compatibility.patch
index 9e91a62de..9e91a62de 100644
--- a/target/linux/patches/3.0.25/bsd-compatibility.patch
+++ b/target/linux/patches/3.0.30/bsd-compatibility.patch
diff --git a/target/linux/patches/3.0.25/cris-etrax.patch b/target/linux/patches/3.0.30/cris-etrax.patch
index a80d9a8b8..a80d9a8b8 100644
--- a/target/linux/patches/3.0.25/cris-etrax.patch
+++ b/target/linux/patches/3.0.30/cris-etrax.patch
diff --git a/target/linux/patches/3.0.25/defaults.patch b/target/linux/patches/3.0.30/defaults.patch
index 58aae610b..58aae610b 100644
--- a/target/linux/patches/3.0.25/defaults.patch
+++ b/target/linux/patches/3.0.30/defaults.patch
diff --git a/target/linux/patches/3.0.25/fon2100.patch b/target/linux/patches/3.0.30/fon2100.patch
index 038ff7020..038ff7020 100644
--- a/target/linux/patches/3.0.25/fon2100.patch
+++ b/target/linux/patches/3.0.30/fon2100.patch
diff --git a/target/linux/patches/3.0.25/gemalto.patch b/target/linux/patches/3.0.30/gemalto.patch
index f3c223b5e..f3c223b5e 100644
--- a/target/linux/patches/3.0.25/gemalto.patch
+++ b/target/linux/patches/3.0.30/gemalto.patch
diff --git a/target/linux/patches/3.0.25/mips-malta.patch b/target/linux/patches/3.0.30/mips-malta.patch
index cc8789dca..cc8789dca 100644
--- a/target/linux/patches/3.0.25/mips-malta.patch
+++ b/target/linux/patches/3.0.30/mips-malta.patch
diff --git a/target/linux/patches/3.0.25/mmc-host.patch b/target/linux/patches/3.0.30/mmc-host.patch
index 3d0e37add..3d0e37add 100644
--- a/target/linux/patches/3.0.25/mmc-host.patch
+++ b/target/linux/patches/3.0.30/mmc-host.patch
diff --git a/target/linux/patches/3.0.25/mtd-rootfs.patch b/target/linux/patches/3.0.30/mtd-rootfs.patch
index 5dad745d8..5dad745d8 100644
--- a/target/linux/patches/3.0.25/mtd-rootfs.patch
+++ b/target/linux/patches/3.0.30/mtd-rootfs.patch
diff --git a/target/linux/patches/3.0.25/non-static.patch b/target/linux/patches/3.0.30/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.0.25/non-static.patch
+++ b/target/linux/patches/3.0.30/non-static.patch
diff --git a/target/linux/patches/3.0.25/sparc-include.patch b/target/linux/patches/3.0.30/sparc-include.patch
index 2f8ffd061..2f8ffd061 100644
--- a/target/linux/patches/3.0.25/sparc-include.patch
+++ b/target/linux/patches/3.0.30/sparc-include.patch
diff --git a/target/linux/patches/3.0.25/startup.patch b/target/linux/patches/3.0.30/startup.patch
index 68e8987b0..68e8987b0 100644
--- a/target/linux/patches/3.0.25/startup.patch
+++ b/target/linux/patches/3.0.30/startup.patch
diff --git a/target/linux/patches/3.0.25/usb-defaults-off.patch b/target/linux/patches/3.0.30/usb-defaults-off.patch
index 31367108a..31367108a 100644
--- a/target/linux/patches/3.0.25/usb-defaults-off.patch
+++ b/target/linux/patches/3.0.30/usb-defaults-off.patch
diff --git a/target/linux/patches/3.0.25/uuid.patch b/target/linux/patches/3.0.30/uuid.patch
index 2529fdab5..2529fdab5 100644
--- a/target/linux/patches/3.0.25/uuid.patch
+++ b/target/linux/patches/3.0.30/uuid.patch
diff --git a/target/linux/patches/3.0.25/vga-cons-default-off.patch b/target/linux/patches/3.0.30/vga-cons-default-off.patch
index 178aeeeb9..178aeeeb9 100644
--- a/target/linux/patches/3.0.25/vga-cons-default-off.patch
+++ b/target/linux/patches/3.0.30/vga-cons-default-off.patch
diff --git a/target/linux/patches/3.0.25/wlan-cf.patch b/target/linux/patches/3.0.30/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.0.25/wlan-cf.patch
+++ b/target/linux/patches/3.0.30/wlan-cf.patch
diff --git a/target/linux/patches/3.0.25/x86-build.patch b/target/linux/patches/3.0.30/x86-build.patch
index 339140f41..339140f41 100644
--- a/target/linux/patches/3.0.25/x86-build.patch
+++ b/target/linux/patches/3.0.30/x86-build.patch
diff --git a/target/linux/patches/3.0.25/zlib-inflate.patch b/target/linux/patches/3.0.30/zlib-inflate.patch
index 58e1f6d21..58e1f6d21 100644
--- a/target/linux/patches/3.0.25/zlib-inflate.patch
+++ b/target/linux/patches/3.0.30/zlib-inflate.patch
diff --git a/target/linux/patches/3.2.12/bsd-compatibility.patch b/target/linux/patches/3.2.18/bsd-compatibility.patch
index 9e91a62de..9e91a62de 100644
--- a/target/linux/patches/3.2.12/bsd-compatibility.patch
+++ b/target/linux/patches/3.2.18/bsd-compatibility.patch
diff --git a/target/linux/patches/3.2.12/cris-etrax.patch b/target/linux/patches/3.2.18/cris-etrax.patch
index a80d9a8b8..a80d9a8b8 100644
--- a/target/linux/patches/3.2.12/cris-etrax.patch
+++ b/target/linux/patches/3.2.18/cris-etrax.patch
diff --git a/target/linux/patches/3.2.12/defaults.patch b/target/linux/patches/3.2.18/defaults.patch
index 58aae610b..58aae610b 100644
--- a/target/linux/patches/3.2.12/defaults.patch
+++ b/target/linux/patches/3.2.18/defaults.patch
diff --git a/target/linux/patches/3.2.12/gemalto.patch b/target/linux/patches/3.2.18/gemalto.patch
index f3c223b5e..f3c223b5e 100644
--- a/target/linux/patches/3.2.12/gemalto.patch
+++ b/target/linux/patches/3.2.18/gemalto.patch
diff --git a/target/linux/patches/3.2.12/mmc-host.patch b/target/linux/patches/3.2.18/mmc-host.patch
index 3d0e37add..3d0e37add 100644
--- a/target/linux/patches/3.2.12/mmc-host.patch
+++ b/target/linux/patches/3.2.18/mmc-host.patch
diff --git a/target/linux/patches/3.2.12/non-static.patch b/target/linux/patches/3.2.18/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.2.12/non-static.patch
+++ b/target/linux/patches/3.2.18/non-static.patch
diff --git a/target/linux/patches/3.2.12/sparc-include.patch b/target/linux/patches/3.2.18/sparc-include.patch
index 2f8ffd061..2f8ffd061 100644
--- a/target/linux/patches/3.2.12/sparc-include.patch
+++ b/target/linux/patches/3.2.18/sparc-include.patch
diff --git a/target/linux/patches/3.2.12/startup.patch b/target/linux/patches/3.2.18/startup.patch
index 68e8987b0..68e8987b0 100644
--- a/target/linux/patches/3.2.12/startup.patch
+++ b/target/linux/patches/3.2.18/startup.patch
diff --git a/target/linux/patches/3.2.12/usb-defaults-off.patch b/target/linux/patches/3.2.18/usb-defaults-off.patch
index 31367108a..31367108a 100644
--- a/target/linux/patches/3.2.12/usb-defaults-off.patch
+++ b/target/linux/patches/3.2.18/usb-defaults-off.patch
diff --git a/target/linux/patches/3.2.12/uuid.patch b/target/linux/patches/3.2.18/uuid.patch
index 2529fdab5..2529fdab5 100644
--- a/target/linux/patches/3.2.12/uuid.patch
+++ b/target/linux/patches/3.2.18/uuid.patch
diff --git a/target/linux/patches/3.2.12/vga-cons-default-off.patch b/target/linux/patches/3.2.18/vga-cons-default-off.patch
index 178aeeeb9..178aeeeb9 100644
--- a/target/linux/patches/3.2.12/vga-cons-default-off.patch
+++ b/target/linux/patches/3.2.18/vga-cons-default-off.patch
diff --git a/target/linux/patches/3.2.12/wlan-cf.patch b/target/linux/patches/3.2.18/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.2.12/wlan-cf.patch
+++ b/target/linux/patches/3.2.18/wlan-cf.patch
diff --git a/target/linux/patches/3.2.12/x86-build.patch b/target/linux/patches/3.2.18/x86-build.patch
index 339140f41..339140f41 100644
--- a/target/linux/patches/3.2.12/x86-build.patch
+++ b/target/linux/patches/3.2.18/x86-build.patch
diff --git a/target/linux/patches/3.2.12/zlib-inflate.patch b/target/linux/patches/3.2.18/zlib-inflate.patch
index 58e1f6d21..58e1f6d21 100644
--- a/target/linux/patches/3.2.12/zlib-inflate.patch
+++ b/target/linux/patches/3.2.18/zlib-inflate.patch
diff --git a/target/linux/patches/3.3.7/brcm.patch b/target/linux/patches/3.3.7/brcm.patch
new file mode 100644
index 000000000..91fcf4777
--- /dev/null
+++ b/target/linux/patches/3.3.7/brcm.patch
@@ -0,0 +1,457 @@
+diff -Nur linux-3.3.7.orig/arch/mips/Kconfig linux-3.3.7/arch/mips/Kconfig
+--- linux-3.3.7.orig/arch/mips/Kconfig 2012-05-21 20:42:51.000000000 +0200
++++ linux-3.3.7/arch/mips/Kconfig 2012-05-25 21:45:16.000000000 +0200
+@@ -102,6 +102,12 @@
+ select GENERIC_GPIO
+ select SYS_HAS_EARLY_PRINTK
+ select CFE
++ select SYS_SUPPORTS_ZBOOT_UART16550
++ select HAVE_KERNEL_GZIP
++ select HAVE_KERNEL_BZIP2
++ select HAVE_KERNEL_LZMA
++ select HAVE_KERNEL_XZ
++ select HAVE_KERNEL_LZO
+ help
+ Support for BCM47XX based boards
+
+diff -Nur linux-3.3.7.orig/arch/mips/Makefile linux-3.3.7/arch/mips/Makefile
+--- linux-3.3.7.orig/arch/mips/Makefile 2012-05-21 20:42:51.000000000 +0200
++++ linux-3.3.7/arch/mips/Makefile 2012-05-25 21:45:16.000000000 +0200
+@@ -76,6 +76,7 @@
+ all-$(CONFIG_BOOT_ELF32) := $(vmlinux-32)
+ all-$(CONFIG_BOOT_ELF64) := $(vmlinux-64)
+ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlinuz
++all-$(CONFIG_BCM47XX) += vmlinuz.elf
+
+ #
+ # GCC uses -G 0 -mabicalls -fpic as default. We don't want PIC in the kernel
+@@ -277,7 +278,7 @@
+ $(Q)$(MAKE) $(build)=arch/mips/boot VMLINUX=$(vmlinux-32) arch/mips/boot/$@
+
+ # boot/compressed
+-vmlinuz vmlinuz.bin vmlinuz.ecoff vmlinuz.srec: $(vmlinux-32) FORCE
++vmlinuz vmlinuz.bin vmlinuz.ecoff vmlinuz.srec vmlinuz.elf: $(vmlinux-32) FORCE
+ $(Q)$(MAKE) $(build)=arch/mips/boot/compressed \
+ VMLINUX_LOAD_ADDRESS=$(load-y) 32bit-bfd=$(32bit-bfd) $@
+
+@@ -316,6 +317,7 @@
+ echo ' vmlinuz.ecoff - ECOFF zboot image'
+ echo ' vmlinuz.bin - Raw binary zboot image'
+ echo ' vmlinuz.srec - SREC zboot image'
++ echo ' vmlinuz.elf - ELF self-relocating zboot image'
+ echo
+ echo ' These will be default as appropriate for a configured platform.'
+ endef
+diff -Nur linux-3.3.7.orig/arch/mips/bcm47xx/Makefile linux-3.3.7/arch/mips/bcm47xx/Makefile
+--- linux-3.3.7.orig/arch/mips/bcm47xx/Makefile 2012-05-21 20:42:51.000000000 +0200
++++ linux-3.3.7/arch/mips/bcm47xx/Makefile 2012-05-25 21:46:00.000000000 +0200
+@@ -3,5 +3,4 @@
+ # under Linux.
+ #
+
+-obj-y += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o
+-obj-$(CONFIG_BCM47XX_SSB) += wgt634u.o
++obj-y += gpio.o irq.o nvram.o prom.o serial.o setup.o time.o platform.o
+diff -Nur linux-3.3.7.orig/arch/mips/bcm47xx/platform.c linux-3.3.7/arch/mips/bcm47xx/platform.c
+--- linux-3.3.7.orig/arch/mips/bcm47xx/platform.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.3.7/arch/mips/bcm47xx/platform.c 2012-05-25 21:56:28.000000000 +0200
+@@ -0,0 +1,146 @@
++/*
++ * 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) 2010, 2011 Waldemar Brodkorb <wbx@openadk.org>
++ * Copyright © 2007, 2011 Thorsten Glaser <tg@freewrt.org>
++ */
++
++#include <linux/platform_device.h>
++#include <linux/module.h>
++#include <linux/mtd/physmap.h>
++#include <linux/ssb/ssb.h>
++
++#include <asm/mach-bcm47xx/bcm47xx.h>
++#include <asm/mach-bcm47xx/nvram.h>
++
++#define CFGFS_FLASH_SIZE (128 * 1024)
++
++static struct mtd_partition bcm47xx_partitions[] = {
++#define SLOT_CFE 0
++ {
++ .name = "cfe",
++ .offset = 0,
++ .size = BCM47XX_OVERRIDE_CFESIZE,
++ .mask_flags = MTD_WRITEABLE /* force read-only */
++ },
++#define SLOT_LINUX 1
++ {
++ .name = "linux",
++ .offset = 0,
++ .size = 0,
++ },
++#define SLOT_ROOTFS 2
++ {
++ .name = "rootfs",
++ .offset = 0,
++ .size = 0,
++ },
++#define SLOT_CFGFS 3
++ {
++ .name = "cfgfs",
++ .offset = 0,
++ .size = 0,
++ },
++#define SLOT_NVRAM 4
++ {
++ .name = "nvram",
++ .offset = 0,
++ .size = 0,
++ },
++};
++
++static struct physmap_flash_data bcm47xx_flash_data = {
++ .parts = bcm47xx_partitions,
++ .nr_parts = ARRAY_SIZE(bcm47xx_partitions)
++};
++
++static struct resource bcm47xx_flash_resource = {
++ .flags = IORESOURCE_MEM,
++};
++
++static struct platform_device bcm47xx_flash = {
++ .name = "physmap-flash",
++ .id = 0,
++ .dev = { .platform_data = &bcm47xx_flash_data, },
++ .resource = &bcm47xx_flash_resource,
++ .num_resources = 1,
++};
++
++static struct platform_device *bcm47xx_devices[] __initdata = {
++ &bcm47xx_flash,
++};
++
++struct bcm47xx_trx_header {
++#define BCM47XX_TRX_MAGIC 0x30524448
++ u32 magic;
++ u32 len;
++ u32 crc32;
++ u32 flag_version;
++ u32 offsets[3];
++};
++
++#define UPTODOWN(slot, psize) do { \
++ posn -= psize; left -= psize; \
++ bcm47xx_partitions[slot].offset = posn; \
++ bcm47xx_partitions[slot].size = psize; \
++} while (/* CONSTCOND */ 0)
++
++static int __init bcm47xx_register_devices(void)
++{
++ u32 flash_size;
++ size_t left, posn;
++ struct ssb_mipscore *mcore = &bcm47xx_bus.ssb.mipscore;
++ struct bcm47xx_trx_header *trx_hdr;
++
++ trx_hdr = (void *)KSEG1ADDR(mcore->flash_window + BCM47XX_OVERRIDE_CFESIZE);
++
++ /* devices might have 2, 4 or 8 MB flash size */
++#ifdef BCM47XX_OVERRIDE_FLASHSIZE
++ flash_size = BCM47XX_OVERRIDE_FLASHSIZE;
++ mcore->flash_window_size = flash_size;
++#define BCM47XX_OVERRODE_FLASHSIZE " (overridden)"
++#else
++ flash_size = mcore->flash_window_size;
++#define BCM47XX_OVERRODE_FLASHSIZE ""
++#endif
++ printk(KERN_INFO "FLASH SIZE%s: %x\n", BCM47XX_OVERRODE_FLASHSIZE,
++ flash_size);
++
++ left = flash_size - BCM47XX_OVERRIDE_CFESIZE;
++ posn = flash_size;
++ UPTODOWN(SLOT_NVRAM, BCM47XX_OVERRIDE_NVRAMSIZE);
++ UPTODOWN(SLOT_CFGFS, CFGFS_FLASH_SIZE);
++ bcm47xx_partitions[SLOT_LINUX].offset = BCM47XX_OVERRIDE_CFESIZE;
++ bcm47xx_partitions[SLOT_LINUX].size = left;
++
++ if (trx_hdr->magic == BCM47XX_TRX_MAGIC) {
++ bcm47xx_partitions[SLOT_ROOTFS].offset =
++ bcm47xx_partitions[SLOT_LINUX].offset +
++ trx_hdr->offsets[1];
++ bcm47xx_partitions[SLOT_ROOTFS].size =
++ bcm47xx_partitions[SLOT_LINUX].size -
++ trx_hdr->offsets[1];
++ } else
++ printk("bcm47xx/platform: no TRX header found\n");
++
++ printk(KERN_INFO "=== Flash map dump ===\n");
++ for (posn = 0; posn < bcm47xx_flash_data.nr_parts; ++posn)
++ printk(KERN_INFO " #%u %08X @%08X '%s'\n",
++ (unsigned int)posn,
++ (unsigned int)bcm47xx_partitions[posn].size,
++ (unsigned int)bcm47xx_partitions[posn].offset,
++ bcm47xx_partitions[posn].name);
++ printk(KERN_INFO "=== Hope this works, have a nice day\n");
++
++ bcm47xx_flash_data.width = mcore->flash_buswidth;
++ bcm47xx_flash_resource.start = mcore->flash_window;
++ bcm47xx_flash_resource.end = mcore->flash_window
++ + mcore->flash_window_size
++ - 1;
++ return platform_add_devices(bcm47xx_devices,
++ ARRAY_SIZE(bcm47xx_devices));
++}
++
++device_initcall(bcm47xx_register_devices);
+diff -Nur linux-3.3.7.orig/arch/mips/boot/compressed/Makefile linux-3.3.7/arch/mips/boot/compressed/Makefile
+--- linux-3.3.7.orig/arch/mips/boot/compressed/Makefile 2012-05-21 20:42:51.000000000 +0200
++++ linux-3.3.7/arch/mips/boot/compressed/Makefile 2012-05-28 22:34:04.000000000 +0200
+@@ -44,6 +44,7 @@
+ tool_$(CONFIG_KERNEL_BZIP2) = bzip2
+ tool_$(CONFIG_KERNEL_LZMA) = lzma
+ tool_$(CONFIG_KERNEL_LZO) = lzo
++tool_$(CONFIG_KERNEL_XZ) = xzkern
+
+ targets += vmlinux.bin.z
+ $(obj)/vmlinux.bin.z: $(obj)/vmlinux.bin FORCE
+@@ -58,8 +59,13 @@
+ # Calculate the load address of the compressed kernel image
+ hostprogs-y := calc_vmlinuz_load_addr
+
++ifdef CONFIG_BCM47XX
++# XXX just after CFE, just pray the address is static
++VMLINUZ_LOAD_ADDRESS = 0xffffffff80900000
++else
+ VMLINUZ_LOAD_ADDRESS = $(shell $(obj)/calc_vmlinuz_load_addr \
+ $(obj)/vmlinux.bin $(VMLINUX_LOAD_ADDRESS))
++endif
+
+ vmlinuzobjs-y += $(obj)/piggy.o
+
+@@ -105,4 +111,12 @@
+ vmlinuz.srec: vmlinuz
+ $(call cmd,objcopy)
+
+-clean-files := $(objtree)/vmlinuz $(objtree)/vmlinuz.{32,ecoff,bin,srec}
++AFLAGS_selfreloc.o := -DVMLINUZ_LOAD_ADDRESS=$(VMLINUZ_LOAD_ADDRESS)
++CPPFLAGS_selfreloc.lds := $(KBUILD_CFLAGS)
++
++arch/mips/boot/compressed/selfreloc.o: arch/mips/boot/compressed/selfreloc.S vmlinuz.bin FORCE
++
++vmlinuz.elf: arch/mips/boot/compressed/selfreloc.o arch/mips/boot/compressed/selfreloc.lds FORCE
++ $(LD) $(LDFLAGS) -T arch/mips/boot/compressed/selfreloc.lds arch/mips/boot/compressed/selfreloc.o -o $@
++
++clean-files := $(objtree)/vmlinuz $(objtree)/vmlinuz.{32,ecoff,bin,srec,elf} $(objtree)/arch/mips/boot/compressed/selfreloc.{o,lds}
+diff -Nur linux-3.3.7.orig/arch/mips/boot/compressed/decompress.c linux-3.3.7/arch/mips/boot/compressed/decompress.c
+--- linux-3.3.7.orig/arch/mips/boot/compressed/decompress.c 2012-05-21 20:42:51.000000000 +0200
++++ linux-3.3.7/arch/mips/boot/compressed/decompress.c 2012-05-28 22:33:19.000000000 +0200
+@@ -43,7 +43,7 @@
+ /* activate the code for pre-boot environment */
+ #define STATIC static
+
+-#ifdef CONFIG_KERNEL_GZIP
++#if defined(CONFIG_KERNEL_GZIP) || defined(CONFIG_KERNEL_XZ)
+ void *memcpy(void *dest, const void *src, size_t n)
+ {
+ int i;
+@@ -54,6 +54,8 @@
+ d[i] = s[i];
+ return dest;
+ }
++#endif
++#ifdef CONFIG_KERNEL_GZIP
+ #include "../../../../lib/decompress_inflate.c"
+ #endif
+
+@@ -74,6 +76,10 @@
+ #include "../../../../lib/decompress_unlzma.c"
+ #endif
+
++#ifdef CONFIG_KERNEL_XZ
++#include "../../../../lib/decompress_unxz.c"
++#endif
++
+ #ifdef CONFIG_KERNEL_LZO
+ #include "../../../../lib/decompress_unlzo.c"
+ #endif
+diff -Nur linux-3.3.7.orig/arch/mips/boot/compressed/selfreloc.S linux-3.3.7/arch/mips/boot/compressed/selfreloc.S
+--- linux-3.3.7.orig/arch/mips/boot/compressed/selfreloc.S 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.3.7/arch/mips/boot/compressed/selfreloc.S 2012-05-25 21:45:16.000000000 +0200
+@@ -0,0 +1,54 @@
++/*-
++ * written 2011 by Thorsten Glaser <tg@freewrt.org> based on
++ * arch/mips/boot/compressed/head.S
++ */
++
++#include <asm/asm.h>
++#include <asm/regdef.h>
++
++ .set noreorder
++ .cprestore
++
++ .text
++ LEAF(selfreloc_start)
++selfreloc_start: