Backups/immortalwrt-mt798x
1
0
Fork 0
mirror of https://github.com/hanwckf/immortalwrt-mt798x.git synced 2025-01-10 03:09:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ath79: fix several issues for ZyXEL NBG6716

Browse Source 
This fixes several issues introduced with ZyXEL NBG6716 support:
- Inhomogeneous indent
- Wrong ath10k MAC patching function
- Wrong brackets for pad-to in nand.mk
- Add missing DEVICE_MODEL
- Remove k2t.sh include (copy/paste leftover)

Fixes: 99835e09992b ("ath79: add support for ZyXEL NBG6716")

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2019-10-28 00:30:51 +01:00 committed by John Crispin
parent cd87272eb2
commit 6d00e6fc7b
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
View File

@ -76,21 +76,21 @@
debounce-interval = <60>; debounce-interval = <60>;
}; };
wifi_button { wifi_button {
label = "WiFi button"; label = "WiFi button";
linux,code = <KEY_RFKILL>; linux,code = <KEY_RFKILL>;
gpios = <&gpio 1 GPIO_ACTIVE_LOW>; gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
debounce-interval = <60>; debounce-interval = <60>;
}; };
usb1 { usb1 {
label = "USB1 eject button"; label = "USB1 eject button";
gpios = <&gpio 0 GPIO_ACTIVE_LOW>; gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
debounce-interval = <60>; debounce-interval = <60>;
}; };
usb2 { usb2 {
label = "USB2 eject button"; label = "USB2 eject button";
gpios = <&gpio 14 GPIO_ACTIVE_LOW>; gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
debounce-interval = <60>; debounce-interval = <60>;
}; };
@ -105,7 +105,7 @@
}; };
&gpio { &gpio {
gpio_usb_power { usb_power {
gpio-hog; gpio-hog;
gpios = <16 0>; gpios = <16 0>;
output-high; output-high;
@ -262,7 +262,7 @@
}; };
&pcie1 { &pcie1 {
status = "okay"; status = "okay";
wifi@0,0 { wifi@0,0 {
compatible = "qcom,ath10k"; compatible = "qcom,ath10k";
@ -272,15 +272,15 @@
}; };
&usb_phy0 { &usb_phy0 {
status = "okay"; status = "okay";
}; };
&usb_phy1 { &usb_phy1 {
status = "okay"; status = "okay";
}; };
&usb0 { &usb0 {
status = "okay"; status = "okay";
hub_port0: port@1 { hub_port0: port@1 {
reg = <1>; reg = <1>;
@ -290,7 +290,7 @@
}; };
&usb1 { &usb1 {
status = "okay"; status = "okay";
hub_port1: port@1 { hub_port1: port@1 {
reg = <1>; reg = <1>;

21
target/linux/ath79/image/nand.mk
View File

@ -1,15 +1,15 @@
include ./common-netgear.mk # for netgear-uImage include ./common-netgear.mk # for netgear-uImage
# attention: only zlib compression is allowed for the boot fs # attention: only zlib compression is allowed for the boot fs
define Build/zyxel-buildkerneljffs define Build/zyxel-buildkerneljffs
rm -rf $(KDIR_TMP)/zyxelnbg6716 rm -rf $(KDIR_TMP)/zyxelnbg6716
mkdir -p $(KDIR_TMP)/zyxelnbg6716/image/boot mkdir -p $(KDIR_TMP)/zyxelnbg6716/image/boot
cp $@ $(KDIR_TMP)/zyxelnbg6716/image/boot/vmlinux.lzma.uImage cp $@ $(KDIR_TMP)/zyxelnbg6716/image/boot/vmlinux.lzma.uImage
$(STAGING_DIR_HOST)/bin/mkfs.jffs2 \ $(STAGING_DIR_HOST)/bin/mkfs.jffs2 \
--big-endian --squash-uids -v -e 128KiB -q -f -n -x lzma -x rtime \ --big-endian --squash-uids -v -e 128KiB -q -f -n -x lzma -x rtime \
-o $@ \ -o $@ \
-d $(KDIR_TMP)/zyxelnbg6716/image -d $(KDIR_TMP)/zyxelnbg6716/image
rm -rf $(KDIR_TMP)/zyxelnbg6716 rm -rf $(KDIR_TMP)/zyxelnbg6716
endef endef
define Build/zyxel-factory define Build/zyxel-factory
@ -94,6 +94,7 @@ TARGET_DEVICES += netgear_wndr4300
define Device/zyxel_nbg6716 define Device/zyxel_nbg6716
ATH_SOC := qca9558 ATH_SOC := qca9558
DEVICE_VENDOR := ZyXEL DEVICE_VENDOR := ZyXEL
DEVICE_MODEL := NBG6716
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct
RAS_BOARD := NBG6716 RAS_BOARD := NBG6716
RAS_ROOTFS_SIZE := 29696k RAS_ROOTFS_SIZE := 29696k
@ -104,7 +105,7 @@ define Device/zyxel_nbg6716
KERNEL := kernel-bin | append-dtb | uImage none | \ KERNEL := kernel-bin | append-dtb | uImage none | \
zyxel-buildkerneljffs | check-size 4096k zyxel-buildkerneljffs | check-size 4096k
IMAGES := sysupgrade.tar sysupgrade-4M-Kernel.bin factory.bin IMAGES := sysupgrade.tar sysupgrade-4M-Kernel.bin factory.bin
IMAGE/sysupgrade.tar/squashfs := append-rootfs | pad-to $$$${BLOCKSIZE} | sysupgrade-tar rootfs=$$$$@ | append-metadata IMAGE/sysupgrade.tar/squashfs := append-rootfs | pad-to $$$$(BLOCKSIZE) | sysupgrade-tar rootfs=$$$$@ | append-metadata
IMAGE/sysupgrade-4M-Kernel.bin/squashfs := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | pad-to 263192576 | gzip IMAGE/sysupgrade-4M-Kernel.bin/squashfs := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | pad-to 263192576 | gzip
IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | zyxel-factory IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | zyxel-factory
UBINIZE_OPTS := -E 5 UBINIZE_OPTS := -E 5

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

@ -3,7 +3,6 @@
[ -e /lib/firmware/$FIRMWARE ] && exit 0 [ -e /lib/firmware/$FIRMWARE ] && exit 0
. /lib/functions/caldata.sh . /lib/functions/caldata.sh
. /lib/functions/k2t.sh
board=$(board_name) board=$(board_name)
@ -12,7 +11,7 @@ case "$FIRMWARE" in
case $board in case $board in
zyxel,nbg6716) zyxel,nbg6716)
caldata_extract "art" 0x5000 0x844 caldata_extract "art" 0x5000 0x844
ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +1) ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +1)
;; ;;
esac esac
;; ;;