net: apps: Move net samples to one directory instead of per kernel

Consolidate networking tests into 1 directory where possible and put
files under samples/net where possible.

Change-Id: Ieb65e000e1717f4d53058f87e36840a0786d467b
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Signed-off-by: Anas Nashif <anas.nashif@intel.com>

50 files changed, 63 insertions, 448 deletions

diff --git a/samples/microkernel/apps/net/coap_observe_client/Makefile b/samples/microkernel/apps/net/coap_observe_client/Makefile
deleted file mode 100644
index b723dd339..000000000
--- a/samples/microkernel/apps/net/coap_observe_client/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Makefile - coap observe client test application
-
-#
-# Copyright (c) 2015 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-MDEF_FILE = prj.mdef
-KERNEL_TYPE = micro
-BOARD ?= basic_minuteia
-CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/coap_observe_client/src/
-
-QEMU_EXTRA_FLAGS = -serial none -serial unix:/tmp/slip.sock
-
-include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/microkernel/apps/net/coap_observe_client/prj.mdef b/samples/microkernel/apps/net/coap_observe_client/prj.mdef
deleted file mode 100644
index 2e6dcf75c..000000000
--- a/samples/microkernel/apps/net/coap_observe_client/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : Network listener
-
-% TASK NAME         PRIO ENTRY           STACK GROUPS
-% ===================================================
-  TASK MAIN            7 startup	2048 [EXE]
diff --git a/samples/microkernel/apps/net/coap_observe_client/prj_arm.conf b/samples/microkernel/apps/net/coap_observe_client/prj_arm.conf
deleted file mode 100644
index 0cd0d1868..000000000
--- a/samples/microkernel/apps/net/coap_observe_client/prj_arm.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_NETWORKING=y
-CONFIG_NETWORKING_WITH_LOGGING=y
-CONFIG_NETWORKING_UART=y
-CONFIG_IP_BUF_RX_SIZE=3
-CONFIG_IP_BUF_TX_SIZE=5
-CONFIG_NANO_TIMEOUTS=y
-CONFIG_NANO_TIMERS=y
-CONFIG_ER_COAP=y
-CONFIG_ER_COAP_CLIENT=y
-CONFIG_ER_COAP_DEBUG=y
diff --git a/samples/microkernel/apps/net/coap_observe_client/prj_x86.conf b/samples/microkernel/apps/net/coap_observe_client/prj_x86.conf
deleted file mode 100644
index 0cd0d1868..000000000
--- a/samples/microkernel/apps/net/coap_observe_client/prj_x86.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_NETWORKING=y
-CONFIG_NETWORKING_WITH_LOGGING=y
-CONFIG_NETWORKING_UART=y
-CONFIG_IP_BUF_RX_SIZE=3
-CONFIG_IP_BUF_TX_SIZE=5
-CONFIG_NANO_TIMEOUTS=y
-CONFIG_NANO_TIMERS=y
-CONFIG_ER_COAP=y
-CONFIG_ER_COAP_CLIENT=y
-CONFIG_ER_COAP_DEBUG=y
diff --git a/samples/microkernel/apps/net/coap_server/Makefile b/samples/microkernel/apps/net/coap_server/Makefile
deleted file mode 100644
index c1eb113b2..000000000
--- a/samples/microkernel/apps/net/coap_server/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Makefile - coap server that is used in testing
-
-#
-# Copyright (c) 2015 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-MDEF_FILE = prj.mdef
-KERNEL_TYPE = micro
-BOARD ?= basic_minuteia
-CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/coap_server/src/
-
-QEMU_EXTRA_FLAGS = -serial none -serial unix:/tmp/slip.sock
-
-include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/microkernel/apps/net/coap_server/prj_arm.conf b/samples/microkernel/apps/net/coap_server/prj_arm.conf
deleted file mode 100644
index dec2d4e00..000000000
--- a/samples/microkernel/apps/net/coap_server/prj_arm.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_NETWORKING=y
-CONFIG_NETWORKING_WITH_LOGGING=y
-CONFIG_NETWORKING_UART=y
-CONFIG_IP_BUF_RX_SIZE=3
-CONFIG_IP_BUF_TX_SIZE=4
-CONFIG_NANO_TIMEOUTS=y
-CONFIG_ER_COAP=y
-CONFIG_ER_COAP_WITH_DTLS=y
-CONFIG_ER_COAP_DEBUG=y
diff --git a/samples/microkernel/apps/net/coap_server/prj_x86.conf b/samples/microkernel/apps/net/coap_server/prj_x86.conf
deleted file mode 100644
index dec2d4e00..000000000
--- a/samples/microkernel/apps/net/coap_server/prj_x86.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_NETWORKING=y
-CONFIG_NETWORKING_WITH_LOGGING=y
-CONFIG_NETWORKING_UART=y
-CONFIG_IP_BUF_RX_SIZE=3
-CONFIG_IP_BUF_TX_SIZE=4
-CONFIG_NANO_TIMEOUTS=y
-CONFIG_ER_COAP=y
-CONFIG_ER_COAP_WITH_DTLS=y
-CONFIG_ER_COAP_DEBUG=y
diff --git a/samples/microkernel/apps/net/dtls_client/Makefile b/samples/microkernel/apps/net/dtls_client/Makefile
deleted file mode 100644
index 8ba80d0b8..000000000
--- a/samples/microkernel/apps/net/dtls_client/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Makefile - dtls client that is used in testing
-
-#
-# Copyright (c) 2015 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-MDEF_FILE = prj.mdef
-KERNEL_TYPE = micro
-BOARD ?= basic_minuteia
-CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/dtls_client/src/
-
-QEMU_EXTRA_FLAGS = -serial none -serial unix:/tmp/slip.sock
-
-include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/microkernel/apps/net/dtls_client/prj_arm.conf b/samples/microkernel/apps/net/dtls_client/prj_arm.conf
deleted file mode 100644
index 4729e4416..000000000
--- a/samples/microkernel/apps/net/dtls_client/prj_arm.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_NETWORKING=y
-CONFIG_NETWORKING_WITH_LOGGING=y
-CONFIG_NETWORKING_WITH_LOOPBACK=y
-CONFIG_NETWORKING_UART=y
-CONFIG_NETWORKING_DEBUG_UART=y
-CONFIG_IP_BUF_TX_SIZE=4
-CONFIG_IP_BUF_RX_SIZE=3
-CONFIG_NANO_TIMEOUTS=y
-CONFIG_TINYDTLS=y
-CONFIG_TINYDTLS_DEBUG=y
diff --git a/samples/microkernel/apps/net/dtls_client/prj_x86.conf b/samples/microkernel/apps/net/dtls_client/prj_x86.conf
deleted file mode 100644
index 9034c126d..000000000
--- a/samples/microkernel/apps/net/dtls_client/prj_x86.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_NETWORKING=y
-CONFIG_NETWORKING_WITH_LOGGING=y
-CONFIG_NETWORKING_WITH_LOOPBACK=y
-CONFIG_NETWORKING_UART=y
-CONFIG_NETWORKING_DEBUG_UART=y
-CONFIG_IP_BUF_TX_SIZE=4
-CONFIG_IP_BUF_RX_SIZE=3
-CONFIG_NANO_TIMEOUTS=y
-CONFIG_TINYDTLS=y
diff --git a/samples/microkernel/apps/net/dtls_server/Makefile b/samples/microkernel/apps/net/dtls_server/Makefile
deleted file mode 100644
index 8623b40b9..000000000
--- a/samples/microkernel/apps/net/dtls_server/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Makefile - dtls server that is used in testing
-
-#
-# Copyright (c) 2015 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-MDEF_FILE = prj.mdef
-KERNEL_TYPE = micro
-BOARD ?= basic_minuteia
-CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/dtls_server/src/
-
-QEMU_EXTRA_FLAGS = -serial none -serial unix:/tmp/slip.sock
-
-include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/microkernel/apps/net/dtls_server/prj.mdef b/samples/microkernel/apps/net/dtls_server/prj.mdef
deleted file mode 100644
index f168b4467..000000000
--- a/samples/microkernel/apps/net/dtls_server/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : DTSL server
-
-% TASK NAME  PRIO ENTRY STACK GROUPS
-% ==================================
-  TASK TASKA    7 startup  3000 [EXE]
diff --git a/samples/microkernel/apps/net/dtls_server/prj_arm.conf b/samples/microkernel/apps/net/dtls_server/prj_arm.conf
deleted file mode 100644
index 7e0f667a2..000000000
--- a/samples/microkernel/apps/net/dtls_server/prj_arm.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-CONFIG_NETWORKING=y
-CONFIG_NETWORKING_WITH_LOGGING=y
-CONFIG_NETWORKING_WITH_LOOPBACK=y
-CONFIG_NETWORKING_UART=y
-CONFIG_NETWORKING_DEBUG_UART=y
-CONFIG_IP_BUF_RX_SIZE=3
-CONFIG_IP_BUF_TX_SIZE=2
-CONFIG_NANO_TIMEOUTS=y
-CONFIG_TINYDTLS=y
-CONFIG_TINYDTLS_DEBUG=y
diff --git a/samples/microkernel/apps/net/dtls_server/prj_x86.conf b/samples/microkernel/apps/net/dtls_server/prj_x86.conf
deleted file mode 100644
index 4d276672b..000000000
--- a/samples/microkernel/apps/net/dtls_server/prj_x86.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-CONFIG_NETWORKING=y
-CONFIG_NETWORKING_WITH_LOGGING=y
-CONFIG_NETWORKING_WITH_LOOPBACK=y
-CONFIG_NETWORKING_UART=y
-CONFIG_NETWORKING_DEBUG_UART=y
-CONFIG_IP_BUF_RX_SIZE=3
-CONFIG_IP_BUF_TX_SIZE=2
-CONFIG_NANO_TIMEOUTS=y
-CONFIG_TINYDTLS=y
diff --git a/samples/microkernel/apps/net/echo_client/Makefile b/samples/microkernel/apps/net/echo_client/Makefile
deleted file mode 100644
index 88ea57f15..000000000
--- a/samples/microkernel/apps/net/echo_client/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Makefile - echo client test application
-
-#
-# Copyright (c) 2015 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-NET_IFACE ?= slip
-MDEF_FILE = prj.mdef
-KERNEL_TYPE = micro
-BOARD ?= qemu_x86
-CONF_FILE = prj_$(NET_IFACE).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/echo_client/src/
-
-include $(ZEPHYR_BASE)/Makefile.inc
-include $(ZEPHYR_BASE)/samples/net/echo_server/Makefile.ipstack
diff --git a/samples/microkernel/apps/net/echo_client/prj_802154.conf b/samples/microkernel/apps/net/echo_client/prj_802154.conf
deleted file mode 100644
index 7c3403c60..000000000
--- a/samples/microkernel/apps/net/echo_client/prj_802154.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_NETWORKING=y
-CONFIG_NETWORKING_WITH_LOGGING=y
-CONFIG_IP_BUF_RX_SIZE=2
-CONFIG_IP_BUF_TX_SIZE=3
-CONFIG_NETWORKING_WITH_15_4=y
-CONFIG_NETWORKING_WITH_15_4_TI_CC2520=y
-CONFIG_TI_CC2520_DEBUG=y
-CONFIG_NETWORKING_WITH_6LOWPAN=y
-CONFIG_6LOWPAN_COMPRESSION_IPHC=y
diff --git a/samples/microkernel/apps/net/echo_client/prj_arm.conf b/samples/microkernel/apps/net/echo_client/prj_arm.conf
deleted file mode 100644
index 1272801cc..000000000
--- a/samples/microkernel/apps/net/echo_client/prj_arm.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_NETWORKING=y
-CONFIG_NETWORKING_WITH_LOGGING=y
-CONFIG_NETWORKING_WITH_LOOPBACK=y
-CONFIG_NETWORKING_UART=y
-CONFIG_NETWORKING_DEBUG_UART=y
-CONFIG_IP_BUF_RX_SIZE=2
-CONFIG_IP_BUF_TX_SIZE=3
diff --git a/samples/microkernel/apps/net/echo_client/prj_slip.conf b/samples/microkernel/apps/net/echo_client/prj_slip.conf
deleted file mode 100644
index 1272801cc..000000000
--- a/samples/microkernel/apps/net/echo_client/prj_slip.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_NETWORKING=y
-CONFIG_NETWORKING_WITH_LOGGING=y
-CONFIG_NETWORKING_WITH_LOOPBACK=y
-CONFIG_NETWORKING_UART=y
-CONFIG_NETWORKING_DEBUG_UART=y
-CONFIG_IP_BUF_RX_SIZE=2
-CONFIG_IP_BUF_TX_SIZE=3
diff --git a/samples/microkernel/apps/net/echo_server/Makefile b/samples/microkernel/apps/net/echo_server/Makefile
deleted file mode 100644
index 9469db953..000000000
--- a/samples/microkernel/apps/net/echo_server/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Makefile - Network echo server microkernel
-
-#
-# Copyright (c) 2015 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-NET_IFACE ?= slip
-MDEF_FILE = prj.mdef
-KERNEL_TYPE = micro
-BOARD ?= qemu_x86
-CONF_FILE = prj_$(NET_IFACE).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/echo_server/src/
-
-include $(ZEPHYR_BASE)/Makefile.inc
-include $(ZEPHYR_BASE)/samples/net/echo_server/Makefile.ipstack
diff --git a/samples/microkernel/apps/net/echo_server/prj_802154.conf b/samples/microkernel/apps/net/echo_server/prj_802154.conf
deleted file mode 100644
index 9d4377b38..000000000
--- a/samples/microkernel/apps/net/echo_server/prj_802154.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-CONFIG_INIT_STACKS=y
-CONFIG_NETWORKING=y
-CONFIG_NETWORKING_WITH_LOGGING=y
-CONFIG_IP_BUF_RX_SIZE=3
-CONFIG_IP_BUF_TX_SIZE=2
-CONFIG_NANO_TIMEOUTS=y
-CONFIG_NETWORKING_WITH_15_4=y
-CONFIG_NETWORKING_WITH_15_4_TI_CC2520=y
-CONFIG_TI_CC2520_DEBUG=y
-CONFIG_NETWORKING_WITH_6LOWPAN=y
-CONFIG_6LOWPAN_COMPRESSION_IPHC=y
diff --git a/samples/microkernel/apps/net/echo_server/prj_slip.conf b/samples/microkernel/apps/net/echo_server/prj_slip.conf
deleted file mode 100644
index 91a67e6d5..000000000
--- a/samples/microkernel/apps/net/echo_server/prj_slip.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-CONFIG_NETWORKING=y
-CONFIG_NETWORKING_WITH_LOGGING=y
-CONFIG_NETWORKING_WITH_LOOPBACK=y
-CONFIG_NETWORKING_UART=y
-CONFIG_NETWORKING_DEBUG_UART=y
-CONFIG_IP_BUF_RX_SIZE=3
-CONFIG_IP_BUF_TX_SIZE=2
-CONFIG_NANO_TIMEOUTS=y
diff --git a/samples/microkernel/apps/net/test_15_4/Makefile b/samples/microkernel/apps/net/test_15_4/Makefile
deleted file mode 100644
index f5f297ac0..000000000
--- a/samples/microkernel/apps/net/test_15_4/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Makefile - IP 802.15.4 test Makefile for microkernel
-
-#
-# Copyright (c) 2011-2014, Wind River Systems, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-MDEF_FILE = prj.mdef
-KERNEL_TYPE = micro
-BOARD ?= qemu_x86
-CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/test_15_4/src/
-
-include $(ZEPHYR_BASE)/Makefile.inc
-include $(ZEPHYR_BASE)/samples/net/test_15_4/Makefile.15_4
diff --git a/samples/microkernel/apps/net/test_15_4/prj.mdef b/samples/microkernel/apps/net/test_15_4/prj.mdef
deleted file mode 100644
index cb3071793..000000000
--- a/samples/microkernel/apps/net/test_15_4/prj.mdef
+++ /dev/null
@@ -1,11 +0,0 @@
-% Application       : Network demo
-
-% TASK NAME  PRIO ENTRY STACK GROUPS
-% ==================================
-  TASK TASKA    7 taskA  2048 [EXE]
-  TASK TASKB    7 taskB  2048 [EXE]
-
-% SEMA NAME
-% =============
-  SEMA TASKASEM
-  SEMA TASKBSEM
diff --git a/samples/microkernel/apps/net/test_15_4/prj_arm.conf b/samples/microkernel/apps/net/test_15_4/prj_arm.conf
deleted file mode 100644
index 22cc99061..000000000
--- a/samples/microkernel/apps/net/test_15_4/prj_arm.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG_NETWORKING=y
-CONFIG_NETWORKING_WITH_LOGGING=y
-CONFIG_NETWORKING_WITH_6LOWPAN=y
-CONFIG_NETWORKING_WITH_15_4=y
-CONFIG_IP_BUF_RX_SIZE=5
-CONFIG_IP_BUF_TX_SIZE=3
diff --git a/samples/microkernel/apps/net/test_15_4/prj_x86.conf b/samples/microkernel/apps/net/test_15_4/prj_x86.conf
deleted file mode 100644
index 73aff1cc7..000000000
--- a/samples/microkernel/apps/net/test_15_4/prj_x86.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG_NETWORKING=y
-CONFIG_NETWORKING_WITH_LOGGING=y
-CONFIG_NETWORKING_WITH_6LOWPAN=y
-CONFIG_NETWORKING_WITH_15_4=y
-CONFIG_NET_15_4_LOOPBACK_NUM=1
-CONFIG_IP_BUF_RX_SIZE=5
-CONFIG_IP_BUF_TX_SIZE=3
diff --git a/samples/nanokernel/apps/net/echo_server/Makefile b/samples/nanokernel/apps/net/echo_server/Makefile
deleted file mode 100644
index 9003ecd72..000000000
--- a/samples/nanokernel/apps/net/echo_server/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Makefile - Network echo server microkernel
-
-#
-# Copyright (c) 2015 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-MDEF_FILE = prj.mdef
-KERNEL_TYPE = nano
-BOARD ?= qemu_x86
-CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/echo_server/src/
-QEMU_EXTRA_FLAGS = -serial unix:/tmp/slip.sock
-
-include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/nanokernel/apps/net/echo_server/prj.mdef b/samples/nanokernel/apps/net/echo_server/prj.mdef
deleted file mode 100644
index 2316c4a5e..000000000
--- a/samples/nanokernel/apps/net/echo_server/prj.mdef
+++ /dev/null
@@ -1,11 +0,0 @@
-% Application       : Network listener
-
-% TASK NAME  PRIO ENTRY STACK GROUPS
-% ==================================
-  TASK TASKA    7 taskA  2048 [EXE]
-  TASK TASKB    7 taskB  2048 [EXE]
-
-% SEMA NAME
-% =============
-  SEMA TASKASEM
-  SEMA TASKBSEM
diff --git a/samples/nanokernel/apps/net/echo_server/prj_arm.conf b/samples/nanokernel/apps/net/echo_server/prj_arm.conf
deleted file mode 100644
index 0833500b9..000000000
--- a/samples/nanokernel/apps/net/echo_server/prj_arm.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_NETWORKING=y
-CONFIG_NETWORKING_WITH_LOGGING=y
-CONFIG_NETWORKING_WITH_LOOPBACK=y
-CONFIG_NETWORKING_UART=y
-CONFIG_NETWORKING_DEBUG_UART=y
diff --git a/samples/nanokernel/apps/net/echo_server/prj_x86.conf b/samples/nanokernel/apps/net/echo_server/prj_x86.conf
deleted file mode 100644
index 8aacdb1ec..000000000
--- a/samples/nanokernel/apps/net/echo_server/prj_x86.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG_INIT_STACKS=y
-CONFIG_NETWORKING=y
-CONFIG_NETWORKING_WITH_LOGGING=y
-CONFIG_NETWORKING_WITH_LOOPBACK=y
-CONFIG_NETWORKING_UART=y
-CONFIG_NETWORKING_DEBUG_UART=y
diff --git a/samples/nanokernel/apps/net/loopback_test/Makefile b/samples/nanokernel/apps/net/loopback_test/Makefile
deleted file mode 100644
index 26e75e8e7..000000000
--- a/samples/nanokernel/apps/net/loopback_test/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Makefile - Simple loopback network app Makefile for nanokernel
-
-#
-# Copyright (c) 2015 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-MDEF_FILE = prj.mdef
-KERNEL_TYPE = nano
-BOARD ?= qemu_x86
-CONF_FILE = prj_$(ARCH).conf
-SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/loopback_test/src/
-
-include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/nanokernel/apps/net/loopback_test/prj.mdef b/samples/nanokernel/apps/net/loopback_test/prj.mdef
deleted file mode 100644
index bce99aa8b..000000000
--- a/samples/nanokernel/apps/net/loopback_test/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : Bluetooth Shell
-
-% TASK NAME         PRIO ENTRY           STACK GROUPS
-% ===================================================
-  TASK MAIN            7 mainloop        2048 [EXE]
diff --git a/samples/nanokernel/apps/net/loopback_test/prj_arm.conf b/samples/nanokernel/apps/net/loopback_test/prj_arm.conf
deleted file mode 100644
index 943d4a680..000000000
--- a/samples/nanokernel/apps/net/loopback_test/prj_arm.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_NETWORKING=y
-CONFIG_NETWORKING_WITH_LOGGING=y
-CONFIG_NETWORKING_WITH_LOOPBACK=y
diff --git a/samples/nanokernel/apps/net/loopback_test/prj_x86.conf b/samples/nanokernel/apps/net/loopback_test/prj_x86.conf
deleted file mode 100644
index 943d4a680..000000000
--- a/samples/nanokernel/apps/net/loopback_test/prj_x86.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_NETWORKING=y
-CONFIG_NETWORKING_WITH_LOGGING=y
-CONFIG_NETWORKING_WITH_LOOPBACK=y
diff --git a/samples/net/coap_observe_client/Makefile b/samples/net/coap_observe_client/Makefile
index dff5065f7..ef0643938 100644
--- a/samples/net/coap_observe_client/Makefile
+++ b/samples/net/coap_observe_client/Makefile
@@ -17,7 +17,7 @@
 #
 
 MDEF_FILE = prj.mdef
