diff options
author | Firas Sammoura <fsammoura@google.com> | 2022-06-17 16:40:54 +0000 |
---|---|---|
committer | Firas Sammoura <fsammoura@google.com> | 2022-06-17 16:40:54 +0000 |
commit | e5fb0b9ba488614b5684e640530f00821ab7b943 (patch) | |
tree | 9a15b4a98d7987870a1805a33883d0cf9123fc05 /zephyr/Kconfig.pd_vbus_detection | |
parent | ad46fafb27c419bd416bfecc76df6c6426a99b32 (diff) | |
parent | a46d3f3feaac0d69012f61b66f652bff991d05a7 (diff) | |
download | chrome-ec-e5fb0b9ba488614b5684e640530f00821ab7b943.tar.gz |
Merge remote-tracking branch cros/main into firmware-fpmcu-bloonchipper-release
Generated by: ./util/update_release_branch.py --board bloonchipper --relevant_paths_file ./util/fingerprint-relevant-paths.txt firmware-fpmcu-bloonchipper-release
Relevant changes:
git log --oneline ad46fafb27..a46d3f3fea -- board/hatch_fp
board/bloonchipper common/fpsensor docs/fingerprint driver/fingerprint
util/getversion.sh
981fb88cf8 docs/fingerprint: Resolve contradictory FPMCU factory flashing instructions
38ef6b7306 tree: Files should end with single newline
60032a8828 docs/fingerprint: Clean up formatting in fingerprint-factory-quick-guide.md
f49eb6f894 docs/fingerprint: Run mdformat
64aa5fc7bb docs/fingerprint: Add links to info on fuzz testing
8bd99cc434 fpsensor: Use correct return type
2b2d7a991d fpsensor: Use correct return type
BRANCH=None
BUG=b:234772776 b:234181908 b:172020503 b:234181908
TEST=`make -j buildall`
Cq-Include-Trybots: chromeos/cq:cq-orchestrator
Signed-off-by: Firas Sammoura <fsammoura@google.com>
Change-Id: I18b58de542c8b439d0f9327a7d4f0ec897da080f
Diffstat (limited to 'zephyr/Kconfig.pd_vbus_detection')
-rw-r--r-- | zephyr/Kconfig.pd_vbus_detection | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/zephyr/Kconfig.pd_vbus_detection b/zephyr/Kconfig.pd_vbus_detection index f3f410c9dc..019eca654a 100644 --- a/zephyr/Kconfig.pd_vbus_detection +++ b/zephyr/Kconfig.pd_vbus_detection @@ -5,10 +5,6 @@ if PLATFORM_EC_USBC if PLATFORM_EC_USB_POWER_DELIVERY -choice PLATFORM_EC_USB_PD_VBUS_DETECTION_TYPE - prompt "Select the method to detect VBUS" - default PLATFORM_EC_USB_PD_VBUS_DETECT_NONE - config PLATFORM_EC_USB_PD_VBUS_DETECT_NONE bool "No way to detect VBUS" help @@ -32,7 +28,5 @@ config PLATFORM_EC_USB_PD_VBUS_DETECT_PPC Choose this option if the Power-Path Controller (PPC) can detect the presence of VBUS -endchoice # PLATFORM_EC_USB_PD_VBUS_DETECTION_TYPE - endif # PLATFORM_EC_USB_POWER_DELIVERY endif # PLATFORM_EC_USBC |