Skip to content

Commit 6c82402

Browse files
committed
chore(cmake): update database
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent b088d6b commit 6c82402

32 files changed

Lines changed: 910 additions & 15 deletions

File tree

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/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ add_library(variant_bin STATIC EXCLUDE_FROM_ALL
2222
generic_clock.c
2323
PeripheralPins.c
2424
PeripheralPins_ETHERCAT_DUINO.c
25+
PeripheralPins_F7x6ZG.c
2526
variant_ETHERCAT_DUINO.cpp
2627
variant_generic.cpp
2728
variant_NUCLEO_F7x6ZG.cpp
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# v3.21 implemented semantic changes regarding $<TARGET_OBJECTS:...>
2+
# See https://cmake.org/cmake/help/v3.21/command/target_link_libraries.html#linking-object-libraries-via-target-objects
3+
cmake_minimum_required(VERSION 3.21)
4+
5+
add_library(variant INTERFACE)
6+
add_library(variant_usage INTERFACE)
7+
8+
target_include_directories(variant_usage INTERFACE
9+
.
10+
)
11+
12+
13+
target_link_libraries(variant_usage INTERFACE
14+
base_config
15+
)
16+
17+
target_link_libraries(variant INTERFACE variant_usage)
18+
19+
20+
21+
add_library(variant_bin STATIC EXCLUDE_FROM_ALL
22+
generic_clock.c
23+
PeripheralPins.c
24+
variant_generic.cpp
25+
)
26+
target_link_libraries(variant_bin PUBLIC variant_usage)
27+
28+
target_link_libraries(variant INTERFACE
29+
variant_bin
30+
)
31+
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# v3.21 implemented semantic changes regarding $<TARGET_OBJECTS:...>
2+
# See https://cmake.org/cmake/help/v3.21/command/target_link_libraries.html#linking-object-libraries-via-target-objects
3+
cmake_minimum_required(VERSION 3.21)
4+
5+
add_library(variant INTERFACE)
6+
add_library(variant_usage INTERFACE)
7+
8+
target_include_directories(variant_usage INTERFACE
9+
.
10+
)
11+
12+
13+
target_link_libraries(variant_usage INTERFACE
14+
base_config
15+
)
16+
17+
target_link_libraries(variant INTERFACE variant_usage)
18+
19+
20+
21+
add_library(variant_bin STATIC EXCLUDE_FROM_ALL
22+
generic_clock.c
23+
PeripheralPins.c
24+
variant_generic.cpp
25+
)
26+
target_link_libraries(variant_bin PUBLIC variant_usage)
27+
28+
target_link_libraries(variant INTERFACE
29+
variant_bin
30+
)
31+
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# v3.21 implemented semantic changes regarding $<TARGET_OBJECTS:...>
2+
# See https://cmake.org/cmake/help/v3.21/command/target_link_libraries.html#linking-object-libraries-via-target-objects
3+
cmake_minimum_required(VERSION 3.21)
4+
5+
add_library(variant INTERFACE)
6+
add_library(variant_usage INTERFACE)
7+
8+
target_include_directories(variant_usage INTERFACE
9+
.
10+
)
11+
12+
13+
target_link_libraries(variant_usage INTERFACE
14+
base_config
15+
)
16+
17+
target_link_libraries(variant INTERFACE variant_usage)
18+
19+
20+
21+
add_library(variant_bin STATIC EXCLUDE_FROM_ALL
22+
generic_clock.c
23+
PeripheralPins.c
24+
variant_generic.cpp
25+
)
26+
target_link_libraries(variant_bin PUBLIC variant_usage)
27+
28+
target_link_libraries(variant INTERFACE
29+
variant_bin
30+
)
31+
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# v3.21 implemented semantic changes regarding $<TARGET_OBJECTS:...>
2+
# See https://cmake.org/cmake/help/v3.21/command/target_link_libraries.html#linking-object-libraries-via-target-objects
3+
cmake_minimum_required(VERSION 3.21)
4+
5+
add_library(variant INTERFACE)
6+
add_library(variant_usage INTERFACE)
7+
8+
target_include_directories(variant_usage INTERFACE
9+
.
10+
)
11+
12+
13+
target_link_libraries(variant_usage INTERFACE
14+
base_config
15+
)
16+
17+
target_link_libraries(variant INTERFACE variant_usage)
18+
19+
20+
21+
add_library(variant_bin STATIC EXCLUDE_FROM_ALL
22+
generic_clock.c
23+
PeripheralPins.c
24+
variant_generic.cpp
25+
)
26+
target_link_libraries(variant_bin PUBLIC variant_usage)
27+
28+
target_link_libraries(variant INTERFACE
29+
variant_bin
30+
)
31+
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# v3.21 implemented semantic changes regarding $<TARGET_OBJECTS:...>
2+
# See https://cmake.org/cmake/help/v3.21/command/target_link_libraries.html#linking-object-libraries-via-target-objects
3+
cmake_minimum_required(VERSION 3.21)
4+
5+
add_library(variant INTERFACE)
6+
add_library(variant_usage INTERFACE)
7+
8+
target_include_directories(variant_usage INTERFACE
9+
.
10+
)
11+
12+
13+
target_link_libraries(variant_usage INTERFACE
14+
base_config
15+
)
16+
17+
target_link_libraries(variant INTERFACE variant_usage)
18+
19+
20+
21+
add_library(variant_bin STATIC EXCLUDE_FROM_ALL
22+
generic_clock.c
23+
PeripheralPins.c
24+
variant_generic.cpp
25+
)
26+
target_link_libraries(variant_bin PUBLIC variant_usage)
27+
28+
target_link_libraries(variant INTERFACE
29+
variant_bin
30+
)
31+
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# v3.21 implemented semantic changes regarding $<TARGET_OBJECTS:...>
2+
# See https://cmake.org/cmake/help/v3.21/command/target_link_libraries.html#linking-object-libraries-via-target-objects
3+
cmake_minimum_required(VERSION 3.21)
4+
5+
add_library(variant INTERFACE)
6+
add_library(variant_usage INTERFACE)
7+
8+
target_include_directories(variant_usage INTERFACE
9+
.
10+
)
11+
12+
13+
target_link_libraries(variant_usage INTERFACE
14+
base_config
15+
)
16+
17+
target_link_libraries(variant INTERFACE variant_usage)
18+
19+
20+
21+
add_library(variant_bin STATIC EXCLUDE_FROM_ALL
22+
generic_clock.c
23+
PeripheralPins.c
24+
variant_generic.cpp
25+
)
26+
target_link_libraries(variant_bin PUBLIC variant_usage)
27+
28+
target_link_libraries(variant INTERFACE
29+
variant_bin
30+
)
31+
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# v3.21 implemented semantic changes regarding $<TARGET_OBJECTS:...>
2+
# See https://cmake.org/cmake/help/v3.21/command/target_link_libraries.html#linking-object-libraries-via-target-objects
3+
cmake_minimum_required(VERSION 3.21)
4+
5+
add_library(variant INTERFACE)
6+
add_library(variant_usage INTERFACE)
7+
8+
target_include_directories(variant_usage INTERFACE
9+
.
10+
)
11+
12+
13+
target_link_libraries(variant_usage INTERFACE
14+
base_config
15+
)
16+
17+
target_link_libraries(variant INTERFACE variant_usage)
18+
19+
20+
21+
add_library(variant_bin STATIC EXCLUDE_FROM_ALL
22+
generic_clock.c
23+
PeripheralPins.c
24+
variant_generic.cpp
25+
)
26+
target_link_libraries(variant_bin PUBLIC variant_usage)
27+
28+
target_link_libraries(variant INTERFACE
29+
variant_bin
30+
)
31+

0 commit comments

Comments
 (0)