[OpenWrt-Devel] [PATCH 2/4] atheros: copy 3.10 patches to 3.14 and refresh them

Sergey Ryazanov ryazanov.s.a at gmail.com
Mon Aug 4 16:40:09 EDT 2014 

Signed-off-by: Sergey Ryazanov <ryazanov.s.a at gmail.com>
---
 target/linux/atheros/{patches-3.10 => patches-3.14}/100-board.patch | 4 ++--
 .../{patches-3.10 => patches-3.14}/101-early-printk-support.patch   | 2 +-
 .../atheros/{patches-3.10 => patches-3.14}/105-ar2315_pci.patch     | 0
 .../{patches-3.10 => patches-3.14}/110-ar2313_ethernet.patch        | 2 +-
 .../linux/atheros/{patches-3.10 => patches-3.14}/120-spiflash.patch | 2 +-
 .../linux/atheros/{patches-3.10 => patches-3.14}/130-watchdog.patch | 6 +++---
 .../{patches-3.10 => patches-3.14}/140-redboot_boardconfig.patch    | 0
 .../{patches-3.10 => patches-3.14}/141-redboot_partition_scan.patch | 0
 .../142-redboot_various_erase_size_fix.patch                        | 0
 .../atheros/{patches-3.10 => patches-3.14}/210-reset_button.patch   | 0
 .../{patches-3.10 => patches-3.14}/220-enet_micrel_workaround.patch | 0
 11 files changed, 8 insertions(+), 8 deletions(-)
 copy target/linux/atheros/{patches-3.10 => patches-3.14}/100-board.patch (99%)
 copy target/linux/atheros/{patches-3.10 => patches-3.14}/101-early-printk-support.patch (97%)
 copy target/linux/atheros/{patches-3.10 => patches-3.14}/105-ar2315_pci.patch (100%)
 copy target/linux/atheros/{patches-3.10 => patches-3.14}/110-ar2313_ethernet.patch (99%)
 copy target/linux/atheros/{patches-3.10 => patches-3.14}/120-spiflash.patch (99%)
 copy target/linux/atheros/{patches-3.10 => patches-3.14}/130-watchdog.patch (97%)
 copy target/linux/atheros/{patches-3.10 => patches-3.14}/140-redboot_boardconfig.patch (100%)
 copy target/linux/atheros/{patches-3.10 => patches-3.14}/141-redboot_partition_scan.patch (100%)
 copy target/linux/atheros/{patches-3.10 => patches-3.14}/142-redboot_various_erase_size_fix.patch (100%)
 copy target/linux/atheros/{patches-3.10 => patches-3.14}/210-reset_button.patch (100%)
 copy target/linux/atheros/{patches-3.10 => patches-3.14}/220-enet_micrel_workaround.patch (100%)

diff --git a/target/linux/atheros/patches-3.10/100-board.patch b/target/linux/atheros/patches-3.14/100-board.patch
similarity index 99%
copy from target/linux/atheros/patches-3.10/100-board.patch
copy to target/linux/atheros/patches-3.14/100-board.patch
index 4a9f31b..a45664a 100644
--- a/target/linux/atheros/patches-3.10/100-board.patch
+++ b/target/linux/atheros/patches-3.14/100-board.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -138,6 +138,19 @@ config BCM63XX
+@@ -144,6 +144,19 @@ config BCM63XX
  	help
  	 Support for BCM63XX based boards
  
@@ -20,7 +20,7 @@
  config MIPS_COBALT
  	bool "Cobalt Server"
  	select CEVT_R4K
-@@ -838,6 +851,7 @@ config NLM_XLP_BOARD
+@@ -795,6 +808,7 @@ config NLM_XLP_BOARD
  
  endchoice
  
diff --git a/target/linux/atheros/patches-3.10/101-early-printk-support.patch b/target/linux/atheros/patches-3.14/101-early-printk-support.patch
similarity index 97%
copy from target/linux/atheros/patches-3.10/101-early-printk-support.patch
copy to target/linux/atheros/patches-3.14/101-early-printk-support.patch
index b347367..d33c3f1 100644
--- a/target/linux/atheros/patches-3.10/101-early-printk-support.patch
+++ b/target/linux/atheros/patches-3.14/101-early-printk-support.patch
@@ -60,7 +60,7 @@
  obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -148,6 +148,7 @@ config ATHEROS_AR231X
