diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-06-17 14:30:18 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-06-17 14:30:18 +0000 |
| commit | 845d7e156ebf9dfcff57c629b6511599c96d33c4 (patch) | |
| tree | f6d66cf37dcff9c1caf8e37d614ef3dfa3947566 /target/linux/adm5120/patches/101-cfi_fixup_macronix_bootloc.patch | |
| parent | 7e9b27206f111a18b77a773f091dba5b36b304f6 (diff) | |
| download | upstream-845d7e156ebf9dfcff57c629b6511599c96d33c4.tar.gz upstream-845d7e156ebf9dfcff57c629b6511599c96d33c4.tar.bz2 upstream-845d7e156ebf9dfcff57c629b6511599c96d33c4.zip | |
[adm5120] switch to 2.6.25.7
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11526 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120/patches/101-cfi_fixup_macronix_bootloc.patch')
| -rw-r--r-- | target/linux/adm5120/patches/101-cfi_fixup_macronix_bootloc.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/adm5120/patches/101-cfi_fixup_macronix_bootloc.patch b/target/linux/adm5120/patches/101-cfi_fixup_macronix_bootloc.patch index 9acb626bb5..9179088934 100644 --- a/target/linux/adm5120/patches/101-cfi_fixup_macronix_bootloc.patch +++ b/target/linux/adm5120/patches/101-cfi_fixup_macronix_bootloc.patch @@ -20,8 +20,8 @@ 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 *); -@@ -217,6 +224,41 @@ - mtd->flags |= MTD_STUPID_LOCK; +@@ -221,6 +228,41 @@ + mtd->flags |= MTD_POWERUP_LOCK; } +#ifdef CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC @@ -60,18 +60,18 @@ +#endif /* CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC */ + static struct cfi_fixup cfi_fixup_table[] = { - #ifdef AMD_BOOTLOC_BUG - { CFI_MFR_AMD, CFI_ID_ANY, fixup_amd_bootblock, NULL }, -@@ -231,6 +273,9 @@ - { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_write_buffers, NULL, }, - #endif { CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL }, + #ifdef AMD_BOOTLOC_BUG +@@ -252,6 +294,9 @@ + */ + { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_erase_chip, NULL }, + { CFI_MFR_ATMEL, AT49BV6416, fixup_use_atmel_lock, NULL }, +#ifdef CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC + { MANUFACTURER_MACRONIX, CFI_ID_ANY, fixup_macronix_bootloc, NULL, }, +#endif { 0, 0, NULL, NULL } }; - static struct cfi_fixup jedec_fixup_table[] = { + --- a/drivers/mtd/chips/Kconfig +++ b/drivers/mtd/chips/Kconfig @@ -196,6 +196,14 @@ |