Reviewed-by: Ray Ni <ray...@intel.com> > -----Original Message----- > From: Tan, Dun <dun....@intel.com> > Sent: Friday, August 20, 2021 3:21 PM > To: devel@edk2.groups.io > Cc: Dong, Guo <guo.d...@intel.com>; Ni, Ray <ray...@intel.com>; Ma, Maurice > <maurice...@intel.com>; You, Benjamin > <benjamin....@intel.com>; Tan, Dun <dun....@intel.com> > Subject: [Patch V2] UefiPayloadPkg: Fix the build error when enable Core ci > for UefiPayloadPkg > > V1: Add quotes when using $(ARCH) in .dsc and .fdf file. > The quotes are added due to the way by which Core ci parse the .dsc file. > Add UINTN in Hob.c to fix cast from pointer to integer of different size > error. > V2: Delete lines which reference ShellBinPkg.The pkg doesn't exist in edk2. > > Cc: Guo Dong <guo.d...@intel.com> > Cc: Ray Ni <ray...@intel.com> > Cc: Maurice Ma <maurice...@intel.com> > Cc: Benjamin You <benjamin....@intel.com> > Signed-off-by: DunTan <dun....@intel.com> > --- > UefiPayloadPkg/Library/PayloadEntryHobLib/Hob.c | 6 +++--- > UefiPayloadPkg/UefiPayloadPkg.dsc | 2 +- > UefiPayloadPkg/UefiPayloadPkg.fdf | 16 ---------------- > 3 files changed, 4 insertions(+), 20 deletions(-) > > diff --git a/UefiPayloadPkg/Library/PayloadEntryHobLib/Hob.c > b/UefiPayloadPkg/Library/PayloadEntryHobLib/Hob.c > index 768c3db770..dd25ac2682 100644 > --- a/UefiPayloadPkg/Library/PayloadEntryHobLib/Hob.c > +++ b/UefiPayloadPkg/Library/PayloadEntryHobLib/Hob.c > @@ -77,9 +77,9 @@ HobConstructor ( > Hob->Version = EFI_HOB_HANDOFF_TABLE_VERSION; > Hob->BootMode = BOOT_WITH_FULL_CONFIGURATION; > > - Hob->EfiMemoryTop = (EFI_PHYSICAL_ADDRESS) EfiMemoryTop; > - Hob->EfiMemoryBottom = (EFI_PHYSICAL_ADDRESS) EfiMemoryBottom; > - Hob->EfiFreeMemoryTop = (EFI_PHYSICAL_ADDRESS) EfiFreeMemoryTop; > + Hob->EfiMemoryTop = (EFI_PHYSICAL_ADDRESS) (UINTN) EfiMemoryTop; > + Hob->EfiMemoryBottom = (EFI_PHYSICAL_ADDRESS) (UINTN) EfiMemoryBottom; > + Hob->EfiFreeMemoryTop = (EFI_PHYSICAL_ADDRESS) (UINTN) EfiFreeMemoryTop; > Hob->EfiFreeMemoryBottom = (EFI_PHYSICAL_ADDRESS) (UINTN) (HobEnd+1); > Hob->EfiEndOfHobList = (EFI_PHYSICAL_ADDRESS) (UINTN) HobEnd; > > diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc > b/UefiPayloadPkg/UefiPayloadPkg.dsc > index b4a30be381..856d5ea786 100644 > --- a/UefiPayloadPkg/UefiPayloadPkg.dsc > +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc > @@ -415,7 +415,7 @@ > # > > ################################################################################ > > -!if "IA32" in $(ARCH) > +!if "IA32" in "$(ARCH)" > [Components.IA32] > !if $(UNIVERSAL_PAYLOAD) == TRUE > UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf > diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf > b/UefiPayloadPkg/UefiPayloadPkg.fdf > index b2cfb6b405..5871d71dbb 100644 > --- a/UefiPayloadPkg/UefiPayloadPkg.fdf > +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf > @@ -201,22 +201,6 @@ INF > ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf > INF ShellPkg/Application/Shell/Shell.inf > !endif > > -!if $(SHELL_TYPE) == MIN_BIN > -!if $(ARCH) == IA32 > -INF RuleOverride = BINARY USE = IA32 > ShellBinPkg/MinUefiShell/MinUefiShell.inf > -!else > -INF RuleOverride = BINARY USE = X64 > ShellBinPkg/MinUefiShell/MinUefiShell.inf > -!endif > -!endif > - > -!if $(SHELL_TYPE) == UEFI_BIN > -!if $(ARCH) == IA32 > -INF RuleOverride = BINARY USE = IA32 ShellBinPkg/UefiShell/UefiShell.inf > -!else > -INF RuleOverride = BINARY USE = X64 ShellBinPkg/UefiShell/UefiShell.inf > -!endif > -!endif > - > > > ################################################################################ > # > -- > 2.31.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#79637): https://edk2.groups.io/g/devel/message/79637 Mute This Topic: https://groups.io/mt/85016173/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
