resolve linker error

blues · Nov 6, 2024 · fe12f2b · fe12f2b
1 parent ebbc431
commit fe12f2b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/ports/stm/Makefile b/ports/stm/Makefile
@@ -165,7 +165,7 @@ endif
 
 # Need this to avoid UART linker problems. TODO: rewrite to use registered callbacks.
 # Does not exist for F4 and lower
-ifeq ($(MCU_VARIANT),$(filter $(MCU_VARIANT),STM32F765xx STM32F767xx STM32F769xx STM32H743xx STM32L4R5xx))
+ifeq ($(MCU_VARIANT),$(filter $(MCU_VARIANT),STM32F765xx STM32F767xx STM32F769xx STM32H743xx STM32L4R5xx STM32L433xx))
 	SRC_STM32 += $(HAL_DIR)/Src/stm32$(MCU_SERIES_LOWER)xx_hal_uart_ex.c
 endif
 

diff --git a/ports/stm/boards/cygnet/mpconfigboard.mk b/ports/stm/boards/cygnet/mpconfigboard.mk
@@ -19,6 +19,8 @@ INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
 
+USB_NUM_ENDPOINT_PAIRS = 0
+
 CIRCUITPY_ALARM = 0
 CIRCUITPY_ANALOGIO = 1
 CIRCUITPY_AUDIOBUSIO = 0

diff --git a/ports/stm/mpconfigport.mk b/ports/stm/mpconfigport.mk
@@ -80,11 +80,14 @@ ifeq ($(MCU_SERIES),L4)
         CIRCUITPY_NVM ?= 0
         CIRCUITPY_ROTARYIO ?= 0
         CIRCUITPY_RTC ?= 1
+        UF2_FAMILY_ID ?= 0x00ff6919
+endif
+
+ifeq ($(MCU_VARIANT),STM32L4R5xx)
         # todo - this varies between devices in the series
         # This slide deck https://www.st.com/content/ccc/resource/training/technical/product_training/98/89/c8/6c/3e/e9/49/79/STM32L4_Peripheral_USB.pdf/files/STM32L4_Peripheral_USB.pdf/jcr:content/translations/en.STM32L4_Peripheral_USB.pdf
         # cites 16 endpoints, 8 endpoint pairs, while section 3.39 of the L4R5 datasheet states 6 endpoint pairs.
         USB_NUM_ENDPOINT_PAIRS = 6
-        UF2_FAMILY_ID ?= 0x00ff6919
 endif
 
 CIRCUITPY_PARALLELDISPLAYBUS := 0