net: enable SLIP only on QEMU targets

In many networking tests we had to configure SLIP in the prj.conf
leaving those configurations Qemu specific. This change enables SLIP for
QEMU targets automatically and allows reuse of prj.conf for multiple
boards.

Additionally, the TUN options is removed. This option was not used
anywhere.

To enable self-contained networking tests that do not depend on SLIP, we
introduce the new option NET_TEST which disables TAP and allows testing
in QEMU without the need for a host interface.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2017-07-26 08:45:13 -04:00 committed by Anas Nashif
commit ca0ad13a61
57 changed files with 35 additions and 56 deletions

View file

@ -4,7 +4,6 @@ CONFIG_NET_UDP=y
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NET_BUF_LOG=y
CONFIG_NET_LOG=y
CONFIG_NET_SLIP_TAP=y
CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_INIT_STACKS=y
CONFIG_PRINTK=y

View file

@ -4,7 +4,6 @@ CONFIG_NET_IPV4=n
CONFIG_NET_UDP=y
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NET_LOG=y
CONFIG_NET_SLIP_TAP=y
CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_INIT_STACKS=y
CONFIG_PRINTK=y

View file

@ -4,7 +4,6 @@ CONFIG_NET_IPV4=y
CONFIG_NET_ARP=y
CONFIG_NET_UDP=y
CONFIG_NET_DHCPV4=y
CONFIG_NET_SLIP_TAP=y
CONFIG_NET_PKT_RX_COUNT=4
CONFIG_NET_PKT_TX_COUNT=4

View file

@ -2,7 +2,6 @@ CONFIG_NETWORKING=y
CONFIG_NET_UDP=y
CONFIG_RANDOM_GENERATOR=y
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NET_SLIP_TAP=y
CONFIG_INIT_STACKS=y
CONFIG_NET_PKT_RX_COUNT=4
CONFIG_NET_PKT_TX_COUNT=4

View file

@ -5,7 +5,6 @@ CONFIG_NET_UDP=y
CONFIG_NET_TCP=y
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NET_LOG=y
CONFIG_NET_SLIP_TAP=y
CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_INIT_STACKS=y
CONFIG_PRINTK=y

View file

@ -8,7 +8,6 @@ CONFIG_NET_BUF_LOG=y
CONFIG_SYS_LOG_NET_BUF_LEVEL=2
CONFIG_NET_LOG=y
CONFIG_SYS_LOG_NET_LEVEL=2
CONFIG_NET_SLIP_TAP=y
CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_INIT_STACKS=y
CONFIG_PRINTK=y

View file

@ -8,7 +8,6 @@ CONFIG_NET_BUF_LOG=y
CONFIG_SYS_LOG_NET_BUF_LEVEL=2
CONFIG_NET_LOG=y
CONFIG_SYS_LOG_NET_LEVEL=2
CONFIG_NET_SLIP_TAP=y
CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_INIT_STACKS=y
CONFIG_PRINTK=y

View file

@ -6,7 +6,6 @@ CONFIG_NET_UDP=y
CONFIG_NET_TCP=y
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NET_LOG=y
CONFIG_NET_SLIP_TAP=y
CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_INIT_STACKS=y
CONFIG_PRINTK=y

View file

@ -15,7 +15,6 @@ CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_NET_STATISTICS=y
CONFIG_PRINTK=y
CONFIG_NET_SLIP_TAP=y
CONFIG_NET_PKT_RX_COUNT=10
CONFIG_NET_PKT_TX_COUNT=10

View file

@ -10,7 +10,6 @@ CONFIG_SYS_LOG_NET_BUF_LEVEL=2
CONFIG_NET_LOG=y
CONFIG_SYS_LOG_NET_LEVEL=2
CONFIG_NET_DEBUG_NET_PKT=y
CONFIG_NET_SLIP_TAP=y
CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_INIT_STACKS=y
CONFIG_PRINTK=y

View file

@ -3,7 +3,6 @@ CONFIG_NET_TCP=y
CONFIG_RANDOM_GENERATOR=y
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NET_LOG=y
CONFIG_NET_SLIP_TAP=y
CONFIG_INIT_STACKS=y
CONFIG_NET_PKT_RX_COUNT=64

View file