-KERNEL_TYPE = nano
+KERNEL_TYPE ?= nano
 BOARD ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
diff --git a/samples/net/coap_observe_client/testcase.ini b/samples/net/coap_observe_client/testcase.ini
index 14bbcb8fb..08d582706 100644
--- a/samples/net/coap_observe_client/testcase.ini
+++ b/samples/net/coap_observe_client/testcase.ini
@@ -1,5 +1,12 @@
-[test]
+[test-nano]
 tags = net
 build_only = true
 arch_whitelist = x86
-platform_whitelist = minnowboard
+platform_whitelist = qemu_x86
+
+[test-micro]
+tags = net
+build_only = true
+extra_args = KERNEL_TYPE=micro
+arch_whitelist = x86
+platform_whitelist = qemu_x86
diff --git a/samples/net/coap_server/Makefile b/samples/net/coap_server/Makefile
index 3dc2b0e6c..47de5348d 100644
--- a/samples/net/coap_server/Makefile
+++ b/samples/net/coap_server/Makefile
@@ -17,7 +17,7 @@
 #
 
 MDEF_FILE = prj.mdef
-KERNEL_TYPE = nano
+KERNEL_TYPE ?= nano
 BOARD ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
diff --git a/samples/net/coap_server/testcase.ini b/samples/net/coap_server/testcase.ini
index 14bbcb8fb..d82566bf3 100644
--- a/samples/net/coap_server/testcase.ini
+++ b/samples/net/coap_server/testcase.ini
@@ -1,5 +1,14 @@
-[test]
+[test-nano]
 tags = net
 build_only = true
 arch_whitelist = x86
