Changeset 24800


Ignore:
Timestamp:
2010-12-22T18:19:36+01:00 (7 years ago)
Author:
hauke
Message:

adm5120: make patches apply again and refresh them

Location:
trunk/target/linux/adm5120
Files:
21 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/adm5120/patches-2.6.32/007-adm5120_pci.patch

    r19005 r24800  
    1111--- a/include/linux/pci_ids.h 
    1212+++ b/include/linux/pci_ids.h 
    13 @@ -1748,6 +1748,9 @@ 
     13@@ -1752,6 +1752,9 @@ 
    1414 #define PCI_VENDOR_ID_ESDGMBH          0x12fe 
    1515 #define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111 
  • trunk/target/linux/adm5120/patches-2.6.32/009-adm5120_leds_switch_trigger.patch

    r19005 r24800  
    11--- a/drivers/leds/Kconfig 
    22+++ b/drivers/leds/Kconfig 
    3 @@ -315,4 +315,12 @@ config LEDS_TRIGGER_NETDEV 
    4           This allows LEDs to be controlled by network device activity. 
    5           If unsure, say Y. 
     3@@ -322,4 +322,12 @@ config LEDS_TRIGGER_USBDEV 
     4          This allows LEDs to be controlled by the presence/activity of 
     5          an USB device. If unsure, say N. 
    66  
    77+config LEDS_TRIGGER_ADM5120_SWITCH 
     
    1616--- a/drivers/leds/Makefile 
    1717+++ b/drivers/leds/Makefile 
    18 @@ -42,3 +42,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO)               += ledt 
    19  obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)  += ledtrig-default-on.o 
     18@@ -43,3 +43,4 @@ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += 
    2019 obj-$(CONFIG_LEDS_TRIGGER_MORSE)       += ledtrig-morse.o 
    21  obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o 
     20 obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o 
     21 obj-$(CONFIG_LEDS_TRIGGER_USBDEV)      += ledtrig-usbdev.o 
    2222+obj-$(CONFIG_LEDS_TRIGGER_ADM5120_SWITCH) += ledtrig-adm5120-switch.o 
  • trunk/target/linux/adm5120/patches-2.6.34/001-adm5120.patch

    r22275 r24800  
    2323        bool "Alchemy processor based machines" 
    2424        select SYS_SUPPORTS_ZBOOT 
    25 @@ -681,6 +696,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD 
     25@@ -683,6 +698,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD 
    2626  
    2727 endchoice 
     
    3333--- a/arch/mips/Makefile 
    3434+++ b/arch/mips/Makefile 
    35 @@ -214,6 +214,23 @@ cflags-$(CONFIG_MACH_JAZZ) += -I$(srctre 
     35@@ -227,6 +227,23 @@ cflags-$(CONFIG_MACH_JAZZ) += -I$(srctre 
    3636 load-$(CONFIG_MACH_JAZZ)       += 0xffffffff80080000 
    3737  
  • trunk/target/linux/adm5120/patches-2.6.34/007-adm5120_pci.patch

    r21218 r24800  
    1111--- a/include/linux/pci_ids.h 
    1212+++ b/include/linux/pci_ids.h 
    13 @@ -1752,6 +1752,9 @@ 
     13@@ -1753,6 +1753,9 @@ 
    1414 #define PCI_VENDOR_ID_ESDGMBH          0x12fe 
    1515 #define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111 
  • trunk/target/linux/adm5120/patches-2.6.34/009-adm5120_leds_switch_trigger.patch

    r21218 r24800  
    11--- a/drivers/leds/Kconfig 
    22+++ b/drivers/leds/Kconfig 
    3 @@ -365,4 +365,12 @@ config LEDS_TRIGGER_NETDEV 
    4           This allows LEDs to be controlled by network device activity. 
    5           If unsure, say Y. 
     3@@ -372,4 +372,12 @@ config LEDS_TRIGGER_USBDEV 
     4          This allows LEDs to be controlled by the presence/activity of 
     5          an USB device. If unsure, say N. 
    66  
    77+config LEDS_TRIGGER_ADM5120_SWITCH 
     
    1616--- a/drivers/leds/Makefile 
    1717+++ b/drivers/leds/Makefile 
    18 @@ -48,3 +48,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO)               += ledt 
    19  obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)  += ledtrig-default-on.o 
     18@@ -49,3 +49,4 @@ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += 
    2019 obj-$(CONFIG_LEDS_TRIGGER_MORSE)       += ledtrig-morse.o 
    21  obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o 
     20 obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o 
     21 obj-$(CONFIG_LEDS_TRIGGER_USBDEV)      += ledtrig-usbdev.o 
    2222+obj-$(CONFIG_LEDS_TRIGGER_ADM5120_SWITCH) += ledtrig-adm5120-switch.o 
  • trunk/target/linux/adm5120/patches-2.6.34/101-cfi_fixup_macronix_bootloc.patch

    r21218 r24800  
    11--- a/drivers/mtd/chips/cfi_cmdset_0002.c 
    22+++ b/drivers/mtd/chips/cfi_cmdset_0002.c 
    3 @@ -53,6 +53,12 @@ 
     3@@ -52,6 +52,12 @@ 
     4 #define SST49LF008A            0x005a 
    45 #define AT49BV6416             0x00d6 
    5  #define MANUFACTURER_SAMSUNG   0x00ec 
    66  
    77+/* Macronix */ 
     
    1414 static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *); 
    1515 static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *); 
    16 @@ -283,6 +289,41 @@ static void fixup_s29gl032n_sectors(stru 
     16@@ -282,6 +288,41 @@ static void fixup_s29gl032n_sectors(stru 
    1717        } 
    1818 } 
     
    5656        { CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL }, 
    5757 #ifdef AMD_BOOTLOC_BUG 
    58 @@ -319,6 +360,9 @@ static struct cfi_fixup fixup_table[] = 
     58@@ -318,6 +359,9 @@ static struct cfi_fixup fixup_table[] = 
    5959         */ 
    6060        { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_erase_chip, NULL }, 
  • trunk/target/linux/adm5120/patches-2.6.34/103-mtd_trxsplit.patch

    r21182 r24800  
    1515--- a/drivers/mtd/Makefile 
    1616+++ b/drivers/mtd/Makefile 
    17 @@ -8,6 +8,7 @@ mtd-y                           := mtdcore.o mtdsuper.o mtdbdi. 
     17@@ -8,6 +8,7 @@ mtd-y                           := mtdcore.o mtdsuper.o 
    1818 mtd-$(CONFIG_MTD_PARTITIONS)   += mtdpart.o 
    1919  
  • trunk/target/linux/adm5120/patches-2.6.35/001-adm5120.patch

    r22275 r24800  
    2323        bool "Alchemy processor based machines" 
    2424        select SYS_SUPPORTS_ZBOOT 
    25 @@ -681,6 +696,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD 
     25@@ -683,6 +698,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD 
    2626  
    2727 endchoice 
     
    3333--- a/arch/mips/Makefile 
    3434+++ b/arch/mips/Makefile 
    35 @@ -214,6 +214,23 @@ cflags-$(CONFIG_MACH_JAZZ) += -I$(srctre 
     35@@ -227,6 +227,23 @@ cflags-$(CONFIG_MACH_JAZZ) += -I$(srctre 
    3636 load-$(CONFIG_MACH_JAZZ)       += 0xffffffff80080000 
    3737  
  • trunk/target/linux/adm5120/patches-2.6.35/007-adm5120_pci.patch

    r21218 r24800  
    1111--- a/include/linux/pci_ids.h 
    1212+++ b/include/linux/pci_ids.h 
    13 @@ -1752,6 +1752,9 @@ 
     13@@ -1756,6 +1756,9 @@ 
    1414 #define PCI_VENDOR_ID_ESDGMBH          0x12fe 
    1515 #define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111 
  • trunk/target/linux/adm5120/patches-2.6.35/009-adm5120_leds_switch_trigger.patch

    r21218 r24800  
    11--- a/drivers/leds/Kconfig 
    22+++ b/drivers/leds/Kconfig 
    3 @@ -365,4 +365,12 @@ config LEDS_TRIGGER_NETDEV 
    4           This allows LEDs to be controlled by network device activity. 
    5           If unsure, say Y. 
     3@@ -389,4 +389,12 @@ config LEDS_TRIGGER_USBDEV 
     4          This allows LEDs to be controlled by the presence/activity of 
     5          an USB device. If unsure, say N. 
    66  
    77+config LEDS_TRIGGER_ADM5120_SWITCH 
     
    1616--- a/drivers/leds/Makefile 
    1717+++ b/drivers/leds/Makefile 
    18 @@ -48,3 +48,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO)               += ledt 
    19  obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)  += ledtrig-default-on.o 
     18@@ -51,3 +51,4 @@ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += 
    2019 obj-$(CONFIG_LEDS_TRIGGER_MORSE)       += ledtrig-morse.o 
    21  obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o 
     20 obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o 
     21 obj-$(CONFIG_LEDS_TRIGGER_USBDEV)      += ledtrig-usbdev.o 
    2222+obj-$(CONFIG_LEDS_TRIGGER_ADM5120_SWITCH) += ledtrig-adm5120-switch.o 
  • trunk/target/linux/adm5120/patches-2.6.35/101-cfi_fixup_macronix_bootloc.patch

    r21751 r24800  
    11--- a/drivers/mtd/chips/cfi_cmdset_0002.c 
    22+++ b/drivers/mtd/chips/cfi_cmdset_0002.c 
    3 @@ -53,6 +53,12 @@ 
     3@@ -49,6 +49,12 @@ 
     4 #define SST49LF008A            0x005a 
    45 #define AT49BV6416             0x00d6 
    5  #define MANUFACTURER_SAMSUNG   0x00ec 
    66  
    77+/* Macronix */ 
     
    1414 static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *); 
    1515 static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *); 
    16 @@ -283,6 +289,41 @@ static void fixup_s29gl032n_sectors(stru 
    17         } 
    18  } 
     16@@ -329,6 +335,41 @@ static struct cfi_fixup cfi_nopri_fixup_ 
     17        { 0, 0, NULL, NULL } 
     18 }; 
    1919  
    2020+#ifdef CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC 
     
    5656        { CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL }, 
    5757 #ifdef AMD_BOOTLOC_BUG 
    58 @@ -319,6 +360,9 @@ static struct cfi_fixup fixup_table[] = 
     58@@ -365,6 +406,9 @@ static struct cfi_fixup fixup_table[] = 
    5959         */ 
    6060        { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_erase_chip, NULL }, 
  • trunk/target/linux/adm5120/patches-2.6.35/102-jedec_pmc_39lvxxx_chips.patch

    r21751 r24800  
    11--- a/drivers/mtd/chips/jedec_probe.c 
    22+++ b/drivers/mtd/chips/jedec_probe.c 
    3 @@ -133,6 +133,10 @@ 
     3@@ -116,6 +116,10 @@ 
    44 #define UPD29F064115   0x221C 
    55  
     
    1212 #define PM49FL004      0x006E 
    1313 #define PM49FL008      0x006A 
    14 @@ -1275,6 +1279,54 @@ static const struct amd_flash_info jedec 
     14@@ -1273,6 +1277,54 @@ static const struct amd_flash_info jedec 
    1515                        ERASEINFO(0x02000,2), 
    1616                        ERASEINFO(0x04000,1), 
  • trunk/target/linux/adm5120/patches-2.6.35/103-mtd_trxsplit.patch

    r21182 r24800  
    1515--- a/drivers/mtd/Makefile 
    1616+++ b/drivers/mtd/Makefile 
    17 @@ -8,6 +8,7 @@ mtd-y                           := mtdcore.o mtdsuper.o mtdbdi. 
     17@@ -8,6 +8,7 @@ mtd-y                           := mtdcore.o mtdsuper.o 
    1818 mtd-$(CONFIG_MTD_PARTITIONS)   += mtdpart.o 
    1919  
  • trunk/target/linux/adm5120/patches-2.6.35/120-rb153_cf_driver.patch

    r21751 r24800  
    1111--- a/drivers/ata/Kconfig 
    1212+++ b/drivers/ata/Kconfig 
    13 @@ -604,6 +604,15 @@ config PATA_RADISYS 
    14   
    15           If unsure, say N. 
     13@@ -778,6 +778,15 @@ config PATA_QDI 
     14        help 
     15          Support for QDI 6500 and 6580 PATA controllers on VESA local bus. 
    1616  
    1717+config PATA_RB153_CF 
  • trunk/target/linux/adm5120/patches-2.6.35/203-gpio_leds_brightness.patch

    r21218 r24800  
    11--- a/drivers/leds/leds-gpio.c 
    22+++ b/drivers/leds/leds-gpio.c 
    3 @@ -45,13 +45,17 @@ static void gpio_led_set(struct led_clas 
     3@@ -52,13 +52,17 @@ static void gpio_led_set(struct led_clas 
    44                container_of(led_cdev, struct gpio_led_data, cdev); 
    55        int level; 
  • trunk/target/linux/adm5120/patches-2.6.35/310-adm5120_wdt.patch

    r21218 r24800  
    11--- a/drivers/watchdog/Kconfig 
    22+++ b/drivers/watchdog/Kconfig 
    3 @@ -807,6 +807,18 @@ config RC32434_WDT 
     3@@ -825,6 +825,18 @@ config RC32434_WDT 
    44          To compile this driver as a module, choose M here: the 
    55          module will be called rc32434_wdt. 
     
    2222--- a/drivers/watchdog/Makefile 
    2323+++ b/drivers/watchdog/Makefile 
    24 @@ -113,6 +113,7 @@ obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt 
     24@@ -114,6 +114,7 @@ obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt 
    2525 obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o 
    2626 obj-$(CONFIG_AR7_WDT) += ar7_wdt.o 
  • trunk/target/linux/adm5120/patches-2.6.36/001-adm5120.patch

    r23224 r24800  
    11--- a/arch/mips/Kconfig 
    22+++ b/arch/mips/Kconfig 
    3 @@ -25,6 +25,21 @@ choice 
     3@@ -26,6 +26,21 @@ choice 
    44        prompt "System type" 
    55        default SGI_IP22 
     
    2323        bool "Alchemy processor based machines" 
    2424        select 64BIT_PHYS_ADDR 
    25 @@ -707,6 +722,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD 
     25@@ -708,6 +723,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD 
    2626  
    2727 endchoice 
  • trunk/target/linux/adm5120/patches-2.6.36/003-adm5120_switch.patch

    r23224 r24800  
    11--- a/drivers/net/Kconfig 
    22+++ b/drivers/net/Kconfig 
    3 @@ -491,6 +491,10 @@ config MIPS_AU1X00_ENET 
     3@@ -614,6 +614,10 @@ config MIPS_AU1X00_ENET 
    44          If you have an Alchemy Semi AU1X00 based system 
    55          say Y.  Otherwise, say N. 
     
    1414--- a/drivers/net/Makefile 
    1515+++ b/drivers/net/Makefile 
    16 @@ -212,6 +212,7 @@ obj-$(CONFIG_SC92031) += sc92031.o 
     16@@ -213,6 +213,7 @@ obj-$(CONFIG_SC92031) += sc92031.o 
    1717 # This is also a 82596 and should probably be merged 
    1818 obj-$(CONFIG_LP486E) += lp486e.o 
  • trunk/target/linux/adm5120/patches-2.6.36/009-adm5120_leds_switch_trigger.patch

    r23224 r24800  
    11--- a/drivers/leds/Kconfig 
    22+++ b/drivers/leds/Kconfig 
    3 @@ -391,4 +391,12 @@ config LEDS_TRIGGER_NETDEV 
    4           This allows LEDs to be controlled by network device activity. 
    5           If unsure, say Y. 
     3@@ -398,4 +398,12 @@ config LEDS_TRIGGER_USBDEV 
     4          This allows LEDs to be controlled by the presence/activity of 
     5          an USB device. If unsure, say N. 
    66  
    77+config LEDS_TRIGGER_ADM5120_SWITCH 
     
    1616--- a/drivers/leds/Makefile 
    1717+++ b/drivers/leds/Makefile 
    18 @@ -51,3 +51,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO)               += ledt 
    19  obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)  += ledtrig-default-on.o 
     18@@ -52,3 +52,4 @@ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += 
    2019 obj-$(CONFIG_LEDS_TRIGGER_MORSE)       += ledtrig-morse.o 
    21  obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o 
     20 obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o 
     21 obj-$(CONFIG_LEDS_TRIGGER_USBDEV)      += ledtrig-usbdev.o 
    2222+obj-$(CONFIG_LEDS_TRIGGER_ADM5120_SWITCH) += ledtrig-adm5120-switch.o 
  • trunk/target/linux/adm5120/patches-2.6.36/102-jedec_pmc_39lvxxx_chips.patch

    r23224 r24800  
    11--- a/drivers/mtd/chips/jedec_probe.c 
    22+++ b/drivers/mtd/chips/jedec_probe.c 
    3 @@ -115,6 +115,10 @@ 
     3@@ -116,6 +116,10 @@ 
    44 #define UPD29F064115   0x221C 
    55  
     
    1212 #define PM49FL004      0x006E 
    1313 #define PM49FL008      0x006A 
    14 @@ -1259,6 +1263,54 @@ static const struct amd_flash_info jedec 
     14@@ -1273,6 +1277,54 @@ static const struct amd_flash_info jedec 
    1515                        ERASEINFO(0x02000,2), 
    1616                        ERASEINFO(0x04000,1), 
  • trunk/target/linux/adm5120/patches-2.6.37/009-adm5120_leds_switch_trigger.patch

    r23973 r24800  
    11--- a/drivers/leds/Kconfig 
    22+++ b/drivers/leds/Kconfig 
    3 @@ -400,4 +400,12 @@ config LEDS_TRIGGER_NETDEV 
    4           This allows LEDs to be controlled by network device activity. 
    5           If unsure, say Y. 
     3@@ -322,4 +322,12 @@ config LEDS_TRIGGER_USBDEV 
     4          This allows LEDs to be controlled by the presence/activity of 
     5          an USB device. If unsure, say N. 
    66  
    77+config LEDS_TRIGGER_ADM5120_SWITCH 
     
    1616--- a/drivers/leds/Makefile 
    1717+++ b/drivers/leds/Makefile 
    18 @@ -52,3 +52,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO)               += ledt 
    19  obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)  += ledtrig-default-on.o 
     18@@ -43,3 +43,4 @@ obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += 
    2019 obj-$(CONFIG_LEDS_TRIGGER_MORSE)       += ledtrig-morse.o 
    21  obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o 
     20 obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o 
     21 obj-$(CONFIG_LEDS_TRIGGER_USBDEV)      += ledtrig-usbdev.o 
    2222+obj-$(CONFIG_LEDS_TRIGGER_ADM5120_SWITCH) += ledtrig-adm5120-switch.o 
Note: See TracChangeset for help on using the changeset viewer.