Pārlūkot izejas kodu

Update OpenWrt base

Matthias Schiffer 8 gadi atpakaļ
vecāks
revīzija
912ab30d3a

+ 1 - 1
modules

@@ -1,7 +1,7 @@
 GLUON_FEEDS='openwrt gluon routing luci'
 
 OPENWRT_REPO=git://git.openwrt.org/15.05/openwrt.git
-OPENWRT_COMMIT=12a75ad198a96ec39e98fa1fdd3740aa1316a255
+OPENWRT_COMMIT=48e7befbddb933d6cb046ec074470bbccdb060da
 
 PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git
 PACKAGES_OPENWRT_COMMIT=bc424ae8577ec10808cc5645eea700ebddf5183f

+ 1 - 1
patches/openwrt/0001-tools-Makefile-fix-host-tools-build-dependencies.patch

@@ -3,7 +3,7 @@ Date: Sat, 26 Jul 2014 06:10:23 +0200
 Subject: tools/Makefile: fix host tools build dependencies
 
 diff --git a/tools/Makefile b/tools/Makefile
-index 2f516d2..9416069 100644
+index d2fe2ff..c6cded8 100644
 --- a/tools/Makefile
 +++ b/tools/Makefile
 @@ -95,10 +95,16 @@ define PrepareStaging

+ 17 - 3
patches/openwrt/0005-ath10k-add-Candelatech-community-firmware-as-an-additional-choice.patch

@@ -3,7 +3,7 @@ Date: Tue, 10 Mar 2015 13:17:14 +0100
 Subject: ath10k: add Candelatech community firmware as an additional choice
 
 diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
-index 2af5d39..5b85971 100644
+index 1f15b40..c9cd289 100644
 --- a/package/kernel/mac80211/Makefile
 +++ b/package/kernel/mac80211/Makefile
 @@ -604,6 +604,14 @@ This module adds support for wireless adapters based on
@@ -21,7 +21,7 @@ index 2af5d39..5b85971 100644
  define KernelPackage/ath10k
    $(call KernelPackage/mac80211/Default)
    TITLE:=Atheros 802.11ac wireless cards support
-@@ -624,13 +632,31 @@ endef
+@@ -624,21 +632,37 @@ endef
  define KernelPackage/ath10k/config
    if PACKAGE_kmod-ath10k
  
@@ -51,11 +51,19 @@ index 2af5d39..5b85971 100644
 +		  Supports both AP and IBSS (ad-hoc) mode. Doesn't support
 +		  encryption when using multiple VIFs.
  
+ 	config ATH10K_API2_FW
+ 		bool "Firmware optimized for AP operation (v10.1 / API v2)"
+-		default n
+-		depends on !ATH10K_STA_FW
+ 		help
+ 		  Use the ath10k firmware from the 10.1 SDK using API v2 optimized
+ 		  for access point operation if the default firmware keeps crashing.
+ 
 +	endchoice
    endif
  endef
  
-@@ -1858,14 +1884,20 @@ define KernelPackage/ath10k/install
+@@ -1866,18 +1890,25 @@ define KernelPackage/ath10k/install
  	$(INSTALL_DATA) \
  		$(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/ath10k/QCA988X/hw2.0/board.bin \
  		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/
@@ -68,6 +76,12 @@ index 2af5d39..5b85971 100644
  	$(INSTALL_DATA) \
  		$(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/main/firmware-2.bin_999.999.0.636 \
  		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-2.bin
+-else ifeq ($(CONFIG_ATH10K_API2_FW),y)
++endif
++ifeq ($(CONFIG_ATH10K_API2_FW),y)
+ 	$(INSTALL_DATA) \
+ 		$(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/10.1/firmware-2.bin_10.1.467.2-1 \
+ 		$(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-2.bin
 -else
 +endif
 +ifeq ($(CONFIG_ATH10K_CT_COMMUNITY_FW),y)

+ 3 - 3
patches/openwrt/0009-ar71xx-add-support-for-tp-link-wr740n-v5.0-EU.patch

@@ -10,10 +10,10 @@ tested it on my own v5.0 router and it works.
 Signed-off-by: Daniel Petre <daniel.petre@posteo.net>
 
 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index a2a66b8..3cab3bd 100644
+index 3c77465..8fc9f4c 100644
 --- a/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
-@@ -459,6 +459,14 @@ define Device/tl-wr740n-v4
+@@ -476,6 +476,14 @@ define Device/tl-wr740n-v4
      CONSOLE := ttyATH0,115200
  endef
  
@@ -28,7 +28,7 @@ index a2a66b8..3cab3bd 100644
  define Device/tl-wr741nd-v1
      $(Device/tplink-4m)
      BOARDNAME := TL-WR741ND
-@@ -488,7 +496,7 @@ define Device/tl-wr743nd-v2
+@@ -505,7 +513,7 @@ define Device/tl-wr743nd-v2
      TPLINK_HWID := 0x07430002
      CONSOLE := ttyATH0,115200
  endef

+ 3 - 3
patches/openwrt/0010-ar71xx-add-support-for-TL-WR741ND-v5.patch

@@ -6,10 +6,10 @@ This device is identical to the TL-WR740N v5, it even uses the same HWID (which
 wasn't the case for older TL-WR741ND revisions).
 
 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index 3cab3bd..8a2b964 100644
+index 8fc9f4c..b45f9b2 100644
 --- a/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
-@@ -489,6 +489,14 @@ define Device/tl-wr741nd-v4
+@@ -506,6 +506,14 @@ define Device/tl-wr741nd-v4
      CONSOLE := ttyATH0,115200
  endef
  
@@ -24,7 +24,7 @@ index 3cab3bd..8a2b964 100644
  define Device/tl-wr743nd-v2
      $(Device/tplink-4mlzma)
      BOARDNAME := TL-WR741ND-v4
-@@ -496,7 +504,7 @@ define Device/tl-wr743nd-v2
+@@ -513,7 +521,7 @@ define Device/tl-wr743nd-v2
      TPLINK_HWID := 0x07430002
      CONSOLE := ttyATH0,115200
  endef

+ 1 - 1
patches/openwrt/0015-ar71xx-fix-wndr3700_board_detect-for-some-NETGEAR-WNDR3700v2.patch

@@ -12,7 +12,7 @@ setting LC_CTYPE=C (probably not strictly necessary on OpenWrt, but will
 definitely work like this, even when awk supports locales and LANG is set).
 
 diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index 8f4bb40..392f498 100755
+index 4c10ab2..5617aa6 100755
 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
 +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
 @@ -38,7 +38,7 @@ wndr3700_board_detect() {