From 4eeb527cb8a1f90c5c4065ca0df20c1e561bef2f Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Fri, 15 Nov 2013 22:04:58 +0000 Subject: [PATCH] Don't specify -DUIP_CONF_IPV6 in platform makefiles Makefile.include has done it for us already, we no longer need to do so ourselves --- platform/cc2530dk/Makefile.cc2530dk | 1 - platform/cc2538dk/Makefile.cc2538dk | 5 ----- platform/sensinode/Makefile.sensinode | 1 - 3 files changed, 7 deletions(-) diff --git a/platform/cc2530dk/Makefile.cc2530dk b/platform/cc2530dk/Makefile.cc2530dk index cae4911b5..2ef71e6f3 100644 --- a/platform/cc2530dk/Makefile.cc2530dk +++ b/platform/cc2530dk/Makefile.cc2530dk @@ -20,7 +20,6 @@ CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES) CLEAN += *.cc2530dk ifeq ($(UIP_CONF_IPV6),1) - CFLAGS += -DUIP_CONF_IPV6=1 CONTIKI_TARGET_SOURCEFILES += viztool.c endif diff --git a/platform/cc2538dk/Makefile.cc2538dk b/platform/cc2538dk/Makefile.cc2538dk index 2ca46af7e..b350c2fc2 100644 --- a/platform/cc2538dk/Makefile.cc2538dk +++ b/platform/cc2538dk/Makefile.cc2538dk @@ -22,11 +22,6 @@ ifndef SMALL SMALL = 1 endif -### If the prject's Makefile specified IPv6, the pre-processor needs to know -ifeq ($(UIP_CONF_IPV6),1) - CFLAGS += -DUIP_CONF_IPV6=1 -endif - ### Define the CPU directory CONTIKI_CPU=$(CONTIKI)/cpu/cc2538 include $(CONTIKI_CPU)/Makefile.cc2538 diff --git a/platform/sensinode/Makefile.sensinode b/platform/sensinode/Makefile.sensinode index 743a51349..d37dafdd8 100644 --- a/platform/sensinode/Makefile.sensinode +++ b/platform/sensinode/Makefile.sensinode @@ -47,7 +47,6 @@ CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES) CLEAN += *.sensinode ifeq ($(UIP_CONF_IPV6),1) - CFLAGS += -DUIP_CONF_IPV6=1 ifeq ($(OFFSET_FIRMWARE),1) CFLAGS += -DDISCO_ENABLED=1 CONTIKI_TARGET_SOURCEFILES += disco.c