ath79: netgear: trim down uImage customisations

[openwrt/openwrt.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 b41650c6e991e7caa5c4a3a2d8a5f94175195e22..d4f43bbaca36c242247ec09ed077dd0ffaebc019 100644 (file)
--- a/target/linux/ath79/image/common-netgear.mk
+++ b/target/linux/ath79/image/common-netgear.mk
@@ -1,9 +1,9 @@
-DEVICE_VARS += NETGEAR_KERNEL_MAGIC NETGEAR_BOARD_ID NETGEAR_HW_ID
+DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID

 
 define Build/netgear-rootfs
        mkimage \
                -A mips -O linux -T filesystem -C none \
 
 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 >> $@
                -n '$(VERSION_DIST) filesystem' \
                -d $(IMAGE_ROOTFS) $@.fs
        cat $@.fs >> $@


@@ -22,21 +22,17 @@ define Build/netgear-squashfs
        dd if=/dev/zero bs=1k count=1 >> $@.squashfs
        mkimage \
                -A mips -O linux -T filesystem -C none \
        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
 
                -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_generic
   DEVICE_VENDOR := NETGEAR
 define Device/netgear_generic
   DEVICE_VENDOR := NETGEAR

-  KERNEL := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma
-  KERNEL_INITRAMFS := 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/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \
        append-rootfs | pad-rootfs
   IMAGES += factory.img
   IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \
        append-rootfs | pad-rootfs