From 350d5d4d60eaf3e96524f761e8e3d98c67a2a07d Mon Sep 17 00:00:00 2001
From: Wu Jiequan <jiequanx.wu@intel.com>
Date: Tue, 9 May 2017 20:04:08 +0800
Subject: [PATCH] net: zoap_server: Unify Makefile and add prj file

Modify the Makefile to unify with other sample apps and
add the arduino 101 configuration file.

Signed-off-by: Wu Jiequan <jiequanx.wu@intel.com>
---
 samples/net/zoap_server/Makefile              |  2 +-
 samples/net/zoap_server/prj_arduino_101.conf  | 42 +++++++++++++++++++
 .../{prj.conf => prj_qemu_x86.conf}           |  0
 ....conf => prj_quark_se_c1000_devboard.conf} |  0
 samples/net/zoap_server/testcase.ini          |  6 +--
 5 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 samples/net/zoap_server/prj_arduino_101.conf
 rename samples/net/zoap_server/{prj.conf => prj_qemu_x86.conf} (100%)
 rename samples/net/zoap_server/{prj_cc2520.conf => prj_quark_se_c1000_devboard.conf} (100%)

diff --git a/samples/net/zoap_server/Makefile b/samples/net/zoap_server/Makefile
index 7943e26c859..ece7fe481b1 100644
--- a/samples/net/zoap_server/Makefile
+++ b/samples/net/zoap_server/Makefile
@@ -7,7 +7,7 @@
 #
 
 BOARD ?= qemu_x86
-CONF_FILE ?= prj.conf
+CONF_FILE ?= prj_$(BOARD).conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
 
diff --git a/samples/net/zoap_server/prj_arduino_101.conf b/samples/net/zoap_server/prj_arduino_101.conf
new file mode 100644
index 00000000000..0ca02c0f96f
--- /dev/null
+++ b/samples/net/zoap_server/prj_arduino_101.conf
@@ -0,0 +1,42 @@
+CONFIG_SYS_LOG=y
+CONFIG_NET_LOG=y
+CONFIG_INIT_STACKS=y
+CONFIG_MAIN_STACK_SIZE=4096
+#CONFIG_TEST_RANDOM_GENERATOR=y
+# IP Stack Configuration
+CONFIG_NETWORKING=y
+CONFIG_NET_ARP=y
+CONFIG_NET_L2_ETHERNET=y
+CONFIG_NET_IPV4=y
+CONFIG_NET_IPV6=y
+CONFIG_NET_LOG=y
+CONFIG_NET_UDP=y
+CONFIG_RANDOM_GENERATOR=y
+CONFIG_TEST_RANDOM_GENERATOR=y
+
+CONFIG_NET_BUF=y
+CONFIG_NET_IFACE_UNICAST_IPV4_ADDR_COUNT=3
+
+# ENC28J60 Ethernet Device
+CONFIG_ETH_ENC28J60=y
+CONFIG_ETH_ENC28J60_0=y
+CONFIG_ETH_ENC28J60_0_SPI_PORT_NAME="SPI_1"
+CONFIG_ETH_ENC28J60_0_MAC3=0x2D
+CONFIG_ETH_ENC28J60_0_MAC4=0x30
+CONFIG_ETH_ENC28J60_0_MAC5=0x36
+
+# Arduino 101
+CONFIG_SPI=y
+
+CONFIG_SYS_LOG_SHOW_COLOR=y
+CONFIG_INIT_STACKS=y
+CONFIG_PRINTK=y
+CONFIG_NET_STATISTICS=y
+CONFIG_NET_NBUF_RX_COUNT=14
+CONFIG_NET_NBUF_TX_COUNT=14
+CONFIG_NET_NBUF_DATA_COUNT=30
+CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=3
+CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=2
+CONFIG_NET_MAX_CONTEXTS=10
+
+CONFIG_ZOAP=y
diff --git a/samples/net/zoap_server/prj.conf b/samples/net/zoap_server/prj_qemu_x86.conf
similarity index 100%
rename from samples/net/zoap_server/prj.conf
rename to samples/net/zoap_server/prj_qemu_x86.conf
diff --git a/samples/net/zoap_server/prj_cc2520.conf b/samples/net/zoap_server/prj_quark_se_c1000_devboard.conf
similarity index 100%
rename from samples/net/zoap_server/prj_cc2520.conf
rename to samples/net/zoap_server/prj_quark_se_c1000_devboard.conf
diff --git a/samples/net/zoap_server/testcase.ini b/samples/net/zoap_server/testcase.ini
index fff1e135219..4bec61c2425 100644
--- a/samples/net/zoap_server/testcase.ini
+++ b/samples/net/zoap_server/testcase.ini
@@ -2,7 +2,7 @@
 tags = net
 build_only = true
 arch_whitelist = x86
-platform_exclude = quark_d2000_crb # not enough RAM
+platform_exclude = quark_d2000_crb qemu_x86_iamcu # not enough RAM
 
 [test_bt]
 tags = net bluetooth
@@ -13,5 +13,5 @@ platform_whitelist = qemu_x86
 [test_net]
 tags = net
 build_only = true
-extra_args = CONF_FILE="prj_cc2520.conf"
-platform_whitelist = quark_se_c1000_devboard
\ No newline at end of file
+extra_args = CONF_FILE="prj_quark_se_c1000_devboard.conf"
+platform_whitelist = quark_se_c1000_devboard