diff options
| author | Peter Marheine <pmarheine@chromium.org> | 2023-02-16 00:14:21 +0000 |
|---|---|---|
| committer | Peter Marheine <pmarheine@chromium.org> | 2023-02-16 00:14:21 +0000 |
| commit | f43d6df6f2860dbe8ec15aebdc28890771ad7897 (patch) | |
| tree | 6877eff7016f9979e46017ea5221a16d36344304 /zephyr/program/herobrine/program.conf | |
| parent | dce247e97903a2464ff8884106bffa43587c1dcb (diff) | |
| parent | 0849542c72359150a357945c010dca6b5a213633 (diff) | |
| download | chrome-ec-f43d6df6f2860dbe8ec15aebdc28890771ad7897.tar.gz | |
Merge remote-tracking branch cros/main into firmware-nissa-15217.B-mainfirmware-nissa-15217.126.B-main
Generated by: ./util/update_release_branch.py --zephyr --board nissa firmware-
nissa-15217.B-main
Relevant changes:
git log --oneline dce247e979..0849542c72 -- zephyr/program/nissa
util/getversion.sh
0849542c72 zephyr: add sleep property for keyboard factory test
5825d894b9 nissa: disable PLATFORM_EC_TCPC_INTERRUPT
25a400690f yavikso: Update fan table version 3
9263f14536 zephyr: remove shi node and add references to shi0
b40c6970d3 Craask: Charger limit for 65w adapter
6fd2d3ea6c zephyr: add comments for tcpc driver
00986ffb1c zephyr: move usbc interrupt handler to shim
2508094b14 yaviks: reduce RW image size (64KB)
55b6aaf52f yaviks: enable keyboard factory test
4786d1eac6 nissa: Add ocpc init function to Nissa boards
2ae1083638 zephyr: cros_kb: set KSI/KSO kbs mode by pinctrl driver
d415f4665a yaviks: Fix OCPC Vsys overshooting
93f9d42a7c zephyr: config: drop few more redundant options
BRANCH=None
BUG=b:254148652 b:260762509 b:265220075 b:268273712 b:265763662
BUG=b:253557900 b:254148652 b:269212593 b:267404783 b:262352202
TEST=`make -j buildall`
Force-Relevant-Builds: all
Change-Id: I195dd82af114180b611f9afd1465a69f7f43d417
Signed-off-by: Peter Marheine <pmarheine@chromium.org>
Diffstat (limited to 'zephyr/program/herobrine/program.conf')
| -rw-r--r-- | zephyr/program/herobrine/program.conf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/zephyr/program/herobrine/program.conf b/zephyr/program/herobrine/program.conf index b18dd9bed1..0bdfde796d 100644 --- a/zephyr/program/herobrine/program.conf +++ b/zephyr/program/herobrine/program.conf @@ -77,7 +77,6 @@ CONFIG_PLATFORM_EC_USB_PD_FRS=y CONFIG_PLATFORM_EC_USB_PD_USB32_DRD=n CONFIG_PLATFORM_EC_USBC_PPC_SYV682C=y CONFIG_PLATFORM_EC_USB_PD_FRS_PPC=y -CONFIG_PLATFORM_EC_USBC_RETIMER_FW_UPDATE=n CONFIG_PLATFORM_EC_USBC_SS_MUX_DFP_ONLY=y CONFIG_PLATFORM_EC_USB_DRP_ACC_TRYSRC=y CONFIG_PLATFORM_EC_USB_PD_5V_EN_CUSTOM=y |