diff options
author | Denis Brockus <dbrockus@google.com> | 2021-05-26 11:26:19 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-05-27 20:16:41 +0000 |
commit | 30fa95c02c2b278cfe952d76d58024535949945f (patch) | |
tree | 4118b3913d0c84fdff427272530aa4158052cc26 | |
parent | 6da429ba94b5babd1f24d0edd5fd328ce3f89a0d (diff) | |
download | chrome-ec-30fa95c02c2b278cfe952d76d58024535949945f.tar.gz |
zephyr: asurada: move options to be board level choices
Until there is a variant that needs to have a CONFIG_
option as a different value, they should stay in the
top level board configuration.
BUG=b:180980668
BRANCH=none
TEST=zmake configure -b $PROJ_ASURADA
Signed-off-by: Denis Brockus <dbrockus@google.com>
Change-Id: I78890978489be5a90656d283c6489a92060305c1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2920626
Tested-by: Denis Brockus <dbrockus@chromium.org>
Auto-Submit: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Yuval Peress <peress@chromium.org>
Commit-Queue: Yuval Peress <peress@chromium.org>
-rw-r--r-- | zephyr/projects/asurada/boards/riscv/asurada/asurada_defconfig | 70 | ||||
-rw-r--r-- | zephyr/projects/asurada/hayato/prj.conf | 37 |
2 files changed, 54 insertions, 53 deletions
diff --git a/zephyr/projects/asurada/boards/riscv/asurada/asurada_defconfig b/zephyr/projects/asurada/boards/riscv/asurada/asurada_defconfig index 57ce99c5aa..75e317fd66 100644 --- a/zephyr/projects/asurada/boards/riscv/asurada/asurada_defconfig +++ b/zephyr/projects/asurada/boards/riscv/asurada/asurada_defconfig @@ -9,30 +9,74 @@ CONFIG_SOC_SERIES_RISCV32_IT8XXX2=y CONFIG_SOC_IT8XXX2=y CONFIG_BOARD_ASURADA=y -# Serial Drivers -CONFIG_SERIAL=y -CONFIG_UART_INTERRUPT_DRIVEN=y +# SoC configuration +CONFIG_AP=y +CONFIG_AP_ARM_MTK_MT8192=y +CONFIG_HAS_TASK_CHIPSET=y -# Enable console +# Console CONFIG_CONSOLE=y CONFIG_UART_CONSOLE=y CONFIG_UART_NS16550=y -# Pinmux Driver -CONFIG_PINMUX=y -CONFIG_PINMUX_ITE_IT8XXX2=y - # GPIO Controller CONFIG_GPIO=y CONFIG_GPIO_ITE_IT8XXX2=y +# ADC Driver +CONFIG_ADC_ITE_IT8XXX2=y +CONFIG_PLATFORM_EC_ADC=y +CONFIG_PLATFORM_EC_ADC_RESOLUTION=10 + # Clock configuration CONFIG_CLOCK_CONTROL=y -CONFIG_ITE_IT8XXX2_TIMER=y - CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32768 CONFIG_SYS_CLOCK_TICKS_PER_SEC=32768 +# Flash +CONFIG_PLATFORM_EC_FLASH_CROS=y + +# I2C +CONFIG_I2C_ITE_IT8XXX2=y +CONFIG_PLATFORM_EC_I2C=y + +# Keyboard +CONFIG_PLATFORM_EC_KEYBOARD=y +CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED=y + +# Lid Switch +CONFIG_PLATFORM_EC_LID_SWITCH=y + +# MKBP +CONFIG_PLATFORM_EC_MKBP_EVENT=y +CONFIG_PLATFORM_EC_MKBP_INPUT_DEVICES=y +CONFIG_PLATFORM_EC_KEYBOARD_PROTOCOL_MKBP=y +CONFIG_PLATFORM_EC_MKBP_USE_GPIO=y + +# Pinmux Driver +CONFIG_PINMUX=y +CONFIG_PINMUX_ITE_IT8XXX2=y + +# Power Button +CONFIG_PLATFORM_EC_POWER_BUTTON=y + +# Power Sequencing +CONFIG_PLATFORM_EC_POWERSEQ=y +CONFIG_PLATFORM_EC_POWERSEQ_HOST_SLEEP=y +CONFIG_PLATFORM_EC_POWERSEQ_IT8XXX2=y +CONFIG_PLATFORM_EC_EXTPOWER_GPIO=y +CONFIG_PLATFORM_EC_CHIPSET_RESET_HOOK=y + +# Serial Drivers +CONFIG_SERIAL=y +CONFIG_UART_INTERRUPT_DRIVEN=y + +# Serial Host Interface (SHI) device. +CONFIG_CROS_SHI_IT8XXX2=y + +# Timer configuration +CONFIG_ITE_IT8XXX2_TIMER=y + # Code RAM base for IT8XXX2 CONFIG_CROS_EC_PROGRAM_MEMORY_BASE=0x80000000 CONFIG_CROS_EC_RAM_BASE=0x80100000 @@ -43,9 +87,3 @@ CONFIG_CROS_EC_RO_MEM_OFF=0x0 CONFIG_CROS_EC_RO_SIZE=0x40000 CONFIG_CROS_EC_RW_MEM_OFF=0x40000 CONFIG_CROS_EC_RW_SIZE=0x40000 - -# MKBP -CONFIG_PLATFORM_EC_MKBP_EVENT=y -CONFIG_PLATFORM_EC_MKBP_INPUT_DEVICES=y -CONFIG_PLATFORM_EC_KEYBOARD_PROTOCOL_MKBP=y -CONFIG_PLATFORM_EC_MKBP_USE_GPIO=y diff --git a/zephyr/projects/asurada/hayato/prj.conf b/zephyr/projects/asurada/hayato/prj.conf index 97a895d34e..de1c961a9d 100644 --- a/zephyr/projects/asurada/hayato/prj.conf +++ b/zephyr/projects/asurada/hayato/prj.conf @@ -8,43 +8,6 @@ CONFIG_SHIMMED_TASKS=y CONFIG_KERNEL_SHELL=y -# SoC configuration -CONFIG_AP=y -CONFIG_AP_ARM_MTK_MT8192=y -CONFIG_HAS_TASK_CHIPSET=y - -# ADC Driver -CONFIG_ADC_ITE_IT8XXX2=y -CONFIG_PLATFORM_EC_ADC=y -CONFIG_PLATFORM_EC_ADC_RESOLUTION=10 - -# Flash -CONFIG_PLATFORM_EC_FLASH_CROS=y - -# I2C -CONFIG_I2C_ITE_IT8XXX2=y -CONFIG_PLATFORM_EC_I2C=y - -# Keyboard -CONFIG_PLATFORM_EC_KEYBOARD=y -CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED=y - -# Lid Switch -CONFIG_PLATFORM_EC_LID_SWITCH=y - -# Power Button -CONFIG_PLATFORM_EC_POWER_BUTTON=y - -# Power Sequencing -CONFIG_PLATFORM_EC_POWERSEQ=y -CONFIG_PLATFORM_EC_POWERSEQ_HOST_SLEEP=y -CONFIG_PLATFORM_EC_POWERSEQ_IT8XXX2=y -CONFIG_PLATFORM_EC_EXTPOWER_GPIO=y -CONFIG_PLATFORM_EC_CHIPSET_RESET_HOOK=y - -# Serial Host Interface (SHI) device. -CONFIG_CROS_SHI_IT8XXX2=y - # TODO(b/180980668): bring these features up CONFIG_LTO=n CONFIG_PLATFORM_EC_BACKLIGHT_LID=n |