KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refresh kernel patches

Browse source 
SVN-Revision: 11201
This commit is contained in:
Gabor Juhos 2008-05-19 08:33:22 +00:00
parent 4da0e6f235
commit ac897ce5b1
14 changed files with 223 additions and 242 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
target/linux/brcm63xx/patches-2.6.25/001-bcm963xx.patch
View file

@ -16,10 +16,10 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
include/asm-mips/cpu.h | 7 ++++++- include/asm-mips/cpu.h | 7 ++++++-
8 files changed, 61 insertions(+), 1 deletions(-) 8 files changed, 61 insertions(+), 1 deletions(-)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig Index: linux-2.6.25.4/arch/mips/Kconfig
index 8724ed3..1b1c4bf 100644 ===================================================================
--- a/arch/mips/Kconfig --- linux-2.6.25.4.orig/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ linux-2.6.25.4/arch/mips/Kconfig
@@ -59,6 +59,17 @@ config BCM47XX @@ -59,6 +59,17 @@ config BCM47XX
help help
Support for BCM47XX based boards Support for BCM47XX based boards
@ -38,11 +38,11 @@ index 8724ed3..1b1c4bf 100644
config MIPS_COBALT config MIPS_COBALT
bool "Cobalt Server" bool "Cobalt Server"
select CEVT_R4K select CEVT_R4K
diff --git a/arch/mips/Makefile b/arch/mips/Makefile Index: linux-2.6.25.4/arch/mips/Makefile
index 1c62381..16a29e1 100644 ===================================================================
--- a/arch/mips/Makefile --- linux-2.6.25.4.orig/arch/mips/Makefile
+++ b/arch/mips/Makefile +++ linux-2.6.25.4/arch/mips/Makefile
@@ -560,6 +560,10 @@ core-$(CONFIG_BCM47XX) += arch/mips/bcm47xx/ @@ -560,6 +560,10 @@ core-$(CONFIG_BCM47XX) += arch/mips/bcm
cflags-$(CONFIG_BCM47XX) += -Iinclude/asm-mips/mach-bcm47xx cflags-$(CONFIG_BCM47XX) += -Iinclude/asm-mips/mach-bcm47xx
load-$(CONFIG_BCM47XX) := 0xffffffff80001000 load-$(CONFIG_BCM47XX) := 0xffffffff80001000
@ -53,11 +53,11 @@ index 1c62381..16a29e1 100644
# #
# SNI RM # SNI RM
# #
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c Index: linux-2.6.25.4/arch/mips/kernel/cpu-probe.c
index 89c3304..6706a07 100644 ===================================================================
--- a/arch/mips/kernel/cpu-probe.c --- linux-2.6.25.4.orig/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c +++ linux-2.6.25.4/arch/mips/kernel/cpu-probe.c
@@ -803,6 +803,18 @@ static inline void cpu_probe_broadcom(struct cpuinfo_mips *c) @@ -803,6 +803,18 @@ static inline void cpu_probe_broadcom(st
case PRID_IMP_BCM4710: case PRID_IMP_BCM4710:
c->cputype = CPU_BCM4710; c->cputype = CPU_BCM4710;
break; break;
@ -76,7 +76,7 @@ index 89c3304..6706a07 100644
default: default:
c->cputype = CPU_UNKNOWN; c->cputype = CPU_UNKNOWN;
break; break;
@@ -887,6 +899,10 @@ static __cpuinit const char *cpu_to_name(struct cpuinfo_mips *c) @@ -887,6 +899,10 @@ static __cpuinit const char *cpu_to_name
case CPU_SR71000: name = "Sandcraft SR71000"; break; case CPU_SR71000: name = "Sandcraft SR71000"; break;
case CPU_BCM3302: name = "Broadcom BCM3302"; break; case CPU_BCM3302: name = "Broadcom BCM3302"; break;
case CPU_BCM4710: name = "Broadcom BCM4710"; break; case CPU_BCM4710: name = "Broadcom BCM4710"; break;
@ -87,10 +87,10 @@ index 89c3304..6706a07 100644
case CPU_PR4450: name = "Philips PR4450"; break; case CPU_PR4450: name = "Philips PR4450"; break;
case CPU_LOONGSON2: name = "ICT Loongson-2"; break; case CPU_LOONGSON2: name = "ICT Loongson-2"; break;
default: default:
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
index 77aefb4..23a67cb 100644 ===================================================================
--- a/arch/mips/mm/c-r4k.c --- linux-2.6.25.4.orig/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c +++ linux-2.6.25.4/arch/mips/mm/c-r4k.c
@@ -882,6 +882,13 @@ static void __cpuinit probe_pcache(void) @@ -882,6 +882,13 @@ static void __cpuinit probe_pcache(void)
if (!(config & MIPS_CONF_M)) if (!(config & MIPS_CONF_M))
panic("Don't know how to probe P-caches on this cpu."); panic("Don't know how to probe P-caches on this cpu.");
@ -105,11 +105,11 @@ index 77aefb4..23a67cb 100644
/* /*
* So we seem to be a MIPS32 or MIPS64 CPU * So we seem to be a MIPS32 or MIPS64 CPU
* So let's probe the I-cache ... * So let's probe the I-cache ...
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c Index: linux-2.6.25.4/arch/mips/mm/tlbex.c
index 382738c..b3b6120 100644 ===================================================================
--- a/arch/mips/mm/tlbex.c --- linux-2.6.25.4.orig/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c +++ linux-2.6.25.4/arch/mips/mm/tlbex.c
@@ -315,6 +315,10 @@ static void __cpuinit build_tlb_write_entry(u32 **p, struct uasm_label **l, @@ -315,6 +315,10 @@ static void __cpuinit build_tlb_write_en
case CPU_25KF: case CPU_25KF:
case CPU_BCM3302: case CPU_BCM3302:
case CPU_BCM4710: case CPU_BCM4710:
@ -120,19 +120,19 @@ index 382738c..b3b6120 100644
case CPU_LOONGSON2: case CPU_LOONGSON2:
if (m4kc_tlbp_war()) if (m4kc_tlbp_war())
uasm_i_nop(p); uasm_i_nop(p);
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile Index: linux-2.6.25.4/arch/mips/pci/Makefile
index ed0c076..57a1111 100644 ===================================================================
--- a/arch/mips/pci/Makefile --- linux-2.6.25.4.orig/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile +++ linux-2.6.25.4/arch/mips/pci/Makefile
@@ -48,3 +48,4 @@ obj-$(CONFIG_TOSHIBA_RBTX4938) += fixup-tx4938.o ops-tx4938.o @@ -48,3 +48,4 @@ obj-$(CONFIG_TOSHIBA_RBTX4938) += fixup-
obj-$(CONFIG_VICTOR_MPC30X) += fixup-mpc30x.o obj-$(CONFIG_VICTOR_MPC30X) += fixup-mpc30x.o
obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o
obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o
+obj-$(CONFIG_BCM963XX) += fixup-bcm96348.o pci-bcm96348.o ops-bcm96348.o +obj-$(CONFIG_BCM963XX) += fixup-bcm96348.o pci-bcm96348.o ops-bcm96348.o
diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h Index: linux-2.6.25.4/include/asm-mips/bootinfo.h
index e031bdf..17b2a37 100644 ===================================================================
--- a/include/asm-mips/bootinfo.h --- linux-2.6.25.4.orig/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h +++ linux-2.6.25.4/include/asm-mips/bootinfo.h
@@ -94,6 +94,18 @@ @@ -94,6 +94,18 @@
#define MACH_MSP7120_FPGA 5 /* PMC-Sierra MSP7120 Emulation */ #define MACH_MSP7120_FPGA 5 /* PMC-Sierra MSP7120 Emulation */
#define MACH_MSP_OTHER 255 /* PMC-Sierra unknown board type */ #define MACH_MSP_OTHER 255 /* PMC-Sierra unknown board type */
@ -152,10 +152,10 @@ index e031bdf..17b2a37 100644
#define CL_SIZE COMMAND_LINE_SIZE #define CL_SIZE COMMAND_LINE_SIZE
extern char *system_type; extern char *system_type;
diff --git a/include/asm-mips/cpu.h b/include/asm-mips/cpu.h Index: linux-2.6.25.4/include/asm-mips/cpu.h
index bf5bbc7..e19389a 100644 ===================================================================
--- a/include/asm-mips/cpu.h --- linux-2.6.25.4.orig/include/asm-mips/cpu.h
+++ b/include/asm-mips/cpu.h +++ linux-2.6.25.4/include/asm-mips/cpu.h
@@ -111,6 +111,10 @@ @@ -111,6 +111,10 @@
#define PRID_IMP_BCM4710 0x4000 #define PRID_IMP_BCM4710 0x4000
@ -177,6 +177,3 @@ index bf5bbc7..e19389a 100644
/* /*
* MIPS64 class processors * MIPS64 class processors
--
1.5.5.1

13
target/linux/brcm63xx/patches-2.6.25/002-bcm963xx_serial.patch
View file

@ -9,15 +9,12 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
drivers/serial/Makefile | 1 + drivers/serial/Makefile | 1 +
1 files changed, 1 insertions(+), 0 deletions(-) 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile Index: linux-2.6.25.4/drivers/serial/Makefile
index 640cfe4..edc325e 100644 ===================================================================
--- a/drivers/serial/Makefile --- linux-2.6.25.4.orig/drivers/serial/Makefile
+++ b/drivers/serial/Makefile +++ linux-2.6.25.4/drivers/serial/Makefile
@@ -67,3 +67,4 @@ obj-$(CONFIG_SERIAL_NETX) += netx-serial.o @@ -67,3 +67,4 @@ obj-$(CONFIG_SERIAL_NETX) += netx-serial
obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
obj-$(CONFIG_SERIAL_QE) += ucc_uart.o obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
+obj-$(CONFIG_BCM963XX) += bcm63xx_cons.o +obj-$(CONFIG_BCM963XX) += bcm63xx_cons.o
--
1.5.5.1

33
target/linux/brcm63xx/patches-2.6.25/040-bcm963xx_flashmap.patch
View file

@ -11,10 +11,10 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
drivers/mtd/redboot.c | 13 ++++++++++--- drivers/mtd/redboot.c | 13 ++++++++++---
3 files changed, 18 insertions(+), 3 deletions(-) 3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig Index: linux-2.6.25.4/drivers/mtd/maps/Kconfig
index 12c2536..38b8d94 100644 ===================================================================
--- a/drivers/mtd/maps/Kconfig --- linux-2.6.25.4.orig/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig +++ linux-2.6.25.4/drivers/mtd/maps/Kconfig
@@ -262,6 +262,13 @@ config MTD_MTX1 @@ -262,6 +262,13 @@ config MTD_MTX1
Flash memory access on 4G Systems MTX-1 Board. If you have one of 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'. these boards and would like to use the flash chips on it, say 'Y'.
@ -29,20 +29,20 @@ index 12c2536..38b8d94 100644
config MTD_DILNETPC config MTD_DILNETPC
tristate "CFI Flash device mapped on DIL/Net PC" tristate "CFI Flash device mapped on DIL/Net PC"
depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile Index: linux-2.6.25.4/drivers/mtd/maps/Makefile
index a9cbe80..e2c10be 100644 ===================================================================
--- a/drivers/mtd/maps/Makefile --- linux-2.6.25.4.orig/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile +++ linux-2.6.25.4/drivers/mtd/maps/Makefile
@@ -68,3 +68,4 @@ obj-$(CONFIG_MTD_PLATRAM) += plat-ram.o @@ -68,3 +68,4 @@ obj-$(CONFIG_MTD_PLATRAM) += plat-ram.o
obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o
obj-$(CONFIG_MTD_MTX1) += mtx-1_flash.o obj-$(CONFIG_MTD_MTX1) += mtx-1_flash.o
obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o
+obj-$(CONFIG_MTD_BCM963XX) += bcm963xx-flash.o +obj-$(CONFIG_MTD_BCM963XX) += bcm963xx-flash.o
diff --git a/drivers/mtd/redboot.c b/drivers/mtd/redboot.c Index: linux-2.6.25.4/drivers/mtd/redboot.c
index 4747490..4f500af 100644 ===================================================================
--- a/drivers/mtd/redboot.c --- linux-2.6.25.4.orig/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c +++ linux-2.6.25.4/drivers/mtd/redboot.c
@@ -39,7 +39,7 @@ static inline int redboot_checksum(struct fis_image_desc *img) @@ -39,7 +39,7 @@ static inline int redboot_checksum(struc
return 1; return 1;
} }
@ -51,7 +51,7 @@ index 4747490..4f500af 100644
struct mtd_partition **pparts, struct mtd_partition **pparts,
unsigned long fis_origin) unsigned long fis_origin)
{ {
@@ -161,6 +161,14 @@ static int parse_redboot_partitions(struct mtd_info *master, @@ -161,6 +161,14 @@ static int parse_redboot_partitions(stru
goto out; goto out;
} }
@ -66,7 +66,7 @@ index 4747490..4f500af 100644
for (i = 0; i < numslots; i++) { for (i = 0; i < numslots; i++) {
struct fis_list *new_fl, **prev; struct fis_list *new_fl, **prev;
@@ -183,9 +191,8 @@ static int parse_redboot_partitions(struct mtd_info *master, @@ -183,9 +191,8 @@ static int parse_redboot_partitions(stru
new_fl->img = &buf[i]; new_fl->img = &buf[i];
if (fis_origin) { if (fis_origin) {
buf[i].flash_base -= fis_origin; buf[i].flash_base -= fis_origin;
@ -77,6 +77,3 @@ index 4747490..4f500af 100644
/* I'm sure the JFFS2 code has done me permanent damage. /* I'm sure the JFFS2 code has done me permanent damage.
* I now think the following is _normal_ * I now think the following is _normal_
--
1.5.5.1

13
target/linux/brcm63xx/patches-2.6.25/050-bcm963xx_add_trailing_zero.patch
View file

@ -11,11 +11,11 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
arch/mips/Makefile | 2 +- arch/mips/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-) 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/mips/Makefile b/arch/mips/Makefile Index: linux-2.6.25.4/arch/mips/Makefile
index 16a29e1..6551951 100644 ===================================================================
--- a/arch/mips/Makefile --- linux-2.6.25.4.orig/arch/mips/Makefile
+++ b/arch/mips/Makefile +++ linux-2.6.25.4/arch/mips/Makefile
@@ -562,7 +562,7 @@ load-$(CONFIG_BCM47XX) := 0xffffffff80001000 @@ -562,7 +562,7 @@ load-$(CONFIG_BCM47XX) := 0xffffffff800
core-$(CONFIG_BCM963XX) += arch/mips/bcm963xx/ core-$(CONFIG_BCM963XX) += arch/mips/bcm963xx/
cflags-$(CONFIG_BCM963XX) += -Iinclude/asm-mips/mach-bcm963xx cflags-$(CONFIG_BCM963XX) += -Iinclude/asm-mips/mach-bcm963xx
@ -24,6 +24,3 @@ index 16a29e1..6551951 100644
# #
# SNI RM # SNI RM
--
1.5.5.1

78
target/linux/brcm63xx/patches-2.6.25/060-bcm963xx_rewrite_irq_handling_code.patch
View file

@ -13,10 +13,10 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
include/asm-mips/mach-bcm963xx/bcm_intr.h | 18 +-- include/asm-mips/mach-bcm963xx/bcm_intr.h | 18 +--
3 files changed, 119 insertions(+), 220 deletions(-) 3 files changed, 119 insertions(+), 220 deletions(-)
diff --git a/arch/mips/bcm963xx/irq.c b/arch/mips/bcm963xx/irq.c Index: linux-2.6.25.4/arch/mips/bcm963xx/irq.c
index 62a848b..11583c9 100644 ===================================================================
--- a/arch/mips/bcm963xx/irq.c --- linux-2.6.25.4.orig/arch/mips/bcm963xx/irq.c
+++ b/arch/mips/bcm963xx/irq.c +++ linux-2.6.25.4/arch/mips/bcm963xx/irq.c
@@ -1,259 +1,159 @@ @@ -1,259 +1,159 @@
/* /*
-<:copyright-gpl -<:copyright-gpl
@ -218,6 +218,7 @@ index 62a848b..11583c9 100644
-void end_brcm_none(unsigned int irq) -void end_brcm_none(unsigned int irq)
-{ -{
-}
+ for (irq = 0, bit = 1; irq < 32; irq++, bit <<= 1) { + for (irq = 0, bit = 1; irq < 32; irq++, bit <<= 1) {
+ if (pending & bit) { + if (pending & bit) {
+ bcm963xx_ack_irq(irq + bcm963xx_irq_base); + bcm963xx_ack_irq(irq + bcm963xx_irq_base);
@ -228,7 +229,14 @@ index 62a848b..11583c9 100644
+ } + }
+ +
+ spurious_interrupt(); + spurious_interrupt();
} +}
+
+static struct irq_chip bcm963xx_irq_type = {
+ .name = "bcm963xx",
+ .unmask = bcm963xx_unmask_irq,
+ .mask = bcm963xx_mask_irq,
+ .ack = bcm963xx_ack_irq
+};
-static struct hw_interrupt_type brcm_irq_type = { -static struct hw_interrupt_type brcm_irq_type = {
- .typename = "MIPS", - .typename = "MIPS",
@ -239,11 +247,11 @@ index 62a848b..11583c9 100644
- .ack = ack_brcm_irq, - .ack = ack_brcm_irq,
- .end = end_brcm_irq, - .end = end_brcm_irq,
- .set_affinity = NULL - .set_affinity = NULL
+static struct irq_chip bcm963xx_irq_type = { +static struct irq_chip bcm963xx_ext_irq_type = {
+ .name = "bcm963xx", + .name = "bcm963xx_ext",
+ .unmask = bcm963xx_unmask_irq, + .unmask = bcm963xx_unmask_ext_irq,
+ .mask = bcm963xx_mask_irq, + .mask = bcm963xx_mask_ext_irq,
+ .ack = bcm963xx_ack_irq + .ack = bcm963xx_ack_ext_irq,
}; };
-static struct hw_interrupt_type brcm_irq_no_end_type = { -static struct hw_interrupt_type brcm_irq_no_end_type = {
@ -255,33 +263,26 @@ index 62a848b..11583c9 100644
- .ack = ack_brcm_irq, - .ack = ack_brcm_irq,
- .end = end_brcm_none, - .end = end_brcm_none,
- .set_affinity = NULL - .set_affinity = NULL
+static struct irq_chip bcm963xx_ext_irq_type = {
+ .name = "bcm963xx_ext",
+ .unmask = bcm963xx_unmask_ext_irq,
+ .mask = bcm963xx_mask_ext_irq,
+ .ack = bcm963xx_ack_ext_irq,
};
-void __init arch_init_irq(void)
+static struct irqaction bcm963xx_cascade_action = { +static struct irqaction bcm963xx_cascade_action = {
+ .handler = no_action, + .handler = no_action,
+ .name = "BCM963xx cascade interrupt" + .name = "BCM963xx cascade interrupt"
+}; };
+
-void __init arch_init_irq(void)
+static void __init bcm963xx_irq_init(int base) +static void __init bcm963xx_irq_init(int base)
{ {
int i; int i;
- clear_c0_status(ST0_BEV); - clear_c0_status(ST0_BEV);
- change_c0_status(ST0_IM, (IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4)); - change_c0_status(ST0_IM, (IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4));
- + bcm963xx_irq_base = base;
- for (i = 0; i < NR_IRQS; i++) { - for (i = 0; i < NR_IRQS; i++) {
- irq_desc[i].status = IRQ_DISABLED; - irq_desc[i].status = IRQ_DISABLED;
- irq_desc[i].action = 0; - irq_desc[i].action = 0;
- irq_desc[i].depth = 1; - irq_desc[i].depth = 1;
- irq_desc[i].chip = &brcm_irq_type; - irq_desc[i].chip = &brcm_irq_type;
+ bcm963xx_irq_base = base; - }
+
+ /* External IRQs */ + /* External IRQs */
+ set_irq_chip_and_handler(INTERRUPT_ID_EXTERNAL_0, &bcm963xx_ext_irq_type, + set_irq_chip_and_handler(INTERRUPT_ID_EXTERNAL_0, &bcm963xx_ext_irq_type,
+ handle_level_irq); + handle_level_irq);
@ -295,7 +296,7 @@ index 62a848b..11583c9 100644
+ for (i = 0; i < 32; i++) { + for (i = 0; i < 32; i++) {
+ set_irq_chip_and_handler(base + i, &bcm963xx_irq_type, + set_irq_chip_and_handler(base + i, &bcm963xx_irq_type,
+ handle_level_irq); + handle_level_irq);
} + }
+ +
+ setup_irq(2, &bcm963xx_cascade_action); + setup_irq(2, &bcm963xx_cascade_action);
+ setup_irq(bcm963xx_irq_base, &bcm963xx_cascade_action); + setup_irq(bcm963xx_irq_base, &bcm963xx_cascade_action);
@ -310,10 +311,10 @@ index 62a848b..11583c9 100644
+asmlinkage void plat_irq_dispatch(void) +asmlinkage void plat_irq_dispatch(void)
{ {
- unsigned long flags; - unsigned long flags;
-
- local_irq_save(flags);
+ unsigned int pending = read_c0_status() & read_c0_cause() & ST0_IM; + unsigned int pending = read_c0_status() & read_c0_cause() & ST0_IM;
- local_irq_save(flags);
-
- PERF->ExtIrqCfg |= (1 << (irq - INTERRUPT_ID_EXTERNAL_0 + EI_CLEAR_SHFT)); // Clear - PERF->ExtIrqCfg |= (1 << (irq - INTERRUPT_ID_EXTERNAL_0 + EI_CLEAR_SHFT)); // Clear
- PERF->ExtIrqCfg &= ~(1 << (irq - INTERRUPT_ID_EXTERNAL_0 + EI_MASK_SHFT)); // Mask - PERF->ExtIrqCfg &= ~(1 << (irq - INTERRUPT_ID_EXTERNAL_0 + EI_MASK_SHFT)); // Mask
- PERF->ExtIrqCfg &= ~(1 << (irq - INTERRUPT_ID_EXTERNAL_0 + EI_INSENS_SHFT)); // Edge insesnsitive - PERF->ExtIrqCfg &= ~(1 << (irq - INTERRUPT_ID_EXTERNAL_0 + EI_INSENS_SHFT)); // Edge insesnsitive
@ -381,11 +382,11 @@ index 62a848b..11583c9 100644
-EXPORT_SYMBOL(request_external_irq); -EXPORT_SYMBOL(request_external_irq);
-EXPORT_SYMBOL(BcmHalMapInterrupt); -EXPORT_SYMBOL(BcmHalMapInterrupt);
- -
diff --git a/drivers/serial/bcm63xx_cons.c b/drivers/serial/bcm63xx_cons.c Index: linux-2.6.25.4/drivers/serial/bcm63xx_cons.c
index 8fff16d..2302ea6 100644 ===================================================================
--- a/drivers/serial/bcm63xx_cons.c --- linux-2.6.25.4.orig/drivers/serial/bcm63xx_cons.c
+++ b/drivers/serial/bcm63xx_cons.c +++ linux-2.6.25.4/drivers/serial/bcm63xx_cons.c
@@ -267,7 +267,7 @@ static void bcm_interrupt(int irq, void *dev, struct pt_regs *regs) @@ -267,7 +267,7 @@ static void bcm_interrupt(int irq, void
} }
// Clear the interrupt // Clear the interrupt
@ -394,7 +395,7 @@ index 8fff16d..2302ea6 100644
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
return IRQ_HANDLED; return IRQ_HANDLED;
#endif #endif
@@ -880,7 +880,7 @@ static int bcm63xx_cons_open(struct tty_struct *tty, struct file *filp) @@ -880,7 +880,7 @@ static int bcm63xx_cons_open(struct tty_
info->count++; info->count++;
tty->driver_data = info; tty->driver_data = info;
info->tty = tty; info->tty = tty;
@ -412,7 +413,7 @@ index 8fff16d..2302ea6 100644
struct bcm_serial *info; struct bcm_serial *info;
// Print the driver version information // Print the driver version information
@@ -981,7 +981,12 @@ static int __init bcm63xx_serialinit(void) @@ -981,7 +981,12 @@ static int __init bcm63xx_serialinit(voi
*/ */
if (!info->port) if (!info->port)
return 0; return 0;
@ -426,10 +427,10 @@ index 8fff16d..2302ea6 100644
} }
/* order matters here... the trick is that flags /* order matters here... the trick is that flags
diff --git a/include/asm-mips/mach-bcm963xx/bcm_intr.h b/include/asm-mips/mach-bcm963xx/bcm_intr.h Index: linux-2.6.25.4/include/asm-mips/mach-bcm963xx/bcm_intr.h
index 8c56840..920f783 100644 ===================================================================
--- a/include/asm-mips/mach-bcm963xx/bcm_intr.h --- linux-2.6.25.4.orig/include/asm-mips/mach-bcm963xx/bcm_intr.h
+++ b/include/asm-mips/mach-bcm963xx/bcm_intr.h +++ linux-2.6.25.4/include/asm-mips/mach-bcm963xx/bcm_intr.h
@@ -39,18 +39,12 @@ struct pt_regs; @@ -39,18 +39,12 @@ struct pt_regs;
typedef int (*FN_HANDLER) (int, void *); typedef int (*FN_HANDLER) (int, void *);
@ -455,6 +456,3 @@ index 8c56840..920f783 100644
#ifdef __cplusplus #ifdef __cplusplus
} }
--
1.5.5.1

13
target/linux/brcm63xx/patches-2.6.25/070-bcm963xx_fix_uart_isr.patch
View file

@ -12,11 +12,11 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
drivers/serial/bcm63xx_cons.c | 6 ++++++ drivers/serial/bcm63xx_cons.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-) 1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/drivers/serial/bcm63xx_cons.c b/drivers/serial/bcm63xx_cons.c Index: linux-2.6.25.4/drivers/serial/bcm63xx_cons.c
index 2302ea6..c60b8f0 100644 ===================================================================
--- a/drivers/serial/bcm63xx_cons.c --- linux-2.6.25.4.orig/drivers/serial/bcm63xx_cons.c
+++ b/drivers/serial/bcm63xx_cons.c +++ linux-2.6.25.4/drivers/serial/bcm63xx_cons.c
@@ -258,8 +258,14 @@ static void bcm_interrupt(int irq, void *dev, struct pt_regs *regs) @@ -258,8 +258,14 @@ static void bcm_interrupt(int irq, void
while (intStat) { while (intStat) {
if (intStat & RXINT) if (intStat & RXINT)
receive_chars(info); receive_chars(info);
@ -31,6 +31,3 @@ index 2302ea6..c60b8f0 100644
else /* don't know what it was, so let's mask it */ else /* don't know what it was, so let's mask it */
info->port->intMask &= ~intStat; info->port->intMask &= ~intStat;
--
1.5.5.1

18
target/linux/brcm63xx/patches-2.6.25/080-bcm963xx_remove_unused_int_handler.patch
View file

@ -12,10 +12,10 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
2 files changed, 1 insertions(+), 60 deletions(-) 2 files changed, 1 insertions(+), 60 deletions(-)
delete mode 100644 arch/mips/bcm963xx/int-handler.S delete mode 100644 arch/mips/bcm963xx/int-handler.S
diff --git a/arch/mips/bcm963xx/Makefile b/arch/mips/bcm963xx/Makefile Index: linux-2.6.25.4/arch/mips/bcm963xx/Makefile
index a9d1e55..77fbd84 100644 ===================================================================
--- a/arch/mips/bcm963xx/Makefile --- linux-2.6.25.4.orig/arch/mips/bcm963xx/Makefile
+++ b/arch/mips/bcm963xx/Makefile +++ linux-2.6.25.4/arch/mips/bcm963xx/Makefile
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
# #
# Copyright (C) 2004 Broadcom Corporation # Copyright (C) 2004 Broadcom Corporation
@ -25,10 +25,9 @@ index a9d1e55..77fbd84 100644
SRCBASE := $(TOPDIR) SRCBASE := $(TOPDIR)
EXTRA_CFLAGS += -I$(SRCBASE)/include EXTRA_CFLAGS += -I$(SRCBASE)/include
diff --git a/arch/mips/bcm963xx/int-handler.S b/arch/mips/bcm963xx/int-handler.S Index: linux-2.6.25.4/arch/mips/bcm963xx/int-handler.S
deleted file mode 100644 ===================================================================
index a7a9c9d..0000000 --- linux-2.6.25.4.orig/arch/mips/bcm963xx/int-handler.S
--- a/arch/mips/bcm963xx/int-handler.S
+++ /dev/null +++ /dev/null
@@ -1,59 +0,0 @@ @@ -1,59 +0,0 @@
-/* -/*
@ -90,6 +89,3 @@ index a7a9c9d..0000000
- nop - nop
- -
- END(brcmIRQ) - END(brcmIRQ)
--
1.5.5.1

21
target/linux/brcm63xx/patches-2.6.25/090-bcm963xx_remove_obsolete_timer_code.patch
View file

@ -11,10 +11,10 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
arch/mips/bcm963xx/time.c | 29 ----------------------------- arch/mips/bcm963xx/time.c | 29 -----------------------------
2 files changed, 0 insertions(+), 31 deletions(-) 2 files changed, 0 insertions(+), 31 deletions(-)
diff --git a/arch/mips/bcm963xx/setup.c b/arch/mips/bcm963xx/setup.c Index: linux-2.6.25.4/arch/mips/bcm963xx/setup.c
index 5847278..982cba0 100644 ===================================================================
--- a/arch/mips/bcm963xx/setup.c --- linux-2.6.25.4.orig/arch/mips/bcm963xx/setup.c
+++ b/arch/mips/bcm963xx/setup.c +++ linux-2.6.25.4/arch/mips/bcm963xx/setup.c
@@ -465,8 +465,6 @@ void __init plat_mem_setup(void) @@ -465,8 +465,6 @@ void __init plat_mem_setup(void)
_machine_halt = brcm_machine_halt; _machine_halt = brcm_machine_halt;
pm_power_off = brcm_machine_halt; pm_power_off = brcm_machine_halt;
@ -24,11 +24,11 @@ index 5847278..982cba0 100644
/* mpi initialization */ /* mpi initialization */
mpi_init(); mpi_init();
} }
diff --git a/arch/mips/bcm963xx/time.c b/arch/mips/bcm963xx/time.c Index: linux-2.6.25.4/arch/mips/bcm963xx/time.c
index fa0fa71..8a5007e 100644 ===================================================================
--- a/arch/mips/bcm963xx/time.c --- linux-2.6.25.4.orig/arch/mips/bcm963xx/time.c
+++ b/arch/mips/bcm963xx/time.c +++ linux-2.6.25.4/arch/mips/bcm963xx/time.c
@@ -71,26 +71,6 @@ static inline unsigned long __init cal_r4koff(void) @@ -71,26 +71,6 @@ static inline unsigned long __init cal_r
return (mips_hpt_frequency / HZ); return (mips_hpt_frequency / HZ);
} }
@ -68,6 +68,3 @@ index fa0fa71..8a5007e 100644
- set_c0_status(IE_IRQ5); - set_c0_status(IE_IRQ5);
-} -}
-#endif -#endif
--
1.5.5.1

