Skip to content

Commit 6c0c006

Browse files
fpistmfpistm
committed
fix(cygnet): typo
regenerate cmake files. Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent ced1323 commit 6c0c006

File tree

3 files changed

+88
-88
lines changed

3 files changed

+88
-88
lines changed

‎boards.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -10818,8 +10818,8 @@ Blues.menu.pnum.CYGNET.build.series=STM32L4xx
1081810818
Blues.menu.pnum.CYGNET.build.product_line=STM32L433xx
1081910819
Blues.menu.pnum.CYGNET.build.variant=STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)
1082010820
Blues.menu.pnum.CYGNET.build.peripheral_pins=-DCUSTOM_PERIPHERAL_PINS
10821-
Blues.menu.pnum.CYGNET_L4.build.vid=0x30A4
10822-
Blues.menu.pnum.CYGNET_L4.build.pid=0x0003
10821+
Blues.menu.pnum.CYGNET.build.vid=0x30A4
10822+
Blues.menu.pnum.CYGNET.build.pid=0x0003
1082310823

1082410824
# Upload menu
1082510825
Blues.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)

‎cmake/boards_db.cmake

+85-85
Original file line numberDiff line numberDiff line change
@@ -4166,6 +4166,88 @@ target_link_options(CoreBoard_F401RC_hid INTERFACE
41664166
)
41674167

41684168

4169+
# CYGNET
4170+
# -----------------------------------------------------------------------------
4171+
4172+
set(CYGNET_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)")
4173+
set(CYGNET_MAXSIZE 262144)
4174+
set(CYGNET_MAXDATASIZE 65536)
4175+
set(CYGNET_MCU cortex-m4)
4176+
set(CYGNET_FPCONF "fpv4-sp-d16-hard")
4177+
add_library(CYGNET INTERFACE)
4178+
target_compile_options(CYGNET INTERFACE
4179+
"SHELL:-DSTM32L433xx "
4180+
"SHELL:-DCUSTOM_PERIPHERAL_PINS"
4181+
"SHELL:"
4182+
"SHELL:-mfpu=fpv4-sp-d16 -mfloat-abi=hard"
4183+
-mcpu=${CYGNET_MCU}
4184+
)
4185+
target_compile_definitions(CYGNET INTERFACE
4186+
"STM32L4xx"
4187+
"ARDUINO_CYGNET"
4188+
"BOARD_NAME=\"CYGNET\""
4189+
"BOARD_ID=CYGNET"
4190+
"VARIANT_H=\"variant_CYGNET.h\""
4191+
)
4192+
target_include_directories(CYGNET INTERFACE
4193+
${CMAKE_CURRENT_LIST_DIR}/../system/STM32L4xx
4194+
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32L4xx_HAL_Driver/Inc
4195+
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32L4xx_HAL_Driver/Src
4196+
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/
4197+
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/
4198+
${CYGNET_VARIANT_PATH}
4199+
)
4200+
4201+
target_link_options(CYGNET INTERFACE
4202+
"LINKER:--default-script=${CYGNET_VARIANT_PATH}/ldscript.ld"
4203+
"LINKER:--defsym=LD_FLASH_OFFSET=0x0"
4204+
"LINKER:--defsym=LD_MAX_SIZE=262144"
4205+
"LINKER:--defsym=LD_MAX_DATA_SIZE=65536"
4206+
"SHELL:-mfpu=fpv4-sp-d16 -mfloat-abi=hard"
4207+
-mcpu=${CYGNET_MCU}
4208+
)
4209+
4210+
add_library(CYGNET_serial_disabled INTERFACE)
4211+
target_compile_options(CYGNET_serial_disabled INTERFACE
4212+
"SHELL:"
4213+
)
4214+
add_library(CYGNET_serial_generic INTERFACE)
4215+
target_compile_options(CYGNET_serial_generic INTERFACE
4216+
"SHELL:-DHAL_UART_MODULE_ENABLED"
4217+
)
4218+
add_library(CYGNET_serial_none INTERFACE)
4219+
target_compile_options(CYGNET_serial_none INTERFACE
4220+
"SHELL:-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE"
4221+
)
4222+
add_library(CYGNET_usb_CDC INTERFACE)
4223+
target_compile_options(CYGNET_usb_CDC INTERFACE
4224+
"SHELL:-DUSBCON -DUSBD_VID=0x30A4 -DUSBD_PID=0x0003 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB"
4225+
)
4226+
add_library(CYGNET_usb_CDCgen INTERFACE)
4227+
target_compile_options(CYGNET_usb_CDCgen INTERFACE
4228+
"SHELL:-DUSBCON -DUSBD_VID=0x30A4 -DUSBD_PID=0x0003 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC"
4229+
)
4230+
add_library(CYGNET_usb_HID INTERFACE)
4231+
target_compile_options(CYGNET_usb_HID INTERFACE
4232+
"SHELL:-DUSBCON -DUSBD_VID=0x30A4 -DUSBD_PID=0x0003 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_HID_COMPOSITE"
4233+
)
4234+
add_library(CYGNET_usb_none INTERFACE)
4235+
target_compile_options(CYGNET_usb_none INTERFACE
4236+
"SHELL:"
4237+
)
4238+
add_library(CYGNET_xusb_FS INTERFACE)
4239+
target_compile_options(CYGNET_xusb_FS INTERFACE
4240+
"SHELL:"
4241+
)
4242+
add_library(CYGNET_xusb_HS INTERFACE)
4243+
target_compile_options(CYGNET_xusb_HS INTERFACE
4244+
"SHELL:-DUSE_USB_HS"
4245+
)
4246+
add_library(CYGNET_xusb_HSFS INTERFACE)
4247+
target_compile_options(CYGNET_xusb_HSFS INTERFACE
4248+
"SHELL:-DUSE_USB_HS -DUSE_USB_HS_IN_FS"
4249+
)
4250+
41694251
# DAISY_PATCH_SM
41704252
# -----------------------------------------------------------------------------
41714253

