diff options
| author | Ravi kumar Veeramally <ravikumar.veeramally@linux.intel.com> | 2016-03-02 17:44:00 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@zephyrproject.org> | 2016-03-03 07:17:30 +0000 |
| commit | fe67b69cd0162abcfd561e909805143a8015463a (patch) | |
| tree | 60b4d301a1cc55e225ff02114228b681fe4f5231 | |
| parent | 4e2023c6639b09e6b78a3f53a8b4ae9f947c90f6 (diff) | |
net: apps: Add separate prj_qemu.conf for board type qemu
Add separate prj_qemu.conf files for qemu_86 board type. Also
remove set_options from Makefile.ipstack which is not required now.
Now build the echo-server with "make server NET_IFACE=qemu" and
echo-client with "make client NET_IFACE=qemu" command options.
Change-Id: I1f3c9c6a198f2b6cae54ae4a5da970b284ef84de
Signed-off-by: Ravi kumar Veeramally <ravikumar.veeramally@linux.intel.com>
| -rw-r--r-- | samples/net/echo_client/prj_qemu.conf | 11 | ||||
| -rw-r--r-- | samples/net/echo_server/Makefile.ipstack | 19 | ||||
| -rw-r--r-- | samples/net/echo_server/prj_qemu.conf | 10 |
3 files changed, 23 insertions, 17 deletions
diff --git a/samples/net/echo_client/prj_qemu.conf b/samples/net/echo_client/prj_qemu.conf new file mode 100644 index 000000000..5812fc472 --- /dev/null +++ b/samples/net/echo_client/prj_qemu.conf @@ -0,0 +1,11 @@ +CONFIG_TEST_RANDOM_GENERATOR=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_LOOPBACK_UART=y +CONFIG_NETWORKING_WITH_6LOWPAN=y +CONFIG_6LOWPAN_COMPRESSION_IPHC=y +CONFIG_NETWORKING_STATISTICS=y diff --git a/samples/net/echo_server/Makefile.ipstack b/samples/net/echo_server/Makefile.ipstack index 41c7a0615..ba15515fa 100644 --- a/samples/net/echo_server/Makefile.ipstack +++ b/samples/net/echo_server/Makefile.ipstack @@ -62,21 +62,6 @@ PIPE_CLIENT_OUT_LINK: ${PIPE_SERVER_OUT} .PHONY: setup_pipes_dual_monitor setup_pipes_dual_monitor: ${PIPE_SERVER_IN} ${PIPE_SERVER_OUT} ${PIPE_CLIENT_IN} ${PIPE_CLIENT_OUT} -CONFIG_OPTIONS_1="CONFIG_NETWORKING_WITH_15_4=y" -CONFIG_OPTIONS_2="CONFIG_NETWORKING_WITH_15_4_LOOPBACK_UART=y" -CONFIG_OPTIONS_3="CONFIG_NETWORKING_WITH_6LOWPAN=y" -CONFIG_OPTIONS_4="CONFIG_NETWORKING_STATISTICS=y" - -.PHONY: set_options -set_options: - # Network uart must be turned off as that will prevent communication - cp -f ${DOTCONFIG} ${DOTCONFIG}.orig ; true - grep -v CONFIG_NETWORKING_UART=y ${DOTCONFIG}.orig > ${DOTCONFIG} - echo "${CONFIG_OPTIONS_1}" >> ${DOTCONFIG} - echo "${CONFIG_OPTIONS_2}" >> ${DOTCONFIG} - echo "${CONFIG_OPTIONS_3}" >> ${DOTCONFIG} - echo "${CONFIG_OPTIONS_4}" >> ${DOTCONFIG} - export QEMU_NUM export QEMU_EXTRA_FLAGS @@ -94,13 +79,13 @@ start_monitor: ${ZEPHYR_BASE}/net/ip/tools/monitor_15_4 ${PIPE_BASE}-server ${PIPE_BASE}-client > /dev/null & \ echo "$$!" > ${PID_FILE} -server: remove_pipes setup_pipes_dual_monitor $(DOTCONFIG) set_options start_monitor +server: remove_pipes setup_pipes_dual_monitor $(DOTCONFIG) start_monitor $(Q)$(call zephyrmake,$(O),qemu); true $(Q)kill `cat ${PID_FILE}` $(Q)rm -f ${PID_FILE} -@killall monitor_15_4 > /dev/null 2>&1 ; true $(Q)stty sane -client: setup_pipes_dual_monitor $(DOTCONFIG) set_options +client: setup_pipes_dual_monitor $(DOTCONFIG) $(Q)$(call zephyrmake,$(O),qemu); true $(Q)stty sane diff --git a/samples/net/echo_server/prj_qemu.conf b/samples/net/echo_server/prj_qemu.conf new file mode 100644 index 000000000..eb0427438 --- /dev/null +++ b/samples/net/echo_server/prj_qemu.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_LOOPBACK_UART=y +CONFIG_NETWORKING_WITH_6LOWPAN=y +CONFIG_6LOWPAN_COMPRESSION_IPHC=y +CONFIG_NETWORKING_STATISTICS=y |