dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

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

This commit is contained in:
Peter van der Perk 2021-08-17 18:46:37 +02:00 committed by Daniel Agar
parent 6af0477733
commit c2ad07b983
8 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Tools/kconfig/updateconfig.py
View File

@ -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

3
boards/ark/can-flow/canbootloader.px4board
View File

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

3
boards/ark/can-gps/canbootloader.px4board
View File

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

3
boards/cuav/can-gps-v1/canbootloader.px4board
View File

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

3
boards/freefly/can-rtk-gps/canbootloader.px4board
View File

@ -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

3
boards/holybro/can-gps-v1/canbootloader.px4board
View File

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

3
boards/nxp/ucans32k146/canbootloader.px4board
View File

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

4
cmake/kconfig.cmake
View File

@ -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}