samples: get rid of obsolete usage of ARCH variable

Using ARCH variable to select different configurations for the different
architectures is misleading and conflicts with the variable ARCH being used by
the build system.  The variable is not needed, it is application specific and
an application can be built without the need to specify ARCH on the command
line.

This is yet another item specific to samples and test cases that
wrongfully being used and documented for every application.  We need to use
another variable and just make it clear it is specific to samples and how they
are written.  One possible solution is to have a script that gets the
architecture based on the board being used.  Attachments

Jira: ZEP-238
Change-Id: Ieccbc087a41858fb96fb361c0aaa04705e968a4e
Signed-off-by: Anas Nashif <anas.nashif@intel.com>

44 files changed, 13 insertions, 68 deletions

diff --git a/samples/drivers/i2c_lsm9ds0/Makefile b/samples/drivers/i2c_lsm9ds0/Makefile
index 9bf82bd14..16f799be4 100644
--- a/samples/drivers/i2c_lsm9ds0/Makefile
+++ b/samples/drivers/i2c_lsm9ds0/Makefile
@@ -1,5 +1,4 @@
 BOARD ?= quark_se_devboard
-ARCH ?= x86
 KERNEL_TYPE = nano
 CONF_FILE = prj.conf
 
diff --git a/samples/drivers/i2c_stts751/Makefile b/samples/drivers/i2c_stts751/Makefile
index bc7771d45..5efa4af6d 100644
--- a/samples/drivers/i2c_stts751/Makefile
+++ b/samples/drivers/i2c_stts751/Makefile
@@ -1,5 +1,4 @@
 BOARD = quark_se_devboard
-ARCH = x86
 KERNEL_TYPE = nano
 CONF_FILE = prj.conf
 
