kconfig: Use depend on instead of select to avoid kconfig loop

Thomas Stenersen · Thomas Stenersen · commit da850d5be837 · 2019-03-11T12:31:10.000+01:00
Remove use of select to "force" enabling other configs in subsys/fs
and subsys/net/l2. The forcing will cause infinite kconfig recursion.

Signed-off-by: Thomas Stenersen &lt;thomas.stenersen@nordicsemi.no&gt;
diff --git a/drivers/flash/Kconfig b/drivers/flash/Kconfig
@@ -41,6 +41,7 @@ config FLASH_SHELL
 config FLASH_PAGE_LAYOUT
 	bool "API for retrieving the layout of pages"
 	depends on FLASH_HAS_PAGE_LAYOUT
+	default y
 	help
 	  Enables API for retrieving the layout of flash memory pages.
 
diff --git a/samples/bluetooth/ipsp/prj.conf b/samples/bluetooth/ipsp/prj.conf
@@ -2,6 +2,7 @@ CONFIG_BT=y
 CONFIG_BT_DEBUG_LOG=y
 CONFIG_BT_SMP=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_CENTRAL=y
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
 CONFIG_BT_DEVICE_NAME="Test IPSP node"
 CONFIG_NETWORKING=y
diff --git a/samples/bluetooth/ipsp/prj_dbg.conf b/samples/bluetooth/ipsp/prj_dbg.conf
@@ -2,6 +2,7 @@ CONFIG_BT=y
 CONFIG_BT_DEBUG_LOG=y
 CONFIG_BT_SMP=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_CENTRAL=y
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
 CONFIG_BT_DEVICE_NAME="Test IPSP node"
 CONFIG_NETWORKING=y
diff --git a/samples/bluetooth/ipsp/prj_zep1656.conf b/samples/bluetooth/ipsp/prj_zep1656.conf
@@ -2,6 +2,7 @@ CONFIG_BT=y
 CONFIG_BT_DEBUG_LOG=y
 CONFIG_BT_SMP=y
 CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_CENTRAL=y
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
 CONFIG_BT_DEVICE_NAME="Test IPSP node"
 CONFIG_NETWORKING=y
diff --git a/subsys/fs/Kconfig b/subsys/fs/Kconfig
@@ -37,7 +37,7 @@ config FAT_FILESYSTEM_ELM
 
 config FILE_SYSTEM_NFFS
 	bool "NFFS file system support"
-	select FLASH_PAGE_LAYOUT
+	depends on FLASH_PAGE_LAYOUT
 	select FS_FLASH_STORAGE_PARTITION
 	help
 	  Enables NFFS file system support.
diff --git a/subsys/net/l2/Kconfig b/subsys/net/l2/Kconfig
@@ -16,11 +16,11 @@ config NET_L2_DUMMY
 config NET_L2_BT
 	bool "Enable Bluetooth support"
 	depends on NET_IPV6
-	select BT
-	select BT_PERIPHERAL
-	select BT_CENTRAL
-	select BT_SMP
-	select BT_L2CAP_DYNAMIC_CHANNEL
+	depends on BT
+	depends on BT_PERIPHERAL
+	depends on BT_CENTRAL
+	depends on BT_SMP
+	depends on BT_L2CAP_DYNAMIC_CHANNEL
 	select NET_6LO
 	help
 	  Enable Bluetooth driver that send and receives IPv6 packets,
diff --git a/tests/net/all/prj.conf b/tests/net/all/prj.conf
@@ -53,6 +53,12 @@ CONFIG_NET_L2_IEEE802154_SECURITY=y
 CONFIG_NET_L2_IEEE802154_SECURITY_CRYPTO_DEV_NAME="CRYPTO-DEV"
 CONFIG_NET_L2_DUMMY=y
 CONFIG_NET_L2_ETHERNET=y
+
+CONFIG_BT=y
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_CENTRAL=y
+CONFIG_BT_SMP=y
+CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
 CONFIG_NET_L2_BT=y
 CONFIG_NET_L2_BT_ZEP1656=y
 CONFIG_NET_L2_BT_SEC_LEVEL=4
