diff options
| author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2019-10-28 00:30:51 +0100 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2019-11-02 20:51:56 +0100 |
| commit | 6d00e6fc7bc598daea83c5a5582daf3d081af87f (patch) | |
| tree | d1115093d84fb36c6bc4827e4e1b45648bf25688 /target/linux/ath79/image/nand.mk | |
| parent | cd87272eb241b1ea7955c1631ad2bb8d38e9fae9 (diff) | |
| download | upstream-6d00e6fc7bc598daea83c5a5582daf3d081af87f.tar.gz upstream-6d00e6fc7bc598daea83c5a5582daf3d081af87f.tar.bz2 upstream-6d00e6fc7bc598daea83c5a5582daf3d081af87f.zip | |
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: 99835e09992b ("ath79: add support for ZyXEL NBG6716")
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/ath79/image/nand.mk')
| -rw-r--r-- | target/linux/ath79/image/nand.mk | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk index 0f7514060e..ef6b607002 100644 --- a/target/linux/ath79/image/nand.mk +++ b/target/linux/ath79/image/nand.mk @@ -1,15 +1,15 @@ 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 |