On 10/27/19 4:30 PM, Adrian Schmutzler wrote:
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 <freif...@adrianschmutzler.de>
---
  .../linux/ath79/dts/qca9558_zyxel_nbg6716.dts | 22 +++++++++----------
  target/linux/ath79/image/nand.mk              | 21 +++++++++---------
  .../etc/hotplug.d/firmware/11-ath10k-caldata  |  3 +--
  3 files changed, 23 insertions(+), 23 deletions(-)

[...]

diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk
index c11ff6a257..049701a971 100644
--- a/target/linux/ath79/image/nand.mk
+++ b/target/linux/ath79/image/nand.mk
@@ -1,13 +1,13 @@
  # 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
[...]

"Build/zyxel-buildkerneljffs" looks to be a "generic", however it is
using a device-specific name for its temp directory.

At least in my opinion, the directory should either be created as a
result of a call to mktemp(1), or generically named.

Jeff Kletsky



_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to