Changeset 36128


Ignore:
Timestamp:
2013-03-25T15:18:32+01:00 (5 years ago)
Author:
kaloz
Message:

[gemini]: upgrade to 3.9-rc4, disable unsupported boards

Location:
trunk/target/linux/gemini
Files:
14 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/gemini/Makefile

    r36039 r36128  
    11# 
    2 # Copyright (C) 2009-2011 OpenWrt.org 
     2# Copyright (C) 2009-2013 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010BOARD:=gemini 
    1111BOARDNAME:=Cortina Systems CS351x 
    12 FEATURES:=squashfs broken 
     12FEATURES:=squashfs pci 
    1313CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 -fno-caller-saves 
    1414MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> 
    1515 
    16 LINUX_VERSION:=3.8.3 
     16LINUX_VERSION:=3.9-rc4 
    1717 
    1818include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/gemini/config-default

    r36111 r36128  
    118118CONFIG_LEGACY_PTYS=y 
    119119CONFIG_LEGACY_PTY_COUNT=256 
    120 CONFIG_MACH_NAS4220B=y 
    121 CONFIG_MACH_RUT100=y 
     120# CONFIG_MACH_NAS4220B is not set 
     121# CONFIG_MACH_RUT100 is not set 
    122122CONFIG_MACH_WBD111=y 
    123123CONFIG_MACH_WBD222=y 
     
    128128CONFIG_MODULES_USE_ELF_REL=y 
    129129CONFIG_MTD_PHYSMAP=y 
    130 CONFIG_MTD_REDBOOT_PARTS=y 
     130# CONFIG_MTD_REDBOOT_PARTS is not set 
    131131CONFIG_NEED_DMA_MAP_STATE=y 
    132132CONFIG_NEED_PER_CPU_KM=y 
  • trunk/target/linux/gemini/patches/000-ARM-gemini-get-platform-to-build-again.patch

    r35993 r36128  
    4242--- a/arch/arm/Kconfig 
    4343+++ b/arch/arm/Kconfig 
    44 @@ -386,6 +386,7 @@ config ARCH_GEMINI 
     44@@ -410,6 +410,7 @@ config ARCH_GEMINI 
    4545        bool "Cortina Systems Gemini" 
    4646        select ARCH_REQUIRE_GPIOLIB 
     
    6363--- a/arch/arm/mach-gemini/board-nas4220b.c 
    6464+++ b/arch/arm/mach-gemini/board-nas4220b.c 
    65 @@ -107,4 +107,5 @@ MACHINE_START(NAS4220B, "Raidsonic NAS I 
     65@@ -103,4 +103,5 @@ MACHINE_START(NAS4220B, "Raidsonic NAS I 
    6666        .init_irq       = gemini_init_irq, 
    67         .timer          = &ib4220b_timer, 
     67        .init_time      = gemini_timer_init, 
    6868        .init_machine   = ib4220b_init, 
    6969+       .restart        = gemini_restart, 
     
    7979 #include <asm/mach-types.h> 
    8080 #include <asm/mach/arch.h> 
    81 @@ -91,4 +92,5 @@ MACHINE_START(RUT100, "Teltonika RUT100" 
     81@@ -87,4 +88,5 @@ MACHINE_START(RUT100, "Teltonika RUT100" 
    8282        .init_irq       = gemini_init_irq, 
    83         .timer          = &rut1xx_timer, 
     83        .init_time      = gemini_timer_init, 
    8484        .init_machine   = rut1xx_init, 
    8585+       .restart        = gemini_restart, 
     
    8787--- a/arch/arm/mach-gemini/board-wbd111.c 
    8888+++ b/arch/arm/mach-gemini/board-wbd111.c 
    89 @@ -134,4 +134,5 @@ MACHINE_START(WBD111, "Wiliboard WBD-111 
     89@@ -130,4 +130,5 @@ MACHINE_START(WBD111, "Wiliboard WBD-111 
    9090        .init_irq       = gemini_init_irq, 
    91         .timer          = &wbd111_timer, 
     91        .init_time      = gemini_timer_init, 
    9292        .init_machine   = wbd111_init, 
    9393+       .restart        = gemini_restart, 
     
    9595--- a/arch/arm/mach-gemini/board-wbd222.c 
    9696+++ b/arch/arm/mach-gemini/board-wbd222.c 
    97 @@ -134,4 +134,5 @@ MACHINE_START(WBD222, "Wiliboard WBD-222 
     97@@ -130,4 +130,5 @@ MACHINE_START(WBD222, "Wiliboard WBD-222 
    9898        .init_irq       = gemini_init_irq, 
    99         .timer          = &wbd222_timer, 
     99        .init_time      = gemini_timer_init, 
    100100        .init_machine   = wbd222_init, 
    101101+       .restart        = gemini_restart, 
  • trunk/target/linux/gemini/patches/110-watchdog-add-gemini_wdt-driver.patch

    r35993 r36128  
    382382--- a/drivers/watchdog/Kconfig 
    383383+++ b/drivers/watchdog/Kconfig 
    384 @@ -152,6 +152,16 @@ config 977_WATCHDOG 
     384@@ -154,6 +154,16 @@ config 977_WATCHDOG 
    385385  
    386386          Not sure? It's safe to say N. 
  • trunk/target/linux/gemini/patches/112-arm-gemini-register-watchdog-devices.patch

    r35993 r36128  
    11--- a/arch/arm/mach-gemini/board-nas4220b.c 
    22+++ b/arch/arm/mach-gemini/board-nas4220b.c 
    3 @@ -99,6 +99,7 @@ static void __init ib4220b_init(void) 
     3@@ -95,6 +95,7 @@ static void __init ib4220b_init(void) 
    44        platform_device_register(&ib4220b_led_device); 
    55        platform_device_register(&ib4220b_key_device); 
     
    1111--- a/arch/arm/mach-gemini/board-wbd111.c 
    1212+++ b/arch/arm/mach-gemini/board-wbd111.c 
    13 @@ -126,6 +126,7 @@ static void __init wbd111_init(void) 
     13@@ -122,6 +122,7 @@ static void __init wbd111_init(void) 
    1414        platform_device_register(&wbd111_leds_device); 
    1515        platform_device_register(&wbd111_keys_device); 
     
    2121--- a/arch/arm/mach-gemini/board-wbd222.c 
    2222+++ b/arch/arm/mach-gemini/board-wbd222.c 
    23 @@ -126,6 +126,7 @@ static void __init wbd222_init(void) 
     23@@ -122,6 +122,7 @@ static void __init wbd222_init(void) 
    2424        platform_device_register(&wbd222_leds_device); 
    2525        platform_device_register(&wbd222_keys_device); 
     
    3131--- a/arch/arm/mach-gemini/board-rut1xx.c 
    3232+++ b/arch/arm/mach-gemini/board-rut1xx.c 
    33 @@ -84,6 +84,7 @@ static void __init rut1xx_init(void) 
     33@@ -80,6 +80,7 @@ static void __init rut1xx_init(void) 
    3434        platform_device_register(&rut1xx_leds); 
    3535        platform_device_register(&rut1xx_keys_device); 
  • trunk/target/linux/gemini/patches/120-net-add-gemini-gmac-driver.patch

    r35993 r36128  
    12771277+               return -1; 
    12781278+ 
    1279 +       gmac->phydev = phy_connect(dev, pdata->bus_id[num], &gmac_get_phy_status, 0, 
     1279+       gmac->phydev = phy_connect(dev, pdata->bus_id[num], &gmac_get_phy_status, 
    12801280+                                pdata->interface[num]); 
    12811281+       if (IS_ERR(gmac->phydev)) 
  • trunk/target/linux/gemini/patches/122-arm-gemini-wbd111-register-ethernet.patch

    r35993 r36128  
    3131        { 
    3232                .code           = KEY_SETUP, 
    33 @@ -127,6 +147,8 @@ static void __init wbd111_init(void) 
     33@@ -123,6 +143,8 @@ static void __init wbd111_init(void) 
    3434        platform_device_register(&wbd111_keys_device); 
    3535        platform_register_rtc(); 
  • trunk/target/linux/gemini/patches/123-arm-gemini-wbd222-register-eth.patch

    r35993 r36128  
    3333        { 
    3434                .code           = KEY_SETUP, 
    35 @@ -127,6 +149,8 @@ static void __init wbd222_init(void) 
     35@@ -123,6 +145,8 @@ static void __init wbd222_init(void) 
    3636        platform_device_register(&wbd222_keys_device); 
    3737        platform_register_rtc(); 
  • trunk/target/linux/gemini/patches/124-arm-gemini-rut100-register-ethernet.patch

    r35993 r36128  
    3737        { 
    3838                .code           = KEY_SETUP, 
    39 @@ -85,6 +107,8 @@ static void __init rut1xx_init(void) 
     39@@ -81,6 +103,8 @@ static void __init rut1xx_init(void) 
    4040        platform_device_register(&rut1xx_keys_device); 
    4141        platform_register_rtc(); 
  • trunk/target/linux/gemini/patches/130-usb-ehci-gemini-fot2gxx-support.patch

    r35993 r36128  
    515515        if (ehci->debug) 
    516516                dbgp_external_startup(ehci_to_hcd(ehci)); 
    517 @@ -340,11 +346,14 @@ static void ehci_silence_controller(stru 
     517@@ -341,11 +347,14 @@ static void ehci_silence_controller(stru 
    518518        ehci->rh_state = EHCI_RH_HALTED; 
    519519        ehci_turn_off_all_ports(ehci); 
     
    530530 } 
    531531  
    532 @@ -599,7 +608,9 @@ static int ehci_run (struct usb_hcd *hcd 
     532@@ -600,7 +609,9 @@ static int ehci_run (struct usb_hcd *hcd 
    533533        // Philips, Intel, and maybe others need CMD_RUN before the 
    534534        // root hub will detect new devices (why?); NEC doesn't 
     
    540540        dbg_cmd (ehci, "init", ehci->command); 
    541541  
    542 @@ -619,9 +630,11 @@ static int ehci_run (struct usb_hcd *hcd 
     542@@ -620,9 +631,11 @@ static int ehci_run (struct usb_hcd *hcd 
    543543         */ 
    544544        down_write(&ehci_cf_port_reset_rwsem); 
     
    552552        ehci->last_periodic_enable = ktime_get_real(); 
    553553  
    554 @@ -1242,6 +1255,11 @@ MODULE_DESCRIPTION(DRIVER_DESC); 
     554@@ -1241,6 +1254,11 @@ MODULE_DESCRIPTION(DRIVER_DESC); 
    555555 MODULE_AUTHOR (DRIVER_AUTHOR); 
    556556 MODULE_LICENSE ("GPL"); 
  • trunk/target/linux/gemini/patches/132-arm-gemini-wbd111-register-usb.patch

    r35993 r36128  
    11--- a/arch/arm/mach-gemini/board-wbd111.c 
    22+++ b/arch/arm/mach-gemini/board-wbd111.c 
    3 @@ -149,6 +149,7 @@ static void __init wbd111_init(void) 
     3@@ -145,6 +145,7 @@ static void __init wbd111_init(void) 
    44        platform_register_watchdog(); 
    55        platform_device_register(&wbd111_phy_device); 
  • trunk/target/linux/gemini/patches/133-arm-gemini-wbd222-register-usb.patch

    r35993 r36128  
    11--- a/arch/arm/mach-gemini/board-wbd222.c 
    22+++ b/arch/arm/mach-gemini/board-wbd222.c 
    3 @@ -151,6 +151,7 @@ static void __init wbd222_init(void) 
     3@@ -147,6 +147,7 @@ static void __init wbd222_init(void) 
    44        platform_register_watchdog(); 
    55        platform_device_register(&wbd222_phy_device); 
  • trunk/target/linux/gemini/patches/134-arm-gemini-rut100-register-usb.patch

    r35993 r36128  
    11--- a/arch/arm/mach-gemini/board-rut1xx.c 
    22+++ b/arch/arm/mach-gemini/board-rut1xx.c 
    3 @@ -109,6 +109,7 @@ static void __init rut1xx_init(void) 
     3@@ -105,6 +105,7 @@ static void __init rut1xx_init(void) 
    44        platform_register_watchdog(); 
    55        platform_device_register(&rut1xx_phy_device); 
  • trunk/target/linux/gemini/patches/135-arm-gemini-nas4220-register-usb.patch

    r35993 r36128  
    11--- a/arch/arm/mach-gemini/board-nas4220b.c 
    22+++ b/arch/arm/mach-gemini/board-nas4220b.c 
    3 @@ -100,6 +100,8 @@ static void __init ib4220b_init(void) 
     3@@ -96,6 +96,8 @@ static void __init ib4220b_init(void) 
    44        platform_device_register(&ib4220b_key_device); 
    55        platform_register_rtc(); 
  • trunk/target/linux/gemini/patches/140-arm-gemini-add-pci-support.patch

    r35993 r36128  
    11--- a/arch/arm/Kconfig 
    22+++ b/arch/arm/Kconfig 
    3 @@ -388,6 +388,7 @@ config ARCH_GEMINI 
     3@@ -412,6 +412,7 @@ config ARCH_GEMINI 
    44        select ARCH_USES_GETTIMEOFFSET 
    55        select NEED_MACH_GPIO_H 
Note: See TracChangeset for help on using the changeset viewer.