diff --git a/samples/drivers/sensor_apds9960/Makefile b/samples/drivers/sensor_apds9960/Makefile
index b50696413..b2b0ac929 100644
--- a/samples/drivers/sensor_apds9960/Makefile
+++ b/samples/drivers/sensor_apds9960/Makefile
@@ -1,6 +1,6 @@
 BOARD ?= arduino_101_sss
 
 KERNEL_TYPE ?= nano
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include ${ZEPHYR_BASE}/Makefile.inc
diff --git a/samples/drivers/sensor_apds9960/prj_arc.conf b/samples/drivers/sensor_apds9960/prj.conf
index c114e2908..c114e2908 100644
--- a/samples/drivers/sensor_apds9960/prj_arc.conf
+++ b/samples/drivers/sensor_apds9960/prj.conf
diff --git a/samples/drivers/spi_test/Makefile b/samples/drivers/spi_test/Makefile
index 49b7eb868..16f799be4 100644
--- a/samples/drivers/spi_test/Makefile
+++ b/samples/drivers/spi_test/Makefile
@@ -1,5 +1,5 @@
 BOARD ?= quark_se_devboard
 KERNEL_TYPE = nano
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include ${ZEPHYR_BASE}/Makefile.inc
diff --git a/samples/drivers/spi_test/prj_x86.conf b/samples/drivers/spi_test/prj.conf
index 5616bfc48..5616bfc48 100644
--- a/samples/drivers/spi_test/prj_x86.conf
+++ b/samples/drivers/spi_test/prj.conf
diff --git a/samples/kernel_event_logger/microkernel/Makefile b/samples/kernel_event_logger/microkernel/Makefile
index bb15b9586..01ab057b1 100644
--- a/samples/kernel_event_logger/microkernel/Makefile
+++ b/samples/kernel_event_logger/microkernel/Makefile
@@ -1,4 +1,3 @@
-BSP ?= generic_pc
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 BOARD ?= qemu_x86
diff --git a/samples/net/test/test_15_4/Makefile b/samples/net/test/test_15_4/Makefile
index 4dfb09938..47ed3ccc8 100644
--- a/samples/net/test/test_15_4/Makefile
+++ b/samples/net/test/test_15_4/Makefile
@@ -19,7 +19,7 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = nano
 BOARD ?= qemu_x86
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 SOURCE_DIR = $(ZEPHYR_BASE)/samples/net/test_15_4/src/
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/net/test/test_15_4/prj_x86.conf b/samples/net/test/test_15_4/prj.conf
index a52654e1b..a52654e1b 100644
--- a/samples/net/test/test_15_4/prj_x86.conf
+++ b/samples/net/test/test_15_4/prj.conf
diff --git a/samples/net/test/test_15_4/prj_arm.conf b/samples/net/test/test_15_4/prj_arm.conf
deleted file mode 100644
index fccd04e0a..000000000
--- a/samples/net/test/test_15_4/prj_arm.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG_NETWORKING=y
-CONFIG_NETWORKING_WITH_LOGGING=y
-CONFIG_NETWORKING_WITH_6LOWPAN=y
-CONFIG_NETWORKING_WITH_15_4=y
-CONFIG_NET_BUF_RX_SIZE=5
-CONFIG_NET_BUF_TX_SIZE=3
diff --git a/samples/net/test_15_4/Makefile b/samples/net/test_15_4/Makefile
index e4f914477..fb67d934c 100644
--- a/samples/net/test_15_4/Makefile
+++ b/samples/net/test_15_4/Makefile
@@ -19,7 +19,7 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE ?= nano
 BOARD ?= qemu_x86
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 CFLAGS += -DNET_802154_TX_STACK_SIZE=5120
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/samples/net/test_15_4/prj_x86.conf b/samples/net/test_15_4/prj.conf
index 73aff1cc7..73aff1cc7 100644
--- a/samples/net/test_15_4/prj_x86.conf
+++ b/samples/net/test_15_4/prj.conf
diff --git a/samples/net/test_15_4/prj_arm.conf b/samples/net/test_15_4/prj_arm.conf
deleted file mode 100644
index 22cc99061..000000000
--- a/samples/net/test_15_4/prj_arm.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG_NETWORKING=y
-CONFIG_NETWORKING_WITH_LOGGING=y
-CONFIG_NETWORKING_WITH_6LOWPAN=y
-CONFIG_NETWORKING_WITH_15_4=y
-CONFIG_IP_BUF_RX_SIZE=5
-CONFIG_IP_BUF_TX_SIZE=3
diff --git a/samples/philosophers/microkernel/Makefile b/samples/philosophers/microkernel/Makefile
index 01ab057b1..0d56ce66d 100644
--- a/samples/philosophers/microkernel/Makefile
+++ b/samples/philosophers/microkernel/Makefile
@@ -1,6 +1,6 @@
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
 BOARD ?= qemu_x86
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include ${ZEPHYR_BASE}/Makefile.inc
diff --git a/samples/philosophers/microkernel/prj_x86.conf b/samples/philosophers/microkernel/prj.conf
index 649a67c90..649a67c90 100644
--- a/samples/philosophers/microkernel/prj_x86.conf
+++ b/samples/philosophers/microkernel/prj.conf
diff --git a/samples/philosophers/microkernel/prj_arm.conf b/samples/philosophers/microkernel/prj_arm.conf
deleted file mode 100644
index 18bfc8163..000000000
--- a/samples/philosophers/microkernel/prj_arm.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_COMPILER_OPT="-O0"
-CONFIG_NUM_IRQS=43
diff --git a/samples/sensor/bmi160/arc/Makefile b/samples/sensor/bmi160/arc/Makefile
index 53627ef0b..795c836db 100644
--- a/samples/sensor/bmi160/arc/Makefile
+++ b/samples/sensor/bmi160/arc/Makefile
@@ -1,5 +1,4 @@
 BOARD ?= arduino_101_sss
-ARCH = arc
 KERNEL_TYPE = nano
 CONF_FILE = prj.conf
 
diff --git a/samples/sensor/bmi160/x86/Makefile b/samples/sensor/bmi160/x86/Makefile
index 56bf67ee5..5eee94f78 100644
--- a/samples/sensor/bmi160/x86/Makefile
+++ b/samples/sensor/bmi160/x86/Makefile
@@ -1,5 +1,4 @@
 BOARD ?= arduino_101
-ARCH = x86
 KERNEL_TYPE = nano
 CONF_FILE = prj.conf
 
diff --git a/tests/bluetooth/tester/Makefile b/tests/bluetooth/tester/Makefile
index 1ca5ccf23..f1a70a3f3 100644
--- a/tests/bluetooth/tester/Makefile
+++ b/tests/bluetooth/tester/Makefile
@@ -20,7 +20,6 @@
 # Makefile for the Bluetooth tester application
 # default for qemu_cortex_m3 as only this currently supports enought UARTs
 BOARD ?= qemu_cortex_m3
-ARCH ?= arm
 
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
diff --git a/tests/crypto/test_aes/Makefile b/tests/crypto/test_aes/Makefile
index 53ee558d8..44eeaa6d5 100644
--- a/tests/crypto/test_aes/Makefile
+++ b/tests/crypto/test_aes/Makefile
@@ -1,6 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/crypto/test_aes/prj_arm.conf b/tests/crypto/test_aes/prj.conf
index cd711875c..cd711875c 100644
--- a/tests/crypto/test_aes/prj_arm.conf
+++ b/tests/crypto/test_aes/prj.conf
diff --git a/tests/crypto/test_aes/prj_x86.conf b/tests/crypto/test_aes/prj_x86.conf
deleted file mode 100644
index cd711875c..000000000
--- a/tests/crypto/test_aes/prj_x86.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_TINYCRYPT=y
-CONFIG_TINYCRYPT_AES=y
diff --git a/tests/crypto/test_cbc/Makefile b/tests/crypto/test_cbc/Makefile
index 53ee558d8..44eeaa6d5 100644
--- a/tests/crypto/test_cbc/Makefile
+++ b/tests/crypto/test_cbc/Makefile
@@ -1,6 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/crypto/test_cbc/prj_arm.conf b/tests/crypto/test_cbc/prj.conf
index 256d435bc..256d435bc 100644
--- a/tests/crypto/test_cbc/prj_arm.conf
+++ b/tests/crypto/test_cbc/prj.conf
diff --git a/tests/crypto/test_cbc/prj_x86.conf b/tests/crypto/test_cbc/prj_x86.conf
deleted file mode 100644
index 256d435bc..000000000
--- a/tests/crypto/test_cbc/prj_x86.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_TINYCRYPT=y
-CONFIG_TINYCRYPT_AES=y
-CONFIG_TINYCRYPT_AES_CBC=y
diff --git a/tests/crypto/test_ccm_mode/Makefile b/tests/crypto/test_ccm_mode/Makefile
index 53ee558d8..44eeaa6d5 100644
--- a/tests/crypto/test_ccm_mode/Makefile
+++ b/tests/crypto/test_ccm_mode/Makefile
@@ -1,6 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/crypto/test_ccm_mode/prj_arm.conf b/tests/crypto/test_ccm_mode/prj.conf
index 6ba75de51..6ba75de51 100644
--- a/tests/crypto/test_ccm_mode/prj_arm.conf
+++ b/tests/crypto/test_ccm_mode/prj.conf
diff --git a/tests/crypto/test_ccm_mode/prj_x86.conf b/tests/crypto/test_ccm_mode/prj_x86.conf
deleted file mode 100644
index 6ba75de51..000000000
--- a/tests/crypto/test_ccm_mode/prj_x86.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_TINYCRYPT=y
-CONFIG_TINYCRYPT_AES=y
-CONFIG_TINYCRYPT_AES_CCM=y
diff --git a/tests/crypto/test_cmac_mode/Makefile b/tests/crypto/test_cmac_mode/Makefile
index 53ee558d8..44eeaa6d5 100644
--- a/tests/crypto/test_cmac_mode/Makefile
+++ b/tests/crypto/test_cmac_mode/Makefile
@@ -1,6 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/crypto/test_cmac_mode/prj_arm.conf b/tests/crypto/test_cmac_mode/prj.conf
index 63f018c6f..63f018c6f 100644
--- a/tests/crypto/test_cmac_mode/prj_arm.conf
+++ b/tests/crypto/test_cmac_mode/prj.conf
diff --git a/tests/crypto/test_cmac_mode/prj_x86.conf b/tests/crypto/test_cmac_mode/prj_x86.conf
deleted file mode 100644
index 63f018c6f..000000000
--- a/tests/crypto/test_cmac_mode/prj_x86.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_TINYCRYPT=y
-CONFIG_TINYCRYPT_AES=y
-CONFIG_TINYCRYPT_AES_CMAC=y
diff --git a/tests/crypto/test_ctr/Makefile b/tests/crypto/test_ctr/Makefile
index 53ee558d8..44eeaa6d5 100644
--- a/tests/crypto/test_ctr/Makefile
+++ b/tests/crypto/test_ctr/Makefile
@@ -1,6 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/crypto/test_ctr/prj_arm.conf b/tests/crypto/test_ctr/prj.conf
index 31d80e2a2..31d80e2a2 100644
--- a/tests/crypto/test_ctr/prj_arm.conf
+++ b/tests/crypto/test_ctr/prj.conf
diff --git a/tests/crypto/test_ctr/prj_x86.conf b/tests/crypto/test_ctr/prj_x86.conf
deleted file mode 100644
index 31d80e2a2..000000000
--- a/tests/crypto/test_ctr/prj_x86.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_TINYCRYPT=y
-CONFIG_TINYCRYPT_AES=y
-CONFIG_TINYCRYPT_AES_CTR=y
diff --git a/tests/crypto/test_hmac/Makefile b/tests/crypto/test_hmac/Makefile
index 53ee558d8..44eeaa6d5 100644
--- a/tests/crypto/test_hmac/Makefile
+++ b/tests/crypto/test_hmac/Makefile
@@ -1,6 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/crypto/test_hmac/pjr_arm.conf b/tests/crypto/test_hmac/pjr_arm.conf
deleted file mode 100644
index 6d38ab41e..000000000
--- a/tests/crypto/test_hmac/pjr_arm.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_TINYCRYPT=y
-CONFIG_TINYCRYPT_SHA256=y
-CONFIG_TINYCRYPT_HMAC_SHA256=y
diff --git a/tests/crypto/test_hmac/prj_arm.conf b/tests/crypto/test_hmac/prj.conf
index 30e85e3dc..30e85e3dc 100644
--- a/tests/crypto/test_hmac/prj_arm.conf
+++ b/tests/crypto/test_hmac/prj.conf
diff --git a/tests/crypto/test_hmac/prj_x86.conf b/tests/crypto/test_hmac/prj_x86.conf
deleted file mode 100644
index 30e85e3dc..000000000
--- a/tests/crypto/test_hmac/prj_x86.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_TINYCRYPT=y
-CONFIG_TINYCRYPT_SHA256=y
-CONFIG_TINYCRYPT_SHA256_HMAC=y
diff --git a/tests/crypto/test_prng/Makefile b/tests/crypto/test_prng/Makefile
index 53ee558d8..44eeaa6d5 100644
--- a/tests/crypto/test_prng/Makefile
+++ b/tests/crypto/test_prng/Makefile
@@ -1,6 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/crypto/test_prng/prj_arm.conf b/tests/crypto/test_prng/prj.conf
index c5cd3b81a..c5cd3b81a 100644
--- a/tests/crypto/test_prng/prj_arm.conf
+++ b/tests/crypto/test_prng/prj.conf
diff --git a/tests/crypto/test_prng/prj_x86.conf b/tests/crypto/test_prng/prj_x86.conf
deleted file mode 100644
index c5cd3b81a..000000000
--- a/tests/crypto/test_prng/prj_x86.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_TINYCRYPT=y
-CONFIG_TINYCRYPT_SHA256=y
-CONFIG_TINYCRYPT_SHA256_HMAC=y
-CONFIG_TINYCRYPT_SHA256_HMAC_PRNG=y
diff --git a/tests/crypto/test_sha256/Makefile b/tests/crypto/test_sha256/Makefile
index 53ee558d8..44eeaa6d5 100644
--- a/tests/crypto/test_sha256/Makefile
+++ b/tests/crypto/test_sha256/Makefile
@@ -1,6 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE = micro
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/crypto/test_sha256/prj_arm.conf b/tests/crypto/test_sha256/prj.conf
index c5ee24319..c5ee24319 100644
--- a/tests/crypto/test_sha256/prj_arm.conf
+++ b/tests/crypto/test_sha256/prj.conf
diff --git a/tests/crypto/test_sha256/prj_x86.conf b/tests/crypto/test_sha256/prj_x86.conf
deleted file mode 100644
index c5ee24319..000000000
--- a/tests/crypto/test_sha256/prj_x86.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_TINYCRYPT=y
-CONFIG_TINYCRYPT_SHA256=y