djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nrf5/sdk: Disable all sdk components from being included in the build while implementing ubluepy, overlap in IRQ handler symbol.

Browse Source
This commit is contained in:
Glenn Ruben Bakke 2017-02-13 00:16:45 +01:00
parent c4b60e6cf8
commit 7a43228a2d
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nrf5/sdk/sdk_12.1.0/build.mk
View File

@ -27,6 +27,7 @@ DEFINES += NRF_SD_BLE_API_VERSION=3
DEFINES += PEER_MANAGER_ENABLED=1
DEFINES += FDS_ENABLED=1
ifeq ($(SDK_COMPOENTS), 1)
# nordic SDK C sources (relative path)
SDK_SRC_C += \
components/ble/ble_advertising/ble_advertising.c \
@ -58,6 +59,7 @@ SDK_SRC_C += \
components/libraries/util/app_error.c \
components/libraries/util/app_error_weak.c \
components/drivers_nrf/common/nrf_drv_common.c
endif
# include source folders (sort removes duplicates)
SDK_INC_DIRS += $(sort $(dir $(SDK_SRC_C)))

1
nrf5/sdk/sdk_common.mk
View File

@ -12,6 +12,7 @@ else ifeq ($(SD), s130)
SDK_MODULES = sdk_10.0.0
else ifeq ($(SD), s132)
SDK_MODULES = sdk_12.1.0
SDK_COMPONENTS = 0
else
$(error No SDK configured for this SD)
endif