From b20f493e0927db2682d0315644d9f07f4899b265 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Tue, 13 Mar 2018 17:38:48 +0000 Subject: [PATCH] Move BLE example to platform-specific/cc26xx This commit moves the BLE/IPv6 example to the platform-specific directory, since we only support one platform currently. The pull also tidies up the example Makefile a bit: We no longer need to specify the name for project-conf.h so we remove this. We add PLATFORMS_ONLY and BOARDS_ONLY --- examples/ble/ipv6-client/Makefile | 10 ---------- examples/platform-specific/cc26xx/ble-ipv6/Makefile | 11 +++++++++++ .../cc26xx/ble-ipv6}/client.c | 0 .../cc26xx/ble-ipv6}/project-conf.h | 0 tests/02-compile-arm-ports-01/Makefile | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 examples/ble/ipv6-client/Makefile create mode 100644 examples/platform-specific/cc26xx/ble-ipv6/Makefile rename examples/{ble/ipv6-client => platform-specific/cc26xx/ble-ipv6}/client.c (100%) rename examples/{ble/ipv6-client => platform-specific/cc26xx/ble-ipv6}/project-conf.h (100%) diff --git a/examples/ble/ipv6-client/Makefile b/examples/ble/ipv6-client/Makefile deleted file mode 100644 index c8f4f2a41..000000000 --- a/examples/ble/ipv6-client/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -DEFINES+=PROJECT_CONF_H=\"project-conf.h\" -CONTIKI_PROJECT=client - -all: $(CONTIKI_PROJECT) - - -MAKE_MAC = MAKE_MAC_BLE -MAKE_NET = MAKE_NET_IPV6 -CONTIKI = ../../.. -include $(CONTIKI)/Makefile.include \ No newline at end of file diff --git a/examples/platform-specific/cc26xx/ble-ipv6/Makefile b/examples/platform-specific/cc26xx/ble-ipv6/Makefile new file mode 100644 index 000000000..4ba928ad3 --- /dev/null +++ b/examples/platform-specific/cc26xx/ble-ipv6/Makefile @@ -0,0 +1,11 @@ +CONTIKI_PROJECT=client + +all: $(CONTIKI_PROJECT) + +PLATFORMS_ONLY = srf06-cc26xx +BOARDS_ONLY = launchpad/cc2650 sensortag/cc2650 srf06/cc26xx + +MAKE_MAC = MAKE_MAC_BLE +MAKE_NET = MAKE_NET_IPV6 +CONTIKI = ../../../.. +include $(CONTIKI)/Makefile.include \ No newline at end of file diff --git a/examples/ble/ipv6-client/client.c b/examples/platform-specific/cc26xx/ble-ipv6/client.c similarity index 100% rename from examples/ble/ipv6-client/client.c rename to examples/platform-specific/cc26xx/ble-ipv6/client.c diff --git a/examples/ble/ipv6-client/project-conf.h b/examples/platform-specific/cc26xx/ble-ipv6/project-conf.h similarity index 100% rename from examples/ble/ipv6-client/project-conf.h rename to examples/platform-specific/cc26xx/ble-ipv6/project-conf.h diff --git a/tests/02-compile-arm-ports-01/Makefile b/tests/02-compile-arm-ports-01/Makefile index e0369319f..10f3537de 100644 --- a/tests/02-compile-arm-ports-01/Makefile +++ b/tests/02-compile-arm-ports-01/Makefile @@ -11,6 +11,7 @@ platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc2650 \ platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1310 \ platform-specific/cc26xx/cc26xx-web-demo/srf06-cc26xx:BOARD=launchpad/cc1350 \ platform-specific/cc26xx/very-sleepy-demo/srf06-cc26xx \ +platform-specific/cc26xx/ble-ipv6/srf06-cc26xx:BOARD=sensortag/cc2650 \ rpl-border-router/srf06-cc26xx:BOARD=launchpad/cc2650 \ sensniff/srf06-cc26xx \ sensniff/srf06-cc26xx:BOARD=launchpad/cc1310 \ @@ -29,7 +30,6 @@ dev/leds/srf06-cc26xx:BOARD=launchpad/cc1310 \ dev/leds/srf06-cc26xx:BOARD=launchpad/cc1350 \ dev/leds/srf06-cc26xx:BOARD=launchpad/cc2650 \ 6tisch/etsi-plugtest-2017/srf06-cc26xx:BOARD=launchpad/cc2650 \ -ble/ipv6-client/srf06-cc26xx:BOARD=launchpad/cc2650 \ storage/cfs-coffee/cc2538dk \ sensniff/cc2538dk \ rpl-udp/cc2538dk \