@ -3,7 +3,6 @@ CONFIG_NET_TCP=y
CONFIG_RANDOM_GENERATOR=y
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NET_LOG=y
CONFIG_NET_SLIP_TAP=y
CONFIG_INIT_STACKS=y
CONFIG_NET_PKT_RX_COUNT=16

View file

@ -3,7 +3,6 @@ CONFIG_NET_TCP=y
CONFIG_RANDOM_GENERATOR=y
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NET_LOG=y
CONFIG_NET_SLIP_TAP=y
CONFIG_INIT_STACKS=y
CONFIG_NET_PKT_RX_COUNT=64

View file

@ -14,7 +14,6 @@ CONFIG_NET_BUF_TX_COUNT=30
CONFIG_NET_PKT_RX_COUNT=14
CONFIG_NET_PKT_TX_COUNT=14
CONFIG_NET_SHELL=y
CONFIG_NET_SLIP_TAP=y
CONFIG_NET_STATISTICS=y
CONFIG_NET_TCP=y
CONFIG_NETWORKING=y

View file

@ -3,7 +3,6 @@ CONFIG_NETWORKING=y
CONFIG_NET_IPV6=y
CONFIG_NET_LOG=y
CONFIG_NET_UDP=y
CONFIG_NET_SLIP_TAP=y
CONFIG_SYS_LOG=y
CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_RANDOM_GENERATOR=y

View file

@ -3,7 +3,6 @@ CONFIG_NET_IPV6=n
CONFIG_NET_IPV4=y
CONFIG_NET_UDP=y
CONFIG_NET_LOG=y
CONFIG_NET_SLIP_TAP=y
CONFIG_SYS_LOG=y
CONFIG_SYS_LOG_SHOW_COLOR=y

View file

@ -4,7 +4,6 @@ CONFIG_NET_IPV4=y
CONFIG_NET_UDP=y
CONFIG_NET_LOG=y
CONFIG_NET_SLIP=y
CONFIG_NET_SLIP_TAP=y
CONFIG_SYS_LOG=y
CONFIG_SYS_LOG_SHOW_COLOR=y

View file

@ -3,7 +3,6 @@ CONFIG_NET_TCP=y
CONFIG_RANDOM_GENERATOR=y
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_NET_LOG=y
CONFIG_NET_SLIP_TAP=y
CONFIG_INIT_STACKS=y
CONFIG_NET_PKT_RX_COUNT=16

View file

@ -11,7 +11,6 @@ CONFIG_NET_MAX_CONTEXTS=10
CONFIG_NET_PKT_RX_COUNT=14
CONFIG_NET_PKT_TX_COUNT=14
CONFIG_NET_SHELL=y
CONFIG_NET_SLIP_TAP=y
CONFIG_NET_STATISTICS=y
CONFIG_NET_TCP=y
CONFIG_NETWORKING=y

View file

@ -10,7 +10,6 @@ CONFIG_NET_SOCKETS=y
CONFIG_NET_SOCKETS_POSIX_NAMES=y
# Network driver config
CONFIG_NET_SLIP_TAP=y
CONFIG_TEST_RANDOM_GENERATOR=y
# Without CONFIG_NET_BUF_LOG printf() doesn't work

View file

@ -10,7 +10,6 @@ CONFIG_NET_SOCKETS=y
CONFIG_NET_SOCKETS_POSIX_NAMES=y
# Network driver config
CONFIG_NET_SLIP_TAP=y
CONFIG_TEST_RANDOM_GENERATOR=y
# Without CONFIG_NET_BUF_LOG printf() doesn't work

View file

@ -6,7 +6,6 @@ CONFIG_NET_IPV4=y
CONFIG_NET_ARP=y
CONFIG_NET_UDP=y
CONFIG_NET_TCP=y
CONFIG_NET_SLIP_TAP=y
CONFIG_NET_DHCPV4=n
CONFIG_NET_MGMT=n

View file

@ -6,7 +6,6 @@ CONFIG_NET_IPV4=y
CONFIG_NET_ARP=y
CONFIG_NET_UDP=y
CONFIG_NET_TCP=y
CONFIG_NET_SLIP_TAP=y
CONFIG_NET_DHCPV4=n
CONFIG_NET_MGMT=n

View file

