tools/squashfs: rename to squashfs3-lzma

[openwrt/staging/aparcar.git] / target / linux / ath79 / image / common-netgear.mk

diff --git a/target/linux/ath79/image/common-netgear.mk b/target/linux/ath79/image/common-netgear.mk
index 8fa6b030fc22cc7cde3e898cb3cba9c58d6a1d46..c3b20cf1dc9731fc3c9a4051099f451f8b69ddc9 100644 (file)
--- a/target/linux/ath79/image/common-netgear.mk
+++ b/target/linux/ath79/image/common-netgear.mk
@@ -1,9 +1,7 @@
-DEVICE_VARS += NETGEAR_KERNEL_MAGIC NETGEAR_BOARD_ID NETGEAR_HW_ID
-
 define Build/netgear-rootfs
        mkimage \
                -A mips -O linux -T filesystem -C none \
-               -M $(NETGEAR_KERNEL_MAGIC) \
+               $(if $(UIMAGE_MAGIC),-M $(UIMAGE_MAGIC)) \
                -n '$(VERSION_DIST) filesystem' \
                -d $(IMAGE_ROOTFS) $@.fs
        cat $@.fs >> $@
@@ -14,7 +12,7 @@ define Build/netgear-squashfs
        rm -rf $@.fs $@.squashfs
        mkdir -p $@.fs/image
        cp $@ $@.fs/image/uImage
-       $(STAGING_DIR_HOST)/bin/mksquashfs-lzma  \
+       $(STAGING_DIR_HOST)/bin/mksquashfs3-lzma  \
                $@.fs $@.squashfs -be \
                -noappend -root-owned -b 65536 \
                $(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH))
@@ -22,23 +20,20 @@ define Build/netgear-squashfs
        dd if=/dev/zero bs=1k count=1 >> $@.squashfs
        mkimage \
                -A mips -O linux -T filesystem -C none \
-               -M $(NETGEAR_KERNEL_MAGIC) \
+               $(if $(UIMAGE_MAGIC),-M $(UIMAGE_MAGIC)) \
                -a 0xbf070000 -e 0xbf070000 \
                -n 'MIPS $(VERSION_DIST) Linux-$(LINUX_VERSION)' \
                -d $@.squashfs $@
        rm -rf $@.squashfs $@.fs
 endef
 
-define Build/netgear-uImage
-       $(call Build/uImage,$(1) -M $(NETGEAR_KERNEL_MAGIC))
-endef
-
-define Device/netgear_ath79
+define Device/netgear_generic
   DEVICE_VENDOR := NETGEAR
-  KERNEL := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma
+  KERNEL := kernel-bin | append-dtb | lzma -d20 | uImage lzma
+  KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | uImage lzma
   IMAGES += factory.img
-  IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | \
-       check-size $$$$(IMAGE_SIZE)
-  IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | \
-       check-size $$$$(IMAGE_SIZE)
+  IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | \
+       netgear-squashfs | append-rootfs | pad-rootfs
+  IMAGE/sysupgrade.bin := $$(IMAGE/default) | check-size | append-metadata
+  IMAGE/factory.img := $$(IMAGE/default) | netgear-dni | check-size
 endef