michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: do not depend on ARCH

Browse source 
Rename project configuration to be architecture independent and do not use ARCH
in Makefile.

Change-Id: Ic793751e3187bc74fd14cec929754d691b01a799
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2016-10-23 18:58:31 -04:00 • committed by Jukka Rissanen
commit e6bbc5003c
27 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/net/6lo/Makefile
View file

@ -1,6 +1,6 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano KERNEL_TYPE ?= nano
CONF_FILE = prj_$(ARCH).conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

0
tests/net/6lo/prj_x86.conf → tests/net/6lo/prj.conf
View file

2
tests/net/6lo/src/main.c
View file

@ -106,7 +106,7 @@ uint8_t dst_mac[8] = { 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xaa };
/* Source and Destination addresses are contect related addresses. */ /* Source and Destination addresses are contect related addresses. */
#if defined(CONFIG_NET_6LO_CONTEXT) #if defined(CONFIG_NET_6LO_CONTEXT)
/* CONFIG_NET_MAX_6LO_CONTEXTS=2, defined in prj_x86.conf, If you want /* CONFIG_NET_MAX_6LO_CONTEXTS=2, defined in prj.conf, If you want
* to increase this value, then add extra contexts here. * to increase this value, then add extra contexts here.
*/ */
#define ctx1_prefix \ #define ctx1_prefix \

2
tests/net/arp/Makefile
View file

@ -1,6 +1,6 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano KERNEL_TYPE ?= nano
CONF_FILE = prj_$(ARCH).conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

0
tests/net/arp/prj_x86.conf → tests/net/arp/prj.conf
View file

2
tests/net/dhcpv4/Makefile
View file

@ -1,6 +1,6 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano KERNEL_TYPE ?= nano
CONF_FILE = prj_$(ARCH).conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

0
tests/net/dhcpv4/prj_x86.conf → tests/net/dhcpv4/prj.conf
View file

2
tests/net/fragment/Makefile
View file

@ -1,6 +1,6 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano KERNEL_TYPE ?= nano
CONF_FILE = prj_$(ARCH).conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

0
tests/net/fragment/prj_x86.conf → tests/net/fragment/prj.conf
View file

2
tests/net/icmpv6/Makefile
View file

@ -1,6 +1,6 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano KERNEL_TYPE ?= nano
CONF_FILE = prj_$(ARCH).conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

0
tests/net/icmpv6/prj_x86.conf → tests/net/icmpv6/prj.conf
View file

2
tests/net/ieee802154/Makefile
View file

@ -1,6 +1,6 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano KERNEL_TYPE ?= nano
CONF_FILE = prj_$(ARCH).conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

0
tests/net/ieee802154/prj_x86.conf → tests/net/ieee802154/prj.conf
View file

2
tests/net/ip-addr/Makefile
View file

@ -1,6 +1,6 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano KERNEL_TYPE ?= nano
CONF_FILE = prj_$(ARCH).conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

0
tests/net/ip-addr/prj_x86.conf → tests/net/ip-addr/prj.conf
View file

3
tests/net/ipv6/Makefile
View file

@ -1,7 +1,6 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano KERNEL_TYPE ?= nano
ARCH ?= x86 CONF_FILE = prj.conf
CONF_FILE = prj_$(ARCH).conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

0
tests/net/ipv6/prj_x86.conf → tests/net/ipv6/prj.conf
View file

2
tests/net/nbuf/Makefile
View file

@ -1,6 +1,6 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano KERNEL_TYPE ?= nano
CONF_FILE ?= prj_x86.conf CONF_FILE ?= prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

0
tests/net/nbuf/prj_x86.conf → tests/net/nbuf/prj.conf
View file

2
tests/net/neighbor/Makefile
View file

@ -1,6 +1,6 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano KERNEL_TYPE ?= nano
CONF_FILE = prj_$(ARCH).conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

0
tests/net/neighbor/prj_x86.conf → tests/net/neighbor/prj.conf
View file

3
tests/net/tcp/Makefile
View file

@ -1,7 +1,6 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano KERNEL_TYPE ?= nano
CONF_FILE = prj_$(ARCH).conf CONF_FILE = prj.conf
ARCH ?= x86
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

0
tests/net/tcp/prj_x86.conf → tests/net/tcp/prj.conf
View file

2
tests/net/udp/Makefile
View file

@ -1,6 +1,6 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano KERNEL_TYPE ?= nano
CONF_FILE = prj_$(ARCH).conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

0
tests/net/udp/prj_x86.conf → tests/net/udp/prj.conf
View file

2
tests/net/utils/Makefile
View file

@ -1,6 +1,6 @@
BOARD ?= qemu_x86 BOARD ?= qemu_x86
MDEF_FILE = prj.mdef MDEF_FILE = prj.mdef
KERNEL_TYPE ?= nano KERNEL_TYPE ?= nano
CONF_FILE = prj_$(ARCH).conf CONF_FILE = prj.conf
include $(ZEPHYR_BASE)/Makefile.inc include $(ZEPHYR_BASE)/Makefile.inc

0
tests/net/utils/prj_x86.conf → tests/net/utils/prj.conf
View file