[coreboot-gerrit] Change in coreboot[master]: payloads/tianocore: Remove out dated ptches

Lijian Zhao (Code Review) gerrit at coreboot.org
Mon Sep 17 22:47:11 CEST 2018


Lijian Zhao has uploaded this change for review. ( https://review.coreboot.org/28650


Change subject: payloads/tianocore: Remove out dated ptches
......................................................................

payloads/tianocore: Remove out dated ptches

The following two changes already got merged in EDK2 main branch, no
need to apply patches any more. They are:
    07_CorebootPayloadPkg-Use-correct-BytesPerScanLine.patch
    08_BaseTools-Fix-building-with-Werror-stringop-truncati.patch

BUG=N/A
TEST=Build with tianocore pass.

Change-Id: Ia6b4d1105360a3ea3319711a14d3e980bc0bf776
Signed-off-by: Lijian Zhao <lijian.zhao at intel.com>
---
D payloads/external/tianocore/patches/07_CorebootPayloadPkg-Use-correct-BytesPerScanLine.patch
D payloads/external/tianocore/patches/08_BaseTools-Fix-building-with-Werror-stringop-truncati.patch
2 files changed, 0 insertions(+), 72 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/50/28650/1

diff --git a/payloads/external/tianocore/patches/07_CorebootPayloadPkg-Use-correct-BytesPerScanLine.patch b/payloads/external/tianocore/patches/07_CorebootPayloadPkg-Use-correct-BytesPerScanLine.patch
deleted file mode 100644
index 9b2569a..0000000
--- a/payloads/external/tianocore/patches/07_CorebootPayloadPkg-Use-correct-BytesPerScanLine.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2e75f9ad6ef625575185dfc262c6803a89850dd5 Mon Sep 17 00:00:00 2001
-From: Arthur Heymans <arthur at aheymans.xyz>
-Date: Wed, 24 Jan 2018 10:07:08 +0100
-Subject: [PATCH] CorebootPayloadPkg: Use correct BytesPerScanLine
-
-Fetch BytesPerScanLine from coreboot table to reflect how the actual
-framebuffer is set up instead of guessing it from the horizontal
-resolution.
-
-This fixes a garbled display when HorizontalResolution * (BitsPerPixel
-/ 8) and pFbInfo->BytesPerScanLine don't match.
-
-Contributed-under: TianoCore Contribution Agreement 1.1
-Signed-off-by: Arthur Heymans <arthur at aheymans.xyz>
----
- CorebootPayloadPkg/FbGop/FbGop.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CorebootPayloadPkg/FbGop/FbGop.c b/CorebootPayloadPkg/FbGop/FbGop.c
-index 37d6def7f780..679061703358 100644
---- a/CorebootPayloadPkg/FbGop/FbGop.c
-+++ b/CorebootPayloadPkg/FbGop/FbGop.c
-@@ -822,7 +822,7 @@ FbGopCheckForVbe (
-   BitsPerPixel         = pFbInfo->BitsPerPixel;
-   HorizontalResolution = pFbInfo->HorizontalResolution;
-   VerticalResolution   = pFbInfo->VerticalResolution;
--  BytesPerScanLine     = HorizontalResolution * (BitsPerPixel / 8);
-+  BytesPerScanLine     = pFbInfo->BytesPerScanLine;
-   
-   ModeBuffer = (FB_VIDEO_MODE_DATA *) AllocatePool (
- 																						ModeNumber * sizeof (FB_VIDEO_MODE_DATA)
--- 
-2.17.0
-
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
deleted file mode 100644
index 4881fff..0000000
--- a/payloads/external/tianocore/patches/08_BaseTools-Fix-building-with-Werror-stringop-truncati.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 8cb365e9ec90420e3d04b77f6e7999a65d5983a6 Mon Sep 17 00:00:00 2001
-From: Patrick Rudolph <siro at das-labor.org>
-Date: Sun, 17 Jun 2018 08:44:51 +0200
-Subject: [PATCH] BaseTools: Fix building with -Werror=stringop-truncation
-
-Signed-off-by: Patrick Rudolph <siro at das-labor.org>
----
- BaseTools/Source/C/GenVtf/GenVtf.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/BaseTools/Source/C/GenVtf/GenVtf.c b/BaseTools/Source/C/GenVtf/GenVtf.c
-index 65ae08eeceb8..d4200621457c 100644
---- a/BaseTools/Source/C/GenVtf/GenVtf.c
-+++ b/BaseTools/Source/C/GenVtf/GenVtf.c
-@@ -129,9 +129,9 @@ Returns:
-   } else {
-     Length = strlen(Str);
-     if (Length < 4) {
--      strncpy (TemStr + 4 - Length, Str, Length);
-+      memcpy (TemStr + 4 - Length, Str, Length);
-     } else {
--      strncpy (TemStr, Str + Length - 4, 4);
-+      memcpy (TemStr, Str + Length - 4, 4);
-     }
-   
-     sscanf (
-@@ -1521,7 +1521,7 @@ Returns:
-   //
-   FitStartPtr = (FIT_TABLE *) RelativeAddress;
- 
--  strncpy ((CHAR8 *) &FitStartPtr->CompAddress, FIT_SIGNATURE, 8);  // "_FIT_   "
-+  memcpy ((CHAR8 *) &FitStartPtr->CompAddress, FIT_SIGNATURE, 8);  // "_FIT_   "
-   assert (((VtfInfo->CompSize & 0x00FFFFFF) % 16) == 0);
-   FitStartPtr->CompSize     = (VtfInfo->CompSize & 0x00FFFFFF) / 16;
-   FitStartPtr->CompVersion  = MAKE_VERSION (VtfInfo->MajorVer, VtfInfo->MinorVer);
--- 
-2.17.0
-

-- 
To view, visit https://review.coreboot.org/28650
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6b4d1105360a3ea3319711a14d3e980bc0bf776
Gerrit-Change-Number: 28650
Gerrit-PatchSet: 1
Gerrit-Owner: Lijian Zhao <lijian.zhao at intel.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180917/472a7722/attachment.html>


More information about the coreboot-gerrit mailing list