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

nrf52dk: move the build error when building without IPv6 from Makefile to C header file to enable PLATFORMS_EXCLUDE syntax in Makefiles

Browse Source
This commit is contained in:
Atis Elsts 2018-02-27 13:19:59 +00:00
parent 50b8612c80
commit dab9ea0817
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/cpu/nrf52832/Makefile.nrf52832
View File

@ -14,12 +14,6 @@ endif
# custom MAC: ble_ipsp_mac_driver # custom MAC: ble_ipsp_mac_driver
MAKE_MAC ?= MAKE_MAC_OTHER MAKE_MAC ?= MAKE_MAC_OTHER
# we only support IPv6
MAKE_NET ?= MAKE_NET_IPV6
ifneq ($(MAKE_NET),MAKE_NET_IPV6)
$(error Only IPv6 stack is supported!)
endif
$(info SDK: $(NRF52_SDK_ROOT)) $(info SDK: $(NRF52_SDK_ROOT))
ifeq ($(NRF52_DK_REVISION),) ifeq ($(NRF52_DK_REVISION),)

5
arch/cpu/nrf52832/nrf52832-def.h
View File

@ -34,6 +34,11 @@
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#include "cm4/cm4-def.h" #include "cm4/cm4-def.h"
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#if !NETSTACK_CONF_WITH_IPV6
/* we only support IPv6 */
#error "Only IPv6 stack is supported!"
#endif
/*---------------------------------------------------------------------------*/
#define RTIMER_ARCH_SECOND 62500 #define RTIMER_ARCH_SECOND 62500
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#endif /* NRF52832_DEF_H_ */ #endif /* NRF52832_DEF_H_ */

2
examples/platform-specific/nrf52dk/coap-demo/coap-client/Makefile
View File

@ -9,6 +9,8 @@ $(warning Using default SERVER_IPV6_EP=fd00::1)
SERVER_IPV6_EP=fd00::1 SERVER_IPV6_EP=fd00::1
endif endif
CFLAGS += -DSERVER_IPV6_EP=\"$(SERVER_IPV6_EP)\"
CFLAGS += -DDEVICE_NAME=\"nRF52_DK_CoAP_Client\" CFLAGS += -DDEVICE_NAME=\"nRF52_DK_CoAP_Client\"
CFLAGS += -DCOAP_OBSERVE_CLIENT=1 CFLAGS += -DCOAP_OBSERVE_CLIENT=1