[source] archs38: only calculate entry point address when necessary
LEDE Commits
lede-commits at lists.infradead.org
Wed Mar 1 11:38:11 PST 2017
jow pushed a commit to source.git, branch lede-17.01:
https://git.lede-project.org/2e67e8c90f5041f730cdf81669e8b690a4b51c9f
commit 2e67e8c90f5041f730cdf81669e8b690a4b51c9f
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Thu Feb 16 07:51:42 2017 +0100
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 <nbd at nbd.name>
---
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 903c1ba..5d941bc 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 \
)
More information about the lede-commits
mailing list