net: do not depend on ARCH

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>
2016-10-23 18:58:31 -04:00 · 2016-10-23 18:58:31 -04:00 · e6bbc5003c
commit e6bbc5003c
parent 408d0c2124
27 changed files with 14 additions and 16 deletions
--- a/tests/net/6lo/Makefile
+++ b/tests/net/6lo/Makefile
@ -1,6 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE ?= nano
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf

 include $(ZEPHYR_BASE)/Makefile.inc
--- a/tests/net/6lo/prj_x86.conf
+++ b/tests/net/6lo/prj_x86.conf
--- a/tests/net/6lo/src/main.c
+++ b/tests/net/6lo/src/main.c
@ -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. */
 #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.
 */
 #define ctx1_prefix \
--- a/tests/net/arp/Makefile
+++ b/tests/net/arp/Makefile
@ -1,6 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE ?= nano
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf

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

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

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

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

 include $(ZEPHYR_BASE)/Makefile.inc
--- a/tests/net/ieee802154/prj_x86.conf
+++ b/tests/net/ieee802154/prj_x86.conf
--- a/tests/net/ip-addr/Makefile
+++ b/tests/net/ip-addr/Makefile
@ -1,6 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE ?= nano
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf

 include $(ZEPHYR_BASE)/Makefile.inc
--- a/tests/net/ip-addr/prj_x86.conf
+++ b/tests/net/ip-addr/prj_x86.conf
--- a/tests/net/ipv6/Makefile
+++ b/tests/net/ipv6/Makefile
@ -1,7 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE ?= nano
-ARCH ?= x86
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf

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

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

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

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

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

 include $(ZEPHYR_BASE)/Makefile.inc
--- a/tests/net/utils/prj_x86.conf
+++ b/tests/net/utils/prj_x86.conf