Skip to content

Commit afff8a1

Browse files
maass-hamburgfabiobaltieri
authored andcommitted
net: config: correct dependency of NET_CONFIG*
Corrects the dependencies of NET_CONFIG* Signed-off-by: Fin Maaß <f.maass@vogl-electronic.com>
1 parent 2dd6486 commit afff8a1

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

subsys/net/lib/config/Kconfig

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,25 @@
33
# Copyright (c) 2017 Intel Corporation.
44
# SPDX-License-Identifier: Apache-2.0
55

6+
module = NET_CONFIG
7+
module-dep = NET_LOG
8+
module-str = Log level for network config library
9+
module-help = Enables net config library to output debug messages.
10+
source "subsys/net/Kconfig.template.log_config.net"
11+
12+
menuconfig NET_CONFIG_SETTINGS
13+
bool "Set network settings for applications"
14+
select NET_MGMT
15+
select NET_MGMT_EVENT
16+
help
17+
Allow IP addresses to be set in config file for
18+
networking client/server sample applications, or
19+
some link-layer dedicated settings like the channel.
20+
Beware this is not meant to be used for proper
21+
provisioning but quick sampling/testing.
22+
23+
if NET_CONFIG_SETTINGS
24+
625
config NET_CONFIG_AUTO_INIT
726
bool "Init networking support automatically during device startup"
827
default n if USB_DEVICE_NETWORK
@@ -12,22 +31,14 @@ config NET_CONFIG_AUTO_INIT
1231
initialized when the device is started. If you do not wish to do
1332
this, then disable this and call net_config_init() in your application.
1433

34+
if NET_CONFIG_AUTO_INIT
35+
1536
config NET_CONFIG_INIT_PRIO
1637
int "Startup priority for the network application init"
1738
default 95
18-
depends on NET_CONFIG_AUTO_INIT
19-
20-
config NET_CONFIG_INIT_TIMEOUT
21-
int "How long to wait for networking to be ready and available"
22-
default 30
23-
help
24-
The value is in seconds. If for example IPv4 address from DHCPv4 is not
25-
received within this limit, then the net_config_init() call will fail
26-
during the device startup.
2739

2840
config NET_CONFIG_NEED_IPV6
2941
bool "This application wants IPv6 support"
30-
depends on NET_CONFIG_AUTO_INIT
3142
select NET_IPV6
3243
help
3344
The network application needs IPv6 support to function properly.
@@ -36,7 +47,6 @@ config NET_CONFIG_NEED_IPV6
3647

3748
config NET_CONFIG_NEED_IPV6_ROUTER
3849
bool "This application wants IPv6 router to exists"
39-
depends on NET_CONFIG_AUTO_INIT
4050
depends on NET_IPV6
4151
help
4252
The network application needs IPv6 router to exists before continuing.
@@ -45,31 +55,21 @@ config NET_CONFIG_NEED_IPV6_ROUTER
4555

4656
config NET_CONFIG_NEED_IPV4
4757
bool "This application wants IPv4 support"
48-
depends on NET_CONFIG_AUTO_INIT
4958
select NET_IPV4
5059
help
5160
The network application needs IPv4 support to function properly.
5261
This option makes sure the network application is initialized properly
5362
in order to use IPv4.
5463

55-
module = NET_CONFIG
56-
module-dep = NET_LOG
57-
module-str = Log level for network config library
58-
module-help = Enables net config library to output debug messages.
59-
source "subsys/net/Kconfig.template.log_config.net"
64+
endif # NET_CONFIG_AUTO_INIT
6065

61-
menuconfig NET_CONFIG_SETTINGS
62-
bool "Set network settings for applications"
63-
select NET_MGMT
64-
select NET_MGMT_EVENT
66+
config NET_CONFIG_INIT_TIMEOUT
67+
int "How long to wait for networking to be ready and available"
68+
default 30
6569
help
66-
Allow IP addresses to be set in config file for
67-
networking client/server sample applications, or
68-
some link-layer dedicated settings like the channel.
69-
Beware this is not meant to be used for proper
70-
provisioning but quick sampling/testing.
71-
72-
if NET_CONFIG_SETTINGS
70+
The value is in seconds. If for example IPv4 address from DHCPv4 is not
71+
received within this limit, then the net_config_init() call will fail
72+
during the device startup.
7373

7474
config NET_CONFIG_MY_VLAN_ID
7575
int "My VLAN identifier"

0 commit comments

Comments
 (0)