[brcm63xx] Fix nxp_74hc164 driver compile error (builbot)

[openwrt.git] / target / linux / ifxmips / patches-2.6.30 / 140-mtd.patch

diff --git a/target/linux/ifxmips/patches-2.6.30/140-mtd.patch b/target/linux/ifxmips/patches-2.6.30/140-mtd.patch
index 797a11c..184c78c 100644 (file)
--- a/target/linux/ifxmips/patches-2.6.30/140-mtd.patch
+++ b/target/linux/ifxmips/patches-2.6.30/140-mtd.patch
@@ -1,17 +1,17 @@
-Index: linux-2.6.30.8/drivers/mtd/maps/Makefile
+Index: linux-2.6.30.10/drivers/mtd/maps/Makefile

 ===================================================================
 ===================================================================

---- linux-2.6.30.8.orig/drivers/mtd/maps/Makefile      2009-09-24 17:28:02.000000000 +0200
-+++ linux-2.6.30.8/drivers/mtd/maps/Makefile   2009-10-19 21:31:32.000000000 +0200
+--- linux-2.6.30.10.orig/drivers/mtd/maps/Makefile     2009-12-04 07:00:07.000000000 +0100
++++ linux-2.6.30.10/drivers/mtd/maps/Makefile  2010-03-24 15:32:04.000000000 +0100

 @@ -62,3 +62,4 @@
  obj-$(CONFIG_MTD_BFIN_ASYNC)  += bfin-async-flash.o
  obj-$(CONFIG_MTD_RBTX4939)    += rbtx4939-flash.o
  obj-$(CONFIG_MTD_VMU)         += vmu-flash.o
 +obj-$(CONFIG_MTD_IFXMIPS)  += ifxmips.o
 @@ -62,3 +62,4 @@
  obj-$(CONFIG_MTD_BFIN_ASYNC)  += bfin-async-flash.o
  obj-$(CONFIG_MTD_RBTX4939)    += rbtx4939-flash.o
  obj-$(CONFIG_MTD_VMU)         += vmu-flash.o
 +obj-$(CONFIG_MTD_IFXMIPS)  += ifxmips.o

-Index: linux-2.6.30.8/drivers/mtd/maps/ifxmips.c
+Index: linux-2.6.30.10/drivers/mtd/maps/ifxmips.c

 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000

-+++ linux-2.6.30.8/drivers/mtd/maps/ifxmips.c  2009-10-19 21:40:44.000000000 +0200
-@@ -0,0 +1,277 @@
++++ linux-2.6.30.10/drivers/mtd/maps/ifxmips.c 2010-03-24 16:46:26.000000000 +0100
+@@ -0,0 +1,282 @@

 +/*
 + * This program is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
 +/*
 + * This program is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by


@@ -116,11 +116,11 @@ Index: linux-2.6.30.8/drivers/mtd/maps/ifxmips.c
 +      {
 +              .name = "uboot_env",
 +              .offset = 0x00020000,
 +      {
 +              .name = "uboot_env",
 +              .offset = 0x00020000,

-+              .size = 0x00010000,
++              .size = 0x0,

 +      },
 +      {
 +              .name = "kernel",
 +      },
 +      {
 +              .name = "kernel",

-+              .offset = 0x00030000,
++              .offset = 0x0,

 +              .size = 0x0,
 +      },
 +      {
 +              .size = 0x0,
 +      },
 +      {


@@ -222,6 +222,10 @@ Index: linux-2.6.30.8/drivers/mtd/maps/ifxmips.c
 +                              rootfs_part = i;
 +              }
 +      } else {
 +                              rootfs_part = i;
 +              }
 +      } else {

++              /* if the flash is 64k sectors, the kernel will reside at 0xb0030000
++                 if the flash is 128k sectors, the kernel will reside at 0xb0040000 */
++              ifxmips_partitions[1].size = ifxmips_mtd->erasesize;
++              ifxmips_partitions[2].offset = ifxmips_partitions[1].offset + ifxmips_mtd->erasesize;

 +              parts = &ifxmips_partitions[0];
 +      }
 +
 +              parts = &ifxmips_partitions[0];
 +      }
 +


@@ -232,8 +236,8 @@ Index: linux-2.6.30.8/drivers/mtd/maps/ifxmips.c
 +              if (detect_squashfs_partition(parts[kernel_part].offset + uimage_size)) {
 +                      printk(KERN_INFO "ifxmips_mtd: found a squashfs following the uImage\n");
 +              } else {
 +              if (detect_squashfs_partition(parts[kernel_part].offset + uimage_size)) {
 +                      printk(KERN_INFO "ifxmips_mtd: found a squashfs following the uImage\n");
 +              } else {

-+                      uimage_size &= ~0xffff;
-+                      uimage_size += 0x10000;
++                      uimage_size &= ~(ifxmips_mtd->erasesize -1);
++                      uimage_size += ifxmips_mtd->erasesize;

 +              }
 +
 +              parts[kernel_part].size = uimage_size;
 +              }
 +
 +              parts[kernel_part].size = uimage_size;


@@ -249,6 +253,7 @@ Index: linux-2.6.30.8/drivers/mtd/maps/ifxmips.c
 +                      parts[3].size -= ifxmips_mtd->erasesize;
 +                      parts[4].offset = ifxmips_mtd->size - ifxmips_mtd->erasesize;
 +                      parts[4].size = ifxmips_mtd->erasesize;
 +                      parts[3].size -= ifxmips_mtd->erasesize;
 +                      parts[4].offset = ifxmips_mtd->size - ifxmips_mtd->erasesize;
 +                      parts[4].size = ifxmips_mtd->erasesize;

++                      ifxmips_meta_partition.size -= ifxmips_mtd->erasesize;

 +              } else {
 +                      num_parts--;
 +              }
 +              } else {
 +                      num_parts--;
 +              }