]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
upgrade to 3.9-rc4, disable unsupported boards
authorImre Kaloz <kaloz@openwrt.org>
Mon, 25 Mar 2013 14:18:32 +0000 (14:18 +0000)
committerImre Kaloz <kaloz@openwrt.org>
Mon, 25 Mar 2013 14:18:32 +0000 (14:18 +0000)
SVN-Revision: 36128

19 files changed:
target/linux/gemini/Makefile
target/linux/gemini/config-default [moved from target/linux/gemini/config-3.8 with 97% similarity]
target/linux/gemini/patches/000-ARM-gemini-get-platform-to-build-again.patch [moved from target/linux/gemini/patches-3.8/000-ARM-gemini-get-platform-to-build-again.patch with 96% similarity]
target/linux/gemini/patches/002-arm-gemini-fix-platform_register_rtc-prototype.patch [moved from target/linux/gemini/patches-3.8/002-arm-gemini-fix-platform_register_rtc-prototype.patch with 100% similarity]
target/linux/gemini/patches/110-watchdog-add-gemini_wdt-driver.patch [moved from target/linux/gemini/patches-3.8/110-watchdog-add-gemini_wdt-driver.patch with 99% similarity]
target/linux/gemini/patches/111-arm-gemini-add-watchdog-device.patch [moved from target/linux/gemini/patches-3.8/111-arm-gemini-add-watchdog-device.patch with 100% similarity]
target/linux/gemini/patches/112-arm-gemini-register-watchdog-devices.patch [moved from target/linux/gemini/patches-3.8/112-arm-gemini-register-watchdog-devices.patch with 83% similarity]
target/linux/gemini/patches/120-net-add-gemini-gmac-driver.patch [moved from target/linux/gemini/patches-3.8/120-net-add-gemini-gmac-driver.patch with 99% similarity]
target/linux/gemini/patches/121-arm-gemini-add-ethernet-device.patch [moved from target/linux/gemini/patches-3.8/121-arm-gemini-add-ethernet-device.patch with 100% similarity]
target/linux/gemini/patches/122-arm-gemini-wbd111-register-ethernet.patch [moved from target/linux/gemini/patches-3.8/122-arm-gemini-wbd111-register-ethernet.patch with 94% similarity]
target/linux/gemini/patches/123-arm-gemini-wbd222-register-eth.patch [moved from target/linux/gemini/patches-3.8/123-arm-gemini-wbd222-register-eth.patch with 94% similarity]
target/linux/gemini/patches/124-arm-gemini-rut100-register-ethernet.patch [moved from target/linux/gemini/patches-3.8/124-arm-gemini-rut100-register-ethernet.patch with 95% similarity]
target/linux/gemini/patches/130-usb-ehci-gemini-fot2gxx-support.patch [moved from target/linux/gemini/patches-3.8/130-usb-ehci-gemini-fot2gxx-support.patch with 98% similarity]
target/linux/gemini/patches/131-arm-gemini-add-usb-platform-device.patch [moved from target/linux/gemini/patches-3.8/131-arm-gemini-add-usb-platform-device.patch with 100% similarity]
target/linux/gemini/patches/132-arm-gemini-wbd111-register-usb.patch [moved from target/linux/gemini/patches-3.8/132-arm-gemini-wbd111-register-usb.patch with 93% similarity]
target/linux/gemini/patches/133-arm-gemini-wbd222-register-usb.patch [moved from target/linux/gemini/patches-3.8/133-arm-gemini-wbd222-register-usb.patch with 83% similarity]
target/linux/gemini/patches/134-arm-gemini-rut100-register-usb.patch [moved from target/linux/gemini/patches-3.8/134-arm-gemini-rut100-register-usb.patch with 83% similarity]
target/linux/gemini/patches/135-arm-gemini-nas4220-register-usb.patch [moved from target/linux/gemini/patches-3.8/135-arm-gemini-nas4220-register-usb.patch with 84% similarity]
target/linux/gemini/patches/140-arm-gemini-add-pci-support.patch [moved from target/linux/gemini/patches-3.8/140-arm-gemini-add-pci-support.patch with 99% similarity]

