summaryrefslogtreecommitdiff
path: root/target/linux/brcm63xx/patches
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/brcm63xx/patches')
-rw-r--r--target/linux/brcm63xx/patches/001-bcm963xx.patch72
-rw-r--r--target/linux/brcm63xx/patches/002-bcm963xx_serial.patch9
-rw-r--r--target/linux/brcm63xx/patches/040-bcm963xx_flashmap.patch31
3 files changed, 62 insertions, 50 deletions
diff --git a/target/linux/brcm63xx/patches/001-bcm963xx.patch b/target/linux/brcm63xx/patches/001-bcm963xx.patch
index 728d5ba..4dae0ac 100644
--- a/target/linux/brcm63xx/patches/001-bcm963xx.patch
+++ b/target/linux/brcm63xx/patches/001-bcm963xx.patch
@@ -1,7 +1,8 @@
-diff -urN linux-2.6.24/arch/mips/Kconfig linux-2.6.24.new/arch/mips/Kconfig
---- linux-2.6.24/arch/mips/Kconfig 2008-01-24 23:58:37.000000000 +0100
-+++ linux-2.6.24.new/arch/mips/Kconfig 2008-02-13 16:20:49.000000000 +0100
-@@ -67,6 +67,17 @@
+Index: linux-2.6.24.7/arch/mips/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/arch/mips/Kconfig
++++ linux-2.6.24.7/arch/mips/Kconfig
+@@ -67,6 +67,17 @@ config BCM47XX
help
Support for BCM47XX based boards
@@ -19,10 +20,11 @@ diff -urN linux-2.6.24/arch/mips/Kconfig linux-2.6.24.new/arch/mips/Kconfig
config MIPS_COBALT
bool "Cobalt Server"
select CEVT_R4K
-diff -urN linux-2.6.24/arch/mips/kernel/cpu-probe.c linux-2.6.24.new/arch/mips/kernel/cpu-probe.c
---- linux-2.6.24/arch/mips/kernel/cpu-probe.c 2008-01-24 23:58:37.000000000 +0100
-+++ linux-2.6.24.new/arch/mips/kernel/cpu-probe.c 2008-02-13 16:23:21.000000000 +0100
-@@ -796,6 +796,18 @@
+Index: linux-2.6.24.7/arch/mips/kernel/cpu-probe.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/mips/kernel/cpu-probe.c
++++ linux-2.6.24.7/arch/mips/kernel/cpu-probe.c
+@@ -796,6 +796,18 @@ static inline void cpu_probe_broadcom(st
case PRID_IMP_BCM4710:
c->cputype = CPU_BCM4710;
break;
@@ -41,7 +43,7 @@ diff -urN linux-2.6.24/arch/mips/kernel/cpu-probe.c linux-2.6.24.new/arch/mips/k
default:
c->cputype = CPU_UNKNOWN;
break;
-@@ -878,6 +890,10 @@
+@@ -878,6 +890,10 @@ static __init const char *cpu_to_name(st
case CPU_SR71000: name = "Sandcraft SR71000"; break;
case CPU_BCM3302: name = "Broadcom BCM3302"; break;
case CPU_BCM4710: name = "Broadcom BCM4710"; break;
@@ -52,10 +54,11 @@ diff -urN linux-2.6.24/arch/mips/kernel/cpu-probe.c linux-2.6.24.new/arch/mips/k
case CPU_PR4450: name = "Philips PR4450"; break;
case CPU_LOONGSON2: name = "ICT Loongson-2"; break;
default:
-diff -urN linux-2.6.24/arch/mips/Makefile linux-2.6.24.new/arch/mips/Makefile
---- linux-2.6.24/arch/mips/Makefile 2008-01-24 23:58:37.000000000 +0100
-+++ linux-2.6.24.new/arch/mips/Makefile 2008-02-13 16:21:21.000000000 +0100
-@@ -543,6 +543,10 @@
+Index: linux-2.6.24.7/arch/mips/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/arch/mips/Makefile
++++ linux-2.6.24.7/arch/mips/Makefile
+@@ -543,6 +543,10 @@ core-$(CONFIG_BCM47XX) += arch/mips/bcm
cflags-$(CONFIG_BCM47XX) += -Iinclude/asm-mips/mach-bcm47xx
load-$(CONFIG_BCM47XX) := 0xffffffff80001000
@@ -66,10 +69,11 @@ diff -urN linux-2.6.24/arch/mips/Makefile linux-2.6.24.new/arch/mips/Makefile
#
# SNI RM
#
-diff -urN linux-2.6.24/arch/mips/mm/c-r4k.c linux-2.6.24.new/arch/mips/mm/c-r4k.c
---- linux-2.6.24/arch/mips/mm/c-r4k.c 2008-01-24 23:58:37.000000000 +0100
-+++ linux-2.6.24.new/arch/mips/mm/c-r4k.c 2008-02-13 16:24:29.000000000 +0100
-@@ -878,6 +878,13 @@
+Index: linux-2.6.24.7/arch/mips/mm/c-r4k.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/mips/mm/c-r4k.c
++++ linux-2.6.24.7/arch/mips/mm/c-r4k.c
+@@ -878,6 +878,13 @@ static void __init probe_pcache(void)
if (!(config & MIPS_CONF_M))
panic("Don't know how to probe P-caches on this cpu.");
@@ -83,10 +87,11 @@ diff -urN linux-2.6.24/arch/mips/mm/c-r4k.c linux-2.6.24.new/arch/mips/mm/c-r4k.
/*
* So we seem to be a MIPS32 or MIPS64 CPU
* So let's probe the I-cache ...
-diff -urN linux-2.6.24/arch/mips/mm/tlbex.c linux-2.6.24.new/arch/mips/mm/tlbex.c
---- linux-2.6.24/arch/mips/mm/tlbex.c 2008-01-24 23:58:37.000000000 +0100
-+++ linux-2.6.24.new/arch/mips/mm/tlbex.c 2008-02-13 16:25:08.000000000 +0100
-@@ -910,6 +910,10 @@
+Index: linux-2.6.24.7/arch/mips/mm/tlbex.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/mips/mm/tlbex.c
++++ linux-2.6.24.7/arch/mips/mm/tlbex.c
+@@ -909,6 +909,10 @@ static __init void build_tlb_write_entry
case CPU_25KF:
case CPU_BCM3302:
case CPU_BCM4710:
@@ -97,17 +102,19 @@ diff -urN linux-2.6.24/arch/mips/mm/tlbex.c linux-2.6.24.new/arch/mips/mm/tlbex.
case CPU_LOONGSON2:
if (m4kc_tlbp_war())
i_nop(p);
-diff -urN linux-2.6.24/arch/mips/pci/Makefile linux-2.6.24.new/arch/mips/pci/Makefile
---- linux-2.6.24/arch/mips/pci/Makefile 2008-01-24 23:58:37.000000000 +0100
-+++ linux-2.6.24.new/arch/mips/pci/Makefile 2008-02-13 16:27:33.000000000 +0100
-@@ -48,3 +48,4 @@
+Index: linux-2.6.24.7/arch/mips/pci/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/arch/mips/pci/Makefile
++++ linux-2.6.24.7/arch/mips/pci/Makefile
+@@ -48,3 +48,4 @@ obj-$(CONFIG_TOSHIBA_RBTX4938) += fixup-
obj-$(CONFIG_VICTOR_MPC30X) += fixup-mpc30x.o
obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o
obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o
+obj-$(CONFIG_BCM963XX) += fixup-bcm96348.o pci-bcm96348.o ops-bcm96348.o
-diff -urN linux-2.6.24/include/asm-mips/bootinfo.h linux-2.6.24.new/include/asm-mips/bootinfo.h
---- linux-2.6.24/include/asm-mips/bootinfo.h 2008-01-24 23:58:37.000000000 +0100
-+++ linux-2.6.24.new/include/asm-mips/bootinfo.h 2008-02-13 16:26:05.000000000 +0100
+Index: linux-2.6.24.7/include/asm-mips/bootinfo.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-mips/bootinfo.h
++++ linux-2.6.24.7/include/asm-mips/bootinfo.h
@@ -197,6 +197,10 @@
*/
#define MACH_GROUP_BRCM 23 /* Broadcom */
@@ -119,9 +126,10 @@ diff -urN linux-2.6.24/include/asm-mips/bootinfo.h linux-2.6.24.new/include/asm-
#define CL_SIZE COMMAND_LINE_SIZE
-diff -urN linux-2.6.24/include/asm-mips/cpu.h linux-2.6.24.new/include/asm-mips/cpu.h
---- linux-2.6.24/include/asm-mips/cpu.h 2008-01-24 23:58:37.000000000 +0100
-+++ linux-2.6.24.new/include/asm-mips/cpu.h 2008-02-13 16:27:13.000000000 +0100
+Index: linux-2.6.24.7/include/asm-mips/cpu.h
+===================================================================
+--- linux-2.6.24.7.orig/include/asm-mips/cpu.h
++++ linux-2.6.24.7/include/asm-mips/cpu.h
@@ -111,6 +111,10 @@
#define PRID_IMP_BCM4710 0x4000
@@ -133,7 +141,7 @@ diff -urN linux-2.6.24/include/asm-mips/cpu.h linux-2.6.24.new/include/asm-mips/
/*
* Definitions for 7:0 on legacy processors
-@@ -196,7 +200,8 @@
+@@ -196,7 +200,8 @@ enum cpu_type_enum {
*/
CPU_4KC, CPU_4KEC, CPU_4KSC, CPU_24K, CPU_34K, CPU_74K, CPU_AU1000,
CPU_AU1100, CPU_AU1200, CPU_AU1500, CPU_AU1550, CPU_PR4450,
diff --git a/target/linux/brcm63xx/patches/002-bcm963xx_serial.patch b/target/linux/brcm63xx/patches/002-bcm963xx_serial.patch
index 2f9e92e..dbcf30e 100644
--- a/target/linux/brcm63xx/patches/002-bcm963xx_serial.patch
+++ b/target/linux/brcm63xx/patches/002-bcm963xx_serial.patch
@@ -1,7 +1,8 @@
-diff -urN linux-2.6.24/drivers/serial/Makefile linux-2.6.24.new/drivers/serial/Makefile
---- linux-2.6.24/drivers/serial/Makefile 2008-02-13 16:44:47.000000000 +0100
-+++ linux-2.6.24.new/drivers/serial/Makefile 2008-02-13 16:45:12.000000000 +0100
-@@ -65,3 +65,4 @@
+Index: linux-2.6.24.7/drivers/serial/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/drivers/serial/Makefile
++++ linux-2.6.24.7/drivers/serial/Makefile
+@@ -65,3 +65,4 @@ obj-$(CONFIG_SERIAL_NETX) += netx-serial
obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
diff --git a/target/linux/brcm63xx/patches/040-bcm963xx_flashmap.patch b/target/linux/brcm63xx/patches/040-bcm963xx_flashmap.patch
index 3884dc1..7a62fff 100644
--- a/target/linux/brcm63xx/patches/040-bcm963xx_flashmap.patch
+++ b/target/linux/brcm63xx/patches/040-bcm963xx_flashmap.patch
@@ -1,7 +1,8 @@
-diff -urN linux-2.6.19/drivers/mtd/maps/Kconfig linux-2.6.19.new/drivers/mtd/maps/Kconfig
---- linux-2.6.19/drivers/mtd/maps/Kconfig 2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19.new/drivers/mtd/maps/Kconfig 2006-12-18 17:21:07.000000000 +0100
-@@ -283,6 +283,13 @@
+Index: linux-2.6.24.7/drivers/mtd/maps/Kconfig
+===================================================================
+--- linux-2.6.24.7.orig/drivers/mtd/maps/Kconfig
++++ linux-2.6.24.7/drivers/mtd/maps/Kconfig
+@@ -269,6 +269,13 @@ config MTD_MTX1
Flash memory access on 4G Systems MTX-1 Board. If you have one of
these boards and would like to use the flash chips on it, say 'Y'.
@@ -15,10 +16,11 @@ diff -urN linux-2.6.19/drivers/mtd/maps/Kconfig linux-2.6.19.new/drivers/mtd/map
config MTD_DILNETPC
tristate "CFI Flash device mapped on DIL/Net PC"
depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT
-diff -urN linux-2.6.19/drivers/mtd/redboot.c linux-2.6.19.new/drivers/mtd/redboot.c
---- linux-2.6.19/drivers/mtd/redboot.c 2006-12-18 17:09:14.000000000 +0100
-+++ linux-2.6.19.new/drivers/mtd/redboot.c 2006-12-18 17:14:26.000000000 +0100
-@@ -39,7 +39,7 @@
+Index: linux-2.6.24.7/drivers/mtd/redboot.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/mtd/redboot.c
++++ linux-2.6.24.7/drivers/mtd/redboot.c
+@@ -39,7 +39,7 @@ static inline int redboot_checksum(struc
return 1;
}
@@ -27,7 +29,7 @@ diff -urN linux-2.6.19/drivers/mtd/redboot.c linux-2.6.19.new/drivers/mtd/redboo
struct mtd_partition **pparts,
unsigned long fis_origin)
{
-@@ -146,6 +146,14 @@
+@@ -146,6 +146,14 @@ static int parse_redboot_partitions(stru
goto out;
}
@@ -42,7 +44,7 @@ diff -urN linux-2.6.19/drivers/mtd/redboot.c linux-2.6.19.new/drivers/mtd/redboo
for (i = 0; i < numslots; i++) {
struct fis_list *new_fl, **prev;
-@@ -168,9 +176,8 @@
+@@ -168,9 +176,8 @@ static int parse_redboot_partitions(stru
new_fl->img = &buf[i];
if (fis_origin) {
buf[i].flash_base -= fis_origin;
@@ -53,10 +55,11 @@ diff -urN linux-2.6.19/drivers/mtd/redboot.c linux-2.6.19.new/drivers/mtd/redboo
/* I'm sure the JFFS2 code has done me permanent damage.
* I now think the following is _normal_
-diff -urN linux-2.6.24/drivers/mtd/maps/Makefile linux-2.6.24.new/drivers/mtd/maps/Makefile
---- linux-2.6.24/drivers/mtd/maps/Makefile 2008-01-24 23:58:37.000000000 +0100
-+++ linux-2.6.24.new/drivers/mtd/maps/Makefile 2008-02-13 16:30:02.000000000 +0100
-@@ -69,3 +69,4 @@
+Index: linux-2.6.24.7/drivers/mtd/maps/Makefile
+===================================================================
+--- linux-2.6.24.7.orig/drivers/mtd/maps/Makefile
++++ linux-2.6.24.7/drivers/mtd/maps/Makefile
+@@ -69,3 +69,4 @@ obj-$(CONFIG_MTD_PLATRAM) += plat-ram.o
obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o
obj-$(CONFIG_MTD_MTX1) += mtx-1_flash.o
obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o