summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--zephyr/CMakeLists.txt2
-rw-r--r--zephyr/Kconfig4
-rw-r--r--zephyr/app/ec/ec_app_main.c2
-rw-r--r--zephyr/projects/asurada/hayato/prj.conf2
-rw-r--r--zephyr/projects/brya/brya/prj.conf2
-rw-r--r--zephyr/projects/herobrine/herobrine_npcx9/prj.conf4
-rw-r--r--zephyr/projects/it8xxx2_evb/prj.conf2
-rw-r--r--zephyr/projects/kohaku/prj.conf2
-rw-r--r--zephyr/projects/npcx_evb/npcx7/prj.conf2
-rw-r--r--zephyr/projects/npcx_evb/npcx9/prj.conf2
-rw-r--r--zephyr/projects/trogdor/herobrine_npcx7/prj.conf4
-rw-r--r--zephyr/projects/trogdor/lazor/prj.conf4
-rw-r--r--zephyr/projects/trogdor/trogdor/prj.conf4
-rw-r--r--zephyr/projects/volteer/delbin/prj.conf2
-rw-r--r--zephyr/shim/include/config_chip.h2
-rw-r--r--zephyr/test/ec_app/src/main.c2
16 files changed, 21 insertions, 21 deletions
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index a9c33790dd..c736fb6a18 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -405,7 +405,7 @@ zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_VBOOT_HASH
zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_VOLUME_BUTTONS
"${PLATFORM_EC}/common/button.c")
-zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_VBOOT
+zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_VBOOT_EFS2
"${PLATFORM_EC}/common/vboot/efs2.c")
zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_VSTORE
diff --git a/zephyr/Kconfig b/zephyr/Kconfig
index 409f1f3a97..3b4a6ead7b 100644
--- a/zephyr/Kconfig
+++ b/zephyr/Kconfig
@@ -641,8 +641,8 @@ menuconfig PLATFORM_EC_TIMER
This option is needed by many features in the EC. Disabling it will
likely cause build errors.
-config PLATFORM_EC_VBOOT
- bool "Enable Chromium OS verified boot"
+config PLATFORM_EC_VBOOT_EFS2
+ bool "EFS2 verified EC boot"
default y if !SOC_POSIX
help
Enables Early Firmware Selection v2 (EFS2) verified boot. When booting
diff --git a/zephyr/app/ec/ec_app_main.c b/zephyr/app/ec/ec_app_main.c
index c35ce7f888..7cc5b170f1 100644
--- a/zephyr/app/ec/ec_app_main.c
+++ b/zephyr/app/ec/ec_app_main.c
@@ -67,7 +67,7 @@ void ec_app_main(void)
}
}
- if (IS_ENABLED(CONFIG_PLATFORM_EC_VBOOT)) {
+ if (IS_ENABLED(CONFIG_PLATFORM_EC_VBOOT_EFS2)) {
/*
* For RO, it behaves as follows:
* In recovery, it enables PD communication and returns.
diff --git a/zephyr/projects/asurada/hayato/prj.conf b/zephyr/projects/asurada/hayato/prj.conf
index 8a513e9a47..2faab291f2 100644
--- a/zephyr/projects/asurada/hayato/prj.conf
+++ b/zephyr/projects/asurada/hayato/prj.conf
@@ -112,7 +112,7 @@ CONFIG_PLATFORM_EC_USB_PD_TBT_COMPAT_MODE=n
CONFIG_PLATFORM_EC_USB_PID=0x5053
# VBoot without EFS2
-CONFIG_PLATFORM_EC_VBOOT=n
+CONFIG_PLATFORM_EC_VBOOT_EFS2=n
CONFIG_PLATFORM_EC_VBOOT_HASH=y
# TODO(b/180980668): bring these features up
diff --git a/zephyr/projects/brya/brya/prj.conf b/zephyr/projects/brya/brya/prj.conf
index 6edeedb6f6..174d6a9231 100644
--- a/zephyr/projects/brya/brya/prj.conf
+++ b/zephyr/projects/brya/brya/prj.conf
@@ -12,7 +12,7 @@ CONFIG_PLATFORM_EC_SWITCH=y
CONFIG_LTO=y
CONFIG_CROS_FLASH_NPCX=y
CONFIG_CROS_SYSTEM_NPCX=y
-CONFIG_PLATFORM_EC_VBOOT=y
+CONFIG_PLATFORM_EC_VBOOT_EFS2=y
CONFIG_PLATFORM_EC_VBOOT_HASH=y
CONFIG_PLATFORM_EC_EXTPOWER_GPIO=y
CONFIG_PLATFORM_EC_CONSOLE_CMD_SYSINFO=y
diff --git a/zephyr/projects/herobrine/herobrine_npcx9/prj.conf b/zephyr/projects/herobrine/herobrine_npcx9/prj.conf
index 74526617dc..ddaf307080 100644
--- a/zephyr/projects/herobrine/herobrine_npcx9/prj.conf
+++ b/zephyr/projects/herobrine/herobrine_npcx9/prj.conf
@@ -39,8 +39,8 @@ CONFIG_PLATFORM_EC_POWER_SLEEP_FAILURE_DETECTION=y
CONFIG_PLATFORM_EC_CHIPSET_RESET_HOOK=y
CONFIG_PLATFORM_EC_CHIPSET_RESUME_INIT_HOOK=y
-# TODO(b:193719620): Enable EC EFS2 (toggled by PLATFORM_EC_VBOOT).
-CONFIG_PLATFORM_EC_VBOOT=n
+# TODO(b:193719620): Enable EC EFS2.
+CONFIG_PLATFORM_EC_VBOOT_EFS2=n
# MKBP event mask
CONFIG_PLATFORM_EC_MKBP_EVENT_WAKEUP_MASK=y
diff --git a/zephyr/projects/it8xxx2_evb/prj.conf b/zephyr/projects/it8xxx2_evb/prj.conf
index b41f689c58..23a7ab2275 100644
--- a/zephyr/projects/it8xxx2_evb/prj.conf
+++ b/zephyr/projects/it8xxx2_evb/prj.conf
@@ -36,5 +36,5 @@ CONFIG_PLATFORM_EC_BOARD_VERSION_GPIO=n
CONFIG_PLATFORM_EC_KEYBOARD=n
CONFIG_CROS_KB_RAW_ITE=n
CONFIG_PLATFORM_EC_SWITCH=n
-CONFIG_PLATFORM_EC_VBOOT=n
+CONFIG_PLATFORM_EC_VBOOT_EFS2=n
CONFIG_PLATFORM_EC_VBOOT_HASH=n
diff --git a/zephyr/projects/kohaku/prj.conf b/zephyr/projects/kohaku/prj.conf
index 28c3a4a550..1d7ca9a07f 100644
--- a/zephyr/projects/kohaku/prj.conf
+++ b/zephyr/projects/kohaku/prj.conf
@@ -9,7 +9,7 @@ CONFIG_SHIMMED_TASKS=y
CONFIG_ESPI=y
CONFIG_I2C=y
-CONFIG_PLATFORM_EC_VBOOT=n
+CONFIG_PLATFORM_EC_VBOOT_EFS2=n
# Power sequencing
CONFIG_AP=y
diff --git a/zephyr/projects/npcx_evb/npcx7/prj.conf b/zephyr/projects/npcx_evb/npcx7/prj.conf
index 930d38e44b..30f3152c42 100644
--- a/zephyr/projects/npcx_evb/npcx7/prj.conf
+++ b/zephyr/projects/npcx_evb/npcx7/prj.conf
@@ -15,7 +15,7 @@ CONFIG_CROS_KB_RAW_NPCX=n
CONFIG_PLATFORM_EC_BACKLIGHT_LID=n
CONFIG_PLATFORM_EC_KEYBOARD=n
CONFIG_PLATFORM_EC_SWITCH=n
-CONFIG_PLATFORM_EC_VBOOT=n
+CONFIG_PLATFORM_EC_VBOOT_EFS2=n
CONFIG_PLATFORM_EC_VSTORE=n
# Board version is selected over GPIO board ID pins.
diff --git a/zephyr/projects/npcx_evb/npcx9/prj.conf b/zephyr/projects/npcx_evb/npcx9/prj.conf
index c268df9b24..e497c82edf 100644
--- a/zephyr/projects/npcx_evb/npcx9/prj.conf
+++ b/zephyr/projects/npcx_evb/npcx9/prj.conf
@@ -15,7 +15,7 @@ CONFIG_CROS_KB_RAW_NPCX=n
CONFIG_PLATFORM_EC_BACKLIGHT_LID=n
CONFIG_PLATFORM_EC_KEYBOARD=n
CONFIG_PLATFORM_EC_SWITCH=n
-CONFIG_PLATFORM_EC_VBOOT=n
+CONFIG_PLATFORM_EC_VBOOT_EFS2=n
CONFIG_PLATFORM_EC_VSTORE=n
# Workaround npcx9 A1 chip's bug for download_from_flash API in th booter.
diff --git a/zephyr/projects/trogdor/herobrine_npcx7/prj.conf b/zephyr/projects/trogdor/herobrine_npcx7/prj.conf
index 229c942dc5..a5aa4f20b6 100644
--- a/zephyr/projects/trogdor/herobrine_npcx7/prj.conf
+++ b/zephyr/projects/trogdor/herobrine_npcx7/prj.conf
@@ -36,9 +36,9 @@ CONFIG_PLATFORM_EC_POWER_SLEEP_FAILURE_DETECTION=y
CONFIG_PLATFORM_EC_CHIPSET_RESET_HOOK=y
CONFIG_PLATFORM_EC_CHIPSET_RESUME_INIT_HOOK=y
-# Trogdor family does not use EFS2 (toggled by PLATFORM_EC_VBOOT).
+# Trogdor family does not use EFS2.
# Herobrine family does. But herobrine_npcx7 is actually a Trogdor board.
-CONFIG_PLATFORM_EC_VBOOT=n
+CONFIG_PLATFORM_EC_VBOOT_EFS2=n
# MKBP event mask
CONFIG_PLATFORM_EC_MKBP_EVENT_WAKEUP_MASK=y
diff --git a/zephyr/projects/trogdor/lazor/prj.conf b/zephyr/projects/trogdor/lazor/prj.conf
index 3d16cdb46b..a26a0941c2 100644
--- a/zephyr/projects/trogdor/lazor/prj.conf
+++ b/zephyr/projects/trogdor/lazor/prj.conf
@@ -39,8 +39,8 @@ CONFIG_PLATFORM_EC_POWER_SLEEP_FAILURE_DETECTION=y
CONFIG_PLATFORM_EC_CHIPSET_RESET_HOOK=y
CONFIG_PLATFORM_EC_CHIPSET_RESUME_INIT_HOOK=y
-# Trogdor family does not use EFS2 (toggled by PLATFORM_EC_VBOOT).
-CONFIG_PLATFORM_EC_VBOOT=n
+# Trogdor family does not use EFS2
+CONFIG_PLATFORM_EC_VBOOT_EFS2=n
# MKBP event mask
CONFIG_PLATFORM_EC_MKBP_EVENT_WAKEUP_MASK=y
diff --git a/zephyr/projects/trogdor/trogdor/prj.conf b/zephyr/projects/trogdor/trogdor/prj.conf
index 3f064c2349..419fcff428 100644
--- a/zephyr/projects/trogdor/trogdor/prj.conf
+++ b/zephyr/projects/trogdor/trogdor/prj.conf
@@ -36,8 +36,8 @@ CONFIG_PLATFORM_EC_POWER_SLEEP_FAILURE_DETECTION=y
CONFIG_PLATFORM_EC_CHIPSET_RESET_HOOK=y
CONFIG_PLATFORM_EC_CHIPSET_RESUME_INIT_HOOK=y
-# Trogdor family does not use EFS2 (toggled by PLATFORM_EC_VBOOT).
-CONFIG_PLATFORM_EC_VBOOT=n
+# Trogdor family does not use EFS2.
+CONFIG_PLATFORM_EC_VBOOT_EFS2=n
# MKBP event mask
CONFIG_PLATFORM_EC_MKBP_EVENT_WAKEUP_MASK=y
diff --git a/zephyr/projects/volteer/delbin/prj.conf b/zephyr/projects/volteer/delbin/prj.conf
index 8f85b5dabc..d81e2d27f7 100644
--- a/zephyr/projects/volteer/delbin/prj.conf
+++ b/zephyr/projects/volteer/delbin/prj.conf
@@ -10,7 +10,7 @@ CONFIG_PLATFORM_EC_BRINGUP=y
CONFIG_ARM_MPU=y
-CONFIG_PLATFORM_EC_VBOOT=n
+CONFIG_PLATFORM_EC_VBOOT_EFS2=n
CONFIG_ESPI=y
CONFIG_PLATFORM_EC_ESPI_VW_SLP_S4=y
diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h
index 18a0861cd0..deeebbd625 100644
--- a/zephyr/shim/include/config_chip.h
+++ b/zephyr/shim/include/config_chip.h
@@ -1550,7 +1550,7 @@
#undef CONFIG_VBOOT_EFS
#undef CONFIG_VBOOT_EFS2
-#ifdef CONFIG_PLATFORM_EC_VBOOT
+#ifdef CONFIG_PLATFORM_EC_VBOOT_EFS2
#define CONFIG_VBOOT_EFS2
#endif
diff --git a/zephyr/test/ec_app/src/main.c b/zephyr/test/ec_app/src/main.c
index d173fa106d..6aa2d6c1b9 100644
--- a/zephyr/test/ec_app/src/main.c
+++ b/zephyr/test/ec_app/src/main.c
@@ -63,7 +63,7 @@ static void test_watchdog_init(void)
static void test_vboot_main(void)
{
-#ifdef CONFIG_PLATFORM_EC_VBOOT
+#ifdef CONFIG_PLATFORM_EC_VBOOT_EFS2
zassert_unreachable("TODO: Implement this test.");
#else
ztest_test_skip();
View Lorry Controller Status