index 29f3bb1c6aae6f5379afad8e7e39b4e139fda2f0..78eb3f7f6cb5e94200e77b7eb8e73b0a19dddf4c 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009-2011 OpenWrt.org
+# Copyright (C) 2009-2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
 ARCH:=arm
 BOARD:=gemini
 BOARDNAME:=Cortina Systems CS351x
-FEATURES:=squashfs broken
+FEATURES:=squashfs pci
 CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 -fno-caller-saves
 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
 
-LINUX_VERSION:=3.8.3
+LINUX_VERSION:=3.9-rc4
 
 include $(INCLUDE_DIR)/target.mk
 
similarity index 97%
rename from target/linux/gemini/config-3.8
rename to target/linux/gemini/config-default
index c4b3e834bfce1b9cb2e751d85ef2ad6bf981d18e..3f9d8fe8e4e43bd3df5ec2c358710b4a39d82ae4 100644 (file)
@@ -117,8 +117,8 @@ CONFIG_IP_PIMSM_V2=y
 CONFIG_KTIME_SCALAR=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-CONFIG_MACH_NAS4220B=y
-CONFIG_MACH_RUT100=y
+# CONFIG_MACH_NAS4220B is not set
+# CONFIG_MACH_RUT100 is not set
 CONFIG_MACH_WBD111=y
 CONFIG_MACH_WBD222=y
 CONFIG_MDIO_BITBANG=y
@@ -127,7 +127,7 @@ CONFIG_MDIO_GPIO=y
 CONFIG_MIGHT_HAVE_PCI=y
 CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_REDBOOT_PARTS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_KM=y
 CONFIG_NLS=m
similarity index 96%
rename from target/linux/gemini/patches-3.8/000-ARM-gemini-get-platform-to-build-again.patch
rename to target/linux/gemini/patches/000-ARM-gemini-get-platform-to-build-again.patch
index b6635e9b6763e33a70db1a0ecc0e564fcf4e3fdb..25ed5f260943101b3d764a45c14401acb745f063 100644 (file)
@@ -41,7 +41,7 @@ Signed-off-by: Arnd Bergmann <arnd@arndb.de>
 
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -386,6 +386,7 @@ config ARCH_GEMINI
+@@ -410,6 +410,7 @@ config ARCH_GEMINI
        bool "Cortina Systems Gemini"
        select ARCH_REQUIRE_GPIOLIB
        select ARCH_USES_GETTIMEOFFSET
@@ -62,9 +62,9 @@ Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  obj-$(CONFIG_MACH_NAS4220B)   += board-nas4220b.o
 --- a/arch/arm/mach-gemini/board-nas4220b.c
 +++ b/arch/arm/mach-gemini/board-nas4220b.c
