Kconfig backport #18259 & remove contrained flash depedency on NO_HELP

3 years ago · bb7b033e11
3 changed files with 6 additions and 8 deletions
--- a/4
+++ b/4
@ -78,15 +78,11 @@ menu "Toolchain"
				@@ -78,15 +78,11 @@ menu "Toolchain"
        help
            flag to enable constrained flash options (eg limit init script status text)

-    if BOARD_CONSTRAINED_FLASH
-
    config BOARD_NO_HELP
        bool "No help"
        help
            optional condition flag to disable help text on constrained flash systems

-    endif #BOARD_CONSTRAINED_FLASH
-
    config BOARD_CONSTRAINED_MEMORY
        bool "Contrained memory"
        help
--- a/boards/ark/can-gps/debug.px4board
+++ b/boards/ark/can-gps/debug.px4board
@ -1,3 +1,4 @@
				@@ -1,3 +1,4 @@
+CONFIG_BOARD_NO_HELP=y
 CONFIG_SYSTEMCMDS_REBOOT=y
 CONFIG_SYSTEMCMDS_TOP=y
 CONFIG_SYSTEMCMDS_TOPIC_LISTENER=y
--- a/cmake/kconfig.cmake
+++ b/cmake/kconfig.cmake
@ -273,10 +273,11 @@ if(EXISTS ${BOARD_DEFCONFIG})
				@@ -273,10 +273,11 @@ if(EXISTS ${BOARD_DEFCONFIG})
 	if(CONSTRAINED_FLASH)
 		set(px4_constrained_flash_build "1" CACHE INTERNAL "constrained flash build" FORCE)
 		add_definitions(-DCONSTRAINED_FLASH)
+	endif()
+
    if (NO_HELP)
 		add_definitions(-DCONSTRAINED_FLASH_NO_HELP="https://docs.px4.io/master/en/modules/modules_main.html")
 	endif()
-	endif()

 	if(CONSTRAINED_MEMORY)
 		set(px4_constrained_memory_build "1" CACHE INTERNAL "constrained memory build" FORCE)