From a0ec632f8d17cf75e2eca44ac3b3ede6d297f7fa Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Thu, 5 Jul 2018 22:48:54 +0200 Subject: [PATCH] ar71xx: get rid of copy-file Use the provided image build variables to point the kernel-bin build command to the kernel we are interested in. Signed-off-by: Mathias Kresin --- target/linux/ar71xx/image/common-tp-link.mk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/target/linux/ar71xx/image/common-tp-link.mk b/target/linux/ar71xx/image/common-tp-link.mk index b50dae9f4f..317d5bb2f4 100644 --- a/target/linux/ar71xx/image/common-tp-link.mk +++ b/target/linux/ar71xx/image/common-tp-link.mk @@ -1,9 +1,5 @@ DEVICE_VARS += LOADER_FLASH_OFFS TPLINK_BOARD_ID TPLINK_FLASHLAYOUT TPLINK_HEADER_VERSION TPLINK_HWID TPLINK_HWREV -define Build/copy-file - cat "$(1)" > "$@" -endef - # Arguments: define Build/loader-okli dd if=$(KDIR)/loader-$(word 1,$(1)).$(LOADER_TYPE) bs=$(word 2,$(1)) conv=sync of="$@.new" @@ -61,8 +57,10 @@ define Device/tplink-nolzma LOADER_FLASH_OFFS := 0x22000 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) 7680 - KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux-initramfs.bin.lzma | loader-kernel-cmdline | tplink-v1-header + KERNEL_NAME := vmlinux.bin.lzma + KERNEL := kernel-bin | uImage lzma -M 0x4f4b4c49 | loader-okli $(1) 7680 + KERNEL_INITRAMFS_NAME := vmlinux-initramfs.bin.lzma + KERNEL_INITRAMFS := kernel-bin | loader-kernel-cmdline | tplink-v1-header endef define Device/tplink-4m