From 2e67e8c90f5041f730cdf81669e8b690a4b51c9f Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 16 Feb 2017 07:51:42 +0100 Subject: [PATCH] archs38: only calculate entry point address when necessary $(eval) runs even during prereq check, which can cause bogus error messages Signed-off-by: Felix Fietkau --- target/linux/archs38/image/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/target/linux/archs38/image/Makefile b/target/linux/archs38/image/Makefile index 903c1ba987d..5d941bc94b2 100644 --- a/target/linux/archs38/image/Makefile +++ b/target/linux/archs38/image/Makefile @@ -10,9 +10,7 @@ include $(INCLUDE_DIR)/image.mk # On ARC initramfs is put before entry point and so entry point moves # in memory from build to built. Thus we need to extract EP from vmlinux # every time before generation of uImage. -define Build/calculate-ep - $(eval KERNEL_ENTRY=$(shell $(KERNEL_CROSS)readelf -h $(1) | grep "Entry point address" | grep -o 0x.*)) -endef +kernel_ep = `$(KERNEL_CROSS)readelf -h $(1) | grep "Entry point address" | grep -o 0x.*` define Build/patch-dtb $(STAGING_DIR_HOST)/bin/patch-dtb $@ $(DTS_DIR)/$(DEVICE_DTS).dtb @@ -69,9 +67,8 @@ endef define Image/BuildKernel # Build unified uImage - $(call Build/calculate-ep, $(KDIR)/vmlinux.elf) $(call Image/BuildKernel/MkuImage, \ - none, $(KERNEL_LOADADDR), $(KERNEL_ENTRY), \ + none, $(KERNEL_LOADADDR),$(call kernel_ep,$(KDIR)/vmlinux.elf) , \ $(KDIR)/vmlinux, \ $(BIN_DIR)/$(IMG_PREFIX)-uImage \ ) -- 2.30.2