From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web12.81161.1629440878511764285 for ; Thu, 19 Aug 2021 23:27:58 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: dun.tan@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10081"; a="302308612" X-IronPort-AV: E=Sophos;i="5.84,336,1620716400"; d="scan'208";a="302308612" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Aug 2021 23:27:57 -0700 X-IronPort-AV: E=Sophos;i="5.84,336,1620716400"; d="scan'208";a="522923299" Received: from duntan-mobl.ccr.corp.intel.com ([10.238.1.156]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Aug 2021 23:27:54 -0700 From: "duntan" To: devel@edk2.groups.io Cc: Guo Dong , Ray Ni , Maurice Ma , Benjamin You , DunTan Subject: [PATCH] UefiPayloadPkg: Fix the build error when enable Core ci for UefiPayloadPkg Date: Fri, 20 Aug 2021 14:26:53 +0800 Message-Id: <20210820062653.714-1-dun.tan@intel.com> X-Mailer: git-send-email 2.31.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. Cc: Guo Dong Cc: Ray Ni Cc: Maurice Ma Cc: Benjamin You Signed-off-by: DunTan --- UefiPayloadPkg/Library/PayloadEntryHobLib/Hob.c | 6 +++--- UefiPayloadPkg/UefiPayloadPkg.dsc | 2 +- UefiPayloadPkg/UefiPayloadPkg.fdf | 4 ++-- 3 files changed, 6 insertions(+), 6 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..1c1d765517 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -202,7 +202,7 @@ INF ShellPkg/Application/Shell/Shell.inf !endif !if $(SHELL_TYPE) == MIN_BIN -!if $(ARCH) == IA32 +!if "$(ARCH)" == IA32 INF RuleOverride = BINARY USE = IA32 ShellBinPkg/MinUefiShell/MinUefiShell.inf !else INF RuleOverride = BINARY USE = X64 ShellBinPkg/MinUefiShell/MinUefiShell.inf @@ -210,7 +210,7 @@ INF RuleOverride = BINARY USE = X64 ShellBinPkg/MinUefiShell/MinUefiShell.inf !endif !if $(SHELL_TYPE) == UEFI_BIN -!if $(ARCH) == IA32 +!if "$(ARCH)" == IA32 INF RuleOverride = BINARY USE = IA32 ShellBinPkg/UefiShell/UefiShell.inf !else INF RuleOverride = BINARY USE = X64 ShellBinPkg/UefiShell/UefiShell.inf -- 2.31.1.windows.1