From 3de5623556ab95d2405a0b6af78b987ac84dfe15 Mon Sep 17 00:00:00 2001
From: Peter van der Perk <peter.vanderperk@nxp.com>
Date: Thu, 7 Oct 2021 10:11:26 +0200
Subject: [PATCH] Kconfig remove defconfig in root directory after gen Cleanup
 fmu configs

---
 boards/px4/fmu-v2/fixedwing.px4board  | 3 ++-
 boards/px4/fmu-v5/ctrlalloc.px4board  | 3 ---
 boards/px4/fmu-v5/debug.px4board      | 2 +-
 boards/px4/fmu-v5/stackcheck.px4board | 3 ---
 boards/px4/fmu-v5/test.px4board       | 3 ---
 cmake/kconfig.cmake                   | 4 ++++
 6 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/boards/px4/fmu-v2/fixedwing.px4board b/boards/px4/fmu-v2/fixedwing.px4board
index ecf57e3f1b..8a4f571743 100644
--- a/boards/px4/fmu-v2/fixedwing.px4board
+++ b/boards/px4/fmu-v2/fixedwing.px4board
@@ -1,12 +1,13 @@
+CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_MS4525=n
 CONFIG_MODULES_FLIGHT_MODE_MANAGER=n
 CONFIG_MODULES_MC_ATT_CONTROL=n
 CONFIG_MODULES_MC_HOVER_THRUST_ESTIMATOR=n
 CONFIG_MODULES_MC_POS_CONTROL=n
 CONFIG_MODULES_MC_RATE_CONTROL=n
 CONFIG_SYSTEMCMDS_BL_UPDATE=n
+CONFIG_COMMON_DIFFERENTIAL_PRESSURE=y
 CONFIG_DRIVERS_CAMERA_CAPTURE=y
 CONFIG_DRIVERS_CAMERA_TRIGGER=y
-CONFIG_COMMON_DIFFERENTIAL_PRESSURE=y
 CONFIG_DRIVERS_DISTANCE_SENSOR_LIGHTWARE_LASER_SERIAL=y
 CONFIG_DRIVERS_DISTANCE_SENSOR_LL40LS=y
 CONFIG_MODULES_CAMERA_FEEDBACK=y
diff --git a/boards/px4/fmu-v5/ctrlalloc.px4board b/boards/px4/fmu-v5/ctrlalloc.px4board
index 7214691f76..37f8b40f5a 100644
--- a/boards/px4/fmu-v5/ctrlalloc.px4board
+++ b/boards/px4/fmu-v5/ctrlalloc.px4board
@@ -1,4 +1 @@
-CONFIG_COMMON_BAROMETERS=y
-CONFIG_COMMON_DISTANCE_SENSOR=y
-CONFIG_COMMON_MAGNETOMETER=y
 CONFIG_MODULES_CONTROL_ALLOCATOR=y
diff --git a/boards/px4/fmu-v5/debug.px4board b/boards/px4/fmu-v5/debug.px4board
index 865ea3e0d5..4ddec63532 100644
--- a/boards/px4/fmu-v5/debug.px4board
+++ b/boards/px4/fmu-v5/debug.px4board
@@ -1,9 +1,9 @@
 # CONFIG_BOARD_UAVCAN_TIMER_OVERRIDE is not set
 CONFIG_COMMON_BAROMETERS=n
+CONFIG_COMMON_DIFFERENTIAL_PRESSURE=n
 CONFIG_COMMON_MAGNETOMETER=n
 CONFIG_DRIVERS_ADC_ADS1115=n
 CONFIG_DRIVERS_BATT_SMBUS=n
-CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE=n
 CONFIG_DRIVERS_DSHOT=n
 CONFIG_DRIVERS_HEATER=n
 CONFIG_DRIVERS_IMU_ANALOG_DEVICES_ADIS16448=n
diff --git a/boards/px4/fmu-v5/stackcheck.px4board b/boards/px4/fmu-v5/stackcheck.px4board
index 41fc6f5c0c..9922665da3 100644
--- a/boards/px4/fmu-v5/stackcheck.px4board
+++ b/boards/px4/fmu-v5/stackcheck.px4board
@@ -30,6 +30,3 @@ CONFIG_MODULES_TEMPERATURE_COMPENSATION=n
 CONFIG_MODULES_VMOUNT=n
 CONFIG_BOARD_CONSTRAINED_FLASH=y
 CONFIG_BOARD_TESTING=y
