From aa96e39306b862d089722583164dd9b6faa79d97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beat=20K=C3=BCng?= <beat-kueng@gmx.net>
Date: Thu, 9 Dec 2021 11:35:59 +0100
Subject: [PATCH] kconfig: do not inherit for recovery.px4board from
 default.px4board

---
 Tools/generate_board_targets_json.py | 4 +++-
 cmake/kconfig.cmake                  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Tools/generate_board_targets_json.py b/Tools/generate_board_targets_json.py
index ac9192fccf..25186fa4ec 100755
--- a/Tools/generate_board_targets_json.py
+++ b/Tools/generate_board_targets_json.py
@@ -41,7 +41,9 @@ def process_target(px4board_file, target_name):
     platform = None
     toolchain = None
 
-    if px4board_file.endswith("default.px4board"):
+    if px4board_file.endswith("default.px4board") or \
+        px4board_file.endswith("recovery.px4board") or \
+        px4board_file.endswith("bootloader.px4board"):
         kconf.load_config(px4board_file, replace=True)
     else: # Merge config with default.px4board
         default_kconfig = re.sub(r'[a-zA-Z\d_]+\.px4board', 'default.px4board', px4board_file)
diff --git a/cmake/kconfig.cmake b/cmake/kconfig.cmake
index 3c787e15a0..1e4527e2d0 100644
--- a/cmake/kconfig.cmake
+++ b/cmake/kconfig.cmake
@@ -31,7 +31,7 @@ if(EXISTS ${BOARD_DEFCONFIG})
     # Depend on BOARD_DEFCONFIG so that we reconfigure on config change
     set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${BOARD_DEFCONFIG})
 
-    if(${LABEL} MATCHES "default" OR ${LABEL} MATCHES "bootloader" OR ${LABEL} MATCHES "canbootloader")
+    if(${LABEL} MATCHES "default" OR ${LABEL} MATCHES "recovery" OR ${LABEL} MATCHES "bootloader" OR ${LABEL} MATCHES "canbootloader")
         # Generate boardconfig from saved defconfig
         execute_process(COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS}
                         ${DEFCONFIG_PATH} ${BOARD_DEFCONFIG}