From d73615b24ba402b1625f03d6a83f183180f24a60 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 13 Mar 2026 14:35:34 +0100 Subject: [PATCH] Revert "ArmPlatformPkg,EmbeddedPkg,MdeModulePkg: Move RealTimeClockLib ..." This reverts commit 57230fff6b39a665485be1bd43ec608d412ba6fb. RealTimeClockLib is not a generic library class that is intended to be used widely to get access to the RTC when the associated runtime services are not available in the calling context. The purpose of RealTimeClockLib is to abstract the underlying hardware access from the generic RealTimeClockRuntimeDxe driver, which backs the runtime services. This means it does not belong in a different package; it belongs in the same package as the driver. Continuous-integration-options: PatchCheck.ignore-multi-package Signed-off-by: Ard Biesheuvel --- .../Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf | 1 - EmbeddedPkg/EmbeddedPkg.dec | 1 + .../Include/Library/RealTimeClockLib.h | 0 .../TemplateRealTimeClockLib/TemplateRealTimeClockLib.inf | 1 - .../VirtualRealTimeClockLib/VirtualRealTimeClockLib.inf | 1 - .../RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf | 1 - MdeModulePkg/MdeModulePkg.dec | 4 ---- 7 files changed, 1 insertion(+), 8 deletions(-) rename {MdeModulePkg => EmbeddedPkg}/Include/Library/RealTimeClockLib.h (100%) diff --git a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf index 7cf9d24ceb..8224617f20 100644 --- a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf +++ b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf @@ -22,7 +22,6 @@ [Packages] MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec EmbeddedPkg/EmbeddedPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec index 2be2e7b0b2..2daa785405 100644 --- a/EmbeddedPkg/EmbeddedPkg.dec +++ b/EmbeddedPkg/EmbeddedPkg.dec @@ -32,6 +32,7 @@ [LibraryClasses.common] PrePiLib|Include/Library/PrePiLib.h + RealTimeClockLib|Include/Library/RealTimeClockLib.h GdbSerialLib|Include/Library/GdbSerialLib.h DebugAgentTimerLib|Include/Library/DebugAgentTimerLib.h NorFlashInfoLib|Include/Library/NorFlashInfoLib.h diff --git a/MdeModulePkg/Include/Library/RealTimeClockLib.h b/EmbeddedPkg/Include/Library/RealTimeClockLib.h similarity index 100% rename from MdeModulePkg/Include/Library/RealTimeClockLib.h rename to EmbeddedPkg/Include/Library/RealTimeClockLib.h diff --git a/EmbeddedPkg/Library/TemplateRealTimeClockLib/TemplateRealTimeClockLib.inf b/EmbeddedPkg/Library/TemplateRealTimeClockLib/TemplateRealTimeClockLib.inf index 6a8253e6fa..a7ff6e9b4a 100644 --- a/EmbeddedPkg/Library/TemplateRealTimeClockLib/TemplateRealTimeClockLib.inf +++ b/EmbeddedPkg/Library/TemplateRealTimeClockLib/TemplateRealTimeClockLib.inf @@ -24,7 +24,6 @@ [Packages] MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec EmbeddedPkg/EmbeddedPkg.dec [LibraryClasses] diff --git a/EmbeddedPkg/Library/VirtualRealTimeClockLib/VirtualRealTimeClockLib.inf b/EmbeddedPkg/Library/VirtualRealTimeClockLib/VirtualRealTimeClockLib.inf index bf6a025cfd..a372042d5d 100644 --- a/EmbeddedPkg/Library/VirtualRealTimeClockLib/VirtualRealTimeClockLib.inf +++ b/EmbeddedPkg/Library/VirtualRealTimeClockLib/VirtualRealTimeClockLib.inf @@ -23,7 +23,6 @@ [Packages] MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec EmbeddedPkg/EmbeddedPkg.dec [LibraryClasses] diff --git a/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf b/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf index ad548d07f8..0a4cd6dae7 100644 --- a/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf +++ b/EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf @@ -24,7 +24,6 @@ [Packages] MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec EmbeddedPkg/EmbeddedPkg.dec [LibraryClasses] diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index a2c714f734..5d7df5f2a8 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -182,10 +182,6 @@ # HobPrintLib|Include/Library/HobPrintLib.h - ## @libraryclass Provides time and date related EFI runtime services - # - RealTimeClockLib|Include/Library/RealTimeClockLib.h - [Guids] ## MdeModule package token space guid # Include/Guid/MdeModulePkgTokenSpace.h