@@ -104807,16 +104807,13 @@ set(HERON_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32U5xx/U575O(G-
104807104807set(HERON_MAXSIZE 2097152)
104808104808set(HERON_MAXDATASIZE 786432)
104809104809set(HERON_MCU cortex-m33)
104810- set(HERON_FPU_CONF "fpv5-sp-d16")
104811- set(HERON_FPU_ABI "hard")
104812- set(HERON_FPCONF "${HERON_FPU_CONF}-${HERON_FPU_ABI}")
104813- set(HERON_PID 0x0004)
104810+ set(HERON_FPCONF "fpv5-sp-d16-hard")
104814104811add_library(HERON INTERFACE)
104815104812target_compile_options(HERON INTERFACE
104813+ "SHELL:-DUSE_HAL_DRIVER -DUSE_FULL_LL_DRIVER"
104816104814 "SHELL:-DSTM32U575xx"
104817104815 "SHELL:-DCUSTOM_PERIPHERAL_PINS"
104818- "SHELL:"
104819- "SHELL:-mfpu=${HERON_FPU_CONF} -mfloat-abi=${HERON_FPU_ABI}"
104816+ "SHELL:-mfpu=fpv5-sp-d16 -mfloat-abi=hard"
104820104817 -mcpu=${HERON_MCU}
104821104818)
104822104819target_compile_definitions(HERON INTERFACE
@@ -104831,22 +104828,22 @@ target_include_directories(HERON INTERFACE
104831104828 ${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32U5xx_HAL_Driver/Inc
104832104829 ${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32U5xx_HAL_Driver/Src
104833104830 ${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32U5xx/Include/
104831+ ${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32U5xx/Source/
104834104832 ${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32U5xx/Source/Templates/gcc/
104835104833 ${HERON_VARIANT_PATH}
104836104834)
104837104835
104838104836target_link_options(HERON INTERFACE
104839104837 "LINKER:--default-script=${HERON_VARIANT_PATH}/ldscript.ld"
104840104838 "LINKER:--defsym=LD_FLASH_OFFSET=0x0"
104841- "LINKER:--defsym=LD_MAX_SIZE=${HERON_MAXSIZE} "
104842- "LINKER:--defsym=LD_MAX_DATA_SIZE=${HERON_MAXDATASIZE} "
104843- "SHELL:-mfpu=${HERON_FPU_CONF} -mfloat-abi=${HERON_FPU_ABI} "
104839+ "LINKER:--defsym=LD_MAX_SIZE=2097152 "
104840+ "LINKER:--defsym=LD_MAX_DATA_SIZE=786432 "
104841+ "SHELL:-mfpu=fpv5-sp-d16 -mfloat-abi=hard "
104844104842 -mcpu=${HERON_MCU}
104845104843)
104846104844
104847104845add_library(HERON_serial_disabled INTERFACE)
104848104846target_compile_options(HERON_serial_disabled INTERFACE
104849- "SHELL:"
104850104847)
104851104848add_library(HERON_serial_generic INTERFACE)
104852104849target_compile_options(HERON_serial_generic INTERFACE
@@ -104858,23 +104855,21 @@ target_compile_options(HERON_serial_none INTERFACE
104858104855)
104859104856add_library(HERON_usb_CDC INTERFACE)
104860104857target_compile_options(HERON_usb_CDC INTERFACE
104861- "SHELL:-DUSBCON -DUSBD_VID=0x30A4 -DUSBD_PID=${HERON_PID} -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB"
104858+ "SHELL:-DUSBCON -DUSBD_VID=0x30A4 -DUSBD_PID=0x0004 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB"
104862104859)
104863104860add_library(HERON_usb_CDCgen INTERFACE)
104864104861target_compile_options(HERON_usb_CDCgen INTERFACE
104865- "SHELL:-DUSBCON -DUSBD_VID=0x30A4 -DUSBD_PID=${HERON_PID} -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC"
104862+ "SHELL:-DUSBCON -DUSBD_VID=0x30A4 -DUSBD_PID=0x0004 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC"
104866104863)
104867104864add_library(HERON_usb_HID INTERFACE)
104868104865target_compile_options(HERON_usb_HID INTERFACE
104869- "SHELL:-DUSBCON -DUSBD_VID=0x30A4 -DUSBD_PID=${HERON_PID} -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_HID_COMPOSITE"
104866+ "SHELL:-DUSBCON -DUSBD_VID=0x30A4 -DUSBD_PID=0x0004 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_HID_COMPOSITE"
104870104867)
104871104868add_library(HERON_usb_none INTERFACE)
104872104869target_compile_options(HERON_usb_none INTERFACE
104873- "SHELL:"
104874104870)
104875104871add_library(HERON_xusb_FS INTERFACE)
104876104872target_compile_options(HERON_xusb_FS INTERFACE
104877- "SHELL:"
104878104873)
104879104874add_library(HERON_xusb_HS INTERFACE)
104880104875target_compile_options(HERON_xusb_HS INTERFACE
0 commit comments