feat: added user handles to pick board features.

Including the handling of default values given the capabilities of the board.

also:
- misc bug fixes
- argparse

Author: massonal

CI/update/templates/boards_db.cmake

@@ -6,9 +6,7 @@ set({{pnum}}_VARIANT_PATH "${CMAKE_CURRENT_LIST_DIR}/../variants/{{config.build.
 set({{pnum}}_MAXSIZE {{config.upload.maximum_size}})
 set({{pnum}}_MAXDATASIZE {{config.upload.maximum_data_size}})
 set({{pnum}}_MCU {{config.build.mcu}})
-{% if config._fpconf != "-" %}
-set({{pnum}}_FPCONF {{config._fpconf}})
-{% endif %}
+set({{pnum}}_FPCONF "{{config._fpconf}}")
 add_library({{pnum}} INTERFACE)
 target_compile_options({{pnum}} INTERFACE
   "SHELL:{{config.build.st_extra_flags}}"
@@ -45,4 +43,29 @@ target_link_libraries({{pnum}} INTERFACE
   {{config.build.cmsis_lib_gcc}}
 )
 
+{% for label,subconfig in config.menu.xserial | dictsort %}
+add_library({{pnum}}_serial_{{label}} INTERFACE)
+target_compile_options({{pnum}}_serial_{{label}} INTERFACE
+  "SHELL:{{subconfig.build.xSerial}}"
+)
+{% endfor %}
+{% for label,subconfig in config.menu.usb | dictsort %}
+add_library({{pnum}}_usb_{{label}} INTERFACE)
+target_compile_options({{pnum}}_usb_{{label}} INTERFACE
+  "SHELL:{{subconfig.build.enable_usb}}"
+)
+{% endfor %}
+{% for label,subconfig in config.menu.xusb | dictsort %}
+add_library({{pnum}}_xusb_{{label}} INTERFACE)
+target_compile_options({{pnum}}_xusb_{{label}} INTERFACE
+  "SHELL:{{subconfig.build.usb_speed}}"
+)
+{% endfor %}
+{% for label,subconfig in config.menu.virtio | dictsort %}
+add_library({{pnum}}_virtio_{{label}} INTERFACE)
+target_compile_options({{pnum}}_virtio_{{label}} INTERFACE
+  "SHELL:{{subconfig.build.enable_virtio}}"
+)
+{% endfor %}
+
 {% endfor %}

CMakeLists.txt

@@ -7,13 +7,9 @@ include(ensure_CMSIS)
 project("Arduino_Core_STM32" CXX C ASM)
 
 
-set(FEAT_XSERIAL "GENERIC" CACHE STRING "USART support")
-set(FEAT_USB "NONE" CACHE STRING "USB support")
-set(FEAT_XUSB "FS" CACHE STRING "USB speed")
 set(FEAT_NANOC ON CACHE BOOL "Use nano libc?")
 set(FEAT_FPF OFF CACHE BOOL "nanolibc: enable %f in printf?")
 set(FEAT_FSF OFF CACHE BOOL "nanolibc: enable %f in scanf?")
-set(FEAT_VIRTIO "DISABLED" CACHE STRING "Virtual serial support")
 set(FEAT_TIMER ON CACHE BOOL "Timer support")
 
 set(BUILD_OPT "s" CACHE STRING "Optimization level")
@@ -22,9 +18,6 @@ set(BUILD_LTO OFF CACHE BOOL "Enable Link-Time-Optimisations")
 set(BUILD_RELPATH ON CACHE BOOL "make __FILE__ be relative instead of absolute")
 set(BUILD_NDEBUG ON CACHE BOOL "define the NDEBUG macro?")
 
-set(USB_PID 0)
-set(USB_VID 0)
-
 
 set(BUILD_CORE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cores/arduino")
 set(BUILD_SYSTEM_PATH "${CMAKE_CURRENT_SOURCE_DIR}/system")
@@ -47,67 +40,6 @@ if(${BUILD_NDEBUG})
   add_compile_definitions(base_config INTERFACE NDEBUG)
 endif()
 
-# configuration specifics
-if (${FEAT_XSERIAL} STREQUAL "GENERIC")
-	target_compile_definitions(base_config INTERFACE
-		HAL_UART_MODULE_ENABLED
-	)
-elseif (${FEAT_XSERIAL} STREQUAL "NONE")
-	target_compile_definitions(base_config INTERFACE
-		HAL_UART_MODULE_ENABLED
-		HWSERIAL_NONE
-	)
-elseif (${FEAT_XSERIAL} STREQUAL "DISABLED")
-	# nothing
-else()
-	message(SEND_ERROR "Bad value for FEAT_XSERIAL: got `${FEAT_XSERIAL}`, expected GENERIC, NONE or DISABLED.")
-endif()
-
-# define USB_SPEED
-if (${FEAT_XUSB} STREQUAL "FS")
-	set(USB_SPEED "")
-elseif (${FEAT_XUSB} STREQUAL "HS")
-	set(USB_SPEED "USE_USB_HS")
-elseif (${FEAT_XUSB} STREQUAL "HSFS")
-	set(USB_SPEED "USE_USB_HS;USE_USB_HS_IN_FS")
-else()
-	message(SEND_ERROR "Bad value for FEAT_XUSB: got `${FEAT_XUSB}`, expected FS, HS or HSFS.")
-endif()
-
-# consume USB_SPEED
-if (${FEAT_USB} STREQUAL "NONE")
-	#nothing
-elseif (${FEAT_USB} STREQUAL "CDCGEN")
-	target_compile_definitions(base_config INTERFACE
-		USBCON
-		${USB_SPEED}
-		USBD_VID=${USB_VID}
-		USBD_PID=${USB_PID}
-		HAL_PCD_MODULE_ENABLED
-		USBD_USE_CDC
-	)
-elseif (${FEAT_USB} STREQUAL "CDC")
-	target_compile_definitions(base_config INTERFACE
-		USBCON
-		${USB_SPEED}
-		USBD_VID=${USB_VID}
-		USBD_PID=${USB_PID}
-		HAL_PCD_MODULE_ENABLED
-		USBD_USE_CDC
-		DISABLE_GENERIC_SERIALUSB
-	)
-elseif (${FEAT_USB} STREQUAL "HID")
-	target_compile_definitions(base_config INTERFACE
-		USBCON
-		${USB_SPEED}
-		USBD_VID=${USB_VID}
-		USBD_PID=${USB_PID}
-		HAL_PCD_MODULE_ENABLED
-		USBD_USE_HID_COMPOSITE
-	)
-else()
-	message(SEND_ERROR "Bad value for FEAT_USB: got `${FEAT_USB}`, expected NONE, CDCGEN, CDC or HID.")
-endif()
 
 if (${FEAT_NANOC})
 	target_link_options(base_config INTERFACE
@@ -125,43 +57,6 @@ if (${FEAT_NANOC})
 	endif()
 endif()
 
-if (${FEAT_VIRTIO} STREQUAL "DISABLED")
-	# nothing
-elseif (${FEAT_VIRTIO} STREQUAL "GENERIC")
-	target_compile_definitions(base_config INTERFACE
-		VIRTIOCON
-		NO_ATOMIC_64_SUPPORT
-		METAL_INTERNAL
-		METAL_MAX_DEVICE_REGIONS=2
-		VIRTIO_SLAVE_ONLY
-		VIRTIO_LOG
-	)
-	target_include_directories(base_config INTERFACE
-		${BUILD_SYSTEM_PATH}/Middlewares/OpenAMP
-		${BUILD_SYSTEM_PATH}/Middlewares/OpenAMP/open-amp/lib/include
-		${BUILD_SYSTEM_PATH}/Middlewares/OpenAMP/libmetal/lib/include
-		${BUILD_SYSTEM_PATH}/Middlewares/OpenAMP/virtual_driver
-	)
-elseif (${FEAT_VIRTIO} STREQUAL "ENABLED")
-	target_compile_definitions(base_config INTERFACE
-		VIRTIOCON
-		NO_ATOMIC_64_SUPPORT
-		METAL_INTERNAL
-		METAL_MAX_DEVICE_REGIONS=2
-		VIRTIO_SLAVE_ONLY
-		VIRTIO_LOG
-		DISABLE_GENERIC_SERIALVIRTIO
-	)
-	target_include_directories(base_config INTERFACE
-		${BUILD_SYSTEM_PATH}/Middlewares/OpenAMP
-		${BUILD_SYSTEM_PATH}/Middlewares/OpenAMP/open-amp/lib/include
-		${BUILD_SYSTEM_PATH}/Middlewares/OpenAMP/libmetal/lib/include
-		${BUILD_SYSTEM_PATH}/Middlewares/OpenAMP/virtual_driver
-	)
-else()
-	message(SEND_ERROR "Bad value for FEAT_VIRTIO: got `${FEAT_VIRTIO}`, expected DISABLED, GENERIC or ENABLED.")
-endif()
-
 if (${FEAT_TIMER})
   target_compile_definitions(base_config INTERFACE
     HAL_TIM_MODULE_ENABLE
@@ -241,6 +136,10 @@ target_include_directories(base_config INTERFACE
 	"${CMSIS5_PATH}/CMSIS/DSP/PrivateInclude"
 	"${CMSIS5_PATH}/CMSIS/Core/Include/"
 	"${CMSIS5_PATH}/CMSIS"
+  "${BUILD_SYSTEM_PATH}/Middlewares/OpenAMP"
+  "${BUILD_SYSTEM_PATH}/Middlewares/OpenAMP/open-amp/lib/include"
+  "${BUILD_SYSTEM_PATH}/Middlewares/OpenAMP/libmetal/lib/include"
+  "${BUILD_SYSTEM_PATH}/Middlewares/OpenAMP/virtual_driver"
 
   "${BUILD_LIB_PATH}/SrcWrapper/src"
 )