<p>Lijian Zhao has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28650">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">payloads/tianocore: Remove out dated ptches<br><br>The following two changes already got merged in EDK2 main branch, no<br>need to apply patches any more. They are:<br> 07_CorebootPayloadPkg-Use-correct-BytesPerScanLine.patch<br> 08_BaseTools-Fix-building-with-Werror-stringop-truncati.patch<br><br>BUG=N/A<br>TEST=Build with tianocore pass.<br><br>Change-Id: Ia6b4d1105360a3ea3319711a14d3e980bc0bf776<br>Signed-off-by: Lijian Zhao <lijian.zhao@intel.com><br>---<br>D payloads/external/tianocore/patches/07_CorebootPayloadPkg-Use-correct-BytesPerScanLine.patch<br>D payloads/external/tianocore/patches/08_BaseTools-Fix-building-with-Werror-stringop-truncati.patch<br>2 files changed, 0 insertions(+), 72 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/50/28650/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/payloads/external/tianocore/patches/07_CorebootPayloadPkg-Use-correct-BytesPerScanLine.patch b/payloads/external/tianocore/patches/07_CorebootPayloadPkg-Use-correct-BytesPerScanLine.patch</span><br><span>deleted file mode 100644</span><br><span>index 9b2569a..0000000</span><br><span>--- a/payloads/external/tianocore/patches/07_CorebootPayloadPkg-Use-correct-BytesPerScanLine.patch</span><br><span>+++ /dev/null</span><br><span>@@ -1,34 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-From 2e75f9ad6ef625575185dfc262c6803a89850dd5 Mon Sep 17 00:00:00 2001</span><br><span style="color: hsl(0, 100%, 40%);">-From: Arthur Heymans <arthur@aheymans.xyz></span><br><span style="color: hsl(0, 100%, 40%);">-Date: Wed, 24 Jan 2018 10:07:08 +0100</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: [PATCH] CorebootPayloadPkg: Use correct BytesPerScanLine</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Fetch BytesPerScanLine from coreboot table to reflect how the actual</span><br><span style="color: hsl(0, 100%, 40%);">-framebuffer is set up instead of guessing it from the horizontal</span><br><span style="color: hsl(0, 100%, 40%);">-resolution.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-This fixes a garbled display when HorizontalResolution * (BitsPerPixel</span><br><span style="color: hsl(0, 100%, 40%);">-/ 8) and pFbInfo->BytesPerScanLine don't match.</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Contributed-under: TianoCore Contribution Agreement 1.1</span><br><span style="color: hsl(0, 100%, 40%);">-Signed-off-by: Arthur Heymans <arthur@aheymans.xyz></span><br><span>----</span><br><span style="color: hsl(0, 100%, 40%);">- CorebootPayloadPkg/FbGop/FbGop.c | 2 +-</span><br><span style="color: hsl(0, 100%, 40%);">- 1 file changed, 1 insertion(+), 1 deletion(-)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-diff --git a/CorebootPayloadPkg/FbGop/FbGop.c b/CorebootPayloadPkg/FbGop/FbGop.c</span><br><span style="color: hsl(0, 100%, 40%);">-index 37d6def7f780..679061703358 100644</span><br><span>---- a/CorebootPayloadPkg/FbGop/FbGop.c</span><br><span style="color: hsl(0, 100%, 40%);">-+++ b/CorebootPayloadPkg/FbGop/FbGop.c</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -822,7 +822,7 @@ FbGopCheckForVbe (</span><br><span style="color: hsl(0, 100%, 40%);">- BitsPerPixel = pFbInfo->BitsPerPixel;
</span><br><span style="color: hsl(0, 100%, 40%);">- HorizontalResolution = pFbInfo->HorizontalResolution;
</span><br><span style="color: hsl(0, 100%, 40%);">- VerticalResolution = pFbInfo->VerticalResolution;
</span><br><span style="color: hsl(0, 100%, 40%);">-- BytesPerScanLine = HorizontalResolution * (BitsPerPixel / 8);
</span><br><span style="color: hsl(0, 100%, 40%);">-+ BytesPerScanLine = pFbInfo->BytesPerScanLine;
</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">- ModeBuffer = (FB_VIDEO_MODE_DATA *) AllocatePool (
</span><br><span style="color: hsl(0, 100%, 40%);">- ModeNumber * sizeof (FB_VIDEO_MODE_DATA)
</span><br><span>--- </span><br><span style="color: hsl(0, 100%, 40%);">-2.17.0</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/payloads/external/tianocore/patches/08_BaseTools-Fix-building-with-Werror-stringop-truncati.patch b/payloads/external/tianocore/patches/08_BaseTools-Fix-building-with-Werror-stringop-truncati.patch</span><br><span>deleted file mode 100644</span><br><span>index 4881fff..0000000</span><br><span>--- a/payloads/external/tianocore/patches/08_BaseTools-Fix-building-with-Werror-stringop-truncati.patch</span><br><span>+++ /dev/null</span><br><span>@@ -1,38 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-From 8cb365e9ec90420e3d04b77f6e7999a65d5983a6 Mon Sep 17 00:00:00 2001</span><br><span style="color: hsl(0, 100%, 40%);">-From: Patrick Rudolph <siro@das-labor.org></span><br><span style="color: hsl(0, 100%, 40%);">-Date: Sun, 17 Jun 2018 08:44:51 +0200</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: [PATCH] BaseTools: Fix building with -Werror=stringop-truncation</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-Signed-off-by: Patrick Rudolph <siro@das-labor.org></span><br><span>----</span><br><span style="color: hsl(0, 100%, 40%);">- BaseTools/Source/C/GenVtf/GenVtf.c | 6 +++---</span><br><span style="color: hsl(0, 100%, 40%);">- 1 file changed, 3 insertions(+), 3 deletions(-)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-diff --git a/BaseTools/Source/C/GenVtf/GenVtf.c b/BaseTools/Source/C/GenVtf/GenVtf.c</span><br><span style="color: hsl(0, 100%, 40%);">-index 65ae08eeceb8..d4200621457c 100644</span><br><span>---- a/BaseTools/Source/C/GenVtf/GenVtf.c</span><br><span style="color: hsl(0, 100%, 40%);">-+++ b/BaseTools/Source/C/GenVtf/GenVtf.c</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -129,9 +129,9 @@ Returns:</span><br><span style="color: hsl(0, 100%, 40%);">- } else {
</span><br><span style="color: hsl(0, 100%, 40%);">- Length = strlen(Str);
</span><br><span style="color: hsl(0, 100%, 40%);">- if (Length < 4) {
</span><br><span style="color: hsl(0, 100%, 40%);">-- strncpy (TemStr + 4 - Length, Str, Length);
</span><br><span style="color: hsl(0, 100%, 40%);">-+ memcpy (TemStr + 4 - Length, Str, Length);
</span><br><span style="color: hsl(0, 100%, 40%);">- } else {
</span><br><span style="color: hsl(0, 100%, 40%);">-- strncpy (TemStr, Str + Length - 4, 4);
</span><br><span style="color: hsl(0, 100%, 40%);">-+ memcpy (TemStr, Str + Length - 4, 4);
</span><br><span style="color: hsl(0, 100%, 40%);">- }
</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">- sscanf (
</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -1521,7 +1521,7 @@ Returns:</span><br><span style="color: hsl(0, 100%, 40%);">- //
</span><br><span style="color: hsl(0, 100%, 40%);">- FitStartPtr = (FIT_TABLE *) RelativeAddress;
</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">-- strncpy ((CHAR8 *) &FitStartPtr->CompAddress, FIT_SIGNATURE, 8); // "_FIT_ "
</span><br><span style="color: hsl(0, 100%, 40%);">-+ memcpy ((CHAR8 *) &FitStartPtr->CompAddress, FIT_SIGNATURE, 8); // "_FIT_ "
</span><br><span style="color: hsl(0, 100%, 40%);">- assert (((VtfInfo->CompSize & 0x00FFFFFF) % 16) == 0);
</span><br><span style="color: hsl(0, 100%, 40%);">- FitStartPtr->CompSize = (VtfInfo->CompSize & 0x00FFFFFF) / 16;
</span><br><span style="color: hsl(0, 100%, 40%);">- FitStartPtr->CompVersion = MAKE_VERSION (VtfInfo->MajorVer, VtfInfo->MinorVer);
</span><br><span>--- </span><br><span style="color: hsl(0, 100%, 40%);">-2.17.0</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28650">change 28650</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/28650"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ia6b4d1105360a3ea3319711a14d3e980bc0bf776 </div>
<div style="display:none"> Gerrit-Change-Number: 28650 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Lijian Zhao <lijian.zhao@intel.com> </div>