Changeset 38180


Ignore:
Timestamp:
2013-09-25T18:22:04+02:00 (4 years ago)
Author:
juhosg
Message:

lantiq/3.10: unbreak the mtd-split patch

Compile tested only.

Signed-off-by: Gabor Juhos <juhosg@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/lantiq/patches-3.10/0100-mtd-split.patch

    r38031 r38180  
    1 Index: linux-3.10.12/arch/mips/lantiq/xway/Makefile 
    2 =================================================================== 
    3 --- linux-3.10.12.orig/arch/mips/lantiq/xway/Makefile   2013-09-17 22:32:50.389021711 +0200 
    4 +++ linux-3.10.12/arch/mips/lantiq/xway/Makefile        2013-09-17 23:04:39.829103336 +0200 
     1--- a/arch/mips/lantiq/xway/Makefile 
     2+++ b/arch/mips/lantiq/xway/Makefile 
    53@@ -1,6 +1,6 @@ 
    64 obj-y := prom.o sysctrl.o clk.o reset.o dma.o gptu.o dcdc.o 
     
    119 obj-$(CONFIG_PCI) += ath_eep.o rt_eep.o pci-ath-fixup.o 
    1210  
    13 Index: linux-3.10.12/arch/mips/lantiq/xway/mtd_split.c 
    14 =================================================================== 
    15 --- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    16 +++ linux-3.10.12/arch/mips/lantiq/xway/mtd_split.c     2013-09-17 22:42:28.485046424 +0200 
     11--- /dev/null 
     12+++ b/arch/mips/lantiq/xway/mtd_split.c 
    1713@@ -0,0 +1,151 @@ 
    1814+#include <linux/magic.h> 
     
    167163+       split_squashfs(master, name, offset, size); 
    168164+} 
    169 Index: linux-3.10.12/include/linux/mtd/partitions.h 
    170 =================================================================== 
    171 --- linux-3.10.12.orig/include/linux/mtd/partitions.h   2013-09-17 22:32:46.925021563 +0200 
    172 +++ linux-3.10.12/include/linux/mtd/partitions.h        2013-09-17 22:32:51.049021740 +0200 
    173 @@ -82,9 +82,14 @@ 
     165--- a/include/linux/mtd/partitions.h 
     166+++ b/include/linux/mtd/partitions.h 
     167@@ -89,12 +89,17 @@ extern int deregister_mtd_parser(struct 
    174168 int mtd_is_partition(const struct mtd_info *mtd); 
    175169 int mtd_add_partition(struct mtd_info *master, char *name, 
     
    179173+ 
    180174 int mtd_del_partition(struct mtd_info *master, int partno); 
     175 struct mtd_info *mtdpart_get_master(const struct mtd_info *mtd); 
     176 uint64_t mtdpart_get_offset(const struct mtd_info *mtd); 
    181177 uint64_t mtd_get_device_size(const struct mtd_info *mtd); 
    182178-extern void __weak arch_split_mtd_part(struct mtd_info *master, 
     179-                                      const char *name, int offset, int size); 
    183180+void __weak arch_split_mtd_part(struct mtd_info *master, 
    184                                        const char *name, int offset, int size); 
     181+                                      const char *name, int offset, int size); 
    185182+unsigned long 
    186183+mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len); 
    187184  
    188  #endif 
    189 Index: linux-3.10.12/drivers/mtd/mtdpart.c 
    190 =================================================================== 
    191 --- linux-3.10.12.orig/drivers/mtd/mtdpart.c    2013-09-17 22:32:46.973021565 +0200 
    192 +++ linux-3.10.12/drivers/mtd/mtdpart.c 2013-09-17 22:32:51.049021740 +0200 
    193 @@ -617,7 +617,7 @@ 
     185 int parse_mtd_partitions_by_type(struct mtd_info *master, 
     186                                 enum mtd_parser_type type, 
     187--- a/drivers/mtd/mtdpart.c 
     188+++ b/drivers/mtd/mtdpart.c 
     189@@ -616,7 +616,7 @@ out_register: 
    194190 } 
    195191  
     
    200196                    long long offset, long long length, bool dup_check) 
    201197 { 
    202 @@ -707,7 +707,7 @@ 
     198@@ -737,7 +737,7 @@ run_parsers_by_type(struct mtd_part *sla 
     199        return nr_parts; 
    203200 } 
    204  EXPORT_SYMBOL_GPL(mtd_del_partition); 
    205201  
    206202-static inline unsigned long 
     
    209205 { 
    210206        unsigned long mask = mtd->erasesize - 1; 
    211 @@ -799,7 +799,6 @@ 
     207@@ -806,7 +806,6 @@ static void split_uimage(struct mtd_info 
    212208                return; 
    213209  
Note: See TracChangeset for help on using the changeset viewer.