X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2FMakefile;h=51633a91019908b1f2874dd5b220deba6c9ce7ba;hp=07f1765a839e3c0cf4f9d33759f961477d266a67;hb=0d6f0d8ae390c2ae59cf92d6f37f363aa2e68c80;hpb=6f072793cc4dc84f2b2e6084b0440035b56e0f54

diff --git a/firmware/Makefile b/firmware/Makefile
index 07f1765..51633a9 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -2,45 +2,24 @@
 
 
 platform?=goodfet
-
-# donb
-ifeq ($(platform),donbfet)
-GCC?=avr-gcc
-mcu?=atmega644p
-CFLAGS=$(DEBUG) -mmcu=$(mcu) -W -Os -mcall-prologues -Wall -Wextra -Wuninitialized -fpack-struct -fshort-enums -funsigned-bitfields
-endif
-
+mcu?=RUNCONFIG
 
 #include `uname`.mak
 GOODFET?=/dev/tty.usbser*
 
-#For Arduino,
-#BSL?=avrdude -V -F -c stk500v1 -p m328p -b 57600 -P /dev/tty.usbserial-* -U flash:w:blink.hex
 #For tos-bsl, use --invert-reset --invert-test
 MSP430BSL?=goodfet.bsl --speed=38400
 JTAG=msp430-jtag
 
-#One of these should be defined explicitly.
-#Default removed because of confusion.
 
-#mcu?=msp430x2618
-#mcu?=msp430x1612
-#mcu?=atmega168
-mcu?=RUNCONFIG
-
-
-#N.B., gcc WILL NOT BITCH if this file doesn't exist.
 GCCINC?=
 
-#GCC?=avr-gcc
-# We use -Wl,-dT because gcc adds the msp430mcu definitions at the
-# very end of the command line, so they only have an effect for a
-# default linker script
-GCC?=msp430-gcc
-LDFLAGS?=-Wl,-dT ldscripts/$(mcu).x
+#All of these are ?= in order ot allow overriding.
+GCC?=msp430-gcc -mmcu=$(mcu)
+LDFLAGS?=-mmcu=$(mcu) #-Wl,-dT ldscripts/$(mcu).x
 
-CCEXTRA?=  $(CFLAGS) -D$(mcu) -D$(platform) -Dplatform=$(platform) $(GCCINC) -I include -I platforms
-CC=$(GCC) -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu)  $(CCEXTRA)
+CCEXTRA ?=  $(CFLAGS) -D$(mcu) -D$(platform) -Dplatform=$(platform) -Dboard=$(board) $(GCCINC) -I include -I platforms
+CC =$(GCC) -Wall -O1 -fno-strict-aliasing -g   $(CCEXTRA)
 
 # Available Applications
 # ======================
@@ -85,38 +64,12 @@ CC=$(GCC) -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu)  $(CCEXTRA)
 
 # Configurations
 # ==============
-# This is what you need to customize to specify which apps you want in 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.
-
-# bare minimum
-# config = monitor
-
-# basic JTAG adapter
-# config = monitor jtag
-
-# Chipcon hacking
-# config = monitor chipcon ccspi
+# This is what you need to customize to specify which apps you want in
+# 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.  $(config) is generated by config.mk.
 
-# Glitch research
-# config = monitor glitch
-
-# XScale PXA255 JTAG
-# config = monitor jtagxscale
-
-# OpenOCD bit-bang device
-#config = monitor openocd
-
-# Old Default Config
-# config = monitor sbw  chipcon nrf ccspi spi jtagarm7 jtag430 jtag430x2 avr
-
-# New default.
-ifeq ($(platform),tilaunchpad)
-config ?= monitor chipcon i2c
-else
-config ?= monitor chipcon spi jtag430 jtag430x2 avr openocd ccspi
-endif
 
 
 # Build the needed list of app and lib object files from the config
@@ -126,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/$(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=
@@ -158,6 +111,14 @@ ifeq ($(filter jtag, $(config)), jtag)
 	endif
 endif
 
+# include MAX342x USB drivers.
+ifeq ($(filter maxusb, $(config)), maxusb)
+	ifneq ($(filter apps/usb/maxusb.o, $(apps)), apps/usb/maxusb.o)
+		apps+= apps/usb/maxusb.o
+		hdrs+= maxusb.h
+	endif
+endif
+
 # include the sbw defs if they specified it
 ifeq ($(filter sbw, $(config)), sbw)
 	# if they only specify sbw, include jtag
@@ -285,7 +246,7 @@ endif
 
 # include adc app
 ifeq ($(filter adc, $(config)), adc)
-	ifeq ($(mcu), msp430x2274)
+	ifeq ($(mcu), msp430f2274)
 		apps+= apps/adc/adc.o
 		hdrs+= adc.h
 	else
@@ -378,8 +339,10 @@ endif
 dumpinfo:
 	$(MSP430BSL) --dumpinfo
 $(app).c: config builddate appsfiles err
-$(app): $(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
@@ -390,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