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

Reorder includes to prefer platform routines. Remove redundant RPL define.

Browse source
This commit is contained in:
David Kopf 2012-04-27 16:54:09 -04:00
parent 52d0117086
commit d6dc216e02
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cpu/avr/Makefile.avr
View file

@ -24,10 +24,6 @@ CONTIKI_TARGET_SOURCEFILES += $(USB)
//AVR = clock.c mtarch.c eeprom.c flash.c leds-arch.c watchdog.c rtimer-arch.c //AVR = clock.c mtarch.c eeprom.c flash.c leds-arch.c watchdog.c rtimer-arch.c
endif endif
ifdef WITH_RPL
CFLAGS += -DUIP_CONF_IPV6_RPL=$(WITH_RPL)
endif
#For a coffee file system, the application makefile can define COFFEE_FILES=n #For a coffee file system, the application makefile can define COFFEE_FILES=n
#to select the type and COFFEE_ADDRESS=0xaaaaaaaa as the starting byte address. #to select the type and COFFEE_ADDRESS=0xaaaaaaaa as the starting byte address.
#If only one is define the other will use the (Raven webserver 1284p) defaults #If only one is define the other will use the (Raven webserver 1284p) defaults
@ -99,9 +95,9 @@ ELF_SIZE = avr-size -C --mcu=$(MCU)
OBJCOPY = avr-objcopy OBJCOPY = avr-objcopy
STRIP = avr-strip STRIP = avr-strip
CFLAGSNO = -Wall -mmcu=$(MCU) -gdwarf-2 -fno-strict-aliasing \ CFLAGSNO = -Wall -mmcu=$(MCU) -gdwarf-2 -fno-strict-aliasing \
-I. -I$(CONTIKI)/core -I$(CONTIKI_CPU) $(USB_INCLUDES) \ -I$(CONTIKI)/platform/$(TARGET) \
-I$(CONTIKI)/platform/$(TARGET) \ -I. -I$(CONTIKI)/core -I$(CONTIKI_CPU) $(USB_INCLUDES) \
$(CONTIKI_PLAT_DEFS) $(CONTIKI_PLAT_DEFS)
CFLAGS += $(CFLAGSNO) -O$(OPTI) CFLAGS += $(CFLAGSNO) -O$(OPTI)
ifndef BOOTLOADER_START ifndef BOOTLOADER_START
BOOTLOADER_START = 0x1F800 BOOTLOADER_START = 0x1F800