diff options
Diffstat (limited to 'target/linux/brcm63xx')
12 files changed, 86 insertions, 142 deletions
diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile index bfbed76d1..924f21978 100644 --- a/target/linux/brcm63xx/Makefile +++ b/target/linux/brcm63xx/Makefile @@ -10,7 +10,7 @@ ARCH:=mips BOARD:=brcm63xx BOARDNAME:=Broadcom BCM963xx FEATURES:=squashfs jffs2 broken usb atm -LINUX_VERSION:=2.6.25.6 +LINUX_VERSION:=2.6.25.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm63xx/patches-2.6.25/001-bcm963xx.patch b/target/linux/brcm63xx/patches-2.6.25/001-bcm963xx.patch index 09afd52ae..909ff61a5 100644 --- a/target/linux/brcm63xx/patches-2.6.25/001-bcm963xx.patch +++ b/target/linux/brcm63xx/patches-2.6.25/001-bcm963xx.patch @@ -16,11 +16,9 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org> include/asm-mips/cpu.h | 7 ++++++- 8 files changed, 61 insertions(+), 1 deletions(-) -Index: linux-2.6.25.4/arch/mips/Kconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/mips/Kconfig -+++ linux-2.6.25.4/arch/mips/Kconfig -@@ -59,6 +59,17 @@ config BCM47XX +--- a/arch/mips/Kconfig ++++ b/arch/mips/Kconfig +@@ -59,6 +59,17 @@ help Support for BCM47XX based boards @@ -38,11 +36,9 @@ Index: linux-2.6.25.4/arch/mips/Kconfig config MIPS_COBALT bool "Cobalt Server" select CEVT_R4K -Index: linux-2.6.25.4/arch/mips/Makefile -=================================================================== ---- linux-2.6.25.4.orig/arch/mips/Makefile -+++ linux-2.6.25.4/arch/mips/Makefile -@@ -560,6 +560,10 @@ core-$(CONFIG_BCM47XX) += arch/mips/bcm +--- a/arch/mips/Makefile ++++ b/arch/mips/Makefile +@@ -560,6 +560,10 @@ cflags-$(CONFIG_BCM47XX) += -Iinclude/asm-mips/mach-bcm47xx load-$(CONFIG_BCM47XX) := 0xffffffff80001000 @@ -53,11 +49,9 @@ Index: linux-2.6.25.4/arch/mips/Makefile # # SNI RM # -Index: linux-2.6.25.4/arch/mips/kernel/cpu-probe.c -=================================================================== ---- linux-2.6.25.4.orig/arch/mips/kernel/cpu-probe.c -+++ linux-2.6.25.4/arch/mips/kernel/cpu-probe.c -@@ -803,6 +803,21 @@ static inline void cpu_probe_broadcom(st +--- a/arch/mips/kernel/cpu-probe.c ++++ b/arch/mips/kernel/cpu-probe.c +@@ -803,6 +803,21 @@ case PRID_IMP_BCM4710: c->cputype = CPU_BCM4710; break; @@ -79,7 +73,7 @@ Index: linux-2.6.25.4/arch/mips/kernel/cpu-probe.c default: c->cputype = CPU_UNKNOWN; break; -@@ -887,6 +899,11 @@ static __cpuinit const char *cpu_to_name +@@ -887,6 +902,11 @@ case CPU_SR71000: name = "Sandcraft SR71000"; break; case CPU_BCM3302: name = "Broadcom BCM3302"; break; case CPU_BCM4710: name = "Broadcom BCM4710"; break; @@ -91,11 +85,9 @@ Index: linux-2.6.25.4/arch/mips/kernel/cpu-probe.c case CPU_PR4450: name = "Philips PR4450"; break; case CPU_LOONGSON2: name = "ICT Loongson-2"; break; default: -Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c -=================================================================== ---- linux-2.6.25.4.orig/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) +--- a/arch/mips/mm/c-r4k.c ++++ b/arch/mips/mm/c-r4k.c +@@ -882,6 +882,13 @@ if (!(config & MIPS_CONF_M)) panic("Don't know how to probe P-caches on this cpu."); @@ -109,11 +101,9 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c /* * So we seem to be a MIPS32 or MIPS64 CPU * So let's probe the I-cache ... -Index: linux-2.6.25.4/arch/mips/mm/tlbex.c -=================================================================== ---- linux-2.6.25.4.orig/arch/mips/mm/tlbex.c -+++ linux-2.6.25.4/arch/mips/mm/tlbex.c -@@ -315,6 +315,11 @@ static void __cpuinit build_tlb_write_en +--- a/arch/mips/mm/tlbex.c ++++ b/arch/mips/mm/tlbex.c +@@ -315,6 +315,11 @@ case CPU_25KF: case CPU_BCM3302: case CPU_BCM4710: @@ -125,19 +115,15 @@ Index: linux-2.6.25.4/arch/mips/mm/tlbex.c case CPU_LOONGSON2: if (m4kc_tlbp_war()) uasm_i_nop(p); -Index: linux-2.6.25.4/arch/mips/pci/Makefile -=================================================================== ---- linux-2.6.25.4.orig/arch/mips/pci/Makefile -+++ linux-2.6.25.4/arch/mips/pci/Makefile -@@ -48,3 +48,4 @@ obj-$(CONFIG_TOSHIBA_RBTX4938) += fixup- +--- a/arch/mips/pci/Makefile ++++ b/arch/mips/pci/Makefile +@@ -48,3 +48,4 @@ 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 -Index: linux-2.6.25.4/include/asm-mips/bootinfo.h -=================================================================== ---- linux-2.6.25.4.orig/include/asm-mips/bootinfo.h -+++ linux-2.6.25.4/include/asm-mips/bootinfo.h +--- a/include/asm-mips/bootinfo.h ++++ b/include/asm-mips/bootinfo.h @@ -94,6 +94,19 @@ #define MACH_MSP7120_FPGA 5 /* PMC-Sierra MSP7120 Emulation */ #define MACH_MSP_OTHER 255 /* PMC-Sierra unknown board type */ @@ -158,10 +144,8 @@ Index: linux-2.6.25.4/include/asm-mips/bootinfo.h #define CL_SIZE COMMAND_LINE_SIZE extern char *system_type; -Index: linux-2.6.25.4/include/asm-mips/cpu.h -=================================================================== ---- linux-2.6.25.4.orig/include/asm-mips/cpu.h -+++ linux-2.6.25.4/include/asm-mips/cpu.h +--- a/include/asm-mips/cpu.h ++++ b/include/asm-mips/cpu.h @@ -111,6 +111,11 @@ #define PRID_IMP_BCM4710 0x4000 @@ -174,7 +158,7 @@ Index: linux-2.6.25.4/include/asm-mips/cpu.h /* * Definitions for 7:0 on legacy processors -@@ -196,7 +200,8 @@ enum cpu_type_enum { +@@ -196,7 +201,8 @@ */ CPU_4KC, CPU_4KEC, CPU_4KSC, CPU_24K, CPU_34K, CPU_74K, CPU_AU1000, CPU_AU1100, CPU_AU1200, CPU_AU1210, CPU_AU1250, CPU_AU1500, CPU_AU1550, diff --git a/target/linux/brcm63xx/patches-2.6.25/002-bcm963xx_serial.patch b/target/linux/brcm63xx/patches-2.6.25/002-bcm963xx_serial.patch index e97c33f2d..7c46a79e7 100644 --- a/target/linux/brcm63xx/patches-2.6.25/002-bcm963xx_serial.patch +++ b/target/linux/brcm63xx/patches-2.6.25/002-bcm963xx_serial.patch @@ -9,11 +9,9 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org> drivers/serial/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) -Index: linux-2.6.25.4/drivers/serial/Makefile -=================================================================== ---- linux-2.6.25.4.orig/drivers/serial/Makefile -+++ linux-2.6.25.4/drivers/serial/Makefile -@@ -67,3 +67,4 @@ obj-$(CONFIG_SERIAL_NETX) += netx-serial +--- a/drivers/serial/Makefile ++++ b/drivers/serial/Makefile +@@ -67,3 +67,4 @@ 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-2.6.25/040-bcm963xx_flashmap.patch b/target/linux/brcm63xx/patches-2.6.25/040-bcm963xx_flashmap.patch index d3638c2f4..e4e6ff5c5 100644 --- a/target/linux/brcm63xx/patches-2.6.25/040-bcm963xx_flashmap.patch +++ b/target/linux/brcm63xx/patches-2.6.25/040-bcm963xx_flashmap.patch @@ -11,11 +11,9 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org> drivers/mtd/redboot.c | 13 ++++++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) -Index: linux-2.6.25.4/drivers/mtd/maps/Kconfig -=================================================================== ---- linux-2.6.25.4.orig/drivers/mtd/maps/Kconfig -+++ linux-2.6.25.4/drivers/mtd/maps/Kconfig -@@ -262,6 +262,13 @@ config MTD_MTX1 +--- a/drivers/mtd/maps/Kconfig ++++ b/drivers/mtd/maps/Kconfig +@@ -262,6 +262,13 @@ 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'. @@ -29,20 +27,16 @@ Index: linux-2.6.25.4/drivers/mtd/maps/Kconfig config MTD_DILNETPC tristate "CFI Flash device mapped on DIL/Net PC" depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT -Index: linux-2.6.25.4/drivers/mtd/maps/Makefile -=================================================================== ---- linux-2.6.25.4.orig/drivers/mtd/maps/Makefile -+++ linux-2.6.25.4/drivers/mtd/maps/Makefile -@@ -68,3 +68,4 @@ obj-$(CONFIG_MTD_PLATRAM) += plat-ram.o +--- a/drivers/mtd/maps/Makefile ++++ b/drivers/mtd/maps/Makefile +@@ -68,3 +68,4 @@ 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 +obj-$(CONFIG_MTD_BCM963XX) += bcm963xx-flash.o -Index: linux-2.6.25.4/drivers/mtd/redboot.c -=================================================================== ---- linux-2.6.25.4.orig/drivers/mtd/redboot.c -+++ linux-2.6.25.4/drivers/mtd/redboot.c -@@ -39,7 +39,7 @@ static inline int redboot_checksum(struc +--- a/drivers/mtd/redboot.c ++++ b/drivers/mtd/redboot.c +@@ -39,7 +39,7 @@ return 1; } @@ -51,7 +45,7 @@ Index: linux-2.6.25.4/drivers/mtd/redboot.c struct mtd_partition **pparts, unsigned long fis_origin) { -@@ -161,6 +161,14 @@ static int parse_redboot_partitions(stru +@@ -161,6 +161,14 @@ goto out; } @@ -66,7 +60,7 @@ Index: linux-2.6.25.4/drivers/mtd/redboot.c for (i = 0; i < numslots; i++) { struct fis_list *new_fl, **prev; -@@ -183,9 +191,8 @@ static int parse_redboot_partitions(stru +@@ -183,9 +191,8 @@ new_fl->img = &buf[i]; if (fis_origin) { buf[i].flash_base -= fis_origin; diff --git a/target/linux/brcm63xx/patches-2.6.25/050-bcm963xx_add_trailing_zero.patch b/target/linux/brcm63xx/patches-2.6.25/050-bcm963xx_add_trailing_zero.patch index adb3f8be5..d13ca9266 100644 --- a/target/linux/brcm63xx/patches-2.6.25/050-bcm963xx_add_trailing_zero.patch +++ b/target/linux/brcm63xx/patches-2.6.25/050-bcm963xx_add_trailing_zero.patch @@ -11,11 +11,9 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org> arch/mips/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -Index: linux-2.6.25.4/arch/mips/Makefile -=================================================================== ---- linux-2.6.25.4.orig/arch/mips/Makefile -+++ linux-2.6.25.4/arch/mips/Makefile -@@ -562,7 +562,7 @@ load-$(CONFIG_BCM47XX) := 0xffffffff800 +--- a/arch/mips/Makefile ++++ b/arch/mips/Makefile +@@ -562,7 +562,7 @@ core-$(CONFIG_BCM963XX) += arch/mips/bcm963xx/ cflags-$(CONFIG_BCM963XX) += -Iinclude/asm-mips/mach-bcm963xx diff --git a/target/linux/brcm63xx/patches-2.6.25/060-bcm963xx_rewrite_irq_handling_code.patch b/target/linux/brcm63xx/patches-2.6.25/060-bcm963xx_rewrite_irq_handling_code.patch index e3cff528c..349010486 100644 --- a/target/linux/brcm63xx/patches-2.6.25/060-bcm963xx_rewrite_irq_handling_code.patch +++ b/target/linux/brcm63xx/patches-2.6.25/060-bcm963xx_rewrite_irq_handling_code.patch @@ -13,10 +13,8 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org> include/asm-mips/mach-bcm963xx/bcm_intr.h | 18 +-- 3 files changed, 119 insertions(+), 220 deletions(-) -Index: linux-2.6.25.4/arch/mips/bcm963xx/irq.c -=================================================================== ---- linux-2.6.25.4.orig/arch/mips/bcm963xx/irq.c -+++ linux-2.6.25.4/arch/mips/bcm963xx/irq.c +--- a/arch/mips/bcm963xx/irq.c ++++ b/arch/mips/bcm963xx/irq.c @@ -1,259 +1,159 @@ /* -<:copyright-gpl @@ -382,11 +380,9 @@ Index: linux-2.6.25.4/arch/mips/bcm963xx/irq.c -EXPORT_SYMBOL(request_external_irq); -EXPORT_SYMBOL(BcmHalMapInterrupt); - -Index: linux-2.6.25.4/drivers/serial/bcm63xx_cons.c -=================================================================== ---- linux-2.6.25.4.orig/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 +--- a/drivers/serial/bcm63xx_cons.c ++++ b/drivers/serial/bcm63xx_cons.c +@@ -267,7 +267,7 @@ } // Clear the interrupt @@ -395,7 +391,7 @@ Index: linux-2.6.25.4/drivers/serial/bcm63xx_cons.c #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) return IRQ_HANDLED; #endif -@@ -880,7 +880,7 @@ static int bcm63xx_cons_open(struct tty_ +@@ -880,7 +880,7 @@ info->count++; tty->driver_data = info; info->tty = tty; @@ -404,7 +400,7 @@ Index: linux-2.6.25.4/drivers/serial/bcm63xx_cons.c // Start up serial port retval = startup(info); -@@ -927,7 +927,7 @@ static struct tty_operations rs_ops = { +@@ -927,7 +927,7 @@ -------------------------------------------------------------------------- */ static int __init bcm63xx_serialinit(void) { @@ -413,7 +409,7 @@ Index: linux-2.6.25.4/drivers/serial/bcm63xx_cons.c struct bcm_serial *info; // Print the driver version information -@@ -981,7 +981,12 @@ static int __init bcm63xx_serialinit(voi +@@ -981,7 +981,12 @@ */ if (!info->port) return 0; @@ -427,11 +423,9 @@ Index: linux-2.6.25.4/drivers/serial/bcm63xx_cons.c } /* order matters here... the trick is that flags -Index: linux-2.6.25.4/include/asm-mips/mach-bcm963xx/bcm_intr.h -=================================================================== ---- linux-2.6.25.4.orig/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; +--- a/include/asm-mips/mach-bcm963xx/bcm_intr.h ++++ b/include/asm-mips/mach-bcm963xx/bcm_intr.h +@@ -39,18 +39,12 @@ typedef int (*FN_HANDLER) (int, void *); /* prototypes */ diff --git a/target/linux/brcm63xx/patches-2.6.25/070-bcm963xx_fix_uart_isr.patch b/target/linux/brcm63xx/patches-2.6.25/070-bcm963xx_fix_uart_isr.patch index 38aef5da1..a90bde3f8 100644 --- a/target/linux/brcm63xx/patches-2.6.25/070-bcm963xx_fix_uart_isr.patch +++ b/target/linux/brcm63xx/patches-2.6.25/070-bcm963xx_fix_uart_isr.patch @@ -12,11 +12,9 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org> drivers/serial/bcm63xx_cons.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) -Index: linux-2.6.25.4/drivers/serial/bcm63xx_cons.c -=================================================================== ---- linux-2.6.25.4.orig/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 +--- a/drivers/serial/bcm63xx_cons.c ++++ b/drivers/serial/bcm63xx_cons.c +@@ -258,8 +258,14 @@ while (intStat) { if (intStat & RXINT) receive_chars(info); diff --git a/target/linux/brcm63xx/patches-2.6.25/080-bcm963xx_remove_unused_int_handler.patch b/target/linux/brcm63xx/patches-2.6.25/080-bcm963xx_remove_unused_int_handler.patch index 5ba30af3b..0abfd9885 100644 --- a/target/linux/brcm63xx/patches-2.6.25/080-bcm963xx_remove_unused_int_handler.patch +++ b/target/linux/brcm63xx/patches-2.6.25/080-bcm963xx_remove_unused_int_handler.patch @@ -12,10 +12,8 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org> 2 files changed, 1 insertions(+), 60 deletions(-) delete mode 100644 arch/mips/bcm963xx/int-handler.S -Index: linux-2.6.25.4/arch/mips/bcm963xx/Makefile -=================================================================== ---- linux-2.6.25.4.orig/arch/mips/bcm963xx/Makefile -+++ linux-2.6.25.4/arch/mips/bcm963xx/Makefile +--- a/arch/mips/bcm963xx/Makefile ++++ b/arch/mips/bcm963xx/Makefile @@ -3,7 +3,7 @@ # # Copyright (C) 2004 Broadcom Corporation @@ -25,9 +23,7 @@ Index: linux-2.6.25.4/arch/mips/bcm963xx/Makefile SRCBASE := $(TOPDIR) EXTRA_CFLAGS += -I$(SRCBASE)/include -Index: linux-2.6.25.4/arch/mips/bcm963xx/int-handler.S -=================================================================== ---- linux-2.6.25.4.orig/arch/mips/bcm963xx/int-handler.S +--- a/arch/mips/bcm963xx/int-handler.S +++ /dev/null @@ -1,59 +0,0 @@ -/* diff --git a/target/linux/brcm63xx/patches-2.6.25/090-bcm963xx_remove_obsolete_timer_code.patch b/target/linux/brcm63xx/patches-2.6.25/090-bcm963xx_remove_obsolete_timer_code.patch index 5f7d6d8ee..72ccfea7f 100644 --- a/target/linux/brcm63xx/patches-2.6.25/090-bcm963xx_remove_obsolete_timer_code.patch +++ b/target/linux/brcm63xx/patches-2.6.25/090-bcm963xx_remove_obsolete_timer_code.patch @@ -11,11 +11,9 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org> arch/mips/bcm963xx/time.c | 29 ----------------------------- 2 files changed, 0 insertions(+), 31 deletions(-) -Index: linux-2.6.25.4/arch/mips/bcm963xx/setup.c -=================================================================== ---- linux-2.6.25.4.orig/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) +--- a/arch/mips/bcm963xx/setup.c ++++ b/arch/mips/bcm963xx/setup.c +@@ -465,8 +465,6 @@ _machine_halt = brcm_machine_halt; pm_power_off = brcm_machine_halt; @@ -24,11 +22,9 @@ Index: linux-2.6.25.4/arch/mips/bcm963xx/setup.c /* mpi initialization */ mpi_init(); } -Index: linux-2.6.25.4/arch/mips/bcm963xx/time.c -=================================================================== ---- linux-2.6.25.4.orig/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_r +--- a/arch/mips/bcm963xx/time.c ++++ b/arch/mips/bcm963xx/time.c +@@ -71,26 +71,6 @@ return (mips_hpt_frequency / HZ); } @@ -55,7 +51,7 @@ Index: linux-2.6.25.4/arch/mips/bcm963xx/time.c void __init plat_time_init(void) { unsigned int est_freq, flags; -@@ -107,12 +87,3 @@ void __init plat_time_init(void) +@@ -107,12 +87,3 @@ (est_freq % 1000000) * 100 / 1000000); local_irq_restore(flags); } diff --git a/target/linux/brcm63xx/patches-2.6.25/100-bcm963xx_add_new_timer_code.patch b/target/linux/brcm63xx/patches-2.6.25/100-bcm963xx_add_new_timer_code.patch index ce75ba8e8..9d08ab087 100644 --- a/target/linux/brcm63xx/patches-2.6.25/100-bcm963xx_add_new_timer_code.patch +++ b/target/linux/brcm63xx/patches-2.6.25/100-bcm963xx_add_new_timer_code.patch @@ -12,11 +12,9 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org> arch/mips/bcm963xx/time.c | 64 ++++++++++++++++++++------------------------ 2 files changed, 31 insertions(+), 35 deletions(-) -Index: linux-2.6.25.4/arch/mips/Kconfig -=================================================================== ---- linux-2.6.25.4.orig/arch/mips/Kconfig -+++ linux-2.6.25.4/arch/mips/Kconfig -@@ -67,6 +67,8 @@ config BCM963XX +--- a/arch/mips/Kconfig ++++ b/arch/mips/Kconfig +@@ -67,6 +67,8 @@ select HW_HAS_PCI select DMA_NONCOHERENT select IRQ_CPU @@ -25,10 +23,8 @@ Index: linux-2.6.25.4/arch/mips/Kconfig help This is a fmaily of boards based on the Broadcom MIPS32 -Index: linux-2.6.25.4/arch/mips/bcm963xx/time.c -=================================================================== ---- linux-2.6.25.4.orig/arch/mips/bcm963xx/time.c -+++ linux-2.6.25.4/arch/mips/bcm963xx/time.c +--- a/arch/mips/bcm963xx/time.c ++++ b/arch/mips/bcm963xx/time.c @@ -1,6 +1,7 @@ /* <:copyright-gpl diff --git a/target/linux/brcm63xx/patches-2.6.25/110-bcm963xx_fix_cfe_detection.patch b/target/linux/brcm63xx/patches-2.6.25/110-bcm963xx_fix_cfe_detection.patch index e22f22126..3cf460266 100644 --- a/target/linux/brcm63xx/patches-2.6.25/110-bcm963xx_fix_cfe_detection.patch +++ b/target/linux/brcm63xx/patches-2.6.25/110-bcm963xx_fix_cfe_detection.patch @@ -10,10 +10,8 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org> drivers/mtd/maps/bcm963xx-flash.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) -Index: linux-2.6.25.4/drivers/mtd/maps/bcm963xx-flash.c -=================================================================== ---- linux-2.6.25.4.orig/drivers/mtd/maps/bcm963xx-flash.c -+++ linux-2.6.25.4/drivers/mtd/maps/bcm963xx-flash.c +--- a/drivers/mtd/maps/bcm963xx-flash.c ++++ b/drivers/mtd/maps/bcm963xx-flash.c @@ -1,8 +1,7 @@ /* - * $Id$ @@ -25,7 +23,7 @@ Index: linux-2.6.25.4/drivers/mtd/maps/bcm963xx-flash.c * * 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 -@@ -184,11 +183,13 @@ static int bcm963xx_parts_size = sizeof( +@@ -184,11 +183,13 @@ static int bcm963xx_detect_cfe(struct mtd_info *master) { int idoffset = 0x4e0; diff --git a/target/linux/brcm63xx/patches-2.6.25/500-bcm96345_fixes.patch b/target/linux/brcm63xx/patches-2.6.25/500-bcm96345_fixes.patch index 1f8dd96f0..dd55cd163 100644 --- a/target/linux/brcm63xx/patches-2.6.25/500-bcm96345_fixes.patch +++ b/target/linux/brcm63xx/patches-2.6.25/500-bcm96345_fixes.patch @@ -17,10 +17,8 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org> include/asm-mips/mach-bcm963xx/board.h | 2 ++ 4 files changed, 25 insertions(+), 11 deletions(-) -Index: linux-2.6.25.4/arch/mips/bcm963xx/setup.c -=================================================================== ---- linux-2.6.25.4.orig/arch/mips/bcm963xx/setup.c -+++ linux-2.6.25.4/arch/mips/bcm963xx/setup.c +--- a/arch/mips/bcm963xx/setup.c ++++ b/arch/mips/bcm963xx/setup.c @@ -43,6 +43,7 @@ #include <asm/bootinfo.h> #include <asm/cpu.h> @@ -29,7 +27,7 @@ Index: linux-2.6.25.4/arch/mips/bcm963xx/setup.c extern void brcm_time_init(void); extern int boot_loader_type; -@@ -465,6 +466,9 @@ void __init plat_mem_setup(void) +@@ -465,6 +466,9 @@ _machine_halt = brcm_machine_halt; pm_power_off = brcm_machine_halt; @@ -41,10 +39,8 @@ Index: linux-2.6.25.4/arch/mips/bcm963xx/setup.c + mpi_init(); + } } -Index: linux-2.6.25.4/arch/mips/bcm963xx/time.c -=================================================================== ---- linux-2.6.25.4.orig/arch/mips/bcm963xx/time.c -+++ linux-2.6.25.4/arch/mips/bcm963xx/time.c +--- a/arch/mips/bcm963xx/time.c ++++ b/arch/mips/bcm963xx/time.c @@ -40,6 +40,8 @@ #include <6348_intr.h> #include <bcm_map_part.h> @@ -54,7 +50,7 @@ Index: linux-2.6.25.4/arch/mips/bcm963xx/time.c /* * calculateCpuSpeed() -@@ -63,11 +65,12 @@ static inline unsigned long __init calcu +@@ -63,11 +65,12 @@ } @@ -68,10 +64,8 @@ Index: linux-2.6.25.4/arch/mips/bcm963xx/time.c printk("CPU frequency %lu.%02lu MHz\n", cpu_clock / 1000000, (cpu_clock % 1000000) * 100 / 1000000); -Index: linux-2.6.25.4/arch/mips/pci/pci-bcm96348.c -=================================================================== ---- linux-2.6.25.4.orig/arch/mips/pci/pci-bcm96348.c -+++ linux-2.6.25.4/arch/mips/pci/pci-bcm96348.c +--- a/arch/mips/pci/pci-bcm96348.c ++++ b/arch/mips/pci/pci-bcm96348.c @@ -21,6 +21,8 @@ #include <linux/kernel.h> #include <linux/init.h> @@ -81,7 +75,7 @@ Index: linux-2.6.25.4/arch/mips/pci/pci-bcm96348.c #include <bcmpci.h> static struct resource bcm_pci_io_resource = { -@@ -47,16 +49,19 @@ struct pci_controller bcm96348_controlle +@@ -47,16 +49,19 @@ static __init int bcm96348_pci_init(void) { @@ -110,11 +104,9 @@ Index: linux-2.6.25.4/arch/mips/pci/pci-bcm96348.c } arch_initcall(bcm96348_pci_init); -Index: linux-2.6.25.4/include/asm-mips/mach-bcm963xx/board.h -=================================================================== ---- linux-2.6.25.4.orig/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 ); +--- a/include/asm-mips/mach-bcm963xx/board.h ++++ b/include/asm-mips/mach-bcm963xx/board.h +@@ -369,5 +369,7 @@ extern int boot_loader_type; |