24
target/linux/brcm63xx/patches-2.6.25/100-bcm963xx_add_new_timer_code.patch
View file

@ -12,10 +12,10 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
arch/mips/bcm963xx/time.c | 64 ++++++++++++++++++++------------------------ arch/mips/bcm963xx/time.c | 64 ++++++++++++++++++++------------------------
2 files changed, 31 insertions(+), 35 deletions(-) 2 files changed, 31 insertions(+), 35 deletions(-)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig Index: linux-2.6.25.4/arch/mips/Kconfig
index 1b1c4bf..3f8be3f 100644 ===================================================================
--- a/arch/mips/Kconfig --- linux-2.6.25.4.orig/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ linux-2.6.25.4/arch/mips/Kconfig
@@ -67,6 +67,8 @@ config BCM963XX @@ -67,6 +67,8 @@ config BCM963XX
select HW_HAS_PCI select HW_HAS_PCI
select DMA_NONCOHERENT select DMA_NONCOHERENT
@ -25,10 +25,10 @@ index 1b1c4bf..3f8be3f 100644
help help
This is a fmaily of boards based on the Broadcom MIPS32 This is a fmaily of boards based on the Broadcom MIPS32
diff --git a/arch/mips/bcm963xx/time.c b/arch/mips/bcm963xx/time.c Index: linux-2.6.25.4/arch/mips/bcm963xx/time.c
index 8a5007e..9fae8fd 100644 ===================================================================
--- a/arch/mips/bcm963xx/time.c --- linux-2.6.25.4.orig/arch/mips/bcm963xx/time.c
+++ b/arch/mips/bcm963xx/time.c +++ linux-2.6.25.4/arch/mips/bcm963xx/time.c
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
/* /*
<:copyright-gpl <:copyright-gpl
@ -97,12 +97,13 @@ index 8a5007e..9fae8fd 100644
+ +
+ printk("CPU frequency %lu.%02lu MHz\n", cpu_clock / 1000000, + printk("CPU frequency %lu.%02lu MHz\n", cpu_clock / 1000000,
+ (cpu_clock % 1000000) * 100 / 1000000); + (cpu_clock % 1000000) * 100 / 1000000);
+
+ mips_hpt_frequency = cpu_clock / 2;
- printk("calculating r4koff... "); - printk("calculating r4koff... ");
- r4k_offset = cal_r4koff(); - r4k_offset = cal_r4koff();
- printk("%08lx(%d)\n", r4k_offset, (int)r4k_offset); - printk("%08lx(%d)\n", r4k_offset, (int)r4k_offset);
+ mips_hpt_frequency = cpu_clock / 2; -
- est_freq = 2 * r4k_offset * HZ; - est_freq = 2 * r4k_offset * HZ;
- est_freq += 5000; /* round */ - est_freq += 5000; /* round */
- est_freq -= est_freq % 10000; - est_freq -= est_freq % 10000;
@ -116,6 +117,3 @@ index 8a5007e..9fae8fd 100644
+ write_c0_count(0); + write_c0_count(0);
+ write_c0_compare(0xffff); + write_c0_compare(0xffff);
} }
--
1.5.5.1