-@@ -107,4 +107,5 @@ MACHINE_START(NAS4220B, "Raidsonic NAS I
+@@ -103,4 +103,5 @@ MACHINE_START(NAS4220B, "Raidsonic NAS I
        .init_irq       = gemini_init_irq,
-       .timer          = &ib4220b_timer,
+       .init_time      = gemini_timer_init,
        .init_machine   = ib4220b_init,
 +      .restart        = gemini_restart,
  MACHINE_END
@@ -78,25 +78,25 @@ Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
-@@ -91,4 +92,5 @@ MACHINE_START(RUT100, "Teltonika RUT100"
+@@ -87,4 +88,5 @@ MACHINE_START(RUT100, "Teltonika RUT100"
        .init_irq       = gemini_init_irq,
-       .timer          = &rut1xx_timer,
+       .init_time      = gemini_timer_init,
        .init_machine   = rut1xx_init,
 +      .restart        = gemini_restart,
  MACHINE_END
 --- a/arch/arm/mach-gemini/board-wbd111.c
 +++ b/arch/arm/mach-gemini/board-wbd111.c
-@@ -134,4 +134,5 @@ MACHINE_START(WBD111, "Wiliboard WBD-111
+@@ -130,4 +130,5 @@ MACHINE_START(WBD111, "Wiliboard WBD-111
        .init_irq       = gemini_init_irq,
-       .timer          = &wbd111_timer,
+       .init_time      = gemini_timer_init,
        .init_machine   = wbd111_init,
 +      .restart        = gemini_restart,
  MACHINE_END
 --- a/arch/arm/mach-gemini/board-wbd222.c
 +++ b/arch/arm/mach-gemini/board-wbd222.c
-@@ -134,4 +134,5 @@ MACHINE_START(WBD222, "Wiliboard WBD-222
+@@ -130,4 +130,5 @@ MACHINE_START(WBD222, "Wiliboard WBD-222
        .init_irq       = gemini_init_irq,
-       .timer          = &wbd222_timer,
+       .init_time      = gemini_timer_init,
        .init_machine   = wbd222_init,
 +      .restart        = gemini_restart,
  MACHINE_END
similarity index 99%
rename from target/linux/gemini/patches-3.8/110-watchdog-add-gemini_wdt-driver.patch
rename to target/linux/gemini/patches/110-watchdog-add-gemini_wdt-driver.patch
index a2b6cb705da013463d9d0bc60efa0390ef8ee5c1..31a68964233752077c57700d929adff10597bea0 100644 (file)
 +MODULE_ALIAS("platform:gemini-wdt");
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig
-@@ -152,6 +152,16 @@ config 977_WATCHDOG
+@@ -154,6 +154,16 @@ config 977_WATCHDOG
  
          Not sure? It's safe to say N.
  
similarity index 83%
rename from target/linux/gemini/patches-3.8/112-arm-gemini-register-watchdog-devices.patch
rename to target/linux/gemini/patches/112-arm-gemini-register-watchdog-devices.patch
index c2a83a38ab6162cfd1bbfd159695c50e697cb4fc..74564b199e6dc3bd90c74e2fa91ee20dd8386890 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-gemini/board-nas4220b.c
 +++ b/arch/arm/mach-gemini/board-nas4220b.c
-@@ -99,6 +99,7 @@ static void __init ib4220b_init(void)
+@@ -95,6 +95,7 @@ static void __init ib4220b_init(void)
        platform_device_register(&ib4220b_led_device);
        platform_device_register(&ib4220b_key_device);
        platform_register_rtc();
@@ -10,7 +10,7 @@
  MACHINE_START(NAS4220B, "Raidsonic NAS IB-4220-B")
 --- a/arch/arm/mach-gemini/board-wbd111.c
 +++ b/arch/arm/mach-gemini/board-wbd111.c
-@@ -126,6 +126,7 @@ static void __init wbd111_init(void)
+@@ -122,6 +122,7 @@ static void __init wbd111_init(void)
        platform_device_register(&wbd111_leds_device);
        platform_device_register(&wbd111_keys_device);
        platform_register_rtc();
@@ -20,7 +20,7 @@
  MACHINE_START(WBD111, "Wiliboard WBD-111")
 --- a/arch/arm/mach-gemini/board-wbd222.c
 +++ b/arch/arm/mach-gemini/board-wbd222.c
-@@ -126,6 +126,7 @@ static void __init wbd222_init(void)
+@@ -122,6 +122,7 @@ static void __init wbd222_init(void)
        platform_device_register(&wbd222_leds_device);
        platform_device_register(&wbd222_keys_device);
        platform_register_rtc();
@@ -30,7 +30,7 @@
  MACHINE_START(WBD222, "Wiliboard WBD-222")
 --- a/arch/arm/mach-gemini/board-rut1xx.c
 +++ b/arch/arm/mach-gemini/board-rut1xx.c
-@@ -84,6 +84,7 @@ static void __init rut1xx_init(void)
+@@ -80,6 +80,7 @@ static void __init rut1xx_init(void)
        platform_device_register(&rut1xx_leds);
        platform_device_register(&rut1xx_keys_device);
        platform_register_rtc();
similarity index 99%
rename from target/linux/gemini/patches-3.8/120-net-add-gemini-gmac-driver.patch
rename to target/linux/gemini/patches/120-net-add-gemini-gmac-driver.patch
index b990a58adcb0ae3a1e58d7f4b0719151ec4c3d04..8801894f7ef4292ecc443811d71eb500ba7bba49 100644 (file)
 +      if (register_netdev(dev))
 +              return -1;
 +
-+      gmac->phydev = phy_connect(dev, pdata->bus_id[num], &gmac_get_phy_status, 0,
++      gmac->phydev = phy_connect(dev, pdata->bus_id[num], &gmac_get_phy_status,
 +                               pdata->interface[num]);
 +      if (IS_ERR(gmac->phydev))
 +              return PTR_ERR(gmac->phydev);
similarity index 94%
rename from target/linux/gemini/patches-3.8/122-arm-gemini-wbd111-register-ethernet.patch
rename to target/linux/gemini/patches/122-arm-gemini-wbd111-register-ethernet.patch
index aa54ade7427f8bb0a22f84d7afdef57b68dcb07c..1a02b558dd4272113a71965c960e36d2c475a15b 100644 (file)
@@ -30,7 +30,7 @@
  static struct gpio_keys_button wbd111_keys[] = {
        {
                .code           = KEY_SETUP,
-@@ -127,6 +147,8 @@ static void __init wbd111_init(void)
+@@ -123,6 +143,8 @@ static void __init wbd111_init(void)
        platform_device_register(&wbd111_keys_device);
        platform_register_rtc();
        platform_register_watchdog();
similarity index 94%
rename from target/linux/gemini/patches-3.8/123-arm-gemini-wbd222-register-eth.patch
rename to target/linux/gemini/patches/123-arm-gemini-wbd222-register-eth.patch
index 621a9ab8b44ab433502b5b7e092097517b89fdb9..32852da28394b9eaca486e13d1019323d1b19e10 100644 (file)
@@ -32,7 +32,7 @@
  static struct gpio_keys_button wbd222_keys[] = {
        {
                .code           = KEY_SETUP,
-@@ -127,6 +149,8 @@ static void __init wbd222_init(void)
+@@ -123,6 +145,8 @@ static void __init wbd222_init(void)
        platform_device_register(&wbd222_keys_device);
        platform_register_rtc();
        platform_register_watchdog();
similarity index 95%
rename from target/linux/gemini/patches-3.8/124-arm-gemini-rut100-register-ethernet.patch
rename to target/linux/gemini/patches/124-arm-gemini-rut100-register-ethernet.patch
index 14be011452e276bcbca8998a03f2fbe93845c1df..e7c55d53e1b906f7371a2a97fee03ad1fdd09bd2 100644 (file)
@@ -36,7 +36,7 @@
  static struct gpio_keys_button rut1xx_keys[] = {
        {
                .code           = KEY_SETUP,
-@@ -85,6 +107,8 @@ static void __init rut1xx_init(void)
+@@ -81,6 +103,8 @@ static void __init rut1xx_init(void)
        platform_device_register(&rut1xx_keys_device);
        platform_register_rtc();
        platform_register_watchdog();
similarity index 98%
rename from target/linux/gemini/patches-3.8/130-usb-ehci-gemini-fot2gxx-support.patch
rename to target/linux/gemini/patches/130-usb-ehci-gemini-fot2gxx-support.patch
index 4e7fdcfe050b3f774b9afce9a33931ace7e911f4..ed6c6259ded9d8582a6cc7807d861874f88f098d 100644 (file)
  
        if (ehci->debug)
                dbgp_external_startup(ehci_to_hcd(ehci));
-@@ -340,11 +346,14 @@ static void ehci_silence_controller(stru
+@@ -341,11 +347,14 @@ static void ehci_silence_controller(stru
        ehci->rh_state = EHCI_RH_HALTED;
        ehci_turn_off_all_ports(ehci);
  
        spin_unlock_irq(&ehci->lock);
  }
  
-@@ -599,7 +608,9 @@ static int ehci_run (struct usb_hcd *hcd
+@@ -600,7 +609,9 @@ static int ehci_run (struct usb_hcd *hcd
        // Philips, Intel, and maybe others need CMD_RUN before the
        // root hub will detect new devices (why?); NEC doesn't
        ehci->command &= ~(CMD_LRESET|CMD_IAAD|CMD_PSE|CMD_ASE|CMD_RESET);
        ehci_writel(ehci, ehci->command, &ehci->regs->command);
        dbg_cmd (ehci, "init", ehci->command);
  
-@@ -619,9 +630,11 @@ static int ehci_run (struct usb_hcd *hcd
+@@ -620,9 +631,11 @@ static int ehci_run (struct usb_hcd *hcd
         */
        down_write(&ehci_cf_port_reset_rwsem);
        ehci->rh_state = EHCI_RH_RUNNING;
        up_write(&ehci_cf_port_reset_rwsem);
        ehci->last_periodic_enable = ktime_get_real();
  
-@@ -1242,6 +1255,11 @@ MODULE_DESCRIPTION(DRIVER_DESC);
+@@ -1241,6 +1254,11 @@ MODULE_DESCRIPTION(DRIVER_DESC);
  MODULE_AUTHOR (DRIVER_AUTHOR);
  MODULE_LICENSE ("GPL");
  
similarity index 93%
rename from target/linux/gemini/patches-3.8/132-arm-gemini-wbd111-register-usb.patch
rename to target/linux/gemini/patches/132-arm-gemini-wbd111-register-usb.patch
index faa531538e5f00484216a8b975f2593178ca158b..44e72d17c36ed328c6ef27b81313f3c5024c3624 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-gemini/board-wbd111.c
 +++ b/arch/arm/mach-gemini/board-wbd111.c
-@@ -149,6 +149,7 @@ static void __init wbd111_init(void)
+@@ -145,6 +145,7 @@ static void __init wbd111_init(void)
        platform_register_watchdog();
        platform_device_register(&wbd111_phy_device);
        platform_register_ethernet(&gmac_data);
similarity index 83%
rename from target/linux/gemini/patches-3.8/133-arm-gemini-wbd222-register-usb.patch
rename to target/linux/gemini/patches/133-arm-gemini-wbd222-register-usb.patch
index a4d332bdd4b463226ee444e400f74a3cf9af70b1..2adc410926f5d00c4131729c23fe6ecf5d6422d0 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-gemini/board-wbd222.c
 +++ b/arch/arm/mach-gemini/board-wbd222.c
-@@ -151,6 +151,7 @@ static void __init wbd222_init(void)
+@@ -147,6 +147,7 @@ static void __init wbd222_init(void)
        platform_register_watchdog();
        platform_device_register(&wbd222_phy_device);
        platform_register_ethernet(&gmac_data);
similarity index 83%
rename from target/linux/gemini/patches-3.8/134-arm-gemini-rut100-register-usb.patch
rename to target/linux/gemini/patches/134-arm-gemini-rut100-register-usb.patch
index 95c6bade06c552fc866ad0d6f6f0ba437b93f43f..c3755ee7d4c8f87e7a6f2455cd25fcb828812d66 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-gemini/board-rut1xx.c
 +++ b/arch/arm/mach-gemini/board-rut1xx.c
-@@ -109,6 +109,7 @@ static void __init rut1xx_init(void)
+@@ -105,6 +105,7 @@ static void __init rut1xx_init(void)
        platform_register_watchdog();
        platform_device_register(&rut1xx_phy_device);
        platform_register_ethernet(&gmac_data);
similarity index 84%
rename from target/linux/gemini/patches-3.8/135-arm-gemini-nas4220-register-usb.patch
rename to target/linux/gemini/patches/135-arm-gemini-nas4220-register-usb.patch
index 31d776d0a20fe0eb6ac1a23eba029f08fbcb52ab..e08c889d4b5812363f054b7c13c7c1709eb68ef9 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-gemini/board-nas4220b.c
 +++ b/arch/arm/mach-gemini/board-nas4220b.c
-@@ -100,6 +100,8 @@ static void __init ib4220b_init(void)
+@@ -96,6 +96,8 @@ static void __init ib4220b_init(void)
        platform_device_register(&ib4220b_key_device);
        platform_register_rtc();
        platform_register_watchdog();
similarity index 99%
rename from target/linux/gemini/patches-3.8/140-arm-gemini-add-pci-support.patch
rename to target/linux/gemini/patches/140-arm-gemini-add-pci-support.patch
index 82df3dfa156c289eebb031fdc6089e348668a767..37ffdadba38af18f7bea1dbb452643d310b206a7 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -388,6 +388,7 @@ config ARCH_GEMINI
+@@ -412,6 +412,7 @@ config ARCH_GEMINI
        select ARCH_USES_GETTIMEOFFSET
        select NEED_MACH_GPIO_H
        select CPU_FA526