JTAGARM7 is back up and running, folks! Tested Halt/Release, Get/Set Registers,...

[goodfet] / firmware / Makefile

diff --git a/firmware/Makefile b/firmware/Makefile
index 49dbf99..bc24bc3 100644 (file)
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -37,11 +37,11 @@ CC =$(GCC) -Wall -O1 -fno-strict-aliasing -g   $(CCEXTRA)
 # ALPHA:
 # jtag430 -- 16-bit MSP430 JTAG
 # jtag430x2 -- 20-bit MSP430 JTAG
+# jtagarm7 -- ARM7TDMI JTAG
 
 # PRE-ALPHA:
 #  Bus protocols:
 # i2c -- Turns GF into USB-to-i2c adapter
-# jtagarm7 -- ARM7TDMI JTAG
 # ejtag -- MIPS JTAG
 # jtagxscale -- XScale JTAG
 # openocd -- OpenOCD bitbang device
@@ -278,10 +278,10 @@ ifeq ($(filter smartcard, $(config)), smartcard)
        hdrs+= smartcard.h
 endif
 
-# include ps2 app
-ifeq ($(filter ps2, $(config)), ps2)
-       apps+= apps/plugins/ps2.o
-       hdrs+= ps2.h
+# include plugin app
+ifeq ($(filter plugin, $(config)), plugin)
+       apps+= apps/plugin.o
+       hdrs+= plugin.h
 endif
 
 # include jscan app
@@ -339,8 +339,10 @@ endif
 dumpinfo:
        $(MSP430BSL) --dumpinfo
 $(app).c: config builddate appsfiles err
-$(app): $(app).c $(libs) $(apps) 
-
+$(app): $(app).o $(libs) $(apps) 
+armlink: $(app).o $(libs) $(apps) $(platformlibs)
+       arm-none-eabi-ld -v -Tlinkers/stm32f407.cmd -nostartfiles -o goodfet.elf $(app).o $(libs) $(apps)
+       arm-none-eabi-objcopy -Obinary goodfet.elf goodfet.bin
 ifeq ($(platform),donbfet)
 $(app).hex: $(app)
        avr-objcopy -j .text -j .data -O ihex goodfet goodfet.hex
@@ -351,7 +353,7 @@ endif
 m4s: $(app).hex
        msp430-objdump -D -m msp430 $(app).hex | m4s init
 clean:
-       rm -f $(app) $(app).hex $(libs) $(apps) lib/apps.c include/config.h include/builddate.h include/apps.h
+       rm -f *.o $(app) $(app).hex $(libs) $(apps) lib/apps.c include/config.h include/builddate.h include/apps.h
 docs:
        doxygen
 pushdocs: docs