patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

samples/net: Let's merge ieee802154 qemu and hw tests into one

Browse source 
There is now only samples/net/ieee802154 for low level IEEE 802.15.4
test.

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Tomasz Bursztyka 2017-10-05 11:11:46 +02:00 committed by Anas Nashif
parent d4eeaff93c
commit 0576a393f2
16 changed files with 32 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
samples/net/common/Makefile.common
View file

@ -11,7 +11,6 @@ ccflags-y +=-I${ZEPHYR_BASE}/drivers/
ccflags-y +=-I${ZEPHYR_BASE}/include/drivers/
obj-y += ../../common/cc2520_frdm_k64f.o
endif
endif
ifeq ($(CONFIG_NET_TESTING), y)
ccflags-y +=-I${ZEPHYR_BASE}/samples/net/common/

7
samples/net/ieee802154/hw/Makefile → samples/net/ieee802154/Makefile
View file

@ -6,7 +6,12 @@
# SPDX-License-Identifier: Apache-2.0
#
BOARD ?= quark_se_c1000_devboard
BOARD ?= qemu_x86
CONF_FILE ?= prj.conf
include $(ZEPHYR_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/samples/net/common/Makefile.ipstack
ifeq ($(CONFIG_BOARD_FRDM_K64F),y)
include $(ZEPHYR_BASE)/samples/net/common/Makefile.common
endif

0
samples/net/ieee802154/qemu/prj.conf → samples/net/ieee802154/prj.conf
View file

7
samples/net/ieee802154/hw/prj_cc2520_1.conf → samples/net/ieee802154/prj_cc2520_1.conf
View file

@ -29,8 +29,6 @@ CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_INIT_STACKS=y
CONFIG_PRINTK=y
CONFIG_NET_SHELL=y
CONFIG_NET_DEBUG_CORE=n
CONFIG_NET_DEBUG_IPV6_NBR_CACHE=n
CONFIG_NET_DEBUG_IPV6=n
@ -49,7 +47,6 @@ CONFIG_NET_L2_IEEE802154_FRAGMENT=y
CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y
CONFIG_NET_L2_IEEE802154_SECURITY=y
CONFIG_NET_L2_IEEE802154_SECURITY_CRYPTO_DEV_NAME="cc2520_crypto"
CONFIG_NET_L2_IEEE802154_SHELL=y
CONFIG_IEEE802154_CC2520=y
CONFIG_IEEE802154_CC2520_AUTO_ACK=y
@ -62,3 +59,7 @@ CONFIG_NET_APP_IEEE802154_DEV_NAME="cc2520"
CONFIG_NET_APP_IEEE802154_SECURITY_KEY="moooooooooooooh"
CONFIG_NET_APP_IEEE802154_SECURITY_KEY_MODE=0
CONFIG_NET_APP_IEEE802154_SECURITY_LEVEL=7
CONFIG_NET_SHELL=y
CONFIG_KERNEL_SHELL=y
CONFIG_NET_L2_IEEE802154_SHELL=y

7
samples/net/ieee802154/hw/prj_cc2520_2.conf → samples/net/ieee802154/prj_cc2520_2.conf
View file

@ -29,8 +29,6 @@ CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_INIT_STACKS=y
CONFIG_PRINTK=y
CONFIG_NET_SHELL=y
CONFIG_NET_DEBUG_CORE=n
CONFIG_NET_DEBUG_IPV6_NBR_CACHE=n
CONFIG_NET_DEBUG_IPV6=n
@ -49,7 +47,6 @@ CONFIG_NET_L2_IEEE802154_FRAGMENT=y
CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y
CONFIG_NET_L2_IEEE802154_SECURITY=y
CONFIG_NET_L2_IEEE802154_SECURITY_CRYPTO_DEV_NAME="cc2520_crypto"
CONFIG_NET_L2_IEEE802154_SHELL=y
CONFIG_IEEE802154_CC2520=y
CONFIG_IEEE802154_CC2520_AUTO_ACK=y
@ -62,3 +59,7 @@ CONFIG_NET_APP_IEEE802154_DEV_NAME="cc2520"
CONFIG_NET_APP_IEEE802154_SECURITY_KEY="moooooooooooooh"
CONFIG_NET_APP_IEEE802154_SECURITY_KEY_MODE=0
CONFIG_NET_APP_IEEE802154_SECURITY_LEVEL=7
CONFIG_NET_SHELL=y
CONFIG_KERNEL_SHELL=y
CONFIG_NET_L2_IEEE802154_SHELL=y

0
samples/net/ieee802154/qemu/prj_client.conf → samples/net/ieee802154/prj_client.conf
View file

7
samples/net/ieee802154/hw/prj_kw40z.conf → samples/net/ieee802154/prj_kw40z.conf
View file

@ -25,8 +25,6 @@ CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_INIT_STACKS=y
CONFIG_PRINTK=y
CONFIG_NET_SHELL=n
CONFIG_NET_DEBUG_CORE=y
CONFIG_NET_DEBUG_IPV6_NBR_CACHE=y
CONFIG_NET_DEBUG_IPV6=y
@ -44,7 +42,6 @@ CONFIG_NET_DEBUG_L2_IEEE802154=y
CONFIG_NET_L2_IEEE802154_FRAGMENT=y
#CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y
CONFIG_NET_L2_IEEE802154_SECURITY=n
CONFIG_NET_L2_IEEE802154_SHELL=n
CONFIG_IEEE802154_KW41Z=y
CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1
@ -52,3 +49,7 @@ CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1
CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_IEEE802154_DEV_NAME="KW41Z"
CONFIG_NET_SHELL=y
CONFIG_KERNEL_SHELL=y
CONFIG_NET_L2_IEEE802154_SHELL=y

7
samples/net/ieee802154/hw/prj_kw41z.conf → samples/net/ieee802154/prj_kw41z.conf
View file

@ -21,8 +21,6 @@ CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_INIT_STACKS=y
CONFIG_PRINTK=y
CONFIG_NET_SHELL=y
CONFIG_NET_DEBUG_CORE=y
CONFIG_NET_DEBUG_IPV6_NBR_CACHE=y
CONFIG_NET_DEBUG_IPV6=y
@ -40,7 +38,6 @@ CONFIG_NET_DEBUG_L2_IEEE802154=y
CONFIG_NET_L2_IEEE802154_FRAGMENT=y
#CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y
CONFIG_NET_L2_IEEE802154_SECURITY=n
CONFIG_NET_L2_IEEE802154_SHELL=y
CONFIG_IEEE802154_KW41Z=y
CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1
@ -48,3 +45,7 @@ CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1
CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_IEEE802154_DEV_NAME="KW41Z"
CONFIG_NET_SHELL=y
CONFIG_KERNEL_SHELL=y
CONFIG_NET_L2_IEEE802154_SHELL=y

9
samples/net/ieee802154/hw/prj_mcr20a.conf → samples/net/ieee802154/prj_mcr20a.conf
View file

@ -24,8 +24,6 @@ CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_INIT_STACKS=y
CONFIG_PRINTK=y
CONFIG_NET_SHELL=y
CONFIG_NET_DEBUG_CORE=y
CONFIG_NET_DEBUG_IPV6_NBR_CACHE=y
CONFIG_NET_DEBUG_IPV6=y
@ -43,11 +41,14 @@ CONFIG_NET_DEBUG_L2_IEEE802154=y
CONFIG_NET_L2_IEEE802154_FRAGMENT=y
#CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y
CONFIG_NET_L2_IEEE802154_SECURITY=n
CONFIG_NET_L2_IEEE802154_SHELL=y
CONFIG_IEEE802154_MCR20A=y
CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1
CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_IEEE802154_DEV_NAME="mcr20a"
CONFIG_NET_APP_IEEE802154_DEV_NAME="mcr20a"
CONFIG_NET_SHELL=y
CONFIG_KERNEL_SHELL=y
CONFIG_NET_L2_IEEE802154_SHELL=y

9
samples/net/ieee802154/hw/prj_nrf5.conf → samples/net/ieee802154/prj_nrf5.conf
View file

@ -24,8 +24,6 @@ CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_INIT_STACKS=y
CONFIG_PRINTK=y
CONFIG_NET_SHELL=y
CONFIG_NET_DEBUG_CORE=y
CONFIG_NET_DEBUG_IPV6_NBR_CACHE=y
CONFIG_NET_DEBUG_IPV6=y
@ -43,11 +41,14 @@ CONFIG_NET_DEBUG_L2_IEEE802154=y
CONFIG_NET_L2_IEEE802154_FRAGMENT=y
#CONFIG_NET_DEBUG_L2_IEEE802154_FRAGMENT=y
CONFIG_NET_L2_IEEE802154_SECURITY=n
CONFIG_NET_L2_IEEE802154_SHELL=y
CONFIG_SYS_LOG_IEEE802154_DRIVER_LEVEL=1
CONFIG_IEEE802154_NRF5=y
CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::1"
CONFIG_NET_APP_IEEE802154_DEV_NAME="IEEE802154_nrf5"
CONFIG_NET_APP_IEEE802154_DEV_NAME="IEEE802154_nrf5"
CONFIG_NET_SHELL=y
CONFIG_KERNEL_SHELL=y
CONFIG_NET_L2_IEEE802154_SHELL=y

0
samples/net/ieee802154/qemu/prj_server.conf → samples/net/ieee802154/prj_server.conf
View file

14
samples/net/ieee802154/qemu/Makefile
View file

@ -1,14 +0,0 @@
# Makefile - ieee802154 example that is used in testing on qemu
#
# Copyright (c) 2016 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#
BOARD = qemu_x86
CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc
include $(ZEPHYR_BASE)/samples/net/common/Makefile.ipstack

1
samples/net/ieee802154/qemu/src/Makefile
View file

@ -1 +0,0 @@
obj-y = ieee802154_qemu_test.o

12
samples/net/ieee802154/qemu/src/ieee802154_qemu_test.c
View file

@ -1,12 +0,0 @@
/*
* Copyright (c) 2016 Intel Corporation.
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <zephyr.h>
void main(void)
{
return;
}

0
samples/net/ieee802154/hw/src/Makefile → samples/net/ieee802154/src/Makefile
View file

0
samples/net/ieee802154/hw/src/ieee802154_test.c → samples/net/ieee802154/src/ieee802154_test.c
View file