+@@ -154,6 +154,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.10/105-ar2315_pci.patch b/target/linux/atheros/patches-3.14/105-ar2315_pci.patch
similarity index 100%
copy from target/linux/atheros/patches-3.10/105-ar2315_pci.patch
copy to target/linux/atheros/patches-3.14/105-ar2315_pci.patch
diff --git a/target/linux/atheros/patches-3.10/110-ar2313_ethernet.patch b/target/linux/atheros/patches-3.14/110-ar2313_ethernet.patch
similarity index 99%
copy from target/linux/atheros/patches-3.10/110-ar2313_ethernet.patch
copy to target/linux/atheros/patches-3.14/110-ar2313_ethernet.patch
index a9dcab2..bda0ce3 100644
--- a/target/linux/atheros/patches-3.10/110-ar2313_ethernet.patch
+++ b/target/linux/atheros/patches-3.14/110-ar2313_ethernet.patch
@@ -16,7 +16,7 @@
  	---help---
  	  If you have a network (Ethernet) card belonging to this class, say Y
  	  and read the Ethernet-HOWTO, available from
-@@ -85,4 +85,10 @@ config ALX
+@@ -80,4 +80,10 @@ config ALX
  	  To compile this driver as a module, choose M here.  The module
  	  will be called alx.
  
diff --git a/target/linux/atheros/patches-3.10/120-spiflash.patch b/target/linux/atheros/patches-3.14/120-spiflash.patch
similarity index 99%
copy from target/linux/atheros/patches-3.10/120-spiflash.patch
copy to target/linux/atheros/patches-3.14/120-spiflash.patch
index 57ab46d..9a55195 100644
--- a/target/linux/atheros/patches-3.10/120-spiflash.patch
+++ b/target/linux/atheros/patches-3.14/120-spiflash.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/Kconfig
 +++ b/drivers/mtd/devices/Kconfig
-@@ -135,6 +135,10 @@ config MTD_BCM47XXSFLASH
+@@ -128,6 +128,10 @@ config MTD_BCM47XXSFLASH
  	  registered by bcma as platform devices. This enables driver for
  	  serial flash memories (only read-only mode is implemented).
  
diff --git a/target/linux/atheros/patches-3.10/130-watchdog.patch b/target/linux/atheros/patches-3.14/130-watchdog.patch
similarity index 97%
copy from target/linux/atheros/patches-3.10/130-watchdog.patch
copy to target/linux/atheros/patches-3.14/130-watchdog.patch
index 13eca59..db824d0 100644
--- a/target/linux/atheros/patches-3.10/130-watchdog.patch
+++ b/target/linux/atheros/patches-3.14/130-watchdog.patch
@@ -212,9 +212,9 @@
 +MODULE_ALIAS("platform:" DRIVER_NAME);
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig
-@@ -1113,6 +1113,13 @@ config LANTIQ_WDT
+@@ -1202,6 +1202,13 @@ config RALINK_WDT
  	help
- 	  Hardware driver for the Lantiq SoC Watchdog Timer.
+ 	  Hardware driver for the Ralink SoC Watchdog Timer.
  
 +config AR2315_WDT
 +	tristate "Atheros AR2315+ WiSoCs Watchdog Timer"
@@ -228,7 +228,7 @@
  # POWERPC Architecture
 --- a/drivers/watchdog/Makefile
 +++ b/drivers/watchdog/Makefile
-@@ -131,6 +131,7 @@ obj-$(CONFIG_GPIO_WDT) += gpio_wdt.o
+@@ -134,6 +134,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.10/140-redboot_boardconfig.patch b/target/linux/atheros/patches-3.14/140-redboot_boardconfig.patch
similarity index 100%
copy from target/linux/atheros/patches-3.10/140-redboot_boardconfig.patch
copy to target/linux/atheros/patches-3.14/140-redboot_boardconfig.patch
diff --git a/target/linux/atheros/patches-3.10/141-redboot_partition_scan.patch b/target/linux/atheros/patches-3.14/141-redboot_partition_scan.patch
similarity index 100%
copy from target/linux/atheros/patches-3.10/141-redboot_partition_scan.patch
copy to target/linux/atheros/patches-3.14/141-redboot_partition_scan.patch
diff --git a/target/linux/atheros/patches-3.10/142-redboot_various_erase_size_fix.patch b/target/linux/atheros/patches-3.14/142-redboot_various_erase_size_fix.patch
similarity index 100%
copy from target/linux/atheros/patches-3.10/142-redboot_various_erase_size_fix.patch
copy to target/linux/atheros/patches-3.14/142-redboot_various_erase_size_fix.patch
diff --git a/target/linux/atheros/patches-3.10/210-reset_button.patch b/target/linux/atheros/patches-3.14/210-reset_button.patch
similarity index 100%
copy from target/linux/atheros/patches-3.10/210-reset_button.patch
copy to target/linux/atheros/patches-3.14/210-reset_button.patch
diff --git a/target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch b/target/linux/atheros/patches-3.14/220-enet_micrel_workaround.patch
similarity index 100%
copy from target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch
copy to target/linux/atheros/patches-3.14/220-enet_micrel_workaround.patch
-- 
1.8.1.5
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

More information about the openwrt-devel mailing list