diff options
| author | Sander Vanheule <sander@svanheule.net> | 2020-11-04 10:21:16 +0100 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-11-25 16:33:49 +0100 |
| commit | ab1584a797ad946585d3eb5498bce07829dabe5f (patch) | |
| tree | 694ede6bbf81a94d74411235a46390462f6cd979 /target/linux/ath79/image/common-netgear.mk | |
| parent | c20b8d690bec265693b3eb250e1ba1e8ed3abae4 (diff) | |
| download | upstream-ab1584a797ad946585d3eb5498bce07829dabe5f.tar.gz upstream-ab1584a797ad946585d3eb5498bce07829dabe5f.tar.bz2 upstream-ab1584a797ad946585d3eb5498bce07829dabe5f.zip | |
ath79: netgear: trim down uImage customisations
Replace NETGEAR_KERNEL_MAGIC by UIMAGE_MAGIC to better match the
variable's purpose. This allows to drop the custom
Build/netgear-uImage.
Signed-off-by: Sander Vanheule <sander@svanheule.net>
[keep UIMAGE_MAGIC definitions even for default value]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/ath79/image/common-netgear.mk')
| -rw-r--r-- | target/linux/ath79/image/common-netgear.mk | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/target/linux/ath79/image/common-netgear.mk b/target/linux/ath79/image/common-netgear.mk index b41650c6e9..d4f43bbaca 100644 --- 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 \ - -M $(NETGEAR_KERNEL_MAGIC) \ + $(if $(UIMAGE_MAGIC),-M $(UIMAGE_MAGIC)) \ -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 \ - -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_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 |