summaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120/patches-2.6.28/101-cfi_fixup_macronix_bootloc.patch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-01-26 07:59:54 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-01-26 07:59:54 +0000
commit6f9076c67dbf7da09b576abaf320820f132d43a9 (patch)
treeaf2a4856b1be5ec9e5e11d07b4b12a8f0e8eb237 /target/linux/adm5120/patches-2.6.28/101-cfi_fixup_macronix_bootloc.patch
parent9906ababb73e0a004ff387628e50062050bca13b (diff)
[adm5120] refresh 2.6.28 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14198 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120/patches-2.6.28/101-cfi_fixup_macronix_bootloc.patch')
-rw-r--r--target/linux/adm5120/patches-2.6.28/101-cfi_fixup_macronix_bootloc.patch15
1 files changed, 4 insertions, 11 deletions
diff --git a/target/linux/adm5120/patches-2.6.28/101-cfi_fixup_macronix_bootloc.patch b/target/linux/adm5120/patches-2.6.28/101-cfi_fixup_macronix_bootloc.patch
index d13ddaf63..ab6d22154 100644
--- a/target/linux/adm5120/patches-2.6.28/101-cfi_fixup_macronix_bootloc.patch
+++ b/target/linux/adm5120/patches-2.6.28/101-cfi_fixup_macronix_bootloc.patch
@@ -1,13 +1,6 @@
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -44,12 +44,19 @@
- #define MANUFACTURER_AMD 0x0001
- #define MANUFACTURER_ATMEL 0x001F
- #define MANUFACTURER_SST 0x00BF
-+#define MANUFACTURER_MACRONIX 0x00C2
- #define SST49LF004B 0x0060
- #define SST49LF040B 0x0050
- #define SST49LF008A 0x005a
+@@ -53,6 +53,12 @@
#define AT49BV6416 0x00d6
#define MANUFACTURER_SAMSUNG 0x00ec
@@ -20,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 *);
-@@ -240,6 +247,41 @@ static void fixup_s29gl032n_sectors(stru
+@@ -283,6 +289,41 @@ static void fixup_s29gl032n_sectors(stru
}
}
@@ -62,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
-@@ -275,6 +317,9 @@ static struct cfi_fixup fixup_table[] =
+@@ -319,6 +360,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 },
@@ -74,7 +67,7 @@
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
-@@ -196,6 +196,14 @@ config MTD_CFI_AMDSTD
+@@ -198,6 +198,14 @@ config MTD_CFI_AMDSTD
provides support for one of those command sets, used on chips
including the AMD Am29LV320.