@@ -101413,16 +101413,12 @@ set(HERON_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32U5xx/U575O(G-
101413101413set(HERON_MAXSIZE 2097152)
101414101414set(HERON_MAXDATASIZE 786432)
101415101415set(HERON_MCU cortex-m33)
101416- set(HERON_FPU_CONF "fpv5-sp-d16")
101417- set(HERON_FPU_ABI "hard")
101418- set(HERON_FPCONF "${HERON_FPU_CONF}-${HERON_FPU_ABI}")
101419- set(HERON_PID 0x0004)
101416+ set(HERON_FPCONF "fpv5-sp-d16-hard")
101420101417add_library(HERON INTERFACE)
101421101418target_compile_options(HERON INTERFACE
101422101419 "SHELL:-DSTM32U575xx"
101423101420 "SHELL:-DCUSTOM_PERIPHERAL_PINS"
101424- "SHELL:"
101425- "SHELL:-mfpu=${HERON_FPU_CONF} -mfloat-abi=${HERON_FPU_ABI}"
101421+ "SHELL:-mfpu=fpv5-sp-d16 -mfloat-abi=hard"
101426101422 -mcpu=${HERON_MCU}
101427101423)
101428101424target_compile_definitions(HERON INTERFACE
@@ -101444,15 +101440,14 @@ target_include_directories(HERON INTERFACE
101444101440target_link_options(HERON INTERFACE
101445101441 "LINKER:--default-script=${HERON_VARIANT_PATH}/ldscript.ld"
101446101442 "LINKER:--defsym=LD_FLASH_OFFSET=0x0"
101447- "LINKER:--defsym=LD_MAX_SIZE=${HERON_MAXSIZE} "
101448- "LINKER:--defsym=LD_MAX_DATA_SIZE=${HERON_MAXDATASIZE} "
101449- "SHELL:-mfpu=${HERON_FPU_CONF} -mfloat-abi=${HERON_FPU_ABI} "
101443+ "LINKER:--defsym=LD_MAX_SIZE=2097152 "
101444+ "LINKER:--defsym=LD_MAX_DATA_SIZE=786432 "
101445+ "SHELL:-mfpu=fpv5-sp-d16 -mfloat-abi=hard "
101450101446 -mcpu=${HERON_MCU}
101451101447)
101452101448
101453101449add_library(HERON_serial_disabled INTERFACE)
101454101450target_compile_options(HERON_serial_disabled INTERFACE
101455- "SHELL:"
101456101451)
101457101452add_library(HERON_serial_generic INTERFACE)
101458101453target_compile_options(HERON_serial_generic INTERFACE
@@ -101464,23 +101459,21 @@ target_compile_options(HERON_serial_none INTERFACE
101464101459)
101465101460add_library(HERON_usb_CDC INTERFACE)
101466101461target_compile_options(HERON_usb_CDC INTERFACE
101467- "SHELL:-DUSBCON -DUSBD_VID=0x30A4 -DUSBD_PID=${HERON_PID} -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB"
101462+ "SHELL:-DUSBCON -DUSBD_VID=0x30A4 -DUSBD_PID=0x0004 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB"
101468101463)
101469101464add_library(HERON_usb_CDCgen INTERFACE)
101470101465target_compile_options(HERON_usb_CDCgen INTERFACE
101471- "SHELL:-DUSBCON -DUSBD_VID=0x30A4 -DUSBD_PID=${HERON_PID} -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC"
101466+ "SHELL:-DUSBCON -DUSBD_VID=0x30A4 -DUSBD_PID=0x0004 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC"
101472101467)
101473101468add_library(HERON_usb_HID INTERFACE)
101474101469target_compile_options(HERON_usb_HID INTERFACE
101475- "SHELL:-DUSBCON -DUSBD_VID=0x30A4 -DUSBD_PID=${HERON_PID} -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_HID_COMPOSITE"
101470+ "SHELL:-DUSBCON -DUSBD_VID=0x30A4 -DUSBD_PID=0x0004 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_HID_COMPOSITE"
101476101471)
101477101472add_library(HERON_usb_none INTERFACE)
101478101473target_compile_options(HERON_usb_none INTERFACE
101479- "SHELL:"
101480101474)
101481101475add_library(HERON_xusb_FS INTERFACE)
101482101476target_compile_options(HERON_xusb_FS INTERFACE
101483- "SHELL:"
101484101477)
101485101478add_library(HERON_xusb_HS INTERFACE)
101486101479target_compile_options(HERON_xusb_HS INTERFACE
@@ -104285,6 +104278,7 @@ set(NUCLEO_F746ZG_FPCONF "fpv5-sp-d16-hard")
104285104278add_library(NUCLEO_F746ZG INTERFACE)
104286104279target_compile_options(NUCLEO_F746ZG INTERFACE
104287104280 "SHELL:-DSTM32F746xx"
104281+ "SHELL:-DCUSTOM_PERIPHERAL_PINS"
104288104282 "SHELL:-mfpu=fpv5-sp-d16 -mfloat-abi=hard"
104289104283 -mcpu=${NUCLEO_F746ZG_MCU}
104290104284)
0 commit comments