diff options
| author | Eric Yilun Lin <yllin@chromium.org> | 2022-03-07 17:17:51 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-03-24 08:55:13 +0000 |
| commit | 38cc7dbe2af6d2e28e4cad02807d84dcb0b6646a (patch) | |
| tree | 31d0e5dd7e4a2e3a7bcd9fa3e519bafc6eeb9ce3 | |
| parent | e0e0fbf3e41fc78fbbcc4e4bf4e0e955dfcef4ab (diff) | |
| download | chrome-ec-38cc7dbe2af6d2e28e4cad02807d84dcb0b6646a.tar.gz | |
zephyr: fix missing USB_PD_DISCHARGE* macros
The macros are missing in the config_chip.h.
Also, the config is actually not enabled in the test config, so
to ensure the consistency and to prevent the broken test so disable it.
BUG=none
TEST=zmake test
BRANCH=none
Change-Id: I07b86fa0cc8cc9f832baa060335df14c2c340b6b
Signed-off-by: Eric Yilun Lin <yllin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3506873
Reviewed-by: Ting Shen <phoenixshen@chromium.org>
Commit-Queue: Eric Yilun Lin <yllin@google.com>
Tested-by: Eric Yilun Lin <yllin@google.com>
| -rw-r--r-- | zephyr/shim/include/config_chip.h | 15 | ||||
| -rw-r--r-- | zephyr/test/drivers/prj.conf | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index 27b72b428a..c6b365b36c 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -1110,6 +1110,21 @@ extern struct jump_data mock_jump_data; #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE #endif +#undef CONFIG_USB_PD_DISCHARGE +#ifdef CONFIG_PLATFORM_EC_USB_PD_DISCHARGE +#define CONFIG_USB_PD_DISCHARGE +#endif + +#undef CONFIG_USB_PD_DISCHARGE_GPIO +#ifdef CONFIG_PLATFORM_EC_USB_PD_DISCHARGE_GPIO +#define CONFIG_USB_PD_DISCHARGE_GPIO +#endif + +#undef CONFIG_USB_PD_DISCHARGE_TCPC +#ifdef CONFIG_PLATFORM_EC_USB_PD_DISCHARGE_TCPC +#define CONFIG_USB_PD_DISCHARGE_TCPC +#endif + #undef CONFIG_USB_PD_DISCHARGE_PPC #ifdef CONFIG_PLATFORM_EC_USB_PD_DISCHARGE_PPC #define CONFIG_USB_PD_DISCHARGE_PPC diff --git a/zephyr/test/drivers/prj.conf b/zephyr/test/drivers/prj.conf index 8aea6c09c4..2de49068ba 100644 --- a/zephyr/test/drivers/prj.conf +++ b/zephyr/test/drivers/prj.conf @@ -114,6 +114,7 @@ CONFIG_PLATFORM_EC_ACCEL_FIFO=y CONFIG_PLATFORM_EC_SENSOR_TIGHT_TIMESTAMPS=y CONFIG_PLATFORM_EC_ALS_TCS3400=y CONFIG_PLATFORM_EC_USBC_RETIMER_INTEL_BB=y +CONFIG_PLATFORM_EC_USB_PD_DISCHARGE=n CONFIG_PLATFORM_EC_USB_PD_TCPM_MUX=y CONFIG_PLATFORM_EC_USB_PD_TCPM_PS8805=y CONFIG_PLATFORM_EC_USB_PD_TCPM_PS8805_FORCE_DID=y |