aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/archs38/image
diff options
context:
space:
mode:
authorAlexey Brodkin <Alexey.Brodkin@synopsys.com>2016-08-19 13:58:36 +0300
committerJohn Crispin <john@phrozen.org>2016-08-20 05:33:47 +0200
commit334fdea08d71079d6e0f5bc8dc79790c0402ae2a (patch)
treedb91746f7c60a25dde9f3dc78244c53be7b88477 /target/linux/archs38/image
parent070edfd92f8f83a93312a7df5f59048d74286584 (diff)
downloadupstream-334fdea08d71079d6e0f5bc8dc79790c0402ae2a.tar.gz
upstream-334fdea08d71079d6e0f5bc8dc79790c0402ae2a.tar.bz2
upstream-334fdea08d71079d6e0f5bc8dc79790c0402ae2a.zip
archs38: Merge sd and ramfs subtargets in generic again
As it turned out we may actually build both initramfs and SD-based images in one run with just a small tweak in existing image/Makefile and so we do here. We're back with one "generic" target for all ARC HS38-based bords. Kudos to John for his patience and very helpful tips! Signed-off-by: John Crispin <john@phrozen.org> Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Cc: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'target/linux/archs38/image')
-rw-r--r--target/linux/archs38/image/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/archs38/image/Makefile b/target/linux/archs38/image/Makefile
index 505ed02625..14f6bc3db4 100644
--- a/target/linux/archs38/image/Makefile
+++ b/target/linux/archs38/image/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/image.mk
# 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 $(LINUX_DIR)/vmlinux | grep "Entry point address" | grep -o 0x.*))
+ $(eval KERNEL_ENTRY=$(shell $(KERNEL_CROSS)readelf -h $(1) | grep "Entry point address" | grep -o 0x.*))
endef
define Build/build-dtb
@@ -36,7 +36,8 @@ define Device/nsim_hs
DEVICE_DTS := nsim_hs_idu
endef
TARGET_DEVICES += nsim_hs
-else
+endif
+
# Root FS on SD-card
KERNEL_LOADADDR := 0x80000000
DEVICE_DTS_LIST:= axs103_idu
@@ -65,7 +66,7 @@ endef
define Image/BuildKernel
# Build unified uImage
- $(call Build/calculate-ep)
+ $(call Build/calculate-ep, $(KDIR)/vmlinux.elf)
$(call Image/BuildKernel/MkuImage, \
none, $(KERNEL_LOADADDR), $(KERNEL_ENTRY), \
$(KDIR)/vmlinux, \
@@ -81,6 +82,5 @@ define Image/Build
$(call Image/Build/SDCard,$(1))
dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
endef
-endif
$(eval $(call BuildImage))