From 19b0e56ba7d5a1c93075cac3d662486917a9ef35 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Wed, 15 Oct 2008 19:30:21 +0000 Subject: refresh patches against 2.6.27 final SVN-Revision: 12987 --- target/linux/ar71xx/patches-2.6.27/001-ar71xx_core.patch | 6 +++--- target/linux/ar71xx/patches-2.6.27/002-ar71xx_pci.patch | 2 +- target/linux/ar71xx/patches-2.6.27/003-ar71xx_usb_host.patch | 10 +++++----- .../ar71xx/patches-2.6.27/004-ar71xx_spi_controller.patch | 4 ++-- target/linux/ar71xx/patches-2.6.27/005-ar71xx_mac_driver.patch | 2 +- target/linux/ar71xx/patches-2.6.27/006-ar71xx_wdt_driver.patch | 4 ++-- .../ar71xx/patches-2.6.27/100-mtd_pm25lv_flash_support.patch | 2 +- .../linux/ar71xx/patches-2.6.27/101-ksz8041_phy_driver.patch | 4 ++-- .../ar71xx/patches-2.6.27/140-redboot_partition_scan.patch | 4 ++-- target/linux/ar71xx/patches-2.6.27/200-rb4xx_nand_driver.patch | 4 ++-- target/linux/ar71xx/patches-2.6.27/300-mips_fw_myloader.patch | 4 ++-- .../ar71xx/patches-2.6.27/800-remove_netif_schedule.patch | 2 +- .../ar71xx/patches-2.6.27/900-mips_multi_machine_support.patch | 6 +++--- .../patches-2.6.27/901-get_c0_compare_irq_function.patch | 4 ++-- .../ar71xx/patches-2.6.27/902-mips_clocksource_init_war.patch | 4 ++-- 15 files changed, 31 insertions(+), 31 deletions(-) (limited to 'target/linux/ar71xx') diff --git a/target/linux/ar71xx/patches-2.6.27/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.27/001-ar71xx_core.patch index 8ff96e3..f37b4d0 100644 --- a/target/linux/ar71xx/patches-2.6.27/001-ar71xx_core.patch +++ b/target/linux/ar71xx/patches-2.6.27/001-ar71xx_core.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -577,6 +577,13 @@ +@@ -577,6 +577,13 @@ core-$(CONFIG_TOSHIBA_RBTX4927) += arch/ # core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/txx9/rbtx4938/ @@ -28,14 +28,14 @@ +#define MACH_AR71XX_RB_411 2 /* MikroTik RouterBOARD 411/411A/411AH */ +#define MACH_AR71XX_RB_433 3 /* MikroTik RouterBOARD 433/433AH */ +#define MACH_AR71XX_RB_450 4 /* MikroTik RouterBOARD 450 */ -+#define MACH_AR71XX_RB_493 5 /* Mikrotik RouterBOARD 493/493AH */ ++#define MACH_AR71XX_RB_493 5 /* MikroTik RouterBOARD 493 */ + #define CL_SIZE COMMAND_LINE_SIZE extern char *system_type; --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -22,6 +22,23 @@ +@@ -22,6 +22,23 @@ choice config MACH_ALCHEMY bool "Alchemy processor based machines" diff --git a/target/linux/ar71xx/patches-2.6.27/002-ar71xx_pci.patch b/target/linux/ar71xx/patches-2.6.27/002-ar71xx_pci.patch index 849938e..799d29a 100644 --- a/target/linux/ar71xx/patches-2.6.27/002-ar71xx_pci.patch +++ b/target/linux/ar71xx/patches-2.6.27/002-ar71xx_pci.patch @@ -1,6 +1,6 @@ --- a/arch/mips/pci/Makefile +++ b/arch/mips/pci/Makefile -@@ -16,6 +16,7 @@ +@@ -16,6 +16,7 @@ obj-$(CONFIG_PCI_VR41XX) += ops-vr41xx.o obj-$(CONFIG_MARKEINS) += ops-emma2rh.o pci-emma2rh.o fixup-emma2rh.o obj-$(CONFIG_PCI_TX4927) += ops-tx4927.o obj-$(CONFIG_BCM47XX) += pci-bcm47xx.o diff --git a/target/linux/ar71xx/patches-2.6.27/003-ar71xx_usb_host.patch b/target/linux/ar71xx/patches-2.6.27/003-ar71xx_usb_host.patch index e28d045..a1a468d 100644 --- a/target/linux/ar71xx/patches-2.6.27/003-ar71xx_usb_host.patch +++ b/target/linux/ar71xx/patches-2.6.27/003-ar71xx_usb_host.patch @@ -1,6 +1,6 @@ --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig -@@ -81,6 +81,12 @@ +@@ -81,6 +81,12 @@ config USB_EHCI_BIG_ENDIAN_DESC depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX) default y @@ -13,7 +13,7 @@ config USB_EHCI_FSL bool "Support for Freescale on-chip EHCI USB controller" depends on USB_EHCI_HCD && FSL_SOC -@@ -152,6 +158,12 @@ +@@ -152,6 +158,12 @@ config USB_OHCI_HCD To compile this driver as a module, choose M here: the module will be called ohci-hcd. @@ -28,7 +28,7 @@ depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx) --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -1040,6 +1040,11 @@ +@@ -1040,6 +1040,11 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ixp4xx_ehci_driver #endif @@ -42,7 +42,7 @@ #error "missing bus glue for ehci-hcd" --- a/drivers/usb/host/ohci.h +++ b/drivers/usb/host/ohci.h -@@ -549,6 +549,11 @@ +@@ -549,6 +549,11 @@ static inline struct usb_hcd *ohci_to_hc #define writel_be(val, addr) out_be32((__force unsigned *)addr, val) #endif @@ -56,7 +56,7 @@ { --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c -@@ -1078,6 +1078,11 @@ +@@ -1078,6 +1078,11 @@ MODULE_LICENSE ("GPL"); #define SM501_OHCI_DRIVER ohci_hcd_sm501_driver #endif diff --git a/target/linux/ar71xx/patches-2.6.27/004-ar71xx_spi_controller.patch b/target/linux/ar71xx/patches-2.6.27/004-ar71xx_spi_controller.patch index ef9f7e8..9c196e0 100644 --- a/target/linux/ar71xx/patches-2.6.27/004-ar71xx_spi_controller.patch +++ b/target/linux/ar71xx/patches-2.6.27/004-ar71xx_spi_controller.patch @@ -1,6 +1,6 @@ --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig -@@ -53,6 +53,13 @@ +@@ -53,6 +53,13 @@ if SPI_MASTER comment "SPI Master Controller Drivers" @@ -16,7 +16,7 @@ depends on (ARCH_AT91 || AVR32) --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile -@@ -11,6 +11,7 @@ +@@ -11,6 +11,7 @@ endif obj-$(CONFIG_SPI_MASTER) += spi.o # SPI master controller drivers (bus) diff --git a/target/linux/ar71xx/patches-2.6.27/005-ar71xx_mac_driver.patch b/target/linux/ar71xx/patches-2.6.27/005-ar71xx_mac_driver.patch index 6e4c7b0..58000f2 100644 --- a/target/linux/ar71xx/patches-2.6.27/005-ar71xx_mac_driver.patch +++ b/target/linux/ar71xx/patches-2.6.27/005-ar71xx_mac_driver.patch @@ -1,6 +1,6 @@ --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig -@@ -2015,6 +2015,8 @@ +@@ -2015,6 +2015,8 @@ config ACENIC_OMIT_TIGON_I The safe and default value for this is N. diff --git a/target/linux/ar71xx/patches-2.6.27/006-ar71xx_wdt_driver.patch b/target/linux/ar71xx/patches-2.6.27/006-ar71xx_wdt_driver.patch index 2dc92f9..707f937 100644 --- a/target/linux/ar71xx/patches-2.6.27/006-ar71xx_wdt_driver.patch +++ b/target/linux/ar71xx/patches-2.6.27/006-ar71xx_wdt_driver.patch @@ -1,6 +1,6 @@ --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig -@@ -704,6 +704,13 @@ +@@ -704,6 +704,13 @@ config TXX9_WDT help Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs. @@ -16,7 +16,7 @@ # POWERPC Architecture --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile -@@ -102,6 +102,7 @@ +@@ -102,6 +102,7 @@ obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o obj-$(CONFIG_AR7_WDT) += ar7_wdt.o obj-$(CONFIG_TXX9_WDT) += txx9wdt.o diff --git a/target/linux/ar71xx/patches-2.6.27/100-mtd_pm25lv_flash_support.patch b/target/linux/ar71xx/patches-2.6.27/100-mtd_pm25lv_flash_support.patch index 34a3d04..937d817 100644 --- a/target/linux/ar71xx/patches-2.6.27/100-mtd_pm25lv_flash_support.patch +++ b/target/linux/ar71xx/patches-2.6.27/100-mtd_pm25lv_flash_support.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -467,6 +467,10 @@ +@@ -467,6 +467,10 @@ static struct flash_info __devinitdata m { "at26df161a", 0x1f4601, 64 * 1024, 32, SECT_4K, }, { "at26df321", 0x1f4701, 64 * 1024, 64, SECT_4K, }, diff --git a/target/linux/ar71xx/patches-2.6.27/101-ksz8041_phy_driver.patch b/target/linux/ar71xx/patches-2.6.27/101-ksz8041_phy_driver.patch index 0797505..530b2f4 100644 --- a/target/linux/ar71xx/patches-2.6.27/101-ksz8041_phy_driver.patch +++ b/target/linux/ar71xx/patches-2.6.27/101-ksz8041_phy_driver.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -77,6 +77,11 @@ +@@ -77,6 +77,11 @@ config MVSWITCH_PHY ---help--- Currently supports the Marvell 88E6060 switch. @@ -14,7 +14,7 @@ depends on PHYLIB=y --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile -@@ -15,6 +15,7 @@ +@@ -15,6 +15,7 @@ obj-$(CONFIG_ICPLUS_PHY) += icplus.o obj-$(CONFIG_ADM6996_PHY) += adm6996.o obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o obj-$(CONFIG_REALTEK_PHY) += realtek.o diff --git a/target/linux/ar71xx/patches-2.6.27/140-redboot_partition_scan.patch b/target/linux/ar71xx/patches-2.6.27/140-redboot_partition_scan.patch index a76bd83..289d4eb 100644 --- a/target/linux/ar71xx/patches-2.6.27/140-redboot_partition_scan.patch +++ b/target/linux/ar71xx/patches-2.6.27/140-redboot_partition_scan.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/redboot.c +++ b/drivers/mtd/redboot.c -@@ -60,31 +60,32 @@ +@@ -60,31 +60,32 @@ static int parse_redboot_partitions(stru static char nullstring[] = "unallocated"; #endif @@ -40,7 +40,7 @@ printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n", master->name, offset); -@@ -156,6 +157,11 @@ +@@ -156,6 +157,11 @@ static int parse_redboot_partitions(stru } if (i == numslots) { /* Didn't find it */ diff --git a/target/linux/ar71xx/patches-2.6.27/200-rb4xx_nand_driver.patch b/target/linux/ar71xx/patches-2.6.27/200-rb4xx_nand_driver.patch index bc468ee..52c3572 100644 --- a/target/linux/ar71xx/patches-2.6.27/200-rb4xx_nand_driver.patch +++ b/target/linux/ar71xx/patches-2.6.27/200-rb4xx_nand_driver.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig -@@ -406,4 +406,8 @@ +@@ -406,4 +406,8 @@ config MTD_NAND_FSL_UPM Enables support for NAND Flash chips wired onto Freescale PowerPC processor localbus with User-Programmable Machine support. @@ -11,7 +11,7 @@ endif # MTD_NAND --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile -@@ -29,6 +29,7 @@ +@@ -29,6 +29,7 @@ obj-$(CONFIG_MTD_NAND_BASLER_EXCITE) += obj-$(CONFIG_MTD_NAND_PXA3xx) += pxa3xx_nand.o obj-$(CONFIG_MTD_NAND_TMIO) += tmio_nand.o obj-$(CONFIG_MTD_NAND_PLATFORM) += plat_nand.o diff --git a/target/linux/ar71xx/patches-2.6.27/300-mips_fw_myloader.patch b/target/linux/ar71xx/patches-2.6.27/300-mips_fw_myloader.patch index a774d21..974ca0e 100644 --- a/target/linux/ar71xx/patches-2.6.27/300-mips_fw_myloader.patch +++ b/target/linux/ar71xx/patches-2.6.27/300-mips_fw_myloader.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -158,6 +158,7 @@ +@@ -158,6 +158,7 @@ endif # libs-$(CONFIG_ARC) += arch/mips/fw/arc/ libs-$(CONFIG_CFE) += arch/mips/fw/cfe/ @@ -10,7 +10,7 @@ libs-$(CONFIG_SIBYTE_CFE) += arch/mips/sibyte/cfe/ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -782,6 +782,9 @@ +@@ -782,6 +782,9 @@ config MIPS_NILE4 config MIPS_DISABLE_OBSOLETE_IDE bool diff --git a/target/linux/ar71xx/patches-2.6.27/800-remove_netif_schedule.patch b/target/linux/ar71xx/patches-2.6.27/800-remove_netif_schedule.patch index 1c9e569..de08595 100644 --- a/target/linux/ar71xx/patches-2.6.27/800-remove_netif_schedule.patch +++ b/target/linux/ar71xx/patches-2.6.27/800-remove_netif_schedule.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ag71xx/ag71xx_phy.c +++ b/drivers/net/ag71xx/ag71xx_phy.c -@@ -171,12 +171,8 @@ +@@ -171,12 +171,8 @@ static void ag71xx_phy_link_adjust(struc } } diff --git a/target/linux/ar71xx/patches-2.6.27/900-mips_multi_machine_support.patch b/target/linux/ar71xx/patches-2.6.27/900-mips_multi_machine_support.patch index 7bb410f..bedc45f 100644 --- a/target/linux/ar71xx/patches-2.6.27/900-mips_multi_machine_support.patch +++ b/target/linux/ar71xx/patches-2.6.27/900-mips_multi_machine_support.patch @@ -113,7 +113,7 @@ + --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile -@@ -83,6 +83,7 @@ +@@ -83,6 +83,7 @@ obj-$(CONFIG_GPIO_TXX9) += gpio_txx9.o obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o @@ -123,7 +123,7 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -615,6 +615,7 @@ +@@ -615,6 +615,7 @@ config WR_PPMC endchoice @@ -131,7 +131,7 @@ source "arch/mips/au1000/Kconfig" source "arch/mips/basler/excite/Kconfig" source "arch/mips/jazz/Kconfig" -@@ -788,6 +789,9 @@ +@@ -788,6 +789,9 @@ config MYLOADER config SYNC_R4K bool diff --git a/target/linux/ar71xx/patches-2.6.27/901-get_c0_compare_irq_function.patch b/target/linux/ar71xx/patches-2.6.27/901-get_c0_compare_irq_function.patch index c1fee78..3c3cdaa 100644 --- a/target/linux/ar71xx/patches-2.6.27/901-get_c0_compare_irq_function.patch +++ b/target/linux/ar71xx/patches-2.6.27/901-get_c0_compare_irq_function.patch @@ -8,7 +8,7 @@ extern void check_wait(void); extern asmlinkage void r4k_wait(void); -@@ -1484,6 +1485,8 @@ +@@ -1484,6 +1485,8 @@ void __cpuinit per_cpu_trap_init(void) */ if (cpu_has_mips_r2) { cp0_compare_irq = (read_c0_intctl() >> 29) & 7; @@ -19,7 +19,7 @@ cp0_perfcount_irq = -1; --- a/include/asm-mips/time.h +++ b/include/asm-mips/time.h -@@ -53,6 +53,7 @@ +@@ -53,6 +53,7 @@ extern int (*perf_irq)(void); #ifdef CONFIG_CEVT_R4K extern int mips_clockevent_init(void); extern unsigned int __weak get_c0_compare_int(void); diff --git a/target/linux/ar71xx/patches-2.6.27/902-mips_clocksource_init_war.patch b/target/linux/ar71xx/patches-2.6.27/902-mips_clocksource_init_war.patch index 564321c..03a66ff 100644 --- a/target/linux/ar71xx/patches-2.6.27/902-mips_clocksource_init_war.patch +++ b/target/linux/ar71xx/patches-2.6.27/902-mips_clocksource_init_war.patch @@ -23,7 +23,7 @@ * The SMTC Kernel for the 34K, 1004K, et. al. replaces several * of these routines with SMTC-specific variants. */ -@@ -30,6 +46,7 @@ +@@ -30,6 +46,7 @@ static int mips_next_event(unsigned long cnt = read_c0_count(); cnt += delta; write_c0_compare(cnt); @@ -31,7 +31,7 @@ res = ((int)(read_c0_count() - cnt) > 0) ? -ETIME : 0; return res; } -@@ -99,22 +116,6 @@ +@@ -99,22 +116,6 @@ static int c0_compare_int_pending(void) return (read_c0_cause() >> cp0_compare_irq) & 0x100; } -- cgit v1.1