generic: rtl8366rb: use correct bitmasks in sanity checks

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

diff --git a/target/linux/adm5120/patches-2.6.34/101-cfi_fixup_macronix_bootloc.patch b/target/linux/adm5120/patches-2.6.34/101-cfi_fixup_macronix_bootloc.patch
index ab6d221..5ecf166 100644 (file)
--- a/target/linux/adm5120/patches-2.6.34/101-cfi_fixup_macronix_bootloc.patch
+++ b/target/linux/adm5120/patches-2.6.34/101-cfi_fixup_macronix_bootloc.patch
@@ -1,8 +1,8 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c

-@@ -53,6 +53,12 @@
+@@ -52,6 +52,12 @@
+ #define SST49LF008A           0x005a

  #define AT49BV6416            0x00d6
  #define AT49BV6416            0x00d6

- #define MANUFACTURER_SAMSUNG  0x00ec

  
 +/* Macronix */
 +#define MX29LV160B    0x2249  /* MX29LV160 Bottom-boot chip */
  
 +/* Macronix */
 +#define MX29LV160B    0x2249  /* MX29LV160 Bottom-boot chip */


@@ -13,7 +13,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 *);

-@@ -283,6 +289,41 @@ static void fixup_s29gl032n_sectors(stru
+@@ -282,6 +288,41 @@ static void fixup_s29gl032n_sectors(stru

        }
  }
  
        }
  }
  


@@ -55,7 +55,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

-@@ -319,6 +360,9 @@ static struct cfi_fixup fixup_table[] = 
+@@ -318,6 +359,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 },


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

-@@ -198,6 +198,14 @@ config MTD_CFI_AMDSTD
+@@ -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.