diff options
| author | Mathias Kresin <dev@kresin.me> | 2018-11-29 10:48:03 +0100 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2018-11-29 13:15:44 +0100 |
| commit | 1977be8bd0753406ef5e76bede162827a9514610 (patch) | |
| tree | 41dd8c9dcc8907c558fec9b726a6c499234c8435 | |
| parent | 7f00123d63584e8d7da717c89fd1df610a161983 (diff) | |
| download | upstream-1977be8bd0753406ef5e76bede162827a9514610.tar.gz upstream-1977be8bd0753406ef5e76bede162827a9514610.tar.bz2 upstream-1977be8bd0753406ef5e76bede162827a9514610.zip | |
ramips: unifiy sysupgrade file extensions
Use .bin as file extension where possible. The user doesn't need to that
sysupgrade images for NAND boards are tarballs.
Signed-off-by: Mathias Kresin <dev@kresin.me>
| -rw-r--r-- | target/linux/ramips/image/mt7621.mk | 13 | ||||
| -rw-r--r-- | target/linux/ramips/image/mt76x8.mk | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 8d1e943af5..d0cf51f7e9 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -219,10 +219,10 @@ define Device/mir3g KERNEL_SIZE := 4096k IMAGE_SIZE := 32768k UBINIZE_OPTS := -E 5 - IMAGES := sysupgrade.tar kernel1.bin rootfs0.bin + IMAGES += kernel1.bin rootfs0.bin IMAGE/kernel1.bin := append-kernel IMAGE/rootfs0.bin := append-ubi | check-size $$$$(IMAGE_SIZE) - IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_TITLE := Xiaomi Mi Router 3G SUPPORTED_DEVICES += R3G DEVICE_PACKAGES := \ @@ -274,8 +274,8 @@ define Device/r6220 KERNEL_SIZE := 4096k IMAGE_SIZE := 28672k UBINIZE_OPTS := -E 5 - IMAGES := sysupgrade.tar kernel.bin rootfs.bin - IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata + IMAGES += kernel.bin rootfs.bin + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/kernel.bin := append-kernel IMAGE/rootfs.bin := append-ubi | check-size $$$$(IMAGE_SIZE) DEVICE_TITLE := Netgear R6220 @@ -327,7 +327,7 @@ define Device/re350-v1 TPLINK_HEADER_VERSION := 1 IMAGE_SIZE := 6016k KERNEL := $(KERNEL_DTB) | tplink-v1-header -e -O - IMAGES := sysupgrade.bin factory.bin + IMAGES += factory.bin IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | append-metadata | check-size $$$$(IMAGE_SIZE) IMAGE/factory.bin := append-rootfs | tplink-safeloader factory endef @@ -368,9 +368,8 @@ define Device/ubnt-erx DTS := UBNT-ERX FILESYSTEMS := squashfs KERNEL_SIZE := 3145728 - IMAGES := sysupgrade.tar KERNEL_INITRAMFS := $$(KERNEL) | ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar - IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata DEVICE_TITLE := Ubiquiti EdgeRouter X endef TARGET_DEVICES += ubnt-erx diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk index af5b0f6d60..d2f402e939 100644 --- a/target/linux/ramips/image/mt76x8.mk +++ b/target/linux/ramips/image/mt76x8.mk @@ -399,7 +399,7 @@ define Device/zyxel_keenetic-extra-ii DEVICE_TITLE := ZyXEL Keenetic Extra II DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport IMAGES += factory.bin - IMAGE/factory.bin := $$(IMAGE/sysupgrade.bin) | pad-to $$$$(BLOCKSIZE) | \ + IMAGE/factory.bin := $$(sysupgrade_bin) | pad-to $$$$(BLOCKSIZE) | \ check-size $$$$(IMAGE_SIZE) | zyimage -d 6162 -v "ZyXEL Keenetic Extra II" endef TARGET_DEVICES += zyxel_keenetic-extra-ii |