Skip to content

Commit 6c86d69

Browse files
committed
[VirtIO] Add VirtIO build config in boards.txt and platform.txt
1 parent ef24463 commit 6c86d69

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

boards.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
menu.pnum=Board part number
44

5+
menu.virtio=Virtual serial support
56
menu.xserial=U(S)ART support
67
menu.usb=USB support (if available)
78
menu.xusb=USB speed (if available)
@@ -675,7 +676,7 @@ STM32MP1.build.mcu=cortex-m4
675676
STM32MP1.build.flags.fp=-mfpu=fpv4-sp-d16 -mfloat-abi=hard
676677
STM32MP1.build.series=STM32MP1xx
677678
STM32MP1.build.cmsis_lib_gcc=arm_cortexM4l_math
678-
STM32MP1.build.extra_flags=-DCORE_CM4 -DUSE_FULL_LL_DRIVER -D{build.product_line} {build.xSerial}
679+
STM32MP1.build.extra_flags=-DCORE_CM4 -DUSE_FULL_LL_DRIVER -D{build.product_line} {build.enable_virtio} {build.xSerial}
679680

680681
# STM32MP157A-DK1 board
681682
STM32MP1.menu.pnum.STM32MP157A_DK1=STM32MP157A-DK1
@@ -1485,6 +1486,13 @@ Eval.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
14851486
Eval.menu.xserial.disabled=Disabled (no Serial support)
14861487
Eval.menu.xserial.disabled.build.xSerial=
14871488

1489+
STM32MP1.menu.virtio.generic=/dev/ttyRPMSG0 => 'Serial' supersede U(S)ART
1490+
STM32MP1.menu.virtio.generic.build.enable_virtio={build.virtio_flags}
1491+
STM32MP1.menu.virtio.none=/dev/ttyRPMSG0 => SerialVirtIO
1492+
STM32MP1.menu.virtio.none.build.enable_virtio={build.virtio_flags} -DDISABLE_GENERIC_SERIALVIRTIO
1493+
STM32MP1.menu.virtio.disable=Disabled (no /dev/ttyRPMSG0 available)
1494+
STM32MP1.menu.virtio.disable.build.enable_virtio=
1495+
14881496
STM32MP1.menu.xserial.generic=UART only (generic 'Serial')
14891497
STM32MP1.menu.xserial.generic.build.xSerial=-DHAL_UART_MODULE_ENABLED
14901498
STM32MP1.menu.xserial.none=UART only (no generic 'Serial')

platform.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ version=1.0.0
99

1010
# STM compile variables
1111
# ----------------------
12-
compiler.stm.extra_include="-I{build.source.path}" "-I{build.core.path}/avr" "-I{build.core.path}/stm32" "-I{build.core.path}/stm32/LL" "-I{build.core.path}/stm32/usb" "-I{build.core.path}/stm32/usb/hid" "-I{build.core.path}/stm32/usb/cdc" "-I{build.system.path}/Drivers/{build.series}_HAL_Driver/Inc" "-I{build.system.path}/Drivers/{build.series}_HAL_Driver/Src" "-I{build.system.path}/{build.series}" "-I{build.system.path}/Middlewares/ST/STM32_USB_Device_Library/Core/Inc" "-I{build.system.path}/Middlewares/ST/STM32_USB_Device_Library/Core/Src"
12+
compiler.stm.extra_include="-I{build.source.path}" "-I{build.core.path}/avr" "-I{build.core.path}/stm32" "-I{build.core.path}/stm32/LL" "-I{build.core.path}/stm32/usb" "-I{build.core.path}/stm32/virtio" "-I{build.core.path}/stm32/usb/hid" "-I{build.core.path}/stm32/usb/cdc" "-I{build.system.path}/Drivers/{build.series}_HAL_Driver/Inc" "-I{build.system.path}/Drivers/{build.series}_HAL_Driver/Src" "-I{build.system.path}/{build.series}" "-I{build.system.path}/Middlewares/ST/STM32_USB_Device_Library/Core/Inc" "-I{build.system.path}/Middlewares/ST/STM32_USB_Device_Library/Core/Src" {build.virtio_extra_include}
1313

1414
compiler.warning_flags=-w
1515
compiler.warning_flags.none=-w
@@ -75,13 +75,18 @@ build.usb_flags=-DUSBCON {build.usb_speed} -DUSBD_VID={build.vid} '-DUSB_MANUFAC
7575
# numeric vendor ID if available or by board's specific value.
7676
build.usb_manufacturer="Unknown"
7777

78+
# VirtIO RPMsg Serial Flags
79+
build.virtio_flags=-DVIRTIOCON -DHAL_IPCC_MODULE_ENABLED -DNO_ATOMIC_64_SUPPORT -DMETAL_INTERNAL -DMETAL_MAX_DEVICE_REGIONS=2 -DVIRTIO_SLAVE_ONLY -D__LOG_TRACE_IO_
80+
build.virtio_extra_include="-I{build.system.path}/Middlewares/OpenAMP" "-I{build.system.path}/Middlewares/OpenAMP/open-amp/lib/include" "-I{build.system.path}/Middlewares/OpenAMP/libmetal/lib/include" "-I{build.system.path}/Middlewares/OpenAMP/virtual_driver"
81+
7882
# Build information's
7983
build.info.flags=-D{build.series} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} -DBOARD_NAME="{build.board}"
8084

8185
# Defaults config
8286
build.xSerial=-DHAL_UART_MODULE_ENABLED
8387
build.enable_usb=
8488
build.usb_speed=
89+
build.enable_virtio=
8590
build.startup_file=
8691
build.flags.fp=
8792
build.flags.optimize=-Os

0 commit comments

Comments
 (0)