<p>Piotr Król has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27615">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">payloads/tianocore: rebase patches to UDK2018 release<br><br>Patches should be applied against edk2 release instead of arbitrary<br>commit. This aims to simplify Tianocore payload support by other<br>platforms.<br><br>Change-Id: Ib409f6f93eb64d7a9a2f09a75f8e637ab8689410<br>Signed-off-by: Piotr Król <piotr.krol@3mdeb.com><br>---<br>M payloads/external/tianocore/Makefile<br>M payloads/external/tianocore/patches/01_CorebootPayloadPkg_pcinoenum.patch<br>M payloads/external/tianocore/patches/02_CorebootPayloadPkg_bds.patch<br>M payloads/external/tianocore/patches/03_Library_EndofDXE.patch<br>M payloads/external/tianocore/patches/04_CorebootPayloadPkg_addps2.patch<br>M payloads/external/tianocore/patches/05_CorebootPayloadPkg_noserial.patch<br>M payloads/external/tianocore/patches/06_CorebootPayloadPkg_keep_cb_table.patch<br>M payloads/external/tianocore/patches/07_CorebootPayloadPkg-Use-correct-BytesPerScanLine.patch<br>M payloads/external/tianocore/patches/08_BaseTools-Fix-building-with-Werror-stringop-truncati.patch<br>D payloads/external/tianocore/patches/09_gcc7-Fix-building-with-fpermissive.patch<br>10 files changed, 56 insertions(+), 92 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/27615/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile</span><br><span>index 2f770d2..72293d8 100644</span><br><span>--- a/payloads/external/tianocore/Makefile</span><br><span>+++ b/payloads/external/tianocore/Makefile</span><br><span>@@ -16,7 +16,8 @@</span><br><span> # force the shell to bash - the edksetup.sh script doesn't work with dash</span><br><span> export SHELL := env bash</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-STABLE_COMMIT_ID=315d9d08fd77db1024ccc5307823da8aaed85e2f</span><br><span style="color: hsl(120, 100%, 40%);">+# STABLE_COMMIT_ID represent official edk2 release, currently UDK2018</span><br><span style="color: hsl(120, 100%, 40%);">+STABLE_COMMIT_ID=3e72ffe8afdd03f1f89eba65c921cbdcb004cfee</span><br><span> TAG-$(CONFIG_TIANOCORE_MASTER)=origin/master</span><br><span> TAG-$(CONFIG_TIANOCORE_STABLE)=$(STABLE_COMMIT_ID)</span><br><span> TAG-$(CONFIG_TIANOCORE_REVISION)=$(CONFIG_TIANOCORE_REVISION_ID)</span><br><span>diff --git a/payloads/external/tianocore/patches/01_CorebootPayloadPkg_pcinoenum.patch b/payloads/external/tianocore/patches/01_CorebootPayloadPkg_pcinoenum.patch</span><br><span>index 448da4a..7036f36 100644</span><br><span>--- a/payloads/external/tianocore/patches/01_CorebootPayloadPkg_pcinoenum.patch</span><br><span>+++ b/payloads/external/tianocore/patches/01_CorebootPayloadPkg_pcinoenum.patch</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-From 4f9d41e69356ce7486b0c74a754ff494256723de Mon Sep 17 00:00:00 2001</span><br><span style="color: hsl(120, 100%, 40%);">+From c3da734cd08117ce2d5cd48367f5a94848aa9321 Mon Sep 17 00:00:00 2001</span><br><span> From: CoolStar <coolstarorganization@gmail.com></span><br><span> Date: Sun, 4 Dec 2016 11:23:38 -0800</span><br><span> Subject: [PATCH] PCI: use Duet's PciNoEnumeration</span><br><span>@@ -10,7 +10,7 @@</span><br><span> 3 files changed, 6 insertions(+), 12 deletions(-)</span><br><span> </span><br><span> diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf b/CorebootPayloadPkg/CorebootPayloadPkg.fdf</span><br><span style="color: hsl(0, 100%, 40%);">-index 303e626842..a39e3999ba 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 7994f0c94928..d71b3ec55690 100644</span><br><span> --- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf</span><br><span> +++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf</span><br><span> @@ -124,8 +124,8 @@ INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf</span><br><span>@@ -25,7 +25,7 @@</span><br><span> #
</span><br><span> # ISA Support
</span><br><span> diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc</span><br><span style="color: hsl(0, 100%, 40%);">-index cdfcb75b59..e838aca61d 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index ace1bc0a3726..0f4e475187ee 100644</span><br><span> --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc</span><br><span> +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc</span><br><span> @@ -450,11 +450,8 @@</span><br><span>@@ -43,7 +43,7 @@</span><br><span> #
</span><br><span> # SCSI/ATA/IDE/DISK Support
</span><br><span> diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc</span><br><span style="color: hsl(0, 100%, 40%);">-index 6b16af63ba..c25d821fd4 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 2492142b972d..97bb0a8ae0a1 100644</span><br><span> --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc</span><br><span> +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc</span><br><span> @@ -451,11 +451,8 @@</span><br><span>@@ -61,5 +61,5 @@</span><br><span> #
</span><br><span> # SCSI/ATA/IDE/DISK Support
</span><br><span> -- </span><br><span style="color: hsl(0, 100%, 40%);">-2.13.2.725.g09c95d1e9-goog</span><br><span style="color: hsl(120, 100%, 40%);">+2.17.0</span><br><span> </span><br><span>diff --git a/payloads/external/tianocore/patches/02_CorebootPayloadPkg_bds.patch b/payloads/external/tianocore/patches/02_CorebootPayloadPkg_bds.patch</span><br><span>index 8013ccd..9c61263 100644</span><br><span>--- a/payloads/external/tianocore/patches/02_CorebootPayloadPkg_bds.patch</span><br><span>+++ b/payloads/external/tianocore/patches/02_CorebootPayloadPkg_bds.patch</span><br><span>@@ -1,20 +1,20 @@</span><br><span style="color: hsl(0, 100%, 40%);">-From 5121087836c1ad2a08857d494c0d9ecb183f4f98 Mon Sep 17 00:00:00 2001</span><br><span style="color: hsl(120, 100%, 40%);">+From e72cac80c845429b042c7f9c36ede642cbe9e150 Mon Sep 17 00:00:00 2001</span><br><span> From: CoolStar <coolstarorganization@gmail.com></span><br><span> Date: Tue, 18 Jul 2017 15:50:38 -0600</span><br><span> Subject: [PATCH] Rebasing</span><br><span> </span><br><span> ---</span><br><span style="color: hsl(0, 100%, 40%);">- CorebootModulePkg/CorebootModulePkg.dec | 8 +</span><br><span style="color: hsl(0, 100%, 40%);">- .../Include/Guid/LdrMemoryDescriptor.h | 33 +</span><br><span style="color: hsl(0, 100%, 40%);">- .../Include/Guid/PciExpressBaseAddress.h | 46 +</span><br><span style="color: hsl(0, 100%, 40%);">- CorebootModulePkg/Include/Guid/PciOptionRomTable.h | 41 +</span><br><span style="color: hsl(0, 100%, 40%);">- .../Library/CorebootBdsLib/BdsPlatform.c | 1731 ++++++++++++++++++++</span><br><span style="color: hsl(0, 100%, 40%);">- .../Library/CorebootBdsLib/BdsPlatform.h | 288 ++++</span><br><span style="color: hsl(0, 100%, 40%);">- .../Library/CorebootBdsLib/PlatformBds.inf | 65 +</span><br><span style="color: hsl(0, 100%, 40%);">- .../Library/CorebootBdsLib/PlatformData.c | 161 ++</span><br><span style="color: hsl(0, 100%, 40%);">- CorebootPayloadPkg/CorebootPayloadPkg.fdf | 5 +-</span><br><span style="color: hsl(0, 100%, 40%);">- CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc | 12 +-</span><br><span style="color: hsl(0, 100%, 40%);">- CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc | 12 +-</span><br><span style="color: hsl(120, 100%, 40%);">+ CorebootModulePkg/CorebootModulePkg.dec | 8 +</span><br><span style="color: hsl(120, 100%, 40%);">+ .../Include/Guid/LdrMemoryDescriptor.h | 33 +</span><br><span style="color: hsl(120, 100%, 40%);">+ .../Include/Guid/PciExpressBaseAddress.h | 46 +</span><br><span style="color: hsl(120, 100%, 40%);">+ .../Include/Guid/PciOptionRomTable.h | 41 +</span><br><span style="color: hsl(120, 100%, 40%);">+ .../Library/CorebootBdsLib/BdsPlatform.c | 1731 +++++++++++++++++</span><br><span style="color: hsl(120, 100%, 40%);">+ .../Library/CorebootBdsLib/BdsPlatform.h | 288 +++</span><br><span style="color: hsl(120, 100%, 40%);">+ .../Library/CorebootBdsLib/PlatformBds.inf | 65 +</span><br><span style="color: hsl(120, 100%, 40%);">+ .../Library/CorebootBdsLib/PlatformData.c | 161 ++</span><br><span style="color: hsl(120, 100%, 40%);">+ CorebootPayloadPkg/CorebootPayloadPkg.fdf | 5 +-</span><br><span style="color: hsl(120, 100%, 40%);">+ CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc | 12 +-</span><br><span style="color: hsl(120, 100%, 40%);">+ .../CorebootPayloadPkgIa32X64.dsc | 12 +-</span><br><span> 11 files changed, 2388 insertions(+), 14 deletions(-)</span><br><span> create mode 100644 CorebootModulePkg/Include/Guid/LdrMemoryDescriptor.h</span><br><span> create mode 100644 CorebootModulePkg/Include/Guid/PciExpressBaseAddress.h</span><br><span>@@ -25,7 +25,7 @@</span><br><span> create mode 100644 CorebootModulePkg/Library/CorebootBdsLib/PlatformData.c</span><br><span> </span><br><span> diff --git a/CorebootModulePkg/CorebootModulePkg.dec b/CorebootModulePkg/CorebootModulePkg.dec</span><br><span style="color: hsl(0, 100%, 40%);">-index 7f1309bdae..20932a1d04 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 7f1309bdae61..20932a1d0467 100644</span><br><span> --- a/CorebootModulePkg/CorebootModulePkg.dec</span><br><span> +++ b/CorebootModulePkg/CorebootModulePkg.dec</span><br><span> @@ -33,8 +33,16 @@</span><br><span>@@ -47,7 +47,7 @@</span><br><span> </span><br><span> diff --git a/CorebootModulePkg/Include/Guid/LdrMemoryDescriptor.h b/CorebootModulePkg/Include/Guid/LdrMemoryDescriptor.h</span><br><span> new file mode 100644</span><br><span style="color: hsl(0, 100%, 40%);">-index 0000000000..38a997deea</span><br><span style="color: hsl(120, 100%, 40%);">+index 000000000000..38a997deea0c</span><br><span> --- /dev/null</span><br><span> +++ b/CorebootModulePkg/Include/Guid/LdrMemoryDescriptor.h</span><br><span> @@ -0,0 +1,33 @@</span><br><span>@@ -86,7 +86,7 @@</span><br><span> +#endif</span><br><span> diff --git a/CorebootModulePkg/Include/Guid/PciExpressBaseAddress.h b/CorebootModulePkg/Include/Guid/PciExpressBaseAddress.h</span><br><span> new file mode 100644</span><br><span style="color: hsl(0, 100%, 40%);">-index 0000000000..ff554383c1</span><br><span style="color: hsl(120, 100%, 40%);">+index 000000000000..ff554383c11b</span><br><span> --- /dev/null</span><br><span> +++ b/CorebootModulePkg/Include/Guid/PciExpressBaseAddress.h</span><br><span> @@ -0,0 +1,46 @@</span><br><span>@@ -138,7 +138,7 @@</span><br><span> +#endif</span><br><span> diff --git a/CorebootModulePkg/Include/Guid/PciOptionRomTable.h b/CorebootModulePkg/Include/Guid/PciOptionRomTable.h</span><br><span> new file mode 100644</span><br><span style="color: hsl(0, 100%, 40%);">-index 0000000000..a2fb99710a</span><br><span style="color: hsl(120, 100%, 40%);">+index 000000000000..a2fb99710a69</span><br><span> --- /dev/null</span><br><span> +++ b/CorebootModulePkg/Include/Guid/PciOptionRomTable.h</span><br><span> @@ -0,0 +1,41 @@</span><br><span>@@ -185,7 +185,7 @@</span><br><span> +</span><br><span> diff --git a/CorebootModulePkg/Library/CorebootBdsLib/BdsPlatform.c b/CorebootModulePkg/Library/CorebootBdsLib/BdsPlatform.c</span><br><span> new file mode 100644</span><br><span style="color: hsl(0, 100%, 40%);">-index 0000000000..b6253a17f8</span><br><span style="color: hsl(120, 100%, 40%);">+index 000000000000..b6253a17f8ea</span><br><span> --- /dev/null</span><br><span> +++ b/CorebootModulePkg/Library/CorebootBdsLib/BdsPlatform.c</span><br><span> @@ -0,0 +1,1731 @@</span><br><span>@@ -1922,7 +1922,7 @@</span><br><span> +}</span><br><span> diff --git a/CorebootModulePkg/Library/CorebootBdsLib/BdsPlatform.h b/CorebootModulePkg/Library/CorebootBdsLib/BdsPlatform.h</span><br><span> new file mode 100644</span><br><span style="color: hsl(0, 100%, 40%);">-index 0000000000..d447f77747</span><br><span style="color: hsl(120, 100%, 40%);">+index 000000000000..d447f77747e3</span><br><span> --- /dev/null</span><br><span> +++ b/CorebootModulePkg/Library/CorebootBdsLib/BdsPlatform.h</span><br><span> @@ -0,0 +1,288 @@</span><br><span>@@ -2216,7 +2216,7 @@</span><br><span> +#endif // _PLATFORM_SPECIFIC_BDS_PLATFORM_H_</span><br><span> diff --git a/CorebootModulePkg/Library/CorebootBdsLib/PlatformBds.inf b/CorebootModulePkg/Library/CorebootBdsLib/PlatformBds.inf</span><br><span> new file mode 100644</span><br><span style="color: hsl(0, 100%, 40%);">-index 0000000000..578c74afae</span><br><span style="color: hsl(120, 100%, 40%);">+index 000000000000..578c74afae22</span><br><span> --- /dev/null</span><br><span> +++ b/CorebootModulePkg/Library/CorebootBdsLib/PlatformBds.inf</span><br><span> @@ -0,0 +1,65 @@</span><br><span>@@ -2287,7 +2287,7 @@</span><br><span> +</span><br><span> diff --git a/CorebootModulePkg/Library/CorebootBdsLib/PlatformData.c b/CorebootModulePkg/Library/CorebootBdsLib/PlatformData.c</span><br><span> new file mode 100644</span><br><span style="color: hsl(0, 100%, 40%);">-index 0000000000..fbdcc7de81</span><br><span style="color: hsl(120, 100%, 40%);">+index 000000000000..fbdcc7de8166</span><br><span> --- /dev/null</span><br><span> +++ b/CorebootModulePkg/Library/CorebootBdsLib/PlatformData.c</span><br><span> @@ -0,0 +1,161 @@</span><br><span>@@ -2453,7 +2453,7 @@</span><br><span> +EFI_DEVICE_PATH_PROTOCOL *gPlatformConnectSequence[] = { NULL };</span><br><span> +</span><br><span> diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf b/CorebootPayloadPkg/CorebootPayloadPkg.fdf</span><br><span style="color: hsl(0, 100%, 40%);">-index a39e3999ba..623ff9c344 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index d71b3ec55690..22987093da58 100644</span><br><span> --- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf</span><br><span> +++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf</span><br><span> @@ -95,8 +95,9 @@ INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntime</span><br><span>@@ -2469,7 +2469,7 @@</span><br><span> INF PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf
</span><br><span> !else
</span><br><span> diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc</span><br><span style="color: hsl(0, 100%, 40%);">-index e838aca61d..a329b78f08 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 0f4e475187ee..053f380a8608 100644</span><br><span> --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc</span><br><span> +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc</span><br><span> @@ -165,6 +165,7 @@</span><br><span>@@ -2508,7 +2508,7 @@</span><br><span> PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf
</span><br><span> !else
</span><br><span> diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc</span><br><span style="color: hsl(0, 100%, 40%);">-index c25d821fd4..790efd7810 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 97bb0a8ae0a1..bb328349b44a 100644</span><br><span> --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc</span><br><span> +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc</span><br><span> @@ -165,6 +165,7 @@</span><br><span>@@ -2547,5 +2547,5 @@</span><br><span> PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf
</span><br><span> !else
</span><br><span> -- </span><br><span style="color: hsl(0, 100%, 40%);">-2.13.2.932.g7449e964c-goog</span><br><span style="color: hsl(120, 100%, 40%);">+2.17.0</span><br><span> </span><br><span>diff --git a/payloads/external/tianocore/patches/03_Library_EndofDXE.patch b/payloads/external/tianocore/patches/03_Library_EndofDXE.patch</span><br><span>index 02ba42b..cca3eea 100644</span><br><span>--- a/payloads/external/tianocore/patches/03_Library_EndofDXE.patch</span><br><span>+++ b/payloads/external/tianocore/patches/03_Library_EndofDXE.patch</span><br><span>@@ -1,16 +1,16 @@</span><br><span style="color: hsl(0, 100%, 40%);">-From 760f1cafdd689beedc8418ab89e856b54296389c Mon Sep 17 00:00:00 2001</span><br><span style="color: hsl(120, 100%, 40%);">+From 1e9c5c97a55f3ad3c0d6d5dde380b4d73bd15860 Mon Sep 17 00:00:00 2001</span><br><span> From: CoolStar <coolstarorganization@gmail.com></span><br><span> Date: Sun, 4 Dec 2016 12:07:30 -0800</span><br><span> Subject: [PATCH] CorebootBdsLib: Call End of DXE event to allow booting 3rd</span><br><span> party efi binaries.</span><br><span> </span><br><span> ---</span><br><span style="color: hsl(0, 100%, 40%);">- .../Library/CorebootBdsLib/BdsPlatform.c | 42 ++++++++++++++++++++++</span><br><span style="color: hsl(0, 100%, 40%);">- .../Library/CorebootBdsLib/PlatformBds.inf | 1 +</span><br><span style="color: hsl(120, 100%, 40%);">+ .../Library/CorebootBdsLib/BdsPlatform.c | 42 +++++++++++++++++++</span><br><span style="color: hsl(120, 100%, 40%);">+ .../Library/CorebootBdsLib/PlatformBds.inf | 1 +</span><br><span> 2 files changed, 43 insertions(+)</span><br><span> </span><br><span> diff --git a/CorebootModulePkg/Library/CorebootBdsLib/BdsPlatform.c b/CorebootModulePkg/Library/CorebootBdsLib/BdsPlatform.c</span><br><span style="color: hsl(0, 100%, 40%);">-index b6253a17f8..cf3e5320cb 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index b6253a17f8ea..cf3e5320cbe8 100644</span><br><span> --- a/CorebootModulePkg/Library/CorebootBdsLib/BdsPlatform.c</span><br><span> +++ b/CorebootModulePkg/Library/CorebootBdsLib/BdsPlatform.c</span><br><span> @@ -1129,6 +1129,46 @@ Returns:</span><br><span>@@ -70,7 +70,7 @@</span><br><span> // Init the time out value</span><br><span> //</span><br><span> diff --git a/CorebootModulePkg/Library/CorebootBdsLib/PlatformBds.inf b/CorebootModulePkg/Library/CorebootBdsLib/PlatformBds.inf</span><br><span style="color: hsl(0, 100%, 40%);">-index 578c74afae..992bd846bd 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 578c74afae22..992bd846bdc4 100644</span><br><span> --- a/CorebootModulePkg/Library/CorebootBdsLib/PlatformBds.inf</span><br><span> +++ b/CorebootModulePkg/Library/CorebootBdsLib/PlatformBds.inf</span><br><span> @@ -58,6 +58,7 @@</span><br><span>@@ -82,5 +82,5 @@</span><br><span> [Pcd]</span><br><span> gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut</span><br><span> -- </span><br><span style="color: hsl(0, 100%, 40%);">-2.13.2.725.g09c95d1e9-goog</span><br><span style="color: hsl(120, 100%, 40%);">+2.17.0</span><br><span> </span><br><span>diff --git a/payloads/external/tianocore/patches/04_CorebootPayloadPkg_addps2.patch b/payloads/external/tianocore/patches/04_CorebootPayloadPkg_addps2.patch</span><br><span>index e90b70e..2b7da9d 100644</span><br><span>--- a/payloads/external/tianocore/patches/04_CorebootPayloadPkg_addps2.patch</span><br><span>+++ b/payloads/external/tianocore/patches/04_CorebootPayloadPkg_addps2.patch</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-From 77c5dfcce842819215490fe63c481860fa7d752d Mon Sep 17 00:00:00 2001</span><br><span style="color: hsl(120, 100%, 40%);">+From e8d6ed35c15b92497cd3ede6cd35523b0e7366ac Mon Sep 17 00:00:00 2001</span><br><span> From: CoolStar <coolstarorganization@gmail.com></span><br><span> Date: Sun, 4 Dec 2016 11:50:00 -0800</span><br><span> Subject: [PATCH] CorebootPayloadPkg: Add PS/2 keyboard drivers.</span><br><span>@@ -10,7 +10,7 @@</span><br><span> 3 files changed, 9 insertions(+)</span><br><span> </span><br><span> diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf b/CorebootPayloadPkg/CorebootPayloadPkg.fdf</span><br><span style="color: hsl(0, 100%, 40%);">-index 347e9c75ce..a347af0c9a 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 22987093da58..0961e96c250d 100644</span><br><span> --- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf</span><br><span> +++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf</span><br><span> @@ -132,6 +132,9 @@ INF DuetPkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf</span><br><span>@@ -24,7 +24,7 @@</span><br><span> #
</span><br><span> # Console Support
</span><br><span> diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc</span><br><span style="color: hsl(0, 100%, 40%);">-index 5ce823bb95..60ee064c59 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 053f380a8608..6ddd64faf7a5 100644</span><br><span> --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc</span><br><span> +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc</span><br><span> @@ -492,6 +492,9 @@</span><br><span>@@ -38,7 +38,7 @@</span><br><span> #
</span><br><span> # Console Support
</span><br><span> diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc</span><br><span style="color: hsl(0, 100%, 40%);">-index fea297a77a..167329c897 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index bb328349b44a..19c203e6cbb6 100644</span><br><span> --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc</span><br><span> +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc</span><br><span> @@ -493,6 +493,9 @@</span><br><span>@@ -52,5 +52,5 @@</span><br><span> #
</span><br><span> # Console Support
</span><br><span> -- </span><br><span style="color: hsl(0, 100%, 40%);">-2.13.2.725.g09c95d1e9-goog</span><br><span style="color: hsl(120, 100%, 40%);">+2.17.0</span><br><span> </span><br><span>diff --git a/payloads/external/tianocore/patches/05_CorebootPayloadPkg_noserial.patch b/payloads/external/tianocore/patches/05_CorebootPayloadPkg_noserial.patch</span><br><span>index 0e84b7d..0e40ed9 100644</span><br><span>--- a/payloads/external/tianocore/patches/05_CorebootPayloadPkg_noserial.patch</span><br><span>+++ b/payloads/external/tianocore/patches/05_CorebootPayloadPkg_noserial.patch</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-From 77f75370d6fbfefb04456f6e1c32c85d4bac8bf5 Mon Sep 17 00:00:00 2001</span><br><span style="color: hsl(120, 100%, 40%);">+From 7d758b06a47225fc54955acc8f70aa31f4cf7d32 Mon Sep 17 00:00:00 2001</span><br><span> From: Matt Devo <matt.devillier@gmail.com></span><br><span> Date: Thu, 23 Feb 2017 14:11:14 -0600</span><br><span> Subject: [PATCH] CorebootPayloadPkg: don't use serial output</span><br><span>@@ -9,7 +9,7 @@</span><br><span> 2 files changed, 2 insertions(+), 2 deletions(-)</span><br><span> </span><br><span> diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc</span><br><span style="color: hsl(0, 100%, 40%);">-index 1d80fc4f5c..ce360c9e9e 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 6ddd64faf7a5..ef83c28adf9b 100644</span><br><span> --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc</span><br><span> +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc</span><br><span> @@ -261,7 +261,7 @@</span><br><span>@@ -22,7 +22,7 @@</span><br><span> gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|FALSE
</span><br><span> gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE
</span><br><span> diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc</span><br><span style="color: hsl(0, 100%, 40%);">-index 52b26eb3d0..a27b0873a1 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 19c203e6cbb6..9b74e3a8f311 100644</span><br><span> --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc</span><br><span> +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc</span><br><span> @@ -261,7 +261,7 @@</span><br><span>@@ -35,5 +35,5 @@</span><br><span> gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|TRUE
</span><br><span> gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE
</span><br><span> -- </span><br><span style="color: hsl(0, 100%, 40%);">-2.13.2.725.g09c95d1e9-goog</span><br><span style="color: hsl(120, 100%, 40%);">+2.17.0</span><br><span> </span><br><span>diff --git a/payloads/external/tianocore/patches/06_CorebootPayloadPkg_keep_cb_table.patch b/payloads/external/tianocore/patches/06_CorebootPayloadPkg_keep_cb_table.patch</span><br><span>index da8fc7f..10024d8 100644</span><br><span>--- a/payloads/external/tianocore/patches/06_CorebootPayloadPkg_keep_cb_table.patch</span><br><span>+++ b/payloads/external/tianocore/patches/06_CorebootPayloadPkg_keep_cb_table.patch</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-From 336ce69129206ea6cb5bea2a99c5f00e77850518 Mon Sep 17 00:00:00 2001</span><br><span style="color: hsl(120, 100%, 40%);">+From 9c28ac87eb2df7319d4f5a48124c837b8bf123b3 Mon Sep 17 00:00:00 2001</span><br><span> From: ReddestDream <reddestdream@gmail.com></span><br><span> Date: Wed, 3 May 2017 00:13:28 -0400</span><br><span> Subject: [PATCH] CbSupportPei: prevent lower coreboot table from being</span><br><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>index 6370efc..9b2569a 100644</span><br><span>--- a/payloads/external/tianocore/patches/07_CorebootPayloadPkg-Use-correct-BytesPerScanLine.patch</span><br><span>+++ b/payloads/external/tianocore/patches/07_CorebootPayloadPkg-Use-correct-BytesPerScanLine.patch</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-From 07dec11fe965e73cfef7df38af70c945b6ff21a2 Mon Sep 17 00:00:00 2001</span><br><span style="color: hsl(120, 100%, 40%);">+From 2e75f9ad6ef625575185dfc262c6803a89850dd5 Mon Sep 17 00:00:00 2001</span><br><span> From: Arthur Heymans <arthur@aheymans.xyz></span><br><span> Date: Wed, 24 Jan 2018 10:07:08 +0100</span><br><span> Subject: [PATCH] CorebootPayloadPkg: Use correct BytesPerScanLine</span><br><span>@@ -12,9 +12,12 @@</span><br><span> </span><br><span> Contributed-under: TianoCore Contribution Agreement 1.1</span><br><span> Signed-off-by: Arthur Heymans <arthur@aheymans.xyz></span><br><span style="color: hsl(120, 100%, 40%);">+---</span><br><span style="color: hsl(120, 100%, 40%);">+ CorebootPayloadPkg/FbGop/FbGop.c | 2 +-</span><br><span style="color: hsl(120, 100%, 40%);">+ 1 file changed, 1 insertion(+), 1 deletion(-)</span><br><span> </span><br><span> diff --git a/CorebootPayloadPkg/FbGop/FbGop.c b/CorebootPayloadPkg/FbGop/FbGop.c</span><br><span style="color: hsl(0, 100%, 40%);">-index 37d6def7f7..6790617033 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 37d6def7f780..679061703358 100644</span><br><span> --- a/CorebootPayloadPkg/FbGop/FbGop.c</span><br><span> +++ b/CorebootPayloadPkg/FbGop/FbGop.c</span><br><span> @@ -822,7 +822,7 @@ FbGopCheckForVbe (</span><br><span>@@ -27,5 +30,5 @@</span><br><span> ModeBuffer = (FB_VIDEO_MODE_DATA *) AllocatePool (
</span><br><span> ModeNumber * sizeof (FB_VIDEO_MODE_DATA)
</span><br><span> -- </span><br><span style="color: hsl(0, 100%, 40%);">-2.16.1</span><br><span style="color: hsl(120, 100%, 40%);">+2.17.0</span><br><span> </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>index 06ddd56..4881fff 100644</span><br><span>--- a/payloads/external/tianocore/patches/08_BaseTools-Fix-building-with-Werror-stringop-truncati.patch</span><br><span>+++ b/payloads/external/tianocore/patches/08_BaseTools-Fix-building-with-Werror-stringop-truncati.patch</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-From b652262ed0dd554c44e7b1bf7134d3458f5edef1 Mon Sep 17 00:00:00 2001</span><br><span style="color: hsl(120, 100%, 40%);">+From 8cb365e9ec90420e3d04b77f6e7999a65d5983a6 Mon Sep 17 00:00:00 2001</span><br><span> From: Patrick Rudolph <siro@das-labor.org></span><br><span> Date: Sun, 17 Jun 2018 08:44:51 +0200</span><br><span> Subject: [PATCH] BaseTools: Fix building with -Werror=stringop-truncation</span><br><span>@@ -9,7 +9,7 @@</span><br><span> 1 file changed, 3 insertions(+), 3 deletions(-)</span><br><span> </span><br><span> 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 acc142a6d1..5d77016eba 100644</span><br><span style="color: hsl(120, 100%, 40%);">+index 65ae08eeceb8..d4200621457c 100644</span><br><span> --- a/BaseTools/Source/C/GenVtf/GenVtf.c</span><br><span> +++ b/BaseTools/Source/C/GenVtf/GenVtf.c</span><br><span> @@ -129,9 +129,9 @@ Returns:</span><br><span>@@ -24,7 +24,7 @@</span><br><span> }
</span><br><span> </span><br><span> sscanf (
</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -1529,7 +1529,7 @@ Returns:</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -1521,7 +1521,7 @@ Returns:</span><br><span> //
</span><br><span> FitStartPtr = (FIT_TABLE *) RelativeAddress;
</span><br><span> </span><br><span>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</span><br><span>deleted file mode 100644</span><br><span>index 7016759..0000000</span><br><span>--- a/payloads/external/tianocore/patches/09_gcc7-Fix-building-with-fpermissive.patch</span><br><span>+++ /dev/null</span><br><span>@@ -1,40 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-From 5546ab29b2c0c2fc3a963bc71221918dc77b6152 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:53:25 +0200</span><br><span style="color: hsl(0, 100%, 40%);">-Subject: [PATCH] gcc7: Fix building with -fpermissive</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/VfrCompile/VfrUtilityLib.cpp | 2 +-</span><br><span style="color: hsl(0, 100%, 40%);">- MdeModulePkg/Library/UefiHiiLib/HiiLib.c | 2 +-</span><br><span style="color: hsl(0, 100%, 40%);">- 2 files changed, 2 insertions(+), 2 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/VfrCompile/VfrUtilityLib.cpp b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp</span><br><span style="color: hsl(0, 100%, 40%);">-index 3ca57ed741..4fa066dd9f 100644</span><br><span>---- a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp</span><br><span style="color: hsl(0, 100%, 40%);">-+++ b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -3372,7 +3372,7 @@ CVfrStringDB::GetVarStoreNameFormStringId (</span><br><span style="color: hsl(0, 100%, 40%);">- UINT8 BlockType;
</span><br><span style="color: hsl(0, 100%, 40%);">- EFI_HII_STRING_PACKAGE_HDR *PkgHeader;
</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">-- if (mStringFileName == '\0' ) {
</span><br><span style="color: hsl(0, 100%, 40%);">-+ if (mStringFileName == NULL ) {
</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;
</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%);">-diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c</span><br><span style="color: hsl(0, 100%, 40%);">-index 857950118f..de0aa5f7bc 100644</span><br><span>---- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c</span><br><span style="color: hsl(0, 100%, 40%);">-+++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c</span><br><span style="color: hsl(0, 100%, 40%);">-@@ -2181,7 +2181,7 @@ InternalHiiIfrValueAction (</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">- StringPtr = ConfigAltResp;
</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(0, 100%, 40%);">-- while (StringPtr != L'\0') {
</span><br><span style="color: hsl(0, 100%, 40%);">-+ while (StringPtr != NULL) {
</span><br><span style="color: hsl(0, 100%, 40%);">- //
</span><br><span style="color: hsl(0, 100%, 40%);">- // 1. Find <ConfigHdr> GUID=...&NAME=...&PATH=...
</span><br><span style="color: hsl(0, 100%, 40%);">- //
</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/27615">change 27615</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/27615"/><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: Ib409f6f93eb64d7a9a2f09a75f8e637ab8689410 </div>
<div style="display:none"> Gerrit-Change-Number: 27615 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Piotr Król <piotr.krol@3mdeb.com> </div>