giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #85 from simonduq/pr/project-conf

Browse Source 
Auto-include project-conf
This commit is contained in:
Simon Duquennoy 2017-10-07 18:35:38 +02:00 committed by GitHub
commit aaef87dc85
58 changed files with 36 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.include
View File

@ -74,6 +74,11 @@ endif
MODULES += os os/sys os/dev os/lib os/services
# Automatically include project-conf.h if found
ifneq ("$(wildcard project-conf.h)","")
CFLAGS += -DPROJECT_CONF_PATH=\"project-conf.h\"
endif
# Configure MAC layer
# The different options

6
arch/platform/cc2538dk/contiki-conf.h
View File

@ -12,9 +12,9 @@
#include <string.h>
/*---------------------------------------------------------------------------*/
/* Include Project Specific conf */
#ifdef PROJECT_CONF_H
#include PROJECT_CONF_H
#endif /* PROJECT_CONF_H */
#ifdef PROJECT_CONF_PATH
#include PROJECT_CONF_PATH
#endif /* PROJECT_CONF_PATH */
/*---------------------------------------------------------------------------*/
/**
* \name Compiler configuration and platform-specific type definitions

7
arch/platform/cooja/contiki-conf.h
View File

@ -138,10 +138,9 @@ typedef uint64_t rtimer_clock_t;
#define NETSTACK_RADIO_MAX_PAYLOAD_LEN 125
/* include the project config */
/* PROJECT_CONF_H might be defined in the project Makefile */
#ifdef PROJECT_CONF_H
#include PROJECT_CONF_H
#endif /* PROJECT_CONF_H */
#ifdef PROJECT_CONF_PATH
#include PROJECT_CONF_PATH
#endif /* PROJECT_CONF_PATH */
#endif /* CONTIKI_CONF_H_ */

7
arch/platform/jn516x/contiki-conf.h
View File

@ -50,9 +50,8 @@
#endif /* CCM_STAR_CONF */
/* include the project config */
/* PROJECT_CONF_H might be defined in the project Makefile */
#ifdef PROJECT_CONF_H
#include PROJECT_CONF_H
#endif /* PROJECT_CONF_H */
#ifdef PROJECT_CONF_PATH
#include PROJECT_CONF_PATH
#endif /* PROJECT_CONF_PATH */
#endif /* CONTIKI_CONF_H_ */

7
arch/platform/native/contiki-conf.h
View File

@ -91,9 +91,8 @@ typedef unsigned long clock_time_t;
int strcasecmp(const char*, const char*);
/* include the project config */
/* PROJECT_CONF_H might be defined in the project Makefile */
#ifdef PROJECT_CONF_H
#include PROJECT_CONF_H
#endif /* PROJECT_CONF_H */
#ifdef PROJECT_CONF_PATH
#include PROJECT_CONF_PATH
#endif /* PROJECT_CONF_PATH */
#endif /* CONTIKI_CONF_H_ */

6
arch/platform/nrf52dk/contiki-conf.h
View File

@ -43,9 +43,9 @@
#include <stdint.h>
/*---------------------------------------------------------------------------*/
/* Include Project Specific conf */
#ifdef PROJECT_CONF_H
#include PROJECT_CONF_H
#endif /* PROJECT_CONF_H */
#ifdef PROJECT_CONF_PATH
#include PROJECT_CONF_PATH
#endif /* PROJECT_CONF_PATH */
/*---------------------------------------------------------------------------*/
/* Include platform peripherals configuration */
#include "platform-conf.h"

6
arch/platform/openmote-cc2538/contiki-conf.h
View File

@ -51,9 +51,9 @@
#include <string.h>
/*---------------------------------------------------------------------------*/
/* Include Project Specific conf */
#ifdef PROJECT_CONF_H
#include PROJECT_CONF_H
#endif /* PROJECT_CONF_H */
#ifdef PROJECT_CONF_PATH
#include PROJECT_CONF_PATH
#endif /* PROJECT_CONF_PATH */
/*---------------------------------------------------------------------------*/
/**
* \name Compiler configuration and platform-specific type definitions

7
arch/platform/sky/contiki-conf.h
View File

@ -34,9 +34,8 @@
#endif /* AES_128_CONF */
/* include the project config */
/* PROJECT_CONF_H might be defined in the project Makefile */
#ifdef PROJECT_CONF_H
#include PROJECT_CONF_H
#endif /* PROJECT_CONF_H */
#ifdef PROJECT_CONF_PATH
#include PROJECT_CONF_PATH
#endif /* PROJECT_CONF_PATH */
#endif /* CONTIKI_CONF_H */

6
arch/platform/srf06-cc26xx/contiki-conf.h
View File

