payloads/tianocore: rebase patches to UDK2018 release

Patches should be applied against edk2 release instead of arbitrary
commit. This aims to simplify Tianocore payload support by other
platforms.

Change-Id: Ib409f6f93eb64d7a9a2f09a75f8e637ab8689410
Signed-off-by: Piotr Król <piotr.krol@3mdeb.com>
Reviewed-on: https://review.coreboot.org/c/27615
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com>

9 files changed, 52 insertions, 88 deletions

diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile
index 747ee47b06..bd02f48e03 100644
--- a/payloads/external/tianocore/Makefile
+++ b/payloads/external/tianocore/Makefile
@@ -16,7 +16,8 @@
 # force the shell to bash - the edksetup.sh script doesn't work with dash
 export SHELL := env bash
 
-STABLE_COMMIT_ID=315d9d08fd77db1024ccc5307823da8aaed85e2f
+# STABLE_COMMIT_ID represent official edk2 release, currently UDK2018
+STABLE_COMMIT_ID=3e72ffe8afdd03f1f89eba65c921cbdcb004cfee
 TAG-$(CONFIG_TIANOCORE_MASTER)=origin/master
 TAG-$(CONFIG_TIANOCORE_STABLE)=$(STABLE_COMMIT_ID)
 TAG-$(CONFIG_TIANOCORE_REVISION)=$(CONFIG_TIANOCORE_REVISION_ID)
diff --git a/payloads/external/tianocore/patches/01_CorebootPayloadPkg_pcinoenum.patch b/payloads/external/tianocore/patches/01_CorebootPayloadPkg_pcinoenum.patch
index 448da4aa30..7036f3675e 100644
--- a/payloads/external/tianocore/patches/01_CorebootPayloadPkg_pcinoenum.patch
+++ b/payloads/external/tianocore/patches/01_CorebootPayloadPkg_pcinoenum.patch
@@ -1,4 +1,4 @@
-From 4f9d41e69356ce7486b0c74a754ff494256723de Mon Sep 17 00:00:00 2001
+From c3da734cd08117ce2d5cd48367f5a94848aa9321 Mon Sep 17 00:00:00 2001
 From: CoolStar <coolstarorganization@gmail.com>
 Date: Sun, 4 Dec 2016 11:23:38 -0800
 Subject: [PATCH] PCI: use Duet's PciNoEnumeration
@@ -10,7 +10,7 @@ Subject: [PATCH] PCI: use Duet's PciNoEnumeration
  3 files changed, 6 insertions(+), 12 deletions(-)
 
 diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
-index 303e626842..a39e3999ba 100644
+index 7994f0c94928..d71b3ec55690 100644
 --- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf
 +++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
 @@ -124,8 +124,8 @@ INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
@@ -25,7 +25,7 @@ index 303e626842..a39e3999ba 100644
  #

  # ISA Support

 diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
-index cdfcb75b59..e838aca61d 100644
+index ace1bc0a3726..0f4e475187ee 100644
 --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
 +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
 @@ -450,11 +450,8 @@
@@ -43,7 +43,7 @@ index cdfcb75b59..e838aca61d 100644
    #

    # SCSI/ATA/IDE/DISK Support

 diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
-index 6b16af63ba..c25d821fd4 100644
+index 2492142b972d..97bb0a8ae0a1 100644
 --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
 +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
 @@ -451,11 +451,8 @@
@@ -61,5 +61,5 @@ index 6b16af63ba..c25d821fd4 100644
    #

    # SCSI/ATA/IDE/DISK Support

 -- 
-2.13.2.725.g09c95d1e9-goog
+2.17.0
 
diff --git a/payloads/external/tianocore/patches/02_CorebootPayloadPkg_bds.patch b/payloads/external/tianocore/patches/02_CorebootPayloadPkg_bds.patch
index 8013ccd0f1..9c612631a4 100644
--- a/payloads/external/tianocore/patches/02_CorebootPayloadPkg_bds.patch
+++ b/payloads/external/tianocore/patches/02_CorebootPayloadPkg_bds.patch
@@ -1,20 +1,20 @@
-From 5121087836c1ad2a08857d494c0d9ecb183f4f98 Mon Sep 17 00:00:00 2001
+From e72cac80c845429b042c7f9c36ede642cbe9e150 Mon Sep 17 00:00:00 2001
 From: CoolStar <coolstarorganization@gmail.com>
 Date: Tue, 18 Jul 2017 15:50:38 -0600
 Subject: [PATCH] Rebasing
 
 ---
