| commit | 3ce21e3da6cec80543f1e9362b2ac85f7c25a838 | [log] [tgz] |
|---|---|---|
| author | Peter Marheine <pmarheine@chromium.org> | Tue Aug 08 00:17:10 2023 |
| committer | Peter Marheine <pmarheine@chromium.org> | Thu Aug 10 23:37:08 2023 |
| tree | ff984a905fac617779312d6bdaf49e02a819d50a | |
| parent | 2c933c4ed374e7f16ae351bd7a6880c20db41e85 [diff] | |
| parent | 9212cdcb482cdaf948269ddf6df48f8f27cd69b9 [diff] |
Merge remote-tracking branch 'm/main' into firmware-nissa-15217.B
Recent EC firmwares require an updated binman to compile, which lives in
this repository. This merges u-boot from main into the Nissa firmware
branch so EC firmware can continue to build when merged from main.
BUG=b:293561697
TEST=cros try firmware --branch firmware-nissa-15217.B \
-g crrev.com/c/4771475,crrev.com/c/4772234
Change-Id: I677f3a54da9d0ace8ec7abbc390607bc1c3e05e9