@ -40,9 +40,9 @@
#include <stdint.h>
/*---------------------------------------------------------------------------*/
/* Include Project Specific conf */
#ifdef PROJECT_CONF_H
#include PROJECT_CONF_H
#endif /* PROJECT_CONF_H */
#ifdef PROJECT_CONF_PATH
#include PROJECT_CONF_PATH
#endif /* PROJECT_CONF_PATH */
/*---------------------------------------------------------------------------*/
/**
* \name Network Stack Configuration

6
arch/platform/zoul/contiki-conf.h
View File

@ -49,9 +49,9 @@
#include <string.h>
/*---------------------------------------------------------------------------*/
/* Include Project Specific conf */
#ifdef PROJECT_CONF_H
#include PROJECT_CONF_H
#endif /* PROJECT_CONF_H */
#ifdef PROJECT_CONF_PATH
#include PROJECT_CONF_PATH
#endif /* PROJECT_CONF_PATH */
/*---------------------------------------------------------------------------*/
/**
* \name Compiler configuration and platform-specific type definitions

1
examples/6tisch/6p-packet/Makefile
View File

@ -2,7 +2,6 @@ CONTIKI_PROJECT = sixp-node.c
PROJECT_SOURCEFILES += test-sf.c
CONTIKI = ../../../
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
MAKE_MAC = MAKE_MAC_TSCH
MODULES += os/net/mac/tsch/sixtop

2
examples/6tisch/etsi-plugtest-2017/Makefile
View File

@ -9,7 +9,7 @@ endif
MODULES += os/services/shell
MODULES += os/net/mac/tsch os/net/mac/tsch/sixtop
PROJECT_SOURCEFILES += sf-plugtest.c
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" -Wno-nonnull-compare
CFLAGS += -Wno-nonnull-compare
ifeq ($(BOARD),launchpad/cc2650)
# Enable DAP and TAP by default for ETSI Plugtest

1
examples/cfs-coffee/Makefile
View File

@ -1,4 +1,3 @@
DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
CONTIKI = ../..
MODULES += os/services/unit-test

2
examples/ipso-objects/Makefile
View File

@ -4,8 +4,6 @@ CONTIKI_SOURCEFILES += serial-protocol.c example-ipso-temperature.c
all: $(CONTIKI_PROJECT)
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
MODULES += os/net/app-layer/coap
MODULES += os/services/lwm2m
MODULES += os/services/ipso-objects

2
examples/ipv6/coap-example/Makefile
View File

@ -3,8 +3,6 @@ all: coap-example-server coap-example-client
CONTIKI=../../..
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
# automatically build RESTful resources
REST_RESOURCES_DIR = ./resources
ifndef TARGET

2
examples/ipv6/json-ws/Makefile
View File

@ -13,8 +13,6 @@ endif
MODULES += os/lib/json os/net/app-layer/httpd-ws
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
ifeq ($(TARGET),)
-include Makefile.target
endif

2
examples/ipv6/multicast/Makefile
View File

@ -1,5 +1,3 @@
DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
CONTIKI_PROJECT = root intermediate sink
all: $(CONTIKI_PROJECT)

1
examples/ipv6/native-border-router/Makefile
View File

@ -4,7 +4,6 @@ MODULES += os/services/slip-cmd
CONTIKI=../../..
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
PROJECT_SOURCEFILES += border-router-cmds.c tun-bridge.c border-router-mac.c \
slip-config.c slip-dev.c

1
examples/ipv6/rpl-border-router/Makefile
View File

@ -3,7 +3,6 @@ all: $(CONTIKI_PROJECT)
CONTIKI=../../..
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
PROJECT_SOURCEFILES += slip-bridge.c
#Simple built-in webserver is the default.

2
examples/ipv6/rpl-simple/Makefile
View File

@ -1,8 +1,6 @@
all: node
CONTIKI=../../..
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
# Set MAKE_MAC = MAKE_MAC_TSCH to run TSCH instead
MAKE_MAC = MAKE_MAC_CSMA

1
examples/ipv6/rpl-tsch-sixtop/Makefile
View File

@ -3,7 +3,6 @@ all: $(CONTIKI_PROJECT)
PROJECT_SOURCEFILES += sf-simple.c
CONTIKI=../../..
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
MAKE_WITH_SECURITY ?= 0 # force Security from command line

1
examples/ipv6/rpl-tsch/Makefile
View File

@ -2,7 +2,6 @@ CONTIKI_PROJECT = node
all: $(CONTIKI_PROJECT)
CONTIKI=../../..
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
MAKE_WITH_ORCHESTRA ?= 0 # force Orchestra from command line
MAKE_WITH_SECURITY ?= 0 # force Security from command line

1
examples/ipv6/slip-radio/Makefile
View File

@ -8,7 +8,6 @@ endif
CONTIKI=../../..
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
PROJECT_SOURCEFILES += slip-net.c
ifeq ($(TARGET),sky)
PROJECT_SOURCEFILES += slip-radio-cc2420.c slip-radio-sky-sensors.c

1
examples/logging/Makefile
View File

@ -1,6 +1,5 @@
CONTIKI_PROJECT = logging
all: $(CONTIKI_PROJECT)
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
CONTIKI = ../..
include $(CONTIKI)/Makefile.include

2
examples/platform-specific/cc2538-common/mqtt-demo/Makefile
View File

@ -1,5 +1,3 @@
DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
all: mqtt-demo

1
examples/platform-specific/cc26xx/Makefile
View File

@ -1,4 +1,3 @@
DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
CONTIKI_PROJECT = cc26xx-demo
all: $(CONTIKI_PROJECT)

2
examples/platform-specific/cc26xx/cc26xx-web-demo/Makefile
View File

@ -1,5 +1,3 @@
DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
all: cc26xx-web-demo
REST_RESOURCES_DIR = ./resources

1
examples/platform-specific/cc26xx/very-sleepy-demo/Makefile
View File

@ -1,4 +1,3 @@
DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
CONTIKI_PROJECT = very-sleepy-demo
all: $(CONTIKI_PROJECT)

1
examples/platform-specific/jn516x/rpl/border-router/Makefile
View File

@ -8,7 +8,6 @@ CONTIKI=../../../../..
MAKE_MAC = MAKE_MAC_TSCH
PROJECTDIRS += .. ../tools
PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
PROJECT_SOURCEFILES += slip-bridge.c slip.c
ifeq ($(PREFIX),)

1
examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile
View File

@ -10,7 +10,6 @@ MAKE_MAC = MAKE_MAC_TSCH
MODULES += os/lib/json
PROJECTDIRS += .. ../tools
PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
CFLAGS += -DWITH_COAP
CFLAGS += -DUIP_CONF_TCP=0

1
examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile
View File

@ -10,7 +10,6 @@ MAKE_MAC = MAKE_MAC_TSCH
MODULES += os/lib/json
PROJECTDIRS += .. ../tools
PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
CFLAGS += -DWITH_COAP
CFLAGS += -DUIP_CONF_TCP=0

1
examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile
View File

@ -10,7 +10,6 @@ MAKE_MAC = MAKE_MAC_TSCH
MODULES += os/lib/json
PROJECTDIRS += .. ../tools
PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
CFLAGS += -DWITH_COAP
CFLAGS += -DUIP_CONF_TCP=0

1
examples/platform-specific/jn516x/rpl/node/Makefile
View File

@ -8,6 +8,5 @@ CONTIKI=../../../../..
MAKE_MAC = MAKE_MAC_TSCH
PROJECTDIRS += .. ../tools
PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
include $(CONTIKI)/Makefile.include

1
examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile
View File

@ -5,7 +5,6 @@ JN516x_WITH_DONGLE = 1
CONTIKI=../../../../../..
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
PROJECTDIRS += .. ../../tools
PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DWITH_COAP

1
examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile
View File

@ -4,7 +4,6 @@ TARGET ?= jn516x
JN516x_WITH_DONGLE = 1
CONTIKI=../../../../../..
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
PROJECT_SOURCEFILES += slip-bridge.c slip.c
PROJECTDIRS += .. ../../tools

1
examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile
View File

@ -5,7 +5,6 @@ JN516x_WITH_DONGLE = 1
CONTIKI=../../../../../..
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
PROJECTDIRS += .. ../../tools
PROJECT_SOURCEFILES += rpl-tools.c

1
examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile
View File

@ -5,7 +5,6 @@ JN516x_WITH_DONGLE = 1
CONTIKI=../../../../../..
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
PROJECT_SOURCEFILES += slip-bridge.c slip.c
PROJECTDIRS += .. ../../tools

1
examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile
View File

@ -6,7 +6,6 @@ TARGET_WITH_UART1 = 1
CONTIKI=../../../../..
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
PROJECTDIRS += .. ../tools
PROJECT_SOURCEFILES += rpl-tools.c

1
examples/platform-specific/nrf52dk/coap-demo/Makefile
View File

@ -1,5 +1,4 @@
CONTIKI=../../../..
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
ifeq ($(MAKECMDGOALS),)
$(error Please specify whether coap-client or coap-server should be built)

2
examples/platform-specific/nrf52dk/mqtt-demo/Makefile
View File

@ -1,5 +1,3 @@
DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
all: mqtt-demo
CONTIKI_WITH_RPL = 0

2
examples/platform-specific/zoul/Makefile
View File

@ -1,5 +1,3 @@
DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
CONTIKI_PROJECT = test-tsl256x test-sht25 test-servo.c
CONTIKI_PROJECT += test-bmp085-bmp180 test-motion test-rotation-sensor
CONTIKI_PROJECT += test-grove-light-sensor test-grove-loudness-sensor

1
examples/platform-specific/zoul/at-test/Makefile
View File

@ -1,4 +1,3 @@
DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
CONTIKI_PROJECT = at-master-test
MODULES = os/services/at-master
all: $(CONTIKI_PROJECT)

1
examples/platform-specific/zoul/orion/client/Makefile
View File

@ -1,4 +1,3 @@
CFLAGS+=-DPROJECT_CONF_H=\"project-conf.h\"
CONTIKI_PROJECT = client ifttt_client
all: $(CONTIKI_PROJECT)

2
examples/platform-specific/zoul/orion/ip64-router/Makefile
View File

@ -1,5 +1,3 @@
DEFINES += PROJECT_CONF_H=\"project-conf.h\"
all: ip64-router
BOARD = orion

2
examples/platform-specific/zoul/rev-b/Makefile
View File

@ -1,5 +1,3 @@
DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
CONTIKI_PROJECT = test-power-mgmt
BOARD ?= remote-revb

1
examples/platform-specific/zoul/rtcc/Makefile
View File

@ -1,4 +1,3 @@
DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
CONTIKI_PROJECT = test-rtcc
TARGET = zoul

2
examples/sensniff/Makefile
View File

@ -1,5 +1,3 @@
DEFINES+=PROJECT_CONF_H=\"project-conf.h\"
CONTIKI_PROJECT = sensniff
PROJECT_SOURCEFILES += sensniff-mac.c netstack.c

4
os/lib/heapmem.c
View File

@ -48,9 +48,9 @@
#define PRINTF(...)
#endif
#ifdef PROJECT_CONF_H
#ifdef PROJECT_CONF_PATH
/* Load the heapmem configuration from a project configuration file. */
#include "project-conf.h"
#include PROJECT_CONF_PATH
#endif
#include <stdint.h>

