fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source
This commit is contained in:
CN_SZTL 2020-08-14 21:48:10 +08:00
commit cb5949d7a4
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
12 changed files with 244 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/libs/libselinux/Makefile
View File

@ -17,6 +17,7 @@ HOST_BUILD_DEPENDS:=libsepol/host pcre/host
PKG_MAINTAINER:=Thomas Petazzoni <thomas.petazzoni@bootlin.com>
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk
define Package/libselinux
SECTION:=libs
@ -36,7 +37,6 @@ define Package/libselinux/description
older version supported by the kernel) when loading policy.
endef
include $(INCLUDE_DIR)/host-build.mk
# Needed to link libselinux utilities, which link against
# libselinux.so, which indirectly depends on libpcre.so, installed in

5
package/libs/libsepol/Makefile
View File

@ -16,6 +16,7 @@ PKG_HASH:=ae6778d01443fdd38cd30eeee846494e19f4d407b09872580372f4aa4bf8a3cc
PKG_MAINTAINER:=Thomas Petazzoni <thomas.petazzoni@bootlin.com>
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk
define Package/libsepol
SECTION:=libs
@ -27,9 +28,7 @@ endef
define Package/libsepol/description
Libsepol is the binary policy manipulation library. It doesn't
depend upon or use any of the other SELinux components.
endef #'
include $(INCLUDE_DIR)/host-build.mk
endef
HOST_MAKE_FLAGS += \
PREFIX=$(STAGING_DIR_HOSTPKG) \

10
package/libs/pcre/Makefile
View File

@ -29,6 +29,7 @@ PKG_CONFIG_DEPENDS:=\
include $(INCLUDE_DIR)/uclibc++.mk
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk
define Package/libpcre/default
SECTION:=libs
@ -61,6 +62,14 @@ define Package/libpcrecpp
DEPENDS:=+libpcre $(CXX_DEPENDS)
endef
HOST_CONFIGURE_ARGS += \
--enable-utf8 \
--enable-unicode-properties \
--enable-pcre16 \
--with-match-limit-recursion=16000 \
--enable-cpp
TARGET_CFLAGS += $(FPIC)
CONFIGURE_ARGS += \
@ -117,3 +126,4 @@ $(eval $(call BuildPackage,libpcre))
$(eval $(call BuildPackage,libpcre16))
$(eval $(call BuildPackage,libpcre32))
$(eval $(call BuildPackage,libpcrecpp))
$(eval $(call HostBuild))

56
target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts Normal file
View File

