From 9087448dc43d37a4a8b2f5650e02880fa9c880c5 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Mon, 9 Oct 2017 21:59:07 +0200 Subject: [PATCH] Removing from contiki-default-conf.h configuration flags that are now set from Makefile exclusively --- os/contiki-default-conf.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/os/contiki-default-conf.h b/os/contiki-default-conf.h index 9a312e192..0a93a4313 100644 --- a/os/contiki-default-conf.h +++ b/os/contiki-default-conf.h @@ -66,12 +66,6 @@ #define NETSTACK_MAX_ROUTE_ENTRIES 16 #endif /* NETSTACK_MAX_ROUTE_ENTRIES */ -/* NETSTACK_CONF_WITH_IPV6 specifies whether or not IPv6 should be used. If IPv6 - is not used, IPv4 is used instead. */ -#ifndef NETSTACK_CONF_WITH_IPV6 -#define NETSTACK_CONF_WITH_IPV6 0 -#endif /* NETSTACK_CONF_WITH_IPV6 */ - /* UIP_CONF_BUFFER_SIZE specifies how much memory should be reserved for the uIP packet buffer. This sets an upper bound on the largest IP packet that can be received by the system. */ @@ -85,12 +79,6 @@ #define UIP_CONF_ROUTER 1 #endif /* UIP_CONF_ROUTER */ -/* UIP_CONF_IPV6_RPL specifies if RPL is to be used for IPv6 - routing. */ -#ifndef UIP_CONF_IPV6_RPL -#define UIP_CONF_IPV6_RPL 1 -#endif /* UIP_CONF_IPV6_RPL */ - /* If RPL is enabled also enable the RPL NBR Policy */ #if UIP_CONF_IPV6_RPL #ifndef NBR_TABLE_FIND_REMOVABLE