diff options
author | Denis Brockus <dbrockus@google.com> | 2021-07-27 09:11:51 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-07-28 16:41:52 +0000 |
commit | c968dfd543af66c4522ebc6b32a706aba17421e8 (patch) | |
tree | 976fb36ba0cd44b4684eae999ee069d80c7651c3 | |
parent | f73fa8e9069e72848d977f5427afe8c30df4e77a (diff) | |
download | chrome-ec-c968dfd543af66c4522ebc6b32a706aba17421e8.tar.gz |
zephyr: ite: add CONFIG_PLATFORM_EC_FW_RESET_VECTOR
CONFIG_PLATFORM_EC_FW_RESET_VECTOR is used to control
CONFIG_FW_RESET_VECTOR in the existing cros-ec code.
This allows a chip specific function to be called
to obtain the firmware reset vector.
BUG=b:194794622
BRANCH=none
TEST=zmake configure -b $PROJ_HAYATO
Signed-off-by: Denis Brockus <dbrockus@google.com>
Change-Id: I49000bc557f86f74af0d8429af6939ad340f21d5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3056514
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>
Tested-by: Denis Brockus <dbrockus@chromium.org>
Auto-Submit: Denis Brockus <dbrockus@chromium.org>
-rw-r--r-- | util/config_allowed.txt | 1 | ||||
-rw-r--r-- | zephyr/Kconfig.system | 9 | ||||
-rw-r--r-- | zephyr/shim/include/config_chip.h | 5 |
3 files changed, 14 insertions, 1 deletions
diff --git a/util/config_allowed.txt b/util/config_allowed.txt index 51f5298d05..2843696cc9 100644 --- a/util/config_allowed.txt +++ b/util/config_allowed.txt @@ -451,7 +451,6 @@ CONFIG_FW_INCLUDE_RO CONFIG_FW_LIMITED_IMAGE CONFIG_FW_PSTATE_OFF CONFIG_FW_PSTATE_SIZE -CONFIG_FW_RESET_VECTOR CONFIG_GESTURE_DETECTION CONFIG_GESTURE_DETECTION_MASK CONFIG_GESTURE_HOST_DETECTION diff --git a/zephyr/Kconfig.system b/zephyr/Kconfig.system index bac96beb20..be7dae8e6f 100644 --- a/zephyr/Kconfig.system +++ b/zephyr/Kconfig.system @@ -30,4 +30,13 @@ config PLATFORM_EC_SYSTEM_PRE_INIT_PRIORITY those critical to determining the reset type, should be initialized at lower priority so that the system reset flags are valid. +config PLATFORM_EC_FW_RESET_VECTOR + bool "Firmware Reset Vector chip specific retrieval" + default y if SOC_FAMILY_RISCV_ITE + help + This defines if there is a chip specific machanism for + retrieving the firmware reset vector. The function that + needs to be provided is system_get_fw_reset_vector that + will return the address of the reset vector. + endif # PLATFORM_EC diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index 01ab43d779..b81ff93eeb 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -1728,4 +1728,9 @@ #define CONFIG_CMD_S5_TIMEOUT #endif +#undef CONFIG_FW_RESET_VECTOR +#ifdef CONFIG_PLATFORM_EC_FW_RESET_VECTOR +#define CONFIG_FW_RESET_VECTOR +#endif + #endif /* __CROS_EC_CONFIG_CHIP_H */ |