diff options
| author | Simon Glass <sjg@chromium.org> | 2021-02-04 17:07:39 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-02-05 18:06:42 +0000 |
| commit | bcddd0e1f69ea38c3551c5576a8d3d7b937f8473 (patch) | |
| tree | cda7a4df6dd45dd051258cad90103d0daa4dc09c | |
| parent | 19f5f16aabec08d5dd5472f208b5ab617287ce47 (diff) | |
| download | chrome-ec-bcddd0e1f69ea38c3551c5576a8d3d7b937f8473.tar.gz | |
zephyr: Correct the USB_PD_REV30 option
This has an extra CONFIG in it. Drop it since it was not intended.
BUG=b:175434113
BRANCH=none
TEST=build zephyr on volteer
Check that CONFIG_USB_PD_REV30 is in fact enabled
Signed-off-by: Simon Glass <sjg@chromium.org>
Change-Id: Ibb93de1a25ff28d6b2dc29732c60b3ccafd7c0d6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2674958
Reviewed-by: Keith Short <keithshort@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
| -rw-r--r-- | zephyr/Kconfig.usbc | 6 | ||||
| -rw-r--r-- | zephyr/projects/volteer/prj.conf | 2 | ||||
| -rw-r--r-- | zephyr/shim/include/config_chip.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/zephyr/Kconfig.usbc b/zephyr/Kconfig.usbc index c39cb9cbc0..e5b6876b9f 100644 --- a/zephyr/Kconfig.usbc +++ b/zephyr/Kconfig.usbc @@ -340,7 +340,7 @@ config PLATFORM_EC_USB_PD_DISCHARGE_PPC endchoice # Discharge method -config PLATFORM_EC_CONFIG_USB_PD_REV30 +config PLATFORM_EC_USB_PD_REV30 bool "USB PD Rev3.0 functionality" default y help @@ -553,7 +553,7 @@ config PLATFORM_EC_USB_PD_TRY_SRC config PLATFORM_EC_USB_PD_USB4 bool "USB4 support" - depends on PLATFORM_EC_CONFIG_USB_PD_REV30 + depends on PLATFORM_EC_USB_PD_REV30 default y help This enables support for entering into USB4 mode between two port @@ -563,7 +563,7 @@ config PLATFORM_EC_USB_PD_USB4 config PLATFORM_EC_USB_PD_TBT_COMPAT_MODE bool "Thunderbolt-compatible mode support" - depends on PLATFORM_EC_CONFIG_USB_PD_REV30 + depends on PLATFORM_EC_USB_PD_REV30 default y help Enable this to allow entering into Thunderbolt-compatible mode between diff --git a/zephyr/projects/volteer/prj.conf b/zephyr/projects/volteer/prj.conf index 5240e8f2c7..7a200b87a7 100644 --- a/zephyr/projects/volteer/prj.conf +++ b/zephyr/projects/volteer/prj.conf @@ -98,7 +98,7 @@ CONFIG_PLATFORM_EC_USB_MUX_VIRTUAL=y CONFIG_PLATFORM_EC_USB_PD_ALT_MODE_UFP=y CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_CHARGER=y CONFIG_PLATFORM_EC_USB_PD_DISCHARGE_PPC=y -CONFIG_PLATFORM_EC_CONFIG_USB_PD_REV30=y +CONFIG_PLATFORM_EC_USB_PD_REV30=y CONFIG_PLATFORM_EC_BATTERY_FUEL_GAUGE=y CONFIG_PLATFORM_EC_USB_PD_VBUS_DETECT_TCPC=y CONFIG_PLATFORM_EC_USB_PD_TCPM_PS8815=y diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index a3ba8531a7..231e5b9d38 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -549,8 +549,8 @@ enum battery_type { #define CONFIG_USB_PD_HOST_CMD #endif -#undef CONFIG_CONFIG_USB_PD_REV30 -#ifdef CONFIG_PLATFORM_EC_CONFIG_USB_PD_REV30 +#undef CONFIG_USB_PD_REV30 +#ifdef CONFIG_PLATFORM_EC_USB_PD_REV30 #define CONFIG_USB_PD_REV30 /* |