Fix remaining bug of the off-by-one error ;)

[openwrt.git] / target / linux / adm5120 / patches-2.6.27 / 101-cfi_fixup_macronix_bootloc.patch

diff --git a/target/linux/adm5120/patches-2.6.27/101-cfi_fixup_macronix_bootloc.patch b/target/linux/adm5120/patches-2.6.27/101-cfi_fixup_macronix_bootloc.patch
index 19ad785..d13ddaf 100644 (file)
--- a/target/linux/adm5120/patches-2.6.27/101-cfi_fixup_macronix_bootloc.patch
+++ b/target/linux/adm5120/patches-2.6.27/101-cfi_fixup_macronix_bootloc.patch
@@ -20,7 +20,7 @@
  static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
  static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
  static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
  static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
  static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
  static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);

-@@ -240,6 +247,41 @@
+@@ -240,6 +247,41 @@ static void fixup_s29gl032n_sectors(stru

        }
  }
  
        }
  }
  


@@ -62,7 +62,7 @@
  static struct cfi_fixup cfi_fixup_table[] = {
        { CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },
  #ifdef AMD_BOOTLOC_BUG
  static struct cfi_fixup cfi_fixup_table[] = {
        { CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },
  #ifdef AMD_BOOTLOC_BUG

-@@ -275,6 +317,9 @@
+@@ -275,6 +317,9 @@ static struct cfi_fixup fixup_table[] = 

         */
        { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_erase_chip, NULL },
        { CFI_MFR_ATMEL, AT49BV6416, fixup_use_atmel_lock, NULL },
         */
        { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_erase_chip, NULL },
        { CFI_MFR_ATMEL, AT49BV6416, fixup_use_atmel_lock, NULL },


@@ -74,7 +74,7 @@
  
 --- a/drivers/mtd/chips/Kconfig
 +++ b/drivers/mtd/chips/Kconfig
  
 --- a/drivers/mtd/chips/Kconfig
 +++ b/drivers/mtd/chips/Kconfig

-@@ -196,6 +196,14 @@
+@@ -196,6 +196,14 @@ config MTD_CFI_AMDSTD

          provides support for one of those command sets, used on chips
          including the AMD Am29LV320.
  
          provides support for one of those command sets, used on chips
          including the AMD Am29LV320.