deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

avrdude and makefile changes suggested by Georg von Zengen

Browse source
This commit is contained in:
dak664 2011-03-08 13:07:00 -05:00
parent d381ee7bbf
commit de7bcda99f
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cpu/avr/Makefile.avr
View file

@ -139,7 +139,7 @@ ifndef NOAVRSIZE
endif endif
%.hex: %.out %.hex: %.out
$(OBJCOPY) $^ -O ihex $@ $(OBJCOPY) $^ -j .text -j .data -O ihex $@
%.ihex: %.out %.ihex: %.out
$(OBJCOPY) $^ -O ihex $@ $(OBJCOPY) $^ -O ihex $@

8
platform/avr-raven/Makefile.avr-raven
View file

@ -3,6 +3,8 @@ CONTIKI_TARGET_DIRS = . apps net loader
CONTIKI_CORE=contiki-raven-main CONTIKI_CORE=contiki-raven-main
CONTIKI_TARGET_MAIN = ${CONTIKI_CORE}.o CONTIKI_TARGET_MAIN = ${CONTIKI_CORE}.o
CONTIKI_TARGET_SOURCEFILES += contiki-raven-main.c contiki-raven-default-init-net.c CONTIKI_TARGET_SOURCEFILES += contiki-raven-main.c contiki-raven-default-init-net.c
#The avr cpu makefile will also add these files if COFFEE_FILES is specified.
CONTIKI_TARGET_SOURCEFILES += cfs-coffee.c cfs-coffee-arch.c
CONTIKIAVR=$(CONTIKI)/cpu/avr CONTIKIAVR=$(CONTIKI)/cpu/avr
CONTIKIBOARD=. CONTIKIBOARD=.
@ -17,12 +19,14 @@ AVRDUDE_PROGRAMMER=jtag2
# #
# The example is for an JTAGICE mkII used to program an ATmega128: # The example is for an JTAGICE mkII used to program an ATmega128:
# avrdude -v -P usb:xxxx -c jtag2 -p atmega128 # avrdude -v -P usb:xxxx -c jtag2 -p atmega128
AVRDUDE_PORT=usb:00B000000D79 #AVRDUDE_PORT=usb:00B000000D79
AVRDUDE_PORT=usb
# Additional avrdude options # Additional avrdude options
# Verify off # Verify off
AVRDUDE_OPTIONS=-V #AVRDUDE_OPTIONS=-V
AVRDUDE_OPTIONS=
include $(CONTIKIAVR)/Makefile.avr include $(CONTIKIAVR)/Makefile.avr

2
platform/avr-raven/cfs-coffee-arch.h
View file

@ -52,7 +52,7 @@
#define COFFEE_STATIC 1 #define COFFEE_STATIC 1
#elif COFFEE_FILES==2 //2=eeprom for full file system #elif COFFEE_FILES==2 //2=eeprom for full file system
#define COFFEE_AVR_EEPROM 1 #define COFFEE_AVR_EEPROM 1
#elif COFFEE_FILES==2 //3=program flash for static file system #elif COFFEE_FILES==3 //3=program flash for static file system
#define COFFEE_AVR_FLASH 1 #define COFFEE_AVR_FLASH 1
#define COFFEE_STATIC 1 #define COFFEE_STATIC 1
#else //4=program flash with full file system #else //4=program flash with full file system