From 7a740b382f9f70f8f672d052c6ad22f5afcbc061 Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Thu, 5 Dec 2013 23:56:30 +0100 Subject: [PATCH] Moved the individual MODULE definitions from the top-level Makefile.include into the individual platforms' Makefiles --- Makefile.include | 3 +-- platform/avr-raven/Makefile.avr-raven | 5 ++--- platform/avr-ravenusb/Makefile.avr-ravenusb | 7 +++++-- platform/avr-ravenusb/contiki-conf.h | 1 + platform/cc2538dk/Makefile.cc2538dk | 2 ++ platform/econotag/Makefile.econotag | 1 + platform/mbxxx/Makefile.mbxxx | 2 ++ platform/micaz/Makefile.micaz | 2 +- platform/minimal-net/Makefile.minimal-net | 2 ++ platform/native/Makefile.native | 2 +- 10 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Makefile.include b/Makefile.include index 9dc2a77a5..5259b3f0c 100644 --- a/Makefile.include +++ b/Makefile.include @@ -58,8 +58,7 @@ UPPERCASE = _ABCDEFGHIJKLMNOPQRSTUVWXYZ TARGET_UPPERCASE := ${strip ${shell echo $(TARGET) | sed y!$(LOWERCASE)!$(UPPERCASE)!}} CFLAGS += -DCONTIKI=1 -DCONTIKI_TARGET_$(TARGET_UPPERCASE)=1 -MODULES += core/sys core/dev core/lib \ - core/net/ipv6 core/net/ipv4 core/net/rime core/net/mac core/net/mac/contikimac +MODULES += core/sys core/dev core/lib core/net/mac #include $(CONTIKI)/core/net/rime/Makefile.rime #include $(CONTIKI)/core/net/mac/Makefile.mac diff --git a/platform/avr-raven/Makefile.avr-raven b/platform/avr-raven/Makefile.avr-raven index 79e78df38..345177ada 100644 --- a/platform/avr-raven/Makefile.avr-raven +++ b/platform/avr-raven/Makefile.avr-raven @@ -1,6 +1,3 @@ - -MODULES += core/net/ipv6 core/net/mac/sicslowmac - CONTIKI_TARGET_DIRS = . apps net loader CONTIKI_CORE=contiki-raven-main @@ -37,3 +34,5 @@ AVRDUDE_MCU=m1284p include $(CONTIKIAVR)/Makefile.avr include $(CONTIKIAVR)/radio/Makefile.radio + +MODULES += core/net/ipv6 core/net/ipv4 core/net/mac core/net core/net/rime core/net/mac/sicslowmac diff --git a/platform/avr-ravenusb/Makefile.avr-ravenusb b/platform/avr-ravenusb/Makefile.avr-ravenusb index dfbd5627c..3fa69ceb3 100644 --- a/platform/avr-ravenusb/Makefile.avr-ravenusb +++ b/platform/avr-ravenusb/Makefile.avr-ravenusb @@ -1,4 +1,3 @@ -MODULES += core/net/ipv6 core/net/mac/sicslowmac CONTIKI_TARGET_DIRS = . apps net loader dev/usb dev/serial CONTIKI_CORE=contiki-raven-main @@ -41,7 +40,8 @@ CONTIKIBOARD=. CONTIKI_PLAT_DEFS = -DF_CPU=8000000UL -DAVRGCC -DAUTO_CRC_PADDING=2 -DJACKDAW=1 #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 endif @@ -66,3 +66,6 @@ AVRDUDE_OPTIONS=-V include $(CONTIKIAVR)/Makefile.avr 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 diff --git a/platform/avr-ravenusb/contiki-conf.h b/platform/avr-ravenusb/contiki-conf.h index 8b0a5d0a3..3a46ba164 100644 --- a/platform/avr-ravenusb/contiki-conf.h +++ b/platform/avr-ravenusb/contiki-conf.h @@ -374,6 +374,7 @@ typedef unsigned short uip_stats_t; //#pragma mark RPL Settings /* ************************************************************************** */ +#define UIP_CONF_IPV6_RPL 0 #if UIP_CONF_IPV6_RPL /* Not completely working yet. Works on Ubuntu after $ifconfig usb0 -arp to drop the neighbor solitications */ diff --git a/platform/cc2538dk/Makefile.cc2538dk b/platform/cc2538dk/Makefile.cc2538dk index b350c2fc2..c28364bc3 100644 --- a/platform/cc2538dk/Makefile.cc2538dk +++ b/platform/cc2538dk/Makefile.cc2538dk @@ -25,3 +25,5 @@ endif ### Define the CPU directory CONTIKI_CPU=$(CONTIKI)/cpu/cc2538 include $(CONTIKI_CPU)/Makefile.cc2538 + +MODULES += core/net/ipv6 core/net/mac core/net/rime core/net/mac/contikimac diff --git a/platform/econotag/Makefile.econotag b/platform/econotag/Makefile.econotag index 99f837501..712f07f6c 100644 --- a/platform/econotag/Makefile.econotag +++ b/platform/econotag/Makefile.econotag @@ -20,3 +20,4 @@ endif include $(CONTIKIMC1322X)/Makefile.mc1322x +MODULES+=core/net/ip core/net/ipv4 core/net core/net/ipv6 core/net/rime core/net/mac diff --git a/platform/mbxxx/Makefile.mbxxx b/platform/mbxxx/Makefile.mbxxx index 752b2576b..4da4f5f23 100644 --- a/platform/mbxxx/Makefile.mbxxx +++ b/platform/mbxxx/Makefile.mbxxx @@ -20,3 +20,5 @@ SERIALDUMP = $(CONTIKI)/tools/stm32w/serialdump-linux ifeq ($(HOST_OS),Windows) SERIALDUMP = $(CONTIKI)/tools/stm32w/serialdump-windows endif + +MODULES+=core/net/ip core/net/ipv4 core/net core/net/ipv6 core/net/rime core/net/mac core/nnet/mac/contikimac diff --git a/platform/micaz/Makefile.micaz b/platform/micaz/Makefile.micaz index b7bb6382f..b7fcc9d89 100644 --- a/platform/micaz/Makefile.micaz +++ b/platform/micaz/Makefile.micaz @@ -45,4 +45,4 @@ ifneq ($(strip $(HAVE_PRGBOARD_FILE)), ) include $(PRGBOARD_FILE) 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 diff --git a/platform/minimal-net/Makefile.minimal-net b/platform/minimal-net/Makefile.minimal-net index 034551781..9a37adf52 100644 --- a/platform/minimal-net/Makefile.minimal-net +++ b/platform/minimal-net/Makefile.minimal-net @@ -28,3 +28,5 @@ endif ### Define the CPU directory CONTIKI_CPU=$(CONTIKI)/cpu/native include $(CONTIKI)/cpu/native/Makefile.native + +MODULES+=core/net/ip core/net/ipv4 core/net core/net/ipv6 core/net/rime diff --git a/platform/native/Makefile.native b/platform/native/Makefile.native index c6c100d1c..c85256727 100644 --- a/platform/native/Makefile.native +++ b/platform/native/Makefile.native @@ -46,4 +46,4 @@ CURSES_LIBS ?= -lncurses 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