summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathaniel Graff <nathaniel.graff@sifive.com>2019-03-12 09:58:13 -0700
committerNathaniel Graff <nathaniel.graff@sifive.com>2019-03-12 15:37:07 -0700
commitebe73c01fbdf73b3b4c6beaf089edb7ee394aa0b (patch)
tree97aad989172b0747823e8c55f353af0454273f9a
parent3da1e2e24fb713e87984bc18d7c1c4c44a97fa47 (diff)
ELF output has .elf extension
Signed-off-by: Nathaniel Graff <nathaniel.graff@sifive.com>
-rw-r--r--Makefile2
-rw-r--r--scripts/standalone.mk4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 319903a..ee3b396 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ PROGRAM_ROOT ?= $(abspath .)
SRC_DIR = $(PROGRAM_ROOT)/software/$(PROGRAM)
-PROGRAM_ELF = $(SRC_DIR)/$(PROGRAM)
+PROGRAM_ELF = $(SRC_DIR)/$(PROGRAM).elf
PROGRAM_HEX = $(SRC_DIR)/$(PROGRAM).hex
#############################################################
diff --git a/scripts/standalone.mk b/scripts/standalone.mk
index 6fa3da4..ac5635f 100644
--- a/scripts/standalone.mk
+++ b/scripts/standalone.mk
@@ -112,7 +112,7 @@ include $(CONFIGURATION).mk
# Software
#############################################################
-PROGRAM_ELF ?= $(SRC_DIR)/$(PROGRAM)
+PROGRAM_ELF ?= $(SRC_DIR)/$(PROGRAM).elf
PROGRAM_HEX ?= $(SRC_DIR)/$(PROGRAM).hex
.PHONY: all
@@ -135,7 +135,7 @@ $(PROGRAM_ELF): \
$(BSP_DIR)/install/lib/libmetal.a \
$(BSP_DIR)/install/lib/libmetal-gloss.a \
$(BSP_DIR)/metal.lds
- $(MAKE) -C $(dir $@) $(notdir $@) \
+ $(MAKE) -C $(dir $@) $(basename $(notdir $@)) \
AR=$(RISCV_AR) \
CC=$(RISCV_GCC) \
CXX=$(RISCV_GXX) \