From 905f8c715374d103fa8a0f2698accf5edd40dc74 Mon Sep 17 00:00:00 2001 From: RaKu Date: Fri, 15 Feb 2019 18:22:14 +0100 Subject: [PATCH] [nrf528xx] always enable diag module (#3593) Disabling diag module causes linker errors due to unresolved symbols when building NCP example with NCP_SPI flag set to 1 on some toolchains. --- examples/Makefile-nrf52811 | 2 +- examples/Makefile-nrf52840 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/Makefile-nrf52811 b/examples/Makefile-nrf52811 index d9ee24a4e..c242cb442 100644 --- a/examples/Makefile-nrf52811 +++ b/examples/Makefile-nrf52811 @@ -44,6 +44,7 @@ GCCVersion = $(shell expr `$(CC) -dumpversion | cut -f1 -d. configure_OPTIONS = \ --enable-mtd \ + --enable-diag \ --enable-linker-map \ --with-examples=nrf52811 \ MBEDTLS_CPPFLAGS="$(NRF52811_MBEDTLS_CPPFLAGS)" \ @@ -105,7 +106,6 @@ configure_OPTIONS += --with-ncp-bus=spi else COMMONCFLAGS += -DUART_AS_SERIAL_TRANSPORT=1 configure_OPTIONS += --with-ncp-bus=uart -configure_OPTIONS += --enable-diag configure_OPTIONS += --enable-cli endif # NCP_SPI == 1 endif # DISABLE_TRANSPORTS diff --git a/examples/Makefile-nrf52840 b/examples/Makefile-nrf52840 index 5dd609853..cc0447267 100644 --- a/examples/Makefile-nrf52840 +++ b/examples/Makefile-nrf52840 @@ -45,6 +45,7 @@ GCCVersion = $(shell expr `$(CC) -dumpversion | cut -f1 -d. configure_OPTIONS = \ --enable-ftd \ --enable-mtd \ + --enable-diag \ --enable-linker-map \ --with-examples=nrf52840 \ $(NULL) @@ -110,7 +111,6 @@ COMMONCFLAGS += -DSPIS_AS_SERIAL_TRANSPORT=1 configure_OPTIONS += --with-ncp-bus=spi else configure_OPTIONS += --with-ncp-bus=uart -configure_OPTIONS += --enable-diag configure_OPTIONS += --enable-cli ifeq ($(USB),1) COMMONCFLAGS += -DUSB_CDC_AS_SERIAL_TRANSPORT=1