diff options
| author | cgsfv <cgsfv@users.noreply.github.com> | 2019-03-19 23:31:12 +0100 |
|---|---|---|
| committer | cgsfv <cgsfv@users.noreply.github.com> | 2019-03-19 23:31:12 +0100 |
| commit | 1631c82bd9d458b532ce79e15b9c3950e6706747 (patch) | |
| tree | cb0d4e66f6c6a2ab0fc9a670c002770d09045837 | |
| parent | 1e7df67a9cf7e98bcc0750a566796b3a2a51c61f (diff) | |
Reverted to naming verilog hex files .hex
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | scripts/standalone.mk | 10 |
2 files changed, 5 insertions, 6 deletions
@@ -28,7 +28,6 @@ SRC_DIR = $(PROGRAM_ROOT)/software/$(PROGRAM) PROGRAM_ELF = $(SRC_DIR)/$(CONFIGURATION)/$(PROGRAM).elf PROGRAM_HEX = $(SRC_DIR)/$(CONFIGURATION)/$(PROGRAM).hex PROGRAM_LST = $(SRC_DIR)/$(CONFIGURATION)/$(PROGRAM).lst -PROGRAM_RTL = $(SRC_DIR)/$(CONFIGURATION)/$(PROGRAM).rtl ############################################################# # BSP Loading diff --git a/scripts/standalone.mk b/scripts/standalone.mk index cb8ffdb..296d1ff 100644 --- a/scripts/standalone.mk +++ b/scripts/standalone.mk @@ -121,7 +121,6 @@ include $(CONFIGURATION).mk PROGRAM_ELF ?= $(SRC_DIR)/$(CONFIGURATION)/$(PROGRAM).elf PROGRAM_HEX ?= $(SRC_DIR)/$(CONFIGURATION)/$(PROGRAM).hex PROGRAM_LST ?= $(SRC_DIR)/$(CONFIGURATION)/$(PROGRAM).lst -PROGRAM_RTL ?= $(SRC_DIR)/$(CONFIGURATION)/$(PROGRAM).rtl .PHONY: all all: software @@ -129,9 +128,7 @@ all: software .PHONY: software software: $(PROGRAM_ELF) -ifneq ($(filter rtl,$(TARGET_TAGS)),) -software: $(PROGRAM_RTL) -endif +software: $(PROGRAM_HEX) PROGRAM_SRCS = $(wildcard $(SRC_DIR)/*.c) $(wildcard $(SRC_DIR)/*.h) $(wildcard $(SRC_DIR)/*.S) @@ -152,7 +149,6 @@ $(PROGRAM_ELF): \ mv $(SRC_DIR)/$(basename $(notdir $@)).map $(dir $@) mv $(SRC_DIR)/$(basename $(notdir $@)) $@ touch -c $@ - $(RISCV_OBJCOPY) -O ihex $(PROGRAM_ELF) $(PROGRAM_HEX) $(RISCV_OBJDUMP) --source --all-headers --demangle --line-numbers --wide $@ > $(PROGRAM_LST) $(RISCV_SIZE) $@ @@ -163,6 +159,10 @@ $(PROGRAM_RTL): \ scripts/elf2hex/install/bin/$(CROSS_COMPILE)-elf2hex \ $(PROGRAM_ELF) $< --output $@ --input $(PROGRAM_ELF) --bit-width $(COREIP_MEM_WIDTH) +else +$(PROGRAM_HEX): \ + $(PROGRAM_ELF) + $(RISCV_OBJCOPY) -O ihex $(PROGRAM_ELF) $@ endif |