- CorebootModulePkg/CorebootModulePkg.dec            |    8 +
- .../Include/Guid/LdrMemoryDescriptor.h             |   33 +
- .../Include/Guid/PciExpressBaseAddress.h           |   46 +
- CorebootModulePkg/Include/Guid/PciOptionRomTable.h |   41 +
- .../Library/CorebootBdsLib/BdsPlatform.c           | 1731 ++++++++++++++++++++
- .../Library/CorebootBdsLib/BdsPlatform.h           |  288 ++++
- .../Library/CorebootBdsLib/PlatformBds.inf         |   65 +
- .../Library/CorebootBdsLib/PlatformData.c          |  161 ++
- CorebootPayloadPkg/CorebootPayloadPkg.fdf          |    5 +-
- CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc      |   12 +-
- CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc   |   12 +-
+ CorebootModulePkg/CorebootModulePkg.dec       |    8 +
+ .../Include/Guid/LdrMemoryDescriptor.h        |   33 +
+ .../Include/Guid/PciExpressBaseAddress.h      |   46 +
+ .../Include/Guid/PciOptionRomTable.h          |   41 +
+ .../Library/CorebootBdsLib/BdsPlatform.c      | 1731 +++++++++++++++++
+ .../Library/CorebootBdsLib/BdsPlatform.h      |  288 +++
+ .../Library/CorebootBdsLib/PlatformBds.inf    |   65 +
+ .../Library/CorebootBdsLib/PlatformData.c     |  161 ++
+ CorebootPayloadPkg/CorebootPayloadPkg.fdf     |    5 +-
+ CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc |   12 +-
+ .../CorebootPayloadPkgIa32X64.dsc             |   12 +-
  11 files changed, 2388 insertions(+), 14 deletions(-)
  create mode 100644 CorebootModulePkg/Include/Guid/LdrMemoryDescriptor.h
  create mode 100644 CorebootModulePkg/Include/Guid/PciExpressBaseAddress.h
@@ -25,7 +25,7 @@ Subject: [PATCH] Rebasing
  create mode 100644 CorebootModulePkg/Library/CorebootBdsLib/PlatformData.c
 
 diff --git a/CorebootModulePkg/CorebootModulePkg.dec b/CorebootModulePkg/CorebootModulePkg.dec
-index 7f1309bdae..20932a1d04 100644
+index 7f1309bdae61..20932a1d0467 100644
 --- a/CorebootModulePkg/CorebootModulePkg.dec
 +++ b/CorebootModulePkg/CorebootModulePkg.dec
 @@ -33,8 +33,16 @@
@@ -47,7 +47,7 @@ index 7f1309bdae..20932a1d04 100644
  

 diff --git a/CorebootModulePkg/Include/Guid/LdrMemoryDescriptor.h b/CorebootModulePkg/Include/Guid/LdrMemoryDescriptor.h
 new file mode 100644
-index 0000000000..38a997deea
+index 000000000000..38a997deea0c
 --- /dev/null
 +++ b/CorebootModulePkg/Include/Guid/LdrMemoryDescriptor.h
 @@ -0,0 +1,33 @@
@@ -86,7 +86,7 @@ index 0000000000..38a997deea
 +#endif
 diff --git a/CorebootModulePkg/Include/Guid/PciExpressBaseAddress.h b/CorebootModulePkg/Include/Guid/PciExpressBaseAddress.h
 new file mode 100644
-index 0000000000..ff554383c1
+index 000000000000..ff554383c11b
 --- /dev/null
 +++ b/CorebootModulePkg/Include/Guid/PciExpressBaseAddress.h
 @@ -0,0 +1,46 @@
@@ -138,7 +138,7 @@ index 0000000000..ff554383c1
 +#endif
 diff --git a/CorebootModulePkg/Include/Guid/PciOptionRomTable.h b/CorebootModulePkg/Include/Guid/PciOptionRomTable.h
 new file mode 100644
-index 0000000000..a2fb99710a
+index 000000000000..a2fb99710a69
 --- /dev/null
 +++ b/CorebootModulePkg/Include/Guid/PciOptionRomTable.h
 @@ -0,0 +1,41 @@
@@ -185,7 +185,7 @@ index 0000000000..a2fb99710a
 +
 diff --git a/CorebootModulePkg/Library/CorebootBdsLib/BdsPlatform.c b/CorebootModulePkg/Library/CorebootBdsLib/BdsPlatform.c
 new file mode 100644
-index 0000000000..b6253a17f8
+index 000000000000..b6253a17f8ea
 --- /dev/null
 +++ b/CorebootModulePkg/Library/CorebootBdsLib/BdsPlatform.c
 @@ -0,0 +1,1731 @@
