Changeset 711 for branches


Ignore:
Timestamp:
Dec 1, 2015, 6:44:54 AM (4 years ago)
Author:
ehem
Message:

Fix patch mess-up

Be careful with procedure, a small error can badly mess things up. Such
as missing a step (apply the OpenWRT generic patches) while building the
patches. These should work better.

Location:
branches/contrib/debian/package-build/linux-patch-ar71xx/patches-3.16
Files:
1 added
1 deleted
8 edited

Legend:

Unmodified
Added
Removed
  • branches/contrib/debian/package-build/linux-patch-ar71xx/patches-3.16/404-mtd-cybertan-trx-parser.patch

    r710 r711  
    11--- a/drivers/mtd/Kconfig
    22+++ b/drivers/mtd/Kconfig
    3 @@ -155,6 +155,12 @@ config MTD_BCM47XX_PARTS
     3@@ -184,6 +184,12 @@ config MTD_BCM47XX_PARTS
    44          This provides partitions parser for devices based on BCM47xx
    55          boards.
     
    1111+          Cybertan partitioning support
    1212+
    13  comment "User Modules And Translation Layers"
    14  
    15  #
     13 config MTD_MYLOADER_PARTS
     14        tristate "MyLoader partition parsing"
     15        depends on ADM5120 || ATH25 || ATH79
    1616--- a/drivers/mtd/Makefile
    1717+++ b/drivers/mtd/Makefile
    18 @@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_AFS_PARTS)   += afs.o
    19  obj-$(CONFIG_MTD_AR7_PARTS)    += ar7part.o
     18@@ -16,6 +16,7 @@ obj-$(CONFIG_MTD_AR7_PARTS)   += ar7part.o
    2019 obj-$(CONFIG_MTD_BCM63XX_PARTS)        += bcm63xxpart.o
    2120 obj-$(CONFIG_MTD_BCM47XX_PARTS)        += bcm47xxpart.o
     21 obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
    2222+obj-$(CONFIG_MTD_CYBERTAN_PARTS) += cybertan_part.o
    2323 
  • branches/contrib/debian/package-build/linux-patch-ar71xx/patches-3.16/405-mtd-tp-link-partition-parser.patch

    r710 r711  
    11--- a/drivers/mtd/Kconfig
    22+++ b/drivers/mtd/Kconfig
    3 @@ -161,6 +161,12 @@ config MTD_MYLOADER_PARTS
    4         ---help---
    5            Cybertan partitioning support
     3@@ -206,6 +206,12 @@ config MTD_MYLOADER_PARTS
     4          You will still need the parsing functions to be called by the driver
     5          for your particular device. It won't happen automatically.
    66 
    77+config MTD_TPLINK_PARTS
     
    1616--- a/drivers/mtd/Makefile
    1717+++ b/drivers/mtd/Makefile
    18 @@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_AFS_PARTS)   += afs.o
    19  obj-$(CONFIG_MTD_AR7_PARTS)    += ar7part.o
     18@@ -16,6 +16,7 @@ obj-$(CONFIG_MTD_AR7_PARTS)   += ar7part.o
    2019 obj-$(CONFIG_MTD_BCM63XX_PARTS)        += bcm63xxpart.o
    2120 obj-$(CONFIG_MTD_BCM47XX_PARTS)        += bcm47xxpart.o
     21 obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
    2222+obj-$(CONFIG_MTD_TPLINK_PARTS) += tplinkpart.o
    2323 obj-$(CONFIG_MTD_CYBERTAN_PARTS) += cybertan_part.o
  • branches/contrib/debian/package-build/linux-patch-ar71xx/patches-3.16/411-mtd-cfi_cmdset_0002-force-word-write.patch

    r710 r711  
    3636 /* Atmel chips don't use the same PRI format as AMD chips */
    3737 static void fixup_convert_atmel_pri(struct mtd_info *mtd)
    38 @@ -1456,6 +1460,7 @@ static int cfi_amdstd_write_words(struct
     38@@ -1458,6 +1462,7 @@ static int cfi_amdstd_write_words(struct
    3939 /*
    4040  * FIXME: interleaved mode not tested, and probably not supported!
     
    4444                                    unsigned long adr, const u_char *buf,
    4545                                    int len)
    46 @@ -1579,7 +1584,6 @@ static int __xipram do_write_buffer(stru
     46@@ -1582,7 +1587,6 @@ static int __xipram do_write_buffer(stru
    4747        return ret;
    4848 }
     
    5252                                    size_t *retlen, const u_char *buf)
    5353 {
    54 @@ -1654,6 +1658,7 @@ static int cfi_amdstd_write_buffers(stru
     54@@ -1657,6 +1661,7 @@ static int cfi_amdstd_write_buffers(stru
    5555 
    5656        return 0;
  • branches/contrib/debian/package-build/linux-patch-ar71xx/patches-3.16/412-mtd-m25p80-zero-partition-parser-data.patch

    r710 r711  
    88        ppdata.of_node = spi->dev.of_node;
    99 
    10         return mtd_device_parse_register(&flash->mtd, NULL, &ppdata,
     10        return mtd_device_parse_register(&flash->mtd,
  • branches/contrib/debian/package-build/linux-patch-ar71xx/patches-3.16/433-spi-rb4xx-cpld-driver.patch

    r710 r711  
    11--- a/drivers/spi/Kconfig
    22+++ b/drivers/spi/Kconfig
    3 @@ -647,6 +647,13 @@ config SPI_TLE62X0
     3@@ -624,6 +624,13 @@ config SPI_TLE62X0
    44          sysfs interface, with each line presented as a kind of GPIO
    55          exposing both switch control and diagnostic feedback.
     
    1717--- a/drivers/spi/Makefile
    1818+++ b/drivers/spi/Makefile
    19 @@ -63,6 +63,7 @@ spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_
     19@@ -62,6 +62,7 @@ spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_
    2020 obj-$(CONFIG_SPI_PXA2XX)               += spi-pxa2xx-platform.o
    2121 obj-$(CONFIG_SPI_PXA2XX_PCI)           += spi-pxa2xx-pci.o
     
    2323+obj-$(CONFIG_SPI_RB4XX_CPLD)           += spi-rb4xx-cpld.o
    2424 obj-$(CONFIG_SPI_QUP)                  += spi-qup.o
    25  obj-$(CONFIG_SPI_ROCKCHIP)             += spi-rockchip.o
    2625 obj-$(CONFIG_SPI_RSPI)                 += spi-rspi.o
     26 obj-$(CONFIG_SPI_S3C24XX)              += spi-s3c24xx-hw.o
  • branches/contrib/debian/package-build/linux-patch-ar71xx/patches-3.16/441-leds-rb750-led-driver.patch

    r710 r711  
    11--- a/drivers/leds/Kconfig
    22+++ b/drivers/leds/Kconfig
    3 @@ -487,6 +487,10 @@ config LEDS_WNDR3700_USB
    4           This option enabled support for the LEDs on the ARM Versatile
    5           and RealView boards. Say Y to enabled these.
     3@@ -494,6 +494,10 @@ config LEDS_WNDR3700_USB
     4          This option enables support for the USB LED found on the
     5          NETGEAR WNDR3700 board.
    66 
    77+config LEDS_RB750
     
    1414--- a/drivers/leds/Makefile
    1515+++ b/drivers/leds/Makefile
    16 @@ -47,6 +47,7 @@ obj-$(CONFIG_LEDS_LT3593)             += leds-lt359
     16@@ -48,6 +48,7 @@ obj-$(CONFIG_LEDS_LT3593)             += leds-lt359
    1717 obj-$(CONFIG_LEDS_ADP5520)             += leds-adp5520.o
    1818 obj-$(CONFIG_LEDS_DELL_NETBOOKS)       += dell-led.o
  • branches/contrib/debian/package-build/linux-patch-ar71xx/patches-3.16/490-usb-ehci-add-quirks-for-qca-socs.patch

    r710 r711  
    4141--- a/drivers/usb/host/ehci.h
    4242+++ b/drivers/usb/host/ehci.h
    43 @@ -226,6 +226,10 @@ struct ehci_hcd {                  /* one per controlle
    44         unsigned                frame_index_bug:1; /* MosChip (AKA NetMos) */
     43@@ -227,6 +227,10 @@ struct ehci_hcd {                  /* one per controlle
    4544        unsigned                need_oc_pp_cycle:1; /* MPC834X port power */
    4645        unsigned                imx28_write_fix:1; /* For Freescale i.MX28 */
     46        unsigned                ignore_oc:1;
    4747+       unsigned                qca_force_host_mode:1;
    4848+       unsigned                qca_force_16bit_ptw:1; /* force 16 bit UTMI */
     
    5454--- a/include/linux/usb/ehci_pdriver.h
    5555+++ b/include/linux/usb/ehci_pdriver.h
    56 @@ -45,6 +45,8 @@ struct usb_ehci_pdata {
    57         unsigned        big_endian_desc:1;
     56@@ -46,6 +46,8 @@ struct usb_ehci_pdata {
    5857        unsigned        big_endian_mmio:1;
    5958        unsigned        no_io_watchdog:1;
     59        unsigned        ignore_oc:1;
    6060+       unsigned        qca_force_host_mode:1;
    6161+       unsigned        qca_force_16bit_ptw:1;
     
    6363        /* Turn on all power and clocks */
    6464        int (*power_on)(struct platform_device *pdev);
    65 @@ -54,6 +56,7 @@ struct usb_ehci_pdata {
     65@@ -55,6 +57,7 @@ struct usb_ehci_pdata {
    6666         * turn off everything else */
    6767        void (*power_suspend)(struct platform_device *pdev);
     
    7373--- a/drivers/usb/host/ehci-platform.c
    7474+++ b/drivers/usb/host/ehci-platform.c
    75 @@ -48,6 +48,14 @@
     75@@ -48,6 +48,14 @@ struct ehci_platform_priv {
    7676 
    7777 static const char hcd_name[] = "ehci-platform";
     
    8888 {
    8989        struct platform_device *pdev = to_platform_device(hcd->self.controller);
    90 @@ -57,6 +65,12 @@ static int ehci_platform_reset(struct us
    91  
    92         hcd->has_tt = pdata->has_tt;
    93         ehci->has_synopsys_hc_bug = pdata->has_synopsys_hc_bug;
    94 +
    95 +       ehci->qca_force_host_mode = pdata->qca_force_host_mode;
    96 +       ehci->qca_force_16bit_ptw = pdata->qca_force_16bit_ptw;
     90@@ -228,6 +236,13 @@ static int ehci_platform_probe(struct pl
     91                ehci->big_endian_mmio = 1;
     92        if (pdata->ignore_oc)
     93                ehci->ignore_oc = 1;
     94+       if (pdata->qca_force_host_mode)
     95+               ehci->qca_force_host_mode = 1;
     96+       if (pdata->qca_force_16bit_ptw)
     97+               ehci->qca_force_16bit_ptw = 1;
    9798+
    9899+       if (pdata->reset_notifier)
    99100+               ehci->reset_notifier = ehci_platform_reset_notifier;
    100101 
    101         if (pdata->pre_setup) {
    102                 retval = pdata->pre_setup(hcd);
     102 #ifndef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO
     103        if (ehci->big_endian_mmio) {
  • branches/contrib/debian/package-build/linux-patch-ar71xx/patches-3.16/902-unaligned_access_hacks.patch

    r710 r711  
    203203--- a/net/ipv6/tcp_ipv6.c
    204204+++ b/net/ipv6/tcp_ipv6.c
    205 @@ -65,6 +65,8 @@
     205@@ -65,6 +65,9 @@
    206206 #include <net/tcp_memcontrol.h>
    207207 #include <net/busy_poll.h>
     
    209209+#include <asm/unaligned.h>
    210210+#include <asm/uaccess.h>
    211  
     211+
    212212 #include <linux/proc_fs.h>
    213213 #include <linux/seq_file.h>
    214 @@ -771,10 +772,10 @@ static void tcp_v6_send_response(struct
     214 
     215@@ -781,10 +782,10 @@ static void tcp_v6_send_response(struct
    215216        topt = (__be32 *)(t1 + 1);
    216217 
     
    802803--- a/net/ipv6/ip6_fib.c
    803804+++ b/net/ipv6/ip6_fib.c
    804 @@ -144,7 +144,7 @@ static __inline__ __be32 addr_bit_set(co
     805@@ -139,7 +139,7 @@ static __inline__ __be32 addr_bit_set(co
    805806         * See include/asm-generic/bitops/le.h.
    806807         */
     
    810811 }
    811812 
    812  static __inline__ struct fib6_node * node_alloc(void)
     813 static __inline__ struct fib6_node *node_alloc(void)
    813814--- a/net/netfilter/nf_conntrack_proto_tcp.c
    814815+++ b/net/netfilter/nf_conntrack_proto_tcp.c
Note: See TracChangeset for help on using the changeset viewer.