13
target/linux/brcm63xx/patches-2.6.25/110-bcm963xx_fix_cfe_detection.patch
View file

@ -10,10 +10,10 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
drivers/mtd/maps/bcm963xx-flash.c | 11 ++++++----- drivers/mtd/maps/bcm963xx-flash.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-) 1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/mtd/maps/bcm963xx-flash.c b/drivers/mtd/maps/bcm963xx-flash.c Index: linux-2.6.25.4/drivers/mtd/maps/bcm963xx-flash.c
index c4c4526..4da672b 100644 ===================================================================
--- a/drivers/mtd/maps/bcm963xx-flash.c --- linux-2.6.25.4.orig/drivers/mtd/maps/bcm963xx-flash.c
+++ b/drivers/mtd/maps/bcm963xx-flash.c +++ linux-2.6.25.4/drivers/mtd/maps/bcm963xx-flash.c
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
/* /*
- * $Id$ - * $Id$
@ -25,7 +25,7 @@ index c4c4526..4da672b 100644
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@@ -184,11 +183,13 @@ static int bcm963xx_parts_size = sizeof(bcm963xx_parts) / sizeof(bcm963xx_parts[ @@ -184,11 +183,13 @@ static int bcm963xx_parts_size = sizeof(
static int bcm963xx_detect_cfe(struct mtd_info *master) static int bcm963xx_detect_cfe(struct mtd_info *master)
{ {
int idoffset = 0x4e0; int idoffset = 0x4e0;
@ -41,6 +41,3 @@ index c4c4526..4da672b 100644
ret = master->read(master, idoffset, 8, &retlen, (void *)buf); ret = master->read(master, idoffset, 8, &retlen, (void *)buf);
printk("bcm963xx: Read Signature value of %s\n", buf); printk("bcm963xx: Read Signature value of %s\n", buf);
return strcmp(idstring,buf); return strcmp(idstring,buf);
--
1.5.5.1

50
target/linux/brcm63xx/patches-2.6.25/500-bcm96345_fixes.patch
View file

@ -17,10 +17,10 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
include/asm-mips/mach-bcm963xx/board.h | 2 ++ include/asm-mips/mach-bcm963xx/board.h | 2 ++
4 files changed, 25 insertions(+), 11 deletions(-) 4 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/arch/mips/bcm963xx/setup.c b/arch/mips/bcm963xx/setup.c Index: linux-2.6.25.4/arch/mips/bcm963xx/setup.c
index 982cba0..c12c9c3 100644 ===================================================================
--- a/arch/mips/bcm963xx/setup.c --- linux-2.6.25.4.orig/arch/mips/bcm963xx/setup.c
+++ b/arch/mips/bcm963xx/setup.c +++ linux-2.6.25.4/arch/mips/bcm963xx/setup.c
@@ -43,6 +43,7 @@ @@ -43,6 +43,7 @@
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/cpu.h> #include <asm/cpu.h>
@ -41,11 +41,11 @@ index 982cba0..c12c9c3 100644
+ mpi_init(); + mpi_init();
+ } + }
} }
diff --git a/arch/mips/bcm963xx/time.c b/arch/mips/bcm963xx/time.c Index: linux-2.6.25.4/arch/mips/bcm963xx/time.c
index 75f751a..22ad56d 100644 ===================================================================
--- a/arch/mips/bcm963xx/time.c --- linux-2.6.25.4.orig/arch/mips/bcm963xx/time.c
+++ b/arch/mips/bcm963xx/time.c +++ linux-2.6.25.4/arch/mips/bcm963xx/time.c
@@ -39,6 +39,8 @@ @@ -40,6 +40,8 @@
#include <6348_intr.h> #include <6348_intr.h>
#include <bcm_map_part.h> #include <bcm_map_part.h>
#include <bcm_intr.h> #include <bcm_intr.h>
@ -54,7 +54,7 @@ index 75f751a..22ad56d 100644
/* /*
* calculateCpuSpeed() * calculateCpuSpeed()
@@ -62,11 +64,12 @@ static inline unsigned long __init calculateCpuSpeed(void) @@ -63,11 +65,12 @@ static inline unsigned long __init calcu
} }
@ -68,10 +68,10 @@ index 75f751a..22ad56d 100644
printk("CPU frequency %lu.%02lu MHz\n", cpu_clock / 1000000, printk("CPU frequency %lu.%02lu MHz\n", cpu_clock / 1000000,
(cpu_clock % 1000000) * 100 / 1000000); (cpu_clock % 1000000) * 100 / 1000000);
diff --git a/arch/mips/pci/pci-bcm96348.c b/arch/mips/pci/pci-bcm96348.c Index: linux-2.6.25.4/arch/mips/pci/pci-bcm96348.c
index bea3b7b..1e82283 100644 ===================================================================
--- a/arch/mips/pci/pci-bcm96348.c --- linux-2.6.25.4.orig/arch/mips/pci/pci-bcm96348.c
+++ b/arch/mips/pci/pci-bcm96348.c +++ linux-2.6.25.4/arch/mips/pci/pci-bcm96348.c
@@ -21,6 +21,8 @@ @@ -21,6 +21,8 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
@ -81,21 +81,22 @@ index bea3b7b..1e82283 100644
#include <bcmpci.h> #include <bcmpci.h>
static struct resource bcm_pci_io_resource = { static struct resource bcm_pci_io_resource = {
@@ -47,16 +49,19 @@ struct pci_controller bcm96348_controller = { @@ -47,16 +49,19 @@ struct pci_controller bcm96348_controlle
static __init int bcm96348_pci_init(void) static __init int bcm96348_pci_init(void)
{ {
- /* Avoid ISA compat ranges. */ - /* Avoid ISA compat ranges. */
- PCIBIOS_MIN_IO = 0x00000000; - PCIBIOS_MIN_IO = 0x00000000;
- PCIBIOS_MIN_MEM = 0x00000000; - PCIBIOS_MIN_MEM = 0x00000000;
-
- /* Set I/O resource limits. */
- ioport_resource.end = 0x1fffffff;
- iomem_resource.end = 0xffffffff;
+ if (!ISBCM(0x6345)) { + if (!ISBCM(0x6345)) {
+ /* Avoid ISA compat ranges. */ + /* Avoid ISA compat ranges. */
+ PCIBIOS_MIN_IO = 0x00000000; + PCIBIOS_MIN_IO = 0x00000000;
+ PCIBIOS_MIN_MEM = 0x00000000; + PCIBIOS_MIN_MEM = 0x00000000;
+
- /* Set I/O resource limits. */
- ioport_resource.end = 0x1fffffff;
- iomem_resource.end = 0xffffffff;
+ /* Set I/O resource limits. */ + /* Set I/O resource limits. */
+ ioport_resource.end = 0x1fffffff; + ioport_resource.end = 0x1fffffff;
+ iomem_resource.end = 0xffffffff; + iomem_resource.end = 0xffffffff;
@ -109,10 +110,10 @@ index bea3b7b..1e82283 100644
} }
arch_initcall(bcm96348_pci_init); arch_initcall(bcm96348_pci_init);
diff --git a/include/asm-mips/mach-bcm963xx/board.h b/include/asm-mips/mach-bcm963xx/board.h Index: linux-2.6.25.4/include/asm-mips/mach-bcm963xx/board.h
index e674cb1..73fa924 100644 ===================================================================
--- a/include/asm-mips/mach-bcm963xx/board.h --- linux-2.6.25.4.orig/include/asm-mips/mach-bcm963xx/board.h
+++ b/include/asm-mips/mach-bcm963xx/board.h +++ linux-2.6.25.4/include/asm-mips/mach-bcm963xx/board.h
@@ -369,5 +369,7 @@ void kerSysWakeupMonitorTask( void ); @@ -369,5 +369,7 @@ void kerSysWakeupMonitorTask( void );
extern int boot_loader_type; extern int boot_loader_type;
@ -121,6 +122,3 @@ index e674cb1..73fa924 100644
+ +
#endif /* _BOARD_H */ #endif /* _BOARD_H */
--
1.5.5.1

