mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-12-21 03:30:01 +00:00
Cleanup of the Contiki network layer configuration. Now using CONTIKI_WITH_IPV6, CONTIKI_WITH_IPV4, and CONTIKI_WITH_RIME in makefiles, and UIP_CONF_IPV6, UIP_CONF_IPV4, UIP_CONF_RIME in c code. Now only the stacks that are used are compiled (via makefile MODULES). Make IPv6 the default network stack.
This commit is contained in:
Simon Duquennoy
parent
d3d33c5699
commit
722b3258d1
@ -14,10 +14,6 @@ ifeq ($(TARGET),)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(UIP_CONF_IPV6),1)
|
||||
CFLAGS += -DUIP_CONF_IPV6=1
|
||||
endif
|
||||
|
||||
ifeq ($(DEFINES),)
|
||||
-include Makefile.$(TARGET).defines
|
||||
ifneq ($(DEFINES),)
|
||||
@ -67,6 +63,37 @@ CFLAGS += -DCONTIKI=1 -DCONTIKI_TARGET_$(TARGET_UPPERCASE)=1
|
||||
|
||||
MODULES += core/sys core/dev core/lib
|
||||
|
||||
# Include IPv6, IPv4, and/or Rime
|
||||
|
||||
HAS_STACK = 0
|
||||
ifeq ($(CONTIKI_WITH_IPV4),1)
|
||||
HAS_STACK = 1
|
||||
CFLAGS += -DUIP_CONF_IPV4=1
|
||||
MODULES += core/net/ipv4 core/net/ip
|
||||
endif
|
||||
|
||||
ifeq ($(CONTIKI_WITH_RIME),1)
|
||||
HAS_STACK = 1
|
||||
CFLAGS += -DUIP_CONF_RIME=1
|
||||
MODULES += core/net/rime
|
||||
endif
|
||||
|
||||
# Make IPv6 the default stack
|
||||
ifeq ($(HAS_STACK),0)
|
||||
ifneq ($(CONTIKI_WITH_IPV6),0)
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(CONTIKI_WITH_IPV6),1)
|
||||
CFLAGS += -DUIP_CONF_IPV6=1
|
||||
ifneq ($(CONTIKI_WITH_RPL),0)
|
||||
CFLAGS += -DUIP_CONF_IPV6_RPL=1
|
||||
MODULES += core/net/rpl
|
||||
endif # UIP_CONF_RPL
|
||||
MODULES += core/net/ipv6 core/net/ip
|
||||
endif
|
||||
|
||||
CONTIKI_SOURCEFILES += $(CONTIKIFILES)
|
||||
|
||||
CONTIKIDIRS += ${addprefix $(CONTIKI)/core/,dev lib net net/llsec net/mac net/rime \
|
||||
|
||||
@ -1,19 +1,35 @@
|
||||
shell_src = shell.c shell-reboot.c \
|
||||
shell-vars.c shell-ps.c shell-rime.c shell-sendtest.c \
|
||||
shell_src = shell.c shell-reboot.c shell-vars.c shell-ps.c \
|
||||
shell-blink.c shell-text.c shell-time.c \
|
||||
shell-file.c shell-netfile.c shell-run.c \
|
||||
shell-rime-ping.c shell-rime-sniff.c shell-rime-netcmd.c \
|
||||
shell-rime-debug.c shell-rime-debug-runicast.c shell-coffee.c \
|
||||
shell-wget.c shell-httpd.c shell-irc.c \
|
||||
shell-file.c shell-run.c \
|
||||
shell-coffee.c \
|
||||
shell-power.c \
|
||||
shell-tcpsend.c shell-udpsend.c shell-ping.c shell-netstat.c \
|
||||
shell-rime-sendcmd.c shell-download.c shell-rime-neighbors.c \
|
||||
shell-rime-unicast.c \
|
||||
shell-base64.c \
|
||||
shell-netperf.c shell-memdebug.c \
|
||||
shell-powertrace.c shell-collect-view.c shell-crc.c
|
||||
shell-memdebug.c \
|
||||
shell-powertrace.c shell-crc.c
|
||||
shell_dsc = shell-dsc.c
|
||||
|
||||
ifeq ($(CONTIKI_WITH_RIME),1)
|
||||
shell_src += shell-rime.c shell-sendtest.c shell-netfile.c \
|
||||
shell-rime-ping.c shell-rime-sniff.c shell-rime-netcmd.c \
|
||||
shell-rime-debug.c shell-rime-debug-runicast.c \
|
||||
shell-rime-sendcmd.c shell-download.c shell-rime-neighbors.c \
|
||||
shell-rime-unicast.c shell-netperf.c \
|
||||
shell-collect-view.c
|
||||
|
||||
APPS += collect-view
|
||||
include $(CONTIKI)/apps/collect-view/Makefile.collect-view
|
||||
endif
|
||||
|
||||
ifeq ($(CONTIKI_WITH_IPV4),1)
|
||||
SHELL_WITH_IP = 1
|
||||
endif
|
||||
ifeq ($(CONTIKI_WITH_IPV6),1)
|
||||
SHELL_WITH_IP = 1
|
||||
endif
|
||||
|
||||
ifeq ($(SHELL_WITH_IP),1)
|
||||
shell_src += shell-wget.c shell-httpd.c shell-irc.c \
|
||||
shell-tcpsend.c shell-udpsend.c shell-ping.c shell-netstat.c
|
||||
APPS += webserver
|
||||
include $(CONTIKI)/apps/webserver/Makefile.webserver
|
||||
ifndef PLATFORM_BUILD
|
||||
@ -38,13 +54,11 @@ ifndef PLATFORM_BUILD
|
||||
override telnet_src = telnet.c
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
APPS += powertrace
|
||||
include $(CONTIKI)/apps/powertrace/Makefile.powertrace
|
||||
|
||||
|
||||
APPS += collect-view
|
||||
include $(CONTIKI)/apps/collect-view/Makefile.collect-view
|
||||
|
||||
ifeq ($(TARGET),sky)
|
||||
shell_src += shell-sky.c shell-exec.c
|
||||
endif
|
||||
|
||||
@ -96,7 +96,6 @@ slip_set_input_callback(void (*c)(void))
|
||||
/* slip_send: forward (IPv4) packets with {UIP_FW_NETIF(..., slip_send)}
|
||||
* was used in slip-bridge.c
|
||||
*/
|
||||
//#if WITH_UIP
|
||||
uint8_t
|
||||
slip_send(void)
|
||||
{
|
||||
@ -125,7 +124,6 @@ slip_send(void)
|
||||
|
||||
return UIP_FW_OK;
|
||||
}
|
||||
//#endif /* WITH_UIP */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
uint8_t
|
||||
slip_write(const void *_ptr, int len)
|
||||
|
||||
@ -51,7 +51,7 @@ CONTIKI_SOURCEFILES += $(CTK) ctk-conio.c petsciiconv.c cfs-posix-dir.c \
|
||||
$(CONTIKI_TARGET_SOURCEFILES) $(CONTIKI_CPU_SOURCEFILES) \
|
||||
$(ETHERNET_SOURCEFILES)
|
||||
|
||||
MODULES += core/ctk core/net/ip core/net/ipv4 core/net/ipv6
|
||||
MODULES += core/ctk
|
||||
|
||||
# Set target-specific variable values
|
||||
${addprefix $(OBJECTDIR)/,${call oname, $(ETHERNET_SOURCEFILES)}}: ASFLAGS += -D DYN_DRV=0
|
||||
|
||||
@ -2,4 +2,5 @@ CONTIKI_PROJECT = ethconfig
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
CONTIKI_WITH_IPV4 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -2,4 +2,5 @@ CONTIKI_PROJECT = ipconfig
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
CONTIKI_WITH_IPV4 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -76,7 +76,7 @@ CFLAGSNO = -I. -I$(CONTIKI)/core -I$(CONTIKI_CPU) -I$(CONTIKI_CPU)/loader \
|
||||
-I$(CONTIKI_CPU)/dbg-io \
|
||||
-I$(CONTIKI)/platform/$(TARGET) \
|
||||
${addprefix -I,$(APPDIRS)} \
|
||||
-DWITH_UIP -DWITH_ASCII -DMCK=$(MCK) \
|
||||
-DWITH_ASCII -DMCK=$(MCK) \
|
||||
-Wall $(ARCH_FLAGS) -g -D SUBTARGET=$(SUBTARGET)
|
||||
|
||||
CFLAGS += $(CFLAGSNO) -O -DRUN_AS_SYSTEM -DROM_RUN
|
||||
|
||||
@ -75,7 +75,7 @@ CFLAGSNO = -I. -I$(CONTIKI)/core -I$(CONTIKI_CPU) -I$(CONTIKI_CPU)/loader \
|
||||
-I$(CONTIKI_CPU)/dbg-io \
|
||||
-I$(CONTIKI)/platform/$(TARGET) \
|
||||
${addprefix -I,$(APPDIRS)} \
|
||||
-DWITH_UIP -DWITH_ASCII -DMCK=$(MCK) \
|
||||
-DWITH_ASCII -DMCK=$(MCK) \
|
||||
-Wall $(ARCH_FLAGS) -g -D SUBTARGET=$(SUBTARGET)
|
||||
|
||||
CFLAGS += $(CFLAGSNO) -O -DRUN_AS_SYSTEM -DROM_RUN
|
||||
|
||||
@ -35,9 +35,9 @@ endef
|
||||
### Banking Guesswork:
|
||||
### Examples outside examples/sensinode do not specify banking.
|
||||
### We automatically turn it on if its unspecified and if we are building with
|
||||
### UIP_CONF_IPV6
|
||||
### CONTIKI_WITH_IPV6
|
||||
ifndef HAVE_BANKING
|
||||
ifeq ($(UIP_CONF_IPV6),1)
|
||||
ifeq ($(CONTIKI_WITH_IPV6),1)
|
||||
HAVE_BANKING=1
|
||||
else
|
||||
HAVE_BANKING=0
|
||||
|
||||
@ -51,9 +51,9 @@ endif
|
||||
### Banking Guesswork:
|
||||
### Generic examples do not specify banking.
|
||||
### We automatically turn it on if its unspecified and if we are building with
|
||||
### UIP_CONF_IPV6
|
||||
### CONTIKI_WITH_IPV6
|
||||
ifndef HAVE_BANKING
|
||||
ifeq ($(UIP_CONF_IPV6),1)
|
||||
ifeq ($(CONTIKI_WITH_IPV6),1)
|
||||
HAVE_BANKING=1
|
||||
else
|
||||
HAVE_BANKING=0
|
||||
|
||||
@ -57,7 +57,7 @@ slip_arch_writeb(unsigned char c)
|
||||
*
|
||||
*/
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#if WITH_UIP
|
||||
#if UIP_CONF_IPV4
|
||||
int
|
||||
putchar(int c)
|
||||
{
|
||||
@ -83,7 +83,7 @@ putchar(int c)
|
||||
|
||||
return c;
|
||||
}
|
||||
#endif
|
||||
#endif /* UIP_CONF_IPV4 */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/**
|
||||
* Initalize the RS232 port and the SLIP driver.
|
||||
|
||||
@ -100,8 +100,8 @@ uart0_writeb(unsigned char c)
|
||||
#endif /* TX_WITH_INTERRUPT */
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#if ! WITH_UIP /* If WITH_UIP is defined, putchar() is defined by the SLIP driver */
|
||||
#endif /* ! WITH_UIP */
|
||||
#if ! UIP_CONF_IPV4 /* If UIP_CONF_IPV4 is defined, putchar() is defined by the SLIP driver */
|
||||
#endif /* ! UIP_CONF_IPV4 */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/**
|
||||
* Initalize the RS232 port.
|
||||
|
||||
@ -97,8 +97,8 @@ uart1_writeb(unsigned char c)
|
||||
#endif /* TX_WITH_INTERRUPT */
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#if ! WITH_UIP /* If WITH_UIP is defined, putchar() is defined by the SLIP driver */
|
||||
#endif /* ! WITH_UIP */
|
||||
#if ! UIP_CONF_IPV4 /* If UIP_CONF_IPV4 is defined, putchar() is defined by the SLIP driver */
|
||||
#endif /* ! UIP_CONF_IPV4 */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/**
|
||||
* Initalize the RS232 port.
|
||||
|
||||
@ -49,7 +49,7 @@ slip_arch_writeb(unsigned char c)
|
||||
*
|
||||
*/
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#if WITH_UIP
|
||||
#if UIP_CONF_IPV4
|
||||
int
|
||||
putchar(int c)
|
||||
{
|
||||
@ -75,7 +75,7 @@ putchar(int c)
|
||||
|
||||
return c;
|
||||
}
|
||||
#endif
|
||||
#endif /* UIP_CONF_IPV4 */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/**
|
||||
* Initalize the RS232 port and the SLIP driver.
|
||||
|
||||
@ -49,7 +49,7 @@ slip_arch_writeb(unsigned char c)
|
||||
*
|
||||
*/
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#if WITH_UIP
|
||||
#if UIP_CONF_IPV4
|
||||
int
|
||||
putchar(int c)
|
||||
{
|
||||
@ -75,7 +75,7 @@ putchar(int c)
|
||||
|
||||
return c;
|
||||
}
|
||||
#endif
|
||||
#endif /* UIP_CONF_IPV4 */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/**
|
||||
* Initalize the RS232 port and the SLIP driver.
|
||||
|
||||
@ -120,9 +120,9 @@ uart1_writeb(unsigned char c)
|
||||
#endif /* TX_WITH_INTERRUPT */
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
#if ! WITH_UIP
|
||||
/* If WITH_UIP is defined, putchar() is defined by the SLIP driver */
|
||||
#endif /* ! WITH_UIP */
|
||||
#if ! UIP_CONF_IPV4
|
||||
/* If UIP_CONF_IPV4 is defined, putchar() is defined by the SLIP driver */
|
||||
#endif /* ! UIP_CONF_IPV4 */
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/*
|
||||
* Initalize the RS232 port.
|
||||
|
||||
@ -5,4 +5,5 @@ SMALL = 1
|
||||
|
||||
all: netdb-client netdb-server
|
||||
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -7,4 +7,5 @@ SMALL = 1
|
||||
|
||||
all: shell-db
|
||||
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -3,4 +3,5 @@ CONTIKI_PROJECT = hello-world blink-hello timer-test sensors-demo
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -2,8 +2,6 @@ DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
|
||||
|
||||
# We need uIPv6, therefore we also need banking
|
||||
HAVE_BANKING=1
|
||||
UIP_CONF_IPV6=1
|
||||
UIP_CONF_RPL=1
|
||||
|
||||
PROJECT_SOURCEFILES += slip-bridge.c
|
||||
|
||||
@ -12,5 +10,5 @@ CONTIKI_PROJECT = border-router
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -5,4 +5,5 @@ DEFINES+=MODELS_CONF_CC2531_USB_STICK=1
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -7,4 +7,5 @@ all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
|
||||
|
||||
HAVE_BANKING=1
|
||||
UIP_CONF_IPV6=1
|
||||
UIP_CONF_RPL=1
|
||||
|
||||
PROJECT_SOURCEFILES += ping6.c
|
||||
|
||||
@ -11,5 +9,7 @@ CONTIKI_PROJECT = client server
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
# needed for rimestats
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -4,4 +4,5 @@ CONTIKI_PROJECT = cc2538-demo timer-test
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -6,5 +6,5 @@ CONTIKI_PROJECT = sniffer
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -1,10 +1,7 @@
|
||||
UIP_CONF_IPV6=1
|
||||
UIP_CONF_RPL=1
|
||||
|
||||
CONTIKI_PROJECT = udp-echo-server
|
||||
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -4,4 +4,5 @@ all: $(CONTIKI_PROJECT)
|
||||
APPS = serial-shell powertrace collect-view
|
||||
CONTIKI = ../..
|
||||
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -3,4 +3,5 @@ all: $(CONTIKI_PROJECT)
|
||||
TARGET=mbxxx
|
||||
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -4,4 +4,5 @@ all: $(CONTIKI_PROJECT)
|
||||
APPS = email
|
||||
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_IPV4 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -3,12 +3,6 @@ all: er-example-server er-example-client
|
||||
|
||||
CONTIKI=../..
|
||||
|
||||
# Contiki IPv6 configuration
|
||||
WITH_UIP6=1
|
||||
UIP_CONF_IPV6=1
|
||||
CFLAGS += -DUIP_CONF_IPV6=1
|
||||
CFLAGS += -DUIP_CONF_IPV6_RPL=1
|
||||
|
||||
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
|
||||
|
||||
# automatically build RESTful resources
|
||||
@ -37,6 +31,7 @@ APPS += rest-engine
|
||||
#CUSTOM_RULE_C_TO_OBJECTDIR_O = 1
|
||||
#CUSTOM_RULE_S_TO_OBJECTDIR_O = 1
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
# minimal-net target is currently broken in Contiki
|
||||
@ -46,7 +41,7 @@ ${info INFO: er-example compiling with large buffers}
|
||||
CFLAGS += -DUIP_CONF_BUFFER_SIZE=1300
|
||||
CFLAGS += -DREST_MAX_CHUNK_SIZE=1024
|
||||
CFLAGS += -DCOAP_MAX_HEADER_SIZE=176
|
||||
CFLAGS += -DUIP_CONF_IPV6_RPL=0
|
||||
UIP_CONF_RPL=0
|
||||
endif
|
||||
|
||||
# optional rules to get assembly
|
||||
|
||||
@ -3,5 +3,6 @@ all: $(CONTIKI_PROJECT)
|
||||
|
||||
APPS = serial-shell
|
||||
CONTIKI = ../..
|
||||
|
||||
CONTIKI_WITH_RIME = 1
|
||||
CONTIKI_WITH_IPV4 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -5,4 +5,5 @@ CONTIKI_PROJECT = extended-rf-api
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -4,4 +4,5 @@ all: $(CONTIKI_PROJECT)
|
||||
APPS = ftp
|
||||
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_IPV4 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
CONTIKI_PROJECT = hello-world
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
#UIP_CONF_IPV6=1
|
||||
|
||||
CONTIKI = ../..
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
CONTIKI=../../..
|
||||
|
||||
UIP_CONF_IPV6=1
|
||||
SMALL=1
|
||||
|
||||
PROJECT_SOURCEFILES += json-ws.c
|
||||
@ -26,4 +25,5 @@ ifneq ($(TARGET),)
|
||||
all: websense-$(TARGET)
|
||||
endif
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
|
||||
UIP_CONF_IPV6=1
|
||||
|
||||
CONTIKI_PROJECT = root intermediate sink
|
||||
all: $(CONTIKI_PROJECT)
|
||||
@ -8,4 +7,5 @@ CONTIKI = ../../..
|
||||
|
||||
MODULES += core/net/ipv6/multicast
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -4,9 +4,6 @@ APPS = slip-cmd
|
||||
|
||||
CONTIKI=../../..
|
||||
|
||||
UIP_CONF_IPV6=1
|
||||
CFLAGS+= -DUIP_CONF_IPV6_RPL -DUIP_CONF_IPV6 -DWITH_UIP6
|
||||
|
||||
#linker optimizations
|
||||
SMALL=1
|
||||
|
||||
@ -23,6 +20,7 @@ APPS += $(WITH_WEBSERVER)
|
||||
CFLAGS += -DWEBSERVER=2
|
||||
endif
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
connect-router: border-router.native
|
||||
|
||||
@ -3,9 +3,6 @@ all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI=../../..
|
||||
|
||||
UIP_CONF_IPV6=1
|
||||
CFLAGS+= -DUIP_CONF_IPV6_RPL
|
||||
|
||||
#linker optimizations
|
||||
SMALL=1
|
||||
|
||||
@ -39,6 +36,7 @@ ifeq ($(PREFIX),)
|
||||
PREFIX = aaaa::1/64
|
||||
endif
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
$(CONTIKI)/tools/tunslip6: $(CONTIKI)/tools/tunslip6.c
|
||||
|
||||
@ -3,14 +3,11 @@ APPS = powertrace collect-view
|
||||
CONTIKI_PROJECT = udp-sender udp-sink
|
||||
PROJECT_SOURCEFILES += collect-common.c
|
||||
|
||||
UIP_CONF_IPV6=1
|
||||
CFLAGS+= -DUIP_CONF_IPV6_RPL
|
||||
|
||||
ifdef PERIOD
|
||||
CFLAGS=-DPERIOD=$(PERIOD)
|
||||
endif
|
||||
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
|
||||
@ -2,10 +2,6 @@ all: udp-client udp-server
|
||||
APPS=servreg-hack
|
||||
CONTIKI=../../..
|
||||
|
||||
UIP_CONF_IPV6=1
|
||||
|
||||
CFLAGS+= -DUIP_CONF_IPV6_RPL
|
||||
|
||||
ifdef WITH_COMPOWER
|
||||
APPS+=powertrace
|
||||
CFLAGS+= -DCONTIKIMAC_CONF_COMPOWER=1 -DWITH_COMPOWER=1 -DQUEUEBUF_CONF_NUM=4
|
||||
@ -18,4 +14,5 @@ ifdef PERIOD
|
||||
CFLAGS+=-DPERIOD=$(PERIOD)
|
||||
endif
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -2,7 +2,5 @@ all: broadcast-example unicast-sender unicast-receiver
|
||||
APPS=servreg-hack
|
||||
CONTIKI=../../..
|
||||
|
||||
UIP_CONF_IPV6=1
|
||||
CFLAGS+= -DUIP_CONF_IPV6_RPL
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -2,9 +2,6 @@ all: sky-websense
|
||||
|
||||
CONTIKI=../../..
|
||||
|
||||
UIP_CONF_IPV6=1
|
||||
CFLAGS+= -DUIP_CONF_IPV6_RPL
|
||||
|
||||
APPS += webbrowser
|
||||
|
||||
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
|
||||
@ -12,6 +9,7 @@ CONTIKI_SOURCEFILES += wget.c
|
||||
PROJECTDIRS += ../rpl-border-router
|
||||
PROJECT_SOURCEFILES += httpd-simple.c
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
$(CONTIKI)/tools/tunslip6: $(CONTIKI)/tools/tunslip6.c
|
||||
|
||||
@ -8,9 +8,6 @@ endif
|
||||
|
||||
CONTIKI=../../..
|
||||
|
||||
UIP_CONF_IPV6=1
|
||||
UIP_CONF_RPL=0
|
||||
|
||||
#linker optimizations
|
||||
SMALL=1
|
||||
|
||||
@ -26,4 +23,6 @@ ifeq ($(TARGET),econotag)
|
||||
PROJECT_SOURCEFILES += slip-radio-mc1322x.c
|
||||
endif
|
||||
|
||||
CONTIKI_WITH_RPL = 0
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -4,4 +4,5 @@ all: $(CONTIKI_PROJECT)
|
||||
APPS = irc
|
||||
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_IPV4 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -4,11 +4,8 @@ all: $(CONTIKI_PROJECT)
|
||||
CONTIKI = ../../../..
|
||||
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
|
||||
|
||||
WITH_UIP6=1
|
||||
UIP_CONF_IPV6=1
|
||||
CFLAGS+= -DUIP_CONF_IPV6_RPL
|
||||
|
||||
#linker optimizations
|
||||
SMALL=1
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -4,11 +4,8 @@ all: $(CONTIKI_PROJECT)
|
||||
CONTIKI = ../../../..
|
||||
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
|
||||
|
||||
WITH_UIP6=1
|
||||
UIP_CONF_IPV6=1
|
||||
CFLAGS+= -DUIP_CONF_IPV6_RPL
|
||||
|
||||
#linker optimizations
|
||||
SMALL=1
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -3,4 +3,5 @@ CONTIKI_PROJECT = acc-example
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -3,4 +3,5 @@ CONTIKI_PROJECT = test-button
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -4,4 +4,5 @@ all: $(CONTIKI_PROJECT)
|
||||
COFFEE=1
|
||||
|
||||
CONTIKI = ../../..
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -9,4 +9,5 @@ PROJECT_SOURCEFILES = shell-sensors.c
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -2,8 +2,6 @@ all: mbxxx-websense
|
||||
|
||||
CONTIKI=../../..
|
||||
|
||||
UIP_CONF_IPV6=1
|
||||
|
||||
APPS += webserver webbrowser
|
||||
|
||||
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
|
||||
@ -11,6 +9,7 @@ CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
|
||||
PROJECTDIRS += ../../ipv6/rpl-border-router
|
||||
PROJECT_SOURCEFILES += httpd-simple.c
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
$(CONTIKI)/tools/tunslip6: $(CONTIKI)/tools/tunslip6.c
|
||||
|
||||
@ -11,6 +11,7 @@ APPS = serial-shell
|
||||
PROJECT_SOURCEFILES = shell-exec.c
|
||||
CONTIKI = ../../..
|
||||
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
%.shell-upload: %.ce
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
CONTIKI_PROJECT = telnet-server
|
||||
|
||||
UIP_CONF_IPV6=1
|
||||
|
||||
APPS = telnetd
|
||||
|
||||
@ -11,4 +9,5 @@ PROJECT_SOURCEFILES = shell-sensors.c
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -3,4 +3,5 @@ CONTIKI_PROJECT = temp-sensor
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
all: udp-server udp-client
|
||||
|
||||
UIP_CONF_IPV6=1
|
||||
|
||||
DEFINES=UIP_CONF_ND6_REACHABLE_TIME=0xffffffff
|
||||
|
||||
CONTIKI = ../../..
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -2,16 +2,13 @@ CONTIKI_PROJECT = mbxxx-webserver
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
DEFINES=PROJECT_CONF_H=\"webserver-ajax-conf.h\"
|
||||
UIP_CONF_IPV6=1
|
||||
|
||||
#APPS = webserver
|
||||
|
||||
PROJECTDIRS = . $(CONTIKI)/apps/webserver
|
||||
PROJECT_SOURCEFILES = ajax-cgi.c httpd-fs.c http-strings.c \
|
||||
httpd.c webserver-dsc.c webserver-nogui.c
|
||||
|
||||
|
||||
|
||||
|
||||
CONTIKI = ../../..
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -2,4 +2,5 @@ CONTIKI_PROJECT = multi-threading
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -3,4 +3,5 @@ all: $(CONTIKI_PROJECT)
|
||||
APPS=serial-shell
|
||||
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
all: example-ping6
|
||||
APPS=ping6
|
||||
|
||||
UIP_CONF_IPV6=1
|
||||
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -3,4 +3,5 @@ APPS+=powertrace
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -1,12 +1,10 @@
|
||||
all: ravenusbstick
|
||||
|
||||
#Define CONTIKI_NO_NET=1 for a passthrough ipv6/6lowpan interface using fakeuip.c
|
||||
#Define UIP_CONF_IPV6=1 to include the uip6 stack (for rpl, internal webserver)
|
||||
#Define CONTIKI_WITH_IPV6 = 1 to include the uip6 stack (for rpl, internal webserver)
|
||||
#Do make clean when switching to remove the duplicate library modules
|
||||
CONTIKI_NO_NET=1
|
||||
#UIP_CONF_IPV6=1
|
||||
|
||||
CFLAGS=-DUIP_CONF_IPV6=0 -DUIP_CONF_IPV6_RPL=0
|
||||
CONTIKI_WITH_IPV6=0
|
||||
|
||||
CONTIKI = ../..
|
||||
|
||||
|
||||
@ -6,8 +6,6 @@ endif
|
||||
|
||||
CONTIKI=../..
|
||||
|
||||
UIP_CONF_IPV6=1
|
||||
|
||||
WITH_COAP = 1
|
||||
|
||||
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
|
||||
@ -20,6 +18,7 @@ CFLAGS += -DWITH_HTTP
|
||||
APPS += rest-http
|
||||
endif
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
$(CONTIKI)/tools/tunslip6: $(CONTIKI)/tools/tunslip6.c
|
||||
|
||||
@ -4,4 +4,5 @@ all: example-abc example-mesh example-collect example-trickle example-polite \
|
||||
example-rudolph0 example-rudolph1 example-rudolph2 example-rucb \
|
||||
example-runicast example-unicast example-neighbors
|
||||
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -7,13 +7,8 @@ all: remotepowerswitch
|
||||
CONTIKI=../../../
|
||||
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
|
||||
|
||||
# for some platforms
|
||||
UIP_CONF_IPV6=1
|
||||
|
||||
WITH_COAP=13
|
||||
|
||||
UIP_CONF_RPL=1
|
||||
|
||||
# REST framework, requires WITH_COAP
|
||||
ifeq ($(WITH_COAP), 13)
|
||||
${info INFO: compiling with CoAP-13}
|
||||
@ -49,4 +44,5 @@ endif
|
||||
|
||||
APPS += erbium
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -13,4 +13,5 @@ CONTIKI_PROJECT += timer-test blink-hello broadcast-rime
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -7,8 +7,6 @@ DEFINES+=MODEL_N601,PROJECT_CONF_H
|
||||
|
||||
# We need uIPv6, therefore we also need banking
|
||||
HAVE_BANKING=1
|
||||
UIP_CONF_IPV6=1
|
||||
UIP_CONF_RPL=1
|
||||
|
||||
PROJECT_SOURCEFILES += slip-bridge.c
|
||||
|
||||
@ -17,4 +15,5 @@ all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -14,4 +14,5 @@ all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -6,8 +6,6 @@ endif
|
||||
DEFINES+=MODEL_N740
|
||||
|
||||
HAVE_BANKING=1
|
||||
UIP_CONF_IPV6=1
|
||||
UIP_CONF_RPL=1
|
||||
OFFSET_FIRMWARE=1
|
||||
|
||||
CONTIKI_PROJECT = disco-example
|
||||
@ -16,4 +14,5 @@ all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -13,4 +13,5 @@ all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -13,5 +13,5 @@ CONTIKI_PROJECT = event-post
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -7,7 +7,6 @@ DEFINES+=MODEL_N740,PROJECT_CONF_H
|
||||
|
||||
# This example won't fit in flash without banking so we turn it on
|
||||
HAVE_BANKING=1
|
||||
UIP_CONF_IPV6=1
|
||||
|
||||
CONTIKI_SOURCEFILES += sensors-driver.c
|
||||
|
||||
@ -15,5 +14,5 @@ CONTIKI_PROJECT = sensors-ipv6
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -13,5 +13,5 @@ CONTIKI_PROJECT = sensors-example
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -10,4 +10,5 @@ CONTIKI_PROJECT = flash
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -12,5 +12,5 @@ CONTIKI_PROJECT = sniffer
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -7,8 +7,6 @@ DEFINES+=MODEL_N740,PROJECT_CONF_H
|
||||
|
||||
# This example won't fit in flash without banking so we turn it on
|
||||
HAVE_BANKING=1
|
||||
UIP_CONF_IPV6=1
|
||||
UIP_CONF_RPL=1
|
||||
|
||||
CONTIKI_SOURCEFILES += ping6.c
|
||||
|
||||
@ -16,5 +14,7 @@ CONTIKI_PROJECT = client server
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../../..
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
# needed for rimestats
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -1,10 +1,9 @@
|
||||
CONTIKI_PROJECT = example-servreg-client
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
UIP_CONF_IPV6=1
|
||||
|
||||
APPS=servreg-hack
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
-include /home/user/nes/testbed-scripts/Makefile.include
|
||||
|
||||
|
||||
@ -2,4 +2,5 @@ CONTIKI_PROJECT = settings-example
|
||||
all: $(CONTIKI_PROJECT)
|
||||
CFLAGS += -DCONTIKI_CONF_SETTINGS_MANAGER=1
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -2,7 +2,7 @@ CONTIKI_PROJECT = sky-webserver
|
||||
all: sky-webserver sky-telnet-server telnet
|
||||
PLATFORM_BUILD=1 # This is needed to avoid the shell to include the httpd-cfs version of the webserver
|
||||
APPS = webserver telnetd
|
||||
CFLAGS = -DWITH_UIP=1 -I.
|
||||
CFLAGS = -I.
|
||||
SMALL=1
|
||||
DEFINES=NETSTACK_CONF_RDC=cxmac_driver,NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE=8
|
||||
|
||||
@ -19,6 +19,8 @@ DEFINES=NETSTACK_CONF_RDC=cxmac_driver,NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE=8
|
||||
# endif
|
||||
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_IPV4 = 1
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
sky-webserver.$(TARGET): $(OBJECTDIR)/ajax-cgi.o
|
||||
|
||||
@ -7,6 +7,7 @@ DEFINES=ELFLOADER_DATAMEMORY_SIZE=0x100,ELFLOADER_TEXTMEMORY_SIZE=0x100
|
||||
|
||||
APPS = serial-shell
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
%.shell-upload: %.ce
|
||||
|
||||
@ -2,11 +2,13 @@ CONTIKI_PROJECT = sky-shell-webserver
|
||||
all: $(CONTIKI_PROJECT)
|
||||
PROJECT_SOURCEFILES = webserver-nogui.c
|
||||
HTTPD_CFS=1
|
||||
CFLAGS = -DWITH_UIP=1 -DRESOLV_CONF_SUPPORTS_MDNS=0
|
||||
CFLAGS = -DRESOLV_CONF_SUPPORTS_MDNS=0
|
||||
DEFINES=NETSTACK_MAC=nullmac_driver,NETSTACK_RDC=nullrdc_driver
|
||||
SMALL=1
|
||||
|
||||
CONTIKI = ../..
|
||||
APPS = webserver serial-shell
|
||||
CONTIKI_WITH_IPV4 = 1
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
|
||||
|
||||
@ -51,7 +51,7 @@ PROCESS_THREAD(sky_shell_process, ev, data)
|
||||
{
|
||||
PROCESS_BEGIN();
|
||||
|
||||
/* WITH_UIP=1 assumes incoming SLIP serial data.
|
||||
/* UIP_CONF_IPV4=1 assumes incoming SLIP serial data.
|
||||
* We override this assumption by restoring default serial input handler. */
|
||||
uart1_set_input(serial_line_input_byte);
|
||||
serial_line_init();
|
||||
|
||||
@ -4,6 +4,7 @@ all: $(CONTIKI_PROJECT)
|
||||
APPS = serial-shell powertrace collect-view
|
||||
CONTIKI = ../..
|
||||
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
-include /home/user/nes/testbed-scripts/Makefile.include
|
||||
|
||||
|
||||
@ -11,4 +11,6 @@ all: blink sky-collect #rt-leds test-button test-cfs tcprudolph0
|
||||
echo $(basename $<)/$(basename $<).ihex 600 > $(basename $<)/runfile ; \
|
||||
tar czf $@ $(basename $<)
|
||||
|
||||
CONTIKI_WITH_IPV4 = 1
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
all: tcp-server
|
||||
|
||||
CONTIKI=../..
|
||||
|
||||
CONTIKI_WITH_IPV4 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -3,7 +3,6 @@ all: $(CONTIKI_PROJECT)
|
||||
|
||||
APPS = telnetd program-handler
|
||||
|
||||
WITH_UIP=1
|
||||
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_IPV4 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -1,9 +1,8 @@
|
||||
UIP_CONF_IPV6=1
|
||||
|
||||
CONTIKI_PROJECT = trickle-library
|
||||
|
||||
all: $(CONTIKI_PROJECT)
|
||||
|
||||
CONTIKI = ../..
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
all: udp-server udp-client
|
||||
|
||||
UIP_CONF_IPV6=1
|
||||
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -6,8 +6,8 @@ ifndef TARGET
|
||||
TARGET = sky
|
||||
endif
|
||||
|
||||
UIP_CONF_IPV6 = 1
|
||||
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
|
||||
SMALL = 1
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -4,4 +4,5 @@ all: $(CONTIKI_PROJECT)
|
||||
APPS = webbrowser
|
||||
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_IPV4 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -3,9 +3,7 @@ all: webserver6
|
||||
|
||||
APPS=raven-webserver raven-lcd-interface
|
||||
TARGET=avr-raven
|
||||
UIP_CONF_IPV6=1
|
||||
|
||||
#UIP_CONF_RPL=0 //RPL is now the default.
|
||||
#RF230BB=1 //Use radio driver that communicates with the core MAC layer. Now the default.
|
||||
#COFFEE_FILES=1 //Static coffee file system in EEPROM
|
||||
#COFFEE_FILES=2 //Dynamic coffee file system in EEPROM
|
||||
@ -14,5 +12,5 @@ UIP_CONF_IPV6=1
|
||||
#COFFEE_ADDRESS=0xnnnn //Override default coffee file system starting address
|
||||
CONTIKI = ../..
|
||||
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -34,15 +34,15 @@ all : $(CONTIKI_PROJECT)
|
||||
@if (test -n "$(ELF_SIZE)");then $(ELF_SIZE) $(CONTIKI_PROJECT).$(TARGET);fi
|
||||
endif
|
||||
|
||||
UIP_CONF_IPV6=1
|
||||
DEFINES=WITH_UIP6,UIP_CONF_TCP=1
|
||||
DEFINES=UIP_CONF_TCP=1
|
||||
|
||||
# Make no RPL the default for minimal-net builds
|
||||
ifeq ($(TARGET),minimal-net)
|
||||
ifndef UIP_CONF_RPL
|
||||
UIP_CONF_RPL=0
|
||||
ifndef CONTIKI_WITH_RPL
|
||||
CONTIKI_WITH_RPL = 0
|
||||
endif
|
||||
endif
|
||||
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -16,6 +16,7 @@ ifeq ($(HTTPD-CFS),1)
|
||||
endif
|
||||
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_IPV4 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
# Intentionally httpd.c and httpd-cfs.c implement the same interface. When
|
||||
|
||||
@ -4,4 +4,5 @@ all: $(CONTIKI_PROJECT)
|
||||
APPS = webbrowser
|
||||
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_IPV4 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -15,4 +15,5 @@ endif
|
||||
|
||||
all: $(CONTIKI_PROJECT)
|
||||
CONTIKI = ../..
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
@ -2,8 +2,6 @@ all: z1-websense
|
||||
|
||||
CONTIKI=../../../..
|
||||
|
||||
UIP_CONF_IPV6=1
|
||||
|
||||
SMALL=1
|
||||
|
||||
APPS += webserver webbrowser
|
||||
@ -13,6 +11,7 @@ CONTIKI_SOURCEFILES += wget.c
|
||||
PROJECTDIRS += ../../../ipv6/rpl-border-router
|
||||
PROJECT_SOURCEFILES += httpd-simple.c
|
||||
|
||||
CONTIKI_WITH_IPV6 = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
$(CONTIKI)/tools/tunslip6: $(CONTIKI)/tools/tunslip6.c
|
||||
|
||||
@ -9,6 +9,7 @@ CONTIKI_SOURCEFILES += cc2420-arch.c sensors.c sht11.c
|
||||
PROJECT_SOURCEFILES = i2cmaster.c tmp102.c adxl345.c battery-sensor.c sky-sensors.c #potentiometer-sensor.c
|
||||
all: example-unicast2
|
||||
|
||||
CONTIKI_WITH_RIME = 1
|
||||
include $(CONTIKI)/Makefile.include
|
||||
|
||||
|
||||
|
||||
@ -308,7 +308,9 @@ uint8_t i;
|
||||
|
||||
#endif /* ANNOUNCE_BOOT */
|
||||
|
||||
#if UIP_CONF_IPV6 || UIP_CONF_IPV4
|
||||
process_start(&tcpip_process, NULL);
|
||||
#endif
|
||||
|
||||
#ifdef RAVEN_LCD_INTERFACE
|
||||
process_start(&raven_lcd_process, NULL);
|
||||
|
||||
@ -35,5 +35,5 @@ AVRDUDE_MCU=m1284p
|
||||
include $(CONTIKIAVR)/Makefile.avr
|
||||
include $(CONTIKIAVR)/radio/Makefile.radio
|
||||
|
||||
MODULES += core/net/ipv6 core/net/ipv4 core/net/ip core/net/mac core/net core/net/rime core/net/mac/sicslowmac \
|
||||
MODULES += core/net/mac core/net core/net/mac/sicslowmac \
|
||||
core/net/llsec
|
||||
|
||||
@ -316,13 +316,17 @@ uint8_t i;
|
||||
// rime_init(rime_udp_init(NULL));
|
||||
// uip_router_register(&rimeroute);
|
||||
|
||||
#if UIP_CONF_IPV6 || UIP_CONF_IPV4
|
||||
process_start(&tcpip_process, NULL);
|
||||
#endif
|
||||
|
||||
#else /* !RF230BB */
|
||||
/* Original RF230 combined mac/radio driver */
|
||||
/* mac process must be started before tcpip process! */
|
||||
process_start(&mac_process, NULL);
|
||||
#if UIP_CONF_IPV6 || UIP_CONF_IPV4
|
||||
process_start(&tcpip_process, NULL);
|
||||
#endif
|
||||
#endif /* RF230BB */
|
||||
|
||||
#ifdef RAVEN_LCD_INTERFACE
|
||||
|
||||
@ -67,8 +67,7 @@ include $(CONTIKIAVR)/Makefile.avr
|
||||
include $(CONTIKIAVR)/radio/Makefile.radio
|
||||
|
||||
ifndef CONTIKI_NO_NET
|
||||
MODULES+=core/net/ip core/net/ipv4 core/net core/net/ipv6 \
|
||||
core/net/rime core/net/mac core/net/mac/sicslowmac \
|
||||
MODULES+=core/net/mac core/net/mac/sicslowmac \
|
||||
core/net/llsec
|
||||
else
|
||||
vpath %.c $(CONTIKI)/core/net/ipv6
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user