michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: apps: Refactor echo-server compilation

Browse source 
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>
This commit is contained in:
Jukka Rissanen 2016-02-02 16:28:37 +02:00 • committed by Anas Nashif
commit 396766531e
10 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
samples/microkernel/apps/net/echo_server/Makefile
View file

@ -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

11
samples/microkernel/apps/net/echo_server/prj_802154.conf Normal file
View file

@ -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

0
samples/microkernel/apps/net/echo_server/prj_x86_ethernet.conf → samples/microkernel/apps/net/echo_server/prj_ethernet.conf
View file

0
samples/microkernel/apps/net/echo_server/prj_arm_slip.conf → samples/microkernel/apps/net/echo_server/prj_slip.conf
View file

9
samples/microkernel/apps/net/echo_server/prj_x86_slip.conf
View file

@ -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

4
samples/net/echo_server/Makefile
View file

@ -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

5
samples/net/echo_server/prj.mdef
View file

@ -1,5 +0,0 @@
% Application : Network echo server
% TASK NAME PRIO ENTRY STACK GROUPS
% ==================================
TASK TASKA 7 task_receive 2048 [EXE]

10
samples/net/echo_server/prj_802154.conf Normal file
View file

@ -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

0
samples/net/echo_server/prj_arm.conf → samples/net/echo_server/prj_slip.conf
View file

8
samples/net/echo_server/prj_x86.conf
View file

@ -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