@@ -1922,7 +1922,7 @@ index 0000000000..b6253a17f8
 +}
 diff --git a/CorebootModulePkg/Library/CorebootBdsLib/BdsPlatform.h b/CorebootModulePkg/Library/CorebootBdsLib/BdsPlatform.h
 new file mode 100644
-index 0000000000..d447f77747
+index 000000000000..d447f77747e3
 --- /dev/null
 +++ b/CorebootModulePkg/Library/CorebootBdsLib/BdsPlatform.h
 @@ -0,0 +1,288 @@
@@ -2216,7 +2216,7 @@ index 0000000000..d447f77747
 +#endif // _PLATFORM_SPECIFIC_BDS_PLATFORM_H_
 diff --git a/CorebootModulePkg/Library/CorebootBdsLib/PlatformBds.inf b/CorebootModulePkg/Library/CorebootBdsLib/PlatformBds.inf
 new file mode 100644
-index 0000000000..578c74afae
+index 000000000000..578c74afae22
 --- /dev/null
 +++ b/CorebootModulePkg/Library/CorebootBdsLib/PlatformBds.inf
 @@ -0,0 +1,65 @@
@@ -2287,7 +2287,7 @@ index 0000000000..578c74afae
 +
 diff --git a/CorebootModulePkg/Library/CorebootBdsLib/PlatformData.c b/CorebootModulePkg/Library/CorebootBdsLib/PlatformData.c
 new file mode 100644
-index 0000000000..fbdcc7de81
+index 000000000000..fbdcc7de8166
 --- /dev/null
 +++ b/CorebootModulePkg/Library/CorebootBdsLib/PlatformData.c
 @@ -0,0 +1,161 @@
@@ -2453,7 +2453,7 @@ index 0000000000..fbdcc7de81
 +EFI_DEVICE_PATH_PROTOCOL    *gPlatformConnectSequence[] = { NULL };
 +
 diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
-index a39e3999ba..623ff9c344 100644
+index d71b3ec55690..22987093da58 100644
 --- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf
 +++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
 @@ -95,8 +95,9 @@ INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntime
@@ -2469,7 +2469,7 @@ index a39e3999ba..623ff9c344 100644
  INF PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf

  !else

 diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
-index e838aca61d..a329b78f08 100644
+index 0f4e475187ee..053f380a8608 100644
 --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
 +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
 @@ -165,6 +165,7 @@
@@ -2508,7 +2508,7 @@ index e838aca61d..a329b78f08 100644
    PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf

  !else

 diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
-index c25d821fd4..790efd7810 100644
+index 97bb0a8ae0a1..bb328349b44a 100644
 --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
 +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
 @@ -165,6 +165,7 @@
@@ -2547,5 +2547,5 @@ index c25d821fd4..790efd7810 100644
    PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf

  !else

 -- 
-2.13.2.932.g7449e964c-goog
+2.17.0
 
diff --git a/payloads/external/tianocore/patches/03_Library_EndofDXE.patch b/payloads/external/tianocore/patches/03_Library_EndofDXE.patch
index 02ba42b77c..cca3eeac99 100644
--- a/payloads/external/tianocore/patches/03_Library_EndofDXE.patch
+++ b/payloads/external/tianocore/patches/03_Library_EndofDXE.patch
@@ -1,16 +1,16 @@
-From 760f1cafdd689beedc8418ab89e856b54296389c Mon Sep 17 00:00:00 2001
+From 1e9c5c97a55f3ad3c0d6d5dde380b4d73bd15860 Mon Sep 17 00:00:00 2001
 From: CoolStar <coolstarorganization@gmail.com>
 Date: Sun, 4 Dec 2016 12:07:30 -0800
 Subject: [PATCH] CorebootBdsLib: Call End of DXE event to allow booting 3rd
  party efi binaries.
 
 ---
- .../Library/CorebootBdsLib/BdsPlatform.c           | 42 ++++++++++++++++++++++
- .../Library/CorebootBdsLib/PlatformBds.inf         |  1 +
+ .../Library/CorebootBdsLib/BdsPlatform.c      | 42 +++++++++++++++++++
+ .../Library/CorebootBdsLib/PlatformBds.inf    |  1 +
  2 files changed, 43 insertions(+)
 
 diff --git a/CorebootModulePkg/Library/CorebootBdsLib/BdsPlatform.c b/CorebootModulePkg/Library/CorebootBdsLib/BdsPlatform.c
-index b6253a17f8..cf3e5320cb 100644
+index b6253a17f8ea..cf3e5320cbe8 100644
 --- a/CorebootModulePkg/Library/CorebootBdsLib/BdsPlatform.c
 +++ b/CorebootModulePkg/Library/CorebootBdsLib/BdsPlatform.c
 @@ -1129,6 +1129,46 @@ Returns:
