nrf5/bluetooth: Switch over to downloaded bluetooth stacks from nordicsemi.com instead of getting them through the SDK's. This will facilitate download of s132 v2.0.0 later.

This commit is contained in:
Glenn Ruben Bakke 2017-04-24 21:46:28 +02:00
parent 9d91e990f7
commit 3f96532952
2 changed files with 20 additions and 13 deletions

View File

@ -4,11 +4,11 @@ SOFTDEV_HEX_PATH ?=
ifeq ($(SD), s110)
SOFTDEV_VERSION = 8.0.0
INC += -Ibluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/softdevice/$(SD)/headers
INC += -Ibluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include
CFLAGS += -DBLUETOOTH_SD_DEBUG=1
CFLAGS += -DBLUETOOTH_SD=110
SOFTDEV_HEX_NAME = $(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_softdevice.hex
SOFTDEV_HEX_PATH = bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/softdevice/$(SD)/hex
SOFTDEV_HEX_PATH = bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)
else ifeq ($(SD), s120)
$(error No BLE wrapper available yet)
@ -16,12 +16,12 @@ else ifeq ($(SD), s130)
$(error No BLE wrapper available yet)
else ifeq ($(SD), s132)
SOFTDEV_VERSION=3.0.0
INC += -Ibluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/softdevice/$(SD)/headers
INC += -Ibluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/softdevice/$(SD)/headers/$(MCU_VARIANT)
INC += -Ibluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include
INC += -Ibluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_API/include/$(MCU_VARIANT)
CFLAGS += -DBLUETOOTH_SD_DEBUG=1
CFLAGS += -DBLUETOOTH_SD=132
SOFTDEV_HEX_NAME = $(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)_softdevice.hex
SOFTDEV_HEX_PATH = bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)/softdevice/$(SD)/hex
SOFTDEV_HEX_PATH = bluetooth/$(SD)_$(MCU_VARIANT)_$(SOFTDEV_VERSION)
else
$(error Incorrect softdevice set flag)
endif

View File

@ -8,10 +8,13 @@ function download_s110_nrf51
echo "####################################"
echo ""
wget https://developer.nordicsemi.com/nRF5_SDK/nRF51_SDK_v10.x.x/nRF51_SDK_10.0.0_dc26b5e.zip
unzip nRF51_SDK_10.0.0_dc26b5e.zip components/softdevice/s110/*
mv components s110_nrf51_8.0.0
rm nRF51_SDK_10.0.0_dc26b5e.zip
mkdir s110_nrf51_8.0.0
cd s110_nrf51_8.0.0
wget https://www.nordicsemi.com/eng/nordic/download_resource/45846/3/78153065/80234
mv 80234 temp.zip
unzip temp.zip
rm temp.zip
cd -
}
function download_s132_nrf52
@ -22,10 +25,14 @@ function download_s132_nrf52
echo "####################################"
echo ""
wget https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v12.x.x/nRF5_SDK_12.1.0_0d23e2a.zip
unzip nRF5_SDK_12.1.0_0d23e2a.zip components/softdevice/s132/*
mv components s132_nrf52_3.0.0
rm nRF5_SDK_12.1.0_0d23e2a.zip
mkdir s132_nrf52_3.0.0
cd s132_nrf52_3.0.0
wget https://www.nordicsemi.com/eng/nordic/download_resource/56261/6/26298825/108144
mv 108144 temp.zip
unzip temp.zip
rm temp.zip
cd -
}
if [ $# -eq 0 ]; then