diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-06-06 08:54:13 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-06-06 08:54:13 +0000 |
commit | db4cd8515c1076aee2517a51e4f57c7f74ae31a5 (patch) | |
tree | 3850c221196f7f5df8896ca82297ae33a170c52a /target/linux/adm5120/patches/101-cfi_fixup_macronix_bootloc.patch | |
parent | 4ece2e4ad1eb79a23b76b0c4a22cea873656b3f6 (diff) | |
download | mtk-20170518-db4cd8515c1076aee2517a51e4f57c7f74ae31a5.zip mtk-20170518-db4cd8515c1076aee2517a51e4f57c7f74ae31a5.tar.gz mtk-20170518-db4cd8515c1076aee2517a51e4f57c7f74ae31a5.tar.bz2 |
refresh patches to match upstream style
SVN-Revision: 11374
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 | 18 |
1 files changed, 7 insertions, 11 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 859b5ca..9acb626 100644 --- a/target/linux/adm5120/patches/101-cfi_fixup_macronix_bootloc.patch +++ b/target/linux/adm5120/patches/101-cfi_fixup_macronix_bootloc.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.24.7/drivers/mtd/chips/cfi_cmdset_0002.c -=================================================================== ---- linux-2.6.24.7.orig/drivers/mtd/chips/cfi_cmdset_0002.c -+++ linux-2.6.24.7/drivers/mtd/chips/cfi_cmdset_0002.c +--- a/drivers/mtd/chips/cfi_cmdset_0002.c ++++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -47,12 +47,19 @@ #define MANUFACTURER_AMD 0x0001 #define MANUFACTURER_ATMEL 0x001F @@ -22,7 +20,7 @@ Index: linux-2.6.24.7/drivers/mtd/chips/cfi_cmdset_0002.c 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 @@ static void fixup_use_atmel_lock(struct +@@ -217,6 +224,41 @@ mtd->flags |= MTD_STUPID_LOCK; } @@ -64,7 +62,7 @@ Index: linux-2.6.24.7/drivers/mtd/chips/cfi_cmdset_0002.c 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 @@ static struct cfi_fixup cfi_fixup_table[ +@@ -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 }, @@ -74,11 +72,9 @@ Index: linux-2.6.24.7/drivers/mtd/chips/cfi_cmdset_0002.c { 0, 0, NULL, NULL } }; static struct cfi_fixup jedec_fixup_table[] = { -Index: linux-2.6.24.7/drivers/mtd/chips/Kconfig -=================================================================== ---- linux-2.6.24.7.orig/drivers/mtd/chips/Kconfig -+++ linux-2.6.24.7/drivers/mtd/chips/Kconfig -@@ -196,6 +196,14 @@ config MTD_CFI_AMDSTD +--- a/drivers/mtd/chips/Kconfig ++++ b/drivers/mtd/chips/Kconfig +@@ -196,6 +196,14 @@ provides support for one of those command sets, used on chips including the AMD Am29LV320. |