@ -0,0 +1,56 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/;
#include "qca9563_tplink_tl-wpa8630.dtsi"
/ {
compatible = "tplink,tl-wpa8630-v1", "qca,qca9563";
model = "TP-Link TL-WPA8630 v1";
aliases {
label-mac-device = &eth0;
};
};
&keys {
wifi {
label = "WiFi button";
linux,code = <KEY_RFKILL>;
gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
};
&partitions {
uboot: partition@0 {
label = "u-boot";
reg = <0x000000 0x010000>;
read-only;
};
partition@10000 {
compatible = "tplink,firmware";
label = "firmware";
reg = <0x010000 0x7d0000>;
};
partition@7e0000 {
label = "mib0";
reg = <0x7e0000 0x010000>;
read-only;
};
art: partition@7f0000 {
label = "art";
reg = <0x7f0000 0x010000>;
read-only;
};
};
&eth0 {
mtd-mac-address = <&uboot 0x0fc00>;
};
&wmac {
mtd-mac-address = <&uboot 0x0fc00>;
};

122
target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi Normal file
View File

@ -0,0 +1,122 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include "qca956x.dtsi"
/ {
aliases {
led-boot = &led_power;
led-failsafe = &led_power;
led-running = &led_power;
led-upgrade = &led_power;
};
keys: keys {
compatible = "gpio-keys";
reset {
label = "Reset button";
linux,code = <KEY_RESTART>;
gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
leds {
label = "LED control button";
linux,code = <BTN_0>;
gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
pair {
label = "Pair button";
linux,code = <BTN_1>;
gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
};
leds {
compatible = "gpio-leds";
led_power: power {
label = "tp-link:green:power";
gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
};
lan {
label = "tp-link:green:lan";
gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
};
wifi2g {
label = "tp-link:green:wifi2g";
gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy1tpt";
};
wifi5g {
label = "tp-link:green:wifi5g";
gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
};
};
&spi {
status = "okay";
num-cs = <1>;
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <25000000>;
partitions: partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
};
};
};
&pcie {
status = "okay";
};
&uart {
status = "okay";
};
&mdio0 {
status = "okay";
phy-mask = <0>;
phy0: ethernet-phy@0 {
reg = <0>;
phy-mode = "sgmii";
qca,mib-poll-interval = <500>;
qca,ar8327-initvals = <
0x04 0x00080080 /* PORT0 PAD MODE CTRL */
0x7c 0x0000007e /* PORT0_STATUS */
>;
};
};
&eth0 {
status = "okay";
phy-handle = <&phy0>;
phy-mode = "sgmii";
};
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
};

158
target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.dtsi
View File

@ -1,45 +1,12 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include "qca956x.dtsi"
#include "qca9563_tplink_tl-wpa8630.dtsi"
/ {
aliases {
led-boot = &led_power;
led-failsafe = &led_power;
led-running = &led_power;
led-upgrade = &led_power;
label-mac-device = &eth0;
};
leds {
compatible = "gpio-leds";
led_power: power {
label = "tp-link:green:power";
gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
};
wifi2g {
label = "tp-link:green:wifi2g";
gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy1tpt";
};
wifi5g {
label = "tp-link:green:wifi5g";
gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
lan {
label = "tp-link:green:lan";
gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
};
};
gpio-export {
compatible = "gpio-export";
@ -48,118 +15,47 @@
gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
};
};
};
keys {
compatible = "gpio-keys";
reset {
label = "Reset button";
linux,code = <KEY_RESTART>;
gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
pair {
label = "Pair button";
linux,code = <BTN_1>;
gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
leds {
label = "LED control button";
linux,code = <BTN_0>;
gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
wps {
label = "WPS button";
linux,code = <KEY_WPS_BUTTON>;
gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
&keys {
wps {
label = "WPS button";
linux,code = <KEY_WPS_BUTTON>;
gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
};
&spi {
status = "okay";
num-cs = <1>;
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <25000000>;
partitions: partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "factory-uboot";
reg = <0x000000 0x020000>;
read-only;
};
partition@20000 {
label = "u-boot";
reg = <0x020000 0x020000>;
read-only;
};
partition@40000 {
compatible = "tplink,firmware";
label = "firmware";
reg = <0x040000 0x5e0000>;
};
partition@620000 {
label = "partition-table";
reg = <0x620000 0x010000>;
read-only;
};
};
&partitions {
partition@0 {
label = "factory-uboot";
reg = <0x000000 0x020000>;
read-only;
};
};
&pcie {
status = "okay";
};
partition@20000 {
label = "u-boot";
reg = <0x020000 0x020000>;
read-only;
};
&uart {
status = "okay";
};
partition@40000 {
compatible = "tplink,firmware";
label = "firmware";
reg = <0x040000 0x5e0000>;
};
&mdio0 {
status = "okay";
phy-mask = <0>;
phy0: ethernet-phy@0 {
reg = <0>;
phy-mode = "sgmii";
qca,mib-poll-interval = <500>;
qca,ar8327-initvals = <
0x04 0x00080080 /* PORT0 PAD MODE CTRL */
0x7c 0x0000007e /* PORT0_STATUS */
>;
partition@620000 {
label = "partition-table";
reg = <0x620000 0x010000>;
read-only;
};
};
&eth0 {
status = "okay";
phy-handle = <&phy0>;
phy-mode = "sgmii";
mtd-mac-address = <&mac 0x8>;
};
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&mac 0x8>;
};

1
target/linux/ath79/generic/base-files/etc/board.d/01_leds
View File

@ -297,6 +297,7 @@ tplink,tl-mr6400-v1)
ucidef_set_led_netdev "wan" "WAN" "tp-link:white:wan" "eth1"
ucidef_set_led_netdev "4g" "4G" "tp-link:white:4g" "usb0"
;;
tplink,tl-wpa8630-v1|\
tplink,tl-wpa8630p-v2-eu|\
tplink,tl-wpa8630p-v2-int)
ucidef_set_led_switch "lan" "LAN" "tp-link:green:lan" "switch0" "0x3c"

1
target/linux/ath79/generic/base-files/etc/board.d/02_network
View File

@ -294,6 +294,7 @@ ath79_setup_interfaces()
ucidef_add_switch "switch0" \
"0@eth0" "1:lan:1" "2:lan:3" "3:lan:2"
;;
tplink,tl-wpa8630-v1|\
tplink,tl-wpa8630p-v2-eu|\
tplink,tl-wpa8630p-v2-int)
# port 5 (internal) is the power-line port

4
target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
View File

@ -129,6 +129,10 @@ case "$FIRMWARE" in
caldata_extract "art" 0x5000 0x844
ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary info 0x8) +1)
;;
tplink,tl-wpa8630-v1)
caldata_extract "art" 0x5000 0x844
ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary u-boot 0x0fc00) +1)
;;
tplink,tl-wr902ac-v1)
caldata_extract "art" 0x5000 0x844
ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary tplink 0x8) -1)

