rebase to display ToT and resolve conflicts.

View Change

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

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: If23898ebc6a1a0bcec910873a07b7470f9aa3dd6
Gerrit-Change-Number: 46413
Gerrit-PatchSet: 45
Gerrit-Owner: Yidi Lin <yidi.lin@mediatek.com>
Gerrit-Reviewer: CK HU <ck.hu@mediatek.com>
Gerrit-Reviewer: Hung-Te Lin <hungte@chromium.org>
Gerrit-Reviewer: Roger Lu <roger.lu@mediatek.com>
Gerrit-Reviewer: Sj Huang <sj.huang@mediatek.com>
Gerrit-Reviewer: Xi Chen <xixi.chen@mediatek.com>
Gerrit-Reviewer: Yu-Ping Wu <yupingso@google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-Reviewer: pan gao <gtk_pangao@mediatek.com>
Gerrit-CC: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-CC: Yidi Lin <yidi.lin@mediatek.corp-partner.google.com>
Gerrit-Comment-Date: Thu, 10 Dec 2020 14:09:16 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment