From 266a2118af56c0fb6f123a5622192b22e0ca8a57 Mon Sep 17 00:00:00 2001 From: Nathaniel Graff Date: Tue, 12 Mar 2019 14:56:26 -0700 Subject: Enable elf2hex in standalone projects Signed-off-by: Nathaniel Graff --- Makefile | 62 ++++++++++++++++++++++++++------------------------- scripts/standalone.mk | 27 ++++++++++++++++++++++ 2 files changed, 59 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index 3853c53..7f3eafb 100644 --- a/Makefile +++ b/Makefile @@ -124,26 +124,6 @@ list-options: list-programs list-targets include scripts/libmetal.mk -############################################################# -# elf2hex -############################################################# -scripts/elf2hex/build/Makefile: scripts/elf2hex/configure - @rm -rf $(dir $@) - @mkdir -p $(dir $@) - cd $(dir $@); \ - $(abspath $<) \ - --prefix=$(abspath $(dir $<))/install \ - --target=$(CROSS_COMPILE) - -scripts/elf2hex/install/bin/$(CROSS_COMPILE)-elf2hex: scripts/elf2hex/build/Makefile - $(MAKE) -C $(dir $<) install - touch -c $@ - -.PHONY: clean-elf2hex -clean-elf2hex: - rm -rf scripts/elf2hex/build scripts/elf2hex/install -clean: clean-elf2hex - ############################################################# # Standalone Project Export ############################################################# @@ -157,6 +137,7 @@ $(STANDALONE_DEST): $(STANDALONE_DEST)/%: mkdir -p $@ +ifneq ($(COREIP_MEM_WIDTH),) standalone: \ $(STANDALONE_DEST) \ $(STANDALONE_DEST)/bsp \ @@ -165,6 +146,7 @@ standalone: \ freedom-metal \ debug.mk \ release.mk \ + scripts/elf2hex \ scripts/standalone.mk \ scripts/libmetal.mk cp -r $(addprefix $(BSP_DIR)/,$(filter-out build,$(shell ls $(BSP_DIR)))) $ $> $> $ $> $> $