Signed-off-by: Sergey Ryazanov <ryazanov....@gmail.com>
---
target/linux/atheros/{config-3.14 => config-3.18} | 10 +++++++---
.../atheros/{patches-3.14 => patches-3.18}/100-board.patch | 4 ++--
.../101-early-printk-support.patch | 2 +-
.../{patches-3.14 => patches-3.18}/102-ar5312_gpio.patch | 4 ++--
.../{patches-3.14 => patches-3.18}/103-ar2315_gpio.patch | 4 ++--
.../{patches-3.14 => patches-3.18}/105-ar2315_pci.patch | 2 +-
.../{patches-3.14 => patches-3.18}/110-ar2313_ethernet.patch | 0
.../atheros/{patches-3.14 => patches-3.18}/120-spiflash.patch | 8 ++++----
.../atheros/{patches-3.14 => patches-3.18}/130-watchdog.patch | 4 ++--
.../140-redboot_boardconfig.patch | 0
.../141-redboot_partition_scan.patch | 0
.../142-redboot_various_erase_size_fix.patch | 0
.../{patches-3.14 => patches-3.18}/210-reset_button.patch | 0
.../220-enet_micrel_workaround.patch | 0
14 files changed, 21 insertions(+), 17 deletions(-)
copy target/linux/atheros/{config-3.14 => config-3.18} (94%)
copy target/linux/atheros/{patches-3.14 => patches-3.18}/100-board.patch (99%)
copy target/linux/atheros/{patches-3.14 =>
patches-3.18}/101-early-printk-support.patch (97%)
copy target/linux/atheros/{patches-3.14 => patches-3.18}/102-ar5312_gpio.patch
(98%)
copy target/linux/atheros/{patches-3.14 => patches-3.18}/103-ar2315_gpio.patch
(98%)
copy target/linux/atheros/{patches-3.14 => patches-3.18}/105-ar2315_pci.patch
(99%)
copy target/linux/atheros/{patches-3.14 =>
patches-3.18}/110-ar2313_ethernet.patch (100%)
copy target/linux/atheros/{patches-3.14 => patches-3.18}/120-spiflash.patch
(98%)
copy target/linux/atheros/{patches-3.14 => patches-3.18}/130-watchdog.patch
(98%)
copy target/linux/atheros/{patches-3.14 =>
patches-3.18}/140-redboot_boardconfig.patch (100%)
copy target/linux/atheros/{patches-3.14 =>
patches-3.18}/141-redboot_partition_scan.patch (100%)
copy target/linux/atheros/{patches-3.14 =>
patches-3.18}/142-redboot_various_erase_size_fix.patch (100%)
copy target/linux/atheros/{patches-3.14 =>
patches-3.18}/210-reset_button.patch (100%)
copy target/linux/atheros/{patches-3.14 =>
patches-3.18}/220-enet_micrel_workaround.patch (100%)
diff --git a/target/linux/atheros/config-3.14 b/target/linux/atheros/config-3.18
similarity index 94%
copy from target/linux/atheros/config-3.14
copy to target/linux/atheros/config-3.18
index 7df31e9..f795430 100644
--- a/target/linux/atheros/config-3.14
+++ b/target/linux/atheros/config-3.18
@@ -4,6 +4,7 @@ CONFIG_AR8216_PHY=y
CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
CONFIG_ARCH_DISCARD_MEMBLOCK=y
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+# CONFIG_ARCH_HAS_SG_CHAIN is not set
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
@@ -25,6 +26,7 @@ CONFIG_CPU_HAS_SYNC=y
CONFIG_CPU_MIPS32=y
CONFIG_CPU_MIPS32_R1=y
CONFIG_CPU_MIPSR1=y
+CONFIG_CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS=y
CONFIG_CPU_R4K_CACHE_TLB=y
CONFIG_CPU_R4K_FPU=y
CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
@@ -49,12 +51,14 @@ CONFIG_GPIO_SYSFS=y
CONFIG_HARDWARE_WATCHPOINTS=y
CONFIG_HAS_DMA=y
CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
+CONFIG_HAS_IOPORT_MAP=y
# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
CONFIG_HAVE_ARCH_JUMP_LABEL=y
CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
+CONFIG_HAVE_BPF_JIT=y
CONFIG_HAVE_CC_STACKPROTECTOR=y
CONFIG_HAVE_CONTEXT_TRACKING=y
CONFIG_HAVE_C_RECORDMCOUNT=y
@@ -62,11 +66,11 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
CONFIG_HAVE_DMA_API_DEBUG=y
CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
CONFIG_HAVE_DYNAMIC_FTRACE=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_HAVE_IDE=y
CONFIG_HAVE_MEMBLOCK=y
@@ -91,7 +95,6 @@ CONFIG_MIPS=y
# CONFIG_MIPS_HUGE_TLB_SUPPORT is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
# CONFIG_MIPS_MACHINE is not set
-CONFIG_MIPS_MT_DISABLED=y
CONFIG_MODULES_USE_ELF_REL=y
CONFIG_MTD_AR2315=y
CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -106,6 +109,7 @@ CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEED_PER_CPU_KM=y
CONFIG_NET_AR231X=y
CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
+# CONFIG_NO_IOPORT_MAP is not set
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PCI=y
CONFIG_PCI_AR2315=y
diff --git a/target/linux/atheros/patches-3.14/100-board.patch
b/target/linux/atheros/patches-3.18/100-board.patch
similarity index 99%
copy from target/linux/atheros/patches-3.14/100-board.patch
copy to target/linux/atheros/patches-3.18/100-board.patch
index 32b6dc8..1dba78d 100644
--- a/target/linux/atheros/patches-3.14/100-board.patch
+++ b/target/linux/atheros/patches-3.18/100-board.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -144,6 +144,19 @@ config BCM63XX
+@@ -154,6 +154,19 @@ config BCM63XX
help
Support for BCM63XX based boards
@@ -20,7 +20,7 @@
config MIPS_COBALT
bool "Cobalt Server"
select CEVT_R4K
-@@ -795,6 +808,7 @@ config NLM_XLP_BOARD
+@@ -834,6 +847,7 @@ config MIPS_PARAVIRT
endchoice
diff --git a/target/linux/atheros/patches-3.14/101-early-printk-support.patch
b/target/linux/atheros/patches-3.18/101-early-printk-support.patch
similarity index 97%
copy from target/linux/atheros/patches-3.14/101-early-printk-support.patch
copy to target/linux/atheros/patches-3.18/101-early-printk-support.patch
index 032ffe7..665091f 100644
--- a/target/linux/atheros/patches-3.14/101-early-printk-support.patch
+++ b/target/linux/atheros/patches-3.18/101-early-printk-support.patch
@@ -60,7 +60,7 @@
obj-$(CONFIG_SOC_AR2315) += ar2315.o
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -154,6 +154,7 @@ config ATHEROS_AR231X
+@@ -164,6 +164,7 @@ config ATHEROS_AR231X
select SYS_SUPPORTS_BIG_ENDIAN
select SYS_SUPPORTS_32BIT_KERNEL
select ARCH_REQUIRE_GPIOLIB
diff --git a/target/linux/atheros/patches-3.14/102-ar5312_gpio.patch
b/target/linux/atheros/patches-3.18/102-ar5312_gpio.patch
similarity index 98%
copy from target/linux/atheros/patches-3.14/102-ar5312_gpio.patch
copy to target/linux/atheros/patches-3.18/102-ar5312_gpio.patch
index 79fdfa1..b84ff31 100644
--- a/target/linux/atheros/patches-3.14/102-ar5312_gpio.patch
+++ b/target/linux/atheros/patches-3.18/102-ar5312_gpio.patch
@@ -44,7 +44,7 @@
platform_device_register(&ar5312_gpio_leds);
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
-@@ -108,6 +108,13 @@ config GPIO_MAX730X
+@@ -112,6 +112,13 @@ config GPIO_MAX730X
comment "Memory mapped GPIO drivers:"
@@ -60,7 +60,7 @@
depends on ARCH_CLPS711X || COMPILE_TEST
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_GPIO_ADNP) += gpio-adnp.o
+@@ -17,6 +17,7 @@ obj-$(CONFIG_GPIO_ADNP) += gpio-adnp.o
obj-$(CONFIG_GPIO_ADP5520) += gpio-adp5520.o
obj-$(CONFIG_GPIO_ADP5588) += gpio-adp5588.o
obj-$(CONFIG_GPIO_AMD8111) += gpio-amd8111.o
diff --git a/target/linux/atheros/patches-3.14/103-ar2315_gpio.patch
b/target/linux/atheros/patches-3.18/103-ar2315_gpio.patch
similarity index 98%
copy from target/linux/atheros/patches-3.14/103-ar2315_gpio.patch
copy to target/linux/atheros/patches-3.18/103-ar2315_gpio.patch
index 79feefa..38588ee 100644
--- a/target/linux/atheros/patches-3.14/103-ar2315_gpio.patch
+++ b/target/linux/atheros/patches-3.18/103-ar2315_gpio.patch
@@ -53,7 +53,7 @@
platform_device_register(&ar2315_spiflash);
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
-@@ -108,6 +108,13 @@ config GPIO_MAX730X
+@@ -112,6 +112,13 @@ config GPIO_MAX730X
comment "Memory mapped GPIO drivers:"
@@ -69,7 +69,7 @@
default y if SOC_AR5312
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_GPIO_ADNP) += gpio-adnp.o
+@@ -17,6 +17,7 @@ obj-$(CONFIG_GPIO_ADNP) += gpio-adnp.o
obj-$(CONFIG_GPIO_ADP5520) += gpio-adp5520.o
obj-$(CONFIG_GPIO_ADP5588) += gpio-adp5588.o
obj-$(CONFIG_GPIO_AMD8111) += gpio-amd8111.o
diff --git a/target/linux/atheros/patches-3.14/105-ar2315_pci.patch
b/target/linux/atheros/patches-3.18/105-ar2315_pci.patch
similarity index 99%
copy from target/linux/atheros/patches-3.14/105-ar2315_pci.patch
copy to target/linux/atheros/patches-3.18/105-ar2315_pci.patch
index 95d00a3..a0c157e 100644
--- a/target/linux/atheros/patches-3.14/105-ar2315_pci.patch
+++ b/target/linux/atheros/patches-3.18/105-ar2315_pci.patch
@@ -7,7 +7,7 @@
+obj-$(CONFIG_PCI_AR2315) += pci-ar2315.o
obj-$(CONFIG_SOC_AR71XX) += pci-ar71xx.o
obj-$(CONFIG_PCI_AR724X) += pci-ar724x.o
-
+ obj-$(CONFIG_MIPS_PCI_VIRTIO) += pci-virtio-guest.o
--- /dev/null
+++ b/arch/mips/pci/pci-ar2315.c
@@ -0,0 +1,345 @@
diff --git a/target/linux/atheros/patches-3.14/110-ar2313_ethernet.patch
b/target/linux/atheros/patches-3.18/110-ar2313_ethernet.patch
similarity index 100%
copy from target/linux/atheros/patches-3.14/110-ar2313_ethernet.patch
copy to target/linux/atheros/patches-3.18/110-ar2313_ethernet.patch
diff --git a/target/linux/atheros/patches-3.14/120-spiflash.patch
b/target/linux/atheros/patches-3.18/120-spiflash.patch
similarity index 98%
copy from target/linux/atheros/patches-3.14/120-spiflash.patch
copy to target/linux/atheros/patches-3.18/120-spiflash.patch
index fb62169..35e659c 100644
--- a/target/linux/atheros/patches-3.14/120-spiflash.patch
+++ b/target/linux/atheros/patches-3.18/120-spiflash.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/Kconfig
+++ b/drivers/mtd/devices/Kconfig
-@@ -128,6 +128,10 @@ config MTD_BCM47XXSFLASH
+@@ -120,6 +120,10 @@ config MTD_BCM47XXSFLASH
registered by bcma as platform devices. This enables driver for
serial flash memories (only read-only mode is implemented).
@@ -13,13 +13,13 @@
help
--- a/drivers/mtd/devices/Makefile
+++ b/drivers/mtd/devices/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_MTD_M25P80) += m25p80.o
- obj-$(CONFIG_MTD_NAND_OMAP_BCH) += elm.o
+@@ -14,6 +14,7 @@ obj-$(CONFIG_MTD_DATAFLASH) += mtd_dataf
+ obj-$(CONFIG_MTD_M25P80) += m25p80.o
obj-$(CONFIG_MTD_SPEAR_SMI) += spear_smi.o
obj-$(CONFIG_MTD_SST25L) += sst25l.o
+obj-$(CONFIG_MTD_AR2315) += ar2315.o
obj-$(CONFIG_MTD_BCM47XXSFLASH) += bcm47xxsflash.o
-
+ obj-$(CONFIG_MTD_ST_SPI_FSM) += st_spi_fsm.o
--- /dev/null
+++ b/drivers/mtd/devices/ar2315.c
diff --git a/target/linux/atheros/patches-3.14/130-watchdog.patch
b/target/linux/atheros/patches-3.18/130-watchdog.patch
similarity index 98%
copy from target/linux/atheros/patches-3.14/130-watchdog.patch
copy to target/linux/atheros/patches-3.18/130-watchdog.patch
index 8d65ffa..65ea7d3 100644
--- a/target/linux/atheros/patches-3.14/130-watchdog.patch
+++ b/target/linux/atheros/patches-3.18/130-watchdog.patch
@@ -212,7 +212,7 @@
+MODULE_ALIAS("platform:" DRIVER_NAME);
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
-@@ -1202,6 +1202,13 @@ config RALINK_WDT
+@@ -1257,6 +1257,13 @@ config RALINK_WDT
help
Hardware driver for the Ralink SoC Watchdog Timer.
@@ -228,7 +228,7 @@
# POWERPC Architecture
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
-@@ -134,6 +134,7 @@ obj-$(CONFIG_GPIO_WDT) += old_gpio_wdt.o
+@@ -138,6 +138,7 @@ obj-$(CONFIG_GPIO_WDT) += old_gpio_wdt.o
obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o
obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
diff --git a/target/linux/atheros/patches-3.14/140-redboot_boardconfig.patch
b/target/linux/atheros/patches-3.18/140-redboot_boardconfig.patch
similarity index 100%
copy from target/linux/atheros/patches-3.14/140-redboot_boardconfig.patch
copy to target/linux/atheros/patches-3.18/140-redboot_boardconfig.patch
diff --git a/target/linux/atheros/patches-3.14/141-redboot_partition_scan.patch
b/target/linux/atheros/patches-3.18/141-redboot_partition_scan.patch
similarity index 100%
copy from target/linux/atheros/patches-3.14/141-redboot_partition_scan.patch
copy to target/linux/atheros/patches-3.18/141-redboot_partition_scan.patch
diff --git
a/target/linux/atheros/patches-3.14/142-redboot_various_erase_size_fix.patch
b/target/linux/atheros/patches-3.18/142-redboot_various_erase_size_fix.patch
similarity index 100%
copy from
target/linux/atheros/patches-3.14/142-redboot_various_erase_size_fix.patch
copy to
target/linux/atheros/patches-3.18/142-redboot_various_erase_size_fix.patch
diff --git a/target/linux/atheros/patches-3.14/210-reset_button.patch
b/target/linux/atheros/patches-3.18/210-reset_button.patch
similarity index 100%
copy from target/linux/atheros/patches-3.14/210-reset_button.patch
copy to target/linux/atheros/patches-3.18/210-reset_button.patch
diff --git a/target/linux/atheros/patches-3.14/220-enet_micrel_workaround.patch
b/target/linux/atheros/patches-3.18/220-enet_micrel_workaround.patch
similarity index 100%
copy from target/linux/atheros/patches-3.14/220-enet_micrel_workaround.patch
copy to target/linux/atheros/patches-3.18/220-enet_micrel_workaround.patch
--
2.0.4
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
