Kconfig rebase backports 26-09-21

3 years ago · 5e98f38f78
5 changed files with 8 additions and 2 deletions
--- a/boards/ark/can-gps/debug.px4board
+++ b/boards/ark/can-gps/debug.px4board
@ -1,4 +1,3 @@
				@@ -1,4 +1,3 @@
-CONFIG_SYSTEMCMDS_PERF=y
 CONFIG_SYSTEMCMDS_REBOOT=y
 CONFIG_SYSTEMCMDS_TOP=y
 CONFIG_SYSTEMCMDS_TOPIC_LISTENER=y
--- a/boards/nxp/fmurt1062-v1/default.px4board
+++ b/boards/nxp/fmurt1062-v1/default.px4board
@ -5,7 +5,7 @@ CONFIG_BOARD_SERIAL_GPS2="/dev/ttyS4"
				@@ -5,7 +5,7 @@ CONFIG_BOARD_SERIAL_GPS2="/dev/ttyS4"
 CONFIG_BOARD_SERIAL_TEL1="/dev/ttyS2"
 CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS3"
 CONFIG_DRIVERS_ADC_BOARD_ADC=y
-CONFIG_COMMON_BAROMETERS=y
+CONFIG_DRIVERS_BAROMETER_MS5611=y
 CONFIG_DRIVERS_BATT_SMBUS=y
 CONFIG_DRIVERS_CAMERA_CAPTURE=y
 CONFIG_DRIVERS_CAMERA_TRIGGER=y
--- a/boards/px4/fmu-v5x/default.px4board
+++ b/boards/px4/fmu-v5x/default.px4board
@ -33,6 +33,7 @@ CONFIG_DRIVERS_PCA9685=y
				@@ -33,6 +33,7 @@ CONFIG_DRIVERS_PCA9685=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_POWER_MONITOR_INA228=y
+CONFIG_DRIVERS_POWER_MONITOR_INA238=y
 CONFIG_DRIVERS_PWM_INPUT=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_PWM_OUT_SIM=y
--- a/boards/px4/fmu-v6x/default.px4board
+++ b/boards/px4/fmu-v6x/default.px4board
@ -33,6 +33,7 @@ CONFIG_DRIVERS_PCA9685=y
				@@ -33,6 +33,7 @@ CONFIG_DRIVERS_PCA9685=y
 CONFIG_DRIVERS_PCA9685_PWM_OUT=y
 CONFIG_DRIVERS_POWER_MONITOR_INA226=y
 CONFIG_DRIVERS_POWER_MONITOR_INA228=y
+CONFIG_DRIVERS_POWER_MONITOR_INA238=y
 CONFIG_DRIVERS_PWM_OUT=y
 CONFIG_DRIVERS_PWM_OUT_SIM=y
 CONFIG_DRIVERS_PX4IO=y
--- a/src/drivers/power_monitor/ina238/Kconfig
+++ b/src/drivers/power_monitor/ina238/Kconfig
@ -0,0 +1,5 @@
				@@ -0,0 +1,5 @@
+menuconfig DRIVERS_POWER_MONITOR_INA238
+	bool "ina238"
+	default n
+	---help---
+		Enable support for ina238