Kconfig backport #18259 & remove contrained flash depedency on NO_HELP

This commit is contained in:
Peter van der Perk
2021-09-30 09:13:20 +02:00
committed by Daniel Agar
parent c3c9910f04
commit bb7b033e11
3 changed files with 6 additions and 8 deletions
-4
View File
@@ -78,15 +78,11 @@ menu "Toolchain"
help help
flag to enable constrained flash options (eg limit init script status text) flag to enable constrained flash options (eg limit init script status text)
if BOARD_CONSTRAINED_FLASH
config BOARD_NO_HELP config BOARD_NO_HELP
bool "No help" bool "No help"
help help
optional condition flag to disable help text on constrained flash systems optional condition flag to disable help text on constrained flash systems
endif #BOARD_CONSTRAINED_FLASH
config BOARD_CONSTRAINED_MEMORY config BOARD_CONSTRAINED_MEMORY
bool "Contrained memory" bool "Contrained memory"
help help
+1
View File
@@ -1,3 +1,4 @@
CONFIG_BOARD_NO_HELP=y
CONFIG_SYSTEMCMDS_REBOOT=y CONFIG_SYSTEMCMDS_REBOOT=y
CONFIG_SYSTEMCMDS_TOP=y CONFIG_SYSTEMCMDS_TOP=y
CONFIG_SYSTEMCMDS_TOPIC_LISTENER=y CONFIG_SYSTEMCMDS_TOPIC_LISTENER=y
+2 -1
View File
@@ -273,10 +273,11 @@ if(EXISTS ${BOARD_DEFCONFIG})
if(CONSTRAINED_FLASH) if(CONSTRAINED_FLASH)
set(px4_constrained_flash_build "1" CACHE INTERNAL "constrained flash build" FORCE) set(px4_constrained_flash_build "1" CACHE INTERNAL "constrained flash build" FORCE)
add_definitions(-DCONSTRAINED_FLASH) add_definitions(-DCONSTRAINED_FLASH)
endif()
if (NO_HELP) if (NO_HELP)
add_definitions(-DCONSTRAINED_FLASH_NO_HELP="https://docs.px4.io/master/en/modules/modules_main.html") add_definitions(-DCONSTRAINED_FLASH_NO_HELP="https://docs.px4.io/master/en/modules/modules_main.html")
endif() endif()
endif()
if(CONSTRAINED_MEMORY) if(CONSTRAINED_MEMORY)
set(px4_constrained_memory_build "1" CACHE INTERNAL "constrained memory build" FORCE) set(px4_constrained_memory_build "1" CACHE INTERNAL "constrained memory build" FORCE)