@@ -106755,15 +106837,15 @@ target_compile_options(SWAN_R5_serial_none INTERFACE
106755106837
)
106756106838
add_library(SWAN_R5_usb_CDC INTERFACE)
106757106839
target_compile_options(SWAN_R5_usb_CDC INTERFACE
106758-
"SHELL:-DUSBCON -DUSBD_VID=0 -DUSBD_PID=-1 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB"
106840+
"SHELL:-DUSBCON -DUSBD_VID=0x30A4 -DUSBD_PID=0x0002 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB"
106759106841
)
106760106842
add_library(SWAN_R5_usb_CDCgen INTERFACE)
106761106843
target_compile_options(SWAN_R5_usb_CDCgen INTERFACE
106762-
"SHELL:-DUSBCON -DUSBD_VID=0 -DUSBD_PID=-1 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC"
106844+
"SHELL:-DUSBCON -DUSBD_VID=0x30A4 -DUSBD_PID=0x0002 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC"
106763106845
)
106764106846
add_library(SWAN_R5_usb_HID INTERFACE)
106765106847
target_compile_options(SWAN_R5_usb_HID INTERFACE
106766-
"SHELL:-DUSBCON -DUSBD_VID=0 -DUSBD_PID=-1 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_HID_COMPOSITE"
106848+
"SHELL:-DUSBCON -DUSBD_VID=0x30A4 -DUSBD_PID=0x0002 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_HID_COMPOSITE"
106767106849
)
106768106850
add_library(SWAN_R5_usb_none INTERFACE)
106769106851
target_compile_options(SWAN_R5_usb_none INTERFACE
@@ -106782,88 +106864,6 @@ target_compile_options(SWAN_R5_xusb_HSFS INTERFACE
106782106864
"SHELL:-DUSE_USB_HS -DUSE_USB_HS_IN_FS"
106783106865
)
106784106866

106785-
# CYGNET
106786-
# -----------------------------------------------------------------------------
106787-
106788-
set(CYGNET_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)")
106789-
set(CYGNET_MAXSIZE 262144)
106790-
set(CYGNET_MAXDATASIZE 65536)
106791-
set(CYGNET_MCU cortex-m4)
106792-
set(CYGNET_FPCONF "fpv4-sp-d16-hard")
106793-
add_library(CYGNET INTERFACE)
106794-
target_compile_options(CYGNET INTERFACE
106795-
"SHELL:-DSTM32L4xx "
106796-
"SHELL:-DCUSTOM_PERIPHERAL_PINS"
106797-
"SHELL:"
106798-
"SHELL:-mfpu=fpv4-sp-d16 -mfloat-abi=hard"
106799-
-mcpu=${CYGNET_MCU}
106800-
)
106801-
target_compile_definitions(CYGNET INTERFACE
106802-
"STM32L4xx"
106803-
"ARDUINO_CYGNET"
106804-
"BOARD_NAME=\"CYGNET\""
106805-
"BOARD_ID=CYGNET"
106806-
"VARIANT_H=\"variant_CYGNET.h\""
106807-
)
106808-
target_include_directories(CYGNET INTERFACE
106809-
${CMAKE_CURRENT_LIST_DIR}/../system/STM32L4xx
106810-
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32L4xx_HAL_Driver/Inc
106811-
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/STM32L4xx_HAL_Driver/Src
106812-
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/
106813-
${CMAKE_CURRENT_LIST_DIR}/../system/Drivers/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/
106814-
${CYGNET_VARIANT_PATH}
106815-
)
106816-
106817-
target_link_options(CYGNET INTERFACE
106818-
"LINKER:--default-script=${CYGNET_VARIANT_PATH}/ldscript.ld"
106819-
"LINKER:--defsym=LD_FLASH_OFFSET=0x0"
106820-
"LINKER:--defsym=LD_MAX_SIZE=262144"
106821-
"LINKER:--defsym=LD_MAX_DATA_SIZE=65536"
106822-
"SHELL:-mfpu=fpv4-sp-d16 -mfloat-abi=hard"
106823-
-mcpu=${CYGNET_MCU}
106824-
)
106825-
106826-
add_library(CYGNET_serial_disabled INTERFACE)
106827-
target_compile_options(CYGNET_serial_disabled INTERFACE
106828-
"SHELL:"
106829-
)
106830-
add_library(CYGNET_serial_generic INTERFACE)
106831-
target_compile_options(CYGNET_serial_generic INTERFACE
106832-
"SHELL:-DHAL_UART_MODULE_ENABLED"
106833-
)
106834-
add_library(CYGNET_serial_none INTERFACE)
106835-
target_compile_options(CYGNET_serial_none INTERFACE
106836-
"SHELL:-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE"
106837-
)
106838-
add_library(CYGNET_usb_CDC INTERFACE)
106839-
target_compile_options(CYGNET_usb_CDC INTERFACE
106840-
"SHELL:-DUSBCON -DUSBD_VID=0 -DUSBD_PID=-1 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC -DDISABLE_GENERIC_SERIALUSB"
106841-
)
106842-
add_library(CYGNET_usb_CDCgen INTERFACE)
106843-
target_compile_options(CYGNET_usb_CDCgen INTERFACE
106844-
"SHELL:-DUSBCON -DUSBD_VID=0 -DUSBD_PID=-1 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_CDC"
106845-
)
106846-
add_library(CYGNET_usb_HID INTERFACE)
106847-
target_compile_options(CYGNET_usb_HID INTERFACE
106848-
"SHELL:-DUSBCON -DUSBD_VID=0 -DUSBD_PID=-1 -DHAL_PCD_MODULE_ENABLED -DUSBD_USE_HID_COMPOSITE"
106849-
)
106850-
add_library(CYGNET_usb_none INTERFACE)
106851-
target_compile_options(CYGNET_usb_none INTERFACE
106852-
"SHELL:"
106853-
)
106854-
add_library(CYGNET_xusb_FS INTERFACE)
106855-
target_compile_options(CYGNET_xusb_FS INTERFACE
106856-
"SHELL:"
106857-
)
106858-
add_library(CYGNET_xusb_HS INTERFACE)
106859-
target_compile_options(CYGNET_xusb_HS INTERFACE
106860-
"SHELL:-DUSE_USB_HS"
106861-
)
106862-
add_library(CYGNET_xusb_HSFS INTERFACE)
106863-
target_compile_options(CYGNET_xusb_HSFS INTERFACE
106864-
"SHELL:-DUSE_USB_HS -DUSE_USB_HS_IN_FS"
106865-
)
106866-
106867106867
# THUNDERPACK_F411
106868106868
# -----------------------------------------------------------------------------
106869106869

‎variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ add_library(variant_bin STATIC EXCLUDE_FROM_ALL
2222
generic_clock.c
2323
PeripheralPins.c
2424
PeripheralPins_CYGNET.c
25-
variant_generic.cpp
2625
variant_CYGNET.cpp
26+
variant_generic.cpp
2727
)
2828
target_link_libraries(variant_bin PUBLIC variant_usage)
2929

0 commit comments

Comments
 (0)