Arduino target is building again.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@1062 12e2690d-a6be-4b82-a7b7-67c4a43b65c8

diff --git a/firmware/Makefile b/firmware/Makefile
index 07f1765..897e4ec 100644 (file)
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -2,31 +2,16 @@
 
 
 platform?=goodfet
 
 
 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*
 
 
 #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
 
 #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.
 
 
 #N.B., gcc WILL NOT BITCH if this file doesn't exist.


@@ -39,7 +24,7 @@ GCCINC?=
 GCC?=msp430-gcc
 LDFLAGS?=-Wl,-dT ldscripts/$(mcu).x
 
 GCC?=msp430-gcc
 LDFLAGS?=-Wl,-dT ldscripts/$(mcu).x
 

-CCEXTRA?=  $(CFLAGS) -D$(mcu) -D$(platform) -Dplatform=$(platform) $(GCCINC) -I include -I platforms
+CCEXTRA?=  $(CFLAGS) -D$(mcu) -D$(platform) -Dplatform=$(platform) -Dboard=$(board) $(GCCINC) -I include -I platforms

 CC=$(GCC) -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu)  $(CCEXTRA)
 
 # Available Applications
 CC=$(GCC) -Wall -Os -fno-strict-aliasing -g -mmcu=$(mcu)  $(CCEXTRA)
 
 # Available Applications

diff --git a/firmware/config.mk b/firmware/config.mk
index bd1f49b..0660f25 100644 (file)
--- a/firmware/config.mk
+++ b/firmware/config.mk
@@ -39,6 +39,14 @@ CFLAGS=$(DEBUG) -mmcu=$(mcu) -W -Os -mcall-prologues -Wall -Wextra -Wuninitializ
 config := monitor avr spi jscan
 endif
 
 config := monitor avr spi jscan
 endif
 

+ifneq (,$(findstring $(board),arduino))
+GCC := avr-gcc
+mcu := atmega168
+#BSL := avrdude -V -F -c stk500v1 -p m328p -b 57600 -P /dev/tty.usbserial-* -U flash:w:blink.hex
+LDFLAGS := 
+config := monitor
+endif
+

 ifneq (,$(findstring $(board),tilaunchpad))
 mcu :=msp430x1612
 CFLAGS := -DDEBUG_LEVEL=3 -DDEBUG_START=1 -DINBAND_DEBUG
 ifneq (,$(findstring $(board),tilaunchpad))
 mcu :=msp430x1612
 CFLAGS := -DDEBUG_LEVEL=3 -DDEBUG_START=1 -DINBAND_DEBUG

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index e97bd1f..6bb0f3e 100644 (file)
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -56,7 +56,7 @@ void handle(uint8_t const app,
   int i;
   
   //debugstr("GoodFET");
   int i;
   
   //debugstr("GoodFET");

-  led_off();
+  //led_off();

   
   // find the app and call the handle fn
   for(i = 0; i < num_apps; i++){
   
   // find the app and call the handle fn
   for(i = 0; i < num_apps; i++){