diff options
| author | Wai-Hong Tam <waihong@google.com> | 2021-07-14 13:52:42 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-07-15 22:50:42 +0000 |
| commit | 61ab7944fb31009f15531dac74393b0e50764c69 (patch) | |
| tree | 1ae5b58f41af68299d9e08a32c4c893ac9446dc3 | |
| parent | afcca55528b45fccec91db1b87fd8c458c6ca825 (diff) | |
| download | chrome-ec-61ab7944fb31009f15531dac74393b0e50764c69.tar.gz | |
zephyr: npcx: Default the NPCX header generator in Kconfig.npcx
The NPCX header generator configs are duplicated on multiple projects.
Move them to the default in Kconfig.npcx.
BRANCH=None
BUG=b:192253134
TEST=Built the brya, kohaku, lazor, volteer, asurada, and posix-ec
images. Booted the lazor image on Lazor board.
Change-Id: I560434473d76ba67fc089ead4ab39efbb5ab6703
Signed-off-by: Wai-Hong Tam <waihong@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3029002
Reviewed-by: Keith Short <keithshort@chromium.org>
5 files changed, 13 insertions, 24 deletions
diff --git a/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx index b4a7c36a3d..e2490836d1 100644 --- a/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx +++ b/zephyr/app/ec/chip/arm/nuvoton_npcx/Kconfig.npcx @@ -8,6 +8,19 @@ if SOC_FAMILY_NPCX +# Enable NPCX firmware header generator +config NPCX_HEADER + default y + +config NPCX_HEADER_SPI_MAX_CLOCK + default 50 + +config NPCX_HEADER_SPI_READ_MODE + default "dual" + +config NPCX_HEADER_CORE_CLOCK_SPI_CLOCK_RATIO + default 2 + # ADC # The resolution and oversamplig values are fixed by the NPCX ADC driver config PLATFORM_EC_ADC_RESOLUTION diff --git a/zephyr/projects/brya/boards/arm/brya/brya_defconfig b/zephyr/projects/brya/boards/arm/brya/brya_defconfig index 223aee2245..4abece1033 100644 --- a/zephyr/projects/brya/boards/arm/brya/brya_defconfig +++ b/zephyr/projects/brya/boards/arm/brya/brya_defconfig @@ -9,12 +9,6 @@ CONFIG_SOC_SERIES_NPCX9=y CONFIG_SOC_NPCX9M3F=y CONFIG_BOARD_BRYA=y -# Enable NPCX firmware header generator -CONFIG_NPCX_HEADER=y -CONFIG_NPCX_HEADER_SPI_MAX_CLOCK_50=y -CONFIG_NPCX_HEADER_SPI_READ_MODE_DUAL=y -CONFIG_NPCX_HEADER_CORE_CLOCK_SPI_CLOCK_RATIO_2=y - # Serial Drivers CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y diff --git a/zephyr/projects/kohaku/boards/arm/kohaku/kohaku_defconfig b/zephyr/projects/kohaku/boards/arm/kohaku/kohaku_defconfig index 30b80190c8..3235c6bc19 100644 --- a/zephyr/projects/kohaku/boards/arm/kohaku/kohaku_defconfig +++ b/zephyr/projects/kohaku/boards/arm/kohaku/kohaku_defconfig @@ -9,12 +9,6 @@ CONFIG_SOC_NPCX7M6FC=y # Platform Configuration CONFIG_BOARD_KOHAKU=y -# Enable NPCX firmware header generator -CONFIG_NPCX_HEADER=y -CONFIG_NPCX_HEADER_SPI_MAX_CLOCK_50=y -CONFIG_NPCX_HEADER_SPI_READ_MODE_DUAL=y -CONFIG_NPCX_HEADER_CORE_CLOCK_SPI_CLOCK_RATIO_2=y - # Serial Drivers CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y diff --git a/zephyr/projects/trogdor/boards/arm/trogdor/trogdor_defconfig b/zephyr/projects/trogdor/boards/arm/trogdor/trogdor_defconfig index e343abae06..4011f89a94 100644 --- a/zephyr/projects/trogdor/boards/arm/trogdor/trogdor_defconfig +++ b/zephyr/projects/trogdor/boards/arm/trogdor/trogdor_defconfig @@ -9,12 +9,6 @@ CONFIG_SOC_NPCX7M7FC=y # Platform Configuration CONFIG_BOARD_TROGDOR=y -# Enable NPCX firmware header generator -CONFIG_NPCX_HEADER=y -CONFIG_NPCX_HEADER_SPI_MAX_CLOCK_50=y -CONFIG_NPCX_HEADER_SPI_READ_MODE_DUAL=y -CONFIG_NPCX_HEADER_CORE_CLOCK_SPI_CLOCK_RATIO_2=y - # Serial Drivers CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y diff --git a/zephyr/projects/volteer/boards/arm/volteer/volteer_defconfig b/zephyr/projects/volteer/boards/arm/volteer/volteer_defconfig index 478a74dde1..d9299c680a 100644 --- a/zephyr/projects/volteer/boards/arm/volteer/volteer_defconfig +++ b/zephyr/projects/volteer/boards/arm/volteer/volteer_defconfig @@ -9,12 +9,6 @@ CONFIG_SOC_NPCX7M7FC=y # Platform Configuration CONFIG_BOARD_VOLTEER=y -# Enable NPCX firmware header generator -CONFIG_NPCX_HEADER=y -CONFIG_NPCX_HEADER_SPI_MAX_CLOCK_50=y -CONFIG_NPCX_HEADER_SPI_READ_MODE_DUAL=y -CONFIG_NPCX_HEADER_CORE_CLOCK_SPI_CLOCK_RATIO_2=y - # Serial Drivers CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y |