1
tests/07-base/code/Makefile
View File

@ -1,6 +1,5 @@
all: test-ringbufindex
CFLAGS += -D PROJECT_CONF_H=\"project-conf.h\"
MODULES += os/services/unit-test
CONTIKI = ../../..

2
tests/08-ipv6/code/receiver/Makefile
View File

@ -1,5 +1,3 @@
CONTIKI=../../../..
CFLAGS+= -DPROJECT_CONF_H=\"project-conf.h\"
include $(CONTIKI)/Makefile.include

2
tests/08-ipv6/code/sender/Makefile
View File

@ -1,5 +1,3 @@
CONTIKI=../../../..
CFLAGS+= -DPROJECT_CONF_H=\"project-conf.h\"
include $(CONTIKI)/Makefile.include

1
tests/13-ieee802154/code-flush-nbr-queue/Makefile
View File

@ -1,6 +1,5 @@
all:
CFLAGS += -D PROJECT_CONF_H=\"project-conf.h\"
MAKE_MAC = MAKE_MAC_TSCH
MODULES += os/net/mac/tsch/sixtop os/services/unit-test

1
tests/13-ieee802154/code/Makefile
View File

@ -2,7 +2,6 @@ all: test-panid-handling test-tcsh-create-packet
MAKE_MAC = MAKE_MAC_TSCH
MODULES += os/services/unit-test
CFLAGS += -D PROJECT_CONF_H=\"project-conf.h\"
TEST_CONFIG_TYPE ?= DEFAULT