4
target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration
View File

@ -45,6 +45,10 @@ tplink,re355-v1)
tplink,re450-v1)
migrate_leds "re450:=tp-link:"
;;
tplink,tl-wpa8630-v1)
migrate_leds "^tl-wpa8630:=tp-link:" \
':wlan$=:wifi2g' ':wlan5$=:wifi5g'
;;
wd,mynet-n750)
migrate_leds "wd:=mynet-n750:"
;;

11
target/linux/ath79/image/generic-tp-link.mk
View File

@ -500,6 +500,17 @@ define Device/tplink_tl-wdr4900-v2
endef
TARGET_DEVICES += tplink_tl-wdr4900-v2
define Device/tplink_tl-wpa8630-v1
$(Device/tplink-8mlzma)
SOC := qca9563
DEVICE_MODEL := TL-WPA8630
DEVICE_VARIANT := v1
DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
TPLINK_HWID := 0x86300001
SUPPORTED_DEVICES += tl-wpa8630
endef
TARGET_DEVICES += tplink_tl-wpa8630-v1
define Device/tplink_tl-wpa8630p-v2
$(Device/tplink-safeloader)
SOC := qca9563

14
target/linux/mpc85xx/base-files/etc/hotplug.d/ieee80211/10-fix-wifi-mac
View File

@ -1,10 +1,10 @@
#!/bin/ash
[ "$ACTION" == "add" ] || exit 0
[ "$ACTION" = "add" ] || exit 0
PHYNBR=${DEVPATH##*/phy}
[ -n $PHYNBR ] || exit 0
[ -n "$PHYNBR" ] || exit 0
. /lib/functions.sh
. /lib/functions/system.sh
@ -13,16 +13,12 @@ board=$(board_name)
case "$board" in
enterasys,ws-ap3710i)
echo $(mtd_get_mac_ascii cfg2 RADIOADDR${PHYNBR}) > /sys${DEVPATH}/macaddress
mtd_get_mac_ascii cfg2 RADIOADDR${PHYNBR} > /sys${DEVPATH}/macaddress
;;
ocedo,panda)
WMAC=wmac$(($PHYNBR + 1))
MAC=$(mtd_get_mac_ascii uboot-env0 ${WMAC})
echo ${MAC} > /sys${DEVPATH}/macaddress
mtd_get_mac_ascii uboot-env0 wmac$(($PHYNBR + 1)) > /sys${DEVPATH}/macaddress
;;
sophos,red-15w-rev1)
echo $(mtd_get_mac_ascii u-boot-env ethaddr) > /sys${DEVPATH}/macaddress
;;
*)
mtd_get_mac_ascii u-boot-env ethaddr > /sys${DEVPATH}/macaddress
;;
esac