merge conflict, please rebase again.

Patch set 3:Code-Review +2

To view, visit change 48972. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot

Gerrit-Branch: master

Gerrit-Change-Id: I4e5213563189336496122a0f2d8077b3e5245314

Gerrit-Change-Number: 48972

Gerrit-PatchSet: 3

Gerrit-Owner: Yidi Lin <yidi.lin@mediatek.com>

Gerrit-Reviewer: Hung-Te Lin <hungte@chromium.org>

Gerrit-Reviewer: Martin Roth <martinroth@google.com>

Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com>

Gerrit-Reviewer: Yu-Ping Wu <yupingso@google.com>

Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>

Gerrit-Comment-Date: Wed, 30 Dec 2020 06:04:31 +0000

Gerrit-HasComments: No

Gerrit-Has-Labels: Yes

Gerrit-MessageType: comment