summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo C2014-06-26 16:16:11 +0200
committerLeo C2014-06-26 16:16:11 +0200
commit78a3a76d0da08b39b370efc45e9c0ba1ee6bef26 (patch)
treeefef27d4e2ad066a0452ef35d0c51f228e22bbf1
parentd9c2b1b6505e365d55703b051596c90558fd1169 (diff)
downloadz180-stamp-78a3a76d0da08b39b370efc45e9c0ba1ee6bef26.zip
ROM files in Z180 dir
-rw-r--r--Z180/Makefile6
-rw-r--r--stm32/Rules.mk14
2 files changed, 10 insertions, 10 deletions
diff --git a/Z180/Makefile b/Z180/Makefile
index 63483a0..f676826 100644
--- a/Z180/Makefile
+++ b/Z180/Makefile
@@ -34,11 +34,11 @@ LN_DATA = C000
#.suffixes: .180 .rel
.phony: all
-all: ../stm32/hdrom.c ../stm32/hdrom.h
+all: hdrom.c hdrom.h
$(OBJ): $(INC)
-../stm32/hdrom.h: ../stm32/hdrom.c
+hdrom.h: hdrom.c
comma:= ,
empty:=
@@ -80,7 +80,7 @@ if [ "$${ERROR}" != "0" ]; then cat $${OUTPUT}; rm -f $@; fi ; \
exit $${ERROR}
endef
-../stm32/hdrom.c: hdrom.hex
+hdrom.c: hdrom.hex
srec_cat -o $@ -c_array $(basename $<) -C_COMpressed -include $< -Intel
hdrom.hex : $(OBJ)
diff --git a/stm32/Rules.mk b/stm32/Rules.mk
index 7811f8b..ddc8db3 100644
--- a/stm32/Rules.mk
+++ b/stm32/Rules.mk
@@ -2,10 +2,14 @@
BINARY := z180-stamp-stm32
P_BINARY := $(OBJPATH)/$(BINARY)
-TARGETS := $(BINARY).elf #$(BINARY).bin
+TARGETS := $(BINARY).elf
-SRCS := z180-stamp-stm32.c serial.c z80-if.c hdrom.c
+###############################################################################
+# Source files
+SRCS := z180-stamp-stm32.c serial.c z80-if.c hdrom.c
+
+SRCS_VPATH := ../Z180
LIBNAME = opencm3_stm32f1
DEFS = -DSTM32F1 -DDEBUG=2
@@ -32,8 +36,6 @@ OBJDUMP := $(TOOLCHAIN)-objdump
GDB := $(TOOLCHAIN)-gdb
###############################################################################
-# Source files
-
ifeq ($(VERBOSE),true)
@@ -78,8 +80,6 @@ LDFLAGS += -Wl,--gc-sections
LDLIBS += -l$(LIBNAME)
LDLIBS += -Wl,--start-group -lc -lgcc -lnosys -Wl,--end-group
-
-###############################################################################
###############################################################################
@@ -98,7 +98,7 @@ list: $(P_BINARY).list
images: $(P_BINARY).images
flash: $(P_BINARY).flash
-%.images: %.bin %.hex %.srec %.list
+%.images: %.bin %.hex %.list
$(call echo_cmd,Images generated: $*)
%.bin: %.elf