@ -3,7 +3,6 @@ CONFIG_NET_IPV4=y
CONFIG_NET_IPV6=y
CONFIG_NET_LOG=y
CONFIG_NET_UDP=y
CONFIG_NET_SLIP_TAP=y
CONFIG_SYS_LOG=y
CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_RANDOM_GENERATOR=y

View file

@ -2,7 +2,6 @@ CONFIG_NETWORKING=y
CONFIG_NET_IPV6=y
CONFIG_NET_LOG=y
CONFIG_NET_UDP=y
CONFIG_NET_SLIP_TAP=y
CONFIG_SYS_LOG=y
CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_RANDOM_GENERATOR=y

View file

@ -22,7 +22,6 @@ CONFIG_INIT_STACKS=y
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_NET_SLIP_TAP=y
CONFIG_NET_L2_ETHERNET=y
CONFIG_NET_SHELL=y

View file

@ -239,31 +239,12 @@ config NET_CONTEXT_CHECK
If you know that the options passed to net_context...() functions
are ok, then you can disable the checks to save some memory.
choice
prompt "Use SLIP connectivity with QEMU"
optional
default NET_SLIP_TUN
config NET_TEST
bool "Network Testing"
default n
help
The SLIP support is only used when the application is run inside QEMU
and the network peer is run in your host. The host needs to have
tunslip running in order to receive and send network packets via the
SLIP driver. The SLIP driver Kconfig options can be tweaked in drivers
section.
Options are provided to communicate with QEMU via a TUN driver, the
default, as it requires less configuration in the host side, or via a
TAP driver.
config NET_SLIP_TUN
bool "TUN SLIP driver"
select SLIP
select UART_PIPE
select UART_INTERRUPT_DRIVEN
select NET_L2_DUMMY
help
The host needs to have tunslip running in order
to receive and send network packets via the SLIP driver.
Choose this if unsure.
Used for self-contained networking tests that do not require a
network device.
config NET_SLIP_TAP
bool "TAP SLIP driver"
@ -271,11 +252,12 @@ config NET_SLIP_TAP
select UART_PIPE
select UART_INTERRUPT_DRIVEN
select SLIP_TAP
default n
default y if (QEMU_TARGET && !NET_TEST)
help
SLIP TAP support is necessary when testing IPv4/ARP. The host
needs to have tunslip with TAP support running in order to
communicate via the SLIP driver.
endchoice
config NET_TRICKLE
bool "Enable Trickle library"

View file

@ -9,7 +9,7 @@ menu "Link layer options"
config NET_L2_DUMMY
bool "Enable dummy l2 layer"
default n
default y if !NET_L2_ETHERNET && NET_SLIP_TUN
default y if !NET_L2_ETHERNET && NET_TEST
help
Add a dummy L2 layer driver, usually in case you need SLIP in
TUN mode.

View file

@ -1,4 +1,5 @@
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
CONFIG_NET_L2_DUMMY=y
CONFIG_NET_IPV6=y
CONFIG_NET_IPV6_ND=n

View file

@ -106,8 +106,6 @@ CONFIG_NET_CONTEXT_SYNC_RECV=y
CONFIG_NET_CONTEXT_CHECK=y
# SLIP
CONFIG_NET_SLIP_TUN=n
CONFIG_NET_SLIP_TAP=y
# Trickle algo
CONFIG_NET_TRICKLE=y

View file

@ -1,4 +1,5 @@
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
CONFIG_NET_ARP=y
CONFIG_NET_L2_ETHERNET=y
CONFIG_NET_IPV4=y

View file

@ -1,4 +1,5 @@
CONFIG_NET_BUF=y
CONFIG_NET_TEST=y
#CONFIG_NET_BUF_LOG=y
#CONFIG_SYS_LOG_NET_BUF_LEVEL=4
CONFIG_ZTEST=y

View file

@ -1,4 +1,5 @@
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
CONFIG_NET_IPV6=y
CONFIG_NET_UDP=y
CONFIG_NET_TCP=n

View file

@ -1,4 +1,5 @@
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
CONFIG_NET_L2_DUMMY=y
CONFIG_NET_UDP=y
CONFIG_NET_DHCPV4=y

View file

@ -1,4 +1,5 @@
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
CONFIG_NET_IPV6=y
CONFIG_NET_IPV4=y
CONFIG_NET_BUF=y

