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>
diff --git a/samples/drivers/i2c_lsm9ds0/Makefile b/samples/drivers/i2c_lsm9ds0/Makefile
index 9bf82bd..16f799b 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 bc7771d..5efa4af 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 b506964..b2b0ac9 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
similarity index 100%
rename from samples/drivers/sensor_apds9960/prj_arc.conf
rename to samples/drivers/sensor_apds9960/prj.conf
diff --git a/samples/drivers/spi_test/Makefile b/samples/drivers/spi_test/Makefile
index 49b7eb8..16f799b 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
similarity index 100%
rename from samples/drivers/spi_test/prj_x86.conf
rename to samples/drivers/spi_test/prj.conf
diff --git a/samples/kernel_event_logger/microkernel/Makefile b/samples/kernel_event_logger/microkernel/Makefile
index bb15b95..01ab057 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 4dfb099..47ed3cc 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
similarity index 100%
rename from samples/net/test/test_15_4/prj_x86.conf
rename to 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 fccd04e..0000000
--- 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 e4f9144..fb67d93 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
similarity index 100%
rename from samples/net/test_15_4/prj_x86.conf
rename to 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 22cc990..0000000
--- 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 01ab057..0d56ce6 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
similarity index 100%
rename from samples/philosophers/microkernel/prj_x86.conf
rename to 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 18bfc81..0000000
--- 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 53627ef..795c836 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 56bf67e..5eee94f 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 1ca5ccf..f1a70a3 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 53ee558..44eeaa6 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
similarity index 100%
rename from tests/crypto/test_aes/prj_arm.conf
rename to 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 cd71187..0000000
--- 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 53ee558..44eeaa6 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
similarity index 100%
rename from tests/crypto/test_cbc/prj_arm.conf
rename to 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 256d435..0000000
--- 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 53ee558..44eeaa6 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
similarity index 100%
rename from tests/crypto/test_ccm_mode/prj_arm.conf
rename to 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 6ba75de..0000000
--- 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 53ee558..44eeaa6 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
similarity index 100%
rename from tests/crypto/test_cmac_mode/prj_arm.conf
rename to 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 63f018c..0000000
--- 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 53ee558..44eeaa6 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
similarity index 100%
rename from tests/crypto/test_ctr/prj_arm.conf
rename to 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 31d80e2..0000000
--- 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 53ee558..44eeaa6 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 6d38ab4..0000000
--- 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
similarity index 100%
rename from tests/crypto/test_hmac/prj_arm.conf
rename to 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 30e85e3..0000000
--- 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 53ee558..44eeaa6 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
similarity index 100%
rename from tests/crypto/test_prng/prj_arm.conf
rename to 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 c5cd3b8..0000000
--- 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 53ee558..44eeaa6 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
similarity index 100%
rename from tests/crypto/test_sha256/prj_arm.conf
rename to 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 c5ee243..0000000
--- 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
