Compare commits
6 Commits
Author | SHA1 | Date |
---|---|---|
Paolo Bonzini | 5443e70b9d | |
Cole Robinson | 63b5781563 | |
Paolo Bonzini | 158dacfc99 | |
Paolo Bonzini | 4b51b1a3b9 | |
Paolo Bonzini | 8654b013f0 | |
Paolo Bonzini | 1778f26d46 |
|
@ -14,3 +14,5 @@
|
||||||
/edk2-20171011-92d07e4.tar.xz
|
/edk2-20171011-92d07e4.tar.xz
|
||||||
/openssl-1.1.0e-hobbled.tar.xz
|
/openssl-1.1.0e-hobbled.tar.xz
|
||||||
/qemu-ovmf-secureboot-1.1.2.tar.gz
|
/qemu-ovmf-secureboot-1.1.2.tar.gz
|
||||||
|
/openssl-1.1.0h-hobbled.tar.xz
|
||||||
|
/edk2-20180529-ee3198e672e2.tar.xz
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
From 37942481c89eca732239c23fe606680e6e3faf77 Mon Sep 17 00:00:00 2001
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
Date: Wed, 27 Jan 2016 03:05:18 +0100
|
Date: Wed, 27 Jan 2016 03:05:18 +0100
|
||||||
Subject: [PATCH] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in NvmExpressDxe
|
Subject: [PATCH] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in NvmExpressDxe
|
||||||
|
@ -7,6 +8,7 @@ level.
|
||||||
|
|
||||||
Contributed-under: TianoCore Contribution Agreement 1.0
|
Contributed-under: TianoCore Contribution Agreement 1.0
|
||||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
---
|
---
|
||||||
OvmfPkg/OvmfPkgIa32.dsc | 5 ++++-
|
OvmfPkg/OvmfPkgIa32.dsc | 5 ++++-
|
||||||
OvmfPkg/OvmfPkgIa32X64.dsc | 5 ++++-
|
OvmfPkg/OvmfPkgIa32X64.dsc | 5 ++++-
|
||||||
|
@ -14,10 +16,10 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
3 files changed, 12 insertions(+), 3 deletions(-)
|
3 files changed, 12 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||||||
index 3f4d42d..048a144 100644
|
index a28b511d5c..7f725ab198 100644
|
||||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||||||
@@ -635,7 +635,10 @@
|
@@ -738,7 +738,10 @@
|
||||||
OvmfPkg/SataControllerDxe/SataControllerDxe.inf
|
OvmfPkg/SataControllerDxe/SataControllerDxe.inf
|
||||||
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
|
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
|
||||||
MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
|
MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
|
||||||
|
@ -30,10 +32,10 @@ index 3f4d42d..048a144 100644
|
||||||
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
|
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
|
||||||
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
|
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
|
||||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||||
index 5688475..fac0cf0 100644
|
index 115d0c01ff..d444a84267 100644
|
||||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||||
@@ -644,7 +644,10 @@
|
@@ -747,7 +747,10 @@
|
||||||
OvmfPkg/SataControllerDxe/SataControllerDxe.inf
|
OvmfPkg/SataControllerDxe/SataControllerDxe.inf
|
||||||
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
|
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
|
||||||
MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
|
MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
|
||||||
|
@ -46,10 +48,10 @@ index 5688475..fac0cf0 100644
|
||||||
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
|
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
|
||||||
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
|
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
|
||||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||||||
index dcf64b9..bc62a64 100644
|
index 362eb789c7..f4e072870c 100644
|
||||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||||||
@@ -642,7 +642,10 @@
|
@@ -745,7 +745,10 @@
|
||||||
OvmfPkg/SataControllerDxe/SataControllerDxe.inf
|
OvmfPkg/SataControllerDxe/SataControllerDxe.inf
|
||||||
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
|
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
|
||||||
MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
|
MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
From 5e55066b33d894cb7e9b84179de449e8734cb57d Mon Sep 17 00:00:00 2001
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
Date: Wed, 27 Jan 2016 03:05:18 +0100
|
Date: Wed, 27 Jan 2016 03:05:18 +0100
|
||||||
Subject: [PATCH] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in the DXE core
|
Subject: [PATCH] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in the DXE core
|
||||||
|
@ -8,6 +9,7 @@ not interested in. Suppress said output.
|
||||||
|
|
||||||
Contributed-under: TianoCore Contribution Agreement 1.0
|
Contributed-under: TianoCore Contribution Agreement 1.0
|
||||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
---
|
---
|
||||||
OvmfPkg/OvmfPkgIa32.dsc | 2 ++
|
OvmfPkg/OvmfPkgIa32.dsc | 2 ++
|
||||||
OvmfPkg/OvmfPkgIa32X64.dsc | 2 ++
|
OvmfPkg/OvmfPkgIa32X64.dsc | 2 ++
|
||||||
|
@ -15,10 +17,10 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
3 files changed, 6 insertions(+)
|
3 files changed, 6 insertions(+)
|
||||||
|
|
||||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||||||
index 767fd7d..40688dd 100644
|
index 7f725ab198..83e47281ed 100644
|
||||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||||||
@@ -562,6 +562,8 @@
|
@@ -644,6 +644,8 @@
|
||||||
<LibraryClasses>
|
<LibraryClasses>
|
||||||
NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
|
NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
|
||||||
DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
|
DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
|
||||||
|
@ -28,10 +30,10 @@ index 767fd7d..40688dd 100644
|
||||||
|
|
||||||
MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
|
MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
|
||||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||||
index 7460d50..3e75388 100644
|
index d444a84267..a2adacfbd3 100644
|
||||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||||
@@ -571,6 +571,8 @@
|
@@ -653,6 +653,8 @@
|
||||||
<LibraryClasses>
|
<LibraryClasses>
|
||||||
NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
|
NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
|
||||||
DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
|
DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
|
||||||
|
@ -41,10 +43,10 @@ index 7460d50..3e75388 100644
|
||||||
|
|
||||||
MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
|
MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
|
||||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||||||
index 765506a..e169f13 100644
|
index f4e072870c..b57e32f432 100644
|
||||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||||||
@@ -569,6 +569,8 @@
|
@@ -651,6 +651,8 @@
|
||||||
<LibraryClasses>
|
<LibraryClasses>
|
||||||
NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
|
NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
|
||||||
DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
|
DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
From c667557c191923e981b972b5679fc49cec60d7e5 Mon Sep 17 00:00:00 2001
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
Date: Sun, 8 Jul 2012 14:26:07 +0200
|
Date: Sun, 8 Jul 2012 14:26:07 +0200
|
||||||
Subject: [PATCH] OvmfPkg: enable DEBUG_VERBOSE
|
Subject: [PATCH] OvmfPkg: enable DEBUG_VERBOSE
|
||||||
|
@ -5,6 +6,7 @@ Subject: [PATCH] OvmfPkg: enable DEBUG_VERBOSE
|
||||||
Enable verbose debug logs.
|
Enable verbose debug logs.
|
||||||
|
|
||||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
---
|
---
|
||||||
OvmfPkg/OvmfPkgIa32.dsc | 2 +-
|
OvmfPkg/OvmfPkgIa32.dsc | 2 +-
|
||||||
OvmfPkg/OvmfPkgIa32X64.dsc | 2 +-
|
OvmfPkg/OvmfPkgIa32X64.dsc | 2 +-
|
||||||
|
@ -12,10 +14,10 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||||||
index c0440d9..fa9661c 100644
|
index 83e47281ed..cd0e71869b 100644
|
||||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||||||
@@ -408,7 +408,7 @@
|
@@ -486,7 +486,7 @@
|
||||||
# DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may
|
# DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may
|
||||||
# // significantly impact boot performance
|
# // significantly impact boot performance
|
||||||
# DEBUG_ERROR 0x80000000 // Error
|
# DEBUG_ERROR 0x80000000 // Error
|
||||||
|
@ -25,10 +27,10 @@ index c0440d9..fa9661c 100644
|
||||||
!ifdef $(SOURCE_DEBUG_ENABLE)
|
!ifdef $(SOURCE_DEBUG_ENABLE)
|
||||||
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
|
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
|
||||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||||
index 6f94bc7..667584a 100644
|
index a2adacfbd3..7f7a78f60a 100644
|
||||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||||
@@ -413,7 +413,7 @@
|
@@ -491,7 +491,7 @@
|
||||||
# DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may
|
# DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may
|
||||||
# // significantly impact boot performance
|
# // significantly impact boot performance
|
||||||
# DEBUG_ERROR 0x80000000 // Error
|
# DEBUG_ERROR 0x80000000 // Error
|
||||||
|
@ -38,10 +40,10 @@ index 6f94bc7..667584a 100644
|
||||||
!ifdef $(SOURCE_DEBUG_ENABLE)
|
!ifdef $(SOURCE_DEBUG_ENABLE)
|
||||||
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
|
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
|
||||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||||||
index a92bf19..5ae8469 100644
|
index b57e32f432..739807efc4 100644
|
||||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||||||
@@ -413,7 +413,7 @@
|
@@ -491,7 +491,7 @@
|
||||||
# DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may
|
# DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may
|
||||||
# // significantly impact boot performance
|
# // significantly impact boot performance
|
||||||
# DEBUG_ERROR 0x80000000 // Error
|
# DEBUG_ERROR 0x80000000 // Error
|
||||||
|
|
|
@ -1,14 +1,22 @@
|
||||||
|
From 6324a2a8ae4fc96c9e13d39483c5ee0cb1fff619 Mon Sep 17 00:00:00 2001
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
Date: Thu, 20 Feb 2014 22:54:45 +0100
|
Date: Thu, 20 Feb 2014 22:54:45 +0100
|
||||||
Subject: [PATCH] OvmfPkg: increase max debug message length to 512
|
Subject: [PATCH] OvmfPkg: increase max debug message length to 512
|
||||||
|
|
||||||
Contributed-under: TianoCore Contribution Agreement 1.0
|
Upstream prefers short debug messages (sometimes even limited to 80
|
||||||
|
characters), but any line length under 512 characters is just unsuitable
|
||||||
|
for effective debugging. (For example, config strings in HII routing,
|
||||||
|
logged by the platform driver "OvmfPkg/PlatformDxe" on DEBUG_VERBOSE
|
||||||
|
level, can be several hundred characters long.) 512 is an empirically good
|
||||||
|
value.
|
||||||
|
|
||||||
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
---
|
---
|
||||||
OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c | 2 +-
|
OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c | 2 +-
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
||||||
index 44850a9..b6927d0 100644
|
index 36cde54976..c0c4eaee0f 100644
|
||||||
--- a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
--- a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
||||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
||||||
@@ -27,7 +27,7 @@
|
@@ -27,7 +27,7 @@
|
||||||
|
@ -19,4 +27,4 @@ index 44850a9..b6927d0 100644
|
||||||
+#define MAX_DEBUG_MESSAGE_LENGTH 0x200
|
+#define MAX_DEBUG_MESSAGE_LENGTH 0x200
|
||||||
|
|
||||||
/**
|
/**
|
||||||
This constructor function does not have to do anything.
|
Prints a debug message to the debug output device if the specified error level is enabled.
|
||||||
|
|
|
@ -1,45 +0,0 @@
|
||||||
From e4133f594621fa9e8936348f4d0aa4bbd2976d2f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
|
||||||
Date: Sun, 8 Jul 2012 11:55:50 +0200
|
|
||||||
Subject: BuildEnv: override "set -C" (noclobber) of sourcing env
|
|
||||||
|
|
||||||
The BuildEnv utility is sourced (executed by the user's interactive shell)
|
|
||||||
when the user sets up the build session. Some users like to set -C
|
|
||||||
(noclobber) for some additional safety in their shells, which trips up
|
|
||||||
BuildEnv. Update the redirection operator so that it overrides noclobber.
|
|
||||||
|
|
||||||
Notes about the c9e5618 -> b9ffeab rebase:
|
|
||||||
|
|
||||||
- Adapted to new BaseTools feature (= out of tree modules).
|
|
||||||
|
|
||||||
Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase:
|
|
||||||
|
|
||||||
- no changes
|
|
||||||
|
|
||||||
Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase:
|
|
||||||
|
|
||||||
- no changes
|
|
||||||
|
|
||||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
||||||
(cherry picked from commit 7df892b6f1c0dead5b177b3866e127b684cdc001)
|
|
||||||
(cherry picked from commit 06d17db0523920d95fb18b3629f523dcd63d9499)
|
|
||||||
---
|
|
||||||
BaseTools/BuildEnv | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv
|
|
||||||
index f748811..ff0c511 100755
|
|
||||||
--- a/BaseTools/BuildEnv
|
|
||||||
+++ b/BaseTools/BuildEnv
|
|
||||||
@@ -90,7 +90,7 @@ StoreCurrentConfiguration() {
|
|
||||||
#
|
|
||||||
OUTPUT_FILE=$CONF_PATH/BuildEnv.sh
|
|
||||||
#echo Storing current configuration into $OUTPUT_FILE
|
|
||||||
- echo "# Auto-generated by ${BASH_SOURCE[0]}" > $OUTPUT_FILE
|
|
||||||
+ echo "# Auto-generated by ${BASH_SOURCE[0]}" >| $OUTPUT_FILE
|
|
||||||
GenerateShellCodeToSetVariable WORKSPACE $OUTPUT_FILE
|
|
||||||
GenerateShellCodeToSetVariable EDK_TOOLS_PATH $OUTPUT_FILE
|
|
||||||
GenerateShellCodeToUpdatePath $OUTPUT_FILE
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From eee4229af92be4c5545590118b7b0fcfaf5982cc Mon Sep 17 00:00:00 2001
|
From ade02daad705e1a4fd6468136de8fcb886f202a2 Mon Sep 17 00:00:00 2001
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
Date: Wed, 11 Jun 2014 23:33:33 +0200
|
Date: Wed, 11 Jun 2014 23:33:33 +0200
|
||||||
Subject: [PATCH] advertise OpenSSL on TianoCore splash screen / boot logo
|
Subject: [PATCH] advertise OpenSSL on TianoCore splash screen / boot logo
|
||||||
|
@ -72,11 +72,13 @@ Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase:
|
||||||
- a new UNI (~description) file for the new driver INF file.
|
- a new UNI (~description) file for the new driver INF file.
|
||||||
|
|
||||||
- In the OVMF DSC and FDF files, we select the new driver INF for
|
- In the OVMF DSC and FDF files, we select the new driver INF for
|
||||||
inclusion if either SECURE_BOOT_ENABLE or TLS_ENABLE is set, as they
|
inclusion if either SECURE_BOOT_ENABLE, NETWORK_IP6_ENABLE, or
|
||||||
both make use of OpenSSL (although different subsets of it).
|
TLS_ENABLE is set, as they all make use of OpenSSL (although
|
||||||
|
different subsets of it).
|
||||||
|
|
||||||
- In the AAVMF DSC and FDF files, we only look at SECURE_BOOT_ENABLE,
|
- In the AAVMF DSC and FDF files, we only look at SECURE_BOOT_ENABLE,
|
||||||
because the ArmVirtQemu platform does not support TLS_ENABLE yet.
|
or NETWORK_IP6_ENABLE, because the ArmVirtQemu platform does not
|
||||||
|
support TLS_ENABLE yet.
|
||||||
|
|
||||||
- This patch is best displayed with "git show --find-copies-harder".
|
- This patch is best displayed with "git show --find-copies-harder".
|
||||||
|
|
||||||
|
@ -89,12 +91,13 @@ Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase:
|
||||||
|
|
||||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
(cherry picked from commit 32192c62e289f261f5ce74acee48e5a94561f10b)
|
(cherry picked from commit 32192c62e289f261f5ce74acee48e5a94561f10b)
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
---
|
---
|
||||||
ArmVirtPkg/ArmVirtQemu.dsc | 4 +
|
ArmVirtPkg/ArmVirtQemu.dsc | 4 +
|
||||||
ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 4 +
|
ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 4 +
|
||||||
ArmVirtPkg/ArmVirtQemuKernel.dsc | 4 +
|
ArmVirtPkg/ArmVirtQemuKernel.dsc | 4 +
|
||||||
MdeModulePkg/Logo/Logo-OpenSSL.bmp.b64 | 2743 ++++++++++++++++++++++++++++++++
|
MdeModulePkg/Logo/Logo-OpenSSL.bmp.b64 | 2743 ++++++++++++++++++++++++
|
||||||
MdeModulePkg/Logo/Logo-OpenSSL.idf | 18 +
|
MdeModulePkg/Logo/Logo-OpenSSL.idf | 15 +
|
||||||
MdeModulePkg/Logo/LogoOpenSSLDxe.inf | 61 +
|
MdeModulePkg/Logo/LogoOpenSSLDxe.inf | 61 +
|
||||||
MdeModulePkg/Logo/LogoOpenSSLDxe.uni | 22 +
|
MdeModulePkg/Logo/LogoOpenSSLDxe.uni | 22 +
|
||||||
OvmfPkg/OvmfPkgIa32.dsc | 4 +
|
OvmfPkg/OvmfPkgIa32.dsc | 4 +
|
||||||
|
@ -103,21 +106,21 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
OvmfPkg/OvmfPkgIa32X64.fdf | 4 +
|
OvmfPkg/OvmfPkgIa32X64.fdf | 4 +
|
||||||
OvmfPkg/OvmfPkgX64.dsc | 4 +
|
OvmfPkg/OvmfPkgX64.dsc | 4 +
|
||||||
OvmfPkg/OvmfPkgX64.fdf | 4 +
|
OvmfPkg/OvmfPkgX64.fdf | 4 +
|
||||||
13 files changed, 2880 insertions(+)
|
13 files changed, 2877 insertions(+)
|
||||||
create mode 100644 MdeModulePkg/Logo/Logo-OpenSSL.bmp.b64
|
create mode 100644 MdeModulePkg/Logo/Logo-OpenSSL.bmp.b64
|
||||||
create mode 100644 MdeModulePkg/Logo/Logo-OpenSSL.idf
|
create mode 100644 MdeModulePkg/Logo/Logo-OpenSSL.idf
|
||||||
create mode 100644 MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
create mode 100644 MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
||||||
create mode 100644 MdeModulePkg/Logo/LogoOpenSSLDxe.uni
|
create mode 100644 MdeModulePkg/Logo/LogoOpenSSLDxe.uni
|
||||||
|
|
||||||
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
|
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
|
||||||
index 8a60b61..045333d 100644
|
index 885c6b14b8..a7a3899560 100644
|
||||||
--- a/ArmVirtPkg/ArmVirtQemu.dsc
|
--- a/ArmVirtPkg/ArmVirtQemu.dsc
|
||||||
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
|
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
|
||||||
@@ -325,7 +325,11 @@
|
@@ -327,7 +327,11 @@
|
||||||
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
|
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
|
||||||
MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
|
MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
|
||||||
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
|
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
|
||||||
+!if $(SECURE_BOOT_ENABLE) == TRUE
|
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE)
|
||||||
+ MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
+ MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
||||||
+!else
|
+!else
|
||||||
MdeModulePkg/Logo/LogoDxe.inf
|
MdeModulePkg/Logo/LogoDxe.inf
|
||||||
|
@ -126,14 +129,14 @@ index 8a60b61..045333d 100644
|
||||||
<LibraryClasses>
|
<LibraryClasses>
|
||||||
NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
|
NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
|
||||||
diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
||||||
index 744006d..8fc2cbc 100644
|
index a6390bd4b8..20a5bcb27b 100644
|
||||||
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
||||||
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
||||||
@@ -190,7 +190,11 @@ READ_LOCK_STATUS = TRUE
|
@@ -202,7 +202,11 @@ READ_LOCK_STATUS = TRUE
|
||||||
#
|
#
|
||||||
# TianoCore logo (splash screen)
|
# TianoCore logo (splash screen)
|
||||||
#
|
#
|
||||||
+!if $(SECURE_BOOT_ENABLE) == TRUE
|
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE)
|
||||||
+ INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
+ INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
||||||
+!else
|
+!else
|
||||||
INF MdeModulePkg/Logo/LogoDxe.inf
|
INF MdeModulePkg/Logo/LogoDxe.inf
|
||||||
|
@ -142,14 +145,14 @@ index 744006d..8fc2cbc 100644
|
||||||
#
|
#
|
||||||
# Ramdisk support
|
# Ramdisk support
|
||||||
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
||||||
index 9a31ec9..a221641 100644
|
index 434d6861a5..6e4e0249ef 100644
|
||||||
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
||||||
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
||||||
@@ -316,7 +316,11 @@
|
@@ -316,7 +316,11 @@
|
||||||
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
|
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
|
||||||
MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
|
MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
|
||||||
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
|
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
|
||||||
+!if $(SECURE_BOOT_ENABLE) == TRUE
|
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE)
|
||||||
+ MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
+ MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
||||||
+!else
|
+!else
|
||||||
MdeModulePkg/Logo/LogoDxe.inf
|
MdeModulePkg/Logo/LogoDxe.inf
|
||||||
|
@ -159,7 +162,7 @@ index 9a31ec9..a221641 100644
|
||||||
NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
|
NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
|
||||||
diff --git a/MdeModulePkg/Logo/Logo-OpenSSL.bmp.b64 b/MdeModulePkg/Logo/Logo-OpenSSL.bmp.b64
|
diff --git a/MdeModulePkg/Logo/Logo-OpenSSL.bmp.b64 b/MdeModulePkg/Logo/Logo-OpenSSL.bmp.b64
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..567ca32
|
index 0000000000..567ca32f05
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/MdeModulePkg/Logo/Logo-OpenSSL.bmp.b64
|
+++ b/MdeModulePkg/Logo/Logo-OpenSSL.bmp.b64
|
||||||
@@ -0,0 +1,2743 @@
|
@@ -0,0 +1,2743 @@
|
||||||
|
@ -2908,16 +2911,13 @@ index 0000000..567ca32
|
||||||
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||||
diff --git a/MdeModulePkg/Logo/Logo-OpenSSL.idf b/MdeModulePkg/Logo/Logo-OpenSSL.idf
|
diff --git a/MdeModulePkg/Logo/Logo-OpenSSL.idf b/MdeModulePkg/Logo/Logo-OpenSSL.idf
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..15de807
|
index 0000000000..e527cff79b
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/MdeModulePkg/Logo/Logo-OpenSSL.idf
|
+++ b/MdeModulePkg/Logo/Logo-OpenSSL.idf
|
||||||
@@ -0,0 +1,18 @@
|
@@ -0,0 +1,15 @@
|
||||||
+// /** @file
|
+// /** @file
|
||||||
+// Platform Logo image definition file.
|
+// Platform Logo image definition file.
|
||||||
+//
|
+//
|
||||||
+// Console Platfrom DXE Driver that specifies whether device can be used as console
|
|
||||||
+// input/output device or error output device and update global variables accordingly.
|
|
||||||
+//
|
|
||||||
+// Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
|
+// Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
|
||||||
+//
|
+//
|
||||||
+// This program and the accompanying materials
|
+// This program and the accompanying materials
|
||||||
|
@ -2932,7 +2932,7 @@ index 0000000..15de807
|
||||||
+#image IMG_LOGO Logo-OpenSSL.bmp
|
+#image IMG_LOGO Logo-OpenSSL.bmp
|
||||||
diff --git a/MdeModulePkg/Logo/LogoOpenSSLDxe.inf b/MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
diff --git a/MdeModulePkg/Logo/LogoOpenSSLDxe.inf b/MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..2f79d87
|
index 0000000000..2f79d873e2
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
+++ b/MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
||||||
@@ -0,0 +1,61 @@
|
@@ -0,0 +1,61 @@
|
||||||
|
@ -2999,7 +2999,7 @@ index 0000000..2f79d87
|
||||||
+ LogoDxeExtra.uni
|
+ LogoDxeExtra.uni
|
||||||
diff --git a/MdeModulePkg/Logo/LogoOpenSSLDxe.uni b/MdeModulePkg/Logo/LogoOpenSSLDxe.uni
|
diff --git a/MdeModulePkg/Logo/LogoOpenSSLDxe.uni b/MdeModulePkg/Logo/LogoOpenSSLDxe.uni
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..7227ac3
|
index 0000000000..7227ac3910
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/MdeModulePkg/Logo/LogoOpenSSLDxe.uni
|
+++ b/MdeModulePkg/Logo/LogoOpenSSLDxe.uni
|
||||||
@@ -0,0 +1,22 @@
|
@@ -0,0 +1,22 @@
|
||||||
|
@ -3026,14 +3026,14 @@ index 0000000..7227ac3
|
||||||
+#string STR_MODULE_DESCRIPTION #language en-US "This module provides the logo bitmap picture (with OpenSSL advertisment) shown on setup screen, through EDKII Platform Logo protocol."
|
+#string STR_MODULE_DESCRIPTION #language en-US "This module provides the logo bitmap picture (with OpenSSL advertisment) shown on setup screen, through EDKII Platform Logo protocol."
|
||||||
+
|
+
|
||||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||||||
index 92e943d..8af11ff 100644
|
index cd0e71869b..0a49336c0d 100644
|
||||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||||||
@@ -644,7 +644,11 @@
|
@@ -694,7 +694,11 @@
|
||||||
NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf
|
NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf
|
||||||
!endif
|
!endif
|
||||||
}
|
}
|
||||||
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
||||||
+ MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
+ MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
||||||
+!else
|
+!else
|
||||||
MdeModulePkg/Logo/LogoDxe.inf
|
MdeModulePkg/Logo/LogoDxe.inf
|
||||||
|
@ -3042,14 +3042,14 @@ index 92e943d..8af11ff 100644
|
||||||
<LibraryClasses>
|
<LibraryClasses>
|
||||||
NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
|
NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
|
||||||
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
||||||
index 7515224..a967904 100644
|
index 52b8b1fea1..4177379a23 100644
|
||||||
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
||||||
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
||||||
@@ -290,7 +290,11 @@ INF ShellPkg/Application/Shell/Shell.inf
|
@@ -295,7 +295,11 @@ INF ShellPkg/Application/Shell/Shell.inf
|
||||||
INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
|
INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
||||||
+INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
+INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
||||||
+!else
|
+!else
|
||||||
INF MdeModulePkg/Logo/LogoDxe.inf
|
INF MdeModulePkg/Logo/LogoDxe.inf
|
||||||
|
@ -3058,14 +3058,14 @@ index 7515224..a967904 100644
|
||||||
#
|
#
|
||||||
# Network modules
|
# Network modules
|
||||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||||
index 7f9220c..9e09a50 100644
|
index 7f7a78f60a..a3d51ef0f7 100644
|
||||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||||
@@ -653,7 +653,11 @@
|
@@ -703,7 +703,11 @@
|
||||||
NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf
|
NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf
|
||||||
!endif
|
!endif
|
||||||
}
|
}
|
||||||
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
||||||
+ MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
+ MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
||||||
+!else
|
+!else
|
||||||
MdeModulePkg/Logo/LogoDxe.inf
|
MdeModulePkg/Logo/LogoDxe.inf
|
||||||
|
@ -3074,14 +3074,14 @@ index 7f9220c..9e09a50 100644
|
||||||
<LibraryClasses>
|
<LibraryClasses>
|
||||||
NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
|
NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
|
||||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||||
index f1a2044..f5a1d86 100644
|
index 70845d6972..5e57161154 100644
|
||||||
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||||
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||||
@@ -291,7 +291,11 @@ INF ShellPkg/Application/Shell/Shell.inf
|
@@ -296,7 +296,11 @@ INF ShellPkg/Application/Shell/Shell.inf
|
||||||
INF RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf
|
INF RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
||||||
+INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
+INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
||||||
+!else
|
+!else
|
||||||
INF MdeModulePkg/Logo/LogoDxe.inf
|
INF MdeModulePkg/Logo/LogoDxe.inf
|
||||||
|
@ -3090,14 +3090,14 @@ index f1a2044..f5a1d86 100644
|
||||||
#
|
#
|
||||||
# Network modules
|
# Network modules
|
||||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||||||
index 36c60fc..a31dbf1 100644
|
index 739807efc4..f9b4ab4dfa 100644
|
||||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||||||
@@ -651,7 +651,11 @@
|
@@ -701,7 +701,11 @@
|
||||||
NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf
|
NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf
|
||||||
!endif
|
!endif
|
||||||
}
|
}
|
||||||
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
||||||
+ MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
+ MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
||||||
+!else
|
+!else
|
||||||
MdeModulePkg/Logo/LogoDxe.inf
|
MdeModulePkg/Logo/LogoDxe.inf
|
||||||
|
@ -3106,14 +3106,14 @@ index 36c60fc..a31dbf1 100644
|
||||||
<LibraryClasses>
|
<LibraryClasses>
|
||||||
NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
|
NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
|
||||||
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
||||||
index 32000a3..0bba313 100644
|
index 1eb46ac9a2..c81b422517 100644
|
||||||
--- a/OvmfPkg/OvmfPkgX64.fdf
|
--- a/OvmfPkg/OvmfPkgX64.fdf
|
||||||
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
||||||
@@ -291,7 +291,11 @@ INF ShellPkg/Application/Shell/Shell.inf
|
@@ -296,7 +296,11 @@ INF ShellPkg/Application/Shell/Shell.inf
|
||||||
INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
|
INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
||||||
+INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
+INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
||||||
+!else
|
+!else
|
||||||
INF MdeModulePkg/Logo/LogoDxe.inf
|
INF MdeModulePkg/Logo/LogoDxe.inf
|
||||||
|
@ -3121,6 +3121,3 @@ index 32000a3..0bba313 100644
|
||||||
|
|
||||||
#
|
#
|
||||||
# Network modules
|
# Network modules
|
||||||
--
|
|
||||||
2.14.3
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From 9a8a034ebc082f86fdbb54dc1303a5059508e14c Mon Sep 17 00:00:00 2001
|
From e4021f592da913f7f2b841ce6d4272fb8410ac7f Mon Sep 17 00:00:00 2001
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
Date: Thu, 12 Jun 2014 00:17:59 +0200
|
Date: Thu, 12 Jun 2014 00:17:59 +0200
|
||||||
Subject: OvmfPkg: QemuVideoDxe: enable debug messages in VbeShim
|
Subject: [PATCH] OvmfPkg: QemuVideoDxe: enable debug messages in VbeShim
|
||||||
|
|
||||||
The Int10h VBE Shim is capable of emitting short debug messages when the
|
The Int10h VBE Shim is capable of emitting short debug messages when the
|
||||||
win2k8r2 UEFI guest uses (emulates) the Video BIOS. In upstream the quiet
|
win2k8r2 UEFI guest uses (emulates) the Video BIOS. In upstream the quiet
|
||||||
|
@ -22,13 +22,14 @@ Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase:
|
||||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
(cherry picked from commit ccda46526bb2e573d9b54f0db75d27e442b4566f)
|
(cherry picked from commit ccda46526bb2e573d9b54f0db75d27e442b4566f)
|
||||||
(cherry picked from commit ed45b26dbeadd63dd8f2edf627290957d8bbb3b2)
|
(cherry picked from commit ed45b26dbeadd63dd8f2edf627290957d8bbb3b2)
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
---
|
---
|
||||||
OvmfPkg/QemuVideoDxe/VbeShim.asm | 2 +-
|
OvmfPkg/QemuVideoDxe/VbeShim.asm | 2 +-
|
||||||
OvmfPkg/QemuVideoDxe/VbeShim.h | 481 +++++++++++++++++++++++++--------------
|
OvmfPkg/QemuVideoDxe/VbeShim.h | 481 ++++++++++++++++++++-----------
|
||||||
2 files changed, 308 insertions(+), 175 deletions(-)
|
2 files changed, 308 insertions(+), 175 deletions(-)
|
||||||
|
|
||||||
diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.asm b/OvmfPkg/QemuVideoDxe/VbeShim.asm
|
diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.asm b/OvmfPkg/QemuVideoDxe/VbeShim.asm
|
||||||
index 18fa920..f87ed5c 100644
|
index 18fa9209d4..f87ed5cf30 100644
|
||||||
--- a/OvmfPkg/QemuVideoDxe/VbeShim.asm
|
--- a/OvmfPkg/QemuVideoDxe/VbeShim.asm
|
||||||
+++ b/OvmfPkg/QemuVideoDxe/VbeShim.asm
|
+++ b/OvmfPkg/QemuVideoDxe/VbeShim.asm
|
||||||
@@ -18,7 +18,7 @@
|
@@ -18,7 +18,7 @@
|
||||||
|
@ -41,7 +42,7 @@ index 18fa920..f87ed5c 100644
|
||||||
%macro DebugLog 1
|
%macro DebugLog 1
|
||||||
%ifdef DEBUG
|
%ifdef DEBUG
|
||||||
diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.h b/OvmfPkg/QemuVideoDxe/VbeShim.h
|
diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.h b/OvmfPkg/QemuVideoDxe/VbeShim.h
|
||||||
index cc9b6e1..325d647 100644
|
index cc9b6e14cd..325d6478a1 100644
|
||||||
--- a/OvmfPkg/QemuVideoDxe/VbeShim.h
|
--- a/OvmfPkg/QemuVideoDxe/VbeShim.h
|
||||||
+++ b/OvmfPkg/QemuVideoDxe/VbeShim.h
|
+++ b/OvmfPkg/QemuVideoDxe/VbeShim.h
|
||||||
@@ -517,185 +517,318 @@ STATIC CONST UINT8 mVbeShim[] = {
|
@@ -517,185 +517,318 @@ STATIC CONST UINT8 mVbeShim[] = {
|
||||||
|
@ -537,6 +538,3 @@ index cc9b6e1..325d647 100644
|
||||||
+ /* 00000459 or al,[fs:bx+si] */ 0x64, 0x0A, 0x00,
|
+ /* 00000459 or al,[fs:bx+si] */ 0x64, 0x0A, 0x00,
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From d2066c1748f885043026c51dec1bc8d6d406ae8f Mon Sep 17 00:00:00 2001
|
From b6e4c1bf03878da7bd82224d523c44fd1fa96aaa Mon Sep 17 00:00:00 2001
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
Date: Tue, 25 Feb 2014 18:40:35 +0100
|
Date: Tue, 25 Feb 2014 18:40:35 +0100
|
||||||
Subject: MdeModulePkg: TerminalDxe: add other text resolutions
|
Subject: [PATCH] MdeModulePkg: TerminalDxe: add other text resolutions
|
||||||
|
|
||||||
When the console output is multiplexed to several devices by
|
When the console output is multiplexed to several devices by
|
||||||
ConSplitterDxe, then ConSplitterDxe builds an intersection of text modes
|
ConSplitterDxe, then ConSplitterDxe builds an intersection of text modes
|
||||||
|
@ -70,12 +70,13 @@ Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase:
|
||||||
|
|
||||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
(cherry picked from commit 99dc3720ac86059f60156197328cc433603c536e)
|
(cherry picked from commit 99dc3720ac86059f60156197328cc433603c536e)
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
---
|
---
|
||||||
.../Universal/Console/TerminalDxe/Terminal.c | 41 ++++++++++++++++++++--
|
.../Universal/Console/TerminalDxe/Terminal.c | 41 +++++++++++++++++--
|
||||||
1 file changed, 38 insertions(+), 3 deletions(-)
|
1 file changed, 38 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
|
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
|
||||||
index 60de2d4..c90879b 100644
|
index 66dd3ad550..78a198379a 100644
|
||||||
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
|
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
|
||||||
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
|
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
|
||||||
@@ -113,9 +113,44 @@ TERMINAL_DEV mTerminalDevTemplate = {
|
@@ -113,9 +113,44 @@ TERMINAL_DEV mTerminalDevTemplate = {
|
||||||
|
@ -126,6 +127,3 @@ index 60de2d4..c90879b 100644
|
||||||
//
|
//
|
||||||
// New modes can be added here.
|
// New modes can be added here.
|
||||||
//
|
//
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
|
@ -1,43 +0,0 @@
|
||||||
From 58e1d1ebb78bfdaf05f4c6e8abf8d4908dfa038a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
|
||||||
Date: Thu, 20 Feb 2014 22:54:45 +0100
|
|
||||||
Subject: OvmfPkg: increase max debug message length to 512
|
|
||||||
|
|
||||||
Upstream prefers short debug messages (sometimes even limited to 80
|
|
||||||
characters), but any line length under 512 characters is just unsuitable
|
|
||||||
for effective debugging. (For example, config strings in HII routing,
|
|
||||||
logged by the platform driver "OvmfPkg/PlatformDxe" on DEBUG_VERBOSE
|
|
||||||
level, can be several hundred characters long.) 512 is an empirically good
|
|
||||||
value.
|
|
||||||
|
|
||||||
Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase:
|
|
||||||
|
|
||||||
- no changes
|
|
||||||
|
|
||||||
Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase:
|
|
||||||
|
|
||||||
- no changes
|
|
||||||
|
|
||||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
||||||
(cherry picked from commit bfe568d18dba15602604f155982e3b73add63dfb)
|
|
||||||
(cherry picked from commit 29435a32ec9428720c74c454ce9817662e601fb6)
|
|
||||||
---
|
|
||||||
OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
|
||||||
index 5435767..01016c3 100644
|
|
||||||
--- a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
|
||||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
|
||||||
@@ -27,7 +27,7 @@
|
|
||||||
//
|
|
||||||
// Define the maximum debug and assert message length that this library supports
|
|
||||||
//
|
|
||||||
-#define MAX_DEBUG_MESSAGE_LENGTH 0x100
|
|
||||||
+#define MAX_DEBUG_MESSAGE_LENGTH 0x200
|
|
||||||
|
|
||||||
/**
|
|
||||||
This constructor function does not have to do anything.
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
From b9c5c901f25e48d68eef6e78a4abca00e153f574 Mon Sep 17 00:00:00 2001
|
From f337eb3972afcccabe86fe663202a758337d0ab8 Mon Sep 17 00:00:00 2001
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
Date: Tue, 25 Feb 2014 22:40:01 +0100
|
Date: Tue, 25 Feb 2014 22:40:01 +0100
|
||||||
Subject: MdeModulePkg: TerminalDxe: set xterm resolution on mode change (RH
|
Subject: [PATCH] MdeModulePkg: TerminalDxe: set xterm resolution on mode
|
||||||
only)
|
change (RH only)
|
||||||
|
|
||||||
The
|
The
|
||||||
|
|
||||||
|
@ -29,17 +29,18 @@ Reference: <http://rtfm.etla.org/xterm/ctlseq.html>
|
||||||
Contributed-under: TianoCore Contribution Agreement 1.0
|
Contributed-under: TianoCore Contribution Agreement 1.0
|
||||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
(cherry picked from commit 2909e025db6878723b49644a8a0cf160d07e6444)
|
(cherry picked from commit 2909e025db6878723b49644a8a0cf160d07e6444)
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
---
|
---
|
||||||
MdeModulePkg/MdeModulePkg.dec | 4 +++
|
MdeModulePkg/MdeModulePkg.dec | 4 +++
|
||||||
.../Universal/Console/TerminalDxe/TerminalConOut.c | 30 ++++++++++++++++++++++
|
.../Console/TerminalDxe/TerminalConOut.c | 30 +++++++++++++++++++
|
||||||
.../Universal/Console/TerminalDxe/TerminalDxe.inf | 2 ++
|
.../Console/TerminalDxe/TerminalDxe.inf | 2 ++
|
||||||
3 files changed, 36 insertions(+)
|
3 files changed, 36 insertions(+)
|
||||||
|
|
||||||
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
|
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
|
||||||
index a3c0633..cd0264e 100644
|
index 6a6d9660ed..2dc1cf94e2 100644
|
||||||
--- a/MdeModulePkg/MdeModulePkg.dec
|
--- a/MdeModulePkg/MdeModulePkg.dec
|
||||||
+++ b/MdeModulePkg/MdeModulePkg.dec
|
+++ b/MdeModulePkg/MdeModulePkg.dec
|
||||||
@@ -1758,6 +1758,10 @@
|
@@ -1936,6 +1936,10 @@
|
||||||
# @Prompt The address mask when memory encryption is enabled.
|
# @Prompt The address mask when memory encryption is enabled.
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask|0x0|UINT64|0x30001047
|
gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask|0x0|UINT64|0x30001047
|
||||||
|
|
||||||
|
@ -51,7 +52,7 @@ index a3c0633..cd0264e 100644
|
||||||
## Specify memory size with page number for PEI code when
|
## Specify memory size with page number for PEI code when
|
||||||
# Loading Module at Fixed Address feature is enabled.
|
# Loading Module at Fixed Address feature is enabled.
|
||||||
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
|
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
|
||||||
index e677a76..e2bdc31 100644
|
index 4d7218e415..295e7641a5 100644
|
||||||
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
|
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
|
||||||
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
|
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
|
||||||
@@ -13,6 +13,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
@@ -13,6 +13,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||||
|
@ -63,10 +64,11 @@ index e677a76..e2bdc31 100644
|
||||||
#include "Terminal.h"
|
#include "Terminal.h"
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -87,6 +89,16 @@ CHAR16 mCursorForwardString[] = { ESC, '[', '0', '0', 'C', 0 };
|
@@ -86,6 +88,16 @@ CHAR16 mSetCursorPositionString[] = { ESC, '[', '0', '0', ';', '0', '0', 'H', 0
|
||||||
|
CHAR16 mCursorForwardString[] = { ESC, '[', '0', '0', 'C', 0 };
|
||||||
CHAR16 mCursorBackwardString[] = { ESC, '[', '0', '0', 'D', 0 };
|
CHAR16 mCursorBackwardString[] = { ESC, '[', '0', '0', 'D', 0 };
|
||||||
|
|
||||||
//
|
+//
|
||||||
+// Note that this is an ASCII format string, taking two INT32 arguments:
|
+// Note that this is an ASCII format string, taking two INT32 arguments:
|
||||||
+// rows, columns.
|
+// rows, columns.
|
||||||
+//
|
+//
|
||||||
|
@ -76,10 +78,9 @@ index e677a76..e2bdc31 100644
|
||||||
+#define RESIZE_SEQ_SIZE (sizeof mResizeTextAreaFormatString + 2 * (11 - 2))
|
+#define RESIZE_SEQ_SIZE (sizeof mResizeTextAreaFormatString + 2 * (11 - 2))
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
+//
|
//
|
||||||
// Body of the ConOut functions
|
// Body of the ConOut functions
|
||||||
//
|
//
|
||||||
|
|
||||||
@@ -508,6 +520,24 @@ TerminalConOutSetMode (
|
@@ -508,6 +520,24 @@ TerminalConOutSetMode (
|
||||||
return EFI_DEVICE_ERROR;
|
return EFI_DEVICE_ERROR;
|
||||||
}
|
}
|
||||||
|
@ -106,7 +107,7 @@ index e677a76..e2bdc31 100644
|
||||||
|
|
||||||
Status = This->ClearScreen (This);
|
Status = This->ClearScreen (This);
|
||||||
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
|
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
|
||||||
index 0780296..bd2ba82 100644
|
index 0780296798..bd2ba828a6 100644
|
||||||
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
|
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
|
||||||
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
|
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
|
||||||
@@ -60,6 +60,7 @@
|
@@ -60,6 +60,7 @@
|
||||||
|
@ -125,6 +126,3 @@ index 0780296..bd2ba82 100644
|
||||||
|
|
||||||
# [Event]
|
# [Event]
|
||||||
# # Relative timer event set by UnicodeToEfiKey(), used to be one 2 seconds input timeout.
|
# # Relative timer event set by UnicodeToEfiKey(), used to be one 2 seconds input timeout.
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
From b311932d3841c017a0f0fec553edcac365cc2038 Mon Sep 17 00:00:00 2001
|
From 30251344cfbd25212394c377b80cd720a3b85d46 Mon Sep 17 00:00:00 2001
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
Date: Wed, 14 Oct 2015 15:59:06 +0200
|
Date: Wed, 14 Oct 2015 15:59:06 +0200
|
||||||
Subject: OvmfPkg: take PcdResizeXterm from the QEMU command line (RH only)
|
Subject: [PATCH] OvmfPkg: take PcdResizeXterm from the QEMU command line (RH
|
||||||
|
only)
|
||||||
|
|
||||||
Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase:
|
Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase:
|
||||||
|
|
||||||
|
@ -18,6 +19,7 @@ Contributed-under: TianoCore Contribution Agreement 1.0
|
||||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
(cherry picked from commit 6fa0c4d67c0bb8bde2ddd6db41c19eb0c40b2721)
|
(cherry picked from commit 6fa0c4d67c0bb8bde2ddd6db41c19eb0c40b2721)
|
||||||
(cherry picked from commit 8abc2a6ddad25af7e88dc0cf57d55dfb75fbf92d)
|
(cherry picked from commit 8abc2a6ddad25af7e88dc0cf57d55dfb75fbf92d)
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
---
|
---
|
||||||
OvmfPkg/OvmfPkgIa32.dsc | 1 +
|
OvmfPkg/OvmfPkgIa32.dsc | 1 +
|
||||||
OvmfPkg/OvmfPkgIa32X64.dsc | 1 +
|
OvmfPkg/OvmfPkgIa32X64.dsc | 1 +
|
||||||
|
@ -27,10 +29,10 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
5 files changed, 5 insertions(+)
|
5 files changed, 5 insertions(+)
|
||||||
|
|
||||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||||||
index 8af11ff..61e606a 100644
|
index 0a49336c0d..8dc3ad2be4 100644
|
||||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||||||
@@ -504,6 +504,7 @@
|
@@ -535,6 +535,7 @@
|
||||||
# ($(SMM_REQUIRE) == FALSE)
|
# ($(SMM_REQUIRE) == FALSE)
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
||||||
|
|
||||||
|
@ -39,10 +41,10 @@ index 8af11ff..61e606a 100644
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
|
||||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||||
index 9e09a50..bfe3baf 100644
|
index a3d51ef0f7..d81cd865d5 100644
|
||||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||||
@@ -510,6 +510,7 @@
|
@@ -541,6 +541,7 @@
|
||||||
# ($(SMM_REQUIRE) == FALSE)
|
# ($(SMM_REQUIRE) == FALSE)
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
||||||
|
|
||||||
|
@ -51,10 +53,10 @@ index 9e09a50..bfe3baf 100644
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
|
||||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||||||
index a31dbf1..4365a7b 100644
|
index f9b4ab4dfa..85bd8d4bf6 100644
|
||||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||||||
@@ -509,6 +509,7 @@
|
@@ -540,6 +540,7 @@
|
||||||
# ($(SMM_REQUIRE) == FALSE)
|
# ($(SMM_REQUIRE) == FALSE)
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
||||||
|
|
||||||
|
@ -63,7 +65,7 @@ index a31dbf1..4365a7b 100644
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
|
||||||
diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
|
diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
|
||||||
index 5a78668..544ac54 100644
|
index 5a78668126..544ac547bf 100644
|
||||||
--- a/OvmfPkg/PlatformPei/Platform.c
|
--- a/OvmfPkg/PlatformPei/Platform.c
|
||||||
+++ b/OvmfPkg/PlatformPei/Platform.c
|
+++ b/OvmfPkg/PlatformPei/Platform.c
|
||||||
@@ -670,6 +670,7 @@ InitializePlatform (
|
@@ -670,6 +670,7 @@ InitializePlatform (
|
||||||
|
@ -75,10 +77,10 @@ index 5a78668..544ac54 100644
|
||||||
|
|
||||||
AmdSevInitialize ();
|
AmdSevInitialize ();
|
||||||
diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
|
diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
|
||||||
index 16a8db7..9f89e08 100644
|
index 9c5ad9961c..31baaa0a22 100644
|
||||||
--- a/OvmfPkg/PlatformPei/PlatformPei.inf
|
--- a/OvmfPkg/PlatformPei/PlatformPei.inf
|
||||||
+++ b/OvmfPkg/PlatformPei/PlatformPei.inf
|
+++ b/OvmfPkg/PlatformPei/PlatformPei.inf
|
||||||
@@ -90,6 +90,7 @@
|
@@ -94,6 +94,7 @@
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved
|
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration
|
gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration
|
||||||
|
@ -86,6 +88,3 @@ index 16a8db7..9f89e08 100644
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
|
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable
|
gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack
|
gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
From 22b073005af491eef177ef5f80ffe71c1ebabb03 Mon Sep 17 00:00:00 2001
|
From 92f37a3d72213d9b76bc47c4f194f2ea989a71a1 Mon Sep 17 00:00:00 2001
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
Date: Tue, 12 Apr 2016 20:50:25 +0200
|
Date: Tue, 12 Apr 2016 20:50:25 +0200
|
||||||
Subject: ArmVirtPkg: QemuFwCfgLib: allow UEFI_DRIVER client modules (RH only)
|
Subject: [PATCH] ArmVirtPkg: QemuFwCfgLib: allow UEFI_DRIVER client modules
|
||||||
|
(RH only)
|
||||||
|
|
||||||
Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase:
|
Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase:
|
||||||
|
|
||||||
|
@ -15,12 +16,13 @@ Contributed-under: TianoCore Contribution Agreement 1.0
|
||||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
(cherry picked from commit 8e2153358aa2bba2c91faa87a70beadcaae03fd8)
|
(cherry picked from commit 8e2153358aa2bba2c91faa87a70beadcaae03fd8)
|
||||||
(cherry picked from commit 5af259a93f4bbee5515ae18638068125e170f2cd)
|
(cherry picked from commit 5af259a93f4bbee5515ae18638068125e170f2cd)
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
---
|
---
|
||||||
ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf | 2 +-
|
ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf | 2 +-
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
|
diff --git a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
|
||||||
index eff4a21..adf1ff6 100644
|
index eff4a21650..adf1ff6c6a 100644
|
||||||
--- a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
|
--- a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
|
||||||
+++ b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
|
+++ b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
|
||||||
@@ -22,7 +22,7 @@
|
@@ -22,7 +22,7 @@
|
||||||
|
@ -32,6 +34,3 @@ index eff4a21..adf1ff6 100644
|
||||||
|
|
||||||
CONSTRUCTOR = QemuFwCfgInitialize
|
CONSTRUCTOR = QemuFwCfgInitialize
|
||||||
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
From c9081ebe3bcd28e5cce4bf58bd8d4fca12f9af7c Mon Sep 17 00:00:00 2001
|
From 6a27daa40698f06a34c209bd90092011d70f7795 Mon Sep 17 00:00:00 2001
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
Date: Sun, 26 Jul 2015 08:02:50 +0000
|
Date: Sun, 26 Jul 2015 08:02:50 +0000
|
||||||
Subject: ArmVirtPkg: take PcdResizeXterm from the QEMU command line (RH only)
|
Subject: [PATCH] ArmVirtPkg: take PcdResizeXterm from the QEMU command line
|
||||||
|
(RH only)
|
||||||
|
|
||||||
Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase:
|
Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase:
|
||||||
|
|
||||||
|
@ -20,19 +21,20 @@ Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase:
|
||||||
Contributed-under: TianoCore Contribution Agreement 1.0
|
Contributed-under: TianoCore Contribution Agreement 1.0
|
||||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
(cherry picked from commit d4564d39dfdbf74e762af43314005a2c026cb262)
|
(cherry picked from commit d4564d39dfdbf74e762af43314005a2c026cb262)
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
---
|
---
|
||||||
ArmVirtPkg/ArmVirtQemu.dsc | 7 +-
|
ArmVirtPkg/ArmVirtQemu.dsc | 7 +-
|
||||||
.../TerminalPcdProducerLib.c | 87 ++++++++++++++++++++++
|
.../TerminalPcdProducerLib.c | 87 +++++++++++++++++++
|
||||||
.../TerminalPcdProducerLib.inf | 41 ++++++++++
|
.../TerminalPcdProducerLib.inf | 41 +++++++++
|
||||||
3 files changed, 134 insertions(+), 1 deletion(-)
|
3 files changed, 134 insertions(+), 1 deletion(-)
|
||||||
create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c
|
create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c
|
||||||
create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf
|
create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf
|
||||||
|
|
||||||
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
|
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
|
||||||
index 045333d..2b1a383 100644
|
index a7a3899560..86d5d5a666 100644
|
||||||
--- a/ArmVirtPkg/ArmVirtQemu.dsc
|
--- a/ArmVirtPkg/ArmVirtQemu.dsc
|
||||||
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
|
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
|
||||||
@@ -212,6 +212,8 @@
|
@@ -206,6 +206,8 @@
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0
|
gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0
|
||||||
gUefiOvmfPkgTokenSpaceGuid.PcdQemuSmbiosValidated|FALSE
|
gUefiOvmfPkgTokenSpaceGuid.PcdQemuSmbiosValidated|FALSE
|
||||||
|
|
||||||
|
@ -41,7 +43,7 @@ index 045333d..2b1a383 100644
|
||||||
[PcdsDynamicHii]
|
[PcdsDynamicHii]
|
||||||
gArmVirtTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gArmVirtVariableGuid|0x0|FALSE|NV,BS
|
gArmVirtTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gArmVirtVariableGuid|0x0|FALSE|NV,BS
|
||||||
|
|
||||||
@@ -284,7 +286,10 @@
|
@@ -282,7 +284,10 @@
|
||||||
MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
|
MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
|
||||||
MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
|
MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
|
||||||
MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
|
MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
|
||||||
|
@ -55,7 +57,7 @@ index 045333d..2b1a383 100644
|
||||||
MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
|
MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
|
||||||
diff --git a/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c
|
diff --git a/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..814ad48
|
index 0000000000..814ad48199
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c
|
+++ b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c
|
||||||
@@ -0,0 +1,87 @@
|
@@ -0,0 +1,87 @@
|
||||||
|
@ -148,7 +150,7 @@ index 0000000..814ad48
|
||||||
+}
|
+}
|
||||||
diff --git a/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf
|
diff --git a/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..fecb37b
|
index 0000000000..fecb37bcdf
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf
|
+++ b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf
|
||||||
@@ -0,0 +1,41 @@
|
@@ -0,0 +1,41 @@
|
||||||
|
@ -193,6 +195,3 @@ index 0000000..fecb37b
|
||||||
+
|
+
|
||||||
+[Pcd]
|
+[Pcd]
|
||||||
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm
|
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From 23df46ebbe7b09451d3a05034acd4d3a25e7177b Mon Sep 17 00:00:00 2001
|
From 84570add9731d2099c6e5be43f96aed508fd4c39 Mon Sep 17 00:00:00 2001
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
Date: Tue, 4 Nov 2014 23:02:53 +0100
|
Date: Tue, 4 Nov 2014 23:02:53 +0100
|
||||||
Subject: OvmfPkg: allow exclusion of the shell from the firmware image
|
Subject: [PATCH] OvmfPkg: allow exclusion of the shell from the firmware image
|
||||||
|
|
||||||
When '-D EXCLUDE_SHELL_FROM_FD' is passed to 'build', exclude the shell
|
When '-D EXCLUDE_SHELL_FROM_FD' is passed to 'build', exclude the shell
|
||||||
binary from the firmware image.
|
binary from the firmware image.
|
||||||
|
@ -47,6 +47,7 @@ Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase:
|
||||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
(cherry picked from commit 9c391def70366cabae08e6008814299c3372fafd)
|
(cherry picked from commit 9c391def70366cabae08e6008814299c3372fafd)
|
||||||
(cherry picked from commit d9dd9ee42937b2611fe37183cc9ec7f62d946933)
|
(cherry picked from commit d9dd9ee42937b2611fe37183cc9ec7f62d946933)
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
---
|
---
|
||||||
OvmfPkg/OvmfPkgIa32.fdf | 2 ++
|
OvmfPkg/OvmfPkgIa32.fdf | 2 ++
|
||||||
OvmfPkg/OvmfPkgIa32X64.fdf | 2 ++
|
OvmfPkg/OvmfPkgIa32X64.fdf | 2 ++
|
||||||
|
@ -54,59 +55,59 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
3 files changed, 6 insertions(+)
|
3 files changed, 6 insertions(+)
|
||||||
|
|
||||||
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
||||||
index a967904..366d6bf 100644
|
index 4177379a23..8c0b6ee1bd 100644
|
||||||
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
||||||
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
||||||
@@ -284,11 +284,13 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
@@ -288,12 +288,14 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
||||||
INF FatPkg/EnhancedFatDxe/Fat.inf
|
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||||||
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
||||||
|
|
||||||
+!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
+!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
||||||
!ifndef $(USE_OLD_SHELL)
|
!ifndef $(USE_OLD_SHELL)
|
||||||
|
INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
|
||||||
INF ShellPkg/Application/Shell/Shell.inf
|
INF ShellPkg/Application/Shell/Shell.inf
|
||||||
!else
|
!else
|
||||||
INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
|
INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
|
||||||
!endif
|
!endif
|
||||||
+!endif
|
+!endif
|
||||||
|
|
||||||
!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
||||||
INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
||||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||||
index f5a1d86..e4ca33e 100644
|
index 5e57161154..8de20366d2 100644
|
||||||
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||||
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
||||||
@@ -285,11 +285,13 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
@@ -289,12 +289,14 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
||||||
INF FatPkg/EnhancedFatDxe/Fat.inf
|
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||||||
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
||||||
|
|
||||||
+!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
+!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
||||||
!ifndef $(USE_OLD_SHELL)
|
!ifndef $(USE_OLD_SHELL)
|
||||||
|
INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
|
||||||
INF ShellPkg/Application/Shell/Shell.inf
|
INF ShellPkg/Application/Shell/Shell.inf
|
||||||
!else
|
!else
|
||||||
INF RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf
|
INF RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf
|
||||||
!endif
|
!endif
|
||||||
+!endif
|
+!endif
|
||||||
|
|
||||||
!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
||||||
INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
||||||
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
||||||
index 0bba313..3196b26 100644
|
index c81b422517..49ef829a3a 100644
|
||||||
--- a/OvmfPkg/OvmfPkgX64.fdf
|
--- a/OvmfPkg/OvmfPkgX64.fdf
|
||||||
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
||||||
@@ -285,11 +285,13 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
@@ -289,12 +289,14 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
||||||
INF FatPkg/EnhancedFatDxe/Fat.inf
|
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||||||
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
||||||
|
|
||||||
+!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
+!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
||||||
!ifndef $(USE_OLD_SHELL)
|
!ifndef $(USE_OLD_SHELL)
|
||||||
|
INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
|
||||||
INF ShellPkg/Application/Shell/Shell.inf
|
INF ShellPkg/Application/Shell/Shell.inf
|
||||||
!else
|
!else
|
||||||
INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
|
INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
|
||||||
!endif
|
!endif
|
||||||
+!endif
|
+!endif
|
||||||
|
|
||||||
!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)
|
||||||
INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
From 92424de98ffaf1fa81e6346949b1d2b5f9a637ca Mon Sep 17 00:00:00 2001
|
From 685d43b29b2ac4b19572bda1ebeb989d69d74ebb Mon Sep 17 00:00:00 2001
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
Date: Tue, 4 Nov 2014 23:02:55 +0100
|
Date: Tue, 4 Nov 2014 23:02:55 +0100
|
||||||
Subject: OvmfPkg: EnrollDefaultKeys: application for enrolling default keys
|
Subject: [PATCH] OvmfPkg: EnrollDefaultKeys: application for enrolling default
|
||||||
|
keys
|
||||||
|
|
||||||
This application is meant to be invoked by the management layer, after
|
This application is meant to be invoked by the management layer, after
|
||||||
booting the UEFI shell and getting a shell prompt on the serial console.
|
booting the UEFI shell and getting a shell prompt on the serial console.
|
||||||
|
@ -190,19 +191,20 @@ Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase:
|
||||||
|
|
||||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
(cherry picked from commit c0b2615a9c0b4a4be1bffe45681a32915449279d)
|
(cherry picked from commit c0b2615a9c0b4a4be1bffe45681a32915449279d)
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
---
|
---
|
||||||
OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 1015 +++++++++++++++++++++++
|
OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 1015 +++++++++++++++++
|
||||||
OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf | 52 ++
|
.../EnrollDefaultKeys/EnrollDefaultKeys.inf | 52 +
|
||||||
OvmfPkg/OvmfPkgIa32.dsc | 4 +
|
OvmfPkg/OvmfPkgIa32.dsc | 4 +
|
||||||
OvmfPkg/OvmfPkgIa32X64.dsc | 4 +
|
OvmfPkg/OvmfPkgIa32X64.dsc | 4 +
|
||||||
OvmfPkg/OvmfPkgX64.dsc | 4 +
|
OvmfPkg/OvmfPkgX64.dsc | 4 +
|
||||||
5 files changed, 1079 insertions(+)
|
5 files changed, 1079 insertions(+)
|
||||||
create mode 100644 OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
|
create mode 100644 OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
|
||||||
create mode 100644 OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf
|
create mode 100644 OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf
|
||||||
|
|
||||||
diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
|
diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..dd413df
|
index 0000000000..dd413df12d
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
|
+++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c
|
||||||
@@ -0,0 +1,1015 @@
|
@@ -0,0 +1,1015 @@
|
||||||
|
@ -1223,7 +1225,7 @@ index 0000000..dd413df
|
||||||
+}
|
+}
|
||||||
diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf
|
diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000..0ad86a2
|
index 0000000000..0ad86a2843
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf
|
+++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf
|
||||||
@@ -0,0 +1,52 @@
|
@@ -0,0 +1,52 @@
|
||||||
|
@ -1280,10 +1282,10 @@ index 0000000..0ad86a2
|
||||||
+ UefiLib
|
+ UefiLib
|
||||||
+ UefiRuntimeServicesTableLib
|
+ UefiRuntimeServicesTableLib
|
||||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||||||
index 61e606a..b0ad6e9 100644
|
index 8dc3ad2be4..518f6db2c6 100644
|
||||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||||||
@@ -821,6 +821,10 @@
|
@@ -876,6 +876,10 @@
|
||||||
|
|
||||||
!if $(SECURE_BOOT_ENABLE) == TRUE
|
!if $(SECURE_BOOT_ENABLE) == TRUE
|
||||||
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
|
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
|
||||||
|
@ -1295,10 +1297,10 @@ index 61e606a..b0ad6e9 100644
|
||||||
|
|
||||||
OvmfPkg/PlatformDxe/Platform.inf
|
OvmfPkg/PlatformDxe/Platform.inf
|
||||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||||
index bfe3baf..bf749d7 100644
|
index d81cd865d5..ed2f876e7e 100644
|
||||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||||
@@ -830,6 +830,10 @@
|
@@ -885,6 +885,10 @@
|
||||||
|
|
||||||
!if $(SECURE_BOOT_ENABLE) == TRUE
|
!if $(SECURE_BOOT_ENABLE) == TRUE
|
||||||
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
|
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
|
||||||
|
@ -1310,10 +1312,10 @@ index bfe3baf..bf749d7 100644
|
||||||
|
|
||||||
OvmfPkg/PlatformDxe/Platform.inf
|
OvmfPkg/PlatformDxe/Platform.inf
|
||||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||||||
index 4365a7b..b677d15 100644
|
index 85bd8d4bf6..a12905f882 100644
|
||||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||||||
@@ -828,6 +828,10 @@
|
@@ -883,6 +883,10 @@
|
||||||
|
|
||||||
!if $(SECURE_BOOT_ENABLE) == TRUE
|
!if $(SECURE_BOOT_ENABLE) == TRUE
|
||||||
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
|
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
|
||||||
|
@ -1324,6 +1326,3 @@ index 4365a7b..b677d15 100644
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
OvmfPkg/PlatformDxe/Platform.inf
|
OvmfPkg/PlatformDxe/Platform.inf
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
From 6734b88cf7abcaf42632e3d2fc469b2169dd2f16 Mon Sep 17 00:00:00 2001
|
From 6f89eae9f2abe20e35058848e7cc10a69a6b05ec Mon Sep 17 00:00:00 2001
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
Date: Wed, 14 Oct 2015 13:49:43 +0200
|
Date: Wed, 14 Oct 2015 13:49:43 +0200
|
||||||
Subject: ArmPlatformPkg: introduce fixed PCD for early hello message (RH only)
|
Subject: [PATCH] ArmPlatformPkg: introduce fixed PCD for early hello message
|
||||||
|
(RH only)
|
||||||
|
|
||||||
Drew has proposed that ARM|AARCH64 platform firmware (especially virtual
|
Drew has proposed that ARM|AARCH64 platform firmware (especially virtual
|
||||||
machine firmware) print a reasonably early, simple hello message to the
|
machine firmware) print a reasonably early, simple hello message to the
|
||||||
|
@ -29,17 +30,18 @@ Contributed-under: TianoCore Contribution Agreement 1.0
|
||||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
(cherry picked from commit 7ce97b06421434c82095f01a1753a8c9c546cc30)
|
(cherry picked from commit 7ce97b06421434c82095f01a1753a8c9c546cc30)
|
||||||
(cherry picked from commit 20b1f1cbd0590aa71c6d99d35e23cf08e0707750)
|
(cherry picked from commit 20b1f1cbd0590aa71c6d99d35e23cf08e0707750)
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
---
|
---
|
||||||
ArmPlatformPkg/ArmPlatformPkg.dec | 7 +++++++
|
ArmPlatformPkg/ArmPlatformPkg.dec | 7 +++++++
|
||||||
1 file changed, 7 insertions(+)
|
1 file changed, 7 insertions(+)
|
||||||
|
|
||||||
diff --git a/ArmPlatformPkg/ArmPlatformPkg.dec b/ArmPlatformPkg/ArmPlatformPkg.dec
|
diff --git a/ArmPlatformPkg/ArmPlatformPkg.dec b/ArmPlatformPkg/ArmPlatformPkg.dec
|
||||||
index 2d82ead..2380609 100644
|
index 5f67e74154..2956d3e2d8 100644
|
||||||
--- a/ArmPlatformPkg/ArmPlatformPkg.dec
|
--- a/ArmPlatformPkg/ArmPlatformPkg.dec
|
||||||
+++ b/ArmPlatformPkg/ArmPlatformPkg.dec
|
+++ b/ArmPlatformPkg/ArmPlatformPkg.dec
|
||||||
@@ -126,6 +126,13 @@
|
@@ -113,6 +113,13 @@
|
||||||
gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L""|VOID*|0x0000001B
|
## If set, this will swap settings for HDLCD RED_SELECT and BLUE_SELECT registers
|
||||||
gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L""|VOID*|0x0000001C
|
gArmPlatformTokenSpaceGuid.PcdArmHdLcdSwapBlueRedSelect|FALSE|BOOLEAN|0x00000045
|
||||||
|
|
||||||
+ #
|
+ #
|
||||||
+ # Early hello message (ASCII string), printed to the serial port.
|
+ # Early hello message (ASCII string), printed to the serial port.
|
||||||
|
@ -51,6 +53,3 @@ index 2d82ead..2380609 100644
|
||||||
[PcdsFixedAtBuild.common,PcdsDynamic.common]
|
[PcdsFixedAtBuild.common,PcdsDynamic.common]
|
||||||
## PL031 RealTimeClock
|
## PL031 RealTimeClock
|
||||||
gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0|UINT32|0x00000024
|
gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0|UINT32|0x00000024
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
From 93d69eb9393cf05af90676253875c59c1bec67fd Mon Sep 17 00:00:00 2001
|
From e6c0f362edd5834b0d891fc44cd6873566bb0df4 Mon Sep 17 00:00:00 2001
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
Date: Wed, 14 Oct 2015 13:59:20 +0200
|
Date: Wed, 14 Oct 2015 13:59:20 +0200
|
||||||
Subject: ArmPlatformPkg: PrePeiCore: write early hello message to the serial
|
Subject: [PATCH] ArmPlatformPkg: PrePeiCore: write early hello message to the
|
||||||
port (RH)
|
serial port (RH)
|
||||||
|
|
||||||
The FixedPcdGetSize() macro expands to an integer constant, therefore an
|
The FixedPcdGetSize() macro expands to an integer constant, therefore an
|
||||||
optimizing compiler can eliminate the new code, if the platform DSC
|
optimizing compiler can eliminate the new code, if the platform DSC
|
||||||
|
@ -25,6 +25,7 @@ Contributed-under: TianoCore Contribution Agreement 1.0
|
||||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
(cherry picked from commit b16c4c505ce0e27305235533eac9236aa66f132e)
|
(cherry picked from commit b16c4c505ce0e27305235533eac9236aa66f132e)
|
||||||
(cherry picked from commit 742e5bf6d5ce5a1e73879d6e5c0dd00feda7a9ac)
|
(cherry picked from commit 742e5bf6d5ce5a1e73879d6e5c0dd00feda7a9ac)
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
---
|
---
|
||||||
ArmPlatformPkg/PrePeiCore/MainMPCore.c | 5 +++++
|
ArmPlatformPkg/PrePeiCore/MainMPCore.c | 5 +++++
|
||||||
ArmPlatformPkg/PrePeiCore/MainUniCore.c | 5 +++++
|
ArmPlatformPkg/PrePeiCore/MainUniCore.c | 5 +++++
|
||||||
|
@ -34,7 +35,7 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
5 files changed, 15 insertions(+)
|
5 files changed, 15 insertions(+)
|
||||||
|
|
||||||
diff --git a/ArmPlatformPkg/PrePeiCore/MainMPCore.c b/ArmPlatformPkg/PrePeiCore/MainMPCore.c
|
diff --git a/ArmPlatformPkg/PrePeiCore/MainMPCore.c b/ArmPlatformPkg/PrePeiCore/MainMPCore.c
|
||||||
index dc47adb..cbd7223 100644
|
index dc47adbaff..cbd72232c7 100644
|
||||||
--- a/ArmPlatformPkg/PrePeiCore/MainMPCore.c
|
--- a/ArmPlatformPkg/PrePeiCore/MainMPCore.c
|
||||||
+++ b/ArmPlatformPkg/PrePeiCore/MainMPCore.c
|
+++ b/ArmPlatformPkg/PrePeiCore/MainMPCore.c
|
||||||
@@ -117,6 +117,11 @@ PrimaryMain (
|
@@ -117,6 +117,11 @@ PrimaryMain (
|
||||||
|
@ -50,7 +51,7 @@ index dc47adb..cbd7223 100644
|
||||||
|
|
||||||
// Enable the GIC Distributor
|
// Enable the GIC Distributor
|
||||||
diff --git a/ArmPlatformPkg/PrePeiCore/MainUniCore.c b/ArmPlatformPkg/PrePeiCore/MainUniCore.c
|
diff --git a/ArmPlatformPkg/PrePeiCore/MainUniCore.c b/ArmPlatformPkg/PrePeiCore/MainUniCore.c
|
||||||
index 134a469..af39fc0 100644
|
index 134a469427..af39fc017c 100644
|
||||||
--- a/ArmPlatformPkg/PrePeiCore/MainUniCore.c
|
--- a/ArmPlatformPkg/PrePeiCore/MainUniCore.c
|
||||||
+++ b/ArmPlatformPkg/PrePeiCore/MainUniCore.c
|
+++ b/ArmPlatformPkg/PrePeiCore/MainUniCore.c
|
||||||
@@ -35,6 +35,11 @@ PrimaryMain (
|
@@ -35,6 +35,11 @@ PrimaryMain (
|
||||||
|
@ -66,7 +67,7 @@ index 134a469..af39fc0 100644
|
||||||
|
|
||||||
// Adjust the Temporary Ram as the new Ppi List (Common + Platform Ppi Lists) is created at
|
// Adjust the Temporary Ram as the new Ppi List (Common + Platform Ppi Lists) is created at
|
||||||
diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCore.h b/ArmPlatformPkg/PrePeiCore/PrePeiCore.h
|
diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCore.h b/ArmPlatformPkg/PrePeiCore/PrePeiCore.h
|
||||||
index 1608946..bf843d7 100644
|
index 160894620c..bf843d7768 100644
|
||||||
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCore.h
|
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCore.h
|
||||||
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCore.h
|
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCore.h
|
||||||
@@ -21,6 +21,7 @@
|
@@ -21,6 +21,7 @@
|
||||||
|
@ -78,7 +79,7 @@ index 1608946..bf843d7 100644
|
||||||
#include <PiPei.h>
|
#include <PiPei.h>
|
||||||
#include <Ppi/TemporaryRamSupport.h>
|
#include <Ppi/TemporaryRamSupport.h>
|
||||||
diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
|
diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
|
||||||
index ecdbccb..dd3447c 100644
|
index e3a31fa7c6..1bc0c45420 100644
|
||||||
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
|
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
|
||||||
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
|
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
|
||||||
@@ -72,6 +72,8 @@
|
@@ -72,6 +72,8 @@
|
||||||
|
@ -91,15 +92,12 @@ index ecdbccb..dd3447c 100644
|
||||||
gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase
|
gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase
|
||||||
gArmTokenSpaceGuid.PcdGicSgiIntId
|
gArmTokenSpaceGuid.PcdGicSgiIntId
|
||||||
diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
|
diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
|
||||||
index b5d4e38..fdbdc82 100644
|
index ec83cec2d8..20698fcfac 100644
|
||||||
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
|
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
|
||||||
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
|
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
|
||||||
@@ -69,3 +69,5 @@
|
@@ -71,3 +71,5 @@
|
||||||
gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase
|
|
||||||
gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize
|
|
||||||
gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize
|
gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize
|
||||||
|
|
||||||
|
gEfiMdeModulePkgTokenSpaceGuid.PcdInitValueInTempStack
|
||||||
+
|
+
|
||||||
+ gArmPlatformTokenSpaceGuid.PcdEarlyHelloMessage
|
+ gArmPlatformTokenSpaceGuid.PcdEarlyHelloMessage
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From ce3f59d0710c24c162d5222bbf5cd7e36180c80c Mon Sep 17 00:00:00 2001
|
From e777f7d03c8a8d56e08926ecf0b17e1338837093 Mon Sep 17 00:00:00 2001
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
Date: Wed, 14 Oct 2015 14:07:17 +0200
|
Date: Wed, 14 Oct 2015 14:07:17 +0200
|
||||||
Subject: ArmVirtPkg: set early hello message (RH only)
|
Subject: [PATCH] ArmVirtPkg: set early hello message (RH only)
|
||||||
|
|
||||||
Print a friendly banner on QEMU, regardless of debug mask settings.
|
Print a friendly banner on QEMU, regardless of debug mask settings.
|
||||||
|
|
||||||
|
@ -21,15 +21,16 @@ Contributed-under: TianoCore Contribution Agreement 1.0
|
||||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
(cherry picked from commit 5d4a15b9019728b2d96322bc679099da49916925)
|
(cherry picked from commit 5d4a15b9019728b2d96322bc679099da49916925)
|
||||||
(cherry picked from commit 179df76dbb0d199bd905236e98775b4059c6502a)
|
(cherry picked from commit 179df76dbb0d199bd905236e98775b4059c6502a)
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
---
|
---
|
||||||
ArmVirtPkg/ArmVirtQemu.dsc | 1 +
|
ArmVirtPkg/ArmVirtQemu.dsc | 1 +
|
||||||
1 file changed, 1 insertion(+)
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
|
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
|
||||||
index 2b1a383..ef6eaf1 100644
|
index 86d5d5a666..ffe4ba8092 100644
|
||||||
--- a/ArmVirtPkg/ArmVirtQemu.dsc
|
--- a/ArmVirtPkg/ArmVirtQemu.dsc
|
||||||
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
|
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
|
||||||
@@ -93,6 +93,7 @@
|
@@ -87,6 +87,7 @@
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE
|
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE
|
||||||
|
|
||||||
[PcdsFixedAtBuild.common]
|
[PcdsFixedAtBuild.common]
|
||||||
|
@ -37,6 +38,3 @@ index 2b1a383..ef6eaf1 100644
|
||||||
gArmPlatformTokenSpaceGuid.PcdCoreCount|1
|
gArmPlatformTokenSpaceGuid.PcdCoreCount|1
|
||||||
!if $(ARCH) == AARCH64
|
!if $(ARCH) == AARCH64
|
||||||
gArmTokenSpaceGuid.PcdVFPEnabled|1
|
gArmTokenSpaceGuid.PcdVFPEnabled|1
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
|
@ -0,0 +1,35 @@
|
||||||
|
From eebbf279b59afa3787d11734d9707cc7ab24d651 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
|
Date: Wed, 25 Jul 2018 22:27:53 +0200
|
||||||
|
Subject: [PATCH] BaseTools/footer.makefile: expand BUILD_CFLAGS last for C
|
||||||
|
files too
|
||||||
|
|
||||||
|
BUILD_CPPFLAGS should be expanded before BUILD_CFLAGS. (The rule for C++
|
||||||
|
source files already does this, with BUILD_CPPFLAGS and BUILD_CXXFLAGS.)
|
||||||
|
|
||||||
|
This patch doesn't change behavior.
|
||||||
|
|
||||||
|
Cc: Liming Gao <liming.gao@intel.com>
|
||||||
|
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
|
||||||
|
Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1540244
|
||||||
|
Contributed-under: TianoCore Contribution Agreement 1.1
|
||||||
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
|
Reviewed-by: Liming Gao <liming.gao@intel.com>
|
||||||
|
(cherry picked from commit 67983484a4430c5f82bb5f1397e010c759136321)
|
||||||
|
---
|
||||||
|
BaseTools/Source/C/Makefiles/footer.makefile | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/BaseTools/Source/C/Makefiles/footer.makefile b/BaseTools/Source/C/Makefiles/footer.makefile
|
||||||
|
index 0926aa9645..5bda9e4e36 100644
|
||||||
|
--- a/BaseTools/Source/C/Makefiles/footer.makefile
|
||||||
|
+++ b/BaseTools/Source/C/Makefiles/footer.makefile
|
||||||
|
@@ -24,7 +24,7 @@ $(LIBRARY): $(OBJECTS)
|
||||||
|
$(BUILD_AR) crs $@ $^
|
||||||
|
|
||||||
|
%.o : %.c
|
||||||
|
- $(BUILD_CC) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@
|
||||||
|
+ $(BUILD_CC) -c $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) $< -o $@
|
||||||
|
|
||||||
|
%.o : %.cpp
|
||||||
|
$(BUILD_CXX) -c $(BUILD_CPPFLAGS) $(BUILD_CXXFLAGS) $< -o $@
|
|
@ -0,0 +1,40 @@
|
||||||
|
From 0af592dfa9a6d1a3379db1331344f411f7774bea Mon Sep 17 00:00:00 2001
|
||||||
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
|
Date: Wed, 25 Jul 2018 22:40:09 +0200
|
||||||
|
Subject: [PATCH] BaseTools/header.makefile: remove "-c" from BUILD_CFLAGS
|
||||||
|
|
||||||
|
Option "-c" is a mode selection flag (choosing between compiling and
|
||||||
|
linking); it should not be in BUILD_CFLAGS, which applies only to
|
||||||
|
compiling anyway. The compilation rule for C source files, in
|
||||||
|
"footer.makefile", already includes "-c" -- currently we have double "-c"
|
||||||
|
options.
|
||||||
|
|
||||||
|
This patch doesn't change behavior.
|
||||||
|
|
||||||
|
Cc: Liming Gao <liming.gao@intel.com>
|
||||||
|
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
|
||||||
|
Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1540244
|
||||||
|
Contributed-under: TianoCore Contribution Agreement 1.1
|
||||||
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
|
Reviewed-by: Liming Gao <liming.gao@intel.com>
|
||||||
|
(cherry picked from commit 03252ae287c4a61983b3793ff71baeabe2ff3df7)
|
||||||
|
---
|
||||||
|
BaseTools/Source/C/Makefiles/header.makefile | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
|
||||||
|
index db436773cf..08421ba24c 100644
|
||||||
|
--- a/BaseTools/Source/C/Makefiles/header.makefile
|
||||||
|
+++ b/BaseTools/Source/C/Makefiles/header.makefile
|
||||||
|
@@ -71,9 +71,9 @@ INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKE
|
||||||
|
BUILD_CPPFLAGS = $(INCLUDE) -O2
|
||||||
|
ifeq ($(DARWIN),Darwin)
|
||||||
|
# assume clang or clang compatible flags on OS X
|
||||||
|
-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g
|
||||||
|
+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g
|
||||||
|
else
|
||||||
|
-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict -Wno-unused-result -nostdlib -c -g
|
||||||
|
+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict -Wno-unused-result -nostdlib -g
|
||||||
|
endif
|
||||||
|
BUILD_LFLAGS =
|
||||||
|
BUILD_CXXFLAGS = -Wno-unused-result
|
|
@ -0,0 +1,87 @@
|
||||||
|
From 67c8bbaf89bbb4015f0b915fed6fb2f35efd282f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
|
Date: Wed, 25 Jul 2018 22:59:57 +0200
|
||||||
|
Subject: [PATCH] BaseTools/Source/C: split "-O2" to BUILD_OPTFLAGS
|
||||||
|
|
||||||
|
The option "-O2" is not a preprocessor flag, but a code generation
|
||||||
|
(compilation) flag. Move it from BUILD_CPPFLAGS to BUILD_CFLAGS and
|
||||||
|
BUILD_CXXFLAGS.
|
||||||
|
|
||||||
|
Because "VfrCompile/GNUmakefile" uses "-O2" through BUILD_CPPFLAGS, and
|
||||||
|
because it doesn't use BUILD_CXXFLAGS, we have to introduce BUILD_OPTFLAGS
|
||||||
|
separately, so that "VfrCompile/GNUmakefile" can continue using just this
|
||||||
|
flag.
|
||||||
|
|
||||||
|
This patch doesn't change behavior.
|
||||||
|
|
||||||
|
Cc: Liming Gao <liming.gao@intel.com>
|
||||||
|
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
|
||||||
|
Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1540244
|
||||||
|
Contributed-under: TianoCore Contribution Agreement 1.1
|
||||||
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
|
Reviewed-by: Liming Gao <liming.gao@intel.com>
|
||||||
|
(cherry picked from commit b8a66170264395edeaa61e6d22930a58e576a685)
|
||||||
|
---
|
||||||
|
BaseTools/Source/C/Makefiles/header.makefile | 6 +++++-
|
||||||
|
BaseTools/Source/C/VfrCompile/GNUmakefile | 11 +++++++----
|
||||||
|
2 files changed, 12 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
|
||||||
|
index 08421ba24c..498c6cf48b 100644
|
||||||
|
--- a/BaseTools/Source/C/Makefiles/header.makefile
|
||||||
|
+++ b/BaseTools/Source/C/Makefiles/header.makefile
|
||||||
|
@@ -68,7 +68,8 @@ $(error Bad HOST_ARCH)
|
||||||
|
endif
|
||||||
|
|
||||||
|
INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE)
|
||||||
|
-BUILD_CPPFLAGS = $(INCLUDE) -O2
|
||||||
|
+BUILD_CPPFLAGS = $(INCLUDE)
|
||||||
|
+BUILD_OPTFLAGS = -O2
|
||||||
|
ifeq ($(DARWIN),Darwin)
|
||||||
|
# assume clang or clang compatible flags on OS X
|
||||||
|
BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g
|
||||||
|
@@ -91,6 +92,9 @@ ifeq ($(DARWIN),Darwin)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
+# keep BUILD_OPTFLAGS last
|
||||||
|
+BUILD_CFLAGS += $(BUILD_OPTFLAGS)
|
||||||
|
+BUILD_CXXFLAGS += $(BUILD_OPTFLAGS)
|
||||||
|
|
||||||
|
.PHONY: all
|
||||||
|
.PHONY: install
|
||||||
|
diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile b/BaseTools/Source/C/VfrCompile/GNUmakefile
|
||||||
|
index c4ec61aa6c..bbe562cbc5 100644
|
||||||
|
--- a/BaseTools/Source/C/VfrCompile/GNUmakefile
|
||||||
|
+++ b/BaseTools/Source/C/VfrCompile/GNUmakefile
|
||||||
|
@@ -25,6 +25,9 @@ OBJECTS = AParser.o DLexerBase.o ATokenBuffer.o EfiVfrParser.o VfrLexer.o VfrSyn
|
||||||
|
|
||||||
|
VFR_CPPFLAGS = -DPCCTS_USE_NAMESPACE_STD $(BUILD_CPPFLAGS)
|
||||||
|
|
||||||
|
+# keep BUILD_OPTFLAGS last
|
||||||
|
+VFR_CXXFLAGS = $(BUILD_OPTFLAGS)
|
||||||
|
+
|
||||||
|
LINKER = $(BUILD_CXX)
|
||||||
|
|
||||||
|
EXTRA_CLEAN_OBJECTS = EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h VfrLexer.cpp VfrLexer.h VfrSyntax.cpp tokens.h
|
||||||
|
@@ -58,16 +61,16 @@ Pccts/dlg/dlg:
|
||||||
|
BIN_DIR='.' $(MAKE) -C Pccts/dlg
|
||||||
|
|
||||||
|
ATokenBuffer.o: Pccts/h/ATokenBuffer.cpp
|
||||||
|
- $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@
|
||||||
|
+ $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $(VFR_CXXFLAGS) $? -o $@
|
||||||
|
|
||||||
|
DLexerBase.o: Pccts/h/DLexerBase.cpp
|
||||||
|
- $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@
|
||||||
|
+ $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $(VFR_CXXFLAGS) $? -o $@
|
||||||
|
|
||||||
|
AParser.o: Pccts/h/AParser.cpp
|
||||||
|
- $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@
|
||||||
|
+ $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $(VFR_CXXFLAGS) $? -o $@
|
||||||
|
|
||||||
|
VfrSyntax.o: VfrSyntax.cpp
|
||||||
|
- $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@
|
||||||
|
+ $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $(VFR_CXXFLAGS) $? -o $@
|
||||||
|
|
||||||
|
clean: localClean
|
||||||
|
|
|
@ -1,73 +0,0 @@
|
||||||
From: Ruiyu Ni <ruiyu.ni@intel.com>
|
|
||||||
Subject: [PATCH] MdeModulePkg/PciBus: Fix bug that PCI BUS claims too much resource
|
|
||||||
Date: Thu, 16 Nov 2017 18:15:14 +0100
|
|
||||||
|
|
||||||
The bug was caused by 728d74973c9262b6c7b7ef4be213223d55affec3
|
|
||||||
"MdeModulePkg/PciBus: Count multiple hotplug resource paddings".
|
|
||||||
|
|
||||||
The patch firstly updated the Bridge->Alignment to the maximum
|
|
||||||
alignment of all devices under the bridge, then aligned the
|
|
||||||
Bridge->Length to Bridge->Alignment.
|
|
||||||
It caused too much resources were claimed.
|
|
||||||
|
|
||||||
The new patch firstly aligns Bridge->Length to Bridge->Alignment,
|
|
||||||
then updates the Bridge->Alignment to the maximum alignment of all
|
|
||||||
devices under the bridge.
|
|
||||||
Because the step to update the Bridge->Alignment is to make sure
|
|
||||||
the resource allocated to the bus under the Bridge meets all
|
|
||||||
devices alignment. But the Bridge->Length doesn't have to align
|
|
||||||
to the maximum alignment.
|
|
||||||
|
|
||||||
Contributed-under: TianoCore Contribution Agreement 1.1
|
|
||||||
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
|
|
||||||
Reviewed-by: Eric Dong <eric.dong@intel.com>
|
|
||||||
(cherry picked from commit 6e3287442774c1a4bc83f127694700eeb07c18dc)
|
|
||||||
---
|
|
||||||
MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c | 24 ++++++++++----------
|
|
||||||
1 file changed, 12 insertions(+), 12 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
|
|
||||||
index 8dbe9a00380f..2f713fcee95e 100644
|
|
||||||
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
|
|
||||||
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciResourceSupport.c
|
|
||||||
@@ -389,18 +389,7 @@ CalculateResourceAperture (
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
- // Adjust the bridge's alignment to the MAX (first) alignment of all children.
|
|
||||||
- //
|
|
||||||
- CurrentLink = Bridge->ChildList.ForwardLink;
|
|
||||||
- if (CurrentLink != &Bridge->ChildList) {
|
|
||||||
- Node = RESOURCE_NODE_FROM_LINK (CurrentLink);
|
|
||||||
- if (Node->Alignment > Bridge->Alignment) {
|
|
||||||
- Bridge->Alignment = Node->Alignment;
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- //
|
|
||||||
- // At last, adjust the aperture with the bridge's alignment
|
|
||||||
+ // Adjust the aperture with the bridge's alignment
|
|
||||||
//
|
|
||||||
Aperture[PciResUsageTypical] = ALIGN_VALUE (Aperture[PciResUsageTypical], Bridge->Alignment + 1);
|
|
||||||
Aperture[PciResUsagePadding] = ALIGN_VALUE (Aperture[PciResUsagePadding], Bridge->Alignment + 1);
|
|
||||||
@@ -410,6 +399,17 @@ CalculateResourceAperture (
|
|
||||||
// Use the larger one between the padding resource and actual occupied resource.
|
|
||||||
//
|
|
||||||
Bridge->Length = MAX (Aperture[PciResUsageTypical], Aperture[PciResUsagePadding]);
|
|
||||||
+
|
|
||||||
+ //
|
|
||||||
+ // Adjust the bridge's alignment to the MAX (first) alignment of all children.
|
|
||||||
+ //
|
|
||||||
+ CurrentLink = Bridge->ChildList.ForwardLink;
|
|
||||||
+ if (CurrentLink != &Bridge->ChildList) {
|
|
||||||
+ Node = RESOURCE_NODE_FROM_LINK (CurrentLink);
|
|
||||||
+ if (Node->Alignment > Bridge->Alignment) {
|
|
||||||
+ Bridge->Alignment = Node->Alignment;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
--
|
|
||||||
2.14.1.3.gb7cf6e02401b
|
|
||||||
|
|
|
@ -0,0 +1,37 @@
|
||||||
|
From 26296351f9a6b6dad0604f8ed62ce5de0f41ac2c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
|
Date: Thu, 26 Jul 2018 00:04:26 +0200
|
||||||
|
Subject: [PATCH] BaseTools/Source/C: take EXTRA_OPTFLAGS from the caller
|
||||||
|
|
||||||
|
Allow the caller of the top-level makefile either to set EXTRA_OPTFLAGS in
|
||||||
|
the environment or to pass EXTRA_OPTFLAGS as a macro definition on the
|
||||||
|
command line. EXTRA_OPTFLAGS extends (and potentially overrides) default C
|
||||||
|
compilation flags set in the makefiles.
|
||||||
|
|
||||||
|
Cc: Liming Gao <liming.gao@intel.com>
|
||||||
|
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
|
||||||
|
Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1540244
|
||||||
|
Contributed-under: TianoCore Contribution Agreement 1.1
|
||||||
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
|
Reviewed-by: Liming Gao <liming.gao@intel.com>
|
||||||
|
(cherry picked from commit b0ca5dae78ff71397a8ef568f1914da7668ff5a9)
|
||||||
|
---
|
||||||
|
BaseTools/Source/C/Makefiles/header.makefile | 5 ++++-
|
||||||
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
|
||||||
|
index 498c6cf48b..1b4cad5497 100644
|
||||||
|
--- a/BaseTools/Source/C/Makefiles/header.makefile
|
||||||
|
+++ b/BaseTools/Source/C/Makefiles/header.makefile
|
||||||
|
@@ -69,7 +69,10 @@ endif
|
||||||
|
|
||||||
|
INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE)
|
||||||
|
BUILD_CPPFLAGS = $(INCLUDE)
|
||||||
|
-BUILD_OPTFLAGS = -O2
|
||||||
|
+
|
||||||
|
+# keep EXTRA_OPTFLAGS last
|
||||||
|
+BUILD_OPTFLAGS = -O2 $(EXTRA_OPTFLAGS)
|
||||||
|
+
|
||||||
|
ifeq ($(DARWIN),Darwin)
|
||||||
|
# assume clang or clang compatible flags on OS X
|
||||||
|
BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g
|
|
@ -1,34 +0,0 @@
|
||||||
From: Ruiyu Ni <ruiyu.ni@intel.com>
|
|
||||||
Subject: [PATCH] MdeModulePkg/Bds: Remove assertion in BmCharToUint
|
|
||||||
Date: Thu, 16 Nov 2017 18:04:42 +0100
|
|
||||||
|
|
||||||
BmCharToUint() could be called using external data and it
|
|
||||||
already contains logic to return -1 when data is invalid,
|
|
||||||
so removing unnecessary assertion to avoid system hang.
|
|
||||||
|
|
||||||
Contributed-under: TianoCore Contribution Agreement 1.1
|
|
||||||
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
|
|
||||||
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
|
||||||
Reviewed-by: Star Zeng <star.zeng@intel.com>
|
|
||||||
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
|
||||||
(cherry picked from commit 618ef6f9bae14e1543d61993ab7ab8992063e4cc)
|
|
||||||
---
|
|
||||||
MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c | 1 -
|
|
||||||
1 file changed, 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c b/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c
|
|
||||||
index 11ab86792a52..a3fa25424592 100644
|
|
||||||
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c
|
|
||||||
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmMisc.c
|
|
||||||
@@ -420,7 +420,6 @@ BmCharToUint (
|
|
||||||
return (Char - L'A' + 0xA);
|
|
||||||
}
|
|
||||||
|
|
||||||
- ASSERT (FALSE);
|
|
||||||
return (UINTN) -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
2.14.1.3.gb7cf6e02401b
|
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,35 @@
|
||||||
|
From c1a087a76d91665433f190d0468be2b33da443cd Mon Sep 17 00:00:00 2001
|
||||||
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
|
Date: Thu, 26 Jul 2018 01:24:40 +0200
|
||||||
|
Subject: [PATCH] BaseTools/Source/C: take EXTRA_LDFLAGS from the caller
|
||||||
|
|
||||||
|
Allow the caller of the top-level makefile either to set EXTRA_LDFLAGS in
|
||||||
|
the environment or to pass EXTRA_LDFLAGS as a macro definition on the
|
||||||
|
command line. EXTRA_LDFLAGS extends (and potentially overrides) default
|
||||||
|
link-editing flags set in the makefiles.
|
||||||
|
|
||||||
|
Cc: Liming Gao <liming.gao@intel.com>
|
||||||
|
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
|
||||||
|
Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1540244
|
||||||
|
Contributed-under: TianoCore Contribution Agreement 1.1
|
||||||
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
|
Reviewed-by: Liming Gao <liming.gao@intel.com>
|
||||||
|
(cherry picked from commit 81502cee20ac4046f08bb4aec754c7091c8808dc)
|
||||||
|
---
|
||||||
|
BaseTools/Source/C/Makefiles/header.makefile | 3 +++
|
||||||
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
|
||||||
|
index 1b4cad5497..7f283d6464 100644
|
||||||
|
--- a/BaseTools/Source/C/Makefiles/header.makefile
|
||||||
|
+++ b/BaseTools/Source/C/Makefiles/header.makefile
|
||||||
|
@@ -99,6 +99,9 @@ endif
|
||||||
|
BUILD_CFLAGS += $(BUILD_OPTFLAGS)
|
||||||
|
BUILD_CXXFLAGS += $(BUILD_OPTFLAGS)
|
||||||
|
|
||||||
|
+# keep EXTRA_LDFLAGS last
|
||||||
|
+BUILD_LFLAGS += $(EXTRA_LDFLAGS)
|
||||||
|
+
|
||||||
|
.PHONY: all
|
||||||
|
.PHONY: install
|
||||||
|
.PHONY: clean
|
|
@ -1,105 +0,0 @@
|
||||||
From: Ruiyu Ni <ruiyu.ni@intel.com>
|
|
||||||
Subject: [PATCH] MdeModulePkg/Bds: Check variable name even *if* OptionNumber is NULL
|
|
||||||
Date: Thu, 16 Nov 2017 18:04:43 +0100
|
|
||||||
|
|
||||||
Current implementation skips to check whether the last four
|
|
||||||
characters are digits when the OptionNumber is NULL.
|
|
||||||
Even worse, it may incorrectly return FALSE when OptionNumber is
|
|
||||||
NULL.
|
|
||||||
|
|
||||||
The patch fixes it to always check the variable name even
|
|
||||||
OptionNumber is NULL.
|
|
||||||
|
|
||||||
Contributed-under: TianoCore Contribution Agreement 1.1
|
|
||||||
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
|
|
||||||
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
|
||||||
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
|
||||||
(cherry picked from commit 5e6e2dcc380dcd841f6f979fea8c302c80a87ec3)
|
|
||||||
---
|
|
||||||
MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c | 45 +++++++++++++-------
|
|
||||||
1 file changed, 30 insertions(+), 15 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c
|
|
||||||
index b0a35058d02b..32918caf324c 100644
|
|
||||||
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c
|
|
||||||
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c
|
|
||||||
@@ -785,6 +785,8 @@ EfiBootManagerIsValidLoadOptionVariableName (
|
|
||||||
UINTN VariableNameLen;
|
|
||||||
UINTN Index;
|
|
||||||
UINTN Uint;
|
|
||||||
+ EFI_BOOT_MANAGER_LOAD_OPTION_TYPE LocalOptionType;
|
|
||||||
+ UINT16 LocalOptionNumber;
|
|
||||||
|
|
||||||
if (VariableName == NULL) {
|
|
||||||
return FALSE;
|
|
||||||
@@ -792,39 +794,52 @@ EfiBootManagerIsValidLoadOptionVariableName (
|
|
||||||
|
|
||||||
VariableNameLen = StrLen (VariableName);
|
|
||||||
|
|
||||||
+ //
|
|
||||||
+ // Return FALSE when the variable name length is too small.
|
|
||||||
+ //
|
|
||||||
if (VariableNameLen <= 4) {
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
- for (Index = 0; Index < ARRAY_SIZE (mBmLoadOptionName); Index++) {
|
|
||||||
- if ((VariableNameLen - 4 == StrLen (mBmLoadOptionName[Index])) &&
|
|
||||||
- (StrnCmp (VariableName, mBmLoadOptionName[Index], VariableNameLen - 4) == 0)
|
|
||||||
+ //
|
|
||||||
+ // Return FALSE when the variable name doesn't start with Driver/SysPrep/Boot/PlatformRecovery.
|
|
||||||
+ //
|
|
||||||
+ for (LocalOptionType = 0; LocalOptionType < ARRAY_SIZE (mBmLoadOptionName); LocalOptionType++) {
|
|
||||||
+ if ((VariableNameLen - 4 == StrLen (mBmLoadOptionName[LocalOptionType])) &&
|
|
||||||
+ (StrnCmp (VariableName, mBmLoadOptionName[LocalOptionType], VariableNameLen - 4) == 0)
|
|
||||||
) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+ if (LocalOptionType == ARRAY_SIZE (mBmLoadOptionName)) {
|
|
||||||
+ return FALSE;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- if (Index == ARRAY_SIZE (mBmLoadOptionName)) {
|
|
||||||
+ //
|
|
||||||
+ // Return FALSE when the last four characters are not hex digits.
|
|
||||||
+ //
|
|
||||||
+ LocalOptionNumber = 0;
|
|
||||||
+ for (Index = VariableNameLen - 4; Index < VariableNameLen; Index++) {
|
|
||||||
+ Uint = BmCharToUint (VariableName[Index]);
|
|
||||||
+ if (Uint == -1) {
|
|
||||||
+ break;
|
|
||||||
+ } else {
|
|
||||||
+ LocalOptionNumber = (UINT16) Uint + LocalOptionNumber * 0x10;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ if (Index != VariableNameLen) {
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (OptionType != NULL) {
|
|
||||||
- *OptionType = (EFI_BOOT_MANAGER_LOAD_OPTION_TYPE) Index;
|
|
||||||
+ *OptionType = LocalOptionType;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (OptionNumber != NULL) {
|
|
||||||
- *OptionNumber = 0;
|
|
||||||
- for (Index = VariableNameLen - 4; Index < VariableNameLen; Index++) {
|
|
||||||
- Uint = BmCharToUint (VariableName[Index]);
|
|
||||||
- if (Uint == -1) {
|
|
||||||
- break;
|
|
||||||
- } else {
|
|
||||||
- *OptionNumber = (UINT16) Uint + *OptionNumber * 0x10;
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
+ *OptionNumber = LocalOptionNumber;
|
|
||||||
}
|
|
||||||
|
|
||||||
- return (BOOLEAN) (Index == VariableNameLen);
|
|
||||||
+ return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
--
|
|
||||||
2.14.1.3.gb7cf6e02401b
|
|
||||||
|
|
|
@ -0,0 +1,69 @@
|
||||||
|
From d30cba687d657a68bf83b8dd54db63b3e2e6cb54 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
|
Date: Thu, 16 Aug 2018 19:38:02 -0700
|
||||||
|
Subject: [PATCH] BaseTools/VfrCompile: honor EXTRA_LDFLAGS
|
||||||
|
|
||||||
|
In commit 81502cee20ac ("BaseTools/Source/C: take EXTRA_LDFLAGS from the
|
||||||
|
caller", 2018-08-16), I missed that "VfrCompile/GNUmakefile" does not use
|
||||||
|
BUILD_LFLAGS in the APPLICATION linking rule, unlike "app.makefile" does.
|
||||||
|
Instead, "VfrCompile/GNUmakefile" uses the (undefined) LFLAGS macro.
|
||||||
|
Therefore commit 81502cee20ac did not cover the linking step of
|
||||||
|
VfrCompile.
|
||||||
|
|
||||||
|
Thankfully, the structure of the linking rules is the same, between
|
||||||
|
"app.makefile" and "VfrCompile/GNUmakefile". Rename the undefined LFLAGS
|
||||||
|
macro in "VfrCompile/GNUmakefile" to VFR_LFLAGS (for consistency with
|
||||||
|
VFR_CXXFLAGS), and set it to EXTRA_LDFLAGS.
|
||||||
|
|
||||||
|
As a result, we have:
|
||||||
|
|
||||||
|
| compilation | linking
|
||||||
|
-----------+--------------------------------+----------------------
|
||||||
|
VfrCompile | VFR_CXXFLAGS = | VFR_LFLAGS =
|
||||||
|
| BUILD_OPTFLAGS = | EXTRA_LDFLAGS
|
||||||
|
| '-O2' + EXTRA_OPTFLAGS |
|
||||||
|
-----------+--------------------------------+----------------------
|
||||||
|
other apps | BUILD_CFLAGS/BUILD_CXXFLAGS = | BUILD_LFLAGS =
|
||||||
|
| [...] + BUILD_OPTFLAGS = | [...] + EXTRA_LDFLAGS
|
||||||
|
| [...] + '-O2' + EXTRA_OPTFLAGS |
|
||||||
|
|
||||||
|
This table shows
|
||||||
|
- that the VfrCompile compilation and linking flags are always a subset of
|
||||||
|
the corresponding flags used by the other apps,
|
||||||
|
- and that the EXTRA flags are always at the end.
|
||||||
|
|
||||||
|
Cc: Liming Gao <liming.gao@intel.com>
|
||||||
|
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
|
||||||
|
Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1540244
|
||||||
|
Fixes: 81502cee20ac4046f08bb4aec754c7091c8808dc
|
||||||
|
Contributed-under: TianoCore Contribution Agreement 1.1
|
||||||
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
|
Reviewed-by: Liming Gao <liming.gao@intel.com>
|
||||||
|
(cherry picked from commit aa4e0df1f0c7ffdff07d7e382c9da89cbe207cdb)
|
||||||
|
---
|
||||||
|
BaseTools/Source/C/VfrCompile/GNUmakefile | 5 ++++-
|
||||||
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile b/BaseTools/Source/C/VfrCompile/GNUmakefile
|
||||||
|
index bbe562cbc5..9273589ff8 100644
|
||||||
|
--- a/BaseTools/Source/C/VfrCompile/GNUmakefile
|
||||||
|
+++ b/BaseTools/Source/C/VfrCompile/GNUmakefile
|
||||||
|
@@ -28,6 +28,9 @@ VFR_CPPFLAGS = -DPCCTS_USE_NAMESPACE_STD $(BUILD_CPPFLAGS)
|
||||||
|
# keep BUILD_OPTFLAGS last
|
||||||
|
VFR_CXXFLAGS = $(BUILD_OPTFLAGS)
|
||||||
|
|
||||||
|
+# keep EXTRA_LDFLAGS last
|
||||||
|
+VFR_LFLAGS = $(EXTRA_LDFLAGS)
|
||||||
|
+
|
||||||
|
LINKER = $(BUILD_CXX)
|
||||||
|
|
||||||
|
EXTRA_CLEAN_OBJECTS = EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h VfrLexer.cpp VfrLexer.h VfrSyntax.cpp tokens.h
|
||||||
|
@@ -42,7 +45,7 @@ APPLICATION = $(MAKEROOT)/bin/$(APPNAME)
|
||||||
|
all: $(MAKEROOT)/bin $(APPLICATION)
|
||||||
|
|
||||||
|
$(APPLICATION): $(OBJECTS)
|
||||||
|
- $(LINKER) -o $(APPLICATION) $(LFLAGS) $(OBJECTS) -L$(MAKEROOT)/libs $(LIBS)
|
||||||
|
+ $(LINKER) -o $(APPLICATION) $(VFR_LFLAGS) $(OBJECTS) -L$(MAKEROOT)/libs $(LIBS)
|
||||||
|
|
||||||
|
VfrCompiler.o: ../Include/Common/BuildVersion.h
|
||||||
|
|
|
@ -1,50 +0,0 @@
|
||||||
From d9edd0b560db7d32b8b93e82d7051d5cf58e9744 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
||||||
Date: Thu, 16 Nov 2017 20:52:57 +0100
|
|
||||||
Subject: [PATCH 1/3] OvmfPkg: make it a proper BASE library
|
|
||||||
|
|
||||||
Remove Uefi.h, which includes UefiSpec.h, and change the
|
|
||||||
return value to match RETURN_STATUS.
|
|
||||||
|
|
||||||
Contributed-under: TianoCore Contribution Agreement 1.1
|
|
||||||
Cc: Laszlo Ersek <lersek@redhat.com>
|
|
||||||
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
|
||||||
Cc: Jordan Justen (Intel address) <jordan.l.justen@intel.com>
|
|
||||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
||||||
---
|
|
||||||
OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c | 5 ++---
|
|
||||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
|
||||||
index 5435767c1c..74f4d9c2d6 100644
|
|
||||||
--- a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
|
||||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
|
||||||
@@ -15,7 +15,6 @@
|
|
||||||
**/
|
|
||||||
|
|
||||||
#include <Base.h>
|
|
||||||
-#include <Uefi.h>
|
|
||||||
#include <Library/DebugLib.h>
|
|
||||||
#include <Library/BaseLib.h>
|
|
||||||
#include <Library/IoLib.h>
|
|
||||||
@@ -32,7 +31,7 @@
|
|
||||||
/**
|
|
||||||
This constructor function does not have to do anything.
|
|
||||||
|
|
||||||
- @retval EFI_SUCCESS The constructor always returns RETURN_SUCCESS.
|
|
||||||
+ @retval RETURN_SUCCESS The constructor always returns RETURN_SUCCESS.
|
|
||||||
|
|
||||||
**/
|
|
||||||
RETURN_STATUS
|
|
||||||
@@ -41,7 +40,7 @@ PlatformDebugLibIoPortConstructor (
|
|
||||||
VOID
|
|
||||||
)
|
|
||||||
{
|
|
||||||
- return EFI_SUCCESS;
|
|
||||||
+ return RETURN_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
--
|
|
||||||
2.14.3
|
|
||||||
|
|
|
@ -0,0 +1,73 @@
|
||||||
|
From cde5a72d365eff5b02b8330fef1c8d36fced08eb Mon Sep 17 00:00:00 2001
|
||||||
|
From: "edk2-devel-bounces@lists.01.org" <edk2-devel-bounces@lists.01.org>
|
||||||
|
Date: Fri, 14 Sep 2018 16:24:15 +0800
|
||||||
|
Subject: [PATCH] NetworkPkg: UefiPxeBcDxe: Add EXCLUSIVE attribute when
|
||||||
|
opening SNP protocol installed by PXE.
|
||||||
|
|
||||||
|
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1152
|
||||||
|
|
||||||
|
v2: Sync the same logic to Ipv6 and update code comments.
|
||||||
|
|
||||||
|
The PXE driver installs a SNP and open this SNP with attribute BY_DRIVER
|
||||||
|
to avoid it being opened by MNP driver, this SNP is also expected not to
|
||||||
|
be opened by other drivers with EXCLUSIVE attribute. In some cases, other
|
||||||
|
drivers may happen to do this by error, and thus cause a system crash.
|
||||||
|
This patch adds EXCLUSIVE attribute when opening SNP in PXE driver, and
|
||||||
|
will reject all OpenProtocol requests by EXCLUSIVE.
|
||||||
|
|
||||||
|
Cc: Subramanian, Sriram <sriram-s@hpe.com>
|
||||||
|
Cc: Ye Ting <ting.ye@intel.com>
|
||||||
|
Cc: Fu Siyuan <siyuan.fu@intel.com>
|
||||||
|
Cc: Wu Jiaxin <jiaxin.wu@intel.com>
|
||||||
|
Contributed-under: TianoCore Contribution Agreement 1.1
|
||||||
|
Signed-off-by: Wang Fan <fan.wang@intel.com>
|
||||||
|
Reviewed-by: Sriram Subramanian <sriram-s@hpe.com>
|
||||||
|
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
|
||||||
|
Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>
|
||||||
|
---
|
||||||
|
NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c | 8 ++++----
|
||||||
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c b/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
|
||||||
|
index bc9dc914f3..0ab640beca 100644
|
||||||
|
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
|
||||||
|
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
|
||||||
|
@@ -814,7 +814,7 @@ PxeBcCreateIp4Children (
|
||||||
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
- // Open SNP on the child handle BY_DRIVER. It will prevent any additionally
|
||||||
|
+ // Open SNP on the child handle BY_DRIVER|EXCLUSIVE. It will prevent any additionally
|
||||||
|
// layering to perform the experiment.
|
||||||
|
//
|
||||||
|
Status = gBS->OpenProtocol (
|
||||||
|
@@ -823,7 +823,7 @@ PxeBcCreateIp4Children (
|
||||||
|
(VOID **) &Snp,
|
||||||
|
This->DriverBindingHandle,
|
||||||
|
Private->Ip4Nic->Controller,
|
||||||
|
- EFI_OPEN_PROTOCOL_BY_DRIVER
|
||||||
|
+ EFI_OPEN_PROTOCOL_BY_DRIVER|EFI_OPEN_PROTOCOL_EXCLUSIVE
|
||||||
|
);
|
||||||
|
if (EFI_ERROR (Status)) {
|
||||||
|
goto ON_ERROR;
|
||||||
|
@@ -1157,7 +1157,7 @@ PxeBcCreateIp6Children (
|
||||||
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
- // Open SNP on the child handle BY_DRIVER. It will prevent any additionally
|
||||||
|
+ // Open SNP on the child handle BY_DRIVER|EXCLUSIVE. It will prevent any additionally
|
||||||
|
// layering to perform the experiment.
|
||||||
|
//
|
||||||
|
Status = gBS->OpenProtocol (
|
||||||
|
@@ -1166,7 +1166,7 @@ PxeBcCreateIp6Children (
|
||||||
|
(VOID **) &Snp,
|
||||||
|
This->DriverBindingHandle,
|
||||||
|
Private->Ip6Nic->Controller,
|
||||||
|
- EFI_OPEN_PROTOCOL_BY_DRIVER
|
||||||
|
+ EFI_OPEN_PROTOCOL_BY_DRIVER|EFI_OPEN_PROTOCOL_EXCLUSIVE
|
||||||
|
);
|
||||||
|
if (EFI_ERROR (Status)) {
|
||||||
|
goto ON_ERROR;
|
||||||
|
--
|
||||||
|
2.17.1
|
||||||
|
|
|
@ -1,254 +0,0 @@
|
||||||
From ba774b89b5a206c71a2ce0db8184747fac0f6af7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
||||||
Date: Thu, 16 Nov 2017 10:33:29 +0100
|
|
||||||
Subject: [PATCH 2/3] OvmfPkg: create a separate PlatformDebugLibIoPort
|
|
||||||
instance for SEC
|
|
||||||
|
|
||||||
The next patch will want to add a global variable to
|
|
||||||
PlatformDebugLibIoPort, but this is not suitable for the SEC
|
|
||||||
phase, because SEC runs from read-only flash. The solution is
|
|
||||||
to have two library instances, one for SEC and another
|
|
||||||
for all other firmware phases. This patch adds the "plumbing"
|
|
||||||
for the SEC library instance, separating the INF files and
|
|
||||||
moving the constructor to a separate C source file.
|
|
||||||
|
|
||||||
Contributed-under: TianoCore Contribution Agreement 1.1
|
|
||||||
Cc: Laszlo Ersek <lersek@redhat.com>
|
|
||||||
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
|
||||||
Cc: Jordan Justen (Intel address) <jordan.l.justen@intel.com>
|
|
||||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
||||||
---
|
|
||||||
OvmfPkg/OvmfPkgIa32.dsc | 2 +-
|
|
||||||
OvmfPkg/OvmfPkgIa32X64.dsc | 2 +-
|
|
||||||
OvmfPkg/OvmfPkgX64.dsc | 2 +-
|
|
||||||
.../PlatformDebugLibIoPort.inf | 3 +-
|
|
||||||
.../PlatformRomDebugLibIoPort.inf | 52 ++++++++++++++++++++++
|
|
||||||
OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c | 15 -------
|
|
||||||
.../PlatformDebugLibIoPort/DebugLibDetect.c | 31 +++++++++++++
|
|
||||||
.../PlatformDebugLibIoPort/DebugLibDetectRom.c | 31 +++++++++++++
|
|
||||||
8 files changed, 119 insertions(+), 19 deletions(-)
|
|
||||||
create mode 100644 OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
|
||||||
create mode 100644 OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.c
|
|
||||||
create mode 100644 OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetectRom.c
|
|
||||||
|
|
||||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
|
||||||
index c2f534fdbf..7ccb61147f 100644
|
|
||||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
|
||||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
|
||||||
@@ -207,7 +207,7 @@ [LibraryClasses.common.SEC]
|
|
||||||
!ifdef $(DEBUG_ON_SERIAL_PORT)
|
|
||||||
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
|
|
||||||
!else
|
|
||||||
- DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
|
||||||
+ DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
|
||||||
!endif
|
|
||||||
ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
|
|
||||||
ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf
|
|
||||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
||||||
index 9f300a2e6f..237ec71b5e 100644
|
|
||||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
||||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
||||||
@@ -212,7 +212,7 @@ [LibraryClasses.common.SEC]
|
|
||||||
!ifdef $(DEBUG_ON_SERIAL_PORT)
|
|
||||||
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
|
|
||||||
!else
|
|
||||||
- DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
|
||||||
+ DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
|
||||||
!endif
|
|
||||||
ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
|
|
||||||
ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf
|
|
||||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
|
||||||
index 1ffcf37f8b..a5047fa38e 100644
|
|
||||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
|
||||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
|
||||||
@@ -212,7 +212,7 @@ [LibraryClasses.common.SEC]
|
|
||||||
!ifdef $(DEBUG_ON_SERIAL_PORT)
|
|
||||||
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
|
|
||||||
!else
|
|
||||||
- DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
|
||||||
+ DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
|
||||||
!endif
|
|
||||||
ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
|
|
||||||
ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf
|
|
||||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf b/OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
|
||||||
index 0e74fe94cb..de3c2f542b 100644
|
|
||||||
--- a/OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
|
||||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf
|
|
||||||
@@ -21,7 +21,7 @@ [Defines]
|
|
||||||
FILE_GUID = DF934DA3-CD31-49FE-AF50-B3C87C79325F
|
|
||||||
MODULE_TYPE = BASE
|
|
||||||
VERSION_STRING = 1.0
|
|
||||||
- LIBRARY_CLASS = DebugLib
|
|
||||||
+ LIBRARY_CLASS = DebugLib|PEI_CORE PEIM DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER SMM_CORE DXE_SMM_DRIVER UEFI_DRIVER UEFI_APPLICATION
|
|
||||||
CONSTRUCTOR = PlatformDebugLibIoPortConstructor
|
|
||||||
|
|
||||||
#
|
|
||||||
@@ -30,6 +30,7 @@ [Defines]
|
|
||||||
|
|
||||||
[Sources]
|
|
||||||
DebugLib.c
|
|
||||||
+ DebugLibDetect.c
|
|
||||||
|
|
||||||
[Packages]
|
|
||||||
MdePkg/MdePkg.dec
|
|
||||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf b/OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..491c0318de
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf
|
|
||||||
@@ -0,0 +1,52 @@
|
|
||||||
+## @file
|
|
||||||
+# Instance of Debug Library for the QEMU debug console port.
|
|
||||||
+# It uses Print Library to produce formatted output strings.
|
|
||||||
+#
|
|
||||||
+# Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
|
|
||||||
+# Copyright (c) 2017, Red Hat, Inc.<BR>
|
|
||||||
+#
|
|
||||||
+# This program and the accompanying materials
|
|
||||||
+# are licensed and made available under the terms and conditions of the BSD License
|
|
||||||
+# which accompanies this distribution. The full text of the license may be found at
|
|
||||||
+# http://opensource.org/licenses/bsd-license.php.
|
|
||||||
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
|
||||||
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|
||||||
+#
|
|
||||||
+#
|
|
||||||
+##
|
|
||||||
+
|
|
||||||
+[Defines]
|
|
||||||
+ INF_VERSION = 0x00010005
|
|
||||||
+ BASE_NAME = PlatformRomDebugLibIoPort
|
|
||||||
+ FILE_GUID = CEB0D9D3-328F-4C24-8C02-28FA1986AE1B
|
|
||||||
+ MODULE_TYPE = BASE
|
|
||||||
+ VERSION_STRING = 1.0
|
|
||||||
+ LIBRARY_CLASS = DebugLib|SEC
|
|
||||||
+ CONSTRUCTOR = PlatformRomDebugLibIoPortConstructor
|
|
||||||
+
|
|
||||||
+#
|
|
||||||
+# VALID_ARCHITECTURES = IA32 X64 IPF EBC
|
|
||||||
+#
|
|
||||||
+
|
|
||||||
+[Sources]
|
|
||||||
+ DebugLib.c
|
|
||||||
+ DebugLibDetectRom.c
|
|
||||||
+
|
|
||||||
+[Packages]
|
|
||||||
+ MdePkg/MdePkg.dec
|
|
||||||
+ OvmfPkg/OvmfPkg.dec
|
|
||||||
+
|
|
||||||
+[LibraryClasses]
|
|
||||||
+ BaseMemoryLib
|
|
||||||
+ IoLib
|
|
||||||
+ PcdLib
|
|
||||||
+ PrintLib
|
|
||||||
+ BaseLib
|
|
||||||
+ DebugPrintErrorLevelLib
|
|
||||||
+
|
|
||||||
+[Pcd]
|
|
||||||
+ gUefiOvmfPkgTokenSpaceGuid.PcdDebugIoPort ## CONSUMES
|
|
||||||
+ gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue ## CONSUMES
|
|
||||||
+ gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask ## CONSUMES
|
|
||||||
+ gEfiMdePkgTokenSpaceGuid.PcdFixedDebugPrintErrorLevel ## CONSUMES
|
|
||||||
+
|
|
||||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
|
||||||
index 74f4d9c2d6..5a1c86f2c3 100644
|
|
||||||
--- a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
|
||||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
|
||||||
@@ -28,21 +28,6 @@
|
|
||||||
//
|
|
||||||
#define MAX_DEBUG_MESSAGE_LENGTH 0x200
|
|
||||||
|
|
||||||
-/**
|
|
||||||
- This constructor function does not have to do anything.
|
|
||||||
-
|
|
||||||
- @retval RETURN_SUCCESS The constructor always returns RETURN_SUCCESS.
|
|
||||||
-
|
|
||||||
-**/
|
|
||||||
-RETURN_STATUS
|
|
||||||
-EFIAPI
|
|
||||||
-PlatformDebugLibIoPortConstructor (
|
|
||||||
- VOID
|
|
||||||
- )
|
|
||||||
-{
|
|
||||||
- return RETURN_SUCCESS;
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
/**
|
|
||||||
Prints a debug message to the debug output device if the specified error level is enabled.
|
|
||||||
|
|
||||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.c b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.c
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..bad054f286
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.c
|
|
||||||
@@ -0,0 +1,31 @@
|
|
||||||
+/** @file
|
|
||||||
+ Constructor code for QEMU debug port library.
|
|
||||||
+ Non-SEC instance.
|
|
||||||
+
|
|
||||||
+ Copyright (c) 2017, Red Hat, Inc.<BR>
|
|
||||||
+ This program and the accompanying materials
|
|
||||||
+ are licensed and made available under the terms and conditions of the BSD License
|
|
||||||
+ which accompanies this distribution. The full text of the license may be found at
|
|
||||||
+ http://opensource.org/licenses/bsd-license.php.
|
|
||||||
+
|
|
||||||
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
|
||||||
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|
||||||
+
|
|
||||||
+**/
|
|
||||||
+
|
|
||||||
+#include <Base.h>
|
|
||||||
+
|
|
||||||
+/**
|
|
||||||
+ This constructor function does not have anything to do.
|
|
||||||
+
|
|
||||||
+ @retval RETURN_SUCCESS The constructor always returns RETURN_SUCCESS.
|
|
||||||
+
|
|
||||||
+**/
|
|
||||||
+RETURN_STATUS
|
|
||||||
+EFIAPI
|
|
||||||
+PlatformDebugLibIoPortConstructor (
|
|
||||||
+ VOID
|
|
||||||
+ )
|
|
||||||
+{
|
|
||||||
+ return RETURN_SUCCESS;
|
|
||||||
+}
|
|
||||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetectRom.c b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetectRom.c
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..83a118a0f7
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetectRom.c
|
|
||||||
@@ -0,0 +1,31 @@
|
|
||||||
+/** @file
|
|
||||||
+ Constructor code for QEMU debug port library.
|
|
||||||
+ SEC instance.
|
|
||||||
+
|
|
||||||
+ Copyright (c) 2017, Red Hat, Inc.<BR>
|
|
||||||
+ This program and the accompanying materials
|
|
||||||
+ are licensed and made available under the terms and conditions of the BSD License
|
|
||||||
+ which accompanies this distribution. The full text of the license may be found at
|
|
||||||
+ http://opensource.org/licenses/bsd-license.php.
|
|
||||||
+
|
|
||||||
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
|
||||||
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|
||||||
+
|
|
||||||
+**/
|
|
||||||
+
|
|
||||||
+#include <Base.h>
|
|
||||||
+
|
|
||||||
+/**
|
|
||||||
+ This constructor function does not have anything to do.
|
|
||||||
+
|
|
||||||
+ @retval RETURN_SUCCESS The constructor always returns RETURN_SUCCESS.
|
|
||||||
+
|
|
||||||
+**/
|
|
||||||
+RETURN_STATUS
|
|
||||||
+EFIAPI
|
|
||||||
+PlatformRomDebugLibIoPortConstructor (
|
|
||||||
+ VOID
|
|
||||||
+ )
|
|
||||||
+{
|
|
||||||
+ return RETURN_SUCCESS;
|
|
||||||
+}
|
|
||||||
--
|
|
||||||
2.14.3
|
|
||||||
|
|
|
@ -1,270 +0,0 @@
|
||||||
From b23853af6eb71e4c9b2e2d235b1db80541d33116 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
||||||
Date: Wed, 15 Nov 2017 18:01:00 +0100
|
|
||||||
Subject: [PATCH 3/3] OvmfPkg: save on I/O port accesses when the debug port is
|
|
||||||
not in use
|
|
||||||
|
|
||||||
When SEV is enabled, every debug message printed by OVMF to the
|
|
||||||
QEMU debug port traps from the guest to QEMU character by character
|
|
||||||
because "REP OUTSB" cannot be used by IoWriteFifo8. Furthermore,
|
|
||||||
when OVMF is built with the DEBUG_VERBOSE bit (value 0x00400000)
|
|
||||||
enabled in "gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel", then the
|
|
||||||
OvmfPkg/IoMmuDxe driver, and the OvmfPkg/Library/BaseMemEncryptSevLib
|
|
||||||
library instance that is built into it, produce a huge amount of
|
|
||||||
log messages. Therefore, in SEV guests, the boot time impact is huge
|
|
||||||
(about 45 seconds _additional_ time spent writing to the debug port).
|
|
||||||
|
|
||||||
While these messages are very useful for analyzing guest behavior,
|
|
||||||
most of the time the user won't be capturing the OVMF debug log.
|
|
||||||
In fact libvirt does not provide a method for configuring log capture;
|
|
||||||
users that wish to do this (or are instructed to do this) have to resort
|
|
||||||
to <qemu:arg>.
|
|
||||||
|
|
||||||
The debug console device provides a handy detection mechanism; when read,
|
|
||||||
it returns 0xE9 (which is very much unlike the 0xFF that is returned by
|
|
||||||
an unused port). Use it to skip the possibly expensive OUT instructions
|
|
||||||
when the debug I/O port isn't plugged anywhere.
|
|
||||||
|
|
||||||
For SEC, the debug port has to be read before each full message.
|
|
||||||
However:
|
|
||||||
|
|
||||||
- if the debug port is available, then reading one byte before writing
|
|
||||||
a full message isn't tragic, especially because SEC doesn't print many
|
|
||||||
messages
|
|
||||||
|
|
||||||
- if the debug port is not available, then reading one byte instead of
|
|
||||||
writing a full message is still a win.
|
|
||||||
|
|
||||||
Contributed-under: TianoCore Contribution Agreement 1.0
|
|
||||||
Cc: Laszlo Ersek <lersek@redhat.com>
|
|
||||||
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
|
||||||
Cc: Jordan Justen (Intel address) <jordan.l.justen@intel.com>
|
|
||||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
||||||
---
|
|
||||||
.../PlatformDebugLibIoPort/DebugLibDetect.h | 57 ++++++++++++++++++++++
|
|
||||||
OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c | 28 +++++++++--
|
|
||||||
.../PlatformDebugLibIoPort/DebugLibDetect.c | 30 ++++++++++--
|
|
||||||
.../PlatformDebugLibIoPort/DebugLibDetectRom.c | 21 +++++++-
|
|
||||||
4 files changed, 127 insertions(+), 9 deletions(-)
|
|
||||||
create mode 100644 OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.h
|
|
||||||
|
|
||||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.h b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.h
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000000..1f739b55d8
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.h
|
|
||||||
@@ -0,0 +1,57 @@
|
|
||||||
+/** @file
|
|
||||||
+ Base Debug library instance for QEMU debug port.
|
|
||||||
+ It uses PrintLib to send debug messages to a fixed I/O port.
|
|
||||||
+
|
|
||||||
+ Copyright (c) 2017, Red Hat, Inc.<BR>
|
|
||||||
+ This program and the accompanying materials
|
|
||||||
+ are licensed and made available under the terms and conditions of the BSD License
|
|
||||||
+ which accompanies this distribution. The full text of the license may be found at
|
|
||||||
+ http://opensource.org/licenses/bsd-license.php.
|
|
||||||
+
|
|
||||||
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
|
||||||
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|
||||||
+
|
|
||||||
+**/
|
|
||||||
+
|
|
||||||
+#ifndef __DEBUG_IO_PORT_DETECT_H__
|
|
||||||
+#define __DEBUG_IO_PORT_DETECT_H__
|
|
||||||
+
|
|
||||||
+#include <Base.h>
|
|
||||||
+
|
|
||||||
+//
|
|
||||||
+// The constant value that is read from the debug I/O port
|
|
||||||
+//
|
|
||||||
+#define BOCHS_DEBUG_PORT_MAGIC 0xE9
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/**
|
|
||||||
+ Helper function to return whether the virtual machine has a debug I/O port.
|
|
||||||
+ PlatformDebugLibIoPortFound can call this function directly or cache the
|
|
||||||
+ result.
|
|
||||||
+
|
|
||||||
+ @retval TRUE if the debug I/O port device was detected.
|
|
||||||
+ @retval FALSE otherwise
|
|
||||||
+
|
|
||||||
+**/
|
|
||||||
+BOOLEAN
|
|
||||||
+EFIAPI
|
|
||||||
+PlatformDebugLibIoPortDetect (
|
|
||||||
+ VOID
|
|
||||||
+ );
|
|
||||||
+
|
|
||||||
+/**
|
|
||||||
+ Return whether the virtual machine has a debug I/O port. DebugLib.c
|
|
||||||
+ calls this function instead of PlatformDebugLibIoPortDetect, to allow
|
|
||||||
+ caching if possible.
|
|
||||||
+
|
|
||||||
+ @retval TRUE if the debug I/O port device was detected.
|
|
||||||
+ @retval FALSE otherwise
|
|
||||||
+
|
|
||||||
+**/
|
|
||||||
+BOOLEAN
|
|
||||||
+EFIAPI
|
|
||||||
+PlatformDebugLibIoPortFound (
|
|
||||||
+ VOID
|
|
||||||
+ );
|
|
||||||
+
|
|
||||||
+#endif
|
|
||||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
|
||||||
index 5a1c86f2c3..36cde54976 100644
|
|
||||||
--- a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
|
||||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c
|
|
||||||
@@ -22,6 +22,7 @@
|
|
||||||
#include <Library/PcdLib.h>
|
|
||||||
#include <Library/BaseMemoryLib.h>
|
|
||||||
#include <Library/DebugPrintErrorLevelLib.h>
|
|
||||||
+#include "DebugLibDetect.h"
|
|
||||||
|
|
||||||
//
|
|
||||||
// Define the maximum debug and assert message length that this library supports
|
|
||||||
@@ -61,9 +62,10 @@ DebugPrint (
|
|
||||||
ASSERT (Format != NULL);
|
|
||||||
|
|
||||||
//
|
|
||||||
- // Check driver debug mask value and global mask
|
|
||||||
+ // Check if the global mask disables this message or the device is inactive
|
|
||||||
//
|
|
||||||
- if ((ErrorLevel & GetDebugPrintErrorLevel ()) == 0) {
|
|
||||||
+ if ((ErrorLevel & GetDebugPrintErrorLevel ()) == 0 ||
|
|
||||||
+ !PlatformDebugLibIoPortFound ()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -120,9 +122,11 @@ DebugAssert (
|
|
||||||
FileName, (UINT64)LineNumber, Description);
|
|
||||||
|
|
||||||
//
|
|
||||||
- // Send the print string to the debug I/O port
|
|
||||||
+ // Send the print string to the debug I/O port, if present
|
|
||||||
//
|
|
||||||
- IoWriteFifo8 (PcdGet16 (PcdDebugIoPort), Length, Buffer);
|
|
||||||
+ if (PlatformDebugLibIoPortFound ()) {
|
|
||||||
+ IoWriteFifo8 (PcdGet16 (PcdDebugIoPort), Length, Buffer);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
//
|
|
||||||
// Generate a Breakpoint, DeadLoop, or NOP based on PCD settings
|
|
||||||
@@ -265,3 +269,19 @@ DebugPrintLevelEnabled (
|
|
||||||
{
|
|
||||||
return (BOOLEAN) ((ErrorLevel & PcdGet32(PcdFixedDebugPrintErrorLevel)) != 0);
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+/**
|
|
||||||
+ Return the result of detecting the debug I/O port device.
|
|
||||||
+
|
|
||||||
+ @retval TRUE if the debug I/O port device was detected.
|
|
||||||
+ @retval FALSE otherwise
|
|
||||||
+
|
|
||||||
+**/
|
|
||||||
+BOOLEAN
|
|
||||||
+EFIAPI
|
|
||||||
+PlatformDebugLibIoPortDetect (
|
|
||||||
+ VOID
|
|
||||||
+ )
|
|
||||||
+{
|
|
||||||
+ return IoRead8 (PcdGet16 (PcdDebugIoPort)) == BOCHS_DEBUG_PORT_MAGIC;
|
|
||||||
+}
|
|
||||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.c b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.c
|
|
||||||
index bad054f286..81c44eece9 100644
|
|
||||||
--- a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.c
|
|
||||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetect.c
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
/** @file
|
|
||||||
- Constructor code for QEMU debug port library.
|
|
||||||
- Non-SEC instance.
|
|
||||||
+ Detection code for QEMU debug port.
|
|
||||||
+ Non-SEC instance, caches the result of detection.
|
|
||||||
|
|
||||||
Copyright (c) 2017, Red Hat, Inc.<BR>
|
|
||||||
This program and the accompanying materials
|
|
||||||
@@ -14,9 +14,16 @@
|
|
||||||
**/
|
|
||||||
|
|
||||||
#include <Base.h>
|
|
||||||
+#include "DebugLibDetect.h"
|
|
||||||
+
|
|
||||||
+//
|
|
||||||
+// Set to TRUE if the debug I/O port is enabled
|
|
||||||
+//
|
|
||||||
+STATIC BOOLEAN mDebugIoPortFound = FALSE;
|
|
||||||
|
|
||||||
/**
|
|
||||||
- This constructor function does not have anything to do.
|
|
||||||
+ This constructor function checks if the debug I/O port device is present,
|
|
||||||
+ caching the result for later use.
|
|
||||||
|
|
||||||
@retval RETURN_SUCCESS The constructor always returns RETURN_SUCCESS.
|
|
||||||
|
|
||||||
@@ -27,5 +34,22 @@ PlatformDebugLibIoPortConstructor (
|
|
||||||
VOID
|
|
||||||
)
|
|
||||||
{
|
|
||||||
+ mDebugIoPortFound = PlatformDebugLibIoPortDetect();
|
|
||||||
return RETURN_SUCCESS;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+/**
|
|
||||||
+ Return the cached result of detecting the debug I/O port device.
|
|
||||||
+
|
|
||||||
+ @retval TRUE if the debug I/O port device was detected.
|
|
||||||
+ @retval FALSE otherwise
|
|
||||||
+
|
|
||||||
+**/
|
|
||||||
+BOOLEAN
|
|
||||||
+EFIAPI
|
|
||||||
+PlatformDebugLibIoPortFound (
|
|
||||||
+ VOID
|
|
||||||
+ )
|
|
||||||
+{
|
|
||||||
+ return mDebugIoPortFound;
|
|
||||||
+}
|
|
||||||
diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetectRom.c b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetectRom.c
|
|
||||||
index 83a118a0f7..b950919675 100644
|
|
||||||
--- a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetectRom.c
|
|
||||||
+++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLibDetectRom.c
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
/** @file
|
|
||||||
- Constructor code for QEMU debug port library.
|
|
||||||
- SEC instance.
|
|
||||||
+ Detection code for QEMU debug port.
|
|
||||||
+ SEC instance, cannot cache the result of detection.
|
|
||||||
|
|
||||||
Copyright (c) 2017, Red Hat, Inc.<BR>
|
|
||||||
This program and the accompanying materials
|
|
||||||
@@ -14,6 +14,7 @@
|
|
||||||
**/
|
|
||||||
|
|
||||||
#include <Base.h>
|
|
||||||
+#include "DebugLibDetect.h"
|
|
||||||
|
|
||||||
/**
|
|
||||||
This constructor function does not have anything to do.
|
|
||||||
@@ -29,3 +30,19 @@ PlatformRomDebugLibIoPortConstructor (
|
|
||||||
{
|
|
||||||
return RETURN_SUCCESS;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+/**
|
|
||||||
+ Return the result of detecting the debug I/O port device.
|
|
||||||
+
|
|
||||||
+ @retval TRUE if the debug I/O port device was detected.
|
|
||||||
+ @retval FALSE otherwise
|
|
||||||
+
|
|
||||||
+**/
|
|
||||||
+BOOLEAN
|
|
||||||
+EFIAPI
|
|
||||||
+PlatformDebugLibIoPortFound (
|
|
||||||
+ VOID
|
|
||||||
+ )
|
|
||||||
+{
|
|
||||||
+ return PlatformDebugLibIoPortDetect ();
|
|
||||||
+}
|
|
||||||
--
|
|
||||||
2.14.3
|
|
||||||
|
|
|
@ -1,72 +0,0 @@
|
||||||
From 3416fa678a9b634910faffbf9479a82f4969f7b1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
|
||||||
Date: Fri, 2 Mar 2018 19:09:22 +0100
|
|
||||||
Subject: [PATCH 1/3] BaseTools/header.makefile: add "-Wno-stringop-truncation"
|
|
||||||
|
|
||||||
gcc-8 (which is part of Fedora 28) enables the new warning
|
|
||||||
"-Wstringop-truncation" in "-Wall". This warning is documented in detail
|
|
||||||
at <https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html>; the
|
|
||||||
introduction says
|
|
||||||
|
|
||||||
> Warn for calls to bounded string manipulation functions such as strncat,
|
|
||||||
> strncpy, and stpncpy that may either truncate the copied string or leave
|
|
||||||
> the destination unchanged.
|
|
||||||
|
|
||||||
It breaks the BaseTools build with:
|
|
||||||
|
|
||||||
> EfiUtilityMsgs.c: In function 'PrintMessage':
|
|
||||||
> EfiUtilityMsgs.c:484:9: error: 'strncat' output may be truncated copying
|
|
||||||
> between 0 and 511 bytes from a string of length 511
|
|
||||||
> [-Werror=stringop-truncation]
|
|
||||||
> strncat (Line, Line2, MAX_LINE_LEN - strlen (Line) - 1);
|
|
||||||
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
> EfiUtilityMsgs.c:469:9: error: 'strncat' output may be truncated copying
|
|
||||||
> between 0 and 511 bytes from a string of length 511
|
|
||||||
> [-Werror=stringop-truncation]
|
|
||||||
> strncat (Line, Line2, MAX_LINE_LEN - strlen (Line) - 1);
|
|
||||||
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
> EfiUtilityMsgs.c:511:5: error: 'strncat' output may be truncated copying
|
|
||||||
> between 0 and 511 bytes from a string of length 511
|
|
||||||
> [-Werror=stringop-truncation]
|
|
||||||
> strncat (Line, Line2, MAX_LINE_LEN - strlen (Line) - 1);
|
|
||||||
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
The right way to fix the warning would be to implement string concat with
|
|
||||||
snprintf(). However, Microsoft does not appear to support snprintf()
|
|
||||||
before VS2015
|
|
||||||
<https://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010>,
|
|
||||||
so we just have to shut up the warning. The strncat() calls flagged above
|
|
||||||
are valid BTW.
|
|
||||||
|
|
||||||
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
|
||||||
Cc: Cole Robinson <crobinso@redhat.com>
|
|
||||||
Cc: Liming Gao <liming.gao@intel.com>
|
|
||||||
Cc: Paolo Bonzini <pbonzini@redhat.com>
|
|
||||||
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
|
|
||||||
Contributed-under: TianoCore Contribution Agreement 1.1
|
|
||||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
||||||
Message-Id: <20180302180924.4312-2-lersek@redhat.com>
|
|
||||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
||||||
---
|
|
||||||
BaseTools/Source/C/Makefiles/header.makefile | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
|
|
||||||
index 063982b82f..6c3826aecb 100644
|
|
||||||
--- a/BaseTools/Source/C/Makefiles/header.makefile
|
|
||||||
+++ b/BaseTools/Source/C/Makefiles/header.makefile
|
|
||||||
@@ -47,9 +47,9 @@ INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKE
|
|
||||||
BUILD_CPPFLAGS = $(INCLUDE) -O2
|
|
||||||
ifeq ($(DARWIN),Darwin)
|
|
||||||
# assume clang or clang compatible flags on OS X
|
|
||||||
-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g
|
|
||||||
+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-self-assign -Wno-unused-result -nostdlib -c -g
|
|
||||||
else
|
|
||||||
-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g
|
|
||||||
+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-unused-result -nostdlib -c -g
|
|
||||||
endif
|
|
||||||
BUILD_LFLAGS =
|
|
||||||
BUILD_CXXFLAGS = -Wno-unused-result
|
|
||||||
--
|
|
||||||
2.14.3
|
|
||||||
|
|
|
@ -1,104 +0,0 @@
|
||||||
From 07a446e7f869f79104bcc1d6accdc462e7bf7ba5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
|
||||||
Date: Fri, 2 Mar 2018 19:09:23 +0100
|
|
||||||
Subject: [PATCH 2/3] BaseTools/header.makefile: add "-Wno-restrict"
|
|
||||||
|
|
||||||
gcc-8 (which is part of Fedora 28) enables the new warning
|
|
||||||
"-Wrestrict" in "-Wall". This warning is documented in detail
|
|
||||||
at <https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html>; the
|
|
||||||
introduction says
|
|
||||||
|
|
||||||
> Warn when an object referenced by a restrict-qualified parameter (or, in
|
|
||||||
> C++, a __restrict-qualified parameter) is aliased by another argument,
|
|
||||||
> or when copies between such objects overlap.
|
|
||||||
|
|
||||||
It breaks the BaseTools build (in the Brotli compression library) with:
|
|
||||||
|
|
||||||
> In function 'ProcessCommandsInternal',
|
|
||||||
> inlined from 'ProcessCommands' at dec/decode.c:1828:10:
|
|
||||||
> dec/decode.c:1781:9: error: 'memcpy' accessing between 17 and 2147483631
|
|
||||||
> bytes at offsets 16 and 16 overlaps between 17 and 2147483631 bytes at
|
|
||||||
> offset 16 [-Werror=restrict]
|
|
||||||
> memcpy(copy_dst + 16, copy_src + 16, (size_t)(i - 16));
|
|
||||||
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
> In function 'ProcessCommandsInternal',
|
|
||||||
> inlined from 'SafeProcessCommands' at dec/decode.c:1833:10:
|
|
||||||
> dec/decode.c:1781:9: error: 'memcpy' accessing between 17 and 2147483631
|
|
||||||
> bytes at offsets 16 and 16 overlaps between 17 and 2147483631 bytes at
|
|
||||||
> offset 16 [-Werror=restrict]
|
|
||||||
> memcpy(copy_dst + 16, copy_src + 16, (size_t)(i - 16));
|
|
||||||
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
Paolo Bonzini <pbonzini@redhat.com> analyzed the Brotli source in detail,
|
|
||||||
and concluded that the warning is a false positive:
|
|
||||||
|
|
||||||
> This seems safe to me, because it's preceded by:
|
|
||||||
>
|
|
||||||
> uint8_t* copy_dst = &s->ringbuffer[pos];
|
|
||||||
> uint8_t* copy_src = &s->ringbuffer[src_start];
|
|
||||||
> int dst_end = pos + i;
|
|
||||||
> int src_end = src_start + i;
|
|
||||||
> if (src_end > pos && dst_end > src_start) {
|
|
||||||
> /* Regions intersect. */
|
|
||||||
> goto CommandPostWrapCopy;
|
|
||||||
> }
|
|
||||||
>
|
|
||||||
> If [src_start, src_start + i) and [pos, pos + i) don't intersect, then
|
|
||||||
> neither do [src_start + 16, src_start + i) and [pos + 16, pos + i).
|
|
||||||
>
|
|
||||||
> The if seems okay:
|
|
||||||
>
|
|
||||||
> (src_start + i > pos && pos + i > src_start)
|
|
||||||
>
|
|
||||||
> which can be rewritten to:
|
|
||||||
>
|
|
||||||
> (pos < src_start + i && src_start < pos + i)
|
|
||||||
>
|
|
||||||
> Then the numbers are in one of these two orders:
|
|
||||||
>
|
|
||||||
> pos <= src_start < pos + i <= src_start + i
|
|
||||||
> src_start <= pos < src_start + i <= pos + i
|
|
||||||
>
|
|
||||||
> These two would be allowed by the "if", but they can only happen if pos
|
|
||||||
> == src_start so they degenerate to the same two orders above:
|
|
||||||
>
|
|
||||||
> pos <= src_start < src_start + i <= pos + i
|
|
||||||
> src_start <= pos < pos + i <= src_start + i
|
|
||||||
>
|
|
||||||
> So it is a false positive in GCC.
|
|
||||||
|
|
||||||
Disable the warning for now.
|
|
||||||
|
|
||||||
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
|
||||||
Cc: Cole Robinson <crobinso@redhat.com>
|
|
||||||
Cc: Liming Gao <liming.gao@intel.com>
|
|
||||||
Cc: Paolo Bonzini <pbonzini@redhat.com>
|
|
||||||
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
|
|
||||||
Reported-by: Cole Robinson <crobinso@redhat.com>
|
|
||||||
Contributed-under: TianoCore Contribution Agreement 1.1
|
|
||||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
||||||
Message-Id: <20180302180924.4312-3-lersek@redhat.com>
|
|
||||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
||||||
---
|
|
||||||
BaseTools/Source/C/Makefiles/header.makefile | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
|
|
||||||
index 6c3826aecb..3feae10095 100644
|
|
||||||
--- a/BaseTools/Source/C/Makefiles/header.makefile
|
|
||||||
+++ b/BaseTools/Source/C/Makefiles/header.makefile
|
|
||||||
@@ -47,9 +47,9 @@ INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKE
|
|
||||||
BUILD_CPPFLAGS = $(INCLUDE) -O2
|
|
||||||
ifeq ($(DARWIN),Darwin)
|
|
||||||
# assume clang or clang compatible flags on OS X
|
|
||||||
-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-self-assign -Wno-unused-result -nostdlib -c -g
|
|
||||||
+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict -Wno-self-assign -Wno-unused-result -nostdlib -c -g
|
|
||||||
else
|
|
||||||
-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-unused-result -nostdlib -c -g
|
|
||||||
+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict -Wno-unused-result -nostdlib -c -g
|
|
||||||
endif
|
|
||||||
BUILD_LFLAGS =
|
|
||||||
BUILD_CXXFLAGS = -Wno-unused-result
|
|
||||||
--
|
|
||||||
2.14.3
|
|
||||||
|
|
|
@ -1,65 +0,0 @@
|
||||||
From 8633e2951d8eba59755c82ef10099ed47eafd474 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
|
||||||
Date: Fri, 2 Mar 2018 19:09:24 +0100
|
|
||||||
Subject: [PATCH 3/3] BaseTools/GenVtf: silence false "stringop-overflow"
|
|
||||||
warning with memcpy()
|
|
||||||
|
|
||||||
gcc-8 (which is part of Fedora 28) enables the new warning
|
|
||||||
"-Wstringop-overflow" in "-Wall". This warning is documented in detail at
|
|
||||||
<https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html>; the
|
|
||||||
introduction says
|
|
||||||
|
|
||||||
> Warn for calls to string manipulation functions such as memcpy and
|
|
||||||
> strcpy that are determined to overflow the destination buffer.
|
|
||||||
|
|
||||||
It breaks the BaseTools build with:
|
|
||||||
|
|
||||||
> GenVtf.c: In function 'ConvertVersionInfo':
|
|
||||||
> GenVtf.c:132:7: error: 'strncpy' specified bound depends on the length
|
|
||||||
> of the source argument [-Werror=stringop-overflow=]
|
|
||||||
> strncpy (TemStr + 4 - Length, Str, Length);
|
|
||||||
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
> GenVtf.c:130:14: note: length computed here
|
|
||||||
> Length = strlen(Str);
|
|
||||||
> ^~~~~~~~~~~
|
|
||||||
|
|
||||||
It is a false positive because, while the bound equals the length of the
|
|
||||||
source argument, the destination pointer is moved back towards the
|
|
||||||
beginning of the destination buffer by the same amount (and this amount is
|
|
||||||
range-checked first, so we can't precede the start of the dest buffer).
|
|
||||||
|
|
||||||
Replace both strncpy() calls with memcpy().
|
|
||||||
|
|
||||||
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
|
||||||
Cc: Cole Robinson <crobinso@redhat.com>
|
|
||||||
Cc: Liming Gao <liming.gao@intel.com>
|
|
||||||
Cc: Paolo Bonzini <pbonzini@redhat.com>
|
|
||||||
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
|
|
||||||
Reported-by: Cole Robinson <crobinso@redhat.com>
|
|
||||||
Contributed-under: TianoCore Contribution Agreement 1.1
|
|
||||||
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
||||||
Message-Id: <20180302180924.4312-4-lersek@redhat.com>
|
|
||||||
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
||||||
---
|
|
||||||
BaseTools/Source/C/GenVtf/GenVtf.c | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/BaseTools/Source/C/GenVtf/GenVtf.c b/BaseTools/Source/C/GenVtf/GenVtf.c
|
|
||||||
index 2ae9a7be2c..0cd33e71e9 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 (
|
|
||||||
--
|
|
||||||
2.14.3
|
|
||||||
|
|
|
@ -1,458 +1,21 @@
|
||||||
From 63b708ccad8afd0b887258888a53fd4945cff682 Mon Sep 17 00:00:00 2001
|
From 0784bdc810bcbd275a78ceb0c2cf04f2f0f68061 Mon Sep 17 00:00:00 2001
|
||||||
Message-Id: <63b708ccad8afd0b887258888a53fd4945cff682.1478467625.git.crobinso@redhat.com>
|
|
||||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
Date: Sun, 6 Nov 2016 13:50:31 -0500
|
Date: Thu, 16 Aug 2018 15:45:47 -0400
|
||||||
Subject: [PATCH] Tweak the tools_def to support cross-compiling.
|
Subject: [PATCH] Tweak the tools_def to support cross-compiling.
|
||||||
|
|
||||||
These files are meant for customization, so this is not upstream.
|
These files are meant for customization, so this is not upstream.
|
||||||
|
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
||||||
---
|
---
|
||||||
BaseTools/Conf/tools_def.template | 343 ++++++++++++++++++--------------------
|
BaseTools/Conf/tools_def.template | 44 +++++++++++++++----------------
|
||||||
1 file changed, 161 insertions(+), 182 deletions(-)
|
1 file changed, 22 insertions(+), 22 deletions(-)
|
||||||
|
|
||||||
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
|
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
|
||||||
index e93c2a0..2fc16c1 100755
|
index a22b96c0b8..8b134ca93f 100755
|
||||||
--- a/BaseTools/Conf/tools_def.template
|
--- a/BaseTools/Conf/tools_def.template
|
||||||
+++ b/BaseTools/Conf/tools_def.template
|
+++ b/BaseTools/Conf/tools_def.template
|
||||||
@@ -178,27 +178,6 @@ DEFINE CYGWIN_BINIA32 = c:/cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe
|
@@ -5068,17 +5068,17 @@ RELEASE_GCC49_AARCH64_DLINK_FLAGS = DEF(GCC49_AARCH64_DLINK_FLAGS)
|
||||||
DEFINE CYGWIN_BINX64 = c:/cygwin/opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin/
|
|
||||||
DEFINE CYGWIN_BINIPF = c:/cygwin/opt/tiano/gcc/ipf/bin/ia64-pc-elf-
|
|
||||||
|
|
||||||
-DEFINE GCC44_IA32_PREFIX = ENV(GCC44_BIN)
|
|
||||||
-DEFINE GCC44_X64_PREFIX = ENV(GCC44_BIN)
|
|
||||||
-
|
|
||||||
-DEFINE GCC45_IA32_PREFIX = ENV(GCC45_BIN)
|
|
||||||
-DEFINE GCC45_X64_PREFIX = ENV(GCC45_BIN)
|
|
||||||
-
|
|
||||||
-DEFINE GCC46_IA32_PREFIX = ENV(GCC46_BIN)
|
|
||||||
-DEFINE GCC46_X64_PREFIX = ENV(GCC46_BIN)
|
|
||||||
-
|
|
||||||
-DEFINE GCC47_IA32_PREFIX = ENV(GCC47_BIN)
|
|
||||||
-DEFINE GCC47_X64_PREFIX = ENV(GCC47_BIN)
|
|
||||||
-
|
|
||||||
-DEFINE GCC48_IA32_PREFIX = ENV(GCC48_BIN)
|
|
||||||
-DEFINE GCC48_X64_PREFIX = ENV(GCC48_BIN)
|
|
||||||
-
|
|
||||||
-DEFINE GCC49_IA32_PREFIX = ENV(GCC49_BIN)
|
|
||||||
-DEFINE GCC49_X64_PREFIX = ENV(GCC49_BIN)
|
|
||||||
-
|
|
||||||
-DEFINE GCC5_IA32_PREFIX = ENV(GCC5_BIN)
|
|
||||||
-DEFINE GCC5_X64_PREFIX = ENV(GCC5_BIN)
|
|
||||||
-
|
|
||||||
DEFINE UNIX_IASL_BIN = ENV(IASL_PREFIX)iasl
|
|
||||||
DEFINE WIN_IASL_BIN = ENV(IASL_PREFIX)iasl.exe
|
|
||||||
DEFINE WIN_ASL_BIN = ENV(IASL_PREFIX)asl.exe
|
|
||||||
@@ -4598,7 +4577,7 @@ DEFINE GCC5_AARCH64_ASLDLINK_FLAGS = DEF(GCC49_AARCH64_ASLDLINK_FLAGS)
|
|
||||||
####################################################################################
|
|
||||||
*_GCC44_*_*_FAMILY = GCC
|
|
||||||
|
|
||||||
-*_GCC44_*_MAKE_PATH = DEF(GCC44_IA32_PREFIX)make
|
|
||||||
+*_GCC44_*_MAKE_PATH = make
|
|
||||||
*_GCC44_*_*_DLL = ENV(GCC44_DLL)
|
|
||||||
*_GCC44_*_ASL_PATH = DEF(UNIX_IASL_BIN)
|
|
||||||
|
|
||||||
@@ -4613,17 +4592,17 @@ DEFINE GCC5_AARCH64_ASLDLINK_FLAGS = DEF(GCC49_AARCH64_ASLDLINK_FLAGS)
|
|
||||||
##################
|
|
||||||
# GCC44 IA32 definitions
|
|
||||||
##################
|
|
||||||
-*_GCC44_IA32_OBJCOPY_PATH = DEF(GCC44_IA32_PREFIX)objcopy
|
|
||||||
-*_GCC44_IA32_CC_PATH = DEF(GCC44_IA32_PREFIX)gcc
|
|
||||||
-*_GCC44_IA32_SLINK_PATH = DEF(GCC44_IA32_PREFIX)ar
|
|
||||||
-*_GCC44_IA32_DLINK_PATH = DEF(GCC44_IA32_PREFIX)gcc
|
|
||||||
-*_GCC44_IA32_ASLDLINK_PATH = DEF(GCC44_IA32_PREFIX)gcc
|
|
||||||
-*_GCC44_IA32_ASM_PATH = DEF(GCC44_IA32_PREFIX)gcc
|
|
||||||
-*_GCC44_IA32_PP_PATH = DEF(GCC44_IA32_PREFIX)gcc
|
|
||||||
-*_GCC44_IA32_VFRPP_PATH = DEF(GCC44_IA32_PREFIX)gcc
|
|
||||||
-*_GCC44_IA32_ASLCC_PATH = DEF(GCC44_IA32_PREFIX)gcc
|
|
||||||
-*_GCC44_IA32_ASLPP_PATH = DEF(GCC44_IA32_PREFIX)gcc
|
|
||||||
-*_GCC44_IA32_RC_PATH = DEF(GCC44_IA32_PREFIX)objcopy
|
|
||||||
+*_GCC44_IA32_OBJCOPY_PATH = ENV(GCC44_IA32_PREFIX)objcopy
|
|
||||||
+*_GCC44_IA32_CC_PATH = ENV(GCC44_IA32_PREFIX)gcc
|
|
||||||
+*_GCC44_IA32_SLINK_PATH = ENV(GCC44_IA32_PREFIX)ar
|
|
||||||
+*_GCC44_IA32_DLINK_PATH = ENV(GCC44_IA32_PREFIX)gcc
|
|
||||||
+*_GCC44_IA32_ASLDLINK_PATH = ENV(GCC44_IA32_PREFIX)gcc
|
|
||||||
+*_GCC44_IA32_ASM_PATH = ENV(GCC44_IA32_PREFIX)gcc
|
|
||||||
+*_GCC44_IA32_PP_PATH = ENV(GCC44_IA32_PREFIX)gcc
|
|
||||||
+*_GCC44_IA32_VFRPP_PATH = ENV(GCC44_IA32_PREFIX)gcc
|
|
||||||
+*_GCC44_IA32_ASLCC_PATH = ENV(GCC44_IA32_PREFIX)gcc
|
|
||||||
+*_GCC44_IA32_ASLPP_PATH = ENV(GCC44_IA32_PREFIX)gcc
|
|
||||||
+*_GCC44_IA32_RC_PATH = ENV(GCC44_IA32_PREFIX)objcopy
|
|
||||||
|
|
||||||
*_GCC44_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32
|
|
||||||
*_GCC44_IA32_ASLDLINK_FLAGS = DEF(GCC44_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386
|
|
||||||
@@ -4641,17 +4620,17 @@ RELEASE_GCC44_IA32_CC_FLAGS = DEF(GCC44_IA32_CC_FLAGS) -Os
|
|
||||||
##################
|
|
||||||
# GCC44 X64 definitions
|
|
||||||
##################
|
|
||||||
-*_GCC44_X64_OBJCOPY_PATH = DEF(GCC44_X64_PREFIX)objcopy
|
|
||||||
-*_GCC44_X64_CC_PATH = DEF(GCC44_X64_PREFIX)gcc
|
|
||||||
-*_GCC44_X64_SLINK_PATH = DEF(GCC44_X64_PREFIX)ar
|
|
||||||
-*_GCC44_X64_DLINK_PATH = DEF(GCC44_X64_PREFIX)gcc
|
|
||||||
-*_GCC44_X64_ASLDLINK_PATH = DEF(GCC44_X64_PREFIX)gcc
|
|
||||||
-*_GCC44_X64_ASM_PATH = DEF(GCC44_X64_PREFIX)gcc
|
|
||||||
-*_GCC44_X64_PP_PATH = DEF(GCC44_X64_PREFIX)gcc
|
|
||||||
-*_GCC44_X64_VFRPP_PATH = DEF(GCC44_X64_PREFIX)gcc
|
|
||||||
-*_GCC44_X64_ASLCC_PATH = DEF(GCC44_X64_PREFIX)gcc
|
|
||||||
-*_GCC44_X64_ASLPP_PATH = DEF(GCC44_X64_PREFIX)gcc
|
|
||||||
-*_GCC44_X64_RC_PATH = DEF(GCC44_X64_PREFIX)objcopy
|
|
||||||
+*_GCC44_X64_OBJCOPY_PATH = ENV(GCC44_X64_PREFIX)objcopy
|
|
||||||
+*_GCC44_X64_CC_PATH = ENV(GCC44_X64_PREFIX)gcc
|
|
||||||
+*_GCC44_X64_SLINK_PATH = ENV(GCC44_X64_PREFIX)ar
|
|
||||||
+*_GCC44_X64_DLINK_PATH = ENV(GCC44_X64_PREFIX)gcc
|
|
||||||
+*_GCC44_X64_ASLDLINK_PATH = ENV(GCC44_X64_PREFIX)gcc
|
|
||||||
+*_GCC44_X64_ASM_PATH = ENV(GCC44_X64_PREFIX)gcc
|
|
||||||
+*_GCC44_X64_PP_PATH = ENV(GCC44_X64_PREFIX)gcc
|
|
||||||
+*_GCC44_X64_VFRPP_PATH = ENV(GCC44_X64_PREFIX)gcc
|
|
||||||
+*_GCC44_X64_ASLCC_PATH = ENV(GCC44_X64_PREFIX)gcc
|
|
||||||
+*_GCC44_X64_ASLPP_PATH = ENV(GCC44_X64_PREFIX)gcc
|
|
||||||
+*_GCC44_X64_RC_PATH = ENV(GCC44_X64_PREFIX)objcopy
|
|
||||||
|
|
||||||
*_GCC44_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64
|
|
||||||
*_GCC44_X64_ASLDLINK_FLAGS = DEF(GCC44_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64
|
|
||||||
@@ -4674,7 +4653,7 @@ RELEASE_GCC44_X64_CC_FLAGS = DEF(GCC44_X64_CC_FLAGS) -Os
|
|
||||||
####################################################################################
|
|
||||||
*_GCC45_*_*_FAMILY = GCC
|
|
||||||
|
|
||||||
-*_GCC45_*_MAKE_PATH = DEF(GCC45_IA32_PREFIX)make
|
|
||||||
+*_GCC45_*_MAKE_PATH = make
|
|
||||||
*_GCC45_*_*_DLL = ENV(GCC45_DLL)
|
|
||||||
*_GCC45_*_ASL_PATH = DEF(UNIX_IASL_BIN)
|
|
||||||
|
|
||||||
@@ -4689,17 +4668,17 @@ RELEASE_GCC44_X64_CC_FLAGS = DEF(GCC44_X64_CC_FLAGS) -Os
|
|
||||||
##################
|
|
||||||
# GCC45 IA32 definitions
|
|
||||||
##################
|
|
||||||
-*_GCC45_IA32_OBJCOPY_PATH = DEF(GCC45_IA32_PREFIX)objcopy
|
|
||||||
-*_GCC45_IA32_CC_PATH = DEF(GCC45_IA32_PREFIX)gcc
|
|
||||||
-*_GCC45_IA32_SLINK_PATH = DEF(GCC45_IA32_PREFIX)ar
|
|
||||||
-*_GCC45_IA32_DLINK_PATH = DEF(GCC45_IA32_PREFIX)gcc
|
|
||||||
-*_GCC45_IA32_ASLDLINK_PATH = DEF(GCC45_IA32_PREFIX)gcc
|
|
||||||
-*_GCC45_IA32_ASM_PATH = DEF(GCC45_IA32_PREFIX)gcc
|
|
||||||
-*_GCC45_IA32_PP_PATH = DEF(GCC45_IA32_PREFIX)gcc
|
|
||||||
-*_GCC45_IA32_VFRPP_PATH = DEF(GCC45_IA32_PREFIX)gcc
|
|
||||||
-*_GCC45_IA32_ASLCC_PATH = DEF(GCC45_IA32_PREFIX)gcc
|
|
||||||
-*_GCC45_IA32_ASLPP_PATH = DEF(GCC45_IA32_PREFIX)gcc
|
|
||||||
-*_GCC45_IA32_RC_PATH = DEF(GCC45_IA32_PREFIX)objcopy
|
|
||||||
+*_GCC45_IA32_OBJCOPY_PATH = ENV(GCC45_IA32_PREFIX)objcopy
|
|
||||||
+*_GCC45_IA32_CC_PATH = ENV(GCC45_IA32_PREFIX)gcc
|
|
||||||
+*_GCC45_IA32_SLINK_PATH = ENV(GCC45_IA32_PREFIX)ar
|
|
||||||
+*_GCC45_IA32_DLINK_PATH = ENV(GCC45_IA32_PREFIX)gcc
|
|
||||||
+*_GCC45_IA32_ASLDLINK_PATH = ENV(GCC45_IA32_PREFIX)gcc
|
|
||||||
+*_GCC45_IA32_ASM_PATH = ENV(GCC45_IA32_PREFIX)gcc
|
|
||||||
+*_GCC45_IA32_PP_PATH = ENV(GCC45_IA32_PREFIX)gcc
|
|
||||||
+*_GCC45_IA32_VFRPP_PATH = ENV(GCC45_IA32_PREFIX)gcc
|
|
||||||
+*_GCC45_IA32_ASLCC_PATH = ENV(GCC45_IA32_PREFIX)gcc
|
|
||||||
+*_GCC45_IA32_ASLPP_PATH = ENV(GCC45_IA32_PREFIX)gcc
|
|
||||||
+*_GCC45_IA32_RC_PATH = ENV(GCC45_IA32_PREFIX)objcopy
|
|
||||||
|
|
||||||
*_GCC45_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32
|
|
||||||
*_GCC45_IA32_ASLDLINK_FLAGS = DEF(GCC45_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386
|
|
||||||
@@ -4717,17 +4696,17 @@ RELEASE_GCC45_IA32_CC_FLAGS = DEF(GCC45_IA32_CC_FLAGS) -Os
|
|
||||||
##################
|
|
||||||
# GCC45 X64 definitions
|
|
||||||
##################
|
|
||||||
-*_GCC45_X64_OBJCOPY_PATH = DEF(GCC45_X64_PREFIX)objcopy
|
|
||||||
-*_GCC45_X64_CC_PATH = DEF(GCC45_X64_PREFIX)gcc
|
|
||||||
-*_GCC45_X64_SLINK_PATH = DEF(GCC45_X64_PREFIX)ar
|
|
||||||
-*_GCC45_X64_DLINK_PATH = DEF(GCC45_X64_PREFIX)gcc
|
|
||||||
-*_GCC45_X64_ASLDLINK_PATH = DEF(GCC45_X64_PREFIX)gcc
|
|
||||||
-*_GCC45_X64_ASM_PATH = DEF(GCC45_X64_PREFIX)gcc
|
|
||||||
-*_GCC45_X64_PP_PATH = DEF(GCC45_X64_PREFIX)gcc
|
|
||||||
-*_GCC45_X64_VFRPP_PATH = DEF(GCC45_X64_PREFIX)gcc
|
|
||||||
-*_GCC45_X64_ASLCC_PATH = DEF(GCC45_X64_PREFIX)gcc
|
|
||||||
-*_GCC45_X64_ASLPP_PATH = DEF(GCC45_X64_PREFIX)gcc
|
|
||||||
-*_GCC45_X64_RC_PATH = DEF(GCC45_X64_PREFIX)objcopy
|
|
||||||
+*_GCC45_X64_OBJCOPY_PATH = ENV(GCC45_X64_PREFIX)objcopy
|
|
||||||
+*_GCC45_X64_CC_PATH = ENV(GCC45_X64_PREFIX)gcc
|
|
||||||
+*_GCC45_X64_SLINK_PATH = ENV(GCC45_X64_PREFIX)ar
|
|
||||||
+*_GCC45_X64_DLINK_PATH = ENV(GCC45_X64_PREFIX)gcc
|
|
||||||
+*_GCC45_X64_ASLDLINK_PATH = ENV(GCC45_X64_PREFIX)gcc
|
|
||||||
+*_GCC45_X64_ASM_PATH = ENV(GCC45_X64_PREFIX)gcc
|
|
||||||
+*_GCC45_X64_PP_PATH = ENV(GCC45_X64_PREFIX)gcc
|
|
||||||
+*_GCC45_X64_VFRPP_PATH = ENV(GCC45_X64_PREFIX)gcc
|
|
||||||
+*_GCC45_X64_ASLCC_PATH = ENV(GCC45_X64_PREFIX)gcc
|
|
||||||
+*_GCC45_X64_ASLPP_PATH = ENV(GCC45_X64_PREFIX)gcc
|
|
||||||
+*_GCC45_X64_RC_PATH = ENV(GCC45_X64_PREFIX)objcopy
|
|
||||||
|
|
||||||
*_GCC45_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64
|
|
||||||
*_GCC45_X64_ASLDLINK_FLAGS = DEF(GCC45_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64
|
|
||||||
@@ -4750,7 +4729,7 @@ RELEASE_GCC45_X64_CC_FLAGS = DEF(GCC45_X64_CC_FLAGS) -Os
|
|
||||||
####################################################################################
|
|
||||||
*_GCC46_*_*_FAMILY = GCC
|
|
||||||
|
|
||||||
-*_GCC46_*_MAKE_PATH = DEF(GCC46_IA32_PREFIX)make
|
|
||||||
+*_GCC46_*_MAKE_PATH = make
|
|
||||||
*_GCC46_*_*_DLL = ENV(GCC46_DLL)
|
|
||||||
*_GCC46_*_ASL_PATH = DEF(UNIX_IASL_BIN)
|
|
||||||
*_GCC46_*_DTC_PATH = DEF(DTC_BIN)
|
|
||||||
@@ -4766,17 +4745,17 @@ RELEASE_GCC45_X64_CC_FLAGS = DEF(GCC45_X64_CC_FLAGS) -Os
|
|
||||||
##################
|
|
||||||
# GCC46 IA32 definitions
|
|
||||||
##################
|
|
||||||
-*_GCC46_IA32_OBJCOPY_PATH = DEF(GCC46_IA32_PREFIX)objcopy
|
|
||||||
-*_GCC46_IA32_CC_PATH = DEF(GCC46_IA32_PREFIX)gcc
|
|
||||||
-*_GCC46_IA32_SLINK_PATH = DEF(GCC46_IA32_PREFIX)ar
|
|
||||||
-*_GCC46_IA32_DLINK_PATH = DEF(GCC46_IA32_PREFIX)gcc
|
|
||||||
-*_GCC46_IA32_ASLDLINK_PATH = DEF(GCC46_IA32_PREFIX)gcc
|
|
||||||
-*_GCC46_IA32_ASM_PATH = DEF(GCC46_IA32_PREFIX)gcc
|
|
||||||
-*_GCC46_IA32_PP_PATH = DEF(GCC46_IA32_PREFIX)gcc
|
|
||||||
-*_GCC46_IA32_VFRPP_PATH = DEF(GCC46_IA32_PREFIX)gcc
|
|
||||||
-*_GCC46_IA32_ASLCC_PATH = DEF(GCC46_IA32_PREFIX)gcc
|
|
||||||
-*_GCC46_IA32_ASLPP_PATH = DEF(GCC46_IA32_PREFIX)gcc
|
|
||||||
-*_GCC46_IA32_RC_PATH = DEF(GCC46_IA32_PREFIX)objcopy
|
|
||||||
+*_GCC46_IA32_OBJCOPY_PATH = ENV(GCC46_IA32_PREFIX)objcopy
|
|
||||||
+*_GCC46_IA32_CC_PATH = ENV(GCC46_IA32_PREFIX)gcc
|
|
||||||
+*_GCC46_IA32_SLINK_PATH = ENV(GCC46_IA32_PREFIX)ar
|
|
||||||
+*_GCC46_IA32_DLINK_PATH = ENV(GCC46_IA32_PREFIX)gcc
|
|
||||||
+*_GCC46_IA32_ASLDLINK_PATH = ENV(GCC46_IA32_PREFIX)gcc
|
|
||||||
+*_GCC46_IA32_ASM_PATH = ENV(GCC46_IA32_PREFIX)gcc
|
|
||||||
+*_GCC46_IA32_PP_PATH = ENV(GCC46_IA32_PREFIX)gcc
|
|
||||||
+*_GCC46_IA32_VFRPP_PATH = ENV(GCC46_IA32_PREFIX)gcc
|
|
||||||
+*_GCC46_IA32_ASLCC_PATH = ENV(GCC46_IA32_PREFIX)gcc
|
|
||||||
+*_GCC46_IA32_ASLPP_PATH = ENV(GCC46_IA32_PREFIX)gcc
|
|
||||||
+*_GCC46_IA32_RC_PATH = ENV(GCC46_IA32_PREFIX)objcopy
|
|
||||||
|
|
||||||
*_GCC46_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32
|
|
||||||
*_GCC46_IA32_ASLDLINK_FLAGS = DEF(GCC46_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386
|
|
||||||
@@ -4794,17 +4773,17 @@ RELEASE_GCC46_IA32_CC_FLAGS = DEF(GCC46_IA32_CC_FLAGS) -Os -Wno-unused-but
|
|
||||||
##################
|
|
||||||
# GCC46 X64 definitions
|
|
||||||
##################
|
|
||||||
-*_GCC46_X64_OBJCOPY_PATH = DEF(GCC46_X64_PREFIX)objcopy
|
|
||||||
-*_GCC46_X64_CC_PATH = DEF(GCC46_X64_PREFIX)gcc
|
|
||||||
-*_GCC46_X64_SLINK_PATH = DEF(GCC46_X64_PREFIX)ar
|
|
||||||
-*_GCC46_X64_DLINK_PATH = DEF(GCC46_X64_PREFIX)gcc
|
|
||||||
-*_GCC46_X64_ASLDLINK_PATH = DEF(GCC46_X64_PREFIX)gcc
|
|
||||||
-*_GCC46_X64_ASM_PATH = DEF(GCC46_X64_PREFIX)gcc
|
|
||||||
-*_GCC46_X64_PP_PATH = DEF(GCC46_X64_PREFIX)gcc
|
|
||||||
-*_GCC46_X64_VFRPP_PATH = DEF(GCC46_X64_PREFIX)gcc
|
|
||||||
-*_GCC46_X64_ASLCC_PATH = DEF(GCC46_X64_PREFIX)gcc
|
|
||||||
-*_GCC46_X64_ASLPP_PATH = DEF(GCC46_X64_PREFIX)gcc
|
|
||||||
-*_GCC46_X64_RC_PATH = DEF(GCC46_X64_PREFIX)objcopy
|
|
||||||
+*_GCC46_X64_OBJCOPY_PATH = ENV(GCC46_X64_PREFIX)objcopy
|
|
||||||
+*_GCC46_X64_CC_PATH = ENV(GCC46_X64_PREFIX)gcc
|
|
||||||
+*_GCC46_X64_SLINK_PATH = ENV(GCC46_X64_PREFIX)ar
|
|
||||||
+*_GCC46_X64_DLINK_PATH = ENV(GCC46_X64_PREFIX)gcc
|
|
||||||
+*_GCC46_X64_ASLDLINK_PATH = ENV(GCC46_X64_PREFIX)gcc
|
|
||||||
+*_GCC46_X64_ASM_PATH = ENV(GCC46_X64_PREFIX)gcc
|
|
||||||
+*_GCC46_X64_PP_PATH = ENV(GCC46_X64_PREFIX)gcc
|
|
||||||
+*_GCC46_X64_VFRPP_PATH = ENV(GCC46_X64_PREFIX)gcc
|
|
||||||
+*_GCC46_X64_ASLCC_PATH = ENV(GCC46_X64_PREFIX)gcc
|
|
||||||
+*_GCC46_X64_ASLPP_PATH = ENV(GCC46_X64_PREFIX)gcc
|
|
||||||
+*_GCC46_X64_RC_PATH = ENV(GCC46_X64_PREFIX)objcopy
|
|
||||||
|
|
||||||
*_GCC46_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64
|
|
||||||
*_GCC46_X64_ASLDLINK_FLAGS = DEF(GCC46_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64
|
|
||||||
@@ -4861,7 +4840,7 @@ RELEASE_GCC46_ARM_CC_FLAGS = DEF(GCC46_ARM_CC_FLAGS) -Wno-unused-but-set-v
|
|
||||||
####################################################################################
|
|
||||||
*_GCC47_*_*_FAMILY = GCC
|
|
||||||
|
|
||||||
-*_GCC47_*_MAKE_PATH = DEF(GCC47_IA32_PREFIX)make
|
|
||||||
+*_GCC47_*_MAKE_PATH = make
|
|
||||||
*_GCC47_*_*_DLL = ENV(GCC47_DLL)
|
|
||||||
*_GCC47_*_ASL_PATH = DEF(UNIX_IASL_BIN)
|
|
||||||
*_GCC47_*_DTC_PATH = DEF(DTC_BIN)
|
|
||||||
@@ -4877,17 +4856,17 @@ RELEASE_GCC46_ARM_CC_FLAGS = DEF(GCC46_ARM_CC_FLAGS) -Wno-unused-but-set-v
|
|
||||||
##################
|
|
||||||
# GCC47 IA32 definitions
|
|
||||||
##################
|
|
||||||
-*_GCC47_IA32_OBJCOPY_PATH = DEF(GCC47_IA32_PREFIX)objcopy
|
|
||||||
-*_GCC47_IA32_CC_PATH = DEF(GCC47_IA32_PREFIX)gcc
|
|
||||||
-*_GCC47_IA32_SLINK_PATH = DEF(GCC47_IA32_PREFIX)ar
|
|
||||||
-*_GCC47_IA32_DLINK_PATH = DEF(GCC47_IA32_PREFIX)gcc
|
|
||||||
-*_GCC47_IA32_ASLDLINK_PATH = DEF(GCC47_IA32_PREFIX)gcc
|
|
||||||
-*_GCC47_IA32_ASM_PATH = DEF(GCC47_IA32_PREFIX)gcc
|
|
||||||
-*_GCC47_IA32_PP_PATH = DEF(GCC47_IA32_PREFIX)gcc
|
|
||||||
-*_GCC47_IA32_VFRPP_PATH = DEF(GCC47_IA32_PREFIX)gcc
|
|
||||||
-*_GCC47_IA32_ASLCC_PATH = DEF(GCC47_IA32_PREFIX)gcc
|
|
||||||
-*_GCC47_IA32_ASLPP_PATH = DEF(GCC47_IA32_PREFIX)gcc
|
|
||||||
-*_GCC47_IA32_RC_PATH = DEF(GCC47_IA32_PREFIX)objcopy
|
|
||||||
+*_GCC47_IA32_OBJCOPY_PATH = ENV(GCC47_IA32_PREFIX)objcopy
|
|
||||||
+*_GCC47_IA32_CC_PATH = ENV(GCC47_IA32_PREFIX)gcc
|
|
||||||
+*_GCC47_IA32_SLINK_PATH = ENV(GCC47_IA32_PREFIX)ar
|
|
||||||
+*_GCC47_IA32_DLINK_PATH = ENV(GCC47_IA32_PREFIX)gcc
|
|
||||||
+*_GCC47_IA32_ASLDLINK_PATH = ENV(GCC47_IA32_PREFIX)gcc
|
|
||||||
+*_GCC47_IA32_ASM_PATH = ENV(GCC47_IA32_PREFIX)gcc
|
|
||||||
+*_GCC47_IA32_PP_PATH = ENV(GCC47_IA32_PREFIX)gcc
|
|
||||||
+*_GCC47_IA32_VFRPP_PATH = ENV(GCC47_IA32_PREFIX)gcc
|
|
||||||
+*_GCC47_IA32_ASLCC_PATH = ENV(GCC47_IA32_PREFIX)gcc
|
|
||||||
+*_GCC47_IA32_ASLPP_PATH = ENV(GCC47_IA32_PREFIX)gcc
|
|
||||||
+*_GCC47_IA32_RC_PATH = ENV(GCC47_IA32_PREFIX)objcopy
|
|
||||||
|
|
||||||
*_GCC47_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32
|
|
||||||
*_GCC47_IA32_ASLDLINK_FLAGS = DEF(GCC47_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386
|
|
||||||
@@ -4905,17 +4884,17 @@ RELEASE_GCC47_IA32_CC_FLAGS = DEF(GCC47_IA32_CC_FLAGS) -Os -Wno-unused-but
|
|
||||||
##################
|
|
||||||
# GCC47 X64 definitions
|
|
||||||
##################
|
|
||||||
-*_GCC47_X64_OBJCOPY_PATH = DEF(GCC47_X64_PREFIX)objcopy
|
|
||||||
-*_GCC47_X64_CC_PATH = DEF(GCC47_X64_PREFIX)gcc
|
|
||||||
-*_GCC47_X64_SLINK_PATH = DEF(GCC47_X64_PREFIX)ar
|
|
||||||
-*_GCC47_X64_DLINK_PATH = DEF(GCC47_X64_PREFIX)gcc
|
|
||||||
-*_GCC47_X64_ASLDLINK_PATH = DEF(GCC47_X64_PREFIX)gcc
|
|
||||||
-*_GCC47_X64_ASM_PATH = DEF(GCC47_X64_PREFIX)gcc
|
|
||||||
-*_GCC47_X64_PP_PATH = DEF(GCC47_X64_PREFIX)gcc
|
|
||||||
-*_GCC47_X64_VFRPP_PATH = DEF(GCC47_X64_PREFIX)gcc
|
|
||||||
-*_GCC47_X64_ASLCC_PATH = DEF(GCC47_X64_PREFIX)gcc
|
|
||||||
-*_GCC47_X64_ASLPP_PATH = DEF(GCC47_X64_PREFIX)gcc
|
|
||||||
-*_GCC47_X64_RC_PATH = DEF(GCC47_X64_PREFIX)objcopy
|
|
||||||
+*_GCC47_X64_OBJCOPY_PATH = ENV(GCC47_X64_PREFIX)objcopy
|
|
||||||
+*_GCC47_X64_CC_PATH = ENV(GCC47_X64_PREFIX)gcc
|
|
||||||
+*_GCC47_X64_SLINK_PATH = ENV(GCC47_X64_PREFIX)ar
|
|
||||||
+*_GCC47_X64_DLINK_PATH = ENV(GCC47_X64_PREFIX)gcc
|
|
||||||
+*_GCC47_X64_ASLDLINK_PATH = ENV(GCC47_X64_PREFIX)gcc
|
|
||||||
+*_GCC47_X64_ASM_PATH = ENV(GCC47_X64_PREFIX)gcc
|
|
||||||
+*_GCC47_X64_PP_PATH = ENV(GCC47_X64_PREFIX)gcc
|
|
||||||
+*_GCC47_X64_VFRPP_PATH = ENV(GCC47_X64_PREFIX)gcc
|
|
||||||
+*_GCC47_X64_ASLCC_PATH = ENV(GCC47_X64_PREFIX)gcc
|
|
||||||
+*_GCC47_X64_ASLPP_PATH = ENV(GCC47_X64_PREFIX)gcc
|
|
||||||
+*_GCC47_X64_RC_PATH = ENV(GCC47_X64_PREFIX)objcopy
|
|
||||||
|
|
||||||
*_GCC47_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64
|
|
||||||
*_GCC47_X64_ASLDLINK_FLAGS = DEF(GCC47_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64
|
|
||||||
@@ -5001,7 +4980,7 @@ RELEASE_GCC47_AARCH64_CC_FLAGS = DEF(GCC47_AARCH64_CC_FLAGS) -Wno-unused-but-s
|
|
||||||
####################################################################################
|
|
||||||
*_GCC48_*_*_FAMILY = GCC
|
|
||||||
|
|
||||||
-*_GCC48_*_MAKE_PATH = DEF(GCC48_IA32_PREFIX)make
|
|
||||||
+*_GCC48_*_MAKE_PATH = make
|
|
||||||
*_GCC48_*_*_DLL = ENV(GCC48_DLL)
|
|
||||||
*_GCC48_*_ASL_PATH = DEF(UNIX_IASL_BIN)
|
|
||||||
*_GCC48_*_DTC_PATH = DEF(DTC_BIN)
|
|
||||||
@@ -5017,17 +4996,17 @@ RELEASE_GCC47_AARCH64_CC_FLAGS = DEF(GCC47_AARCH64_CC_FLAGS) -Wno-unused-but-s
|
|
||||||
##################
|
|
||||||
# GCC48 IA32 definitions
|
|
||||||
##################
|
|
||||||
-*_GCC48_IA32_OBJCOPY_PATH = DEF(GCC48_IA32_PREFIX)objcopy
|
|
||||||
-*_GCC48_IA32_CC_PATH = DEF(GCC48_IA32_PREFIX)gcc
|
|
||||||
-*_GCC48_IA32_SLINK_PATH = DEF(GCC48_IA32_PREFIX)ar
|
|
||||||
-*_GCC48_IA32_DLINK_PATH = DEF(GCC48_IA32_PREFIX)gcc
|
|
||||||
-*_GCC48_IA32_ASLDLINK_PATH = DEF(GCC48_IA32_PREFIX)gcc
|
|
||||||
-*_GCC48_IA32_ASM_PATH = DEF(GCC48_IA32_PREFIX)gcc
|
|
||||||
-*_GCC48_IA32_PP_PATH = DEF(GCC48_IA32_PREFIX)gcc
|
|
||||||
-*_GCC48_IA32_VFRPP_PATH = DEF(GCC48_IA32_PREFIX)gcc
|
|
||||||
-*_GCC48_IA32_ASLCC_PATH = DEF(GCC48_IA32_PREFIX)gcc
|
|
||||||
-*_GCC48_IA32_ASLPP_PATH = DEF(GCC48_IA32_PREFIX)gcc
|
|
||||||
-*_GCC48_IA32_RC_PATH = DEF(GCC48_IA32_PREFIX)objcopy
|
|
||||||
+*_GCC48_IA32_OBJCOPY_PATH = ENV(GCC48_IA32_PREFIX)objcopy
|
|
||||||
+*_GCC48_IA32_CC_PATH = ENV(GCC48_IA32_PREFIX)gcc
|
|
||||||
+*_GCC48_IA32_SLINK_PATH = ENV(GCC48_IA32_PREFIX)ar
|
|
||||||
+*_GCC48_IA32_DLINK_PATH = ENV(GCC48_IA32_PREFIX)gcc
|
|
||||||
+*_GCC48_IA32_ASLDLINK_PATH = ENV(GCC48_IA32_PREFIX)gcc
|
|
||||||
+*_GCC48_IA32_ASM_PATH = ENV(GCC48_IA32_PREFIX)gcc
|
|
||||||
+*_GCC48_IA32_PP_PATH = ENV(GCC48_IA32_PREFIX)gcc
|
|
||||||
+*_GCC48_IA32_VFRPP_PATH = ENV(GCC48_IA32_PREFIX)gcc
|
|
||||||
+*_GCC48_IA32_ASLCC_PATH = ENV(GCC48_IA32_PREFIX)gcc
|
|
||||||
+*_GCC48_IA32_ASLPP_PATH = ENV(GCC48_IA32_PREFIX)gcc
|
|
||||||
+*_GCC48_IA32_RC_PATH = ENV(GCC48_IA32_PREFIX)objcopy
|
|
||||||
|
|
||||||
*_GCC48_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32
|
|
||||||
*_GCC48_IA32_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386
|
|
||||||
@@ -5045,17 +5024,17 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Os -Wno-unused-but
|
|
||||||
##################
|
|
||||||
# GCC48 X64 definitions
|
|
||||||
##################
|
|
||||||
-*_GCC48_X64_OBJCOPY_PATH = DEF(GCC48_X64_PREFIX)objcopy
|
|
||||||
-*_GCC48_X64_CC_PATH = DEF(GCC48_X64_PREFIX)gcc
|
|
||||||
-*_GCC48_X64_SLINK_PATH = DEF(GCC48_X64_PREFIX)ar
|
|
||||||
-*_GCC48_X64_DLINK_PATH = DEF(GCC48_X64_PREFIX)gcc
|
|
||||||
-*_GCC48_X64_ASLDLINK_PATH = DEF(GCC48_X64_PREFIX)gcc
|
|
||||||
-*_GCC48_X64_ASM_PATH = DEF(GCC48_X64_PREFIX)gcc
|
|
||||||
-*_GCC48_X64_PP_PATH = DEF(GCC48_X64_PREFIX)gcc
|
|
||||||
-*_GCC48_X64_VFRPP_PATH = DEF(GCC48_X64_PREFIX)gcc
|
|
||||||
-*_GCC48_X64_ASLCC_PATH = DEF(GCC48_X64_PREFIX)gcc
|
|
||||||
-*_GCC48_X64_ASLPP_PATH = DEF(GCC48_X64_PREFIX)gcc
|
|
||||||
-*_GCC48_X64_RC_PATH = DEF(GCC48_X64_PREFIX)objcopy
|
|
||||||
+*_GCC48_X64_OBJCOPY_PATH = ENV(GCC48_X64_PREFIX)objcopy
|
|
||||||
+*_GCC48_X64_CC_PATH = ENV(GCC48_X64_PREFIX)gcc
|
|
||||||
+*_GCC48_X64_SLINK_PATH = ENV(GCC48_X64_PREFIX)ar
|
|
||||||
+*_GCC48_X64_DLINK_PATH = ENV(GCC48_X64_PREFIX)gcc
|
|
||||||
+*_GCC48_X64_ASLDLINK_PATH = ENV(GCC48_X64_PREFIX)gcc
|
|
||||||
+*_GCC48_X64_ASM_PATH = ENV(GCC48_X64_PREFIX)gcc
|
|
||||||
+*_GCC48_X64_PP_PATH = ENV(GCC48_X64_PREFIX)gcc
|
|
||||||
+*_GCC48_X64_VFRPP_PATH = ENV(GCC48_X64_PREFIX)gcc
|
|
||||||
+*_GCC48_X64_ASLCC_PATH = ENV(GCC48_X64_PREFIX)gcc
|
|
||||||
+*_GCC48_X64_ASLPP_PATH = ENV(GCC48_X64_PREFIX)gcc
|
|
||||||
+*_GCC48_X64_RC_PATH = ENV(GCC48_X64_PREFIX)objcopy
|
|
||||||
|
|
||||||
*_GCC48_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64
|
|
||||||
*_GCC48_X64_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64
|
|
||||||
@@ -5141,7 +5120,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
|
|
||||||
####################################################################################
|
|
||||||
*_GCC49_*_*_FAMILY = GCC
|
|
||||||
|
|
||||||
-*_GCC49_*_MAKE_PATH = DEF(GCC49_IA32_PREFIX)make
|
|
||||||
+*_GCC49_*_MAKE_PATH = make
|
|
||||||
*_GCC49_*_*_DLL = ENV(GCC49_DLL)
|
|
||||||
*_GCC49_*_ASL_PATH = DEF(UNIX_IASL_BIN)
|
|
||||||
*_GCC49_*_DTC_PATH = DEF(DTC_BIN)
|
|
||||||
@@ -5157,17 +5136,17 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s
|
|
||||||
##################
|
|
||||||
# GCC49 IA32 definitions
|
|
||||||
##################
|
|
||||||
-*_GCC49_IA32_OBJCOPY_PATH = DEF(GCC49_IA32_PREFIX)objcopy
|
|
||||||
-*_GCC49_IA32_CC_PATH = DEF(GCC49_IA32_PREFIX)gcc
|
|
||||||
-*_GCC49_IA32_SLINK_PATH = DEF(GCC49_IA32_PREFIX)ar
|
|
||||||
-*_GCC49_IA32_DLINK_PATH = DEF(GCC49_IA32_PREFIX)gcc
|
|
||||||
-*_GCC49_IA32_ASLDLINK_PATH = DEF(GCC49_IA32_PREFIX)gcc
|
|
||||||
-*_GCC49_IA32_ASM_PATH = DEF(GCC49_IA32_PREFIX)gcc
|
|
||||||
-*_GCC49_IA32_PP_PATH = DEF(GCC49_IA32_PREFIX)gcc
|
|
||||||
-*_GCC49_IA32_VFRPP_PATH = DEF(GCC49_IA32_PREFIX)gcc
|
|
||||||
-*_GCC49_IA32_ASLCC_PATH = DEF(GCC49_IA32_PREFIX)gcc
|
|
||||||
-*_GCC49_IA32_ASLPP_PATH = DEF(GCC49_IA32_PREFIX)gcc
|
|
||||||
-*_GCC49_IA32_RC_PATH = DEF(GCC49_IA32_PREFIX)objcopy
|
|
||||||
+*_GCC49_IA32_OBJCOPY_PATH = ENV(GCC49_IA32_PREFIX)objcopy
|
|
||||||
+*_GCC49_IA32_CC_PATH = ENV(GCC49_IA32_PREFIX)gcc
|
|
||||||
+*_GCC49_IA32_SLINK_PATH = ENV(GCC49_IA32_PREFIX)ar
|
|
||||||
+*_GCC49_IA32_DLINK_PATH = ENV(GCC49_IA32_PREFIX)gcc
|
|
||||||
+*_GCC49_IA32_ASLDLINK_PATH = ENV(GCC49_IA32_PREFIX)gcc
|
|
||||||
+*_GCC49_IA32_ASM_PATH = ENV(GCC49_IA32_PREFIX)gcc
|
|
||||||
+*_GCC49_IA32_PP_PATH = ENV(GCC49_IA32_PREFIX)gcc
|
|
||||||
+*_GCC49_IA32_VFRPP_PATH = ENV(GCC49_IA32_PREFIX)gcc
|
|
||||||
+*_GCC49_IA32_ASLCC_PATH = ENV(GCC49_IA32_PREFIX)gcc
|
|
||||||
+*_GCC49_IA32_ASLPP_PATH = ENV(GCC49_IA32_PREFIX)gcc
|
|
||||||
+*_GCC49_IA32_RC_PATH = ENV(GCC49_IA32_PREFIX)objcopy
|
|
||||||
|
|
||||||
*_GCC49_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32
|
|
||||||
*_GCC49_IA32_ASLDLINK_FLAGS = DEF(GCC49_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386
|
|
||||||
@@ -5185,17 +5164,17 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Os -Wno-unused-but
|
|
||||||
##################
|
|
||||||
# GCC49 X64 definitions
|
|
||||||
##################
|
|
||||||
-*_GCC49_X64_OBJCOPY_PATH = DEF(GCC49_X64_PREFIX)objcopy
|
|
||||||
-*_GCC49_X64_CC_PATH = DEF(GCC49_X64_PREFIX)gcc
|
|
||||||
-*_GCC49_X64_SLINK_PATH = DEF(GCC49_X64_PREFIX)ar
|
|
||||||
-*_GCC49_X64_DLINK_PATH = DEF(GCC49_X64_PREFIX)gcc
|
|
||||||
-*_GCC49_X64_ASLDLINK_PATH = DEF(GCC49_X64_PREFIX)gcc
|
|
||||||
-*_GCC49_X64_ASM_PATH = DEF(GCC49_X64_PREFIX)gcc
|
|
||||||
-*_GCC49_X64_PP_PATH = DEF(GCC49_X64_PREFIX)gcc
|
|
||||||
-*_GCC49_X64_VFRPP_PATH = DEF(GCC49_X64_PREFIX)gcc
|
|
||||||
-*_GCC49_X64_ASLCC_PATH = DEF(GCC49_X64_PREFIX)gcc
|
|
||||||
-*_GCC49_X64_ASLPP_PATH = DEF(GCC49_X64_PREFIX)gcc
|
|
||||||
-*_GCC49_X64_RC_PATH = DEF(GCC49_X64_PREFIX)objcopy
|
|
||||||
+*_GCC49_X64_OBJCOPY_PATH = ENV(GCC49_X64_PREFIX)objcopy
|
|
||||||
+*_GCC49_X64_CC_PATH = ENV(GCC49_X64_PREFIX)gcc
|
|
||||||
+*_GCC49_X64_SLINK_PATH = ENV(GCC49_X64_PREFIX)ar
|
|
||||||
+*_GCC49_X64_DLINK_PATH = ENV(GCC49_X64_PREFIX)gcc
|
|
||||||
+*_GCC49_X64_ASLDLINK_PATH = ENV(GCC49_X64_PREFIX)gcc
|
|
||||||
+*_GCC49_X64_ASM_PATH = ENV(GCC49_X64_PREFIX)gcc
|
|
||||||
+*_GCC49_X64_PP_PATH = ENV(GCC49_X64_PREFIX)gcc
|
|
||||||
+*_GCC49_X64_VFRPP_PATH = ENV(GCC49_X64_PREFIX)gcc
|
|
||||||
+*_GCC49_X64_ASLCC_PATH = ENV(GCC49_X64_PREFIX)gcc
|
|
||||||
+*_GCC49_X64_ASLPP_PATH = ENV(GCC49_X64_PREFIX)gcc
|
|
||||||
+*_GCC49_X64_RC_PATH = ENV(GCC49_X64_PREFIX)objcopy
|
|
||||||
|
|
||||||
*_GCC49_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64
|
|
||||||
*_GCC49_X64_ASLDLINK_FLAGS = DEF(GCC49_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64
|
|
||||||
@@ -5287,7 +5266,7 @@ RELEASE_GCC49_AARCH64_DLINK_FLAGS = DEF(GCC49_AARCH64_DLINK_FLAGS)
|
|
||||||
####################################################################################
|
|
||||||
*_GCC5_*_*_FAMILY = GCC
|
|
||||||
|
|
||||||
-*_GCC5_*_MAKE_PATH = DEF(GCC5_IA32_PREFIX)make
|
|
||||||
+*_GCC5_*_MAKE_PATH = make
|
|
||||||
*_GCC5_*_*_DLL = ENV(GCC5_DLL)
|
|
||||||
*_GCC5_*_ASL_PATH = DEF(UNIX_IASL_BIN)
|
|
||||||
*_GCC5_*_DTC_PATH = DEF(DTC_BIN)
|
|
||||||
@@ -5303,17 +5282,17 @@ RELEASE_GCC49_AARCH64_DLINK_FLAGS = DEF(GCC49_AARCH64_DLINK_FLAGS)
|
|
||||||
##################
|
##################
|
||||||
# GCC5 IA32 definitions
|
# GCC5 IA32 definitions
|
||||||
##################
|
##################
|
||||||
|
@ -480,8 +43,8 @@ index e93c2a0..2fc16c1 100755
|
||||||
+*_GCC5_IA32_RC_PATH = ENV(GCC5_IA32_PREFIX)objcopy
|
+*_GCC5_IA32_RC_PATH = ENV(GCC5_IA32_PREFIX)objcopy
|
||||||
|
|
||||||
*_GCC5_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 -fno-lto
|
*_GCC5_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 -fno-lto
|
||||||
*_GCC5_IA32_ASLDLINK_FLAGS = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386
|
*_GCC5_IA32_ASLDLINK_FLAGS = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386 -no-pie
|
||||||
@@ -5335,17 +5314,17 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,
|
@@ -5100,17 +5100,17 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,
|
||||||
##################
|
##################
|
||||||
# GCC5 X64 definitions
|
# GCC5 X64 definitions
|
||||||
##################
|
##################
|
||||||
|
@ -510,6 +73,3 @@ index e93c2a0..2fc16c1 100755
|
||||||
|
|
||||||
*_GCC5_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 -fno-lto
|
*_GCC5_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 -fno-lto
|
||||||
*_GCC5_X64_ASLDLINK_FLAGS = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64
|
*_GCC5_X64_ASLDLINK_FLAGS = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64
|
||||||
--
|
|
||||||
2.14.3
|
|
||||||
|
|
||||||
|
|
115
edk2.spec
115
edk2.spec
|
@ -1,7 +1,7 @@
|
||||||
%global edk2_date 20171011
|
%global edk2_date 20180815
|
||||||
%global edk2_githash 92d07e4
|
%global edk2_githash cb5f4f45ce
|
||||||
%global openssl_version 1.1.0e
|
%global openssl_version 1.1.0h
|
||||||
%global qosb_version 1.1.2
|
%global qosb_version 1.1.3
|
||||||
|
|
||||||
%define qosb_testing 0
|
%define qosb_testing 0
|
||||||
|
|
||||||
|
@ -35,12 +35,14 @@
|
||||||
|
|
||||||
Name: edk2
|
Name: edk2
|
||||||
Version: %{edk2_date}git%{edk2_githash}
|
Version: %{edk2_date}git%{edk2_githash}
|
||||||
Release: 7%{dist}
|
Release: 2%{dist}
|
||||||
Summary: EFI Development Kit II
|
Summary: EFI Development Kit II
|
||||||
|
|
||||||
Group: Applications/Emulators
|
Group: Applications/Emulators
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://www.tianocore.org/edk2/
|
URL: http://www.tianocore.org/edk2/
|
||||||
|
|
||||||
|
# Tarball generated from git object update-tarball.sh script
|
||||||
Source0: edk2-%{edk2_date}-%{edk2_githash}.tar.xz
|
Source0: edk2-%{edk2_date}-%{edk2_githash}.tar.xz
|
||||||
Source1: openssl-%{openssl_version}-hobbled.tar.xz
|
Source1: openssl-%{openssl_version}-hobbled.tar.xz
|
||||||
Source2: ovmf-whitepaper-c770f8c.txt
|
Source2: ovmf-whitepaper-c770f8c.txt
|
||||||
|
@ -55,30 +57,27 @@ Patch0001: 0001-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch
|
||||||
Patch0002: 0002-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-the-DXE-.patch
|
Patch0002: 0002-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-the-DXE-.patch
|
||||||
Patch0003: 0003-OvmfPkg-enable-DEBUG_VERBOSE.patch
|
Patch0003: 0003-OvmfPkg-enable-DEBUG_VERBOSE.patch
|
||||||
Patch0004: 0004-OvmfPkg-increase-max-debug-message-length-to-512.patch
|
Patch0004: 0004-OvmfPkg-increase-max-debug-message-length-to-512.patch
|
||||||
Patch0005: 0005-BuildEnv-override-set-C-noclobber-of-sourcing-env.patch
|
Patch0005: 0005-advertise-OpenSSL-on-TianoCore-splash-screen-boot-lo.patch
|
||||||
Patch0006: 0006-advertise-OpenSSL-on-TianoCore-splash-screen-boot-lo.patch
|
Patch0006: 0006-OvmfPkg-QemuVideoDxe-enable-debug-messages-in-VbeShi.patch
|
||||||
Patch0008: 0008-OvmfPkg-QemuVideoDxe-enable-debug-messages-in-VbeShi.patch
|
Patch0007: 0007-MdeModulePkg-TerminalDxe-add-other-text-resolutions.patch
|
||||||
Patch0009: 0009-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch
|
Patch0008: 0008-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch
|
||||||
Patch0010: 0010-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch
|
Patch0009: 0009-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch
|
||||||
Patch0011: 0011-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch
|
Patch0010: 0010-ArmVirtPkg-QemuFwCfgLib-allow-UEFI_DRIVER-client-mod.patch
|
||||||
Patch0012: 0012-ArmVirtPkg-QemuFwCfgLib-allow-UEFI_DRIVER-client-mod.patch
|
Patch0011: 0011-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch
|
||||||
Patch0013: 0013-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch
|
Patch0012: 0012-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch
|
||||||
Patch0014: 0014-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch
|
Patch0013: 0013-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch
|
||||||
Patch0015: 0015-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch
|
Patch0014: 0014-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch
|
||||||
Patch0016: 0016-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch
|
Patch0015: 0015-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch
|
||||||
Patch0017: 0017-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch
|
Patch0016: 0016-ArmVirtPkg-set-early-hello-message-RH-only.patch
|
||||||
Patch0018: 0018-ArmVirtPkg-set-early-hello-message.patch
|
# Fix passing through RPM build flags (bz 1540244)
|
||||||
|
Patch0017: 0017-BaseTools-footer.makefile-expand-BUILD_CFLAGS-last-f.patch
|
||||||
# upstream backports
|
Patch0018: 0018-BaseTools-header.makefile-remove-c-from-BUILD_CFLAGS.patch
|
||||||
Patch0019: 0019-MdeModulePkg-PciBus-Fix-bug-that-PCI-BUS-claims-too-much-resource.patch
|
Patch0019: 0019-BaseTools-Source-C-split-O2-to-BUILD_OPTFLAGS.patch
|
||||||
Patch0020: 0020-MdeModulePkg-Bds-Remove-assertion-in-BmCharToUint.patch
|
Patch0020: 0020-BaseTools-Source-C-take-EXTRA_OPTFLAGS-from-the-call.patch
|
||||||
Patch0021: 0021-MdeModulePkg-Bds-Check-variable-name-even-if-OptionNumber-is-NULL.patch
|
Patch0021: 0021-BaseTools-Source-C-take-EXTRA_LDFLAGS-from-the-calle.patch
|
||||||
Patch0022: 0022-OvmfPkg-make-it-a-proper-BASE-library.patch
|
Patch0022: 0022-BaseTools-VfrCompile-honor-EXTRA_LDFLAGS.patch
|
||||||
Patch0023: 0023-OvmfPkg-create-a-separate-PlatformDebugLibIoPort-ins.patch
|
# Fix UEFI netboot
|
||||||
Patch0024: 0024-OvmfPkg-save-on-I-O-port-accesses-when-the-debug-por.patch
|
Patch0023: 0023-NetworkPkg-UefiPxeBcDxe-Add-EXCLUSIVE-attribute-when.patch
|
||||||
Patch0025: 0025-BaseTools-header.makefile-add-Wno-stringop-truncatio.patch
|
|
||||||
Patch0026: 0026-BaseTools-header.makefile-add-Wno-restrict.patch
|
|
||||||
Patch0027: 0027-BaseTools-GenVtf-silence-false-stringop-overflow-war.patch
|
|
||||||
|
|
||||||
%if 0%{?cross:1}
|
%if 0%{?cross:1}
|
||||||
# Tweak the tools_def to support cross-compiling.
|
# Tweak the tools_def to support cross-compiling.
|
||||||
|
@ -173,7 +172,10 @@ variable files to enforce Secure Boot.
|
||||||
%if 0%{?build_ovmf_x64:1}
|
%if 0%{?build_ovmf_x64:1}
|
||||||
%package ovmf
|
%package ovmf
|
||||||
Summary: Open Virtual Machine Firmware
|
Summary: Open Virtual Machine Firmware
|
||||||
|
# OVMF includes the Secure Boot and IPv6 features; it has a builtin OpenSSL
|
||||||
|
# library.
|
||||||
License: BSD and OpenSSL
|
License: BSD and OpenSSL
|
||||||
|
Provides: bundled(openssl)
|
||||||
Provides: OVMF = %{version}-%{release}
|
Provides: OVMF = %{version}-%{release}
|
||||||
Obsoletes: OVMF < %{version}-%{release}
|
Obsoletes: OVMF < %{version}-%{release}
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
@ -185,7 +187,10 @@ Open Virtual Machine Firmware (x64)
|
||||||
%if 0%{?build_ovmf_ia32:1}
|
%if 0%{?build_ovmf_ia32:1}
|
||||||
%package ovmf-ia32
|
%package ovmf-ia32
|
||||||
Summary: Open Virtual Machine Firmware
|
Summary: Open Virtual Machine Firmware
|
||||||
|
# OVMF includes the Secure Boot and IPv6 features; it has a builtin OpenSSL
|
||||||
|
# library.
|
||||||
License: BSD and OpenSSL
|
License: BSD and OpenSSL
|
||||||
|
Provides: bundled(openssl)
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%description ovmf-ia32
|
%description ovmf-ia32
|
||||||
EFI Development Kit II
|
EFI Development Kit II
|
||||||
|
@ -198,6 +203,9 @@ Summary: AARCH64 Virtual Machine Firmware
|
||||||
Provides: AAVMF = %{version}-%{release}
|
Provides: AAVMF = %{version}-%{release}
|
||||||
Obsoletes: AAVMF < %{version}-%{release}
|
Obsoletes: AAVMF < %{version}-%{release}
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
# No Secure Boot for AAVMF yet, but we include OpenSSL for the IPv6 stack.
|
||||||
|
License: BSD and OpenSSL
|
||||||
|
Provides: bundled(openssl)
|
||||||
%description aarch64
|
%description aarch64
|
||||||
EFI Development Kit II
|
EFI Development Kit II
|
||||||
AARCH64 UEFI Firmware
|
AARCH64 UEFI Firmware
|
||||||
|
@ -223,11 +231,10 @@ rm -rf EdkShellPkg
|
||||||
rm -rf FatBinPkg
|
rm -rf FatBinPkg
|
||||||
rm -rf ShellBinPkg
|
rm -rf ShellBinPkg
|
||||||
|
|
||||||
|
# copy whitepaper into place
|
||||||
cp -a -- %{SOURCE2} .
|
cp -a -- %{SOURCE2} .
|
||||||
|
# extract openssl into place
|
||||||
# add openssl
|
tar -xvf %{SOURCE1} --strip-components=1
|
||||||
(cd .. && tar -xvf %{SOURCE1})
|
|
||||||
cp CryptoPkg/Library/OpensslLib/openssl/LICENSE LICENSE.openssl
|
|
||||||
|
|
||||||
# Extract QOSB
|
# Extract QOSB
|
||||||
tar -xvf %{SOURCE3}
|
tar -xvf %{SOURCE3}
|
||||||
|
@ -241,7 +248,7 @@ base64 --decode < MdeModulePkg/Logo/Logo-OpenSSL.bmp.b64 > MdeModulePkg/Logo/Log
|
||||||
source ./edksetup.sh
|
source ./edksetup.sh
|
||||||
|
|
||||||
# compiler
|
# compiler
|
||||||
CC_FLAGS="-t GCC49"
|
CC_FLAGS="-t GCC5"
|
||||||
|
|
||||||
# parallel builds
|
# parallel builds
|
||||||
JOBS="%{?_smp_mflags}"
|
JOBS="%{?_smp_mflags}"
|
||||||
|
@ -251,8 +258,9 @@ if test "$JOBS" != ""; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# common features
|
# common features
|
||||||
CC_FLAGS="${CC_FLAGS} -b DEBUG"
|
CC_FLAGS="$CC_FLAGS --cmd-len=65536 -t %{TOOLCHAIN} -b DEBUG --hash"
|
||||||
CC_FLAGS="${CC_FLAGS} --cmd-len=65536"
|
CC_FLAGS="$CC_FLAGS -D NETWORK_IP6_ENABLE"
|
||||||
|
CC_FLAGS="$CC_FLAGS -D TPM2_ENABLE"
|
||||||
|
|
||||||
# ovmf features
|
# ovmf features
|
||||||
OVMF_FLAGS="${CC_FLAGS}"
|
OVMF_FLAGS="${CC_FLAGS}"
|
||||||
|
@ -272,15 +280,17 @@ ARM_FLAGS="${CC_FLAGS}"
|
||||||
ARM_FLAGS="${ARM_FLAGS} -D DEBUG_PRINT_ERROR_LEVEL=0x8040004F"
|
ARM_FLAGS="${ARM_FLAGS} -D DEBUG_PRINT_ERROR_LEVEL=0x8040004F"
|
||||||
|
|
||||||
unset MAKEFLAGS
|
unset MAKEFLAGS
|
||||||
make -C BaseTools #%{?_smp_mflags}
|
make -C BaseTools %{?_smp_mflags} \
|
||||||
|
EXTRA_OPTFLAGS="%{optflags}" \
|
||||||
|
EXTRA_LDFLAGS="%{__global_ldflags}"
|
||||||
sed -i -e 's/-Werror//' Conf/tools_def.txt
|
sed -i -e 's/-Werror//' Conf/tools_def.txt
|
||||||
|
|
||||||
|
|
||||||
%if 0%{?cross:1}
|
%if 0%{?cross:1}
|
||||||
export GCC49_IA32_PREFIX="x86_64-linux-gnu-"
|
export GCC5_IA32_PREFIX="x86_64-linux-gnu-"
|
||||||
export GCC49_X64_PREFIX="x86_64-linux-gnu-"
|
export GCC5_X64_PREFIX="x86_64-linux-gnu-"
|
||||||
export GCC49_AARCH64_PREFIX="aarch64-linux-gnu-"
|
export GCC5_AARCH64_PREFIX="aarch64-linux-gnu-"
|
||||||
export GCC49_ARM_PREFIX="arm-linux-gnu-"
|
export GCC5_ARM_PREFIX="arm-linux-gnu-"
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# build ovmf (x64)
|
# build ovmf (x64)
|
||||||
|
@ -367,6 +377,7 @@ python3 qemu-ovmf-secureboot-%{qosb_version}/ovmf-vars-generator \
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
cp CryptoPkg/Library/OpensslLib/openssl/LICENSE LICENSE.openssl
|
||||||
mkdir -p %{buildroot}%{_bindir} \
|
mkdir -p %{buildroot}%{_bindir} \
|
||||||
%{buildroot}%{_datadir}/%{name}/Conf \
|
%{buildroot}%{_datadir}/%{name}/Conf \
|
||||||
%{buildroot}%{_datadir}/%{name}/Scripts
|
%{buildroot}%{_datadir}/%{name}/Scripts
|
||||||
|
@ -420,8 +431,10 @@ install qemu-ovmf-secureboot-%{qosb_version}/ovmf-vars-generator %{buildroot}%{_
|
||||||
|
|
||||||
%files tools
|
%files tools
|
||||||
%license License.txt
|
%license License.txt
|
||||||
|
%license LICENSE.openssl
|
||||||
%{_bindir}/BootSectImage
|
%{_bindir}/BootSectImage
|
||||||
%{_bindir}/Brotli
|
%{_bindir}/Brotli
|
||||||
|
%{_bindir}/DevicePath
|
||||||
%{_bindir}/EfiLdrImage
|
%{_bindir}/EfiLdrImage
|
||||||
%{_bindir}/EfiRom
|
%{_bindir}/EfiRom
|
||||||
%{_bindir}/GenCrc32
|
%{_bindir}/GenCrc32
|
||||||
|
@ -516,6 +529,26 @@ install qemu-ovmf-secureboot-%{qosb_version}/ovmf-vars-generator %{buildroot}%{_
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Nov 9 2018 Paolo Bonzini <pbonzini@redhat.com> - 20180815gitcb5f4f45ce-2
|
||||||
|
- Fix network boot via grub (bz 1648476)
|
||||||
|
|
||||||
|
* Fri Aug 31 2018 Cole Robinson <crobinso@redhat.com> - 20180815gitcb5f4f45ce-1
|
||||||
|
- Update to edk2 git cb5f4f45ce, edk2-stable201808
|
||||||
|
|
||||||
|
* Mon Jul 23 2018 Paolo Bonzini <pbonzini@redhat.com> - 20180529gitee3198e672e2-4
|
||||||
|
- Fixes for AMD SEV on OVMF_CODE.fd
|
||||||
|
- Add Provides for bundled OpenSSL
|
||||||
|
|
||||||
|
* Wed Jul 18 2018 Paolo Bonzini <pbonzini@redhat.com> - 20180529gitee3198e672e2-3
|
||||||
|
- Enable IPv6
|
||||||
|
|
||||||
|
* Wed Jun 20 2018 Paolo Bonzini <pbonzini@redhat.com> - 20180529gitee3198e672e2-2
|
||||||
|
- Backport two bug fixes from RHEL: connect again virtio-rng devices, and
|
||||||
|
connect consoles unconditionally in OVMF (ARM firmware already did it)
|
||||||
|
|
||||||
|
* Tue May 29 2018 Paolo Bonzini <pbonzini@redhat.com> - 20180529gitee3198e672e2-1
|
||||||
|
- Rebase to ee3198e672e2
|
||||||
|
|
||||||
* Tue May 01 2018 Cole Robinson <crobinso@redhat.com> - 20171011git92d07e4-7
|
* Tue May 01 2018 Cole Robinson <crobinso@redhat.com> - 20171011git92d07e4-7
|
||||||
- Bump release for new build
|
- Bump release for new build
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
diff -up a/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bss_fd.c.preserve-nl a/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bss_fd.c
|
diff --git a/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bss_fd.c b/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bss_fd.c
|
||||||
--- a/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bss_fd.c.preserve-nl 2016-11-10 15:03:44.000000000 +0100
|
index 2bd3517..a886655 100644
|
||||||
+++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bss_fd.c 2016-12-22 14:36:16.730740423 +0100
|
--- a/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bss_fd.c
|
||||||
@@ -202,8 +202,10 @@ static int fd_gets(BIO *bp, char *buf, i
|
+++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bss_fd.c
|
||||||
|
@@ -204,8 +204,10 @@ static int fd_gets(BIO *bp, char *buf, int size)
|
||||||
char *ptr = buf;
|
char *ptr = buf;
|
||||||
char *end = buf + size - 1;
|
char *end = buf + size - 1;
|
||||||
|
|
||||||
|
@ -14,10 +15,11 @@ diff -up a/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bss_fd.c.preserve-nl
|
||||||
|
|
||||||
ptr[0] = '\0';
|
ptr[0] = '\0';
|
||||||
|
|
||||||
diff -up a/CryptoPkg/Library/OpensslLib/openssl/doc/crypto/BIO_read.pod.preserve-nl a/CryptoPkg/Library/OpensslLib/openssl/doc/crypto/BIO_read.pod
|
diff --git a/CryptoPkg/Library/OpensslLib/openssl/doc/crypto/BIO_read.pod b/CryptoPkg/Library/OpensslLib/openssl/doc/crypto/BIO_read.pod
|
||||||
--- a/CryptoPkg/Library/OpensslLib/openssl/doc/crypto/BIO_read.pod.preserve-nl 2016-11-10 15:03:45.000000000 +0100
|
index 45871c1..fe70e9f 100644
|
||||||
+++ b/CryptoPkg/Library/OpensslLib/openssl/doc/crypto/BIO_read.pod 2016-12-22 14:37:22.731245197 +0100
|
--- a/CryptoPkg/Library/OpensslLib/openssl/doc/crypto/BIO_read.pod
|
||||||
@@ -23,7 +23,8 @@ in B<buf>. Usually this operation will a
|
+++ b/CryptoPkg/Library/OpensslLib/openssl/doc/crypto/BIO_read.pod
|
||||||
|
@@ -23,7 +23,8 @@ in B<buf>. Usually this operation will attempt to read a line of data
|
||||||
from the BIO of maximum length B<len-1>. There are exceptions to this,
|
from the BIO of maximum length B<len-1>. There are exceptions to this,
|
||||||
however; for example, BIO_gets() on a digest BIO will calculate and
|
however; for example, BIO_gets() on a digest BIO will calculate and
|
||||||
return the digest and other BIOs may not support BIO_gets() at all.
|
return the digest and other BIOs may not support BIO_gets() at all.
|
||||||
|
@ -27,3 +29,6 @@ diff -up a/CryptoPkg/Library/OpensslLib/openssl/doc/crypto/BIO_read.pod.preserve
|
||||||
|
|
||||||
BIO_write() attempts to write B<len> bytes from B<buf> to BIO B<b>.
|
BIO_write() attempts to write B<len> bytes from B<buf> to BIO B<b>.
|
||||||
|
|
||||||
|
--
|
||||||
|
2.17.0
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
diff -up a/CryptoPkg/Library/OpensslLib/openssl/crypto/rsa/rsa_gen.c.cc-reqs b/CryptoPkg/Library/OpensslLib/openssl/crypto/rsa/rsa_gen.c
|
--- a/CryptoPkg/Library/OpensslLib/openssl/crypto/rsa/rsa_gen.c
|
||||||
--- a/CryptoPkg/Library/OpensslLib/openssl/crypto/rsa/rsa_gen.c.cc-reqs 2017-01-26 14:10:23.000000000 +0100
|
+++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/rsa/rsa_gen.c
|
||||||
+++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/rsa/rsa_gen.c 2017-01-26 16:01:52.622308528 +0100
|
@@ -86,6 +86,12 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value,
|
||||||
@@ -75,6 +75,12 @@ static int rsa_builtin_keygen(RSA *rsa,
|
|
||||||
if (!rsa->iqmp && ((rsa->iqmp = BN_secure_new()) == NULL))
|
if (!rsa->iqmp && ((rsa->iqmp = BN_secure_new()) == NULL))
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
|
@ -14,14 +13,17 @@ diff -up a/CryptoPkg/Library/OpensslLib/openssl/crypto/rsa/rsa_gen.c.cc-reqs b/C
|
||||||
if (BN_copy(rsa->e, e_value) == NULL)
|
if (BN_copy(rsa->e, e_value) == NULL)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
@@ -103,7 +109,9 @@ static int rsa_builtin_keygen(RSA *rsa,
|
@@ -118,7 +124,9 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value,
|
||||||
do {
|
do {
|
||||||
if (!BN_generate_prime_ex(rsa->q, bitsq, 0, NULL, NULL, cb))
|
if (!BN_generate_prime_ex(rsa->q, bitsq, 0, NULL, NULL, cb))
|
||||||
goto err;
|
goto err;
|
||||||
- } while ((BN_cmp(rsa->p, rsa->q) == 0) && (++degenerate < 3));
|
- } while (BN_cmp(rsa->p, rsa->q) == 0);
|
||||||
+ if (!BN_sub(r2, rsa->q, rsa->p))
|
+ if (!BN_sub(r2, rsa->q, rsa->p))
|
||||||
+ goto err;
|
+ goto err;
|
||||||
+ } while ((BN_ucmp(r2, r3) <= 0) && (++degenerate < 3));
|
+ } while (BN_ucmp(r2, r3) <= 0);
|
||||||
if (degenerate == 3) {
|
if (!BN_sub(r2, rsa->q, BN_value_one()))
|
||||||
ok = 0; /* we set our own err */
|
goto err;
|
||||||
RSAerr(RSA_F_RSA_BUILTIN_KEYGEN, RSA_R_KEY_SIZE_TOO_SMALL);
|
ERR_set_mark();
|
||||||
|
--
|
||||||
|
2.17.0
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
diff -up a/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c.disable-ssl3 b/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c
|
diff --git a/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c b/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c
|
||||||
--- a/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c.disable-ssl3 2016-08-25 17:29:22.000000000 +0200
|
index 8a190d2..6b4c5ae 100644
|
||||||
+++ b/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c 2016-09-08 11:08:05.252082263 +0200
|
--- a/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c
|
||||||
@@ -2470,6 +2470,13 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *m
|
+++ b/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c
|
||||||
|
@@ -2653,6 +2653,13 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth)
|
||||||
* or by using the SSL_CONF library.
|
* or by using the SSL_CONF library.
|
||||||
*/
|
*/
|
||||||
ret->options |= SSL_OP_NO_COMPRESSION;
|
ret->options |= SSL_OP_NO_COMPRESSION;
|
||||||
|
@ -15,19 +16,20 @@ diff -up a/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c.disable-ssl3 b/Cry
|
||||||
|
|
||||||
ret->tlsext_status_type = -1;
|
ret->tlsext_status_type = -1;
|
||||||
|
|
||||||
diff -up a/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c.disable-ssl3 b/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c
|
diff --git a/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c b/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c
|
||||||
--- a/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c.disable-ssl3 2016-09-08 11:08:05.252082263 +0200
|
index 2cbbddd..1a409d1 100644
|
||||||
+++ b/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c 2016-09-08 11:11:44.802005886 +0200
|
--- a/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c
|
||||||
@@ -258,6 +258,7 @@ static int execute_test(SSL_TEST_FIXTURE
|
+++ b/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c
|
||||||
|
@@ -277,6 +277,7 @@ static int execute_test(SSL_TEST_FIXTURE fixture)
|
||||||
SSL_TEST_SERVERNAME_CB_NONE) {
|
SSL_TEST_SERVERNAME_CB_NONE) {
|
||||||
server2_ctx = SSL_CTX_new(TLS_server_method());
|
server2_ctx = SSL_CTX_new(TLS_server_method());
|
||||||
TEST_check(server2_ctx != NULL);
|
TEST_check(server2_ctx != NULL);
|
||||||
+ SSL_CTX_clear_options(server2_ctx, SSL_OP_NO_SSLv3);
|
+ SSL_CTX_clear_options(server2_ctx, SSL_OP_NO_SSLv3);
|
||||||
}
|
}
|
||||||
client_ctx = SSL_CTX_new(TLS_client_method());
|
client_ctx = SSL_CTX_new(TLS_client_method());
|
||||||
|
TEST_check(SSL_CTX_set_max_proto_version(client_ctx, TLS_MAX_VERSION));
|
||||||
@@ -266,11 +267,15 @@ static int execute_test(SSL_TEST_FIXTURE
|
@@ -290,11 +291,15 @@ static int execute_test(SSL_TEST_FIXTURE fixture)
|
||||||
resume_client_ctx = SSL_CTX_new(TLS_client_method());
|
TLS_MAX_VERSION));
|
||||||
TEST_check(resume_server_ctx != NULL);
|
TEST_check(resume_server_ctx != NULL);
|
||||||
TEST_check(resume_client_ctx != NULL);
|
TEST_check(resume_client_ctx != NULL);
|
||||||
+ SSL_CTX_clear_options(resume_server_ctx, SSL_OP_NO_SSLv3);
|
+ SSL_CTX_clear_options(resume_server_ctx, SSL_OP_NO_SSLv3);
|
||||||
|
@ -42,10 +44,11 @@ diff -up a/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c.disable-ssl3 b/C
|
||||||
|
|
||||||
TEST_check(CONF_modules_load(conf, fixture.test_app, 0) > 0);
|
TEST_check(CONF_modules_load(conf, fixture.test_app, 0) > 0);
|
||||||
|
|
||||||
diff -up a/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c.disable-ssl3 b/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c
|
diff --git a/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c b/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c
|
||||||
--- a/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c.disable-ssl3 2016-08-25 17:29:23.000000000 +0200
|
index e77c692..e586072 100644
|
||||||
+++ b/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c 2016-09-08 11:08:05.253082286 +0200
|
--- a/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c
|
||||||
@@ -1456,6 +1456,11 @@ int main(int argc, char *argv[])
|
+++ b/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c
|
||||||
|
@@ -1460,6 +1460,11 @@ int main(int argc, char *argv[])
|
||||||
ERR_print_errors(bio_err);
|
ERR_print_errors(bio_err);
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
@ -57,3 +60,6 @@ diff -up a/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c.disable-ssl3
|
||||||
/*
|
/*
|
||||||
* Since we will use low security ciphersuites and keys for testing set
|
* Since we will use low security ciphersuites and keys for testing set
|
||||||
* security level to zero by default. Tests can override this by adding
|
* security level to zero by default. Tests can override this by adding
|
||||||
|
--
|
||||||
|
2.17.0
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
diff -up a/CryptoPkg/Library/OpensslLib/openssl/crypto/x509/x509_cmp.c.issuer-hash b/CryptoPkg/Library/OpensslLib/openssl/crypto/x509/x509_cmp.c
|
--- a/CryptoPkg/Library/OpensslLib/openssl/crypto/x509/x509_cmp.c
|
||||||
--- a/CryptoPkg/Library/OpensslLib/openssl/crypto/x509/x509_cmp.c.issuer-hash 2016-07-18 15:16:32.788881100 +0200
|
+++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/x509/x509_cmp.c
|
||||||
+++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/x509/x509_cmp.c 2016-07-18 15:17:16.671871840 +0200
|
@@ -39,6 +39,7 @@ unsigned long X509_issuer_and_serial_hash(X509 *a)
|
||||||
@@ -87,6 +87,7 @@ unsigned long X509_issuer_and_serial_has
|
|
||||||
|
|
||||||
if (ctx == NULL)
|
if (ctx == NULL)
|
||||||
goto err;
|
goto err;
|
||||||
|
@ -9,3 +8,6 @@ diff -up a/CryptoPkg/Library/OpensslLib/openssl/crypto/x509/x509_cmp.c.issuer-ha
|
||||||
f = X509_NAME_oneline(a->cert_info.issuer, NULL, 0);
|
f = X509_NAME_oneline(a->cert_info.issuer, NULL, 0);
|
||||||
if (!EVP_DigestInit_ex(ctx, EVP_md5(), NULL))
|
if (!EVP_DigestInit_ex(ctx, EVP_md5(), NULL))
|
||||||
goto err;
|
goto err;
|
||||||
|
--
|
||||||
|
2.17.0
|
||||||
|
|
||||||
|
|
|
@ -12,9 +12,9 @@
|
||||||
fedpkg switch-branch master
|
fedpkg switch-branch master
|
||||||
gitk -- sources
|
gitk -- sources
|
||||||
|
|
||||||
# the commit that added the 1.1.0e hobbled tarball is c676ac32d544,
|
# the commit that added the 1.1.0h hobbled tarball is 6eb8f620273
|
||||||
# subject "update to upstream version 1.1.0e"
|
# subject "update to upstream version 1.1.0h"
|
||||||
git checkout c676ac32d544
|
git checkout 6eb8f620273
|
||||||
|
|
||||||
# fetch the hobbled tarball and verify the checksum
|
# fetch the hobbled tarball and verify the checksum
|
||||||
(
|
(
|
||||||
|
@ -32,15 +32,16 @@
|
||||||
# unpack the hobbled tarball into edk2, according to
|
# unpack the hobbled tarball into edk2, according to
|
||||||
# "OpenSSL-HOWTO.txt"; WORKSPACE stands for the root of the edk2 project
|
# "OpenSSL-HOWTO.txt"; WORKSPACE stands for the root of the edk2 project
|
||||||
# tree
|
# tree
|
||||||
tar -x --xz -f openssl-1.1.0e-hobbled.tar.xz
|
tar -x --xz -f openssl-1.1.0h-hobbled.tar.xz
|
||||||
mv -- openssl-1.1.0e "$WORKSPACE"/CryptoPkg/Library/OpensslLib/openssl
|
mv -- openssl-1.1.0h "$WORKSPACE"/CryptoPkg/Library/OpensslLib/openssl
|
||||||
|
|
||||||
# update the INF files as described in "OpenSSL-HOWTO.txt", then save
|
# update the INF files as described in "OpenSSL-HOWTO.txt", then save
|
||||||
# the results as a single commit
|
# the results as a single commit
|
||||||
cd "$WORKSPACE"/CryptoPkg/Library/OpensslLib
|
(cd "$WORKSPACE"/CryptoPkg/Library/OpensslLib && perl process_files.pl)
|
||||||
perl process_files.pl
|
git rm --cached CryptoPkg/Library/OpensslLib/openssl
|
||||||
git add -A
|
git commit -m'remove openssl submodule'
|
||||||
git commit
|
git add -A CryptoPkg/Library/OpensslLib/openssl
|
||||||
|
git commit -m'add openssl 1.1.0h'
|
||||||
git format-patch -1
|
git format-patch -1
|
||||||
|
|
||||||
Then run the patch through this script which will build a new tar file.
|
Then run the patch through this script which will build a new tar file.
|
||||||
|
|
6
sources
6
sources
|
@ -1,3 +1,3 @@
|
||||||
SHA512 (edk2-20171011-92d07e4.tar.xz) = b7afcefd21470df730648c32455d19e0e31caf15d6a9aedc36a1c390fccddd18719d2710cdd01cf6156bb7551c67fce2a3073bf640b756c32184d889a8d40d46
|
SHA512 (qemu-ovmf-secureboot-1.1.3.tar.gz) = f830a525f66379e8e3c61d006fab49547e6709f7aa0f95e70f23c7d26407cc804a0ced9dcfd26af63391d603e9cb5a0714c222c7cdca8599e41852e22e13be80
|
||||||
SHA512 (openssl-1.1.0e-hobbled.tar.xz) = 25e7d5bddd28501de3f1488c91f4effb0e271986c836302680ea3754d73dceb1d34dd7460096bc28d3c0bced7dd5736dda15ccf5936d9313f4587f68a256efbc
|
SHA512 (openssl-1.1.0h-hobbled.tar.xz) = 6b544a5560a0a3d59b368e3f216284e79389112c87bb34289f8f6644a2454407161a1755b292e8045ff7c172237b070973b03610fd1da3d5204f4118a8644724
|
||||||
SHA512 (qemu-ovmf-secureboot-1.1.2.tar.gz) = 4dd7e06663bde90cea99849d47d4c94c48d573ac0454e56eab9174ade999b4dcef73fea63a9bc64d2bccecf8f69c9df2945b237a2f95a08c83d42d744e76d687
|
SHA512 (edk2-20180815-cb5f4f45ce.tar.xz) = 2912bb30b5be1d7efc1b7aa6d337fd1403fc9ea7cfc580c22dd770d82273ce4c801eba2d60a6f2fda4bc1c6e49747be606de4acfdcca286c10e44b11369cde9d
|
||||||
|
|
Loading…
Reference in New Issue