View file

@ -1,4 +1,5 @@
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
CONFIG_NET_L2_DUMMY=y
CONFIG_NET_IPV6=y
CONFIG_NET_IPV6_ND=n

View file

@ -1,4 +1,5 @@
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
CONFIG_NET_BUF=y
CONFIG_NET_IPV6=y
CONFIG_NET_L2_IEEE802154=y

View file

@ -1,4 +1,5 @@
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
CONFIG_NET_IPV6=y
CONFIG_NET_UDP=y
CONFIG_NET_TCP=n

View file

@ -1,4 +1,5 @@
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
CONFIG_NET_IPV6=y
CONFIG_NET_IPV6_DAD=n
CONFIG_NET_IPV6_ND=n

View file

@ -1,4 +1,5 @@
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
CONFIG_NET_IPV6=y
CONFIG_NET_UDP=y
CONFIG_NET_TCP=n

View file

@ -1,4 +1,5 @@
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
CONFIG_NET_IPV6=y
CONFIG_NET_UDP=y
CONFIG_NET_TCP=n

View file

@ -1,5 +1,6 @@
# required for htons
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
# native IP stack support
CONFIG_RANDOM_GENERATOR=y

View file

@ -1,5 +1,5 @@
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
CONFIG_RANDOM_GENERATOR=y
CONFIG_TEST_RANDOM_GENERATOR=y

View file

@ -1,4 +1,5 @@
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
CONFIG_RANDOM_GENERATOR=y
CONFIG_TEST_RANDOM_GENERATOR=y

View file

@ -1,5 +1,6 @@
# required for htons
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
# native IP stack support
CONFIG_RANDOM_GENERATOR=y

View file

@ -1,4 +1,5 @@
CONFIG_NET_BUF_LOG=y
CONFIG_NET_TEST=y
CONFIG_SYS_LOG_NET_BUF_LEVEL=2
CONFIG_NETWORKING=y
CONFIG_NETWORKING_WITH_IPV6=y

View file

@ -1,4 +1,5 @@
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
CONFIG_NET_BUF=y
CONFIG_MAIN_STACK_SIZE=2048
CONFIG_NET_PKT_RX_COUNT=5

View file

@ -1,4 +1,5 @@
CONFIG_ZTEST=y
CONFIG_NET_TEST=y
CONFIG_NETWORKING=y
CONFIG_NET_IPV6=y
CONFIG_NET_UDP=y

View file

@ -1,4 +1,5 @@
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
CONFIG_NET_IPV6=y
CONFIG_NET_BUF=y
CONFIG_MAIN_STACK_SIZE=2048

View file

@ -1,4 +1,5 @@
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
CONFIG_NET_IPV6=y
CONFIG_NET_BUF=y
CONFIG_NET_BUF_LOG=y

View file

@ -1,4 +1,5 @@
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
CONFIG_NET_IPV6=y
CONFIG_NET_UDP=y
CONFIG_NET_TCP=n

View file

@ -1,4 +1,5 @@
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
CONFIG_NET_IPV6=y
CONFIG_NET_UDP=y
CONFIG_NET_TCP=n

View file

@ -10,7 +10,6 @@ CONFIG_NET_SOCKETS=y
CONFIG_NET_SOCKETS_POSIX_NAMES=y
# Network driver config
CONFIG_NET_SLIP_TAP=y
CONFIG_TEST_RANDOM_GENERATOR=y
# Network address config

View file

@ -1,4 +1,5 @@
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
CONFIG_NET_L2_DUMMY=y
CONFIG_NET_TCP=y
CONFIG_NET_MAX_CONN=64

View file

@ -1,4 +1,5 @@
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
CONFIG_NET_IPV6=y
CONFIG_NET_UDP=y
CONFIG_NET_TCP=n

View file

@ -1,4 +1,5 @@
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
CONFIG_NET_L2_DUMMY=y
CONFIG_NET_UDP=y
CONFIG_NET_TCP=n

View file

@ -1,4 +1,5 @@
CONFIG_NETWORKING=y
CONFIG_NET_TEST=y
CONFIG_NET_IPV6=y
CONFIG_NET_IPV4=y
CONFIG_NET_BUF=y