feat(ble): Plug in latest BLE library (0.2.1-11)

epicardium/ble/ble.c

@@ -71,12 +71,6 @@ extern void bleFileTransfer_init(void);
 extern void bleCard10_init(void);
 extern void BbBleDrvSetTxPower(int8_t power);
 
-/*************************************************************************************************/
-void PalSysAssertTrap(void)
-{
-	while (1) {
-	}
-}
 /*************************************************************************************************/
 static bool_t myTrace(const uint8_t *pBuf, uint32_t len)
 {

lib/sdk/Libraries/BTLE/README.txt

+Refer to this site for the Cordio documentation.
+
+https://os.mbed.com/docs/mbed-cordio/19.02/introduction/index.html

lib/sdk/Libraries/BTLE/btle.mk

@@ -29,7 +29,7 @@
 # property whatsoever. Maxim Integrated Products, Inc. retains all
 # ownership rights.
 #
-# $Id: btle.mk 47480 2019-10-08 13:44:29Z kevin.gillespie $
+# $Id: btle.mk 50302 2019-12-24 15:42:19Z kevin.gillespie $
 #
 ################################################################################
 
@@ -44,25 +44,52 @@ endif
 TARGET_UC:=$(shell echo $(TARGET) | tr a-z A-Z)
 TARGET_LC:=$(shell echo $(TARGET) | tr A-Z a-z)
 
+# Specify the library variant.
+ifeq "$(MFLOAT_FLAGS)" "hardfp"
+LIBRARY_VARIANT=hardfp
+else
+ifeq "$(MFLOAT_FLAGS)" "hard"
+LIBRARY_VARIANT=hardfp
+else
+LIBRARY_VARIANT=softfp
+endif
+endif
+
 PHY_DIR             := ${CORDIO_DIR}/phy
 PHY_BUILD_DIR       := ${PHY_DIR}/build
 PHY_LIB_DIR         := ${PHY_BUILD_DIR}/${COMPILER}/library
+ifeq "$(LIBRARY_VARIANT)" ""
 PHY_LIB             := ${PHY_LIB_DIR}/libphy.a
+else
+PHY_LIB             := ${PHY_LIB_DIR}/libphy_$(LIBRARY_VARIANT).a
+endif
 
 LINKLAYER_DIR       := ${CORDIO_DIR}/link_layer
 LINKLAYER_BUILD_DIR := ${LINKLAYER_DIR}/build
 LINKLAYER_LIB_DIR   := ${LINKLAYER_BUILD_DIR}/${COMPILER}/library
+ifeq "$(LIBRARY_VARIANT)" ""
 LINKLAYER_LIB       := ${LINKLAYER_LIB_DIR}/liblinklayer.a
+else
+LINKLAYER_LIB       := ${LINKLAYER_LIB_DIR}/liblinklayer_$(LIBRARY_VARIANT).a
+endif
 
 STACK_DIR           := ${CORDIO_DIR}/stack
 STACK_BUILD_DIR     := ${STACK_DIR}/build
 STACK_LIB_DIR       := ${STACK_BUILD_DIR}/${COMPILER}/library
+ifeq "$(LIBRARY_VARIANT)" ""
 STACK_LIB           := ${STACK_LIB_DIR}/libstack.a
+else
+STACK_LIB           := ${STACK_LIB_DIR}/libstack_$(LIBRARY_VARIANT).a
+endif
 
 WSF_DIR             := ${CORDIO_DIR}/wsf
 WSF_BUILD_DIR       := ${WSF_DIR}/build
 WSF_LIB_DIR         := ${WSF_BUILD_DIR}/${COMPILER}/library
+ifeq "$(LIBRARY_VARIANT)" ""
 WSF_LIB             := ${WSF_LIB_DIR}/libwsf.a
+else
+WSF_LIB             := ${WSF_LIB_DIR}/libwsf_$(LIBRARY_VARIANT).a
+endif
 
 # Add to libraries list
 ifeq ($(BTLE_DEFS_ONLY),)
@@ -72,6 +99,9 @@ LIBS += $(WSF_LIB)
 LIBS += $(PHY_LIB)
 endif
 
+# Add Cordio include path
+IPATH += ${CORDIO_DIR}
+
 # Add Link Layer include paths
 IPATH += ${LINKLAYER_DIR}/platform/common/include
 IPATH += ${LINKLAYER_DIR}/controller/include/ble
@@ -81,7 +111,9 @@ IPATH += ${LINKLAYER_DIR}/controller/sources/ble/include
 
 # Add Stack include paths
 IPATH += ${STACK_DIR}/platform/$(TARGET_LC)
+IPATH += ${STACK_DIR}/platform/include
 IPATH += ${STACK_DIR}/ble-host/sources/stack/cfg
+IPATH += ${STACK_DIR}/ble-host/sources/stack/dm
 IPATH += ${STACK_DIR}/ble-host/include
 IPATH += ${STACK_DIR}/ble-host/sources/stack/hci
 IPATH += ${STACK_DIR}/ble-host/sources/hci/dual_chip
@@ -156,21 +188,34 @@ else
 PROJ_CFLAGS+=-DENABLE_SDMA=TRUE
 FILTERED_SRCS+=hci_drv.c
 
+# Fixed data memory size for all of the images
+PROJ_AFLAGS +=-D__SDMA_DATA_SIZE=0x7BC0
+
 ifeq ($(SDMA_ADV),)
 ifeq ($(SDMA_SCN),)
-PROJ_AFLAGS +=-D__SDMA_SIZE=0x2F000
+SDMA_CODE_NAME=${STACK_DIR}/platform/$(TARGET_LC)/sdma_code.inc
 endif
 endif
 
 ifneq ($(SDMA_ADV),)
+# Adv/Slave only
 PROJ_CFLAGS+=-DSDMA_ADV=TRUE
-PROJ_AFLAGS +=-D__SDMA_SIZE=0x21000 # Adv/Slave only
+SDMA_CODE_NAME=${STACK_DIR}/platform/$(TARGET_LC)/sdma_adv_code.inc
 endif
 
 ifneq ($(SDMA_SCN),)
+# Scan/Master only
 PROJ_CFLAGS+=-DSDMA_SCN=TRUE
-PROJ_AFLAGS +=-D__SDMA_SIZE=0x28000 # Scan/Master only
+SDMA_CODE_NAME=${STACK_DIR}/platform/$(TARGET_LC)/sdma_scn_code.inc
+
 endif
+
+FILESIZE=$(shell ls -la $(SDMA_CODE_NAME) | tr -s " " | cut -d " " -f5)
+
+# 81 characters per line, 16 bytes per line, round to the upper 16 byte boundary
+CODESIZE=$$(( ($(FILESIZE) / 81 + 1 ) * 16 ))
+PROJ_AFLAGS +=-D__SDMA_CODE_SIZE=$(CODESIZE)
+
 endif
 
 ifeq ($(BTLE_DEFS_ONLY),)
@@ -184,6 +229,7 @@ PROJ_CFLAGS+=-DLCTR_CONN_NO_TIFS_REASSEMBLY=1
 PROJ_CFLAGS+=-DBB_ENABLE_INLINE_ENC_TX=1
 PROJ_CFLAGS+=-DBB_ENABLE_INLINE_DEC_RX=1
 PROJ_CFLAGS+=-DFORCE_PMU_WAKEUP=1
+PROJ_CFLAGS+=-DWDX_FTD_ATT_DEFAULT_PAYLOAD_LEN=256
 
 # Build libraries
 export TARGET

lib/sdk/Libraries/BTLE/link_layer/build/GCC/Makefile

+################################################################################
+# Copyright (C) 2018 Maxim Integrated Products, Inc., All Rights Reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL MAXIM INTEGRATED BE LIABLE FOR ANY CLAIM, DAMAGES
+# OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of Maxim Integrated
+# Products, Inc. shall not be used except as stated in the Maxim Integrated
+# Products, Inc. Branding Policy.
+#
+# The mere transfer of this software does not imply any licenses
+# of trade secrets, proprietary technology, copyrights, patents,
+# trademarks, maskwork rights, or any other form of intellectual
+# property whatsoever. Maxim Integrated Products, Inc. retains all
+# ownership rights.
+#
+# $Id: Makefile 50443 2020-01-07 21:13:48Z nathan.goldstick $
+#
+################################################################################
+
+# This is the name of the build output file
+PROJECT_NAME=liblinklayer
+
+# Specify the project variant.
+ifeq "$(MFLOAT_FLAGS)" "hardfp"
+PROJECT_VARIANT=hardfp
+else
+ifeq "$(MFLOAT_FLAGS)" "hard"
+PROJECT_VARIANT=hardfp
+else
+PROJECT_VARIANT=softfp
+endif
+endif
+
+# Use these to specify the project.
+ifeq "$(PROJECT_VARIANT)" ""
+PROJECT=$(PROJECT_NAME)
+else
+PROJECT=$(PROJECT_NAME)_$(PROJECT_VARIANT)
+endif
+
+# Specify the target processor
+ifeq "$(TARGET)" ""
+TARGET=MAX32665
+endif
+
+# Select 'GCC' or 'IAR' compiler
+COMPILER=GCC
+
+# Specify the board used
+ifeq "$(BOARD)" ""
+BOARD=EvKit_V1
+endif
+
+# Create Target name variables
+TARGET_UC:=$(shell echo $(TARGET) | tr a-z A-Z)
+TARGET_LC:=$(shell echo $(TARGET) | tr A-Z a-z)
+
+# Specify variant specific CFLAGS
+ifeq "$(MFLOAT_FLAGS)" "hardfp"
+PROJECT_CFLAGS+=-mfloat-abi=hardfp
+else
+ifeq "$(MFLOAT_FLAGS)" "hard"
+PROJECT_CFLAGS+=-mfloat-abi=hardfp
+else
+PROJECT_CFLAGS+=-mfloat-abi=softfp
+endif
+endif
+
+ifeq "$(BUILD_DIR)" ""
+BUILD_DIR=./library
+endif
+
+# Strip this library during link stage.
+STRIP_LIBRARIES?=
+ifneq "$(ECLIPSE)" "1"
+export FIXDBGPATHS_MATCH='^\.\./\.\./'
+export FIXDBGPATHS_REPLACE=
+endif
+
+# This is the path to the CMSIS root directory
+ifeq "$(MAXIM_PATH)" ""
+LIBS_DIR=../../../../../Libraries
+NDALIBS_DIR=../../../../../NDALibraries
+else
+LIBS_DIR=/$(subst \,/,$(subst :,,$(MAXIM_PATH))/Firmware/$(TARGET_UC)/Libraries)
+NDALIBS_DIR=/$(subst \,/,$(subst :,,$(MAXIM_PATH))/Firmware/$(TARGET_UC)/NDALibraries)
+endif
+CMSIS_ROOT=$(LIBS_DIR)/CMSIS
+
+# Include Cordio BTLE Library
+ifeq "$(CORDIO_DIR)" ""
+CORDIO_DIR=$(LIBS_DIR)/BTLE
+endif
+
+#--------------------
+# Stack CFLAGS configuration
+PROJ_CFLAGS+=-DINIT_BROADCASTER
+PROJ_CFLAGS+=-DINIT_OBSERVER
+PROJ_CFLAGS+=-DINIT_CENTRAL
+PROJ_CFLAGS+=-DINIT_PERIPHERAL
+PROJ_CFLAGS+=-DINIT_PHY
+PROJ_CFLAGS+=-DINIT_ENCRYPTED
+
+# Include BTLE definitions and headers
+BTLE_DEFS_ONLY=1
+include $(CORDIO_DIR)/btle.mk
+
+# Include sources
+include $(CORDIO_DIR)/link_layer/build/sources_ll.mk
+
+# Map variable names
+SRCS  += $(LINKLAYER_C_FILES)
+VPATH += $(dir $(SRCS))
+IPATH += $(LINKLAYER_INC_DIRS)
+
+# Use absolute paths if building within eclipse environment.
+ifeq "$(ECLIPSE)" "1"
+SRCS = $(abspath $(SRCS))
+endif
+
+# Only building libraries.
+MAKECMDGOALS=lib
+
+# Include the rules for building for this target
+include $(CMSIS_ROOT)/Device/Maxim/$(TARGET_UC)/Source/$(COMPILER)/$(TARGET_LC).mk

lib/sdk/Libraries/BTLE/link_layer/build/sources_ll.mk

+################################################################################
+# Copyright (C) 2018 Maxim Integrated Products, Inc., All Rights Reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL MAXIM INTEGRATED BE LIABLE FOR ANY CLAIM, DAMAGES
+# OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of Maxim Integrated
+# Products, Inc. shall not be used except as stated in the Maxim Integrated
+# Products, Inc. Branding Policy.
+#
+# The mere transfer of this software does not imply any licenses
+# of trade secrets, proprietary technology, copyrights, patents,
+# trademarks, maskwork rights, or any other form of intellectual
+# property whatsoever. Maxim Integrated Products, Inc. retains all
+# ownership rights.
+#
+# $Id: sources_ll.mk 48465 2019-11-06 16:55:27Z nathan.goldstick $
+#
+################################################################################
+
+ifeq "$(CORDIO_DIR)" ""
+$(error "CORDIO_DIR must be specified")
+endif
+
+ifeq "$(MFLOAT_FLAGS)" "hardfp"
+LINKLAYER_LIB_VARIANT=hardfp
+else
+ifeq "$(MFLOAT_FLAGS)" "hard"
+LINKLAYER_LIB_VARIANT=hardfp
+else
+LINKLAYER_LIB_VARIANT=softfp
+endif
+endif
+
+LINKLAYER_DIR       := ${CORDIO_DIR}/link_layer
+LINKLAYER_BUILD_DIR := ${LINKLAYER_DIR}/build
+LINKLAYER_LIB_DIR   := ${LINKLAYER_BUILD_DIR}/${COMPILER}/library
+ifeq "$(LINKLAYER_LIB_VARIANT)" ""
+LINKLAYER_LIB       := ${LINKLAYER_LIB_DIR}/liblinklayer.a
+else
+LINKLAYER_LIB       := ${LINKLAYER_LIB_DIR}/liblinklayer_$(LINKLAYER_LIB_VARIANT).a
+endif
+
+WSF_DIR             := ${CORDIO_DIR}/wsf
+
+LINKLAYER_INC_DIRS += \
+	$(WSF_DIR)/include \
+	$(WSF_DIR)/include/util \
+	$(LINKLAYER_DIR) \
+	$(LINKLAYER_DIR)/platform \
+	$(LINKLAYER_DIR)/platform/max32665 \
+	$(LINKLAYER_DIR)/platform/common \
+	$(LINKLAYER_DIR)/platform/common/include \
+	$(LINKLAYER_DIR)/platform/common/sources \
+	$(LINKLAYER_DIR)/platform/common/sources/chci \
+	$(LINKLAYER_DIR)/platform/common/sources/bb \
+	$(LINKLAYER_DIR)/platform/common/sources/bb/ble \
+	$(LINKLAYER_DIR)/platform/common/sources/ll \
+	$(LINKLAYER_DIR)/controller \
+	$(LINKLAYER_DIR)/controller/include \
+	$(LINKLAYER_DIR)/controller/include/common \
+	$(LINKLAYER_DIR)/controller/include/ble \
+	$(LINKLAYER_DIR)/controller/sources \
+	$(LINKLAYER_DIR)/controller/sources/common \
+	$(LINKLAYER_DIR)/controller/sources/common/bb \
+	$(LINKLAYER_DIR)/controller/sources/common/sch \
+	$(LINKLAYER_DIR)/controller/sources/ble \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci \
+	$(LINKLAYER_DIR)/controller/sources/ble/init \
+	$(LINKLAYER_DIR)/controller/sources/ble/bb \
+	$(LINKLAYER_DIR)/controller/sources/ble/sch \
+	$(LINKLAYER_DIR)/controller/sources/ble/include \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll \
+	$(LINKLAYER_DIR)/controller/sources/ble/lmgr \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr \
+	$(LINKLAYER_DIR)/thirdparty \
+	$(LINKLAYER_DIR)/thirdparty/uecc
+
+LINKLAYER_H_FILES += $(shell find $(LINKLAYER_INC_DIRS) -name '*.h')
+
+LINKLAYER_C_FILES += \
+	$(LINKLAYER_DIR)/platform/max32665/chci_drv.c \
+	$(LINKLAYER_DIR)/platform/max32665/ll_tester.c \
+	$(LINKLAYER_DIR)/platform/max32665/lhci_vs.c \
+	$(LINKLAYER_DIR)/platform/max32665/ll_math_aes.c \
+	$(LINKLAYER_DIR)/platform/common/sources/chci/chci_tr_serial.c \
+	$(LINKLAYER_DIR)/platform/common/sources/chci/chci_tr.c \
+	$(LINKLAYER_DIR)/platform/common/sources/bb/ble/bb_ble_pdufilt.c \
+	$(LINKLAYER_DIR)/platform/common/sources/bb/ble/bb_ble_reslist.c \
+	$(LINKLAYER_DIR)/platform/common/sources/bb/ble/bb_ble_whitelist.c \
+	$(LINKLAYER_DIR)/platform/common/sources/bb/ble/bb_ble_periodiclist.c \
+	$(LINKLAYER_DIR)/platform/common/sources/ll/ll_math_ecc.c \
+	$(LINKLAYER_DIR)/platform/common/sources/ll/lhci_cmd_vs_ext.c \
+	$(LINKLAYER_DIR)/controller/sources/common/bb/bb_main.c \
+	$(LINKLAYER_DIR)/controller/sources/common/sch/sch_main.c \
+	$(LINKLAYER_DIR)/controller/sources/common/sch/sch_list.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_evt_vs.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_evt_phy.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_init_adv_priv.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_init_adv_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_init_adv_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_evt_enc_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_cmd_adv_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_init.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_cmd_phy.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_main.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_cmd_adv_master_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_evt.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_cmd_adv_priv.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_init_conn_cs2.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_init_conn_master_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_cmd_adv_slave_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_cmd_sc.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_cmd_enc_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_evt_conn_priv.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_cmd_enc_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_cmd_conn_master_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_evt_conn_cs2.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_evt_enc_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_evt_adv_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_cmd_conn_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_init_adv_master_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_cmd.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_init_conn_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_init_sc.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_init_enc_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_init_conn_priv.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_evt_sc.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_evt_conn.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_init_conn.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_evt_conn_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_cmd_conn.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_init_enc_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_cmd_adv_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_cmd_conn_priv.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_init_adv_slave_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_evt_adv_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_init_phy.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_evt_adv_slave_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lhci/lhci_evt_adv_master_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/bb/bb_ble_main.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/bb/bb_ble_adv_slave_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/bb/bb_ble_adv_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/bb/bb_ble_adv_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/bb/bb_ble_conn_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/bb/bb_ble_conn_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/bb/bb_ble_test.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/bb/bb_ble_conn.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/bb/bb_ble_adv_master_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/sch/sch_ble.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/sch/sch_rm.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_init_conn_cs2.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_main_adv_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_init_adv_master_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_main_phy.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_init_adv_slave_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_main_sc.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_init_sc.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_init_master_phy.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_main_conn_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_main_priv.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_init_adv_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_init_conn_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_init_conn_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_main_conn_master_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_init_adv_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_init_init_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_main_dtm.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_init_priv.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_main.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_main_conn_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_main_adv_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_main_conn.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_main_enc_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_main_diag.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_main_adv_master_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_init_slave_phy.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_init_enc_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_math.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_init.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_init_enc_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_main_adv_slave_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_main_enc_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/ll/ll_init_init_master_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lmgr/lmgr_main_priv.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lmgr/lmgr_main_adv_slave_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lmgr/lmgr_main_conn.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lmgr/lmgr_main.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lmgr/lmgr_events.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lmgr/lmgr_main_sc.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lmgr/lmgr_main_adv_master_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lmgr/lmgr_main_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lmgr/lmgr_main_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_main_conn_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_main_adv_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_main_conn_cs2.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_act_conn.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_act_phy.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_isr_init_master_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_isr_adv_master_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_isr_conn.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_pdu_enc.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_pdu_conn.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_main_adv_slave_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_main_enc_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_sm_conn_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_main_adv_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_main_priv.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_isr_init_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_act_adv_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_act_adv_master_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_main_conn_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_main_slave_phy.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_main_conn_data.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_sm_llcp_conn_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_pdu_adv_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_isr_adv_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_main_conn.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_pdu_adv_master_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_act_adv_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_main_init_master_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_act_init_master_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_sm_conn_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_act_enc_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_sm_adv_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_sm_adv_slave_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_sm_llcp_master_phy.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_sm_llcp_slave_phy.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_sm_init_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_sm_adv_master_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_sm_adv_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_act_conn_master_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_act_init_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_sm_llcp_conn.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_sm_llcp_conn_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_sm_init_master_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_main_adv_master_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_main.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_isr_adv_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_isr_conn_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_main_master_phy.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_sm_llcp_enc_slave.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_main_enc_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_isr_conn_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_act_enc.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_main_init_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_act_conn_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_main_sc.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_isr_adv_slave_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_pdu_adv_slave_ae.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_sm_llcp_enc_master.c \
+	$(LINKLAYER_DIR)/controller/sources/ble/lctr/lctr_act_adv_slave_ae.c \
+	$(LINKLAYER_DIR)/thirdparty/uecc/uECC_ll.c 

lib/sdk/Libraries/BTLE/link_layer/controller/include/ble/ll_api.h

@@ -25,6 +25,7 @@
  *    - INIT_OBSERVER
  *    - INIT_PERIPHERAL
  *    - INIT_CENTRAL
+ *    - INIT_PHY
  *    - INIT_ENCRYPTED
  *
  *  \note   Each feature may require additional \ref LlRtCfg_t requirements.

lib/sdk/Libraries/BTLE/link_layer/controller/sources/ble/init/init.c

@@ -101,6 +101,9 @@ void LlInitLlInit(bool_t initHandler)
     #else
       LlConnMasterInit();
     #endif
+    #ifdef INIT_PHY
+    LlPhyMasterInit();
+    #endif
   #else
     #ifdef INIT_OBSERVER
       LlScanMasterInit();
@@ -114,6 +117,9 @@ void LlInitLlInit(bool_t initHandler)
     #else
       LlConnSlaveInit();
     #endif
+    #ifdef INIT_PHY
+    LlPhySlaveInit();
+    #endif
   #else
     #ifdef INIT_BROADCASTER
       LlAdvSlaveInit();

lib/sdk/Libraries/BTLE/link_layer/controller/sources/ble/init/init_ctr.c

@@ -80,6 +80,12 @@ void LlInitLhciInit(void)
     LhciScInit();
   #endif
 
+  #if defined(INIT_PERIPHERAL) || defined(INIT_CENTRAL)
+  #ifdef INIT_PHY
+    LhciPhyInit();
+  #endif
+  #endif
+
   handlerId = WsfOsSetNextHandler(LhciHandler);
   LhciHandlerInit(handlerId);
 }

lib/sdk/Libraries/BTLE/link_layer/controller/sources/ble/init/init_ctr_ext.c

@@ -52,8 +52,10 @@ void LlInitLhciExtInit(void)
 
   #if defined(INIT_PERIPHERAL) || defined(INIT_CENTRAL)
     LhciChannelSelection2Init();
+  #ifdef INIT_PHY
     LhciPhyInit();
   #endif
+  #endif