Changeset 34154


Ignore:
Timestamp:
2012-11-11T19:41:09+01:00 (5 years ago)
Author:
florian
Message:

[ar7] add support for Linux 3.6

Location:
trunk/target/linux/ar7
Files:
6 added
16 copied

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/ar7/config-3.6

    r34153 r34154  
    55CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y 
    66CONFIG_ARCH_DISCARD_MEMBLOCK=y 
     7CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y 
     8CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y 
    79CONFIG_ARCH_HIBERNATION_POSSIBLE=y 
    810CONFIG_ARCH_REQUIRE_GPIOLIB=y 
    911CONFIG_ARCH_SUSPEND_POSSIBLE=y 
     12CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y 
    1013CONFIG_BCMA_POSSIBLE=y 
    1114CONFIG_BOOT_ELF32=y 
     15CONFIG_BUILDTIME_EXTABLE_SORT=y 
    1216CONFIG_CEVT_R4K=y 
    1317CONFIG_CEVT_R4K_LIB=y 
     
    3438CONFIG_GENERIC_CMOS_UPDATE=y 
    3539CONFIG_GENERIC_GPIO=y 
     40CONFIG_GENERIC_IO=y 
    3641CONFIG_GENERIC_IRQ_SHOW=y 
     42CONFIG_GENERIC_SMP_IDLE_THREAD=y 
    3743CONFIG_GPIOLIB=y 
    3844CONFIG_HARDWARE_WATCHPOINTS=y 
     
    4248CONFIG_HAVE_ARCH_JUMP_LABEL=y 
    4349CONFIG_HAVE_ARCH_KGDB=y 
     50CONFIG_HAVE_CLK=y 
    4451CONFIG_HAVE_C_RECORDMCOUNT=y 
    4552CONFIG_HAVE_DMA_API_DEBUG=y 
     
    7178CONFIG_LEDS_GPIO=y 
    7279CONFIG_LEDS_TRIGGER_HEARTBEAT=y 
     80# CONFIG_MACH_LOONGSON1 is not set 
    7381CONFIG_MDIO_BOARDINFO=y 
    7482CONFIG_MIPS=y 
     
    8391CONFIG_NO_EXCEPT_FILL=y 
    8492CONFIG_PAGEFLAGS_EXTENDED=y 
     93CONFIG_PANIC_ON_OOPS_VALUE=0 
    8594CONFIG_PERF_USE_VMALLOC=y 
    8695CONFIG_PHYLIB=y 
     
    96105CONFIG_SYS_SUPPORTS_ZBOOT=y 
    97106CONFIG_SYS_SUPPORTS_ZBOOT_UART16550=y 
     107# CONFIG_USB_ARCH_HAS_EHCI is not set 
     108# CONFIG_USB_ARCH_HAS_OHCI is not set 
     109# CONFIG_USB_ARCH_HAS_XHCI is not set 
    98110CONFIG_VLYNQ=y 
    99111# CONFIG_VLYNQ_DEBUG is not set 
  • trunk/target/linux/ar7/files-3.6/drivers/mtd/titanpart.c

    r34153 r34154  
    170170        /* Get access to the header, and do some validation checks */ 
    171171        //hdr=(struct nsp_img_hdr_head*)flash_base; 
    172         master->read(master, flash_base, sizeof(struct nsp_img_hdr_head), &len, (uint8_t *)&hdr); 
     172        mtd_read(master, flash_base, sizeof(struct nsp_img_hdr_head), &len, (uint8_t *)&hdr); 
    173173        if(hdr.magic != NSP_IMG_MAGIC_NUMBER) 
    174174                return -1;      /* Not a single image */ 
    175175 
    176         master->read(master, flash_base + hdr.sect_info_offset, sizeof(struct nsp_img_hdr_section_info), &len, (uint8_t *)&sect_info); 
     176        mtd_read(master, flash_base + hdr.sect_info_offset, sizeof(struct nsp_img_hdr_section_info), &len, (uint8_t *)&sect_info); 
    177177 
    178178        /* Look for the root fs, and add it first. This way we KNOW where the rootfs is */ 
    179179        for(i=0; i< sect_info.num_sects && i<MAX_NUM_PARTITIONS; i++){ 
    180                 master->read(master, flash_base + sect_info.sections_offset + (i * sect_info.sect_size) , sizeof(struct nsp_img_hdr_sections), &len, (uint8_t *)&section); 
     180                mtd_read(master, flash_base + sect_info.sections_offset + (i * sect_info.sect_size) , sizeof(struct nsp_img_hdr_sections), &len, (uint8_t *)&section); 
    181181                /* Add only the root partition */ 
    182182                if(section.type != NSP_IMG_SECTION_TYPE_FILESYSTEM_ROOT){ 
     
    192192        for(i=0; i< sect_info.num_sects && i<MAX_NUM_PARTITIONS; i++){ 
    193193 
    194                 master->read(master, flash_base + sect_info.sections_offset + (i * sect_info.sect_size) , sizeof(struct nsp_img_hdr_sections), &len, (uint8_t *)&section); 
     194                mtd_read(master, flash_base + sect_info.sections_offset + (i * sect_info.sect_size) , sizeof(struct nsp_img_hdr_sections), &len, (uint8_t *)&section); 
    195195 
    196196                name=section.name; 
  • trunk/target/linux/ar7/patches-3.6/110-flash.patch

    r34153 r34154  
    11--- a/drivers/mtd/maps/physmap.c 
    22+++ b/drivers/mtd/maps/physmap.c 
    3 @@ -78,7 +78,7 @@ static const char *rom_probe_types[] = { 
     3@@ -94,7 +94,7 @@ static const char *rom_probe_types[] = { 
    44                                        "map_rom", 
    55                                        NULL }; 
  • trunk/target/linux/ar7/patches-3.6/120-gpio_chrdev.patch

    r34153 r34154  
    11--- a/drivers/char/Kconfig 
    22+++ b/drivers/char/Kconfig 
    3 @@ -478,6 +478,15 @@ config MWAVE 
     3@@ -463,6 +463,15 @@ config MWAVE 
    44          To compile this driver as a module, choose M here: the 
    55          module will be called mwave. 
     
    1919--- a/drivers/char/Makefile 
    2020+++ b/drivers/char/Makefile 
    21 @@ -44,6 +44,7 @@ obj-$(CONFIG_HW_RANDOM)               += hw_random/ 
     21@@ -43,6 +43,7 @@ obj-$(CONFIG_HW_RANDOM)               += hw_random/ 
    2222 obj-$(CONFIG_PPDEV)            += ppdev.o 
    2323 obj-$(CONFIG_NWBUTTON)         += nwbutton.o 
  • trunk/target/linux/ar7/patches-3.6/300-add-ac49x-platform.patch

    r34153 r34154  
    3535--- a/arch/mips/Kconfig 
    3636+++ b/arch/mips/Kconfig 
    37 @@ -72,7 +72,7 @@ config AR7 
    38         select VLYNQ 
     37@@ -80,7 +80,7 @@ config AR7 
     38        select HAVE_CLK 
    3939        help 
    4040          Support for the Texas Instruments AR7 System-on-a-Chip 
     
    4444 config ATH79 
    4545        bool "Atheros AR71XX/AR724X/AR913X based boards" 
    46 @@ -814,6 +814,7 @@ config NLM_XLP_BOARD 
     46@@ -838,6 +838,7 @@ config NLM_XLP_BOARD 
    4747 endchoice 
    4848  
  • trunk/target/linux/ar7/patches-3.6/320-ac49x-mtd-partitions.patch

    r34153 r34154  
    11--- a/drivers/mtd/maps/physmap.c 
    22+++ b/drivers/mtd/maps/physmap.c 
    3 @@ -78,7 +78,7 @@ static const char *rom_probe_types[] = { 
     3@@ -94,7 +94,7 @@ static const char *rom_probe_types[] = { 
    44                                        "map_rom", 
    55                                        NULL }; 
  • trunk/target/linux/ar7/patches-3.6/500-serial_kludge.patch

    r34153 r34154  
    22+++ b/drivers/tty/serial/8250/8250.c 
    33@@ -290,6 +290,13 @@ static const struct serial8250_config ua 
    4                 .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10, 
    5                 .flags          = UART_CAP_FIFO | UART_CAP_AFE | UART_CAP_EFR, 
     4                                  UART_FCR_R_TRIG_00 | UART_FCR_T_TRIG_00, 
     5                .flags          = UART_CAP_FIFO, 
    66        }, 
    77+       [PORT_AR7] = { 
     
    1414 }; 
    1515  
    16  #if defined(CONFIG_MIPS_ALCHEMY) 
    17 @@ -2798,7 +2805,11 @@ static void serial8250_console_putchar(s 
     16 /* Uart divisor latch read */ 
     17@@ -2752,7 +2759,11 @@ static void serial8250_console_putchar(s 
    1818        struct uart_8250_port *up = 
    1919                container_of(port, struct uart_8250_port, port); 
     
    2424        wait_for_xmitr(up, UART_LSR_THRE); 
    2525+#endif 
    26         serial_out(up, UART_TX, ch); 
     26        serial_port_out(port, UART_TX, ch); 
    2727 } 
    2828  
  • trunk/target/linux/ar7/patches-3.6/950-cpmac_titan.patch

    r34153 r34154  
    11--- a/drivers/net/ethernet/ti/cpmac.c 
    22+++ b/drivers/net/ethernet/ti/cpmac.c 
    3 @@ -1159,6 +1159,8 @@ static int __devinit cpmac_probe(struct 
     3@@ -1156,6 +1156,8 @@ static int __devinit cpmac_probe(struct 
    44                goto fail; 
    55        } 
     
    1010  
    1111        dev->netdev_ops = &cpmac_netdev_ops; 
    12 @@ -1237,7 +1239,7 @@ int __devinit cpmac_init(void) 
     12@@ -1234,7 +1236,7 @@ int __devinit cpmac_init(void) 
    1313        cpmac_mii->reset = cpmac_mdio_reset; 
    1414        cpmac_mii->irq = mii_irqs; 
     
    1919        if (!cpmac_mii->priv) { 
    2020                printk(KERN_ERR "Can't ioremap mdio registers\n"); 
    21 @@ -1248,10 +1250,16 @@ int __devinit cpmac_init(void) 
     21@@ -1245,10 +1247,16 @@ int __devinit cpmac_init(void) 
    2222 #warning FIXME: unhardcode gpio&reset bits 
    2323        ar7_gpio_disable(26); 
     
    3838  
    3939        for (i = 0; i < 300; i++) { 
    40 @@ -1268,7 +1276,11 @@ int __devinit cpmac_init(void) 
     40@@ -1265,7 +1273,11 @@ int __devinit cpmac_init(void) 
    4141                mask = 0; 
    4242        } 
  • trunk/target/linux/ar7/patches-3.6/972-cpmac_fixup.patch

    r34153 r34154  
    138138  
    139139        dev = alloc_etherdev_mq(sizeof(*priv), CPMAC_QUEUES); 
    140 @@ -1178,6 +1167,13 @@ static int __devinit cpmac_probe(struct 
     140@@ -1175,6 +1164,13 @@ static int __devinit cpmac_probe(struct 
    141141        snprintf(priv->phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT, 
    142142                                                mdio_bus_id, phy_id); 
     
    152152                                                PHY_INTERFACE_MODE_MII); 
    153153  
    154 @@ -1189,13 +1185,6 @@ static int __devinit cpmac_probe(struct 
     154@@ -1186,13 +1182,6 @@ static int __devinit cpmac_probe(struct 
    155155                goto fail; 
    156156        } 
     
    166166                printk(KERN_INFO 
    167167                       "cpmac: device %s (regs: %p, irq: %d, phy: %s, " 
    168 @@ -1228,6 +1217,7 @@ int __devinit cpmac_init(void) 
     168@@ -1225,6 +1214,7 @@ int __devinit cpmac_init(void) 
    169169 { 
    170170        u32 mask; 
     
    174174        cpmac_mii = mdiobus_alloc(); 
    175175        if (cpmac_mii == NULL) 
    176 @@ -1251,31 +1241,51 @@ int __devinit cpmac_init(void) 
     176@@ -1248,31 +1238,51 @@ int __devinit cpmac_init(void) 
    177177        ar7_gpio_disable(26); 
    178178        ar7_gpio_disable(27); 
Note: See TracChangeset for help on using the changeset viewer.