From 9c1283c58e2513e2f8b424fd107472bff921b83a Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Wed, 10 Jul 2024 12:32:24 +0300 Subject: [PATCH] ports/all: Wrap more CDC functions. Just to ensure tud_task is not call by other code while debugging is enabled. --- src/omv/ports/mimxrt/omv_portconfig.mk | 2 ++ src/omv/ports/nrf/omv_portconfig.mk | 18 +++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/omv/ports/mimxrt/omv_portconfig.mk b/src/omv/ports/mimxrt/omv_portconfig.mk index 7a84c01e6..bd02b1ee1 100644 --- a/src/omv/ports/mimxrt/omv_portconfig.mk +++ b/src/omv/ports/mimxrt/omv_portconfig.mk @@ -48,7 +48,9 @@ LDFLAGS = -mthumb \ -mabi=aapcs-linux \ -Wl,--print-memory-usage \ -Wl,--gc-sections \ + -Wl,--wrap=mp_usbd_task \ -Wl,--wrap=tud_cdc_rx_cb \ + -Wl,--wrap=mp_hal_stdio_poll \ -Wl,--wrap=mp_hal_stdout_tx_strn \ -Wl,-T$(BUILD)/$(LDSCRIPT).lds \ -Wl,-Map=$(BUILD)/$(FIRMWARE).map diff --git a/src/omv/ports/nrf/omv_portconfig.mk b/src/omv/ports/nrf/omv_portconfig.mk index 0946f821d..38eb97c01 100644 --- a/src/omv/ports/nrf/omv_portconfig.mk +++ b/src/omv/ports/nrf/omv_portconfig.mk @@ -63,9 +63,21 @@ OMV_CFLAGS += -I$(TOP_DIR)/$(LIBPDM_DIR)/ CFLAGS += $(HAL_CFLAGS) $(MPY_CFLAGS) $(OMV_CFLAGS) # Linker Flags -LDFLAGS = -mcpu=$(CPU) -mabi=aapcs-linux -mthumb -mfpu=$(FPU) -mfloat-abi=hard\ - -nostdlib -Wl,--gc-sections -Wl,-T$(BUILD)/$(LDSCRIPT).lds \ - -Wl,--wrap=tud_cdc_rx_cb -Wl,--wrap=mp_hal_stdout_tx_strn +LDFLAGS = -mcpu=$(CPU) \ + -mabi=aapcs-linux \ + -mthumb \ + -mfpu=$(FPU) \ + -mfloat-abi=hard \ + -nostdlib \ + -Wl,--gc-sections \ + -Wl,--print-memory-usage \ + -Wl,--wrap=mp_usbd_task \ + -Wl,--wrap=tud_cdc_rx_cb \ + -Wl,--wrap=mp_hal_stdio_poll \ + -Wl,--wrap=mp_hal_stdout_tx_strn \ + -Wl,--no-warn-rwx-segment \ + -Wl,-Map=$(BUILD)/$(FIRMWARE).map \ + -Wl,-T$(BUILD)/$(LDSCRIPT).lds #------------- Firmware Objects ----------------# FIRM_OBJ += $(wildcard $(BUILD)/$(CMSIS_DIR)/src/dsp/CommonTables/*.o)