summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Baltieri <fabiobaltieri@google.com>2022-12-13 15:29:01 +0000
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-12-15 09:26:24 +0000
commit99fd246c45e6c4f6d838373e949d29d58255a4ec (patch)
tree7207d62dbac514683adaeb1bcefb9c733121e744
parent613e64ed985025f332e781a796ea8ca86c8e77a1 (diff)
downloadchrome-ec-99fd246c45e6c4f6d838373e949d29d58255a4ec.tar.gz
zephyr: config: drop a bunch of automatic options from tests
Drop a bunch of options that are already automatically selected based on the devicetree nodes. BRANCH=none BUG=none TEST=./twister Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com> Change-Id: I52045e478c5c02bdbbda0dd3f30de1a67ff3b6a4 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4100866 Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com> Reviewed-by: Wai-Hong Tam <waihong@google.com>
-rw-r--r--zephyr/test/drivers/prj.conf1
-rw-r--r--zephyr/test/i2c/prj.conf2
-rw-r--r--zephyr/test/i2c_dts/prj.conf2
-rw-r--r--zephyr/test/system_shim/prj.conf1
-rw-r--r--zephyr/test/throttle_ap/prj.conf3
5 files changed, 1 insertions, 8 deletions
diff --git a/zephyr/test/drivers/prj.conf b/zephyr/test/drivers/prj.conf
index 0e930e13e6..56a87b7a1b 100644
--- a/zephyr/test/drivers/prj.conf
+++ b/zephyr/test/drivers/prj.conf
@@ -146,7 +146,6 @@ CONFIG_PLATFORM_EC_MKBP_EVENT=y
CONFIG_PLATFORM_EC_MKBP_USE_GPIO=y
CONFIG_PLATFORM_EC_MKBP_INPUT_DEVICES=y
CONFIG_PLATFORM_EC_KEYBOARD_PWRBTN_ASSERTS_KSI2=y
-CONFIG_FLASH_SIMULATOR=y
CONFIG_FLASH=y
CONFIG_PLATFORM_EC_VBOOT_HASH=y
CONFIG_PLATFORM_EC_CONSOLE_CMD_CHARGER_ADC_AMON_BMON=y
diff --git a/zephyr/test/i2c/prj.conf b/zephyr/test/i2c/prj.conf
index fbf4b53cc3..abf7d7e113 100644
--- a/zephyr/test/i2c/prj.conf
+++ b/zephyr/test/i2c/prj.conf
@@ -6,7 +6,6 @@ CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_EMUL=y
-CONFIG_BMI160=y
CONFIG_EMUL_BMI160=y
CONFIG_SENSOR=y
CONFIG_BMI160_TRIGGER_NONE=y
@@ -16,4 +15,3 @@ CONFIG_CROS_EC=y
# TODO(b/173711210) figure out why SPI is required here when we're not using it.
CONFIG_SPI=y
-CONFIG_SPI_EMUL=y
diff --git a/zephyr/test/i2c_dts/prj.conf b/zephyr/test/i2c_dts/prj.conf
index 75a6e70ff7..d79c1ff00e 100644
--- a/zephyr/test/i2c_dts/prj.conf
+++ b/zephyr/test/i2c_dts/prj.conf
@@ -6,11 +6,9 @@ CONFIG_ZTEST=y
CONFIG_ZTEST_NEW_API=y
CONFIG_EMUL=y
-CONFIG_BMI160=y
CONFIG_EMUL_BMI160=y
CONFIG_SENSOR=y
CONFIG_BMI160_TRIGGER_NONE=y
# TODO(b/173711210) figure out why SPI is required here when we're not using it.
CONFIG_SPI=y
-CONFIG_SPI_EMUL=y
diff --git a/zephyr/test/system_shim/prj.conf b/zephyr/test/system_shim/prj.conf
index 6888f70a53..6de45ead48 100644
--- a/zephyr/test/system_shim/prj.conf
+++ b/zephyr/test/system_shim/prj.conf
@@ -7,7 +7,6 @@ CONFIG_ZTEST_NEW_API=y
CONFIG_PLATFORM_EC=y
CONFIG_CROS_EC=y
CONFIG_BBRAM=y
-CONFIG_BBRAM_EMUL=y
CONFIG_PLATFORM_EC_BOARD_RESET_AFTER_POWER_ON=y
diff --git a/zephyr/test/throttle_ap/prj.conf b/zephyr/test/throttle_ap/prj.conf
index cf04487da3..8a835017e8 100644
--- a/zephyr/test/throttle_ap/prj.conf
+++ b/zephyr/test/throttle_ap/prj.conf
@@ -36,9 +36,8 @@ CONFIG_CROS_EC=y
CONFIG_SHIMMED_TASKS=y
CONFIG_EMUL=y
CONFIG_GPIO=y
-CONFIG_GPIO_EMUL=y
CONFIG_HEAP_MEM_POOL_SIZE=1024
CONFIG_PLATFORM_EC_THROTTLE_AP=y
CONFIG_PLATFORM_EC_THROTTLE_AP_SINGLE_PIN=y
-CONFIG_PLATFORM_EC_CONSOLE_CMD_APTHROTTLE=n \ No newline at end of file
+CONFIG_PLATFORM_EC_CONSOLE_CMD_APTHROTTLE=n