From 81e2cd329efc0ed240234f475426cb81bf5d9c84 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 17 Jan 2025 09:59:02 +0100 Subject: [PATCH] ArmPkg/ArmGic: Rename directory to ArmGicDxe Now that ArmPkg/Drivers/ArmGic no longer carries a combination of libraries and DXE drivers, rename the directory to the more idiomatic ArmPkg/Drivers/ArmGicDxe Continuous-integration-options: PatchCheck.ignore-multi-package Signed-off-by: Ard Biesheuvel --- ArmPkg/ArmPkg.dsc | 6 +++--- ArmPkg/Drivers/{ArmGic => ArmGicDxe}/ArmGicCommonDxe.c | 0 ArmPkg/Drivers/{ArmGic => ArmGicDxe}/ArmGicDxe.c | 0 ArmPkg/Drivers/{ArmGic => ArmGicDxe}/ArmGicDxe.h | 0 ArmPkg/Drivers/{ArmGic => ArmGicDxe}/ArmGicDxe.inf | 0 ArmPkg/Drivers/{ArmGic => ArmGicDxe}/ArmGicV2Dxe.inf | 0 ArmPkg/Drivers/{ArmGic => ArmGicDxe}/ArmGicV3Dxe.inf | 0 ArmPkg/Drivers/{ArmGic => ArmGicDxe}/GicV2/ArmGicV2Dxe.c | 0 .../Drivers/{ArmGic => ArmGicDxe}/GicV3/AArch64/ArmGicV3.S | 0 ArmPkg/Drivers/{ArmGic => ArmGicDxe}/GicV3/Arm/ArmGicV3.S | 0 ArmPkg/Drivers/{ArmGic => ArmGicDxe}/GicV3/ArmGicV3Dxe.c | 0 ArmVirtPkg/ArmVirtCloudHv.dsc | 2 +- ArmVirtPkg/ArmVirtCloudHv.fdf | 2 +- ArmVirtPkg/ArmVirtKvmTool.dsc | 2 +- ArmVirtPkg/ArmVirtKvmTool.fdf | 2 +- ArmVirtPkg/ArmVirtQemu.dsc | 2 +- ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 2 +- ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 +- ArmVirtPkg/ArmVirtXen.dsc | 2 +- ArmVirtPkg/ArmVirtXen.fdf | 2 +- 20 files changed, 12 insertions(+), 12 deletions(-) rename ArmPkg/Drivers/{ArmGic => ArmGicDxe}/ArmGicCommonDxe.c (100%) rename ArmPkg/Drivers/{ArmGic => ArmGicDxe}/ArmGicDxe.c (100%) rename ArmPkg/Drivers/{ArmGic => ArmGicDxe}/ArmGicDxe.h (100%) rename ArmPkg/Drivers/{ArmGic => ArmGicDxe}/ArmGicDxe.inf (100%) rename ArmPkg/Drivers/{ArmGic => ArmGicDxe}/ArmGicV2Dxe.inf (100%) rename ArmPkg/Drivers/{ArmGic => ArmGicDxe}/ArmGicV3Dxe.inf (100%) rename ArmPkg/Drivers/{ArmGic => ArmGicDxe}/GicV2/ArmGicV2Dxe.c (100%) rename ArmPkg/Drivers/{ArmGic => ArmGicDxe}/GicV3/AArch64/ArmGicV3.S (100%) rename ArmPkg/Drivers/{ArmGic => ArmGicDxe}/GicV3/Arm/ArmGicV3.S (100%) rename ArmPkg/Drivers/{ArmGic => ArmGicDxe}/GicV3/ArmGicV3Dxe.c (100%) diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index ecfbada222..b8817b4d7e 100644 --- a/ArmPkg/ArmPkg.dsc +++ b/ArmPkg/ArmPkg.dsc @@ -124,9 +124,9 @@ ArmPkg/Drivers/CpuDxe/CpuDxe.inf ArmPkg/Drivers/CpuPei/CpuPei.inf - ArmPkg/Drivers/ArmGic/ArmGicDxe.inf - ArmPkg/Drivers/ArmGic/ArmGicV2Dxe.inf - ArmPkg/Drivers/ArmGic/ArmGicV3Dxe.inf + ArmPkg/Drivers/ArmGicDxe/ArmGicDxe.inf + ArmPkg/Drivers/ArmGicDxe/ArmGicV2Dxe.inf + ArmPkg/Drivers/ArmGicDxe/ArmGicV3Dxe.inf ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.inf ArmPkg/Drivers/TimerDxe/TimerDxe.inf diff --git a/ArmPkg/Drivers/ArmGic/ArmGicCommonDxe.c b/ArmPkg/Drivers/ArmGicDxe/ArmGicCommonDxe.c similarity index 100% rename from ArmPkg/Drivers/ArmGic/ArmGicCommonDxe.c rename to ArmPkg/Drivers/ArmGicDxe/ArmGicCommonDxe.c diff --git a/ArmPkg/Drivers/ArmGic/ArmGicDxe.c b/ArmPkg/Drivers/ArmGicDxe/ArmGicDxe.c similarity index 100% rename from ArmPkg/Drivers/ArmGic/ArmGicDxe.c rename to ArmPkg/Drivers/ArmGicDxe/ArmGicDxe.c diff --git a/ArmPkg/Drivers/ArmGic/ArmGicDxe.h b/ArmPkg/Drivers/ArmGicDxe/ArmGicDxe.h similarity index 100% rename from ArmPkg/Drivers/ArmGic/ArmGicDxe.h rename to ArmPkg/Drivers/ArmGicDxe/ArmGicDxe.h diff --git a/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf b/ArmPkg/Drivers/ArmGicDxe/ArmGicDxe.inf similarity index 100% rename from ArmPkg/Drivers/ArmGic/ArmGicDxe.inf rename to ArmPkg/Drivers/ArmGicDxe/ArmGicDxe.inf diff --git a/ArmPkg/Drivers/ArmGic/ArmGicV2Dxe.inf b/ArmPkg/Drivers/ArmGicDxe/ArmGicV2Dxe.inf similarity index 100% rename from ArmPkg/Drivers/ArmGic/ArmGicV2Dxe.inf rename to ArmPkg/Drivers/ArmGicDxe/ArmGicV2Dxe.inf diff --git a/ArmPkg/Drivers/ArmGic/ArmGicV3Dxe.inf b/ArmPkg/Drivers/ArmGicDxe/ArmGicV3Dxe.inf similarity index 100% rename from ArmPkg/Drivers/ArmGic/ArmGicV3Dxe.inf rename to ArmPkg/Drivers/ArmGicDxe/ArmGicV3Dxe.inf diff --git a/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Dxe.c b/ArmPkg/Drivers/ArmGicDxe/GicV2/ArmGicV2Dxe.c similarity index 100% rename from ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Dxe.c rename to ArmPkg/Drivers/ArmGicDxe/GicV2/ArmGicV2Dxe.c diff --git a/ArmPkg/Drivers/ArmGic/GicV3/AArch64/ArmGicV3.S b/ArmPkg/Drivers/ArmGicDxe/GicV3/AArch64/ArmGicV3.S similarity index 100% rename from ArmPkg/Drivers/ArmGic/GicV3/AArch64/ArmGicV3.S rename to ArmPkg/Drivers/ArmGicDxe/GicV3/AArch64/ArmGicV3.S diff --git a/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.S b/ArmPkg/Drivers/ArmGicDxe/GicV3/Arm/ArmGicV3.S similarity index 100% rename from ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.S rename to ArmPkg/Drivers/ArmGicDxe/GicV3/Arm/ArmGicV3.S diff --git a/ArmPkg/Drivers/ArmGic/GicV3/ArmGicV3Dxe.c b/ArmPkg/Drivers/ArmGicDxe/GicV3/ArmGicV3Dxe.c similarity index 100% rename from ArmPkg/Drivers/ArmGic/GicV3/ArmGicV3Dxe.c rename to ArmPkg/Drivers/ArmGicDxe/GicV3/ArmGicV3Dxe.c diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc index 495446837f..9c57673926 100644 --- a/ArmVirtPkg/ArmVirtCloudHv.dsc +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc @@ -279,7 +279,7 @@ MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - ArmPkg/Drivers/ArmGic/ArmGicDxe.inf { + ArmPkg/Drivers/ArmGicDxe/ArmGicDxe.inf { NULL|ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf } diff --git a/ArmVirtPkg/ArmVirtCloudHv.fdf b/ArmVirtPkg/ArmVirtCloudHv.fdf index ef39ccb877..7bad8ed0b2 100644 --- a/ArmVirtPkg/ArmVirtCloudHv.fdf +++ b/ArmVirtPkg/ArmVirtCloudHv.fdf @@ -136,7 +136,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf - INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf + INF ArmPkg/Drivers/ArmGicDxe/ArmGicDxe.inf INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc index cae95974c1..f8ba13b883 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.dsc +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc @@ -299,7 +299,7 @@ MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - ArmPkg/Drivers/ArmGic/ArmGicDxe.inf { + ArmPkg/Drivers/ArmGicDxe/ArmGicDxe.inf { NULL|ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf } diff --git a/ArmVirtPkg/ArmVirtKvmTool.fdf b/ArmVirtPkg/ArmVirtKvmTool.fdf index 1ca388084e..b20ef9c844 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.fdf +++ b/ArmVirtPkg/ArmVirtKvmTool.fdf @@ -151,7 +151,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf - INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf + INF ArmPkg/Drivers/ArmGicDxe/ArmGicDxe.inf INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf INF OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 15b87b701f..cec17d98f9 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -428,7 +428,7 @@ MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - ArmPkg/Drivers/ArmGic/ArmGicDxe.inf { + ArmPkg/Drivers/ArmGicDxe/ArmGicDxe.inf { NULL|ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf } diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc index 5720bd28c8..622409af8a 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -71,7 +71,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf - INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf + INF ArmPkg/Drivers/ArmGicDxe/ArmGicDxe.inf INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf INF OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index cbd34a3737..b345fa3808 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -338,7 +338,7 @@ MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - ArmPkg/Drivers/ArmGic/ArmGicDxe.inf { + ArmPkg/Drivers/ArmGicDxe/ArmGicDxe.inf { NULL|ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf } diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc index 25e34ca485..32bb115f77 100644 --- a/ArmVirtPkg/ArmVirtXen.dsc +++ b/ArmVirtPkg/ArmVirtXen.dsc @@ -192,7 +192,7 @@ MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - ArmPkg/Drivers/ArmGic/ArmGicDxe.inf { + ArmPkg/Drivers/ArmGicDxe/ArmGicDxe.inf { NULL|ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf } diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf index 15efa07813..d149f9b6d5 100644 --- a/ArmVirtPkg/ArmVirtXen.fdf +++ b/ArmVirtPkg/ArmVirtXen.fdf @@ -164,7 +164,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf - INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf + INF ArmPkg/Drivers/ArmGicDxe/ArmGicDxe.inf INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf