Changeset 31706


Ignore:
Timestamp:
2012-05-13T17:10:40+02:00 (5 years ago)
Author:
hauke
Message:

amazon: update amazon target to kernel 3.3

This is just compile tested, my device is currently not working.

Location:
trunk/target/linux/amazon
Files:
3 added
1 deleted
11 edited
1 copied
4 moved

Legend:

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

    r26576 r31706  
    1111BOARDNAME:=Infineon Amazon 
    1212FEATURES:=squashfs jffs2 broken 
    13 LINUX_VERSION:=2.6.37.6 
     13LINUX_VERSION:=3.3.5 
    1414 
    1515include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/amazon/config-3.3

    r31705 r31706  
    66CONFIG_AMAZON_PCI=y 
    77CONFIG_AMAZON_WDT=y 
     8CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y 
     9CONFIG_ARCH_DISCARD_MEMBLOCK=y 
     10# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set 
    811# CONFIG_ARCH_HAS_ILOG2_U32 is not set 
    912# CONFIG_ARCH_HAS_ILOG2_U64 is not set 
    1013CONFIG_ARCH_HIBERNATION_POSSIBLE=y 
    1114# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set 
    12 CONFIG_ARCH_POPULATES_NODE_MAP=y 
    1315# CONFIG_ARCH_SUPPORTS_MSI is not set 
    14 CONFIG_ARCH_SUPPORTS_OPROFILE=y 
    1516CONFIG_ARCH_SUSPEND_POSSIBLE=y 
    16 # CONFIG_AUTO_IRQ_AFFINITY is not set 
     17CONFIG_BCMA_POSSIBLE=y 
    1718CONFIG_CEVT_R4K=y 
    1819CONFIG_CEVT_R4K_LIB=y 
     
    3435CONFIG_DMA_NONCOHERENT=y 
    3536CONFIG_EARLY_PRINTK=y 
    36 # CONFIG_FSNOTIFY is not set 
    3737CONFIG_GENERIC_ATOMIC64=y 
    3838CONFIG_GENERIC_CLOCKEVENTS=y 
    3939CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 
    4040CONFIG_GENERIC_CMOS_UPDATE=y 
    41 CONFIG_GENERIC_FIND_LAST_BIT=y 
    42 CONFIG_GENERIC_FIND_NEXT_BIT=y 
    43 # CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set 
    44 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 
    45 # CONFIG_GENERIC_PENDING_IRQ is not set 
    46 # CONFIG_HARDIRQS_SW_RESEND is not set 
     41# CONFIG_GENERIC_CPU_DEVICES is not set 
     42CONFIG_GENERIC_IRQ_SHOW=y 
     43CONFIG_GENERIC_PCI_IOMAP=y 
    4744CONFIG_HARDWARE_WATCHPOINTS=y 
    4845CONFIG_HAS_DMA=y 
    4946CONFIG_HAS_IOMEM=y 
    5047CONFIG_HAS_IOPORT=y 
     48CONFIG_HAVE_ARCH_JUMP_LABEL=y 
    5149CONFIG_HAVE_ARCH_KGDB=y 
    5250CONFIG_HAVE_C_RECORDMCOUNT=y 
     
    6159CONFIG_HAVE_GENERIC_HARDIRQS=y 
    6260CONFIG_HAVE_IDE=y 
     61CONFIG_HAVE_IRQ_WORK=y 
     62CONFIG_HAVE_MEMBLOCK=y 
     63CONFIG_HAVE_MEMBLOCK_NODE_MAP=y 
    6364CONFIG_HAVE_OPROFILE=y 
    6465CONFIG_HAVE_PERF_EVENTS=y 
    65 # CONFIG_HAVE_SPARSE_IRQ is not set 
    6666CONFIG_HAVE_STD_PC_SERIAL_PORT=y 
    6767CONFIG_HW_HAS_PCI=y 
     
    6969CONFIG_INITRAMFS_SOURCE="" 
    7070CONFIG_IRQ_CPU=y 
    71 # CONFIG_IRQ_PER_CPU is not set 
     71CONFIG_IRQ_FORCED_THREADING=y 
    7272CONFIG_KALLSYMS=y 
    73 CONFIG_LOONGSON_UART_BASE=y 
    74 CONFIG_MACH_NO_WESTBRIDGE=y 
     73# CONFIG_MINIX_FS_NATIVE_ENDIAN is not set 
    7574CONFIG_MIPS=y 
    7675CONFIG_MIPS_L1_CACHE_SHIFT=5 
    7776# CONFIG_MIPS_MACHINE is not set 
    7877CONFIG_MIPS_MT_DISABLED=y 
     78# CONFIG_MLX4_CORE is not set 
    7979CONFIG_MTD_AMAZON_BUS_WIDTH_16=y 
    8080# CONFIG_MTD_AMAZON_BUS_WIDTH_32 is not set 
     
    9292CONFIG_NEED_DMA_MAP_STATE=y 
    9393CONFIG_NEED_PER_CPU_KM=y 
    94 # CONFIG_NET_PCI is not set 
     94CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y 
    9595CONFIG_PAGEFLAGS_EXTENDED=y 
    9696CONFIG_PCI=y 
     
    108108CONFIG_SYS_SUPPORTS_ARBIT_HZ=y 
    109109CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 
     110CONFIG_USB_ARCH_HAS_XHCI=y 
    110111CONFIG_USB_SUPPORT=y 
     112CONFIG_XZ_DEC=y 
    111113CONFIG_ZONE_DMA_FLAG=0 
  • trunk/target/linux/amazon/files/arch/mips/amazon/interrupt.c

    r19458 r31706  
    3535#include <asm/time.h> 
    3636 
    37 static void amazon_disable_irq(unsigned int irq_nr) 
     37static void amazon_disable_irq(struct irq_data *d) 
    3838{ 
    3939        int i; 
    4040        u32 amazon_ier = AMAZON_ICU_IM0_IER; 
     41        unsigned int irq_nr = d->irq; 
    4142 
    4243        if (irq_nr <= INT_NUM_IM0_IRL11 && irq_nr >= INT_NUM_IM0_IRL0) 
     
    5455} 
    5556 
    56 static void amazon_mask_and_ack_irq(unsigned int irq_nr) 
     57static void amazon_mask_and_ack_irq(struct irq_data *d) 
    5758{ 
    5859        int i; 
    5960        u32 amazon_ier = AMAZON_ICU_IM0_IER; 
    6061        u32 amazon_isr = AMAZON_ICU_IM0_ISR; 
     62        unsigned int irq_nr = d->irq; 
    6163 
    6264        if (irq_nr <= INT_NUM_IM0_IRL11 && irq_nr >= INT_NUM_IM0_IRL0){ 
     
    7880} 
    7981 
    80 static void amazon_enable_irq(unsigned int irq_nr) 
     82static void amazon_enable_irq(struct irq_data *d) 
    8183{ 
    8284        int i; 
    8385        u32 amazon_ier = AMAZON_ICU_IM0_IER; 
     86        unsigned int irq_nr = d->irq; 
    8487 
    8588        if (irq_nr <= INT_NUM_IM0_IRL11 && irq_nr >= INT_NUM_IM0_IRL0) 
     
    97100} 
    98101 
    99 static unsigned int amazon_startup_irq(unsigned int irq) 
     102static unsigned int amazon_startup_irq(struct irq_data *d) 
    100103{ 
    101         amazon_enable_irq(irq); 
     104        amazon_enable_irq(d); 
    102105        return 0; 
    103 } 
    104  
    105 static void amazon_end_irq(unsigned int irq) 
    106 { 
    107         if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) { 
    108                 amazon_enable_irq(irq); 
    109         } 
    110106} 
    111107 
    112108static struct irq_chip amazon_irq_type = { 
    113109        .name = "AMAZON", 
    114         .startup = amazon_startup_irq, 
    115         .enable = amazon_enable_irq, 
    116         .disable = amazon_disable_irq, 
    117         .unmask = amazon_enable_irq, 
    118         .ack = amazon_mask_and_ack_irq, 
    119         .mask = amazon_disable_irq, 
    120         .mask_ack = amazon_mask_and_ack_irq, 
    121         .end = amazon_end_irq 
     110        .irq_startup = amazon_startup_irq, 
     111        .irq_enable = amazon_enable_irq, 
     112        .irq_disable = amazon_disable_irq, 
     113        .irq_unmask = amazon_enable_irq, 
     114        .irq_ack = amazon_mask_and_ack_irq, 
     115        .irq_mask = amazon_disable_irq, 
     116        .irq_mask_ack = amazon_mask_and_ack_irq, 
    122117}; 
    123118 
     
    179174 
    180175        for (i = INT_NUM_IRQ0; i <= INT_NUM_IM4_IRL31; i++) 
    181                 set_irq_chip_and_handler(i, &amazon_irq_type, 
     176                irq_set_chip_and_handler(i, &amazon_irq_type, 
    182177                        handle_level_irq); 
    183178 
  • trunk/target/linux/amazon/files/drivers/mtd/maps/amazon.c

    r18989 r31706  
    119119} 
    120120 
    121 static int __init amazon_mtd_probe(struct platform_device *dev) 
     121static int amazon_mtd_probe(struct platform_device *dev) 
    122122{ 
    123123        unsigned long uimage_size; 
     
    168168        } 
    169169 
    170         add_mtd_partitions(mymtd, parts, 3); 
     170        mtd_device_register(mymtd, parts, 3); 
    171171 
    172172        printk(KERN_INFO "amazon_mtd: added %s flash with %dMB\n", 
  • trunk/target/linux/amazon/files/drivers/net/ethernet/admmod.c

    r31705 r31706  
    12461246int adm_process_mac_table_request (unsigned int cmd, PMACENTRY mMACENTRY) 
    12471247{ 
    1248     unsigned int rtval; 
    12491248    unsigned int val;           //6996i 
    12501249    unsigned int control[6] ;   //6996i 
  • trunk/target/linux/amazon/files/drivers/net/ethernet/amazon_sw.c

    r31705 r31706  
    9999 
    100100/***************************************** Module Parameters *************************************/ 
    101 char mode[] = "bridge"; 
     101static char mode[] = "bridge"; 
    102102module_param_array(mode, charp, NULL, 0); 
    103103 
  • trunk/target/linux/amazon/files/drivers/watchdog/amazon_wdt.c

    r26576 r31706  
    216216}; 
    217217 
    218 static int __init amazon_wdt_probe(struct platform_device *dev) 
     218static int amazon_wdt_probe(struct platform_device *dev) 
    219219{ 
    220220        int result = result = register_chrdev(0, "watchdog", &wdt_fops); 
  • trunk/target/linux/amazon/patches-3.3/000-mips-bad-intctl.patch

    r26576 r31706  
    11--- a/arch/mips/kernel/traps.c 
    22+++ b/arch/mips/kernel/traps.c 
    3 @@ -1578,7 +1578,16 @@ void __cpuinit per_cpu_trap_init(void) 
     3@@ -1593,7 +1593,16 @@ void __cpuinit per_cpu_trap_init(void) 
    44        if (cpu_has_mips_r2) { 
    55                cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP; 
     
    2020--- a/arch/mips/include/asm/irq.h 
    2121+++ b/arch/mips/include/asm/irq.h 
    22 @@ -138,9 +138,11 @@ extern void free_irqno(unsigned int irq) 
     22@@ -139,9 +139,11 @@ extern void free_irqno(unsigned int irq) 
    2323  * IE7.  Since R2 their number has to be read from the c0_intctl register. 
    2424  */ 
  • trunk/target/linux/amazon/patches-3.3/017-wdt-driver.patch

    r26576 r31706  
    11--- a/drivers/watchdog/Makefile 
    22+++ b/drivers/watchdog/Makefile 
    3 @@ -119,6 +119,7 @@ obj-$(CONFIG_AR7_WDT) += ar7_wdt.o 
    4  obj-$(CONFIG_TXX9_WDT) += txx9wdt.o 
     3@@ -132,6 +132,7 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o 
    54 obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o 
    65 octeon-wdt-y := octeon-wdt-main.o octeon-wdt-nmi.o 
     6 obj-$(CONFIG_LANTIQ_WDT) += lantiq_wdt.o 
    77+obj-$(CONFIG_AMAZON_WDT) += amazon_wdt.o 
    88  
  • trunk/target/linux/amazon/patches-3.3/100-board.patch

    r26576 r31706  
    11--- a/arch/mips/Kconfig 
    22+++ b/arch/mips/Kconfig 
    3 @@ -102,6 +102,22 @@ config BCM63XX 
     3@@ -120,6 +120,22 @@ config BCM63XX 
    44        help 
    55         Support for BCM63XX based boards 
     
    2424        bool "Cobalt Server" 
    2525        select CEVT_R4K 
    26 @@ -716,6 +732,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD 
     26@@ -813,6 +829,7 @@ config NLM_XLP_BOARD 
    2727  
    2828 endchoice 
     
    3030+source "arch/mips/amazon/Kconfig" 
    3131 source "arch/mips/alchemy/Kconfig" 
    32  source "arch/mips/bcm63xx/Kconfig" 
    33  source "arch/mips/jazz/Kconfig" 
     32 source "arch/mips/ath79/Kconfig" 
     33 source "arch/mips/bcm47xx/Kconfig" 
    3434--- a/arch/mips/Kbuild.platforms 
    3535+++ b/arch/mips/Kbuild.platforms 
    36 @@ -5,6 +5,7 @@ platforms += ar7 
     36@@ -6,6 +6,7 @@ platforms += ath79 
    3737 platforms += bcm47xx 
    3838 platforms += bcm63xx 
  • trunk/target/linux/amazon/patches-3.3/130-mtd_drivers.patch

    r26576 r31706  
    11--- a/drivers/mtd/maps/Makefile 
    22+++ b/drivers/mtd/maps/Makefile 
    3 @@ -59,3 +59,4 @@ obj-$(CONFIG_MTD_RBTX4939)    += rbtx4939-f 
    4  obj-$(CONFIG_MTD_VMU)          += vmu-flash.o 
     3@@ -57,3 +57,4 @@ obj-$(CONFIG_MTD_VMU)         += vmu-flash.o 
    54 obj-$(CONFIG_MTD_GPIO_ADDR)    += gpio-addr-flash.o 
    6  obj-$(CONFIG_MTD_BCM963XX)     += bcm963xx-flash.o 
     5 obj-$(CONFIG_MTD_LATCH_ADDR)   += latch-addr-flash.o 
     6 obj-$(CONFIG_MTD_LANTIQ)       += lantiq-flash.o 
    77+obj-$(CONFIG_AMAZON_MTD)       += amazon.o 
  • trunk/target/linux/amazon/patches-3.3/140-net_drivers.patch

    r26576 r31706  
    1 --- a/drivers/net/Makefile 
    2 +++ b/drivers/net/Makefile 
    3 @@ -302,3 +302,6 @@ obj-$(CONFIG_CAIF) += caif/ 
    4  obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/ 
    5  obj-$(CONFIG_PCH_GBE) += pch_gbe/ 
    6  obj-$(CONFIG_TILE_NET) += tile/ 
     1--- a/drivers/net/ethernet/Makefile 
     2+++ b/drivers/net/ethernet/Makefile 
     3@@ -74,3 +74,6 @@ obj-$(CONFIG_NET_VENDOR_TUNDRA) += tundr 
     4 obj-$(CONFIG_NET_VENDOR_VIA) += via/ 
     5 obj-$(CONFIG_NET_VENDOR_XILINX) += xilinx/ 
     6 obj-$(CONFIG_NET_VENDOR_XIRCOM) += xircom/ 
    77+ 
    88+obj-$(CONFIG_AMAZON_NET_SW) += amazon_sw.o 
  • trunk/target/linux/amazon/patches-3.3/150-serial_driver.patch

    r18589 r31706  
    1 --- a/drivers/serial/Makefile 
    2 +++ b/drivers/serial/Makefile 
    3 @@ -3,6 +3,7 @@ 
    4  # 
    5   
    6  obj-$(CONFIG_SERIAL_CORE) += serial_core.o 
     1--- a/drivers/tty/serial/Makefile 
     2+++ b/drivers/tty/serial/Makefile 
     3@@ -78,3 +78,4 @@ obj-$(CONFIG_SERIAL_LANTIQ)   += lantiq.o 
     4 obj-$(CONFIG_SERIAL_XILINX_PS_UART) += xilinx_uartps.o 
     5 obj-$(CONFIG_SERIAL_SIRFSOC) += sirfsoc_uart.o 
     6 obj-$(CONFIG_SERIAL_AR933X)   += ar933x_uart.o 
    77+obj-$(CONFIG_AMAZON_ASC_UART) += amazon_asc.o 
    8  obj-$(CONFIG_SERIAL_21285) += 21285.o 
    9   
    10  # These Sparc drivers have to appear before others such as 8250 
  • trunk/target/linux/amazon/patches-3.3/160-cfi-swap.patch

    r26576 r31706  
    11--- a/drivers/mtd/chips/cfi_cmdset_0002.c 
    22+++ b/drivers/mtd/chips/cfi_cmdset_0002.c 
    3 @@ -1166,6 +1166,9 @@ static int __xipram do_write_oneword(str 
     3@@ -1152,6 +1152,9 @@ static int __xipram do_write_oneword(str 
    44        int retry_cnt = 0; 
    55  
     
    1111        mutex_lock(&chip->mutex); 
    1212        ret = get_chip(map, chip, adr, FL_WRITING); 
    13 @@ -1433,7 +1436,11 @@ static int __xipram do_write_buffer(stru 
     13@@ -1420,7 +1423,11 @@ static int __xipram do_write_buffer(stru 
    1414        z = 0; 
    1515        while(z < words * map_bankwidth(map)) { 
     
    2323                z += map_bankwidth(map); 
    2424                buf += map_bankwidth(map); 
    25 @@ -1678,6 +1685,9 @@ static int __xipram do_erase_oneblock(st 
     25@@ -1665,6 +1672,9 @@ static int __xipram do_erase_oneblock(st 
    2626        int ret = 0; 
    2727  
     
    3333        mutex_lock(&chip->mutex); 
    3434        ret = get_chip(map, chip, adr, FL_ERASING); 
    35 @@ -1806,6 +1816,10 @@ static int do_atmel_lock(struct map_info 
     35@@ -1793,6 +1803,10 @@ static int do_atmel_lock(struct map_info 
    3636        struct cfi_private *cfi = map->fldrv_priv; 
    3737        int ret; 
     
    4444        ret = get_chip(map, chip, adr + chip->start, FL_LOCKING); 
    4545        if (ret) 
    46 @@ -1842,6 +1856,10 @@ static int do_atmel_unlock(struct map_in 
     46@@ -1828,6 +1842,10 @@ static int do_atmel_unlock(struct map_in 
    4747        struct cfi_private *cfi = map->fldrv_priv; 
    4848        int ret; 
Note: See TracChangeset for help on using the changeset viewer.