ar71xx: rename mktplinkfw-initramfs to more generic mktplinkfw-combined

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
This commit is contained in:
Matthias Schiffer 2016-12-09 13:08:51 +01:00
parent fff6443b5b
commit 0495181529
No known key found for this signature in database
GPG key ID: 16EF3F64CB201D9C

View file

@ -21,10 +21,10 @@ define Build/mktplinkfw
$(if $(findstring sysupgrade,$(word 1,$(1))),-s) && mv $@.new $@ || rm -f $@ $(if $(findstring sysupgrade,$(word 1,$(1))),-s) && mv $@.new $@ || rm -f $@
endef endef
# mktplinkfw-initramfs <optional extra arguments to mktplinkfw binary> # mktplinkfw-combined
# #
# -c combined image # -c combined image
define Build/mktplinkfw-initramfs define Build/mktplinkfw-combined
$(STAGING_DIR_HOST)/bin/mktplinkfw \ $(STAGING_DIR_HOST)/bin/mktplinkfw \
-H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) -N OpenWrt -V $(REVISION) $(1) \ -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) -N OpenWrt -V $(REVISION) $(1) \
-m $(TPLINK_HEADER_VERSION) \ -m $(TPLINK_HEADER_VERSION) \
@ -40,7 +40,7 @@ define Device/tplink
TPLINK_HEADER_VERSION := 1 TPLINK_HEADER_VERSION := 1
LOADER_TYPE := gz LOADER_TYPE := gz
KERNEL := kernel-bin | patch-cmdline | lzma 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 IMAGES := sysupgrade.bin factory.bin
IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade
IMAGE/factory.bin := append-rootfs | mktplinkfw factory IMAGE/factory.bin := append-rootfs | mktplinkfw factory
@ -52,7 +52,7 @@ $(Device/tplink)
COMPILE := loader-$(1).gz COMPILE := loader-$(1).gz
COMPILE/loader-$(1).gz := loader-okli-compile COMPILE/loader-$(1).gz := loader-okli-compile
KERNEL := copy-file $(KDIR)/vmlinux.bin.lzma | uImage lzma -M 0x4f4b4c49 | loader-okli $(1) 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 endef
define Device/tplink-4m define Device/tplink-4m
@ -183,7 +183,7 @@ $(Device/tplink-8mlzma)
DEVICE_TITLE := TP-LINK TL-WDR6500v2 DEVICE_TITLE := TP-LINK TL-WDR6500v2
DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport kmod-ath10k ath10k-firmware-qca988x 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 := 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 BOARDNAME = TL-WDR6500-v2
DEVICE_PROFILE = TLWDR6500V2 DEVICE_PROFILE = TLWDR6500V2
TPLINK_HWID := 0x65000002 TPLINK_HWID := 0x65000002