-platform_whitelist = minnowboard
+platform_whitelist = qemu_x86
+kernel = nano
+
+[test-micro]
+tags = net
+build_only = true
+extra_args = KERNEL_TYPE=micro
+kernel = micro
+arch_whitelist = x86
+platform_whitelist = qemu_x86
diff --git a/samples/net/dtls_client/Makefile b/samples/net/dtls_client/Makefile
index bcd2a4d6b..03b70454d 100644
--- a/samples/net/dtls_client/Makefile
+++ b/samples/net/dtls_client/Makefile
@@ -16,7 +16,8 @@
 # limitations under the License.
 #
 
-KERNEL_TYPE = nano
+MDEF_FILE = prj.mdef
+KERNEL_TYPE ?= nano
 BOARD ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
diff --git a/samples/microkernel/apps/net/coap_server/prj.mdef b/samples/net/dtls_client/prj.mdef
index f168b4467..f168b4467 100644
--- a/samples/microkernel/apps/net/coap_server/prj.mdef
+++ b/samples/net/dtls_client/prj.mdef
diff --git a/samples/net/dtls_client/testcase.ini b/samples/net/dtls_client/testcase.ini
index 14bbcb8fb..564cc953b 100644
--- a/samples/net/dtls_client/testcase.ini
+++ b/samples/net/dtls_client/testcase.ini
@@ -1,5 +1,14 @@
-[test]
+[test-nano]
 tags = net
 build_only = true
 arch_whitelist = x86
