projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Closer to STM32 port.
[goodfet]
/
firmware
/
Makefile
diff --git
a/firmware/Makefile
b/firmware/Makefile
index
a3ffacd
..
51633a9
100644
(file)
--- a/
firmware/Makefile
+++ b/
firmware/Makefile
@@
-68,14
+68,8
@@
CC =$(GCC) -Wall -O1 -fno-strict-aliasing -g $(CCEXTRA)
# your firmware. The "config" variable is just a space-delimited list
# of apps you want included. The makefile will take the list of apps
# and include all of the proper code needed to build your desired
# your firmware. The "config" variable is just a space-delimited list
# of apps you want included. The makefile will take the list of apps
# and include all of the proper code needed to build your desired
-# firmware.
This
is generated by config.mk.
+# firmware.
$(config)
is generated by config.mk.
-# New default.
-# ifeq ($(platform),tilaunchpad)
-# config ?= monitor chipcon i2c
-# else
-# config ?= monitor chipcon spi jtag430 jtag430x2 avr openocd ccspi maxusb
-# endif
# Build the needed list of app and lib object files from the config
# Build the needed list of app and lib object files from the config
@@
-85,7
+79,7
@@
ifeq ($(platform),tilaunchpad)
libs= lib/$(platform).o lib/command.o lib/apps.o lib/msp430_serial.o
#libs+=lib/setjmp.o
else
libs= lib/$(platform).o lib/command.o lib/apps.o lib/msp430_serial.o
#libs+=lib/setjmp.o
else
-libs= lib/$(mcu).o lib/command.o lib/dco_calib.o lib/apps.o lib/msp430.o lib/arduino.o
+libs= lib/$(mcu).o lib/command.o lib/dco_calib.o lib/apps.o lib/msp430.o lib/arduino.o
$(extralibs)
endif
hdrs=
endif
hdrs=
@@
-345,8
+339,10
@@
endif
dumpinfo:
$(MSP430BSL) --dumpinfo
$(app).c: config builddate appsfiles err
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
ifeq ($(platform),donbfet)
$(app).hex: $(app)
avr-objcopy -j .text -j .data -O ihex goodfet goodfet.hex
@@
-357,7
+353,7
@@
endif
m4s: $(app).hex
msp430-objdump -D -m msp430 $(app).hex | m4s init
clean:
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
docs:
doxygen
pushdocs: docs