72
target/linux/brcm63xx/patches/001-bcm963xx.patch
View file

@ -1,7 +1,8 @@
diff -urN linux-2.6.24/arch/mips/Kconfig linux-2.6.24.new/arch/mips/Kconfig Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/mips/Kconfig
@@ -67,6 +67,17 @@ +++ linux-2.6.24.7/arch/mips/Kconfig
@@ -67,6 +67,17 @@ config BCM47XX
help help
Support for BCM47XX based boards 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 config MIPS_COBALT
bool "Cobalt Server" bool "Cobalt Server"
select CEVT_R4K 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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/mips/kernel/cpu-probe.c
@@ -796,6 +796,18 @@ +++ 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: case PRID_IMP_BCM4710:
c->cputype = CPU_BCM4710; c->cputype = CPU_BCM4710;
break; 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: default:
c->cputype = CPU_UNKNOWN; c->cputype = CPU_UNKNOWN;
break; 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_SR71000: name = "Sandcraft SR71000"; break;
case CPU_BCM3302: name = "Broadcom BCM3302"; break; case CPU_BCM3302: name = "Broadcom BCM3302"; break;
case CPU_BCM4710: name = "Broadcom BCM4710"; 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_PR4450: name = "Philips PR4450"; break;
case CPU_LOONGSON2: name = "ICT Loongson-2"; break; case CPU_LOONGSON2: name = "ICT Loongson-2"; break;
default: default:
diff -urN linux-2.6.24/arch/mips/Makefile linux-2.6.24.new/arch/mips/Makefile Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/mips/Makefile
@@ -543,6 +543,10 @@ +++ 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 cflags-$(CONFIG_BCM47XX) += -Iinclude/asm-mips/mach-bcm47xx
load-$(CONFIG_BCM47XX) := 0xffffffff80001000 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 # 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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/mips/mm/c-r4k.c
@@ -878,6 +878,13 @@ +++ 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)) if (!(config & MIPS_CONF_M))
panic("Don't know how to probe P-caches on this cpu."); 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 we seem to be a MIPS32 or MIPS64 CPU
* So let's probe the I-cache ... * 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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/mips/mm/tlbex.c
@@ -910,6 +910,10 @@ +++ 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_25KF:
case CPU_BCM3302: case CPU_BCM3302:
case CPU_BCM4710: 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: case CPU_LOONGSON2:
if (m4kc_tlbp_war()) if (m4kc_tlbp_war())
i_nop(p); i_nop(p);
diff -urN linux-2.6.24/arch/mips/pci/Makefile linux-2.6.24.new/arch/mips/pci/Makefile Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/arch/mips/pci/Makefile
@@ -48,3 +48,4 @@ +++ 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_VICTOR_MPC30X) += fixup-mpc30x.o
obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o
obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o
+obj-$(CONFIG_BCM963XX) += fixup-bcm96348.o pci-bcm96348.o ops-bcm96348.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 Index: linux-2.6.24.7/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 --- 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 @@ @@ -197,6 +197,10 @@
*/ */
#define MACH_GROUP_BRCM 23 /* Broadcom */ #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 #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 Index: linux-2.6.24.7/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 --- 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 @@ @@ -111,6 +111,10 @@
#define PRID_IMP_BCM4710 0x4000 #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 * 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_4KC, CPU_4KEC, CPU_4KSC, CPU_24K, CPU_34K, CPU_74K, CPU_AU1000,
CPU_AU1100, CPU_AU1200, CPU_AU1500, CPU_AU1550, CPU_PR4450, CPU_AU1100, CPU_AU1200, CPU_AU1500, CPU_AU1550, CPU_PR4450,