-platform_whitelist = minnowboard
+platform_whitelist = qemu_x86
+kernel = nano
+
+[test-micro]
+tags = net
+kernel = micro
+build_only = true
+extra_args = KERNEL_TYPE=micro
+arch_whitelist = x86
+platform_whitelist = qemu_x86
diff --git a/samples/net/dtls_server/Makefile b/samples/net/dtls_server/Makefile
index 18518e3c1..88d7153b4 100644
--- a/samples/net/dtls_server/Makefile
+++ b/samples/net/dtls_server/Makefile
@@ -16,7 +16,8 @@
 # limitations under the License.
 #
 
-KERNEL_TYPE = nano
+MDEF_FILE = prj.mdef
+KERNEL_TYPE ?= nano
 BOARD ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 
diff --git a/samples/microkernel/apps/net/dtls_client/prj.mdef b/samples/net/dtls_server/prj.mdef
index f168b4467..f168b4467 100644
--- a/samples/microkernel/apps/net/dtls_client/prj.mdef
+++ b/samples/net/dtls_server/prj.mdef
diff --git a/samples/net/dtls_server/testcase.ini b/samples/net/dtls_server/testcase.ini
index 14bbcb8fb..d82566bf3 100644
--- a/samples/net/dtls_server/testcase.ini
+++ b/samples/net/dtls_server/testcase.ini
@@ -1,5 +1,14 @@
-[test]
+[test-nano]
 tags = net
 build_only = true
 arch_whitelist = x86
