net: apps: Refactor echo-server compilation

Separate setup for different low level bearer. By default the
Makefile will create version suitable for qemu testing using
slip. If one writes "make NET_IFACE=802154" then IEEE 802.15.4
radio specific settings are activated.

Because echo-server does not contain any processor specific
settings, remove the ARM config files and rename the x86
specific ones.

Change-Id: I2caf26979f32496c6efb4dd1f625a60e3e5f6744
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>

10 files changed, 25 insertions, 26 deletions

diff --git a/samples/microkernel/apps/net/echo_server/Makefile b/samples/microkernel/apps/net/echo_server/Makefile
index adaa70b46..9469db953 100644
--- a/samples/microkernel/apps/net/echo_server/Makefile
+++ b/samples/microkernel/apps/net/echo_server/Makefile
@@ -16,11 +16,11 @@
 # limitations under the License.
 #
 
-NET_INTF ?= slip
+NET_IFACE ?= slip
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 BOARD ?= qemu_x86
-CONF_FILE = prj_$(ARCH)_$(NET_INTF).conf
+CONF_FILE = prj_$(NET_IFACE).conf
 SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/echo_server/src/
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/microkernel/apps/net/echo_server/prj_802154.conf b/samples/microkernel/apps/net/echo_server/prj_802154.conf
new file mode 100644
index 000000000..9d4377b38
--- /dev/null
+++ b/samples/microkernel/apps/net/echo_server/prj_802154.conf
@@ -0,0 +1,11 @@
+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_x86_ethernet.conf b/samples/microkernel/apps/net/echo_server/prj_ethernet.conf
index 00a976571..00a976571 100644
--- a/samples/microkernel/apps/net/echo_server/prj_x86_ethernet.conf
+++ b/samples/microkernel/apps/net/echo_server/prj_ethernet.conf
diff --git a/samples/microkernel/apps/net/echo_server/prj_arm_slip.conf b/samples/microkernel/apps/net/echo_server/prj_slip.conf
index 91a67e6d5..91a67e6d5 100644
--- a/samples/microkernel/apps/net/echo_server/prj_arm_slip.conf
+++ b/samples/microkernel/apps/net/echo_server/prj_slip.conf
diff --git a/samples/microkernel/apps/net/echo_server/prj_x86_slip.conf b/samples/microkernel/apps/net/echo_server/prj_x86_slip.conf
deleted file mode 100644
index 7bac063ff..000000000
--- a/samples/microkernel/apps/net/echo_server/prj_x86_slip.conf
+++ /dev/null
@@ -1,9 +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
-CONFIG_IP_BUF_RX_SIZE=3
-CONFIG_IP_BUF_TX_SIZE=2
-CONFIG_NANO_TIMEOUTS=y
diff --git a/samples/net/echo_server/Makefile b/samples/net/echo_server/Makefile
index 649eb89f9..a482d4765 100644
--- a/samples/net/echo_server/Makefile
+++ b/samples/net/echo_server/Makefile
@@ -16,10 +16,10 @@
 # limitations under the License.
 #
 
-MDEF_FILE = prj.mdef
+NET_IFACE ?= slip
 KERNEL_TYPE = nano
 BOARD ?= qemu_x86
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj_$(NET_IFACE).conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
 include $(ZEPHYR_BASE)/samples/net/echo_server/Makefile.ipstack
diff --git a/samples/net/echo_server/prj.mdef b/samples/net/echo_server/prj.mdef
deleted file mode 100644
index d14a3c083..000000000
--- a/samples/net/echo_server/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : Network echo server
-
-% TASK NAME  PRIO ENTRY STACK GROUPS
-% ==================================
-  TASK TASKA    7 task_receive  2048 [EXE]
diff --git a/samples/net/echo_server/prj_802154.conf b/samples/net/echo_server/prj_802154.conf
new file mode 100644
index 000000000..ed5966268
--- /dev/null
+++ b/samples/net/echo_server/prj_802154.conf
@@ -0,0 +1,10 @@
+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/net/echo_server/prj_arm.conf b/samples/net/echo_server/prj_slip.conf
index 91a67e6d5..91a67e6d5 100644
--- a/samples/net/echo_server/prj_arm.conf
+++ b/samples/net/echo_server/prj_slip.conf
diff --git a/samples/net/echo_server/prj_x86.conf b/samples/net/echo_server/prj_x86.conf
deleted file mode 100644
index 91a67e6d5..000000000
--- a/samples/net/echo_server/prj_x86.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