Fix the build error caused by the dependency with SiFive silicon code. Signed-off-by: Abner Chang <abner.ch...@hpe.com> Cc: Daniel Schaefer <daniel.schae...@hpe.com> Cc: Sunil V L <suni...@ventanamicro.com> --- .../Universal/Pei/PlatformPei/PlatformPei.inf | 7 +------ .../Universal/Pei/PlatformPei/Platform.h | 13 ++++++++++++- .../Universal/Pei/PlatformPei/Platform.c | 4 +--- 3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/PlatformPei.inf b/Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/PlatformPei.inf index 0db88abba4..6368a49927 100644 --- a/Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/PlatformPei.inf +++ b/Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/PlatformPei.inf @@ -3,7 +3,7 @@ # # This module provides platform specific function to detect boot mode. # -# Copyright (c) 2021, Hewlett Packard Enterprise Development LP. All rights reserved.<BR> +# Copyright (c) 2021-2022, Hewlett Packard Enterprise Development LP. All rights reserved.<BR> # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -32,14 +32,11 @@ MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec Platform/RISC-V/PlatformPkg/RiscVPlatformPkg.dec - Platform/SiFive/U5SeriesPkg/U5SeriesPkg.dec Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec - Silicon/SiFive/SiFive.dec UefiCpuPkg/UefiCpuPkg.dec [Guids] gEfiMemoryTypeInformationGuid - gSiFiveU5SeriesPlatformsPkgTokenSpaceGuid [LibraryClasses] DebugLib @@ -64,8 +61,6 @@ gUefiRiscVPlatformPkgTokenSpaceGuid.PcdRiscVDxeFvSize gUefiRiscVPlatformPkgTokenSpaceGuid.PcdTemporaryRamBase gUefiRiscVPlatformPkgTokenSpaceGuid.PcdTemporaryRamSize - gSiFiveU5SeriesPlatformsPkgTokenSpaceGuid.PcdNumberofU5Cores - gSiFiveU5SeriesPlatformsPkgTokenSpaceGuid.PcdE5MCSupported [Ppis] gEfiPeiMasterBootModePpiGuid diff --git a/Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/Platform.h b/Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/Platform.h index c2cdd6d75b..1b6cb4f870 100644 --- a/Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/Platform.h +++ b/Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/Platform.h @@ -1,7 +1,7 @@ /** @file Platform PEI module include file. - Copyright (c) 2019, Hewlett Packard Enterprise Development LP. All rights reserved.<BR> + Copyright (c) 2019-2022, Hewlett Packard Enterprise Development LP. All rights reserved.<BR> Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR> SPDX-License-Identifier: BSD-2-Clause-Patent @@ -83,4 +83,15 @@ InitializeXen ( VOID ); +/** + Build processor and platform information for the U5 platform + + @return EFI_SUCCESS Status. + +**/ +EFI_STATUS +BuildRiscVSmbiosHobs ( + VOID +); + #endif // _PLATFORM_PEI_H_INCLUDED_ diff --git a/Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/Platform.c b/Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/Platform.c index 8586a94b62..6deeb19655 100644 --- a/Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/Platform.c +++ b/Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/Platform.c @@ -1,7 +1,7 @@ /**@file Platform PEI driver - Copyright (c) 2019-2021, Hewlett Packard Enterprise Development LP. All rights reserved.<BR> + Copyright (c) 2019-2022, Hewlett Packard Enterprise Development LP. All rights reserved.<BR> Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR> Copyright (c) 2011, Andrei Warkentin <andr...@motorola.com> @@ -30,8 +30,6 @@ #include <Ppi/MasterBootMode.h> #include <IndustryStandard/Pci22.h> -#include <SiFiveU5MCCoreplex.h> - #include "Platform.h" EFI_MEMORY_TYPE_INFORMATION mDefaultMemoryTypeInformation[] = { -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#85905): https://edk2.groups.io/g/devel/message/85905 Mute This Topic: https://groups.io/mt/88579968/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-