summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTinic Uro <[email protected]>2024-06-12 08:33:10 -0700
committerTinic Uro <[email protected]>2024-06-12 08:33:10 -0700
commitbc576e7cee64fedfa977604f8e9e4043b3473ece (patch)
tree4caf73acc4068e64e79821a79b183a99b5c40480
parent6a1dc2507955901ae7d1774cc9ba69230c43485a (diff)
Make it work.
-rw-r--r--hw/bsp/stm32u5/boards/stm32u545nucleo/board.mk1
-rw-r--r--hw/bsp/stm32u5/boards/stm32u575eval/board.mk1
-rw-r--r--hw/bsp/stm32u5/family.mk2
-rw-r--r--src/common/tusb_mcu.h2
4 files changed, 4 insertions, 2 deletions
diff --git a/hw/bsp/stm32u5/boards/stm32u545nucleo/board.mk b/hw/bsp/stm32u5/boards/stm32u545nucleo/board.mk
index 66cba0c2b..072c595fb 100644
--- a/hw/bsp/stm32u5/boards/stm32u545nucleo/board.mk
+++ b/hw/bsp/stm32u5/boards/stm32u545nucleo/board.mk
@@ -6,5 +6,6 @@ LD_FILE = ${FAMILY_PATH}/linker/STM32U545xx_FLASH.ld
SRC_S += $(ST_CMSIS)/Source/Templates/gcc/startup_stm32u545xx.s
+MCU_VARIANT = stm32u545xx
# For flash-jlink target
JLINK_DEVICE = stm32u545re
diff --git a/hw/bsp/stm32u5/boards/stm32u575eval/board.mk b/hw/bsp/stm32u5/boards/stm32u575eval/board.mk
index 922d67f83..fee56f2ba 100644
--- a/hw/bsp/stm32u5/boards/stm32u575eval/board.mk
+++ b/hw/bsp/stm32u5/boards/stm32u575eval/board.mk
@@ -6,5 +6,6 @@ LD_FILE = ${FAMILY_PATH}/linker/STM32U575xx_FLASH.ld
SRC_S += $(ST_CMSIS)/Source/Templates/gcc/startup_stm32u575xx.s
+MCU_VARIANT = stm32u575xx
# For flash-jlink target
JLINK_DEVICE = stm32u575ai
diff --git a/hw/bsp/stm32u5/family.mk b/hw/bsp/stm32u5/family.mk
index 45f9aa33e..9ab8992a8 100644
--- a/hw/bsp/stm32u5/family.mk
+++ b/hw/bsp/stm32u5/family.mk
@@ -41,7 +41,7 @@ SRC_C += \
ifeq ($(MCU_VARIANT),stm32u545xx)
SRC_C += \
src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c
-else ($(MCU_VARIANT),stm32u535xx)
+else ifeq ($(MCU_VARIANT),stm32u535xx)
SRC_C += \
src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c
else
diff --git a/src/common/tusb_mcu.h b/src/common/tusb_mcu.h
index 0f4fca8d1..4b802138b 100644
--- a/src/common/tusb_mcu.h
+++ b/src/common/tusb_mcu.h
@@ -271,7 +271,7 @@
#define TUP_DCD_ENDPOINT_MAX 8
#elif TU_CHECK_MCU(OPT_MCU_STM32U5)
- #ifdef USB_DRD_FS
+ #if defined (STM32U535xx) || defined (STM32U545xx)
#define TUP_USBIP_FSDEV
#define TUP_USBIP_FSDEV_STM32
#define TUP_DCD_ENDPOINT_MAX 8