8000 nrf5: Merging sdk makefiles into bluetooth_common.mk. s1xx_iot is sti… · ladyada/circuitpython@5e89a27 · GitHub
[go: up one dir, main page]

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 5e89a27

Browse files
committed
nrf5: Merging sdk makefiles into bluetooth_common.mk. s1xx_iot is still left out of this refactoring.
1 parent ec35861 commit 5e89a27

File tree

3 files changed

+17
-46
lines changed

3 files changed

+17
-46
lines changed

nrf5/sdk/bluetooth_common.mk

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
11

2-
SDK_MODULES ?=
2+
SOFTDEV_HEX_NAME ?=
33

4-
ifeq ($(SD), s1xx)
5-
SDK_MODULES = iot_0.9.0
6-
else ifeq ($(SD), s110)
7-
SDK_MODULES = sdk_10.0.0
4+
ifeq ($(SD), s110)
5+
INC += -I$(SDK_ROOT)components/softdevice/$(SD)/headers
6+
CFLAGS += -DBLUETOOTH_SD_DEBUG=1
7+
CFLAGS += -DBLUETOOTH_SD=110
8+
SOFTDEV_HEX_NAME = s110_nrf51_8.0.0_softdevice.hex
89
else ifeq ($(SD), s120)
9-
SDK_MODULES = sdk_10.0.0
10-
$(error No supported BLE wrapper)
10+
$(error No BLE wrapper available yet)
1111
else ifeq ($(SD), s130)
12-
SDK_MODULES = sdk_10.0.0
12+
$(error No BLE wrapper available yet)
1313
else ifeq ($(SD), s132)
14-
SDK_MODULES = sdk_12.1.0
15-
SDK_COMPONENTS = 0
14+
INC += -I$(SDK_ROOT)components/softdevice/$(SD)/headers
15+
INC += -I$(SDK_ROOT)components/softdevice/$(SD)/headers/$(MCU_VARIANT)
16+
CFLAGS += -DBLUETOOTH_SD_DEBUG=1
17+
CFLAGS += -DBLUETOOTH_SD=132
18+
SOFTDEV_HEX_NAME = s132_nrf52_3.0.0_softdevice.hex
19+
#else ifeq ($(SD), s1xx)
20+
# include sdk/iot_0.9.0/sdk.mk
1621
else
17-
$(error No SDK configured for this SD)
22+
$(error Incorrect softdevice set flag)
1823
endif
1924

20-
SDK_MODULES_PATH = sdk/$(SDK_MODULES)/
21-
22-
include $(SDK_MODULES_PATH)sdk.mk
25+
SOFTDEV_HEX = $(lastword $(wildcard $(SDK_ROOT)/components/softdevice/$(SD)/hex/$(SOFTDEV_HEX_NAME)))
2326

2427
INC += -I./sdk
2528

nrf5/sdk/sdk_10.0.0/sdk.mk

Lines changed: 0 additions & 17 deletions
This file was deleted.

nrf5/sdk/sdk_12.1.0/sdk.mk

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0