@@ -70,7 +70,7 @@ index b6253a17f8..cf3e5320cb 100644
    // Init the time out value
    //
 diff --git a/CorebootModulePkg/Library/CorebootBdsLib/PlatformBds.inf b/CorebootModulePkg/Library/CorebootBdsLib/PlatformBds.inf
-index 578c74afae..992bd846bd 100644
+index 578c74afae22..992bd846bdc4 100644
 --- a/CorebootModulePkg/Library/CorebootBdsLib/PlatformBds.inf
 +++ b/CorebootModulePkg/Library/CorebootBdsLib/PlatformBds.inf
 @@ -58,6 +58,7 @@
@@ -82,5 +82,5 @@ index 578c74afae..992bd846bd 100644
  [Pcd]
    gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut
 -- 
-2.13.2.725.g09c95d1e9-goog
+2.17.0
 
diff --git a/payloads/external/tianocore/patches/04_CorebootPayloadPkg_addps2.patch b/payloads/external/tianocore/patches/04_CorebootPayloadPkg_addps2.patch
index e90b70e37b..2b7da9d9fb 100644
--- a/payloads/external/tianocore/patches/04_CorebootPayloadPkg_addps2.patch
+++ b/payloads/external/tianocore/patches/04_CorebootPayloadPkg_addps2.patch
@@ -1,4 +1,4 @@
-From 77c5dfcce842819215490fe63c481860fa7d752d Mon Sep 17 00:00:00 2001
+From e8d6ed35c15b92497cd3ede6cd35523b0e7366ac Mon Sep 17 00:00:00 2001
 From: CoolStar <coolstarorganization@gmail.com>
 Date: Sun, 4 Dec 2016 11:50:00 -0800
 Subject: [PATCH] CorebootPayloadPkg: Add PS/2 keyboard drivers.
@@ -10,7 +10,7 @@ Subject: [PATCH] CorebootPayloadPkg: Add PS/2 keyboard drivers.
  3 files changed, 9 insertions(+)
 
 diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
-index 347e9c75ce..a347af0c9a 100644
+index 22987093da58..0961e96c250d 100644
 --- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf
 +++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
 @@ -132,6 +132,9 @@ INF DuetPkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf
@@ -24,7 +24,7 @@ index 347e9c75ce..a347af0c9a 100644
  #

  # Console Support

 diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
-index 5ce823bb95..60ee064c59 100644
+index 053f380a8608..6ddd64faf7a5 100644
 --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
 +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
 @@ -492,6 +492,9 @@
@@ -38,7 +38,7 @@ index 5ce823bb95..60ee064c59 100644
    #

    # Console Support

 diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
-index fea297a77a..167329c897 100644
+index bb328349b44a..19c203e6cbb6 100644
 --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
 +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
 @@ -493,6 +493,9 @@
@@ -52,5 +52,5 @@ index fea297a77a..167329c897 100644
    #

    # Console Support

 -- 
-2.13.2.725.g09c95d1e9-goog
+2.17.0
 
diff --git a/payloads/external/tianocore/patches/06_CorebootPayloadPkg_keep_cb_table.patch b/payloads/external/tianocore/patches/06_CorebootPayloadPkg_keep_cb_table.patch
index da8fc7f0fd..10024d85ab 100644
--- a/payloads/external/tianocore/patches/06_CorebootPayloadPkg_keep_cb_table.patch
+++ b/payloads/external/tianocore/patches/06_CorebootPayloadPkg_keep_cb_table.patch
@@ -1,4 +1,4 @@
-From 336ce69129206ea6cb5bea2a99c5f00e77850518 Mon Sep 17 00:00:00 2001
+From 9c28ac87eb2df7319d4f5a48124c837b8bf123b3 Mon Sep 17 00:00:00 2001
 From: ReddestDream <reddestdream@gmail.com>
 Date: Wed, 3 May 2017 00:13:28 -0400
 Subject: [PATCH] CbSupportPei: prevent lower coreboot table from being
