Commit 6d00e6fc authored by Adrian Schmutzler's avatar Adrian Schmutzler Committed by John Crispin

ath79: fix several issues for ZyXEL NBG6716

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: 99835e09 ("ath79: add support for ZyXEL NBG6716")
Signed-off-by: default avatarAdrian Schmutzler <freifunk@adrianschmutzler.de>
parent cd87272e
......@@ -76,21 +76,21 @@
debounce-interval = <60>;
};
wifi_button {
label = "WiFi button";
wifi_button {
label = "WiFi button";
linux,code = <KEY_RFKILL>;
gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
usb1 {
usb1 {
label = "USB1 eject button";
gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
usb2 {
label = "USB2 eject button";
usb2 {
label = "USB2 eject button";
gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
......@@ -105,7 +105,7 @@
};
&gpio {
gpio_usb_power {
usb_power {
gpio-hog;
gpios = <16 0>;
output-high;
......@@ -262,7 +262,7 @@
};
&pcie1 {
status = "okay";
status = "okay";
wifi@0,0 {
compatible = "qcom,ath10k";
......@@ -272,15 +272,15 @@
};
&usb_phy0 {
status = "okay";
status = "okay";
};
&usb_phy1 {
status = "okay";
status = "okay";
};
&usb0 {
status = "okay";
status = "okay";
hub_port0: port@1 {
reg = <1>;
......@@ -290,7 +290,7 @@
};
&usb1 {
status = "okay";
status = "okay";
hub_port1: port@1 {
reg = <1>;
......
include ./common-netgear.mk # for netgear-uImage
# attention: only zlib compression is allowed for the boot fs
define Build/zyxel-buildkerneljffs
rm -rf $(KDIR_TMP)/zyxelnbg6716
mkdir -p $(KDIR_TMP)/zyxelnbg6716/image/boot
cp $@ $(KDIR_TMP)/zyxelnbg6716/image/boot/vmlinux.lzma.uImage
$(STAGING_DIR_HOST)/bin/mkfs.jffs2 \
--big-endian --squash-uids -v -e 128KiB -q -f -n -x lzma -x rtime \
-o $@ \
-d $(KDIR_TMP)/zyxelnbg6716/image
rm -rf $(KDIR_TMP)/zyxelnbg6716
define Build/zyxel-buildkerneljffs
rm -rf $(KDIR_TMP)/zyxelnbg6716
mkdir -p $(KDIR_TMP)/zyxelnbg6716/image/boot
cp $@ $(KDIR_TMP)/zyxelnbg6716/image/boot/vmlinux.lzma.uImage
$(STAGING_DIR_HOST)/bin/mkfs.jffs2 \
--big-endian --squash-uids -v -e 128KiB -q -f -n -x lzma -x rtime \
-o $@ \
-d $(KDIR_TMP)/zyxelnbg6716/image
rm -rf $(KDIR_TMP)/zyxelnbg6716
endef
define Build/zyxel-factory
......@@ -94,6 +94,7 @@ TARGET_DEVICES += netgear_wndr4300
define Device/zyxel_nbg6716
ATH_SOC := qca9558
DEVICE_VENDOR := ZyXEL
DEVICE_MODEL := NBG6716
DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k-ct ath10k-firmware-qca988x-ct
RAS_BOARD := NBG6716
RAS_ROOTFS_SIZE := 29696k
......@@ -104,7 +105,7 @@ define Device/zyxel_nbg6716
KERNEL := kernel-bin | append-dtb | uImage none | \
zyxel-buildkerneljffs | check-size 4096k
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/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | zyxel-factory
UBINIZE_OPTS := -E 5
......
......@@ -3,7 +3,6 @@
[ -e /lib/firmware/$FIRMWARE ] && exit 0
. /lib/functions/caldata.sh
. /lib/functions/k2t.sh
board=$(board_name)
......@@ -12,7 +11,7 @@ case "$FIRMWARE" in
case $board in
zyxel,nbg6716)
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
;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment