kconfig: fw_info: let entry be a menuconfig, rework FW_INFO_API

Let fw_info entry FW_INFO be a menuconfig, so that its related
entries can expand nicely into a menu.

The dependency on FW_INFO || FW_INFO_API on the Kconfig entries
for this library prevented them from expanding into the menu.
Rework FW_INFO_API so that it depends on FW_INFO.

Signed-off-by: Emanuele Di Santo <emdi@nordicsemi.no>

Author: lemrey

subsys/fw_info/CMakeLists.txt

@@ -3,21 +3,15 @@
 #
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
-if (CONFIG_FW_INFO)
-  zephyr_library()
+
+zephyr_library()
+
+if (CONFIG_FW_INFO AND NOT CONFIG_FW_INFO_API)
   zephyr_library_sources(fw_info.c)
   zephyr_linker_sources(RODATA ext_apis.ld)
+  zephyr_linker_sources(ROM_START SORT_KEY ${CONFIG_FW_INFO_OFFSET} fw_info.ld)
 endif ()
 
-if (CONFIG_FW_INFO_API)
-  zephyr_library()
-endif()
-
-zephyr_linker_sources_ifdef(CONFIG_FW_INFO
-  ROM_START
-  SORT_KEY ${CONFIG_FW_INFO_OFFSET}
-  fw_info.ld)
-
 # The following creates variables with the magic numbers used for firmware
 # metadata as comma-separated lists of numbers.
 

subsys/fw_info/Kconfig

@@ -4,18 +4,18 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-config FW_INFO
+menuconfig FW_INFO
 	bool
 	prompt "Firmware Metadata"
 	imply NRFX_NVMC
 
-if(!FW_INFO)
+if (FW_INFO)
+
 config FW_INFO_API
-	bool
-	prompt "Firmware Metadata find API"
-endif
+	bool "Only provide APIs to locate metadata"
+	help
+	  Only provide APIs to locate metadata.
 
-if (FW_INFO || FW_INFO_API)
 config FW_INFO_OFFSET
 	hex "The location of firmware info inside this firmware"
 	default 0x200

subsys/pcd/Kconfig

@@ -34,7 +34,7 @@ if PCD_APP || PCD_NET
 
 config PCD_READ_NETCORE_APP_VERSION
 	bool "Include PCD command to read network core application version"
-	select FW_INFO_API if !FW_INFO
+	depends on FW_INFO || FW_INFO_API
 
 config PCD_USE_CONSTANTS
 	bool "Use KConfig constants rather than pm_config.h"

tests/subsys/pcd/prj.conf

@@ -11,4 +11,6 @@ CONFIG_PCD_APP=y
 CONFIG_BOARD_ENABLE_CPUNET=y
 CONFIG_ZTEST_STACK_SIZE=2048
 CONFIG_PARTITION_MANAGER_ENABLED=y
+CONFIG_FW_INFO=y
+CONFIG_FW_INFO_API=y
 CONFIG_PCD_READ_NETCORE_APP_VERSION=y