From 63b525dd6b209af5554a2d053efd4b3ce6f60c9c Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 30 Jul 2016 14:19:11 +0200 Subject: image: add a helper variable for getting kernel/rootfs from within image Build/* templates Signed-off-by: Felix Fietkau --- target/linux/ath25/image/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'target/linux/ath25') diff --git a/target/linux/ath25/image/Makefile b/target/linux/ath25/image/Makefile index 784cee847c..4face056e3 100644 --- a/target/linux/ath25/image/Makefile +++ b/target/linux/ath25/image/Makefile @@ -10,24 +10,24 @@ include $(INCLUDE_DIR)/image.mk define Build/mkfwimage $(STAGING_DIR_HOST)/bin/mkfwimage \ -B $(1).OpenWrt.$(REVISION) \ - -k $(word 1,$^) \ - -r $(word 2,$^) \ + -k $(IMAGE_KERNEL) \ + -r $(IMAGE_ROOTFS) \ -o $@.new && \ mv $@.new $@ endef define Build/combined-image -sh $(TOPDIR)/scripts/combined-image.sh \ - "$(word 1,$^)" \ - "$(word 2,$^)" \ + "$(IMAGE_KERNEL)" \ + "$(IMAGE_ROOTFS)" \ "$@.new" && \ mv $@.new $@ endef define Build/mkmylofw $(STAGING_DIR_HOST)/bin/mkmylofw -B $(1) \ - -p0x020000:0x130000:ah:0x80041000:linux:$(word 1,$^) \ - -p0x150000:0x2a0000:::rootfs:$(word 2,$^) \ + -p0x020000:0x130000:ah:0x80041000:linux:$(IMAGE_KERNEL) \ + -p0x150000:0x2a0000:::rootfs:$(IMAGE_ROOTFS) \ $@.new && \ mv $@.new $@ endef -- cgit v1.2.3