Skip to content

Commit a23f562

Browse files
author
Clément Léger
committed
Makefile: add capsense library in linked libraries
1 parent b84a191 commit a23f562

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

make/Makefile.cypress

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,14 @@ PSOC_CREATOR_DIR ?= $(error PSOC_CREATOR_DIR must be defined)
1414
CROSS_COMPILE := arm-none-eabi-
1515
CPU_TYPE ?= CY8C49
1616

17+
RELEASE_TYPE ?= Debug
18+
1719
# Special dir from cypress tools
18-
CYCOMPONENT_LIB := $(PSOC_CREATOR_DIR)/psoc/content/CyComponentLibrary/CyComponentLibrary.cylib/$($(CPU_TYPE)_cpu_dir)/ARM_GCC_493/Debug/CyComponentLibrary.a
20+
CYCOMPONENT_LIB_DIR := $(PSOC_CREATOR_DIR)/psoc/content/CyComponentLibrary/CyComponentLibrary.cylib/
21+
22+
CAPSENSE_LIB := $(CYCOMPONENT_LIB_DIR)/CapSense_CSD_P4_v2_30/$($(CPU_TYPE)_psoc_type)/Library/CapsenseP4Library_GCC.a
23+
CYCOMPONENT_LIB := $(CYCOMPONENT_LIB_DIR)/$($(CPU_TYPE)_cpu_dir)/ARM_GCC_493/$(RELEASE_TYPE)/CyComponentLibrary.a
24+
CYPRESS_LIBS := "$(CAPSENSE_LIB)" "$(CYCOMPONENT_LIB)"
1925
CYELFTOOL := $(PSOC_CREATOR_DIR)/bin/cyelftool.exe
2026

2127
BUILD_DIR ?= ./build
@@ -31,8 +37,6 @@ LFLAGS := -Wl,--gc-sections -Wl,-Map,$(BUILD_DIR)/$(PROJECT_NAME).map -L$(BUILD
3137
ASFLAGS := $(COMMON_FLAGS)
3238
INCLUDE_CFLAGS := -I$(PROJECT_DIR)/$(GEN_SRC_DIR) -I$(PROJECT_DIR)/
3339

34-
35-
3640
SRC_C_FILES := $(wildcard $(PROJECT_DIR)/$(GEN_SRC_DIR)/*.c $(PROJECT_DIR)/*.c)
3741
BOOTASM_GNU := $(PROJECT_DIR)/$(GEN_SRC_DIR)/CyBootAsmGnu.s
3842

@@ -55,7 +59,7 @@ $(BUILD_DIR)/$(PROJECT_NAME).a: $(OBJ_FILES)
5559

5660
$(BUILD_DIR)/$(PROJECT_NAME).elf: $(BUILD_DIR)/$(PROJECT_NAME).a
5761
@mkdir -p $(dir $@)
58-
$(CROSS_COMPILE)gcc -specs=nano.specs $(CFLAGS) -o $@ -Wl,--start-group $^ "$(CYCOMPONENT_LIB)" -Wl,--end-group $(LFLAGS)
62+
$(CROSS_COMPILE)gcc -specs=nano.specs $(CFLAGS) -o $@ -Wl,--start-group $^ $(CYPRESS_LIBS) -Wl,--end-group $(LFLAGS)
5963
wine "$(CYELFTOOL)" -B $@ --flash_row_size $($(CPU_TYPE)_flash_row_size) --flash_size $($(CPU_TYPE)_flash_size) --flash_array_size $($(CPU_TYPE)_flash_array_size)
6064
wine "$(CYELFTOOL)" -S $@
6165

0 commit comments

Comments
 (0)