-CONFIG_COMMON_DISTANCE_SENSOR=y
-CONFIG_COMMON_MAGNETOMETER=y
-CONFIG_DRIVERS_BAROMETER_MS5611=y
diff --git a/boards/px4/fmu-v5/test.px4board b/boards/px4/fmu-v5/test.px4board
index dcf0829b78..81445db112 100644
--- a/boards/px4/fmu-v5/test.px4board
+++ b/boards/px4/fmu-v5/test.px4board
@@ -1,9 +1,6 @@
 CONFIG_MODULES_ATTITUDE_ESTIMATOR_Q=n
 CONFIG_MODULES_LOCAL_POSITION_ESTIMATOR=n
 CONFIG_BOARD_TESTING=y
-CONFIG_COMMON_BAROMETERS=y
-CONFIG_COMMON_DISTANCE_SENSOR=y
-CONFIG_COMMON_MAGNETOMETER=y
 CONFIG_DRIVERS_TEST_PPM=y
 CONFIG_EXAMPLES_FAKE_IMU=y
 CONFIG_EXAMPLES_FAKE_MAGNETOMETER=y
diff --git a/cmake/kconfig.cmake b/cmake/kconfig.cmake
index 49c2658395..b31e9bdaa4 100644
--- a/cmake/kconfig.cmake
+++ b/cmake/kconfig.cmake
@@ -349,6 +349,7 @@ if(${LABEL} MATCHES "default" OR ${LABEL} MATCHES "bootloader" OR ${LABEL} MATCH
         ${MENUCONFIG_PATH} Kconfig
         COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} ${SAVEDEFCONFIG_PATH}
         COMMAND ${CMAKE_COMMAND} -E copy defconfig ${BOARD_DEFCONFIG}
+        COMMAND ${CMAKE_COMMAND} -E remove defconfig
         COMMAND ${CMAKE_COMMAND} -E remove ${PX4_BINARY_DIR}/NuttX/apps_copy.stamp
         WORKING_DIRECTORY ${PX4_SOURCE_DIR}
         USES_TERMINAL
@@ -361,6 +362,7 @@ if(${LABEL} MATCHES "default" OR ${LABEL} MATCHES "bootloader" OR ${LABEL} MATCH
         ${GUICONFIG_PATH} Kconfig
         COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} ${SAVEDEFCONFIG_PATH}
         COMMAND ${CMAKE_COMMAND} -E copy defconfig ${BOARD_DEFCONFIG}
+        COMMAND ${CMAKE_COMMAND} -E remove defconfig
         COMMAND ${CMAKE_COMMAND} -E remove ${PX4_BINARY_DIR}/NuttX/apps_copy.stamp
         WORKING_DIRECTORY ${PX4_SOURCE_DIR}
         USES_TERMINAL
@@ -373,6 +375,7 @@ else()
         ${MENUCONFIG_PATH} Kconfig
         COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} ${SAVEDEFCONFIG_PATH}
         COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/kconfig/diffconfig.py -m ${PX4_BOARD_DIR}/default.px4board defconfig > ${BOARD_DEFCONFIG}
+        COMMAND ${CMAKE_COMMAND} -E remove defconfig
         COMMAND ${CMAKE_COMMAND} -E remove ${PX4_BINARY_DIR}/NuttX/apps_copy.stamp
         WORKING_DIRECTORY ${PX4_SOURCE_DIR}
         USES_TERMINAL
@@ -385,6 +388,7 @@ else()
         ${GUICONFIG_PATH} Kconfig
         COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} ${SAVEDEFCONFIG_PATH}
         COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/kconfig/diffconfig.py -m ${PX4_BOARD_DIR}/default.px4board defconfig > ${BOARD_DEFCONFIG}
+        COMMAND ${CMAKE_COMMAND} -E remove defconfig
         COMMAND ${CMAKE_COMMAND} -E remove ${PX4_BINARY_DIR}/NuttX/apps_copy.stamp
         WORKING_DIRECTORY ${PX4_SOURCE_DIR}
         USES_TERMINAL