From d95e578b253a8624f4b30b06c48de9d482fb4355 Mon Sep 17 00:00:00 2001
From: Leif Lindholm <leif.lindholm@oss.qualcomm.com>
Date: Tue, 30 Sep 2025 15:38:59 +0100
Subject: [PATCH] ArmPlatformPkg: rename LcdHwLibNull and LcdPlatformLibNull

By edk2 convention, a NULL library should be called *LibNull.
These libraries did not follow this convention, so rename them.

Signed-off-by: Leif Lindholm <leif.lindholm@oss.qualcomm.com>
---
 ArmPlatformPkg/ArmPlatformPkg.dsc                         | 8 ++++----
 .../LcdHwNullLib.c => LcdHwLibNull/LcdHwLibNull.c}        | 0
 .../LcdHwNullLib.inf => LcdHwLibNull/LcdHwLibNull.inf}    | 4 ++--
 .../LcdPlatformLibNull.c}                                 | 0
 .../LcdPlatformLibNull.inf}                               | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename ArmPlatformPkg/Library/{LcdHwNullLib/LcdHwNullLib.c => LcdHwLibNull/LcdHwLibNull.c} (100%)
 rename ArmPlatformPkg/Library/{LcdHwNullLib/LcdHwNullLib.inf => LcdHwLibNull/LcdHwLibNull.inf} (84%)
 rename ArmPlatformPkg/Library/{LcdPlatformNullLib/LcdPlatformNullLib.c => LcdPlatformLibNull/LcdPlatformLibNull.c} (100%)
 rename ArmPlatformPkg/Library/{LcdPlatformNullLib/LcdPlatformNullLib.inf => LcdPlatformLibNull/LcdPlatformLibNull.inf} (84%)

diff --git a/ArmPlatformPkg/ArmPlatformPkg.dsc b/ArmPlatformPkg/ArmPlatformPkg.dsc
index d792487c19..370cb9aa94 100644
--- a/ArmPlatformPkg/ArmPlatformPkg.dsc
+++ b/ArmPlatformPkg/ArmPlatformPkg.dsc
@@ -49,8 +49,8 @@
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
-  LcdHwLib|ArmPlatformPkg/Library/LcdHwNullLib/LcdHwNullLib.inf
-  LcdPlatformLib|ArmPlatformPkg/Library/LcdPlatformNullLib/LcdPlatformNullLib.inf
+  LcdHwLib|ArmPlatformPkg/Library/LcdHwLibNull/LcdHwLibNull.inf
+  LcdPlatformLib|ArmPlatformPkg/Library/LcdPlatformLibNull/LcdPlatformLibNull.inf
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
   MemoryInitPeiLib|ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
@@ -105,8 +105,8 @@
 
   ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
   ArmPlatformPkg/Library/HdLcd/HdLcd.inf
-  ArmPlatformPkg/Library/LcdHwNullLib/LcdHwNullLib.inf
-  ArmPlatformPkg/Library/LcdPlatformNullLib/LcdPlatformNullLib.inf
+  ArmPlatformPkg/Library/LcdHwLibNull/LcdHwLibNull.inf
+  ArmPlatformPkg/Library/LcdPlatformLibNull/LcdPlatformLibNull.inf
   ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf
   ArmPlatformPkg/Library/PL011UartClockLib/PL011UartClockLib.inf
   ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf
diff --git a/ArmPlatformPkg/Library/LcdHwNullLib/LcdHwNullLib.c b/ArmPlatformPkg/Library/LcdHwLibNull/LcdHwLibNull.c
similarity index 100%
rename from ArmPlatformPkg/Library/LcdHwNullLib/LcdHwNullLib.c
rename to ArmPlatformPkg/Library/LcdHwLibNull/LcdHwLibNull.c
diff --git a/ArmPlatformPkg/Library/LcdHwNullLib/LcdHwNullLib.inf b/ArmPlatformPkg/Library/LcdHwLibNull/LcdHwLibNull.inf
similarity index 84%
rename from ArmPlatformPkg/Library/LcdHwNullLib/LcdHwNullLib.inf
rename to ArmPlatformPkg/Library/LcdHwLibNull/LcdHwLibNull.inf
index 82e10fa69a..a8488ad798 100644
--- a/ArmPlatformPkg/Library/LcdHwNullLib/LcdHwNullLib.inf
+++ b/ArmPlatformPkg/Library/LcdHwLibNull/LcdHwLibNull.inf
@@ -8,14 +8,14 @@
 
 [Defines]
   INF_VERSION                    = 0x0001001A
-  BASE_NAME                      = LcdHwNullLib
+  BASE_NAME                      = LcdHwLibNull
   FILE_GUID                      = bb1fde98-1de2-410e-8850-fdcb8e67ebc0
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = LcdHwLib
 
 [Sources]
-  LcdHwNullLib.c
+  LcdHwLibNull.c
 
 [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
diff --git a/ArmPlatformPkg/Library/LcdPlatformNullLib/LcdPlatformNullLib.c b/ArmPlatformPkg/Library/LcdPlatformLibNull/LcdPlatformLibNull.c
similarity index 100%
rename from ArmPlatformPkg/Library/LcdPlatformNullLib/LcdPlatformNullLib.c
rename to ArmPlatformPkg/Library/LcdPlatformLibNull/LcdPlatformLibNull.c
diff --git a/ArmPlatformPkg/Library/LcdPlatformNullLib/LcdPlatformNullLib.inf b/ArmPlatformPkg/Library/LcdPlatformLibNull/LcdPlatformLibNull.inf
similarity index 84%
rename from ArmPlatformPkg/Library/LcdPlatformNullLib/LcdPlatformNullLib.inf
rename to ArmPlatformPkg/Library/LcdPlatformLibNull/LcdPlatformLibNull.inf
index 21bbe0571f..e300bedaa4 100644
--- a/ArmPlatformPkg/Library/LcdPlatformNullLib/LcdPlatformNullLib.inf
+++ b/ArmPlatformPkg/Library/LcdPlatformLibNull/LcdPlatformLibNull.inf
@@ -9,14 +9,14 @@
 
 [Defines]
   INF_VERSION                    = 0x0001001A
-  BASE_NAME                      = LcdPlatformNullLib
+  BASE_NAME                      = LcdPlatformLibNull
   FILE_GUID                      = f8bb120b-528f-46e2-92c2-130870af1a20
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = LcdPlatformLib
 
 [Sources]
-  LcdPlatformNullLib.c
+  LcdPlatformLibNull.c
 
 [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec