GIC, GenericTimer and BootArch are ARM specific concepts. Move them to Arm folder and update the references.
Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org> Cc: Leif Lindholm <quic_llind...@quicinc.com> Cc: Pierre Gondois <pierre.gond...@arm.com> Cc: Sami Mujawar <sami.muja...@arm.com> Signed-off-by: Sunil V L <suni...@ventanamicro.com> --- .../FdtHwInfoParserLib/FdtHwInfoParserLib.inf | 32 +++++++++---------- .../{ => Arm}/BootArch/ArmBootArchParser.h | 0 .../GenericTimer/ArmGenericTimerParser.h | 0 .../{ => Arm}/Gic/ArmGicCParser.h | 0 .../{ => Arm}/Gic/ArmGicDParser.h | 0 .../{ => Arm}/Gic/ArmGicDispatcher.h | 0 .../{ => Arm}/Gic/ArmGicItsParser.h | 0 .../{ => Arm}/Gic/ArmGicMsiFrameParser.h | 0 .../{ => Arm}/Gic/ArmGicRParser.h | 0 .../{ => Arm}/BootArch/ArmBootArchParser.c | 2 +- .../GenericTimer/ArmGenericTimerParser.c | 4 +-- .../{ => Arm}/Gic/ArmGicCParser.c | 4 +-- .../{ => Arm}/Gic/ArmGicDParser.c | 4 +-- .../{ => Arm}/Gic/ArmGicDispatcher.c | 12 +++---- .../{ => Arm}/Gic/ArmGicItsParser.c | 4 +-- .../{ => Arm}/Gic/ArmGicMsiFrameParser.c | 4 +-- .../{ => Arm}/Gic/ArmGicRParser.c | 4 +-- .../FdtHwInfoParserLib/FdtHwInfoParser.c | 6 ++-- .../Pci/ArmPciConfigSpaceParser.c | 2 +- 19 files changed, 39 insertions(+), 39 deletions(-) rename DynamicTablesPkg/Library/FdtHwInfoParserLib/{ => Arm}/BootArch/ArmBootArchParser.h (100%) rename DynamicTablesPkg/Library/FdtHwInfoParserLib/{ => Arm}/GenericTimer/ArmGenericTimerParser.h (100%) rename DynamicTablesPkg/Library/FdtHwInfoParserLib/{ => Arm}/Gic/ArmGicCParser.h (100%) rename DynamicTablesPkg/Library/FdtHwInfoParserLib/{ => Arm}/Gic/ArmGicDParser.h (100%) rename DynamicTablesPkg/Library/FdtHwInfoParserLib/{ => Arm}/Gic/ArmGicDispatcher.h (100%) rename DynamicTablesPkg/Library/FdtHwInfoParserLib/{ => Arm}/Gic/ArmGicItsParser.h (100%) rename DynamicTablesPkg/Library/FdtHwInfoParserLib/{ => Arm}/Gic/ArmGicMsiFrameParser.h (100%) rename DynamicTablesPkg/Library/FdtHwInfoParserLib/{ => Arm}/Gic/ArmGicRParser.h (100%) rename DynamicTablesPkg/Library/FdtHwInfoParserLib/{ => Arm}/BootArch/ArmBootArchParser.c (95%) rename DynamicTablesPkg/Library/FdtHwInfoParserLib/{ => Arm}/GenericTimer/ArmGenericTimerParser.c (95%) rename DynamicTablesPkg/Library/FdtHwInfoParserLib/{ => Arm}/Gic/ArmGicCParser.c (96%) rename DynamicTablesPkg/Library/FdtHwInfoParserLib/{ => Arm}/Gic/ArmGicDParser.c (95%) rename DynamicTablesPkg/Library/FdtHwInfoParserLib/{ => Arm}/Gic/ArmGicDispatcher.c (92%) rename DynamicTablesPkg/Library/FdtHwInfoParserLib/{ => Arm}/Gic/ArmGicItsParser.c (95%) rename DynamicTablesPkg/Library/FdtHwInfoParserLib/{ => Arm}/Gic/ArmGicMsiFrameParser.c (95%) rename DynamicTablesPkg/Library/FdtHwInfoParserLib/{ => Arm}/Gic/ArmGicRParser.c (95%) diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtHwInfoParserLib.inf b/DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtHwInfoParserLib.inf index d2c171accaa5..fa768cf664df 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtHwInfoParserLib.inf +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtHwInfoParserLib.inf @@ -22,22 +22,22 @@ [Sources] FdtHwInfoParser.h FdtUtility.c FdtUtility.h - BootArch/ArmBootArchParser.c - BootArch/ArmBootArchParser.h - GenericTimer/ArmGenericTimerParser.c - GenericTimer/ArmGenericTimerParser.h - Gic/ArmGicCParser.c - Gic/ArmGicCParser.h - Gic/ArmGicDispatcher.c - Gic/ArmGicDispatcher.h - Gic/ArmGicDParser.c - Gic/ArmGicDParser.h - Gic/ArmGicItsParser.c - Gic/ArmGicItsParser.h - Gic/ArmGicMsiFrameParser.c - Gic/ArmGicMsiFrameParser.h - Gic/ArmGicRParser.c - Gic/ArmGicRParser.h + Arm/BootArch/ArmBootArchParser.c + Arm/BootArch/ArmBootArchParser.h + Arm/GenericTimer/ArmGenericTimerParser.c + Arm/GenericTimer/ArmGenericTimerParser.h + Arm/Gic/ArmGicCParser.c + Arm/Gic/ArmGicCParser.h + Arm/Gic/ArmGicDispatcher.c + Arm/Gic/ArmGicDispatcher.h + Arm/Gic/ArmGicDParser.c + Arm/Gic/ArmGicDParser.h + Arm/Gic/ArmGicItsParser.c + Arm/Gic/ArmGicItsParser.h + Arm/Gic/ArmGicMsiFrameParser.c + Arm/Gic/ArmGicMsiFrameParser.h + Arm/Gic/ArmGicRParser.c + Arm/Gic/ArmGicRParser.h Pci/ArmPciConfigSpaceParser.c Pci/ArmPciConfigSpaceParser.h Serial/ArmSerialPortParser.c diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/BootArch/ArmBootArchParser.h b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/BootArch/ArmBootArchParser.h similarity index 100% rename from DynamicTablesPkg/Library/FdtHwInfoParserLib/BootArch/ArmBootArchParser.h rename to DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/BootArch/ArmBootArchParser.h diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/GenericTimer/ArmGenericTimerParser.h b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/GenericTimer/ArmGenericTimerParser.h similarity index 100% rename from DynamicTablesPkg/Library/FdtHwInfoParserLib/GenericTimer/ArmGenericTimerParser.h rename to DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/GenericTimer/ArmGenericTimerParser.h diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicCParser.h b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicCParser.h similarity index 100% rename from DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicCParser.h rename to DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicCParser.h diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicDParser.h b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicDParser.h similarity index 100% rename from DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicDParser.h rename to DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicDParser.h diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicDispatcher.h b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicDispatcher.h similarity index 100% rename from DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicDispatcher.h rename to DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicDispatcher.h diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicItsParser.h b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicItsParser.h similarity index 100% rename from DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicItsParser.h rename to DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicItsParser.h diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicMsiFrameParser.h b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicMsiFrameParser.h similarity index 100% rename from DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicMsiFrameParser.h rename to DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicMsiFrameParser.h diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicRParser.h b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicRParser.h similarity index 100% rename from DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicRParser.h rename to DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicRParser.h diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/BootArch/ArmBootArchParser.c b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/BootArch/ArmBootArchParser.c similarity index 95% rename from DynamicTablesPkg/Library/FdtHwInfoParserLib/BootArch/ArmBootArchParser.c rename to DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/BootArch/ArmBootArchParser.c index b07b6b8b666a..d217e33424b1 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/BootArch/ArmBootArchParser.c +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/BootArch/ArmBootArchParser.c @@ -10,7 +10,7 @@ #include "FdtHwInfoParser.h" #include "CmObjectDescUtility.h" -#include "BootArch/ArmBootArchParser.h" +#include "Arm/BootArch/ArmBootArchParser.h" /** List of "compatible" property values for Psci nodes. diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/GenericTimer/ArmGenericTimerParser.c b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/GenericTimer/ArmGenericTimerParser.c similarity index 95% rename from DynamicTablesPkg/Library/FdtHwInfoParserLib/GenericTimer/ArmGenericTimerParser.c rename to DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/GenericTimer/ArmGenericTimerParser.c index 988a81221dab..6488399ed812 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/GenericTimer/ArmGenericTimerParser.c +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/GenericTimer/ArmGenericTimerParser.c @@ -10,8 +10,8 @@ #include "FdtHwInfoParser.h" #include "CmObjectDescUtility.h" -#include "GenericTimer/ArmGenericTimerParser.h" -#include "Gic/ArmGicDispatcher.h" +#include "Arm/GenericTimer/ArmGenericTimerParser.h" +#include "Arm/Gic/ArmGicDispatcher.h" /** List of "compatible" property values for timer nodes. diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicCParser.c b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicCParser.c similarity index 96% rename from DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicCParser.c rename to DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicCParser.c index ee82f7a0b461..cf577b47242e 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicCParser.c +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicCParser.c @@ -13,8 +13,8 @@ #include "FdtHwInfoParser.h" #include "CmObjectDescUtility.h" -#include "Gic/ArmGicCParser.h" -#include "Gic/ArmGicDispatcher.h" +#include "Arm/Gic/ArmGicCParser.h" +#include "Arm/Gic/ArmGicDispatcher.h" /** List of "compatible" property values for CPU nodes. diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicDParser.c b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicDParser.c similarity index 95% rename from DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicDParser.c rename to DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicDParser.c index b7f569672980..906ef8b8585e 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicDParser.c +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicDParser.c @@ -11,8 +11,8 @@ #include "CmObjectDescUtility.h" #include "FdtHwInfoParser.h" -#include "Gic/ArmGicDispatcher.h" -#include "Gic/ArmGicDParser.h" +#include "Arm/Gic/ArmGicDispatcher.h" +#include "Arm/Gic/ArmGicDParser.h" /** Parse a Gic compatible interrupt-controller node, extracting GicD information. diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicDispatcher.c b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicDispatcher.c similarity index 92% rename from DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicDispatcher.c rename to DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicDispatcher.c index 1f3af1f968a9..ca34d24a78d9 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicDispatcher.c +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicDispatcher.c @@ -10,12 +10,12 @@ **/ #include "FdtHwInfoParser.h" -#include "Gic/ArmGicCParser.h" -#include "Gic/ArmGicDispatcher.h" -#include "Gic/ArmGicDParser.h" -#include "Gic/ArmGicItsParser.h" -#include "Gic/ArmGicMsiFrameParser.h" -#include "Gic/ArmGicRParser.h" +#include "Arm/Gic/ArmGicCParser.h" +#include "Arm/Gic/ArmGicDispatcher.h" +#include "Arm/Gic/ArmGicDParser.h" +#include "Arm/Gic/ArmGicItsParser.h" +#include "Arm/Gic/ArmGicMsiFrameParser.h" +#include "Arm/Gic/ArmGicRParser.h" /** List of "compatible" property values for GicV2 interrupt nodes. diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicItsParser.c b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicItsParser.c similarity index 95% rename from DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicItsParser.c rename to DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicItsParser.c index f23818fbd047..6d4bde6a141a 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicItsParser.c +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicItsParser.c @@ -10,8 +10,8 @@ #include "CmObjectDescUtility.h" #include "FdtHwInfoParser.h" -#include "Gic/ArmGicDispatcher.h" -#include "Gic/ArmGicItsParser.h" +#include "Arm/Gic/ArmGicDispatcher.h" +#include "Arm/Gic/ArmGicItsParser.h" /** Parse a Gic compatible interrupt-controller node, extracting GicIts information. diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicMsiFrameParser.c b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicMsiFrameParser.c similarity index 95% rename from DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicMsiFrameParser.c rename to DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicMsiFrameParser.c index c474cb25fe6f..dff5beff91be 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicMsiFrameParser.c +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicMsiFrameParser.c @@ -11,8 +11,8 @@ #include "CmObjectDescUtility.h" #include "FdtHwInfoParser.h" -#include "Gic/ArmGicDispatcher.h" -#include "Gic/ArmGicMsiFrameParser.h" +#include "Arm/Gic/ArmGicDispatcher.h" +#include "Arm/Gic/ArmGicMsiFrameParser.h" /** List of "compatible" property values for Msi-frame nodes. diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicRParser.c b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicRParser.c similarity index 95% rename from DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicRParser.c rename to DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicRParser.c index 0f9c7bb3fea2..de2e1dd1f1e3 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Gic/ArmGicRParser.c +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Arm/Gic/ArmGicRParser.c @@ -10,8 +10,8 @@ #include "CmObjectDescUtility.h" #include "FdtHwInfoParser.h" -#include "Gic/ArmGicDispatcher.h" -#include "Gic/ArmGicRParser.h" +#include "Arm/Gic/ArmGicDispatcher.h" +#include "Arm/Gic/ArmGicRParser.h" /** Parse a Gic compatible interrupt-controller node, extracting GicR information. diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtHwInfoParser.c b/DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtHwInfoParser.c index 376de078bcb1..78bf9c9efae4 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtHwInfoParser.c +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtHwInfoParser.c @@ -6,9 +6,9 @@ **/ #include "FdtHwInfoParser.h" -#include "BootArch/ArmBootArchParser.h" -#include "GenericTimer/ArmGenericTimerParser.h" -#include "Gic/ArmGicDispatcher.h" +#include "Arm/BootArch/ArmBootArchParser.h" +#include "Arm/GenericTimer/ArmGenericTimerParser.h" +#include "Arm/Gic/ArmGicDispatcher.h" #include "Pci/ArmPciConfigSpaceParser.h" #include "Serial/ArmSerialPortParser.h" diff --git a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSpaceParser.c b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSpaceParser.c index 2ffff1ccd27f..68b048498121 100644 --- a/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSpaceParser.c +++ b/DynamicTablesPkg/Library/FdtHwInfoParserLib/Pci/ArmPciConfigSpaceParser.c @@ -17,7 +17,7 @@ #include "FdtHwInfoParser.h" #include "Pci/ArmPciConfigSpaceParser.h" -#include "Gic/ArmGicDispatcher.h" +#include "Arm/Gic/ArmGicDispatcher.h" /** List of "compatible" property values for host PCIe bridges nodes. -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113463): https://edk2.groups.io/g/devel/message/113463 Mute This Topic: https://groups.io/mt/103622704/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-