[edk2-devel] [PATCH] UefiPayloadPkg: Fix the build failure
Add double quotes to LlvmObjcopyPath.
Blank space in LlvmObjcopyPath will cause build failure.
This build failure is introduced by 2306555bf908 (
"UefiPayloadPkg: Fix IA32 entry build failure").
Signed-off-by: Dun Tan
Cc: Ray Ni
Cc: Guo Dong
Cc: Benjamin You
Cc: Sean Rhodes
---
UefiPayloadPkg/UniversalPayloadBuild.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py
b/UefiPayloadPkg/UniversalPayloadBuild.py
index 8af381336d..50335d4316 100644
--- a/UefiPayloadPkg/UniversalPayloadBuild.py
+++ b/UefiPayloadPkg/UniversalPayloadBuild.py
@@ -111,9 +111,9 @@ def BuildUniversalPayload(Args, MacroList):
#
# Copy the DXEFV as a section in elf format Universal Payload entry.
#
-remove_section = f"{LlvmObjcopyPath} -I {ObjCopyFlag} -O {ObjCopyFlag}
--remove-section .upld_info --remove-section .upld.uefi_fv {EntryOutputDir}"
-add_section= f"{LlvmObjcopyPath} -I {ObjCopyFlag} -O {ObjCopyFlag}
--add-section .upld_info={UpldInfoFile} --add-section
.upld.uefi_fv={FvOutputDir} {EntryOutputDir}"
-set_section= f"{LlvmObjcopyPath} -I {ObjCopyFlag} -O {ObjCopyFlag}
--set-section-alignment .upld.upld_info=16 --set-section-alignment
.upld.uefi_fv=16 {EntryOutputDir}"
+remove_section = f'"{LlvmObjcopyPath}" -I {ObjCopyFlag} -O {ObjCopyFlag}
--remove-section .upld_info --remove-section .upld.uefi_fv {EntryOutputDir}'
+add_section= f'"{LlvmObjcopyPath}" -I {ObjCopyFlag} -O {ObjCopyFlag}
--add-section .upld_info={UpldInfoFile} --add-section
.upld.uefi_fv={FvOutputDir} {EntryOutputDir}'
+set_section= f'"{LlvmObjcopyPath}" -I {ObjCopyFlag} -O {ObjCopyFlag}
--set-section-alignment .upld.upld_info=16 --set-section-alignment
.upld.uefi_fv=16 {EntryOutputDir}'
RunCommand(remove_section)
RunCommand(add_section)
RunCommand(set_section)
--
2.31.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#89555): https://edk2.groups.io/g/devel/message/89555
Mute This Topic: https://groups.io/mt/90931912/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel][PATCH] UefiPayloadPkg: Fix the build failure
Acked-by: Dun Tan
-Original Message-
From: devel@edk2.groups.io On Behalf Of Guo Dong
Sent: Thursday, April 14, 2022 4:49 AM
To: devel@edk2.groups.io
Cc: Dong, Guo ; Ni, Ray ; You, Benjamin
; Rhodes, Sean
Subject: [edk2-devel][PATCH] UefiPayloadPkg: Fix the build failure
From: Guo Dong
When Quite parameter is not provided, its default value would be "None" instead
of "". So update its default value not to impact the build.
Cc: Ray Ni
Cc: Benjamin You
Cc: Sean Rhodes
Signed-off-by: Guo Dong
---
UefiPayloadPkg/UniversalPayloadBuild.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py
b/UefiPayloadPkg/UniversalPayloadBuild.py
index 2796c310a7..99410d244d 100644
--- a/UefiPayloadPkg/UniversalPayloadBuild.py
+++ b/UefiPayloadPkg/UniversalPayloadBuild.py
@@ -53,7 +53,7 @@ def RunCommand(cmd):
def BuildUniversalPayload(Args, MacroList): BuildTarget = Args.Target
ToolChain = Args.ToolChain-Quiet = Args.Quiet+Quiet = "--quiet" if
Args.Quiet else "" BuildArch = "X64" if Args.Arch == 'X64' else "IA32 -a
X64" ElfToolChain = 'CLANGDWARF' @@ -121,7 +121,7 @@ def main():
parser.add_argument('-a', '--Arch', choices=['IA32', 'X64'], help='Specify
the ARCH for payload entry module. Default build X64 image.', default ='X64')
parser.add_argument("-D", "--Macro", action="append",
default=["UNIVERSAL_PAYLOAD=TRUE"]) parser.add_argument('-i', '--ImageId',
type=str, help='Specify payload ID (16 bytes maximal).', default ='UEFI')-
parser.add_argument('-q', '--Quiet')+parser.add_argument('-q', '--Quiet',
action='store_true', help='Disable all build messages except FATAL ERRORS.')
MacroList = {} args = parser.parse_args() if args.Macro is not None:--
2.35.1.windows.2
-=-=-=-=-=-=
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#3): https://edk2.groups.io/g/devel/message/3
Mute This Topic: https://groups.io/mt/90450653/6168883
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [dun@intel.com]
-=-=-=-=-=-=
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#88894): https://edk2.groups.io/g/devel/message/88894
Mute This Topic: https://groups.io/mt/90450653/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel][PATCH] UefiPayloadPkg: Fix the build failure
From: Guo Dong
When Quite parameter is not provided, its default value would
be "None" instead of "". So update its default value not to
impact the build.
Cc: Ray Ni
Cc: Benjamin You
Cc: Sean Rhodes
Signed-off-by: Guo Dong
---
UefiPayloadPkg/UniversalPayloadBuild.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py
b/UefiPayloadPkg/UniversalPayloadBuild.py
index 2796c310a7..99410d244d 100644
--- a/UefiPayloadPkg/UniversalPayloadBuild.py
+++ b/UefiPayloadPkg/UniversalPayloadBuild.py
@@ -53,7 +53,7 @@ def RunCommand(cmd):
def BuildUniversalPayload(Args, MacroList):
BuildTarget = Args.Target
ToolChain = Args.ToolChain
-Quiet = Args.Quiet
+Quiet = "--quiet" if Args.Quiet else ""
BuildArch = "X64" if Args.Arch == 'X64' else "IA32 -a X64"
ElfToolChain = 'CLANGDWARF'
@@ -121,7 +121,7 @@ def main():
parser.add_argument('-a', '--Arch', choices=['IA32', 'X64'], help='Specify
the ARCH for payload entry module. Default build X64 image.', default ='X64')
parser.add_argument("-D", "--Macro", action="append",
default=["UNIVERSAL_PAYLOAD=TRUE"])
parser.add_argument('-i', '--ImageId', type=str, help='Specify payload ID
(16 bytes maximal).', default ='UEFI')
-parser.add_argument('-q', '--Quiet')
+parser.add_argument('-q', '--Quiet', action='store_true', help='Disable
all build messages except FATAL ERRORS.')
MacroList = {}
args = parser.parse_args()
if args.Macro is not None:
--
2.35.1.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#3): https://edk2.groups.io/g/devel/message/3
Mute This Topic: https://groups.io/mt/90450653/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [`edk2-devel][PATCH] UefiPayloadPkg: Fix the build failure for non-universal payload
Reviewed-by: Zhiguang Liu
From: devel@edk2.groups.io on behalf of Guo Dong
Sent: Tuesday, October 19, 2021 14:08
To: devel@edk2.groups.io
Cc: Dong, Guo ; Ni, Ray ; Ma, Maurice
; You, Benjamin
Subject: [edk2-devel] [`edk2-devel][PATCH] UefiPayloadPkg: Fix the build
failure for non-universal payload
From: Guo Dong
Applied an old patch which caused non-universal payload build failed
since that code was added after the old patch.
This patch fixed the build failure.
Signed-off-by: Guo Dong
Cc: Ray Ni
Cc: Maurice Ma
Cc: Benjamin You
---
UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
index 00db65c2f0..9efe01d094 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
+++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
@@ -103,7 +103,7 @@ MemInfoCallbackMmio (
**/
EFI_STATUS
FindToludCallback (
- IN MEMROY_MAP_ENTRY *MemoryMapEntry,
+ IN MEMORY_MAP_ENTRY *MemoryMapEntry,
IN VOID *Params
)
{
@@ -168,7 +168,7 @@ FindToludCallback (
**/
EFI_STATUS
MemInfoCallback (
- IN MEMROY_MAP_ENTRY *MemoryMapEntry,
+ IN MEMORY_MAP_ENTRY *MemoryMapEntry,
IN VOID *Params
)
{
--
2.32.0.windows.2
-=-=-=-=-=-=
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#82287): https://edk2.groups.io/g/devel/message/82287
Mute This Topic: https://groups.io/mt/86433746/1779286
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [zhiguang@intel.com]
-=-=-=-=-=-=
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#82288): https://edk2.groups.io/g/devel/message/82288
Mute This Topic: https://groups.io/mt/86433746/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [`edk2-devel][PATCH] UefiPayloadPkg: Fix the build failure for non-universal payload
From: Guo Dong
Applied an old patch which caused non-universal payload build failed
since that code was added after the old patch.
This patch fixed the build failure.
Signed-off-by: Guo Dong
Cc: Ray Ni
Cc: Maurice Ma
Cc: Benjamin You
---
UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
index 00db65c2f0..9efe01d094 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
+++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
@@ -103,7 +103,7 @@ MemInfoCallbackMmio (
**/
EFI_STATUS
FindToludCallback (
- IN MEMROY_MAP_ENTRY *MemoryMapEntry,
+ IN MEMORY_MAP_ENTRY *MemoryMapEntry,
IN VOID *Params
)
{
@@ -168,7 +168,7 @@ FindToludCallback (
**/
EFI_STATUS
MemInfoCallback (
- IN MEMROY_MAP_ENTRY *MemoryMapEntry,
+ IN MEMORY_MAP_ENTRY *MemoryMapEntry,
IN VOID *Params
)
{
--
2.32.0.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#82287): https://edk2.groups.io/g/devel/message/82287
Mute This Topic: https://groups.io/mt/86433746/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] UefiPayloadPkg: Fix the build failure
Reviewed-by: Maurice Ma
-Maurice
> -Original Message-
> From: Dong, Guo
> Sent: Wednesday, June 30, 2021 15:51
> To: devel@edk2.groups.io
> Cc: Ma, Maurice ; You, Benjamin
>
> Subject: [edk2-devel] [PATCH] UefiPayloadPkg: Fix the build failure
>
> For non-universal payload, HandoffHobTable is used without initialization.
> This patch fixed this failure.
>
> Signed-off-by: Guo Dong
> ---
> UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c | 3 +--
> UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c | 4 +---
> 2 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
> b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
> index ed956c447c..ae16f25c7c 100644
> --- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
> +++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
> @@ -559,7 +559,6 @@ PayloadEntry (
> {
>EFI_STATUSStatus;
>PHYSICAL_ADDRESS DxeCoreEntryPoint;
> - EFI_HOB_HANDOFF_INFO_TABLE*HandoffHobTable;
>UINTN MemBase;
>UINTN HobMemBase;
>UINTN HobMemTop;
> @@ -603,7 +602,7 @@ PayloadEntry (
>IoWrite8 (LEGACY_8259_MASK_REGISTER_MASTER, 0xFF);
>IoWrite8 (LEGACY_8259_MASK_REGISTER_SLAVE, 0xFF);
>
> - Hob.HandoffInformationTable = HandoffHobTable;
> + Hob.HandoffInformationTable = (EFI_HOB_HANDOFF_INFO_TABLE *)
> GetFirstHob(EFI_HOB_TYPE_HANDOFF);
>HandOffToDxeCore (DxeCoreEntryPoint, Hob);
>
>// Should not get here
> diff --git a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c
> b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c
> index a67653eb11..7a00a56ab9 100644
> --- a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c
> +++ b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c
> @@ -364,7 +364,6 @@ _ModuleEntryPoint (
> {
>EFI_STATUSStatus;
>PHYSICAL_ADDRESS DxeCoreEntryPoint;
> - EFI_HOB_HANDOFF_INFO_TABLE*HandoffHobTable;
>EFI_PEI_HOB_POINTERS Hob;
>EFI_FIRMWARE_VOLUME_HEADER*DxeFv;
>
> @@ -393,8 +392,7 @@ _ModuleEntryPoint (
>IoWrite8 (LEGACY_8259_MASK_REGISTER_MASTER, 0xFF);
>IoWrite8 (LEGACY_8259_MASK_REGISTER_SLAVE, 0xFF);
>
> - HandoffHobTable = (EFI_HOB_HANDOFF_INFO_TABLE *)
> GetFirstHob(EFI_HOB_TYPE_HANDOFF);
> - Hob.HandoffInformationTable = HandoffHobTable;
> + Hob.HandoffInformationTable = (EFI_HOB_HANDOFF_INFO_TABLE *)
> GetFirstHob(EFI_HOB_TYPE_HANDOFF);
>HandOffToDxeCore (DxeCoreEntryPoint, Hob);
>
>// Should not get here
> --
> 2.16.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#77425): https://edk2.groups.io/g/devel/message/77425
Mute This Topic: https://groups.io/mt/83904719/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [PATCH] UefiPayloadPkg: Fix the build failure
For non-universal payload, HandoffHobTable is used without initialization.
This patch fixed this failure.
Signed-off-by: Guo Dong
---
UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c | 3 +--
UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c | 4 +---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
index ed956c447c..ae16f25c7c 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
+++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
@@ -559,7 +559,6 @@ PayloadEntry (
{
EFI_STATUSStatus;
PHYSICAL_ADDRESS DxeCoreEntryPoint;
- EFI_HOB_HANDOFF_INFO_TABLE*HandoffHobTable;
UINTN MemBase;
UINTN HobMemBase;
UINTN HobMemTop;
@@ -603,7 +602,7 @@ PayloadEntry (
IoWrite8 (LEGACY_8259_MASK_REGISTER_MASTER, 0xFF);
IoWrite8 (LEGACY_8259_MASK_REGISTER_SLAVE, 0xFF);
- Hob.HandoffInformationTable = HandoffHobTable;
+ Hob.HandoffInformationTable = (EFI_HOB_HANDOFF_INFO_TABLE *)
GetFirstHob(EFI_HOB_TYPE_HANDOFF);
HandOffToDxeCore (DxeCoreEntryPoint, Hob);
// Should not get here
diff --git a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c
b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c
index a67653eb11..7a00a56ab9 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c
+++ b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c
@@ -364,7 +364,6 @@ _ModuleEntryPoint (
{
EFI_STATUSStatus;
PHYSICAL_ADDRESS DxeCoreEntryPoint;
- EFI_HOB_HANDOFF_INFO_TABLE*HandoffHobTable;
EFI_PEI_HOB_POINTERS Hob;
EFI_FIRMWARE_VOLUME_HEADER*DxeFv;
@@ -393,8 +392,7 @@ _ModuleEntryPoint (
IoWrite8 (LEGACY_8259_MASK_REGISTER_MASTER, 0xFF);
IoWrite8 (LEGACY_8259_MASK_REGISTER_SLAVE, 0xFF);
- HandoffHobTable = (EFI_HOB_HANDOFF_INFO_TABLE *)
GetFirstHob(EFI_HOB_TYPE_HANDOFF);
- Hob.HandoffInformationTable = HandoffHobTable;
+ Hob.HandoffInformationTable = (EFI_HOB_HANDOFF_INFO_TABLE *)
GetFirstHob(EFI_HOB_TYPE_HANDOFF);
HandOffToDxeCore (DxeCoreEntryPoint, Hob);
// Should not get here
--
2.16.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#77381): https://edk2.groups.io/g/devel/message/77381
Mute This Topic: https://groups.io/mt/83904719/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
