Skip to content

Commit

Permalink
fix(BLE): Fixing clean.cordio build target (#1083)
Browse files Browse the repository at this point in the history
  • Loading branch information
kevin-gillespie authored Jul 19, 2024
1 parent a064240 commit 8fc1336
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
3 changes: 1 addition & 2 deletions Libraries/Cordio/platform/targets/maxim/build/cordio_lib.mk
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ ${CORDIO_BUILD_DIR}/${CORDIO_LIB}: ${CORDIO_C_FILES} ${PROJECTMK}
DUAL_CORE=$(DUAL_CORE) RISCV_CORE=$(RISCV_CORE) TRACE=${TRACE} DEBUG=${DEBUG} RTOS=${RTOS} \
CFG_DEV="${CFG_DEV}" PROJECTMK=${PROJECTMK} BOARD=${BOARD} MXC_OPTIMIZE_CFLAGS=${CORDIO_OPTIMIZE_CFLAGS} \
BT_VER=${BT_VER}


clean.cordio:
@$(MAKE) -f ${CORDIO_DIR}/platform/targets/maxim/build/libCordio.mk BUILD_DIR=${CORDIO_BUILD_DIR} clean
@$(MAKE) -f ${CORDIO_DIR}/platform/targets/maxim/build/libCordio.mk MAXIM_PATH=${MAXIM_PATH} BUILD_DIR=${CORDIO_BUILD_DIR} clean
12 changes: 6 additions & 6 deletions Libraries/Cordio/platform/targets/maxim/build/libCordio.mk
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ ifeq "$(BUILD_DIR)" ""
BUILD_DIR=./Build
endif

ifeq "${LIB_DIR}" ""
LIB_DIR := ${MAXIM_PATH}/Libraries
ifeq "${LIBS_DIR}" ""
LIBS_DIR := ${MAXIM_PATH}/Libraries
endif

include ${LIB_DIR}/Cordio/platform/targets/maxim/build/cordio.mk
include ${LIBS_DIR}/Cordio/platform/targets/maxim/build/cordio.mk

# Convert Cordio definitions to Maxim CMSIS definitions
PROJ_CFLAGS += $(addprefix -D,$(sort $(CFG_DEV))) # Remove duplicates
Expand All @@ -78,8 +78,8 @@ VPATH += %.c $(sort $(dir $(C_FILES)))
IPATH += $(INC_DIRS)

# Add dependencies in the Board library and the PeripheralDrivers
IPATH += ${LIB_DIR}/MiscDrivers/PushButton
include ${LIB_DIR}/PeriphDrivers/periphdriver.mk
IPATH += ${LIBS_DIR}/MiscDrivers/PushButton
include ${LIBS_DIR}/PeriphDrivers/periphdriver.mk

# Use absolute paths if building within eclipse environment.
ifeq "$(ECLIPSE)" "1"
Expand All @@ -90,4 +90,4 @@ endif
MAKECMDGOALS=lib

# Include the rules for building for this target
include ${LIB_DIR}/CMSIS/Device/Maxim/$(TARGET_UC)/Source/$(COMPILER)/$(TARGET_LC).mk
include ${LIBS_DIR}/CMSIS/Device/Maxim/$(TARGET_UC)/Source/$(COMPILER)/$(TARGET_LC).mk

0 comments on commit 8fc1336

Please sign in to comment.