summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWealian Liao <whliao@nuvoton.corp-partner.google.com>2021-07-16 16:23:09 +0800
committerCommit Bot <commit-bot@chromium.org>2021-07-20 06:59:52 +0000
commitd385897bc7102dc107306644bb2701cc93a286ea (patch)
tree034326ee4a77380be2e74146e582ccc1c6533faf
parentd5bccee2e4ce2988181cc80b64bb050161d3048a (diff)
downloadchrome-ec-d385897bc7102dc107306644bb2701cc93a286ea.tar.gz
zephyr: npcx: Cleanup the header default config
The current setting lets choice select & config value misalign. e.g., ``` // Earlier definition in Kconfig.npcx CONFIG_NPCX_HEADER_SPI_MAX_CLOCK=50 // Default choice automatically set CONFIG_NPCX_HEADER_SPI_MAX_CLOCK_20=y ``` Upstream PR(https://github.com/zephyrproject-rtos/zephyr/pull/36999) adds symbols for those choice options. This CL change to override the header setting by the choice symbols. BUG=none BRANCH=none TEST=zmake testall TEST=get the aligned header config on Lazor Cq-Depend: chromium:3038117, chromium:3038118 Signed-off-by: Wealian Liao <whliao@nuvoton.corp-partner.google.com> Change-Id: Ie11b462d0dd52e14becdfef9ad195c81b67242aa Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3034783 Reviewed-by: Yuval Peress <peress@chromium.org> Commit-Queue: Yuval Peress <peress@chromium.org>
-rw-r--r--zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx15
1 files changed, 9 insertions, 6 deletions
diff --git a/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx
index e2490836d1..2da9252775 100644
--- a/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx
+++ b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx
@@ -12,14 +12,17 @@ if SOC_FAMILY_NPCX
config NPCX_HEADER
default y
-config NPCX_HEADER_SPI_MAX_CLOCK
- default 50
+choice NPCX_HEADER_SPI_MAX_CLOCK_CHOICE
+ default NPCX_HEADER_SPI_MAX_CLOCK_50
+endchoice
-config NPCX_HEADER_SPI_READ_MODE
- default "dual"
+choice NPCX_HEADER_SPI_READ_MODE_CHOICE
+ default NPCX_HEADER_SPI_READ_MODE_DUAL
+endchoice
-config NPCX_HEADER_CORE_CLOCK_SPI_CLOCK_RATIO
- default 2
+choice NPCX_HEADER_CORE_CLOCK_SPI_CLOCK_RATIO_CHOICE
+ default NPCX_HEADER_CORE_CLOCK_SPI_CLOCK_RATIO_2
+endchoice
# ADC
# The resolution and oversamplig values are fixed by the NPCX ADC driver