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

nrf5/bluetooth: Adding back SOFTDEV_HEX as flash tools in main Makefile uses this to locate hex file.

Browse Source
This commit is contained in:
Glenn Ruben Bakke 2017-04-21 18:55:59 +02:00
parent 10b7f3ef83
commit a76ff755e3
1 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
nrf5/bluetooth/bluetooth_common.mk
View File

@ -1,26 +1,53 @@
SOFTDEV_HEX_NAME ?= SOFTDEV_HEX_NAME ?=
SOFTDEV_HEX_PATH ?=
ifeq ($(SD), s110) ifeq ($(SD), s110)
INC += -I$(SDK_ROOT)components/softdevice/$(SD)/headers SOFTDEV_VERSION = 8.0.0
INC += -Ibluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/softdevice/$(SD)/headers
CFLAGS += -DBLUETOOTH_SD_DEBUG=1 CFLAGS += -DBLUETOOTH_SD_DEBUG=1
CFLAGS += -DBLUETOOTH_SD=110 CFLAGS += -DBLUETOOTH_SD=110
SOFTDEV_HEX_NAME = s110_nrf51_8.0.0_softdevice.hex SOFTDEV_HEX_NAME = $(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_softdevice.hex
SOFTDEV_HEX_PATH = bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/softdevice/$(SD)/hex
else ifeq ($(SD), s120) else ifeq ($(SD), s120)
$(error No BLE wrapper available yet) $(error No BLE wrapper available yet)
else ifeq ($(SD), s130) else ifeq ($(SD), s130)
$(error No BLE wrapper available yet) $(error No BLE wrapper available yet)
else ifeq ($(SD), s132) else ifeq ($(SD), s132)
INC += -I$(SDK_ROOT)components/softdevice/$(SD)/headers SOFTDEV_VERSION=3.0.0
INC += -I$(SDK_ROOT)components/softdevice/$(SD)/headers/$(MCU_VARIANT) INC += -Ibluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/softdevice/$(SD)/headers
INC += -Ibluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/softdevice/$(SD)/headers/$(MCU_VARIANT)
CFLAGS += -DBLUETOOTH_SD_DEBUG=1 CFLAGS += -DBLUETOOTH_SD_DEBUG=1
CFLAGS += -DBLUETOOTH_SD=132 CFLAGS += -DBLUETOOTH_SD=132
SOFTDEV_HEX_NAME = s132_nrf52_3.0.0_softdevice.hex SOFTDEV_HEX_NAME = $(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_softdevice.hex
SOFTDEV_HEX_PATH = bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/softdevice/$(SD)/hex
else else
$(error Incorrect softdevice set flag) $(error Incorrect softdevice set flag)
endif endif
SOFTDEV_HEX = $(lastword $(wildcard $(SDK_ROOT)/components/softdevice/$(SD)/hex/$(SOFTDEV_HEX_NAME))) define STACK_MISSING_ERROR
###### ERROR: Bluetooth LE Stack not found ############
# #
# The build target requires a Bluetooth LE stack. #
# $(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION) Bluetooth LE stack not found. #
# #
# Please run the download script: #
# #
# bluetooth/download_ble_stack.sh #
# #
#######################################################
endef
SOFTDEV_HEX = $(SOFTDEV_HEX_PATH)/$(SOFTDEV_HEX_NAME)
ifeq ($(shell test ! -e $(SOFTDEV_HEX) && echo -n no),no)
$(error $(STACK_MISSING_ERROR))
endif
INC += -I./bluetooth INC += -I./bluetooth