From: Andrei Warkentin <awarken...@vmware.com>
Remove the PlatformPcdLib. It is completely unnecessary. Originally,
this was meant for the GENET driver, but now that ConfigDxe registers
the platform device, the library is superfluous.
Signed-off-by: Ard Biesheuvel <ard.biesheu...@arm.com>
---
Platform/RaspberryPi/RaspberryPi.dec | 3 --
Platform/RaspberryPi/RPi4/RPi4.dsc | 2 -
Platform/RaspberryPi/Library/PlatformPcdLib/PlatformPcdLib.inf | 44
-------------------
Platform/RaspberryPi/Library/PlatformPcdLib/PlatformPcdLib.c | 45
--------------------
4 files changed, 94 deletions(-)
diff --git a/Platform/RaspberryPi/RaspberryPi.dec
b/Platform/RaspberryPi/RaspberryPi.dec
index 7a22621a6905..1a3c44e0eb01 100644
--- a/Platform/RaspberryPi/RaspberryPi.dec
+++ b/Platform/RaspberryPi/RaspberryPi.dec
@@ -68,6 +68,3 @@ [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic,
PcdsDynamicEx]
gRaspberryPiTokenSpaceGuid.PcdSystemTableMode|1|UINT32|0x0000001B
gRaspberryPiTokenSpaceGuid.PcdRamMoreThan3GB|0|UINT32|0x00000019
gRaspberryPiTokenSpaceGuid.PcdRamLimitTo3GB|0|UINT32|0x0000001A
-
-[PcdsDynamic]
- gRaspberryPiTokenSpaceGuid.PcdBcmGenetMacAddress|0x0|UINT64|0x00000040
diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc
b/Platform/RaspberryPi/RPi4/RPi4.dsc
index 0dca782c9058..5910082deb04 100644
--- a/Platform/RaspberryPi/RPi4/RPi4.dsc
+++ b/Platform/RaspberryPi/RPi4/RPi4.dsc
@@ -683,8 +683,6 @@ [Components.common]
#
!include NetworkPkg/Network.dsc.inc
Silicon/Broadcom/Drivers/Net/BcmGenetDxe/BcmGenetDxe.inf {
- <LibraryClasses>
- NULL|Platform/RaspberryPi/Library/PlatformPcdLib/PlatformPcdLib.inf
<PcdsFixedAtBuild>
gEmbeddedTokenSpaceGuid.PcdDmaDeviceOffset|0x00000000
gEmbeddedTokenSpaceGuid.PcdDmaDeviceLimit|0xffffffff
diff --git a/Platform/RaspberryPi/Library/PlatformPcdLib/PlatformPcdLib.inf
b/Platform/RaspberryPi/Library/PlatformPcdLib/PlatformPcdLib.inf
deleted file mode 100644
index c97453e4e7c1..000000000000
--- a/Platform/RaspberryPi/Library/PlatformPcdLib/PlatformPcdLib.inf
+++ /dev/null
@@ -1,44 +0,0 @@
-#/** @file
-#
-# Copyright (c) 2020, Pete Batard <p...@akeo.ie>
-#
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-#
-#**/
-
-[Defines]
- INF_VERSION = 0x0001001A
- BASE_NAME = PlatformPcdLib
- FILE_GUID = 3B8409D7-D3C7-4006-823B-BFB184435363
- MODULE_TYPE = DXE_DRIVER
- VERSION_STRING = 1.0
- LIBRARY_CLASS = NULL|DXE_DRIVER UEFI_APPLICATION
- CONSTRUCTOR = PlatformPcdLibConstructor
-
-[Sources]
- PlatformPcdLib.c
-
-[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
- Platform/RaspberryPi/RaspberryPi.dec
- Silicon/Broadcom/Drivers/Net/BcmNet.dec
- Silicon/Broadcom/Bcm27xx/Bcm27xx.dec
-
-[LibraryClasses]
- DebugLib
- PcdLib
- UefiLib
- PrintLib
-
-[Protocols]
- gRaspberryPiFirmwareProtocolGuid ## CONSUMES
-
-[Pcd]
- gRaspberryPiTokenSpaceGuid.PcdBcmGenetMacAddress ## SOMETIMES_PRODUCES
-
-[FixedPcd]
- gBcm27xxTokenSpaceGuid.PcdBcmGenetRegistersAddress
-
-[Depex]
- gRaspberryPiFirmwareProtocolGuid
diff --git a/Platform/RaspberryPi/Library/PlatformPcdLib/PlatformPcdLib.c
b/Platform/RaspberryPi/Library/PlatformPcdLib/PlatformPcdLib.c
deleted file mode 100644
index e78518c81374..000000000000
--- a/Platform/RaspberryPi/Library/PlatformPcdLib/PlatformPcdLib.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/** @file
- *
- * Copyright (c) 2020, Pete Batard <p...@akeo.ie>
- *
- * SPDX-License-Identifier: BSD-2-Clause-Patent
- *
- **/
-
-#include <Library/DebugLib.h>
-#include <Library/PcdLib.h>
-#include <Library/PrintLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-#include <Library/UefiLib.h>
-#include <Library/UefiRuntimeServicesTableLib.h>
-#include <Protocol/RpiFirmware.h>
-
-EFI_STATUS
-EFIAPI
-PlatformPcdLibConstructor (
- IN EFI_HANDLE ImageHandle,
- IN EFI_SYSTEM_TABLE *SystemTable
- )
-{
- EFI_STATUS Status;
- UINT64 MacAddr;
- RASPBERRY_PI_FIRMWARE_PROTOCOL *mFwProtocol;
-
- if (PcdGet64 (PcdBcmGenetMacAddress) == 0) {
- Status = gBS->LocateProtocol (&gRaspberryPiFirmwareProtocolGuid, NULL,
- (VOID**)&mFwProtocol);
- ASSERT_EFI_ERROR(Status);
-
- //
- // Get the MAC address from the firmware
- //
- Status = mFwProtocol->GetMacAddress ((UINT8*) &MacAddr);
- if (EFI_ERROR (Status)) {
- DEBUG ((DEBUG_WARN, "%a: failed to retrieve MAC address\n",
__FUNCTION__));
- } else {
- PcdSet64S (PcdBcmGenetMacAddress, MacAddr);
- }
- }
-
- return EFI_SUCCESS;
-}
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#59252): https://edk2.groups.io/g/devel/message/59252
Mute This Topic: https://groups.io/mt/74154335/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