diff --git a/payloads/external/tianocore/patches/07_CorebootPayloadPkg-Use-correct-BytesPerScanLine.patch b/payloads/external/tianocore/patches/07_CorebootPayloadPkg-Use-correct-BytesPerScanLine.patch
index 6370efca23..9b2569abda 100644
--- a/payloads/external/tianocore/patches/07_CorebootPayloadPkg-Use-correct-BytesPerScanLine.patch
+++ b/payloads/external/tianocore/patches/07_CorebootPayloadPkg-Use-correct-BytesPerScanLine.patch
@@ -1,4 +1,4 @@
-From 07dec11fe965e73cfef7df38af70c945b6ff21a2 Mon Sep 17 00:00:00 2001
+From 2e75f9ad6ef625575185dfc262c6803a89850dd5 Mon Sep 17 00:00:00 2001
 From: Arthur Heymans <arthur@aheymans.xyz>
 Date: Wed, 24 Jan 2018 10:07:08 +0100
 Subject: [PATCH] CorebootPayloadPkg: Use correct BytesPerScanLine
@@ -12,9 +12,12 @@ This fixes a garbled display when HorizontalResolution * (BitsPerPixel
 
 Contributed-under: TianoCore Contribution Agreement 1.1
 Signed-off-by: Arthur Heymans <arthur@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 37d6def7f7..6790617033 100644
+index 37d6def7f780..679061703358 100644
 --- a/CorebootPayloadPkg/FbGop/FbGop.c
 +++ b/CorebootPayloadPkg/FbGop/FbGop.c
 @@ -822,7 +822,7 @@ FbGopCheckForVbe (
@@ -27,5 +30,5 @@ index 37d6def7f7..6790617033 100644
    ModeBuffer = (FB_VIDEO_MODE_DATA *) AllocatePool (

  																						ModeNumber * sizeof (FB_VIDEO_MODE_DATA)

 -- 
-2.16.1
+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
index 06ddd568d7..4881fff559 100644
--- 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
@@ -1,4 +1,4 @@
-From b652262ed0dd554c44e7b1bf7134d3458f5edef1 Mon Sep 17 00:00:00 2001
+From 8cb365e9ec90420e3d04b77f6e7999a65d5983a6 Mon Sep 17 00:00:00 2001
 From: Patrick Rudolph <siro@das-labor.org>
 Date: Sun, 17 Jun 2018 08:44:51 +0200
 Subject: [PATCH] BaseTools: Fix building with -Werror=stringop-truncation
@@ -9,7 +9,7 @@ Signed-off-by: Patrick Rudolph <siro@das-labor.org>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/BaseTools/Source/C/GenVtf/GenVtf.c b/BaseTools/Source/C/GenVtf/GenVtf.c
-index acc142a6d1..5d77016eba 100644
+index 65ae08eeceb8..d4200621457c 100644
 --- a/BaseTools/Source/C/GenVtf/GenVtf.c
 +++ b/BaseTools/Source/C/GenVtf/GenVtf.c
 @@ -129,9 +129,9 @@ Returns:
@@ -24,7 +24,7 @@ index acc142a6d1..5d77016eba 100644
      }

    

      sscanf (

-@@ -1529,7 +1529,7 @@ Returns:
+@@ -1521,7 +1521,7 @@ Returns:
    //

    FitStartPtr = (FIT_TABLE *) RelativeAddress;

  

diff --git a/payloads/external/tianocore/patches/09_gcc7-Fix-building-with-fpermissive.patch b/payloads/external/tianocore/patches/09_gcc7-Fix-building-with-fpermissive.patch
deleted file mode 100644
index 701675988d..0000000000
--- a/payloads/external/tianocore/patches/09_gcc7-Fix-building-with-fpermissive.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5546ab29b2c0c2fc3a963bc71221918dc77b6152 Mon Sep 17 00:00:00 2001
-From: Patrick Rudolph <siro@das-labor.org>
-Date: Sun, 17 Jun 2018 08:53:25 +0200
-Subject: [PATCH] gcc7: Fix building with -fpermissive
-
-Signed-off-by: Patrick Rudolph <siro@das-labor.org>
----
- BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp | 2 +-
- MdeModulePkg/Library/UefiHiiLib/HiiLib.c        | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
-index 3ca57ed741..4fa066dd9f 100644
---- a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
-+++ b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
-@@ -3372,7 +3372,7 @@ CVfrStringDB::GetVarStoreNameFormStringId (
-   UINT8       BlockType;

-   EFI_HII_STRING_PACKAGE_HDR *PkgHeader;

-   

--  if (mStringFileName == '\0' ) {

-+  if (mStringFileName == NULL ) {

-     return NULL;

-   }

- 

-diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
-index 857950118f..de0aa5f7bc 100644
---- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
-+++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
-@@ -2181,7 +2181,7 @@ InternalHiiIfrValueAction (
-   

-   StringPtr = ConfigAltResp;

-   

--  while (StringPtr != L'\0') {

-+  while (StringPtr != NULL) {

-     //

-     // 1. Find <ConfigHdr> GUID=...&NAME=...&PATH=...

-     //

--- 
-2.17.0
-