From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web11.41551.1678524868873055947 for ; Sat, 11 Mar 2023 00:54:29 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=EtBQtAH1; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: evan.chai@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678524868; x=1710060868; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=83B2ItpiVNPhcTD/f56Rsp4fK7ba3dF7LXRkiSVQ8eg=; b=EtBQtAH1QSRzP7Gasob5IlwnEcm0EodFPtO+hkJgO1nP8e2JmdglIy4n /7HvWkC3V4+H+R8QAGVbyhSiWaxolGUdKx2zC39uOHjWM0Q6pFH3CRjfd U11l0SK4TV8Rs4GEhkMI5M0paQHjBVsV7tZ3rU40tyuJDh9uhDTxXB+2M O34SKJevbSRKM9HOOpYdeUusmuFDyN1F3WuffnnRHMncyP0knfXQjZFTp 327Jg0PmGUgK0ULVMNf2D+ybrjnkpE6EPhjXzMEfayTRZh+jyakjS+0lj XPvLM9ZQvx0Rn2ynP+wcwIbFSRJs5tXjlulaWHgq/2oawOpd25s+/aFNJ Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10645"; a="316533395" X-IronPort-AV: E=Sophos;i="5.98,252,1673942400"; d="scan'208";a="316533395" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2023 00:54:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10645"; a="708301920" X-IronPort-AV: E=Sophos;i="5.98,252,1673942400"; d="scan'208";a="708301920" Received: from evanccy.ccr.corp.intel.com ([10.238.200.73]) by orsmga008.jf.intel.com with ESMTP; 11 Mar 2023 00:54:26 -0800 From: "Chai, Evan" To: devel@edk2.groups.io Cc: Daniel Schaefer , Andrei Warkentin , Sunil V L Subject: [PATCH 3/3] Platform/SiFive: Fixed build failure casued by wrong alignment Date: Sat, 11 Mar 2023 16:53:49 +0800 Message-Id: <20230311085349.607-3-evan.chai@intel.com> X-Mailer: git-send-email 2.39.0.windows.2 In-Reply-To: <20230311085349.607-1-evan.chai@intel.com> References: <20230311085349.607-1-evan.chai@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable The lib and driver should be aligned to Mdepkg. Cc: Daniel Schaefer Signed-off-by: Evan Chai Reviewed-by: Andrei Warkentin Reviewed-by: Sunil V L --- .../U5SeriesPkg/FreedomU500VC707Board/U500.dsc | 15 ++++++++------- .../U5SeriesPkg/FreedomU500VC707Board/U500.fdf | 2 +- .../FreedomU540HiFiveUnleashedBoard/U540.dsc | 17 +++++++++-------- .../FreedomU540HiFiveUnleashedBoard/U540.fdf | 2 +- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Platform/SiFive/U5SeriesPkg/FreedomU500VC707Board/U500.dsc b/P= latform/SiFive/U5SeriesPkg/FreedomU500VC707Board/U500.dsc index fc1ed012..372bb8fc 100644 --- a/Platform/SiFive/U5SeriesPkg/FreedomU500VC707Board/U500.dsc +++ b/Platform/SiFive/U5SeriesPkg/FreedomU500VC707Board/U500.dsc @@ -2,6 +2,7 @@ # RISC-V EFI on SiFive VC707 (U500) RISC-V platform=0D #=0D # Copyright (c) 2019-2021, Hewlett Packard Enterprise Development LP. All= rights reserved.
=0D +# Copyright (c) 2023, Intel Corporation. All rights reserved.
=0D #=0D # SPDX-License-Identifier: BSD-2-Clause-Patent=0D #=0D @@ -150,7 +151,7 @@ RiscVEdk2SbiLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVEdk2SbiLib/Risc= VEdk2SbiLib.inf=0D RiscVPlatformTimerLib|Platform/SiFive/U5SeriesPkg/Library/RiscVPlatformT= imerLib/RiscVPlatformTimerLib.inf=0D MachineModeTimerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVReadMachine= ModeTimer/EmulatedMachineModeTimerLib/EmulatedMachineModeTimerLib.inf=0D - CpuExceptionHandlerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVExceptio= nLib/CpuExceptionHandlerDxeLib.inf=0D + CpuExceptionHandlerLib|UefiCpuPkg/Library/BaseRiscV64CpuExceptionHandler= Lib/BaseRiscV64CpuExceptionHandlerLib.inf=0D =0D # Flattened Device Tree (FDT) access library=0D FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf=0D @@ -228,7 +229,7 @@ RiscVCoreplexInfoLib|Platform/SiFive/U5SeriesPkg/Library/PeiCoreInfoHobL= ib/PeiCoreInfoHobLib.inf=0D =0D [LibraryClasses.common.DXE_CORE]=0D - TimerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVTimerLib/BaseRiscVTime= rLib.inf=0D + TimerLib|UefiCpuPkg/Library/BaseRiscV64CpuTimerLib/BaseRiscV64CpuTimerLi= b.inf=0D HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf=0D DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf= =0D MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeC= oreMemoryAllocationLib.inf=0D @@ -245,7 +246,7 @@ =0D [LibraryClasses.common.DXE_RUNTIME_DRIVER]=0D PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf=0D - TimerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVTimerLib/BaseRiscVTime= rLib.inf=0D + TimerLib|UefiCpuPkg/Library/BaseRiscV64CpuTimerLib/BaseRiscV64CpuTimerLi= b.inf=0D HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf=0D DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf= =0D MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf=0D @@ -265,7 +266,7 @@ =0D [LibraryClasses.common.UEFI_DRIVER]=0D PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf=0D - TimerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVTimerLib/BaseRiscVTime= rLib.inf=0D + TimerLib|UefiCpuPkg/Library/BaseRiscV64CpuTimerLib/BaseRiscV64CpuTimerLi= b.inf=0D HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf=0D DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf= =0D MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf=0D @@ -280,7 +281,7 @@ =0D [LibraryClasses.common.DXE_DRIVER]=0D PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf=0D - TimerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVTimerLib/BaseRiscVTime= rLib.inf=0D + TimerLib|UefiCpuPkg/Library/BaseRiscV64CpuTimerLib/BaseRiscV64CpuTimerLi= b.inf=0D HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf=0D MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf=0D ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeRepor= tStatusCodeLib.inf=0D @@ -300,7 +301,7 @@ =0D [LibraryClasses.common.UEFI_APPLICATION]=0D PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf=0D - TimerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVTimerLib/BaseRiscVTime= rLib.inf=0D + TimerLib|UefiCpuPkg/Library/BaseRiscV64CpuTimerLib/BaseRiscV64CpuTimerLi= b.inf=0D HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf=0D MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf=0D !ifdef $(DEBUG_ON_SERIAL_PORT)=0D @@ -466,7 +467,7 @@ #=0D # RISC-V Core module=0D #=0D - Silicon/RISC-V/ProcessorPkg/Universal/CpuDxe/CpuDxe.inf=0D + UefiCpuPkg/CpuDxeRiscV64/CpuDxeRiscV64.inf=0D Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.inf=0D MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf=0D =0D diff --git a/Platform/SiFive/U5SeriesPkg/FreedomU500VC707Board/U500.fdf b/P= latform/SiFive/U5SeriesPkg/FreedomU500VC707Board/U500.fdf index 4ce19279..da4d3379 100644 --- a/Platform/SiFive/U5SeriesPkg/FreedomU500VC707Board/U500.fdf +++ b/Platform/SiFive/U5SeriesPkg/FreedomU500VC707Board/U500.fdf @@ -151,7 +151,7 @@ INF Platform/SiFive/U5SeriesPkg/Universal/Dxe/RamFvbSe= rvicesRuntimeDxe/FvbServi =0D # RISC-V Core Drivers=0D INF Platform/SiFive/U5SeriesPkg/Universal/Dxe/TimerDxe/TimerDxe.inf=0D -INF Silicon/RISC-V/ProcessorPkg/Universal/CpuDxe/CpuDxe.inf=0D +INF UefiCpuPkg/CpuDxeRiscV64/CpuDxeRiscV64.inf=0D INF Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.inf=0D =0D INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.in= f=0D diff --git a/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U5= 40.dsc b/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.d= sc index e59955d0..12b08522 100644 --- a/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.dsc +++ b/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.dsc @@ -2,6 +2,7 @@ # RISC-V EFI on SiFive Freedom U540 HiFive Unleashed RISC-V platform=0D #=0D # Copyright (c) 2019-2021, Hewlett Packard Enterprise Development LP. All= rights reserved.
=0D +# Copyright (c) 2023, Intel Corporation. All rights reserved.
=0D #=0D # SPDX-License-Identifier: BSD-2-Clause-Patent=0D #=0D @@ -102,6 +103,7 @@ FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf=0D VariableFlashInfoLib|MdeModulePkg/Library/BaseVariableFlashInfoLib/BaseV= ariableFlashInfoLib.inf=0D VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/Var= iablePolicyHelperLib.inf=0D + RiscVSbiLib|MdePkg/Library/BaseRiscVSbiLib/BaseRiscVSbiLib.inf=0D =0D # RISC-V Platform Library=0D TimeBaseLib|EmbeddedPkg//Library/TimeBaseLib/TimeBaseLib.inf=0D @@ -152,8 +154,7 @@ RiscVPlatformTimerLib|Platform/SiFive/U5SeriesPkg/Library/RiscVPlatformT= imerLib/RiscVPlatformTimerLib.inf=0D #MachineModeTimerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVReadMachin= eModeTimer/MachineModeTimerLib/MachineModeTimerLib.inf=0D MachineModeTimerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVReadMachine= ModeTimer/EmulatedMachineModeTimerLib/EmulatedMachineModeTimerLib.inf=0D - CpuExceptionHandlerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVExceptio= nLib/CpuExceptionHandlerDxeLib.inf=0D -=0D + CpuExceptionHandlerLib|UefiCpuPkg/Library/BaseRiscV64CpuExceptionHandler= Lib/BaseRiscV64CpuExceptionHandlerLib.inf=0D =0D # Flattened Device Tree (FDT) access library=0D FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf=0D @@ -230,7 +231,7 @@ RiscVCoreplexInfoLib|Platform/SiFive/U5SeriesPkg/Library/PeiCoreInfoHobL= ib/PeiCoreInfoHobLib.inf=0D =0D [LibraryClasses.common.DXE_CORE]=0D - TimerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVTimerLib/BaseRiscVTime= rLib.inf=0D + TimerLib|UefiCpuPkg/Library/BaseRiscV64CpuTimerLib/BaseRiscV64CpuTimerLi= b.inf=0D HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf=0D DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf= =0D MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeC= oreMemoryAllocationLib.inf=0D @@ -247,7 +248,7 @@ =0D [LibraryClasses.common.DXE_RUNTIME_DRIVER]=0D PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf=0D - TimerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVTimerLib/BaseRiscVTime= rLib.inf=0D + TimerLib|UefiCpuPkg/Library/BaseRiscV64CpuTimerLib/BaseRiscV64CpuTimerLi= b.inf=0D HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf=0D DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf= =0D MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf=0D @@ -267,7 +268,7 @@ =0D [LibraryClasses.common.UEFI_DRIVER]=0D PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf=0D - TimerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVTimerLib/BaseRiscVTime= rLib.inf=0D + TimerLib|UefiCpuPkg/Library/BaseRiscV64CpuTimerLib/BaseRiscV64CpuTimerLi= b.inf=0D HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf=0D DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf= =0D MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf=0D @@ -282,7 +283,7 @@ =0D [LibraryClasses.common.DXE_DRIVER]=0D PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf=0D - TimerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVTimerLib/BaseRiscVTime= rLib.inf=0D + TimerLib|UefiCpuPkg/Library/BaseRiscV64CpuTimerLib/BaseRiscV64CpuTimerLi= b.inf=0D HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf=0D MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf=0D ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeRepor= tStatusCodeLib.inf=0D @@ -302,7 +303,7 @@ =0D [LibraryClasses.common.UEFI_APPLICATION]=0D PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf=0D - TimerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVTimerLib/BaseRiscVTime= rLib.inf=0D + TimerLib|UefiCpuPkg/Library/BaseRiscV64CpuTimerLib/BaseRiscV64CpuTimerLi= b.inf=0D HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf=0D MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf=0D !ifdef $(DEBUG_ON_SERIAL_PORT)=0D @@ -465,7 +466,7 @@ #=0D # RISC-V Core module=0D #=0D - Silicon/RISC-V/ProcessorPkg/Universal/CpuDxe/CpuDxe.inf=0D + UefiCpuPkg/CpuDxeRiscV64/CpuDxeRiscV64.inf=0D Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.inf=0D MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf=0D =0D diff --git a/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U5= 40.fdf b/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.f= df index c58fa635..237ed74a 100644 --- a/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.fdf +++ b/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.fdf @@ -151,7 +151,7 @@ INF Platform/SiFive/U5SeriesPkg/Universal/Dxe/RamFvbSe= rvicesRuntimeDxe/FvbServi =0D # RISC-V Core Drivers=0D INF Platform/SiFive/U5SeriesPkg/Universal/Dxe/TimerDxe/TimerDxe.inf=0D -INF Silicon/RISC-V/ProcessorPkg/Universal/CpuDxe/CpuDxe.inf=0D +INF UefiCpuPkg/CpuDxeRiscV64/CpuDxeRiscV64.inf=0D INF Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.inf=0D =0D INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.in= f=0D --=20 2.39.0.windows.2