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
This commit is contained in:
George Oikonomou 2013-11-15 22:04:58 +00:00
parent 58ef2342c2
commit 4eeb527cb8
3 changed files with 0 additions and 7 deletions

View file

@ -20,7 +20,6 @@ CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
CLEAN += *.cc2530dk CLEAN += *.cc2530dk
ifeq ($(UIP_CONF_IPV6),1) ifeq ($(UIP_CONF_IPV6),1)
CFLAGS += -DUIP_CONF_IPV6=1
CONTIKI_TARGET_SOURCEFILES += viztool.c CONTIKI_TARGET_SOURCEFILES += viztool.c
endif endif

View file

@ -22,11 +22,6 @@ ifndef SMALL
SMALL = 1 SMALL = 1
endif 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 ### Define the CPU directory
CONTIKI_CPU=$(CONTIKI)/cpu/cc2538 CONTIKI_CPU=$(CONTIKI)/cpu/cc2538
include $(CONTIKI_CPU)/Makefile.cc2538 include $(CONTIKI_CPU)/Makefile.cc2538

View file

@ -47,7 +47,6 @@ CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
CLEAN += *.sensinode CLEAN += *.sensinode
ifeq ($(UIP_CONF_IPV6),1) ifeq ($(UIP_CONF_IPV6),1)
CFLAGS += -DUIP_CONF_IPV6=1
ifeq ($(OFFSET_FIRMWARE),1) ifeq ($(OFFSET_FIRMWARE),1)
CFLAGS += -DDISCO_ENABLED=1 CFLAGS += -DDISCO_ENABLED=1
CONTIKI_TARGET_SOURCEFILES += disco.c CONTIKI_TARGET_SOURCEFILES += disco.c