9
target/linux/brcm63xx/patches/002-bcm963xx_serial.patch
View file

@ -1,7 +1,8 @@
diff -urN linux-2.6.24/drivers/serial/Makefile linux-2.6.24.new/drivers/serial/Makefile Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/drivers/serial/Makefile
@@ -65,3 +65,4 @@ +++ 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_OF_PLATFORM) += of_serial.o
obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
obj-$(CONFIG_SERIAL_QE) += ucc_uart.o obj-$(CONFIG_SERIAL_QE) += ucc_uart.o

31
target/linux/brcm63xx/patches/040-bcm963xx_flashmap.patch
View file

@ -1,7 +1,8 @@
diff -urN linux-2.6.19/drivers/mtd/maps/Kconfig linux-2.6.19.new/drivers/mtd/maps/Kconfig Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/drivers/mtd/maps/Kconfig
@@ -283,6 +283,13 @@ +++ 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 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'. 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 config MTD_DILNETPC
tristate "CFI Flash device mapped on DIL/Net PC" tristate "CFI Flash device mapped on DIL/Net PC"
depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT 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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/drivers/mtd/redboot.c
@@ -39,7 +39,7 @@ +++ linux-2.6.24.7/drivers/mtd/redboot.c
@@ -39,7 +39,7 @@ static inline int redboot_checksum(struc
return 1; 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, struct mtd_partition **pparts,
unsigned long fis_origin) unsigned long fis_origin)
{ {
@@ -146,6 +146,14 @@ @@ -146,6 +146,14 @@ static int parse_redboot_partitions(stru
goto out; 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++) { for (i = 0; i < numslots; i++) {
struct fis_list *new_fl, **prev; 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]; new_fl->img = &buf[i];
if (fis_origin) { if (fis_origin) {
buf[i].flash_base -= 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'm sure the JFFS2 code has done me permanent damage.
* I now think the following is _normal_ * 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 Index: linux-2.6.24.7/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 --- linux-2.6.24.7.orig/drivers/mtd/maps/Makefile
@@ -69,3 +69,4 @@ +++ 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_OMAP_NOR) += omap_nor.o
obj-$(CONFIG_MTD_MTX1) += mtx-1_flash.o obj-$(CONFIG_MTD_MTX1) += mtx-1_flash.o
obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o