From: Pierre Gondois <pierre.gond...@arm.com> Removing the "Platform/ARM/" prefix changes the order of alphabetically ordered files in the "Package" section of inf files. Re-order them.
Also to re-order the "LibraryClasses" and "Sources" sections when necessary. Bugzilla: 3264 (https://bugzilla.tianocore.org/show_bug.cgi?id=3264) Signed-off-by: Pierre Gondois <pierre.gond...@arm.com> --- .../ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf | 8 ++++---- .../Drivers/FdtPlatformDxe/FdtPlatformDxe.inf | 2 +- .../Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf | 10 +++++----- Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsLib.inf | 4 ++-- Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf | 10 +++++----- .../ConfigurationManagerDxe.inf | 4 ++-- Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 10 +++++----- .../JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf | 2 +- Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf | 8 ++++---- .../JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf | 2 +- .../Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf | 2 +- .../JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf | 2 +- .../Library/NorFlashJunoLib/NorFlashJunoLib.inf | 2 +- .../JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 4 ++-- .../ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf | 2 +- Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf | 2 +- Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf | 2 +- .../ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf | 2 +- Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf | 2 +- Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf | 2 +- Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf | 2 +- Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf | 2 +- Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf | 2 +- .../Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 8 ++++---- .../Library/PciHostBridgeLib/PciHostBridgeLib.inf | 4 ++-- .../ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf | 2 +- .../ConfigurationManagerDxe.inf | 2 +- .../VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf | 6 +++--- .../VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf | 2 +- .../ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf | 6 +++--- .../Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf | 2 +- .../ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf | 10 +++++----- .../VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf | 6 +++--- .../ArmVExpressDtPlatformDtbLoaderLib.inf | 2 +- .../Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf | 4 ++-- .../Library/ArmVExpressLibRTSM/ArmVExpressLib.inf | 10 +++++----- .../Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf | 10 +++++----- .../NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf | 2 +- .../Library/ResetSystemLib/ResetSystemLib.inf | 2 +- 39 files changed, 83 insertions(+), 83 deletions(-) diff --git a/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf b/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf index 258eaf1204c0..04560a7c1911 100644 --- a/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf +++ b/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf @@ -17,18 +17,18 @@ [Defines] ENTRY_POINT = BootMonFsEntryPoint [Sources] - BootMonFsEntryPoint.c - BootMonFsOpenClose.c BootMonFsDir.c + BootMonFsEntryPoint.c BootMonFsImages.c + BootMonFsOpenClose.c BootMonFsReadWrite.c BootMonFsUnsupported.c [Packages] + ArmCommonPkg/ArmCommonPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec - MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - ArmCommonPkg/ArmCommonPkg.dec + MdePkg/MdePkg.dec [LibraryClasses] BaseLib diff --git a/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf b/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf index 7f0beb100cce..e7b68356585e 100644 --- a/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf +++ b/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf @@ -22,10 +22,10 @@ [Sources.common] ShellSetFdt.c [Packages] + ArmCommonPkg/ArmCommonPkg.dec EmbeddedPkg/EmbeddedPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - ArmCommonPkg/ArmCommonPkg.dec ShellPkg/ShellPkg.dec [LibraryClasses] diff --git a/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf b/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf index 52d6bce28ecc..fdd238f5b621 100644 --- a/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf +++ b/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf @@ -17,15 +17,15 @@ [Defines] [Sources.common] ArmShellCmdRunAxf.c ArmShellCmdRunAxf.uni - RunAxf.c - BootMonFsLoader.h BootMonFsLoader.c - ElfLoader.h + BootMonFsLoader.h ElfLoader.c + ElfLoader.h + RunAxf.c # ELF definitions taken from BaseTools + elf_common.h elf32.h elf64.h - elf_common.h [Sources.AARCH64] AArch64/Pivot.S @@ -34,10 +34,10 @@ [Sources.ARM] Arm/Pivot.S [Packages] + ArmCommonPkg/ArmCommonPkg.dec ArmPkg/ArmPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - ArmCommonPkg/ArmCommonPkg.dec ShellPkg/ShellPkg.dec [LibraryClasses] diff --git a/Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsLib.inf b/Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsLib.inf index 4157a598cc6e..cb734c08fc4d 100644 --- a/Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsLib.inf +++ b/Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsLib.inf @@ -19,11 +19,11 @@ [Sources.common] BdsHelper.c [Packages] + ArmCommonPkg/ArmCommonPkg.dec EmbeddedPkg/EmbeddedPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec NetworkPkg/NetworkPkg.dec - ArmCommonPkg/ArmCommonPkg.dec [LibraryClasses] ArmLib @@ -31,8 +31,8 @@ [LibraryClasses] DebugLib DevicePathLib HobLib - PcdLib NetLib + PcdLib [Guids] gEfiFileInfoGuid diff --git a/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf b/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf index 20030a5e54fb..a7353238128f 100644 --- a/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf +++ b/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf @@ -16,21 +16,21 @@ [Defines] VERSION_STRING = 1.0 [Sources] - Dsdt.asl + AcpiSsdtRootPci.asl # Juno R1 specific Dbg2.aslc - Spcr.aslc + Dsdt.asl Fadt.aslc Gtdt.aslc Madt.aslc - AcpiSsdtRootPci.asl # Juno R1 specific + Spcr.aslc [Packages] ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec EmbeddedPkg/EmbeddedPkg.dec - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec JunoPkg/ArmJuno.dec + MdeModulePkg/MdeModulePkg.dec + MdePkg/MdePkg.dec [FixedPcd] gArmPlatformTokenSpaceGuid.PcdCoreCount diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf index b496756295bd..0323240355de 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf @@ -21,18 +21,18 @@ [Defines] # [Sources] - ConfigurationManager.c AslTables/Dsdt.asl AslTables/SsdtJunoUsb.asl AslTables/SsdtPci.asl + ConfigurationManager.c [Packages] ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec DynamicTablesPkg/DynamicTablesPkg.dec + JunoPkg/ArmJuno.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - JunoPkg/ArmJuno.dec [LibraryClasses] ArmPlatformLib diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf index 3d14332b3ea0..1f14edf9a900 100644 --- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf +++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf @@ -17,13 +17,13 @@ [Sources.common] ArmJunoDxe.c [Packages] + ArmCommonPkg/ArmCommonPkg.dec ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec EmbeddedPkg/EmbeddedPkg.dec - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - ArmCommonPkg/ArmCommonPkg.dec JunoPkg/ArmJuno.dec + MdeModulePkg/MdeModulePkg.dec + MdePkg/MdePkg.dec [LibraryClasses] AcpiLib @@ -38,9 +38,9 @@ [LibraryClasses] PrintLib SerialPortLib UefiBootServicesTableLib - UefiRuntimeServicesTableLib - UefiLib UefiDriverEntryPoint + UefiLib + UefiRuntimeServicesTableLib [Guids] gEfiFileInfoGuid diff --git a/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf b/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf index be9c08bc5f88..5174ff9501d8 100644 --- a/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf +++ b/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf @@ -23,8 +23,8 @@ [Defines] ENTRY_POINT = InitializeSataSiI3132 [Packages] - MdePkg/MdePkg.dec JunoPkg/ArmJuno.dec + MdePkg/MdePkg.dec [LibraryClasses] MemoryAllocationLib diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf index cc24f5e895ce..3923b6ffba47 100644 --- a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf +++ b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf @@ -13,17 +13,17 @@ [Defines] LIBRARY_CLASS = ArmPlatformLib [Packages] - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - EmbeddedPkg/EmbeddedPkg.dec ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec + EmbeddedPkg/EmbeddedPkg.dec JunoPkg/ArmJuno.dec + MdeModulePkg/MdeModulePkg.dec + MdePkg/MdePkg.dec [LibraryClasses] - IoLib ArmLib HobLib + IoLib MemoryAllocationLib SerialPortLib diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf b/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf index 55a18031df3f..8b833ba57da9 100644 --- a/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf +++ b/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf @@ -18,8 +18,8 @@ [Sources.common] [Packages] ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec - MdePkg/MdePkg.dec JunoPkg/ArmJuno.dec + MdePkg/MdePkg.dec [LibraryClasses] ArmLib diff --git a/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf b/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf index a34dceb7bdc0..fe9b666a4c45 100644 --- a/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf +++ b/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf @@ -22,8 +22,8 @@ [Sources.common] [Packages] ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec - MdePkg/MdePkg.dec JunoPkg/ArmJuno.dec + MdePkg/MdePkg.dec [LibraryClasses] BaseLib diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf index 4f3f3c708715..7f52562e7e98 100644 --- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf +++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf @@ -30,9 +30,9 @@ [Sources] [Packages] ArmPkg/ArmPkg.dec + JunoPkg/ArmJuno.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - JunoPkg/ArmJuno.dec [LibraryClasses] BaseLib diff --git a/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf b/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf index 5064409173b1..2d654cc7758f 100644 --- a/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf +++ b/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf @@ -18,8 +18,8 @@ [Sources.common] [Packages] ArmPlatformPkg/ArmPlatformPkg.dec - MdePkg/MdePkg.dec JunoPkg/ArmJuno.dec + MdePkg/MdePkg.dec [LibraryClasses] BaseLib diff --git a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf index 8f0231314678..d18a561fbab1 100644 --- a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf +++ b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf @@ -30,14 +30,14 @@ [Sources] [Packages] ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec + JunoPkg/ArmJuno.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - JunoPkg/ArmJuno.dec [LibraryClasses] ArmLib - BaseMemoryLib BaseLib + BaseMemoryLib DebugLib HobLib IoLib diff --git a/Platform/ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf b/Platform/ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf index 5e773543b39d..a4428f382e49 100644 --- a/Platform/ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf +++ b/Platform/ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf @@ -21,8 +21,8 @@ [Sources.common] [Packages] MdePkg/MdePkg.dec - OvmfPkg/OvmfPkg.dec Morello/MorelloPlatform.dec + OvmfPkg/OvmfPkg.dec [LibraryClasses] UefiDriverEntryPoint diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf index 409d3aa5ccbc..0a1503884db3 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf @@ -16,7 +16,6 @@ [Defines] [Sources] Dbg2.aslc - SsdtRos.asl Fadt.aslc Gtdt.aslc Iort.aslc @@ -27,6 +26,7 @@ [Sources] Spcr.aslc Ssdt.asl SsdtEvents.asl + SsdtRos.asl [Packages] ArmPkg/ArmPkg.dec diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf index c74685bec7b2..767073ff8a0c 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf @@ -16,7 +16,6 @@ [Defines] [Sources] Dbg2.aslc - SsdtRos.asl Fadt.aslc Gtdt.aslc Iort.aslc @@ -27,6 +26,7 @@ [Sources] Spcr.aslc Ssdt.asl SsdtEvents.asl + SsdtRos.asl [Packages] ArmPkg/ArmPkg.dec diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf index 1ad34860fa7b..c4e29a485f44 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf @@ -16,7 +16,6 @@ [Defines] [Sources] Dbg2.aslc - SsdtRos.asl Fadt.aslc Gtdt.aslc Iort.aslc @@ -29,6 +28,7 @@ [Sources] Spcr.aslc Ssdt.asl SsdtEvents.asl + SsdtRos.asl [Packages] ArmPkg/ArmPkg.dec diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf index c136ea4320e0..60ef6744294f 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf @@ -25,8 +25,8 @@ [Sources] RdN2/Pptt.aslc Spcr.aslc Ssdt.asl - SsdtRos.asl SsdtEvents.asl + SsdtRos.asl [Packages] ArmPkg/ArmPkg.dec diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf index 36bc95615f86..574f332985d6 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf @@ -25,8 +25,8 @@ [Sources] RdN2Cfg1/Pptt.aslc Spcr.aslc Ssdt.asl - SsdtRos.asl SsdtEvents.asl + SsdtRos.asl [Packages] ArmPkg/ArmPkg.dec diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf index d5b6479e4f44..808033405512 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf @@ -16,7 +16,6 @@ [Defines] [Sources] Dbg2.aslc - SsdtRos.asl Fadt.aslc Gtdt.aslc Iort.aslc @@ -27,6 +26,7 @@ [Sources] Spcr.aslc Ssdt.asl SsdtEvents.asl + SsdtRos.asl [Packages] ArmPkg/ArmPkg.dec diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf index 3863237d2a0c..86c8257c9bcd 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf @@ -16,7 +16,6 @@ [Defines] [Sources] Dbg2.aslc - SsdtRos.asl Fadt.aslc Gtdt.aslc Iort.aslc @@ -29,6 +28,7 @@ [Sources] Spcr.aslc Ssdt.asl SsdtEvents.asl + SsdtRos.asl [Packages] ArmPkg/ArmPkg.dec diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf index 7b536e823869..e6ae131aba3c 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf @@ -25,8 +25,8 @@ [Sources] Sgi575/Pptt.aslc Spcr.aslc Ssdt.asl - SsdtRos.asl SsdtEvents.asl + SsdtRos.asl [Packages] ArmPkg/ArmPkg.dec diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf index 3ed6def28003..08241b85590e 100644 --- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf +++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf @@ -16,14 +16,14 @@ [Defines] [Sources] SmbiosPlatformDxe.c Type0BiosInformation.c - Type1SystemInformation.c - Type3SystemEnclosure.c - Type4ProcessorInformation.c - Type7CacheInformation.c Type16PhysicalMemoryArray.c Type17MemoryDevice.c Type19MemoryArrayMappedAddress.c + Type1SystemInformation.c Type32SystemBootInformation.c + Type3SystemEnclosure.c + Type4ProcessorInformation.c + Type7CacheInformation.c [Packages] ArmPkg/ArmPkg.dec diff --git a/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf b/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf index a9fdd874d049..17c2bb01b821 100644 --- a/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf +++ b/Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf @@ -27,9 +27,9 @@ [Sources] PciHostBridgeLib.c [Packages] - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec ArmPkg/ArmPkg.dec + MdeModulePkg/MdeModulePkg.dec + MdePkg/MdePkg.dec [LibraryClasses] BaseLib diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf index f86167cccd70..00452b678c72 100644 --- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf +++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf @@ -30,8 +30,8 @@ [LibraryClasses] SerialPortLib [Sources.common] - PlatformLibMem.c PlatformLib.c + PlatformLibMem.c [Sources.AARCH64] AArch64/Helper.S | GCC diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf index bbb3dd02ef8d..477b16852156 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf @@ -21,9 +21,9 @@ [Defines] # [Sources] - ConfigurationManager.c AslTables/Dsdt.asl AslTables/SsdtPci.asl + ConfigurationManager.c [Packages] ArmPkg/ArmPkg.dec diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf index 26798cdfb22c..d2dce0058bd4 100644 --- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf +++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf @@ -18,11 +18,11 @@ [Sources.common] ArmFvpDxe.c [Packages] - MdePkg/MdePkg.dec + ArmCommonPkg/ArmCommonPkg.dec ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec + MdePkg/MdePkg.dec OvmfPkg/OvmfPkg.dec - ArmCommonPkg/ArmCommonPkg.dec VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] @@ -30,7 +30,7 @@ [LibraryClasses] BaseMemoryLib IoLib TimerLib - UefiDriverEntryPoint UefiBootServicesTableLib + UefiDriverEntryPoint VirtioMmioDeviceLib diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf index 93a51de12368..a2ebd3b10099 100644 --- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf +++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf @@ -18,9 +18,9 @@ [Sources.common] ArmHwDxe.c [Packages] + ArmCommonPkg/ArmCommonPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec MdePkg/MdePkg.dec - ArmCommonPkg/ArmCommonPkg.dec [LibraryClasses] ArmShellCmdRunAxfLib diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf index 5121177324d5..ba30409a50c0 100644 --- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf +++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf @@ -34,11 +34,11 @@ [Protocols] gEfiDiskIoProtocolGuid [Packages] + ArmPkg/ArmPkg.dec + ArmPlatformPkg/ArmPlatformPkg.dec EmbeddedPkg/EmbeddedPkg.dec - MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - ArmPlatformPkg/ArmPlatformPkg.dec - ArmPkg/ArmPkg.dec + MdePkg/MdePkg.dec VExpressPkg/ArmVExpressPkg.dec [Pcd] diff --git a/Platform/ARM/VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf b/Platform/ARM/VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf index 2ebcf910ed2d..7a1aa87ba86e 100644 --- a/Platform/ARM/VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf +++ b/Platform/ARM/VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf @@ -38,8 +38,8 @@ [Protocols] [Packages] EmbeddedPkg/EmbeddedPkg.dec - MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec + MdePkg/MdePkg.dec VExpressPkg/ArmVExpressPkg.dec [Pcd] diff --git a/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf b/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf index 988eb4a23ea0..6b8e5d75a89e 100644 --- a/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf +++ b/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf @@ -28,19 +28,19 @@ [Sources.common] Lan9118Dxe.h [Packages] - NetworkPkg/NetworkPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec + NetworkPkg/NetworkPkg.dec VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] BaseLib - UefiLib - NetLib - UefiDriverEntryPoint BaseMemoryLib - IoLib DevicePathLib + IoLib + NetLib + UefiDriverEntryPoint + UefiLib [Protocols] gEfiSimpleNetworkProtocolGuid diff --git a/Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf b/Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf index ff1407aefd4e..d07954df1b3a 100644 --- a/Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf +++ b/Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf @@ -32,13 +32,13 @@ [Packages] VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] + ArmLib BaseLib - UefiLib - UefiDriverEntryPoint BaseMemoryLib - ArmLib IoLib TimerLib + UefiDriverEntryPoint + UefiLib [Protocols] gEfiCpuArchProtocolGuid diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf index 823233a4153b..488d5175015f 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf @@ -19,9 +19,9 @@ [Sources] [Packages] ArmPkg/ArmPkg.dec + EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec VExpressPkg/ArmVExpressPkg.dec - EmbeddedPkg/EmbeddedPkg.dec [LibraryClasses] ArmGicLib diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf index d2bf15aa405e..8c56cac09603 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf @@ -15,16 +15,16 @@ [Defines] LIBRARY_CLASS = ArmPlatformLib [Packages] - ArmPlatformPkg/ArmPlatformPkg.dec ArmPkg/ArmPkg.dec + ArmPlatformPkg/ArmPlatformPkg.dec EmbeddedPkg/EmbeddedPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] - IoLib ArmLib + IoLib MemoryAllocationLib SerialPortLib diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf index 8ff24785939a..f54ff376c775 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf @@ -14,19 +14,19 @@ [Defines] LIBRARY_CLASS = ArmPlatformLib [Packages] - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - EmbeddedPkg/EmbeddedPkg.dec ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec + EmbeddedPkg/EmbeddedPkg.dec + MdeModulePkg/MdeModulePkg.dec + MdePkg/MdePkg.dec VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] - IoLib ArmLib + HobLib + IoLib MemoryAllocationLib SerialPortLib - HobLib [Sources.common] RTSM.c diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf index 7271ff5ab298..28bf8f05db33 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf @@ -14,16 +14,16 @@ [Defines] LIBRARY_CLASS = ArmPlatformLib [Packages] - MdePkg/MdePkg.dec - MdeModulePkg/MdeModulePkg.dec - VExpressPkg/ArmVExpressPkg.dec - EmbeddedPkg/EmbeddedPkg.dec ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec + EmbeddedPkg/EmbeddedPkg.dec + MdeModulePkg/MdeModulePkg.dec + MdePkg/MdePkg.dec + VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] - IoLib ArmLib + IoLib SerialPortLib [Sources.common] diff --git a/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf index 736230e53160..b171d1f92096 100644 --- a/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf +++ b/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf @@ -17,8 +17,8 @@ [Sources.common] NorFlashArmVExpress.c [Packages] - MdePkg/MdePkg.dec ArmPlatformPkg/ArmPlatformPkg.dec + MdePkg/MdePkg.dec VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] diff --git a/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf b/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf index 37e00bd5bc60..332156d71eb5 100644 --- a/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf +++ b/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf @@ -27,5 +27,5 @@ [Packages] VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] - DebugLib ArmPlatformSysConfigLib + DebugLib -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#80873): https://edk2.groups.io/g/devel/message/80873 Mute This Topic: https://groups.io/mt/85741396/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
