diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-12-22 17:19:36 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-12-22 17:19:36 +0000 |
commit | 22d8dcbf447f54b1a4ff0365c8a5f53736984cf0 (patch) | |
tree | 44bc4628235a7deaf2f4a1aefa4d1bb5b828e36d /target/linux/adm5120/patches-2.6.35/101-cfi_fixup_macronix_bootloc.patch | |
parent | 72ca63488b7a1efd184235509176de9526106cde (diff) | |
download | master-31e0f0ae-22d8dcbf447f54b1a4ff0365c8a5f53736984cf0.tar.gz master-31e0f0ae-22d8dcbf447f54b1a4ff0365c8a5f53736984cf0.tar.bz2 master-31e0f0ae-22d8dcbf447f54b1a4ff0365c8a5f53736984cf0.zip |
adm5120: make patches apply again and refresh them
SVN-Revision: 24800
Diffstat (limited to 'target/linux/adm5120/patches-2.6.35/101-cfi_fixup_macronix_bootloc.patch')
-rw-r--r-- | target/linux/adm5120/patches-2.6.35/101-cfi_fixup_macronix_bootloc.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/adm5120/patches-2.6.35/101-cfi_fixup_macronix_bootloc.patch b/target/linux/adm5120/patches-2.6.35/101-cfi_fixup_macronix_bootloc.patch index ec7505c58d..31217c4721 100644 --- a/target/linux/adm5120/patches-2.6.35/101-cfi_fixup_macronix_bootloc.patch +++ b/target/linux/adm5120/patches-2.6.35/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 -@@ -53,6 +53,12 @@ +@@ -49,6 +49,12 @@ + #define SST49LF008A 0x005a #define AT49BV6416 0x00d6 - #define MANUFACTURER_SAMSUNG 0x00ec +/* Macronix */ +#define MX29LV160B 0x2249 /* MX29LV160 Bottom-boot chip */ @@ -13,9 +13,9 @@ 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 - } - } +@@ -329,6 +335,41 @@ static struct cfi_fixup cfi_nopri_fixup_ + { 0, 0, NULL, NULL } + }; +#ifdef CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC +/* @@ -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 -@@ -319,6 +360,9 @@ static struct cfi_fixup fixup_table[] = +@@ -365,6 +406,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 }, |