-platform_whitelist = minnowboard
+platform_whitelist = qemu_x86
+kernel = nano
+
+[test-micro]
+tags = net
+build_only = true
+extra_args = KERNEL_TYPE=micro
+kernel = micro
+arch_whitelist = x86
+platform_whitelist = qemu_x86
diff --git a/samples/net/echo_client/Makefile b/samples/net/echo_client/Makefile
index 1e5ec9a33..4857da5c1 100644
--- a/samples/net/echo_client/Makefile
+++ b/samples/net/echo_client/Makefile
@@ -17,7 +17,8 @@
 #
 
 NET_IFACE ?= slip
-KERNEL_TYPE = nano
+MDEF_FILE = prj.mdef
+KERNEL_TYPE ?= nano
 BOARD ?= qemu_x86
 CONF_FILE = prj_$(NET_IFACE).conf
 
diff --git a/samples/microkernel/apps/net/echo_client/prj.mdef b/samples/net/echo_client/prj.mdef
index 865de24b6..865de24b6 100644
--- a/samples/microkernel/apps/net/echo_client/prj.mdef
+++ b/samples/net/echo_client/prj.mdef
diff --git a/samples/net/echo_server/Makefile b/samples/net/echo_server/Makefile
index a482d4765..bb775feba 100644
--- a/samples/net/echo_server/Makefile
+++ b/samples/net/echo_server/Makefile
@@ -17,7 +17,8 @@
 #
 
 NET_IFACE ?= slip
