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

Moved the individual MODULE definitions from the top-level Makefile.include into the individual platforms' Makefiles

Browse source
This commit is contained in:
Adam Dunkels 2013-12-05 23:56:30 +01:00
parent 0fe08205e1
commit 7a740b382f
10 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile.include
View file

@ -58,8 +58,7 @@ UPPERCASE = _ABCDEFGHIJKLMNOPQRSTUVWXYZ
TARGET_UPPERCASE := ${strip ${shell echo $(TARGET) | sed y!$(LOWERCASE)!$(UPPERCASE)!}} TARGET_UPPERCASE := ${strip ${shell echo $(TARGET) | sed y!$(LOWERCASE)!$(UPPERCASE)!}}
CFLAGS += -DCONTIKI=1 -DCONTIKI_TARGET_$(TARGET_UPPERCASE)=1 CFLAGS += -DCONTIKI=1 -DCONTIKI_TARGET_$(TARGET_UPPERCASE)=1
MODULES += core/sys core/dev core/lib \ MODULES += core/sys core/dev core/lib core/net/mac
core/net/ipv6 core/net/ipv4 core/net/rime core/net/mac core/net/mac/contikimac
#include $(CONTIKI)/core/net/rime/Makefile.rime #include $(CONTIKI)/core/net/rime/Makefile.rime
#include $(CONTIKI)/core/net/mac/Makefile.mac #include $(CONTIKI)/core/net/mac/Makefile.mac

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

@ -1,6 +1,3 @@
MODULES += core/net/ipv6 core/net/mac/sicslowmac
CONTIKI_TARGET_DIRS = . apps net loader CONTIKI_TARGET_DIRS = . apps net loader
CONTIKI_CORE=contiki-raven-main CONTIKI_CORE=contiki-raven-main
@ -37,3 +34,5 @@ AVRDUDE_MCU=m1284p
include $(CONTIKIAVR)/Makefile.avr include $(CONTIKIAVR)/Makefile.avr
include $(CONTIKIAVR)/radio/Makefile.radio include $(CONTIKIAVR)/radio/Makefile.radio
MODULES += core/net/ipv6 core/net/ipv4 core/net/mac core/net core/net/rime core/net/mac/sicslowmac

7
platform/avr-ravenusb/Makefile.avr-ravenusb
View file

@ -1,4 +1,3 @@
MODULES += core/net/ipv6 core/net/mac/sicslowmac
CONTIKI_TARGET_DIRS = . apps net loader dev/usb dev/serial CONTIKI_TARGET_DIRS = . apps net loader dev/usb dev/serial
CONTIKI_CORE=contiki-raven-main CONTIKI_CORE=contiki-raven-main
@ -41,7 +40,8 @@ CONTIKIBOARD=.
CONTIKI_PLAT_DEFS = -DF_CPU=8000000UL -DAVRGCC -DAUTO_CRC_PADDING=2 -DJACKDAW=1 CONTIKI_PLAT_DEFS = -DF_CPU=8000000UL -DAVRGCC -DAUTO_CRC_PADDING=2 -DJACKDAW=1
#The no-net build using fakeuip.c is always ipv6 #The no-net build using fakeuip.c is always ipv6
ifdef CONTIKI_NO_NET CFLAGS += -I$(CONTIKI)/core/net/ipv6 -I$(CONTIKI)/core/net/ip -I$(CONTIKI)/core/net/ipv4
ifdef CONTIKI_NO_NET
CONTIKI_PLAT_DEFS+= -DUIP_CONF_IPV6=1 CONTIKI_PLAT_DEFS+= -DUIP_CONF_IPV6=1
endif endif
@ -66,3 +66,6 @@ AVRDUDE_OPTIONS=-V
include $(CONTIKIAVR)/Makefile.avr include $(CONTIKIAVR)/Makefile.avr
include $(CONTIKIAVR)/radio/Makefile.radio include $(CONTIKIAVR)/radio/Makefile.radio
MODULES+=core/net/ip core/net/ipv4 core/net core/net/ipv6 \
core/net/rime core/net/mac core/net/mac/sicslowmac

1
platform/avr-ravenusb/contiki-conf.h
View file

@ -374,6 +374,7 @@ typedef unsigned short uip_stats_t;
//#pragma mark RPL Settings //#pragma mark RPL Settings
/* ************************************************************************** */ /* ************************************************************************** */
#define UIP_CONF_IPV6_RPL 0
#if UIP_CONF_IPV6_RPL #if UIP_CONF_IPV6_RPL
/* Not completely working yet. Works on Ubuntu after $ifconfig usb0 -arp to drop the neighbor solitications */ /* Not completely working yet. Works on Ubuntu after $ifconfig usb0 -arp to drop the neighbor solitications */

2
platform/cc2538dk/Makefile.cc2538dk
View file

@ -25,3 +25,5 @@ endif
### Define the CPU directory ### Define the CPU directory
CONTIKI_CPU=$(CONTIKI)/cpu/cc2538 CONTIKI_CPU=$(CONTIKI)/cpu/cc2538
include $(CONTIKI_CPU)/Makefile.cc2538 include $(CONTIKI_CPU)/Makefile.cc2538
MODULES += core/net/ipv6 core/net/mac core/net/rime core/net/mac/contikimac

1
platform/econotag/Makefile.econotag
View file

@ -20,3 +20,4 @@ endif
include $(CONTIKIMC1322X)/Makefile.mc1322x include $(CONTIKIMC1322X)/Makefile.mc1322x
MODULES+=core/net/ip core/net/ipv4 core/net core/net/ipv6 core/net/rime core/net/mac

2
platform/mbxxx/Makefile.mbxxx
View file

@ -20,3 +20,5 @@ SERIALDUMP = $(CONTIKI)/tools/stm32w/serialdump-linux
ifeq ($(HOST_OS),Windows) ifeq ($(HOST_OS),Windows)
SERIALDUMP = $(CONTIKI)/tools/stm32w/serialdump-windows SERIALDUMP = $(CONTIKI)/tools/stm32w/serialdump-windows
endif endif
MODULES+=core/net/ip core/net/ipv4 core/net core/net/ipv6 core/net/rime core/net/mac core/nnet/mac/contikimac

2
platform/micaz/Makefile.micaz
View file

@ -45,4 +45,4 @@ ifneq ($(strip $(HAVE_PRGBOARD_FILE)), )
include $(PRGBOARD_FILE) include $(PRGBOARD_FILE)
endif endif
MODULES += core/net/ipv6 core/net/rime core/net/mac/cxmac dev/cc2420 MODULES += core/net/ipv6 core/net/ipv4 core/net/rime core/net/mac/cxmac dev/cc2420

2
platform/minimal-net/Makefile.minimal-net
View file

@ -28,3 +28,5 @@ endif
### Define the CPU directory ### Define the CPU directory
CONTIKI_CPU=$(CONTIKI)/cpu/native CONTIKI_CPU=$(CONTIKI)/cpu/native
include $(CONTIKI)/cpu/native/Makefile.native include $(CONTIKI)/cpu/native/Makefile.native
MODULES+=core/net/ip core/net/ipv4 core/net core/net/ipv6 core/net/rime

2
platform/native/Makefile.native
View file

@ -46,4 +46,4 @@ CURSES_LIBS ?= -lncurses
TARGET_LIBFILES += $(CURSES_LIBS) TARGET_LIBFILES += $(CURSES_LIBS)
MODULES+=core/net/ip core/net/ipv4 core/net core/net/ipv6 MODULES+=core/net/ip core/net/ipv4 core/net core/net/ipv6 core/net/rime