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.34 | |
| parent | 72ca63488b7a1efd184235509176de9526106cde (diff) | |
| download | upstream-22d8dcbf447f54b1a4ff0365c8a5f53736984cf0.tar.gz upstream-22d8dcbf447f54b1a4ff0365c8a5f53736984cf0.tar.bz2 upstream-22d8dcbf447f54b1a4ff0365c8a5f53736984cf0.zip | |
adm5120: make patches apply again and refresh them
SVN-Revision: 24800
Diffstat (limited to 'target/linux/adm5120/patches-2.6.34')
5 files changed, 14 insertions, 14 deletions
diff --git a/target/linux/adm5120/patches-2.6.34/001-adm5120.patch b/target/linux/adm5120/patches-2.6.34/001-adm5120.patch index c6eec1e23f..c99399cb13 100644 --- a/target/linux/adm5120/patches-2.6.34/001-adm5120.patch +++ b/target/linux/adm5120/patches-2.6.34/001-adm5120.patch @@ -22,7 +22,7 @@ config MACH_ALCHEMY bool "Alchemy processor based machines" select SYS_SUPPORTS_ZBOOT -@@ -681,6 +696,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD +@@ -683,6 +698,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD endchoice @@ -32,7 +32,7 @@ source "arch/mips/jazz/Kconfig" --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -214,6 +214,23 @@ cflags-$(CONFIG_MACH_JAZZ) += -I$(srctre +@@ -227,6 +227,23 @@ cflags-$(CONFIG_MACH_JAZZ) += -I$(srctre load-$(CONFIG_MACH_JAZZ) += 0xffffffff80080000 # diff --git a/target/linux/adm5120/patches-2.6.34/007-adm5120_pci.patch b/target/linux/adm5120/patches-2.6.34/007-adm5120_pci.patch index b06d7947ce..12d0f4aa9e 100644 --- a/target/linux/adm5120/patches-2.6.34/007-adm5120_pci.patch +++ b/target/linux/adm5120/patches-2.6.34/007-adm5120_pci.patch @@ -10,7 +10,7 @@ obj-$(CONFIG_CPU_CAVIUM_OCTEON) += msi-octeon.o --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h -@@ -1752,6 +1752,9 @@ +@@ -1753,6 +1753,9 @@ #define PCI_VENDOR_ID_ESDGMBH 0x12fe #define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111 diff --git a/target/linux/adm5120/patches-2.6.34/009-adm5120_leds_switch_trigger.patch b/target/linux/adm5120/patches-2.6.34/009-adm5120_leds_switch_trigger.patch index 0258fa4fbe..777476f3ef 100644 --- a/target/linux/adm5120/patches-2.6.34/009-adm5120_leds_switch_trigger.patch +++ b/target/linux/adm5120/patches-2.6.34/009-adm5120_leds_switch_trigger.patch @@ -1,8 +1,8 @@ --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig -@@ -365,4 +365,12 @@ config LEDS_TRIGGER_NETDEV - This allows LEDs to be controlled by network device activity. - If unsure, say Y. +@@ -372,4 +372,12 @@ config LEDS_TRIGGER_USBDEV + This allows LEDs to be controlled by the presence/activity of + an USB device. If unsure, say N. +config LEDS_TRIGGER_ADM5120_SWITCH + tristate "LED ADM5120 Switch Port Status Trigger" @@ -15,8 +15,8 @@ endif # NEW_LEDS --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile -@@ -48,3 +48,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledt - obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o +@@ -49,3 +49,4 @@ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o - obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o + obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o + obj-$(CONFIG_LEDS_TRIGGER_USBDEV) += ledtrig-usbdev.o +obj-$(CONFIG_LEDS_TRIGGER_ADM5120_SWITCH) += ledtrig-adm5120-switch.o 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 43459328a4..5ecf166505 100644 --- 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 -@@ -53,6 +53,12 @@ +@@ -52,6 +52,12 @@ + #define SST49LF008A 0x005a #define AT49BV6416 0x00d6 - #define MANUFACTURER_SAMSUNG 0x00ec +/* 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 *); -@@ -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 -@@ -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 }, diff --git a/target/linux/adm5120/patches-2.6.34/103-mtd_trxsplit.patch b/target/linux/adm5120/patches-2.6.34/103-mtd_trxsplit.patch index 69f1035505..ec4f6c5a40 100644 --- a/target/linux/adm5120/patches-2.6.34/103-mtd_trxsplit.patch +++ b/target/linux/adm5120/patches-2.6.34/103-mtd_trxsplit.patch @@ -14,7 +14,7 @@ depends on MTD_PARTITIONS --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile -@@ -8,6 +8,7 @@ mtd-y := mtdcore.o mtdsuper.o mtdbdi. +@@ -8,6 +8,7 @@ mtd-y := mtdcore.o mtdsuper.o mtd-$(CONFIG_MTD_PARTITIONS) += mtdpart.o obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o |