Skip to content

Commit a60cb05

Browse files
sjancsjanc
committed
porting: Build ports with MbedTLS
Tinycrypt support is being removed from NimBLE.
1 parent f932972 commit a60cb05

7 files changed

Lines changed: 19 additions & 53 deletions

File tree

‎porting/examples/dummy/Makefile‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ SIZE := $(CROSS_COMPILE)size
3131

3232
# Configure NimBLE variables
3333
NIMBLE_ROOT := ../../..
34-
NIMBLE_CFG_TINYCRYPT := 1
34+
NIMBLE_CFG_MBEDTLS := 1
3535

3636
# Skip files that don't build for this port
3737
NIMBLE_IGNORE := $(NIMBLE_ROOT)/nimble/host/src/ble_gatts_lcl.c \
@@ -47,22 +47,19 @@ SRC = \
4747
$(wildcard $(NIMBLE_ROOT)/porting/npl/dummy/src/*.c) \
4848
$(NIMBLE_SRC) \
4949
$(wildcard $(NIMBLE_ROOT)/nimble/transport/socket/src/*.c) \
50-
$(TINYCRYPT_SRC) \
5150
main.c \
5251

5352
# Add dummy NPL and all NimBLE directories to include paths
5453
INC = \
5554
$(NIMBLE_ROOT)/porting/npl/dummy/include \
5655
$(NIMBLE_INCLUDE) \
5756
$(NIMBLE_ROOT)/nimble/transport/socket/include \
58-
$(TINYCRYPT_INCLUDE) \
5957
$(INCLUDE) \
6058

6159
OBJ := $(SRC:.c=.o)
62-
TINYCRYPT_OBJ := $(TINYCRYPT_SRC:.c=.o)
6360

6461
CFLAGS := $(NIMBLE_CFLAGS)
65-
LDFLAGS := $(NIMBLE_LDFLAGS)
62+
LDFLAGS := $(NIMBLE_LDFLAGS) $(MBEDTLS_LDFLAGS)
6663

6764
.PHONY: all clean
6865
.DEFAULT: all
@@ -73,10 +70,8 @@ clean:
7370
rm $(OBJ) -f
7471
rm dummy -f
7572

76-
$(TINYCRYPT_OBJ): CFLAGS+=$(TINYCRYPT_CFLAGS)
77-
7873
%.o: %.c
7974
$(CC) -c $(addprefix -I, $(INC)) $(CFLAGS) -o $@ $<
8075

81-
dummy: $(OBJ) $(TINYCRYPT_OBJ)
76+
dummy: $(OBJ)
8277
$(CC) -o $@ $^ $(LDFLAGS)

‎porting/examples/linux/Makefile‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ SIZE := $(CROSS_COMPILE)size
2929

3030
# Configure NimBLE variables
3131
NIMBLE_ROOT := ../../..
32-
NIMBLE_CFG_TINYCRYPT := 1
32+
NIMBLE_CFG_MBEDTLS:= 1
3333

3434
# Skip files that don't build for this port
3535
NIMBLE_IGNORE := $(NIMBLE_ROOT)/porting/nimble/src/hal_timer.c \
@@ -46,7 +46,6 @@ SRC += \
4646
$(wildcard $(NIMBLE_ROOT)/porting/npl/linux/src/*.c) \
4747
$(wildcard $(NIMBLE_ROOT)/porting/npl/linux/src/*.cc) \
4848
$(wildcard $(NIMBLE_ROOT)/nimble/transport/socket/src/*.c) \
49-
$(TINYCRYPT_SRC) \
5049
$(NULL)
5150

5251
# Source files for demo app
@@ -61,7 +60,6 @@ INC = \
6160
$(NIMBLE_ROOT)/porting/npl/linux/include \
6261
$(NIMBLE_ROOT)/nimble/transport/socket/include \
6362
$(NIMBLE_INCLUDE) \
64-
$(TINYCRYPT_INCLUDE) \
6563
$(NULL)
6664

6765
INCLUDES := $(addprefix -I, $(INC))
@@ -72,16 +70,14 @@ SRC_CC = $(filter %.cc, $(SRC))
7270
OBJ := $(SRC_C:.c=.o)
7371
OBJ += $(SRC_CC:.cc=.o)
7472

75-
TINYCRYPT_OBJ := $(TINYCRYPT_SRC:.c=.o)
76-
7773
CFLAGS = \
7874
$(NIMBLE_CFLAGS) \
7975
$(INCLUDES) \
8076
-g \
8177
-D_GNU_SOURCE \
8278
$(NULL)
8379

84-
LIBS := $(NIMBLE_LDFLAGS) -lrt -lpthread -lstdc++
80+
LIBS := $(NIMBLE_LDFLAGS) $(MBEDTLS_LDFLAGS) -lrt -lpthread -lstdc++
8581

8682
.PHONY: all clean
8783
.DEFAULT: all
@@ -92,14 +88,12 @@ clean:
9288
rm $(OBJ) -f
9389
rm nimble-linux -f
9490

95-
$(TINYCRYPT_OBJ): CFLAGS+=$(TINYCRYPT_CFLAGS)
96-
9791
%.o: %.c
9892
$(CC) -c $(INCLUDES) $(CFLAGS) -o $@ $<
9993

10094
%.o: %.cc
10195
$(CXX) -c $(INCLUDES) $(CFLAGS) -o $@ $<
10296

103-
nimble-linux: $(OBJ) $(TINYCRYPT_OBJ)
97+
nimble-linux: $(OBJ)
10498
$(LD) -o $@ $^ $(LIBS)
10599
$(SIZE) $@

‎porting/examples/linux_blemesh/Makefile‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ SIZE := $(CROSS_COMPILE)size
2929

3030
# Configure NimBLE variables
3131
NIMBLE_ROOT := ../../..
32-
NIMBLE_CFG_TINYCRYPT := 1
32+
NIMBLE_CFG_MBEDTLS := 1
3333

3434
# Skip files that don't build for this port
3535
NIMBLE_IGNORE := $(NIMBLE_ROOT)/porting/nimble/src/hal_timer.c \
@@ -47,7 +47,6 @@ SRC += \
4747
$(wildcard $(NIMBLE_ROOT)/porting/npl/linux/src/*.c) \
4848
$(wildcard $(NIMBLE_ROOT)/porting/npl/linux/src/*.cc) \
4949
$(wildcard $(NIMBLE_ROOT)/nimble/transport/socket/src/*.c) \
50-
$(TINYCRYPT_SRC) \
5150
$(NULL)
5251

5352
# Source files for demo app
@@ -63,7 +62,6 @@ INC = \
6362
$(NIMBLE_ROOT)/porting/npl/linux/src \
6463
$(NIMBLE_ROOT)/nimble/transport/socket/include \
6564
$(NIMBLE_INCLUDE) \
66-
$(TINYCRYPT_INCLUDE) \
6765
$(NULL)
6866

6967
INCLUDES := $(addprefix -I, $(INC))
@@ -74,16 +72,14 @@ SRC_CC = $(filter %.cc, $(SRC))
7472
OBJ := $(SRC_C:.c=.o)
7573
OBJ += $(SRC_CC:.cc=.o)
7674

77-
TINYCRYPT_OBJ := $(TINYCRYPT_SRC:.c=.o)
78-
7975
CFLAGS = \
8076
$(NIMBLE_CFLAGS) \
8177
$(INCLUDES) \
8278
-g \
8379
-D_GNU_SOURCE \
8480
$(NULL)
8581

86-
LIBS := $(NIMBLE_LDFLAGS) -lrt -lpthread -lstdc++
82+
LIBS := $(NIMBLE_LDFLAGS) $(MBEDTLS_LDFLAGS) -lrt -lpthread -lstdc++
8783

8884
.PHONY: all clean
8985
.DEFAULT: all
@@ -94,14 +90,12 @@ clean:
9490
rm $(OBJ) -f
9591
rm nimble-linux-blemesh -f
9692

97-
$(TINYCRYPT_OBJ): CFLAGS+=$(TINYCRYPT_CFLAGS)
98-
9993
%.o: %.c
10094
$(CC) -c $(INCLUDES) $(CFLAGS) -o $@ $<
10195

10296
%.o: %.cc
10397
$(CXX) -c $(INCLUDES) $(CFLAGS) -o $@ $<
10498

105-
nimble-linux-blemesh: $(OBJ) $(TINYCRYPT_OBJ)
99+
nimble-linux-blemesh: $(OBJ)
106100
$(LD) -o $@ $^ $(LIBS)
107101
$(SIZE) $@

‎porting/examples/linux_blemesh_shell/Makefile‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ SIZE := $(CROSS_COMPILE)size
2929

3030
# Configure NimBLE variables
3131
NIMBLE_ROOT := ../../..
32-
NIMBLE_CFG_TINYCRYPT := 1
32+
NIMBLE_CFG_MBEDTLS := 1
3333

3434
# Skip files that don't build for this port
3535
NIMBLE_IGNORE := $(NIMBLE_ROOT)/porting/nimble/src/hal_timer.c \
@@ -47,7 +47,6 @@ SRC += \
4747
$(wildcard $(NIMBLE_ROOT)/porting/npl/linux/src/*.c) \
4848
$(wildcard $(NIMBLE_ROOT)/porting/npl/linux/src/*.cc) \
4949
$(wildcard $(NIMBLE_ROOT)/nimble/transport/socket/src/*.c) \
50-
$(TINYCRYPT_SRC) \
5150
$(wildcard $(NIMBLE_ROOT)/nimble/host/mesh/src/*.c) \
5251
$(NULL)
5352

@@ -66,7 +65,6 @@ INC = \
6665
$(NIMBLE_ROOT)/porting/npl/linux/src \
6766
$(NIMBLE_ROOT)/nimble/transport/socket/include \
6867
$(NIMBLE_INCLUDE) \
69-
$(TINYCRYPT_INCLUDE) \
7068
$(NULL)
7169

7270
INCLUDES := $(addprefix -I, $(INC))
@@ -77,16 +75,14 @@ SRC_CC = $(filter %.cc, $(SRC))
7775
OBJ := $(SRC_C:.c=.o)
7876
OBJ += $(SRC_CC:.cc=.o)
7977

80-
TINYCRYPT_OBJ := $(TINYCRYPT_SRC:.c=.o)
81-
8278
CFLAGS = \
8379
$(NIMBLE_CFLAGS) \
8480
$(INCLUDES) \
8581
-g \
8682
-D_GNU_SOURCE \
8783
$(NULL)
8884

89-
LIBS := $(NIMBLE_LDFLAGS) -lrt -lpthread -lstdc++
85+
LIBS := $(NIMBLE_LDFLAGS) $(MBEDTLS_LDFLAGS) -lrt -lpthread -lstdc++
9086

9187
.PHONY: all clean
9288
.DEFAULT: all
@@ -97,14 +93,12 @@ clean:
9793
rm $(OBJ) -f
9894
rm nimble-linux-blemesh-shell -f
9995

100-
$(TINYCRYPT_OBJ): CFLAGS+=$(TINYCRYPT_CFLAGS)
101-
10296
%.o: %.c
10397
$(CC) -c $(INCLUDES) $(CFLAGS) -o $@ $<
10498

10599
%.o: %.cc
106100
$(CXX) -c $(INCLUDES) $(CFLAGS) -o $@ $<
107101

108-
nimble-linux-blemesh-shell: $(OBJ) $(TINYCRYPT_OBJ)
102+
nimble-linux-blemesh-shell: $(OBJ)
109103
$(LD) -o $@ $^ $(LIBS)
110104
$(SIZE) $@

‎porting/examples/nuttx/Make.defs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#
1717

1818
# Configure NimBLE variables
19-
NIMBLE_CFG_TINYCRYPT := 1
19+
NIMBLE_CFG_MBEDTLS := 1
2020

2121
# Skip files that don't build for this port
2222
NIMBLE_IGNORE := $(NIMBLE_ROOT)/porting/nimble/src/hal_timer.c \
@@ -30,8 +30,7 @@ CSRCS := $(NIMBLE_SRC)
3030
# Source files for NPL OSAL
3131
CSRCS += \
3232
$(wildcard $(NIMBLE_ROOT)/porting/npl/nuttx/src/*.c) \
33-
$(wildcard $(NIMBLE_ROOT)/nimble/transport/socket/src/*.c) \
34-
$(TINYCRYPT_SRC)
33+
$(wildcard $(NIMBLE_ROOT)/nimble/transport/socket/src/*.c)
3534

3635
# Source files for demo app
3736
CSRCS += $(NIMBLE_ROOT)/porting/examples/nuttx/ble.c
@@ -43,14 +42,12 @@ INC = \
4342
$(wildcard $(NIMBLE_ROOT)/porting/examples/nuttx/include) \
4443
$(NIMBLE_ROOT)/porting/npl/nuttx/include \
4544
$(NIMBLE_ROOT)/nimble/transport/socket/include \
46-
$(NIMBLE_INCLUDE) \
47-
$(TINYCRYPT_INCLUDE)
45+
$(NIMBLE_INCLUDE)
4846

4947
INCLUDES := $(addprefix -I, $(INC))
5048

5149
CFLAGS += \
5250
$(INCLUDES) \
53-
$(TINYCRYPT_CFLAGS) \
5451
-DNIMBLE_CFG_CONTROLLER=0 -DOS_CFG_ALIGN_4=4 -DOS_CFG_ALIGNMENT=4 \
5552
-Ddefault_RNG_defined=0
5653

‎porting/nimble/Makefile.defs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ ifneq (,$(NIMBLE_CFG_CONTROLLER))
6363
include $(NIMBLE_ROOT)/porting/nimble/Makefile.controller
6464
endif
6565

66-
# TinyCrypt (for SM)
67-
ifneq (,$(NIMBLE_CFG_TINYCRYPT))
68-
include $(NIMBLE_ROOT)/porting/nimble/Makefile.tinycrypt
66+
# Mbed TLS (for SM)
67+
ifneq (,$(NIMBLE_CFG_MBEDTLS))
68+
include $(NIMBLE_ROOT)/porting/nimble/Makefile.mbedtls
6969
endif
7070

7171
ifneq (,$(NIMBLE_CFG_MESH))

porting/nimble/Makefile.tinycrypt renamed to porting/nimble/Makefile.mbedtls

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,4 @@
1515
# under the License.
1616
#
1717

18-
TINYCRYPT_CFLAGS := -std=c99
19-
20-
TINYCRYPT_INCLUDE := \
21-
$(NIMBLE_ROOT)/ext/tinycrypt/include \
22-
$(NULL)
23-
24-
TINYCRYPT_SRC := \
25-
$(filter-out $(NIMBLE_IGNORE), $(wildcard $(NIMBLE_ROOT)/ext/tinycrypt/src/*.c)) \
26-
$(NULL)
18+
MBEDTLS_LDFLAGS := -lmbedtls -lmbedcrypto

0 commit comments

Comments
 (0)