From 0495181529e6069af03704f4b5ae71883a2cd6b6 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 9 Dec 2016 13:08:51 +0100 Subject: [PATCH] ar71xx: rename mktplinkfw-initramfs to more generic mktplinkfw-combined Signed-off-by: Matthias Schiffer --- target/linux/ar71xx/image/tp-link.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk index 97abec03af..f6c1f5b193 100644 --- a/target/linux/ar71xx/image/tp-link.mk +++ b/target/linux/ar71xx/image/tp-link.mk @@ -21,10 +21,10 @@ define Build/mktplinkfw $(if $(findstring sysupgrade,$(word 1,$(1))),-s) && mv $@.new $@ || rm -f $@ endef -# mktplinkfw-initramfs +# mktplinkfw-combined # # -c combined image -define Build/mktplinkfw-initramfs +define Build/mktplinkfw-combined $(STAGING_DIR_HOST)/bin/mktplinkfw \ -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) -N OpenWrt -V $(REVISION) $(1) \ -m $(TPLINK_HEADER_VERSION) \ @@ -40,7 +40,7 @@ define Device/tplink TPLINK_HEADER_VERSION := 1 LOADER_TYPE := gz KERNEL := kernel-bin | patch-cmdline | lzma - KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | mktplinkfw-initramfs + KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | mktplinkfw-combined IMAGES := sysupgrade.bin factory.bin IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade IMAGE/factory.bin := append-rootfs | mktplinkfw factory @@ -52,7 +52,7 @@ $(Device/tplink) COMPILE := loader-$(1).gz COMPILE/loader-$(1).gz := loader-okli-compile KERNEL := copy-file $(KDIR)/vmlinux.bin.lzma | uImage lzma -M 0x4f4b4c49 | loader-okli $(1) - KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux-initramfs.bin.lzma | loader-kernel-cmdline | mktplinkfw-initramfs + KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux-initramfs.bin.lzma | loader-kernel-cmdline | mktplinkfw-combined endef define Device/tplink-4m @@ -183,7 +183,7 @@ $(Device/tplink-8mlzma) DEVICE_TITLE := TP-LINK TL-WDR6500v2 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k ath10k-firmware-qca988x KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma - KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | uImage lzma | mktplinkfw-initramfs + KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | uImage lzma | mktplinkfw-combined BOARDNAME = TL-WDR6500-v2 DEVICE_PROFILE = TLWDR6500V2 TPLINK_HWID := 0x65000002