[Kconfig] Don't inherit kconfig when bootloader (and canbootloader)

Tools/kconfig/updateconfig.py

@@ -57,8 +57,15 @@ for name in glob.glob(px4_dir + '/boards/*/*/bootloader.px4board'):
     kconf.load_config(name)
     print(kconf.write_min_config(name))
 
+for name in glob.glob(px4_dir + '/boards/*/*/canbootloader.px4board'):
+    kconf = kconfiglib.Kconfig()
+    kconf.load_config(name)
+    print(kconf.write_min_config(name))
+
 for name in glob.glob(px4_dir + '/boards/*/*/*.px4board'):
-    if(os.path.basename(name) != "default.px4board" and os.path.basename(name) != "bootloader.px4board"):
+    if(os.path.basename(name) != "default.px4board" and
+       os.path.basename(name) != "bootloader.px4board" and
+       os.path.basename(name) != "canbootloader.px4board"):
         board_default = os.path.dirname(name) + "/default.px4board";
 
         # Merge with default config

boards/ark/can-flow/canbootloader.px4board

@@ -1 +1,4 @@
+CONFIG_ARCHITECTURE_CORTEX_M4=y
 CONFIG_BOARD_ROMFSROOT=""
+CONFIG_BOARD_CONSTRAINED_MEMORY=y
+CONFIG_DRIVERS_BOOTLOADERS=y

boards/ark/can-gps/canbootloader.px4board

@@ -1 +1,4 @@
+CONFIG_ARCHITECTURE_CORTEX_M4=y
 CONFIG_BOARD_ROMFSROOT=""
+CONFIG_BOARD_CONSTRAINED_MEMORY=y
+CONFIG_DRIVERS_BOOTLOADERS=y

boards/cuav/can-gps-v1/canbootloader.px4board

@@ -1 +1,4 @@
+CONFIG_ARCHITECTURE_CORTEX_M4=y
 CONFIG_BOARD_ROMFSROOT=""
+CONFIG_BOARD_CONSTRAINED_MEMORY=y
+CONFIG_DRIVERS_BOOTLOADERS=y

boards/freefly/can-rtk-gps/canbootloader.px4board

@@ -1,2 +1,5 @@
+CONFIG_ARCHITECTURE_CORTEX_M7=y
 CONFIG_BOARD_ROMFSROOT=""
 CONFIG_BOARD_CONSTRAINED_MEMORY=y
+CONFIG_DRIVERS_BOOTLOADERS=y
+CONFIG_DRIVERS_LIGHTS_RGBLED_NCP5623C=y

boards/holybro/can-gps-v1/canbootloader.px4board

@@ -1 +1,4 @@
+CONFIG_ARCHITECTURE_CORTEX_M4=y
 CONFIG_BOARD_ROMFSROOT=""
+CONFIG_BOARD_CONSTRAINED_MEMORY=y
+CONFIG_DRIVERS_BOOTLOADERS=y

boards/nxp/ucans32k146/canbootloader.px4board

@@ -1 +1,4 @@
+CONFIG_ARCHITECTURE_CORTEX_M4=y
 CONFIG_BOARD_ROMFSROOT=""
+CONFIG_BOARD_CONSTRAINED_MEMORY=y
+CONFIG_DRIVERS_BOOTLOADERS=y

cmake/kconfig.cmake

@@ -30,7 +30,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")
+    if(${LABEL} MATCHES "default" 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}
@@ -307,7 +307,7 @@ if(EXISTS ${BOARD_DEFCONFIG})
 endif()
 
 
-if(${LABEL} MATCHES "default" OR ${LABEL} MATCHES "bootloader")
+if(${LABEL} MATCHES "default" OR ${LABEL} MATCHES "bootloader" OR ${LABEL} MATCHES "canbootloader")
     add_custom_target(boardconfig
         ${CMAKE_COMMAND} -E env
         ${COMMON_KCONFIG_ENV_SETTINGS}