Changeset 34129


Ignore:
Timestamp:
2012-11-09T20:26:30+01:00 (5 years ago)
Author:
blogic
Message:

[lantiq] add mtd split and atm patch

Location:
trunk/target/linux/lantiq
Files:
2 edited
2 copied

Legend:

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

    r34061 r34129  
    7373# CONFIG_HZ_100 is not set 
    7474CONFIG_HZ_250=y 
    75 CONFIG_IMAGE_CMDLINE_HACK=y 
    7675CONFIG_INITRAMFS_SOURCE="" 
    7776CONFIG_IRQ_CPU=y 
  • trunk/target/linux/lantiq/patches-3.6/0300-owrt-mtd-split.patch

    r34127 r34129  
    1313diff --git a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h 
    1414index 1ec8f2a..1ff93cc 100644 
    15 --- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h 
    16 +++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h 
    17 @@ -166,6 +166,7 @@ extern unsigned char ltq_boot_select(void); 
    18   
    19  extern __iomem void *ltq_ebu_membase; 
    20  extern __iomem void *ltq_cgu_membase; 
    21 +extern unsigned long ltq_brn_boot; 
    22   
    23  static inline int ltq_is_ase(void) 
    24  { 
    25 diff --git a/arch/mips/lantiq/setup.c b/arch/mips/lantiq/setup.c 
    26 index 1ff6c9d..708e969 100644 
    27 --- a/arch/mips/lantiq/setup.c 
    28 +++ b/arch/mips/lantiq/setup.c 
    29 @@ -18,6 +18,9 @@ 
    30  #include "devices.h" 
    31  #include "prom.h" 
    32   
    33 +/* set to 1 if the bootloader is BRN-BOOT instead of u-boot */ 
    34 +unsigned long ltq_brn_boot = 0; 
    35 + 
    36  void __init plat_mem_setup(void) 
    37  { 
    38         /* assume 16M as default incase uboot fails to pass proper ramsize */ 
    39 @@ -38,6 +41,10 @@ void __init plat_mem_setup(void) 
    40                         if (strict_strtoul(e, 0, &memsize)) 
    41                                 pr_warn("bad memsize specified\n"); 
    42                 } 
    43 +               if (!strncmp(e, "BRN-BOOT", 8)){ 
    44 +                       pr_info("Found BRN-BOOT instead of u-boot\n"); 
    45 +                       ltq_brn_boot = 1; 
    46 +               } 
    47                 envp++; 
    48         } 
    49         memsize *= 1024 * 1024; 
    5015diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig 
    5116index 982a98b..e2f3f3e 100644 
     
    8146+       int ret; 
    8247+ 
    83 +       ret = mtd->read(mtd, offset, 4, &len, (void *)&magic); 
     48+       ret = mtd_read(mtd, offset, 4, &len, (void *)&magic); 
    8449+       if (ret || len != sizeof(magic)) 
    8550+               return 0; 
     
    8853+               return 0; 
    8954+ 
    90 +       ret = mtd->read(mtd, offset + 12, 4, &len, (void *)&temp); 
     55+       ret = mtd_read(mtd, offset + 12, 4, &len, (void *)&temp); 
    9156+       if (ret || len != sizeof(temp)) 
    9257+               return 0; 
     
    10469+       int ret; 
    10570+ 
    106 +       ret = mtd->read(mtd, offset, 4, &len, (void *)&magic); 
     71+       ret = mtd_read(mtd, offset, 4, &len, (void *)&magic); 
    10772+       if (ret || len != sizeof(magic)) 
    10873+               return 0; 
     
    11176+               return 0; 
    11277+ 
    113 +       ret = mtd->read(mtd, offset + 4, 4, &len, (void *)&temp); 
     78+       ret = mtd_read(mtd, offset + 4, 4, &len, (void *)&temp); 
    11479+       if (ret || len != sizeof(temp)) 
    11580+               return 0; 
     
    12994+       int ret; 
    13095+ 
    131 +       ret = mtd->read(mtd, offset, 4, &len, (void *)&temp); 
     96+       ret = mtd_read(mtd, offset, 4, &len, (void *)&temp); 
    13297+       if (ret || len != sizeof(temp)) 
    13398+               return 0; 
     
    143108+       int ret; 
    144109+ 
    145 +       ret = mtd->read(mtd, offset, 4, &len, (void *)&temp); 
     110+       ret = mtd_read(mtd, offset, 4, &len, (void *)&temp); 
    146111+       if (ret || len != sizeof(temp)) 
    147112+               return 0; 
     
    163128+               long size_min = ptr - 0x400 - 12 - offset; 
    164129+               long size_max = ptr + 12 - offset; 
    165 +               ret = mtd->read(mtd, ptr, 16, &len, (void *)buf); 
     130+               ret = mtd_read(mtd, ptr, 16, &len, (void *)buf); 
    166131+               if (ret || len != 16) 
    167132+                       return 0; 
  • trunk/target/linux/lantiq/patches-3.6/0301-owrt-atm.patch

    r34127 r34129  
    1111 4 files changed, 11 insertions(+), 1 deletions(-) 
    1212 
    13 diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c 
    14 index 63dbb83..1e89104 100644 
    15 --- a/arch/mips/lantiq/irq.c 
    16 +++ b/arch/mips/lantiq/irq.c 
    17 @@ -10,6 +10,7 @@ 
    18  #include <linux/interrupt.h> 
    19  #include <linux/ioport.h> 
    20  #include <linux/sched.h> 
     13Index: linux-3.6.6/arch/mips/lantiq/irq.c 
     14=================================================================== 
     15--- linux-3.6.6.orig/arch/mips/lantiq/irq.c     2012-11-08 23:08:47.000000000 +0100 
     16+++ linux-3.6.6/arch/mips/lantiq/irq.c  2012-11-08 23:10:32.023843184 +0100 
     17@@ -14,6 +14,7 @@ 
     18 #include <linux/of_platform.h> 
     19 #include <linux/of_address.h> 
     20 #include <linux/of_irq.h> 
    2121+#include <linux/module.h> 
    2222  
    2323 #include <asm/bootinfo.h> 
    2424 #include <asm/irq_cpu.h> 
    25 @@ -171,6 +172,7 @@ void ltq_disable_irq(struct irq_data *d) 
    26         ltq_icu_w32(ltq_icu_r32(LTQ_ICU_IM0_IER, im_nr) & ~(1 << irq_nr), 
    27                 LTQ_ICU_IM0_IER, im_nr); 
     25@@ -107,6 +108,7 @@ 
     26        ltq_icu_w32(im, ltq_icu_r32(im, ier) & ~BIT(offset), ier); 
     27        ltq_icu_w32(im, BIT(offset), isr); 
    2828 } 
    2929+EXPORT_SYMBOL(ltq_mask_and_ack_irq); 
    3030  
    31  void ltq_mask_and_ack_irq(struct irq_data *d) 
     31 static void ltq_ack_irq(struct irq_data *d) 
    3232 { 
    33 diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c 
    34 index ef83ef1..c156456 100644 
    35 --- a/arch/mips/mm/cache.c 
    36 +++ b/arch/mips/mm/cache.c 
    37 @@ -58,6 +58,8 @@ void (*_dma_cache_wback)(unsigned long start, unsigned long size); 
     33Index: linux-3.6.6/arch/mips/mm/cache.c 
     34=================================================================== 
     35--- linux-3.6.6.orig/arch/mips/mm/cache.c       2012-11-08 23:08:45.000000000 +0100 
     36+++ linux-3.6.6/arch/mips/mm/cache.c    2012-11-08 23:09:41.155841939 +0100 
     37@@ -58,6 +58,8 @@ 
    3838 void (*_dma_cache_inv)(unsigned long start, unsigned long size); 
    3939  
     
    4444 #endif /* CONFIG_DMA_NONCOHERENT */ 
    4545  
    46 diff --git a/net/atm/common.c b/net/atm/common.c 
    47 index b4b44db..c30b397 100644 
    48 --- a/net/atm/common.c 
    49 +++ b/net/atm/common.c 
    50 @@ -62,11 +62,17 @@ static void vcc_remove_socket(struct sock *sk) 
     46Index: linux-3.6.6/net/atm/common.c 
     47=================================================================== 
     48--- linux-3.6.6.orig/net/atm/common.c   2012-11-05 09:57:06.000000000 +0100 
     49+++ linux-3.6.6/net/atm/common.c        2012-11-08 23:09:41.155841939 +0100 
     50@@ -62,11 +62,17 @@ 
    5151        write_unlock_irq(&vcc_sklist_lock); 
    5252 } 
     
    6666                pr_debug("Sorry: wmem_alloc = %d, size = %d, sndbuf = %d\n", 
    6767                         sk_wmem_alloc_get(sk), size, sk->sk_sndbuf); 
    68 diff --git a/net/atm/proc.c b/net/atm/proc.c 
    69 index 0d020de..9fdb539 100644 
    70 --- a/net/atm/proc.c 
    71 +++ b/net/atm/proc.c 
    72 @@ -154,7 +154,7 @@ static void *vcc_seq_next(struct seq_file *seq, void *v, loff_t *pos) 
     68Index: linux-3.6.6/net/atm/proc.c 
     69=================================================================== 
     70--- linux-3.6.6.orig/net/atm/proc.c     2012-11-05 09:57:06.000000000 +0100 
     71+++ linux-3.6.6/net/atm/proc.c  2012-11-08 23:09:41.159841940 +0100 
     72@@ -154,7 +154,7 @@ 
    7373 static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc) 
    7474 { 
     
    7979                "---",  "1",    "2",    "3/4",  /*  0- 3 */ 
    8080                "???",  "5",    "???",  "???",  /*  4- 7 */ 
    81 --  
    82 1.7.9.1 
    83  
  • trunk/target/linux/lantiq/xway/config-default

    r34062 r34129  
    1212# CONFIG_MTD_PHYSMAP_OF is not set 
    1313# CONFIG_MTD_SM_COMMON is not set 
     14CONFIG_MTD_UIMAGE_SPLIT=y 
    1415# CONFIG_PROC_DEVICETREE is not set 
    1516CONFIG_RTL8306_PHY=y 
Note: See TracChangeset for help on using the changeset viewer.