From 8476875b4dd2f77f53e353f532f06944481a4617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Tue, 26 Oct 2021 09:21:36 +0200 Subject: [PATCH] Kconfig: add missing serial ports --- Kconfig | 9 +++++++++ boards/holybro/kakutef7/default.px4board | 1 + boards/omnibus/f4sd/default.px4board | 1 + boards/px4/fmu-v5x/default.px4board | 1 + cmake/kconfig.cmake | 9 +++++++++ 5 files changed, 21 insertions(+) diff --git a/Kconfig b/Kconfig index 330b76a915..dbcb75e55a 100644 --- a/Kconfig +++ b/Kconfig @@ -128,6 +128,9 @@ config BOARD_KEYSTORE menu "Serial ports" + config BOARD_SERIAL_URT6 + string "URT6 tty port" + config BOARD_SERIAL_GPS1 string "GPS1 tty port" @@ -158,8 +161,14 @@ menu "Serial ports" config BOARD_SERIAL_TEL5 string "TEL5 tty port" + config BOARD_SERIAL_RC + string "RC tty port" + config BOARD_SERIAL_WIFI string "WIFI tty port" + + config BOARD_SERIAL_PPB + string "PPB (Pixhawk Payload Bus) tty port" endmenu menu "drivers" diff --git a/boards/holybro/kakutef7/default.px4board b/boards/holybro/kakutef7/default.px4board index 52ec0c7869..ec4361a416 100644 --- a/boards/holybro/kakutef7/default.px4board +++ b/boards/holybro/kakutef7/default.px4board @@ -5,6 +5,7 @@ CONFIG_BOARD_EXTERNAL_METADATA=y CONFIG_BOARD_SERIAL_GPS1="/dev/ttyS3" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS0" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS1" +CONFIG_BOARD_SERIAL_RC="/dev/ttyS4" CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_BMP280=y CONFIG_DRIVERS_DSHOT=y diff --git a/boards/omnibus/f4sd/default.px4board b/boards/omnibus/f4sd/default.px4board index f95d7931d8..821eb23616 100644 --- a/boards/omnibus/f4sd/default.px4board +++ b/boards/omnibus/f4sd/default.px4board @@ -3,6 +3,7 @@ CONFIG_BOARD_ARCHITECTURE="cortex-m4" CONFIG_BOARD_CONSTRAINED_FLASH=y CONFIG_BOARD_CONSTRAINED_MEMORY=y CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS1" +CONFIG_BOARD_SERIAL_URT6="/dev/ttyS2" CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_DRIVERS_BAROMETER_BMP280=y CONFIG_DRIVERS_DSHOT=y diff --git a/boards/px4/fmu-v5x/default.px4board b/boards/px4/fmu-v5x/default.px4board index f31eed6795..522fcc208e 100644 --- a/boards/px4/fmu-v5x/default.px4board +++ b/boards/px4/fmu-v5x/default.px4board @@ -7,6 +7,7 @@ CONFIG_BOARD_SERIAL_GPS2="/dev/ttyS7" CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS6" CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS4" CONFIG_BOARD_SERIAL_TEL3="/dev/ttyS1" +CONFIG_BOARD_SERIAL_PPB="/dev/ttyS3" CONFIG_DRIVERS_ADC_ADS1115=y CONFIG_DRIVERS_ADC_BOARD_ADC=y CONFIG_COMMON_BAROMETERS=y diff --git a/cmake/kconfig.cmake b/cmake/kconfig.cmake index 3b547dc46b..d10b67979e 100644 --- a/cmake/kconfig.cmake +++ b/cmake/kconfig.cmake @@ -210,6 +210,9 @@ if(EXISTS ${BOARD_DEFCONFIG}) # Serial ports set(board_serial_ports) + if(SERIAL_URT6) + list(APPEND board_serial_ports URT6:${SERIAL_URT6}) + endif() if(SERIAL_GPS1) list(APPEND board_serial_ports GPS1:${SERIAL_GPS1}) endif() @@ -240,9 +243,15 @@ if(EXISTS ${BOARD_DEFCONFIG}) if(SERIAL_TEL5) list(APPEND board_serial_ports TEL5:${SERIAL_TEL5}) endif() + if(SERIAL_RC) + list(APPEND board_serial_ports RC:${SERIAL_RC}) + endif() if(SERIAL_WIFI) list(APPEND board_serial_ports WIFI:${SERIAL_WIFI}) endif() + if(SERIAL_PPB) + list(APPEND board_serial_ports PPB:${SERIAL_PPB}) + endif() # ROMFS