-KERNEL_TYPE = nano
+MDEF_FILE = prj.mdef
+KERNEL_TYPE ?= nano
 BOARD ?= qemu_x86
 CONF_FILE = prj_$(NET_IFACE).conf
 
diff --git a/samples/microkernel/apps/net/echo_server/prj.mdef b/samples/net/echo_server/prj.mdef
index 970ed645d..970ed645d 100644
--- a/samples/microkernel/apps/net/echo_server/prj.mdef
+++ b/samples/net/echo_server/prj.mdef
diff --git a/samples/microkernel/apps/net/echo_server/prj_ethernet.conf b/samples/net/echo_server/prj_ethernet.conf
index 00a976571..00a976571 100644
--- a/samples/microkernel/apps/net/echo_server/prj_ethernet.conf
+++ b/samples/net/echo_server/prj_ethernet.conf
diff --git a/samples/net/test_15_4/Makefile b/samples/net/test_15_4/Makefile
index 1ee363b97..e4f914477 100644
--- a/samples/net/test_15_4/Makefile
+++ b/samples/net/test_15_4/Makefile
@@ -17,7 +17,7 @@
 #
 
 MDEF_FILE = prj.mdef
-KERNEL_TYPE = nano
+KERNEL_TYPE ?= nano
 BOARD ?= qemu_x86
 CONF_FILE = prj_$(ARCH).conf
 CFLAGS += -DNET_802154_TX_STACK_SIZE=5120
diff --git a/samples/net/test_15_4/prj.mdef b/samples/net/test_15_4/prj.mdef
index bad07455f..cb3071793 100644
--- a/samples/net/test_15_4/prj.mdef
+++ b/samples/net/test_15_4/prj.mdef
@@ -1 +1,11 @@
 % Application       : Network demo
+
+% TASK NAME  PRIO ENTRY STACK GROUPS
+% ==================================
+  TASK TASKA    7 taskA  2048 [EXE]
+  TASK TASKB    7 taskB  2048 [EXE]
+
+% SEMA NAME
+% =============
+  SEMA TASKASEM
+  SEMA TASKBSEM