Skip to content

Commit d6344ec

Browse files
fpistmfpistm
authored
Merge pull request #3003 from fpistm/variants_update
chore(variants): update against CubeMX DB release 6.0.180
2 parents 2e3c1a6 + 6c82402 commit d6344ec

904 files changed

Lines changed: 27314 additions & 1040 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cmake/boards_db.cmake‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -101413,16 +101413,12 @@ set(HERON_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32U5xx/U575O(G-
101413101413
set(HERON_MAXSIZE 2097152)
101414101414
set(HERON_MAXDATASIZE 786432)
101415101415
set(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")
101420101417
add_library(HERON INTERFACE)
101421101418
target_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
)
101428101424
target_compile_definitions(HERON INTERFACE
@@ -101444,15 +101440,14 @@ target_include_directories(HERON INTERFACE
101444101440
target_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

101453101449
add_library(HERON_serial_disabled INTERFACE)
101454101450
target_compile_options(HERON_serial_disabled INTERFACE
101455-
"SHELL:"
101456101451
)
101457101452
add_library(HERON_serial_generic INTERFACE)
101458101453
target_compile_options(HERON_serial_generic INTERFACE
@@ -101464,23 +101459,21 @@ target_compile_options(HERON_serial_none INTERFACE
101464101459
)
101465101460
add_library(HERON_usb_CDC INTERFACE)
101466101461
target_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
)
101469101464
add_library(HERON_usb_CDCgen INTERFACE)
101470101465
target_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
)
101473101468
add_library(HERON_usb_HID INTERFACE)
101474101469
target_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
)
101477101472
add_library(HERON_usb_none INTERFACE)
101478101473
target_compile_options(HERON_usb_none INTERFACE
101479-
"SHELL:"
101480101474
)
101481101475
add_library(HERON_xusb_FS INTERFACE)
101482101476
target_compile_options(HERON_xusb_FS INTERFACE
101483-
"SHELL:"
101484101477
)
101485101478
add_library(HERON_xusb_HS INTERFACE)
101486101479
target_compile_options(HERON_xusb_HS INTERFACE
@@ -104285,6 +104278,7 @@ set(NUCLEO_F746ZG_FPCONF "fpv5-sp-d16-hard")
104285104278
add_library(NUCLEO_F746ZG INTERFACE)
104286104279
target_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
)

‎libraries/I3C/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ target_link_libraries(I3C INTERFACE
2828
I3C_bin
2929
$<TARGET_OBJECTS:I3C_bin>
3030
)
31+

‎variants/STM32C0xx/C011D6Y_C011F(4-6)(P-U)/PeripheralPins.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
/*
1414
* Automatically generated from STM32C011D6Yx.xml, STM32C011F(4-6)Px.xml
1515
* STM32C011F(4-6)Ux.xml
16-
* CubeMX DB release 6.0.170
16+
* CubeMX DB release 6.0.180
1717
*/
1818
#if !defined(CUSTOM_PERIPHERAL_PINS)
1919
#include "Arduino.h"

‎variants/STM32C0xx/C011J(4-6)M/PeripheralPins.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
/*
1414
* Automatically generated from STM32C011J(4-6)Mx.xml
15-
* CubeMX DB release 6.0.170
15+
* CubeMX DB release 6.0.180
1616
*/
1717
#if !defined(CUSTOM_PERIPHERAL_PINS)
1818
#include "Arduino.h"

‎variants/STM32C0xx/C031C(4-6)(T-U)/PeripheralPins.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
/*
1414
* Automatically generated from STM32C031C(4-6)Tx.xml, STM32C031C(4-6)Ux.xml
15-
* CubeMX DB release 6.0.170
15+
* CubeMX DB release 6.0.180
1616
*/
1717
#if !defined(CUSTOM_PERIPHERAL_PINS)
1818
#include "Arduino.h"

‎variants/STM32C0xx/C031F(4-6)P/PeripheralPins.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
/*
1414
* Automatically generated from STM32C031F(4-6)Px.xml
15-
* CubeMX DB release 6.0.170
15+
* CubeMX DB release 6.0.180
1616
*/
1717
#if !defined(CUSTOM_PERIPHERAL_PINS)
1818
#include "Arduino.h"

‎variants/STM32C0xx/C031G(4-6)U/PeripheralPins.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
/*
1414
* Automatically generated from STM32C031G(4-6)Ux.xml
15-
* CubeMX DB release 6.0.170
15+
* CubeMX DB release 6.0.180
1616
*/
1717
#if !defined(CUSTOM_PERIPHERAL_PINS)
1818
#include "Arduino.h"

‎variants/STM32C0xx/C031K(4-6)(T-U)/PeripheralPins.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
/*
1414
* Automatically generated from STM32C031K(4-6)Tx.xml, STM32C031K(4-6)Ux.xml
15-
* CubeMX DB release 6.0.170
15+
* CubeMX DB release 6.0.180
1616
*/
1717
#if !defined(CUSTOM_PERIPHERAL_PINS)
1818
#include "Arduino.h"

‎variants/STM32C0xx/C051C(6-8)(T-U)/PeripheralPins.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
/*
1414
* Automatically generated from STM32C051C6Tx.xml, STM32C051C6Ux.xml
1515
* STM32C051C8Tx.xml, STM32C051C8Ux.xml
16-
* CubeMX DB release 6.0.170
16+
* CubeMX DB release 6.0.180
1717
*/
1818
#if !defined(CUSTOM_PERIPHERAL_PINS)
1919
#include "Arduino.h"

‎variants/STM32C0xx/C051D8Y_C051F(6-8)P/PeripheralPins.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
/*
1414
* Automatically generated from STM32C051D8Yx.xml, STM32C051F6Px.xml
1515
* STM32C051F8Px.xml
16-
* CubeMX DB release 6.0.170
16+
* CubeMX DB release 6.0.180
1717
*/
1818
#if !defined(CUSTOM_PERIPHERAL_PINS)
1919
#include "Arduino.h"

0 commit comments

Comments
 (0)