From f4680fa1cb44e210480648567ad6da0f2d5db83a Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu, 28 Jun 2018 11:38:55 +1000
Subject: WIP non-system-specific FW

---
 Makefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index e6e64af..33f6d07 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ TARGETS_bin = $(patsubst %.h,%.bin,$(TARGET_DEFS))
 FW_SOURCE = cf-code/cf-fsi-fw.S
 FW_DEPS = $(FW_SOURCE) cf-fsi-fw.h
 
-all: $(TARGETS_bin) cf-fsi-test-rom cf-fsi-test-palm
+all: cf-fsi-fw.bin cf-fsi-test-rom cf-fsi-test-palm
 
 cf-code/%.s : cf-code/%.h $(FW_DEPS)
 	$(CC) -E $(M68KCPPFLAGS) -I. -include $< $(FW_SOURCE) -o $@
@@ -44,21 +44,21 @@ cf-code/%.elf : cf-code/%.o
 cf-code/%.bin : cf-code/%.elf
 	$(M68KOC) -O binary $^ $@
 
-cf-wrapper-rom.o : cf-wrapper.S cf-code/cf-fsi-romulus.bin
-	$(CC) $(CFLAGS) -DCF_FILE="cf-code/cf-fsi-romulus.bin" -c cf-wrapper.S -o $@
+cf-fsi-fw.bin : $(TARGETS_bin)
+	cat $^ >$@
 
-cf-wrapper-palm.o : cf-wrapper.S cf-code/cf-fsi-palmetto.bin
-	$(CC) $(CFLAGS) -DCF_FILE="cf-code/cf-fsi-palmetto.bin" -c cf-wrapper.S -o $@
+cf-wrapper.o : cf-fsi-fw.bin cf-wrapper.S
+	$(CC) $(CFLAGS) -DCF_FILE=$< -c cf-wrapper.S -o $@
 
-cf-fsi-test-rom : cf-fsi-test.c cf-wrapper-rom.o
+cf-fsi-test-rom : cf-fsi-test.c cf-wrapper.o
 	$(CC) $(CFLAGS) -DROMULUS $^ -o $@
 
-cf-fsi-test-palm : cf-fsi-test.c cf-wrapper-palm.o
+cf-fsi-test-palm : cf-fsi-test.c cf-wrapper.o
 	$(CC) $(CFLAGS) -O0 -mcpu=arm926ej-s -DPALMETTO $^ -o $@
 
 # Keep the ELF for debugging
 .PRECIOUS : cf-code/%.elf
 
 clean:
-	rm -rf cf-fsi-test-* *.o *.s
+	rm -rf cf-fsi-test-* *.o *.s *.bin
 	rm -rf cf-code/*.elf cf-code/*.bin cf-code/*.s cf-code/*.o
-- 
cgit v1.2.1