2
tests/14-rpl-lite/code/Makefile
View File

@ -1,6 +1,4 @@
all: sender-node receiver-node root-node
CONTIKI=../../..
CFLAGS+=-DPROJECT_CONF_H=\"project-conf.h\"
include $(CONTIKI)/Makefile.include

2
tests/15-rpl-classic/code/Makefile
View File

@ -1,7 +1,5 @@
all: sender-node receiver-node root-node
CONTIKI=../../..
CFLAGS+=-DPROJECT_CONF_H=\"project-conf.h\"
CONTIKI_WITH_RPL_LITE = 0
include $(CONTIKI)/Makefile.include

1
tests/16-6tisch/code/Makefile
View File

@ -1,6 +1,5 @@
all:
CFLAGS += -D PROJECT_CONF_H=\"project-conf.h\"
APPS += unit-test
MODULES += os/net/mac/tsch os/net/mac/tsch/sixtop

2
tools/sky/uip6-bridge/Makefile
View File

@ -6,7 +6,7 @@ CONTIKI=../../..
endif
endif
DEFINES=WITH_SLIP=1,PROJECT_CONF_H=\"bridge-conf.h\"
DEFINES=WITH_SLIP=1
ifndef TARGET
TARGET=sky

0
tools/sky/uip6-bridge/bridge-conf.h → tools/sky/uip6-bridge/project-conf.h
View File