From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.12132.1632146698232825843 for ; Mon, 20 Sep 2021 07:04:58 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: pierre.gondois@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D39E81435; Mon, 20 Sep 2021 07:04:57 -0700 (PDT) Received: from e120189.arm.com (unknown [10.57.94.101]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C46293F718; Mon, 20 Sep 2021 07:04:55 -0700 (PDT) From: "PierreGondois" To: devel@edk2.groups.io, Sean Brogan , Ard Biesheuvel , Leif Lindholm , Sami Mujawar Cc: Liming Gao , Thomas Abraham Subject: [RFC PATCH edk2-platforms v1 6/7] Platform/ARM: Remove Platform/ARM prefix Date: Mon, 20 Sep 2021 15:04:07 +0100 Message-Id: <20210920140408.16190-7-Pierre.Gondois@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210920140408.16190-1-Pierre.Gondois@arm.com> References: <20210920140408.16190-1-Pierre.Gondois@arm.com> From: Pierre Gondois Some modules/configuration files are referenced from the edk2-repository/ folder, e.g. Platform/ARM/.../module.inf. Reasons to remove the Platform/ARM prefix are: - The prefix implies conserving the folder structure when building Arm platforms and makes modules/packages exportation difficult. E.g., the JunoPkg must be in a Platform/ARM/ folder. - Removing the Platform/ARM prefix would allow to make Modules/Packages self-contained entities. If there is a module/package dependency, the build system should be able to resolve it without having a file path out of the module/package. This patch removes this Platform/ARM prefix. This implies that edk2-platforms/Platform/ARM must be added to the PACKAGES_PATH environment variable. Bugzilla: 3264 (https://bugzilla.tianocore.org/show_bug.cgi?id=3264) Signed-off-by: Pierre Gondois --- .../Drivers/BootMonFs/BootMonFs.inf | 2 +- .../Drivers/FdtPlatformDxe/FdtPlatformDxe.inf | 2 +- .../ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf | 2 +- .../ArmCommonPkg/Library/BdsLib/BdsLib.inf | 2 +- .../ARM/JunoPkg/AcpiTables/AcpiTables.inf | 2 +- Platform/ARM/JunoPkg/ArmJuno.dsc | 26 ++++++++-------- Platform/ARM/JunoPkg/ArmJuno.fdf | 14 ++++----- .../ConfigurationManager.dsc.inc | 2 +- .../ConfigurationManagerDxe.inf | 2 +- .../JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 2 +- .../Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf | 2 +- .../JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf | 2 +- .../Library/ArmJunoMtlLib/ArmJunoMtlLib.inf | 2 +- .../HdLcdArmJunoLib/HdLcdArmJunoLib.inf | 2 +- .../JunoPciHostBridgeLib.inf | 2 +- .../NorFlashJunoLib/NorFlashJunoLib.inf | 2 +- .../SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 2 +- .../ConfigurationManagerDxeFvp.inf | 2 +- .../ConfigurationManagerFvp.dsc.inc | 2 +- .../Drivers/PlatformDxe/PlatformDxeFvp.inf | 2 +- .../PciHostBridgeLib/PciHostBridgeLibFvp.inf | 2 +- .../Library/PlatformLib/PlatformLib.inf | 2 +- Platform/ARM/Morello/MorelloPlatform.dsc.inc | 2 +- Platform/ARM/Morello/MorelloPlatformFvp.dsc | 12 ++++---- Platform/ARM/Morello/MorelloPlatformFvp.fdf | 4 +-- Platform/ARM/Morello/Readme.md | 2 +- Platform/ARM/N1Sdp/N1SdpPlatform.dsc | 4 +-- Platform/ARM/Readme.md | 2 +- .../SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf | 2 +- .../SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf | 2 +- .../AcpiTables/RdN1EdgeX2AcpiTables.inf | 2 +- .../ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf | 2 +- .../SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf | 2 +- .../ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf | 2 +- .../SgiPkg/AcpiTables/RdV1McAcpiTables.inf | 2 +- .../SgiPkg/AcpiTables/Sgi575AcpiTables.inf | 2 +- .../Drivers/PlatformDxe/PlatformDxe.inf | 2 +- .../SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 2 +- .../Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf | 2 +- .../Library/NorFlashLib/NorFlashLib.inf | 2 +- .../NorFlashLib/StandaloneMmNorFlashLib.inf | 2 +- .../Library/PlatformLib/PlatformLib.inf | 2 +- .../Library/SgiPlatformPei/SgiPlatformPei.inf | 2 +- Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc | 4 +-- Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc | 4 +-- Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.dsc | 10 +++---- Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.fdf.inc | 2 +- Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.dsc | 10 +++---- Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.fdf.inc | 2 +- Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.dsc | 10 +++---- .../ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.fdf.inc | 2 +- Platform/ARM/SgiPkg/RdN2/RdN2.dsc | 10 +++---- Platform/ARM/SgiPkg/RdN2/RdN2.fdf.inc | 2 +- Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.dsc | 10 +++---- Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.fdf.inc | 2 +- Platform/ARM/SgiPkg/RdV1/RdV1.dsc | 10 +++---- Platform/ARM/SgiPkg/RdV1/RdV1.fdf.inc | 2 +- Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.dsc | 10 +++---- Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.fdf.inc | 2 +- Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc | 10 +++---- Platform/ARM/SgiPkg/Sgi575/Sgi575.fdf.inc | 2 +- Platform/ARM/SgiPkg/SgiPlatform.dsc.inc | 18 +++++------ Platform/ARM/SgiPkg/SgiPlatform.fdf | 6 ++-- Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc | 2 +- .../ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 30 +++++++++---------- .../ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf | 14 ++++----- .../VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 28 ++++++++--------- .../VExpressPkg/ArmVExpress-FVP-AArch64.fdf | 22 +++++++------- Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 10 +++---- .../ConfigurationManagerDxe.inf | 2 +- .../Drivers/ArmVExpressDxe/ArmFvpDxe.inf | 2 +- .../ArmVExpressFastBootDxe.inf | 2 +- .../Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf | 2 +- .../Drivers/Lan9118Dxe/Lan9118Dxe.inf | 2 +- .../Drivers/Lan91xDxe/Lan91xDxe.inf | 2 +- .../Drivers/PL180MciDxe/PL180MciDxe.inf | 2 +- .../Library/ArmMaliDpLib/ArmMaliDpLib.inf | 2 +- .../ArmVExpressDtPlatformDtbLoaderLib.inf | 2 +- .../ArmVExpressLibCTA15-A7/ArmVExpressLib.inf | 2 +- .../ArmVExpressLibRTSM/ArmVExpressLib.inf | 2 +- .../ArmVExpressLibRTSM/ArmVExpressLibSec.inf | 2 +- .../ArmVExpressPciHostBridgeLib.inf | 2 +- .../ArmVExpressSysConfigLib.inf | 2 +- .../ArmVExpressSysConfigRuntimeLib.inf | 2 +- .../HdLcdArmVExpressLib.inf | 2 +- .../NorFlashArmVExpressLib.inf | 2 +- .../PL111LcdArmVExpressLib.inf | 2 +- .../Library/ResetSystemLib/ResetSystemLib.inf | 2 +- Platform/Comcast/RDKQemu/RDKQemu.fdf | 2 +- Readme.md | 2 +- 90 files changed, 206 insertions(+), 206 deletions(-) diff --git a/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf b/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf index 791e6fae0126..258eaf1204c0 100644 --- a/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf +++ b/Platform/ARM/ArmCommonPkg/Drivers/BootMonFs/BootMonFs.inf @@ -28,7 +28,7 @@ [Packages] ArmPlatformPkg/ArmPlatformPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec + ArmCommonPkg/ArmCommonPkg.dec [LibraryClasses] BaseLib diff --git a/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf b/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf index 471efb51afd0..7f0beb100cce 100644 --- a/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf +++ b/Platform/ARM/ArmCommonPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf @@ -25,7 +25,7 @@ [Packages] EmbeddedPkg/EmbeddedPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - Platform/ARM/ArmCommonPkg/ArmCommonPkg.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 22926f4f2314..52d6bce28ecc 100644 --- a/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf +++ b/Platform/ARM/ArmCommonPkg/Library/ArmShellCmdRunAxf/ArmShellCmdRunAxf.inf @@ -37,7 +37,7 @@ [Packages] ArmPkg/ArmPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - Platform/ARM/ArmCommonPkg/ArmCommonPkg.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 b7248624659c..4157a598cc6e 100644 --- a/Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsLib.inf +++ b/Platform/ARM/ArmCommonPkg/Library/BdsLib/BdsLib.inf @@ -23,7 +23,7 @@ [Packages] MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec NetworkPkg/NetworkPkg.dec - Platform/ARM/ArmCommonPkg/ArmCommonPkg.dec + ArmCommonPkg/ArmCommonPkg.dec [LibraryClasses] ArmLib diff --git a/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf b/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf index f140febc4ad4..20030a5e54fb 100644 --- a/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf +++ b/Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf @@ -30,7 +30,7 @@ [Packages] EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - Platform/ARM/JunoPkg/ArmJuno.dec + JunoPkg/ArmJuno.dec [FixedPcd] gArmPlatformTokenSpaceGuid.PcdCoreCount diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc index c208415f3602..935ddcbed70b 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.dsc +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc @@ -22,24 +22,24 @@ [Defines] SUPPORTED_ARCHITECTURES = AARCH64|ARM BUILD_TARGETS = DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT - FLASH_DEFINITION = Platform/ARM/JunoPkg/ArmJuno.fdf + FLASH_DEFINITION = JunoPkg/ArmJuno.fdf # On RTSM, most peripherals are VExpress Motherboard peripherals -!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +!include VExpressPkg/ArmVExpress.dsc.inc !include MdePkg/MdeLibs.dsc.inc !ifdef DYNAMIC_TABLES_FRAMEWORK !include DynamicTablesPkg/DynamicTables.dsc.inc -!include Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc +!include JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc !endif [LibraryClasses.common] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf - ArmPlatformLib|Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf + ArmPlatformLib|JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf - NorFlashPlatformLib|Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf + NorFlashPlatformLib|JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf @@ -48,10 +48,10 @@ [LibraryClasses.common] UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf # SCMI Mailbox Transport Layer - ArmMtlLib|Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf + ArmMtlLib|JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf !ifndef HEADLESS_PLATFORM - LcdPlatformLib|Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf + LcdPlatformLib|JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf LcdHwLib|ArmPlatformPkg/Library/HdLcd/HdLcd.inf !endif @@ -71,7 +71,7 @@ [LibraryClasses.common.SEC, LibraryClasses.common.PEIM] [LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.UEFI_APPLICATION, LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.DXE_DRIVER] PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf NonDiscoverableDeviceRegistrationLib|MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf - PciHostBridgeLib|Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf + PciHostBridgeLib|JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf PciLib|MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf @@ -271,7 +271,7 @@ [Components.common] # MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf !ifndef DYNAMIC_TABLES_FRAMEWORK - Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf + JunoPkg/AcpiTables/AcpiTables.inf !endif MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf @@ -315,7 +315,7 @@ [Components.common] # SATA Controller # MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf - Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf + JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf # # NVMe boot devices @@ -325,7 +325,7 @@ [Components.common] # # Networking stack # - Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf + VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf !if 0 OptionRomPkg/MarvellYukonDxe/MarvellYukonDxe.inf !endif @@ -350,13 +350,13 @@ [Components.common] # # Juno platform driver # - Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf + JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf # # SMBIOS/DMI # MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf - Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf + JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf # # Bds diff --git a/Platform/ARM/JunoPkg/ArmJuno.fdf b/Platform/ARM/JunoPkg/ArmJuno.fdf index 01c7edb08661..f7a1e3302287 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.fdf +++ b/Platform/ARM/JunoPkg/ArmJuno.fdf @@ -109,10 +109,10 @@ [FV.FvMain] # INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf !ifndef DYNAMIC_TABLES_FRAMEWORK - INF RuleOverride=ACPITABLE Platform/ARM/JunoPkg/AcpiTables/AcpiTables.inf + INF RuleOverride=ACPITABLE JunoPkg/AcpiTables/AcpiTables.inf !else # Configuration Manager - INF Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf + INF JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf # # Dynamic Table fdf @@ -184,7 +184,7 @@ [FV.FvMain] # SATA Controller # INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf - INF Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf + INF JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf # # NVMe boot devices @@ -194,9 +194,9 @@ [FV.FvMain] # # Networking stack # -!include Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc +!include VExpressPkg/ArmVExpress-networking.fdf.inc - INF Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf + INF VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf !if 0 INF OptionRomPkg/MarvellYukonDxe/MarvellYukonDxe.inf !endif @@ -210,13 +210,13 @@ [FV.FvMain] # # Juno platform driver # - INF Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf + INF JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf # # SMBIOS/DMI # INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf - INF Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf + INF JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf # # Bds diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc index 987c2d8ca3ba..e638ee6f7ab1 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc @@ -14,4 +14,4 @@ [LibraryClasses.common] [Components.common] # Configuration Manager - Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf + JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf index 00be2c435bd6..b496756295bd 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf @@ -32,7 +32,7 @@ [Packages] DynamicTablesPkg/DynamicTablesPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - Platform/ARM/JunoPkg/ArmJuno.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 5dcd67af47aa..3d14332b3ea0 100644 --- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf +++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf @@ -23,7 +23,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec ArmCommonPkg/ArmCommonPkg.dec - Platform/ARM/JunoPkg/ArmJuno.dec + JunoPkg/ArmJuno.dec [LibraryClasses] AcpiLib diff --git a/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf b/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf index 123e085ecd95..be9c08bc5f88 100644 --- a/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf +++ b/Platform/ARM/JunoPkg/Drivers/SataSiI3132Dxe/SataSiI3132Dxe.inf @@ -24,7 +24,7 @@ [Defines] [Packages] MdePkg/MdePkg.dec - Platform/ARM/JunoPkg/ArmJuno.dec + JunoPkg/ArmJuno.dec [LibraryClasses] MemoryAllocationLib diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf index 145663c2fa28..cc24f5e895ce 100644 --- a/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf +++ b/Platform/ARM/JunoPkg/Library/ArmJunoLib/ArmJunoLib.inf @@ -18,7 +18,7 @@ [Packages] EmbeddedPkg/EmbeddedPkg.dec ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec - Platform/ARM/JunoPkg/ArmJuno.dec + JunoPkg/ArmJuno.dec [LibraryClasses] IoLib diff --git a/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf b/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf index 0b1460c27408..55a18031df3f 100644 --- a/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf +++ b/Platform/ARM/JunoPkg/Library/ArmJunoMtlLib/ArmJunoMtlLib.inf @@ -19,7 +19,7 @@ [Packages] ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec MdePkg/MdePkg.dec - Platform/ARM/JunoPkg/ArmJuno.dec + JunoPkg/ArmJuno.dec [LibraryClasses] ArmLib diff --git a/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf b/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf index 346c1a3d123e..a34dceb7bdc0 100644 --- a/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf +++ b/Platform/ARM/JunoPkg/Library/HdLcdArmJunoLib/HdLcdArmJunoLib.inf @@ -23,7 +23,7 @@ [Packages] ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec MdePkg/MdePkg.dec - Platform/ARM/JunoPkg/ArmJuno.dec + JunoPkg/ArmJuno.dec [LibraryClasses] BaseLib diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf index 8b4a6e2fad97..4f3f3c708715 100644 --- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf +++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf @@ -32,7 +32,7 @@ [Packages] ArmPkg/ArmPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - Platform/ARM/JunoPkg/ArmJuno.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 e5e5628de387..5064409173b1 100644 --- a/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf +++ b/Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf @@ -19,7 +19,7 @@ [Sources.common] [Packages] ArmPlatformPkg/ArmPlatformPkg.dec MdePkg/MdePkg.dec - Platform/ARM/JunoPkg/ArmJuno.dec + JunoPkg/ArmJuno.dec [LibraryClasses] BaseLib diff --git a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf index 5a13605925e7..8f0231314678 100644 --- a/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf +++ b/Platform/ARM/JunoPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf @@ -32,7 +32,7 @@ [Packages] ArmPlatformPkg/ArmPlatformPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - Platform/ARM/JunoPkg/ArmJuno.dec + JunoPkg/ArmJuno.dec [LibraryClasses] ArmLib diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxeFvp.inf b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxeFvp.inf index 6fc307df014c..9c6b4698540b 100644 --- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxeFvp.inf +++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxeFvp.inf @@ -35,7 +35,7 @@ [Packages] DynamicTablesPkg/DynamicTablesPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - Platform/ARM/Morello/MorelloPlatform.dec + Morello/MorelloPlatform.dec [LibraryClasses] UefiDriverEntryPoint diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerFvp.dsc.inc b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerFvp.dsc.inc index 71916783c24c..a2fc71f307b2 100644 --- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerFvp.dsc.inc +++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerFvp.dsc.inc @@ -13,4 +13,4 @@ [BuildOptions] [Components.common] # Configuration Manager - Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxeFvp.inf + Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxeFvp.inf diff --git a/Platform/ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf b/Platform/ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf index c36c62f05a39..5e773543b39d 100644 --- a/Platform/ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf +++ b/Platform/ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf @@ -22,7 +22,7 @@ [Sources.common] [Packages] MdePkg/MdePkg.dec OvmfPkg/OvmfPkg.dec - Platform/ARM/Morello/MorelloPlatform.dec + Morello/MorelloPlatform.dec [LibraryClasses] UefiDriverEntryPoint diff --git a/Platform/ARM/Morello/Library/PciHostBridgeLib/PciHostBridgeLibFvp.inf b/Platform/ARM/Morello/Library/PciHostBridgeLib/PciHostBridgeLibFvp.inf index 1d6c5b01d13d..ee18350a361e 100644 --- a/Platform/ARM/Morello/Library/PciHostBridgeLib/PciHostBridgeLibFvp.inf +++ b/Platform/ARM/Morello/Library/PciHostBridgeLib/PciHostBridgeLibFvp.inf @@ -29,7 +29,7 @@ [Packages] ArmPkg/ArmPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - Platform/ARM/Morello/MorelloPlatform.dec + Morello/MorelloPlatform.dec [FixedPcd] gArmMorelloTokenSpaceGuid.PcdPciBusMax diff --git a/Platform/ARM/Morello/Library/PlatformLib/PlatformLib.inf b/Platform/ARM/Morello/Library/PlatformLib/PlatformLib.inf index c2d7da3701d2..a63ec5f52f7e 100644 --- a/Platform/ARM/Morello/Library/PlatformLib/PlatformLib.inf +++ b/Platform/ARM/Morello/Library/PlatformLib/PlatformLib.inf @@ -20,7 +20,7 @@ [Packages] ArmPlatformPkg/ArmPlatformPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - Platform/ARM/Morello/MorelloPlatform.dec + Morello/MorelloPlatform.dec [Sources.common] PlatformLib.c diff --git a/Platform/ARM/Morello/MorelloPlatform.dsc.inc b/Platform/ARM/Morello/MorelloPlatform.dsc.inc index dccd22248318..703518a3d428 100644 --- a/Platform/ARM/Morello/MorelloPlatform.dsc.inc +++ b/Platform/ARM/Morello/MorelloPlatform.dsc.inc @@ -9,7 +9,7 @@ [LibraryClasses.common] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf - ArmPlatformLib|Platform/ARM/Morello/Library/PlatformLib/PlatformLib.inf + ArmPlatformLib|Morello/Library/PlatformLib/PlatformLib.inf BasePathLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf diff --git a/Platform/ARM/Morello/MorelloPlatformFvp.dsc b/Platform/ARM/Morello/MorelloPlatformFvp.dsc index ee612296a80e..1adf90227130 100644 --- a/Platform/ARM/Morello/MorelloPlatformFvp.dsc +++ b/Platform/ARM/Morello/MorelloPlatformFvp.dsc @@ -24,16 +24,16 @@ [Defines] SUPPORTED_ARCHITECTURES = AARCH64 BUILD_TARGETS = NOOPT|DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT - FLASH_DEFINITION = Platform/ARM/Morello/MorelloPlatformFvp.fdf + FLASH_DEFINITION = Morello/MorelloPlatformFvp.fdf BUILD_NUMBER = 1 # Network definition DEFINE NETWORK_ISCSI_ENABLE = FALSE -!include Platform/ARM/Morello/MorelloPlatform.dsc.inc -!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +!include Morello/MorelloPlatform.dsc.inc +!include VExpressPkg/ArmVExpress.dsc.inc !include DynamicTablesPkg/DynamicTables.dsc.inc -!include Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerFvp.dsc.inc +!include Morello/ConfigurationManager/ConfigurationManagerFvp.dsc.inc # include common/basic libraries from MdePkg. !include MdePkg/MdeLibs.dsc.inc @@ -46,7 +46,7 @@ [LibraryClasses.common] OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf [LibraryClasses.common.DXE_DRIVER] - PciHostBridgeLib|Platform/ARM/Morello/Library/PciHostBridgeLib/PciHostBridgeLibFvp.inf + PciHostBridgeLib|Morello/Library/PciHostBridgeLib/PciHostBridgeLibFvp.inf [PcdsFeatureFlag.common] gArmMorelloTokenSpaceGuid.PcdVirtioBlkSupported|TRUE @@ -68,4 +68,4 @@ [Components.common] OvmfPkg/VirtioNetDxe/VirtioNet.inf # Platform driver - Platform/ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf + Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf diff --git a/Platform/ARM/Morello/MorelloPlatformFvp.fdf b/Platform/ARM/Morello/MorelloPlatformFvp.fdf index 8bdb7f0d0f5f..9634f45f15c3 100644 --- a/Platform/ARM/Morello/MorelloPlatformFvp.fdf +++ b/Platform/ARM/Morello/MorelloPlatformFvp.fdf @@ -99,7 +99,7 @@ [FV.FvMain] INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf # Configuration Manager - INF Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxeFvp.inf + INF Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxeFvp.inf # Dynamic Table fdf !include DynamicTablesPkg/DynamicTables.fdf.inc @@ -140,7 +140,7 @@ [FV.FvMain] INF ShellPkg/Application/Shell/Shell.inf # Platform driver - INF Platform/ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf + INF Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf # Bds INF MdeModulePkg/Application/UiApp/UiApp.inf diff --git a/Platform/ARM/Morello/Readme.md b/Platform/ARM/Morello/Readme.md index 8d441234f3b8..b43834625bfb 100644 --- a/Platform/ARM/Morello/Readme.md +++ b/Platform/ARM/Morello/Readme.md @@ -5,7 +5,7 @@ extension. Capability architecture specific changes will be added [here](https:/ The platform port in UEFI firmware provides ARMv8-A architecture enablement. -Platform code is located at Platform/ARM/Morello. +Platform code is located at Morello. # Documentation diff --git a/Platform/ARM/N1Sdp/N1SdpPlatform.dsc b/Platform/ARM/N1Sdp/N1SdpPlatform.dsc index 61e7a909f80d..7e6e8d31b449 100644 --- a/Platform/ARM/N1Sdp/N1SdpPlatform.dsc +++ b/Platform/ARM/N1Sdp/N1SdpPlatform.dsc @@ -18,10 +18,10 @@ [Defines] SUPPORTED_ARCHITECTURES = AARCH64 BUILD_TARGETS = NOOPT|DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT - FLASH_DEFINITION = Platform/ARM/N1Sdp/N1SdpPlatform.fdf + FLASH_DEFINITION = N1Sdp/N1SdpPlatform.fdf BUILD_NUMBER = 1 -!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +!include VExpressPkg/ArmVExpress.dsc.inc !include MdePkg/MdeLibs.dsc.inc [LibraryClasses.common] diff --git a/Platform/ARM/Readme.md b/Platform/ARM/Readme.md index ad2386c0dbb6..1916651242b5 100644 --- a/Platform/ARM/Readme.md +++ b/Platform/ARM/Readme.md @@ -11,7 +11,7 @@ can be found here: # Build EDK2 TianoCore -`build -a AARCH64 -p Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc -t GCC5` +`build -a AARCH64 -p VExpressPkg/ArmVExpress-FVP-AArch64.dsc -t GCC5` Once built, the edk2 image is the following file Build/ArmVExpress-FVP-AArch64/DEBUG_GCC5/FV/FVP_AARCH64_EFI.fd diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf index 8c34c2fa73e4..409d3aa5ccbc 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf @@ -33,7 +33,7 @@ [Packages] ArmPlatformPkg/ArmPlatformPkg.dec EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec - Platform/ARM/SgiPkg/SgiPlatform.dec + SgiPkg/SgiPlatform.dec [FixedPcd] gArmPlatformTokenSpaceGuid.PcdCoreCount diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf index ce89aa93ea7b..c74685bec7b2 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf @@ -33,7 +33,7 @@ [Packages] ArmPlatformPkg/ArmPlatformPkg.dec EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec - Platform/ARM/SgiPkg/SgiPlatform.dec + SgiPkg/SgiPlatform.dec [FixedPcd] gArmPlatformTokenSpaceGuid.PcdCoreCount diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf index 1999bc1553e9..1ad34860fa7b 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf @@ -35,7 +35,7 @@ [Packages] ArmPlatformPkg/ArmPlatformPkg.dec EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec - Platform/ARM/SgiPkg/SgiPlatform.dec + SgiPkg/SgiPlatform.dec [FixedPcd] gArmPlatformTokenSpaceGuid.PcdCoreCount diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf index 25be2e276e85..c136ea4320e0 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf @@ -33,7 +33,7 @@ [Packages] ArmPlatformPkg/ArmPlatformPkg.dec EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec - Platform/ARM/SgiPkg/SgiPlatform.dec + SgiPkg/SgiPlatform.dec [FixedPcd] gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf index 4b36c3e5ceb2..36bc95615f86 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf @@ -33,7 +33,7 @@ [Packages] ArmPlatformPkg/ArmPlatformPkg.dec EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec - Platform/ARM/SgiPkg/SgiPlatform.dec + SgiPkg/SgiPlatform.dec [FixedPcd] gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf index 97a87462932b..d5b6479e4f44 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf @@ -33,7 +33,7 @@ [Packages] ArmPlatformPkg/ArmPlatformPkg.dec EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec - Platform/ARM/SgiPkg/SgiPlatform.dec + SgiPkg/SgiPlatform.dec [FixedPcd] gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf index deaca3719ae4..3863237d2a0c 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf @@ -35,7 +35,7 @@ [Packages] ArmPlatformPkg/ArmPlatformPkg.dec EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec - Platform/ARM/SgiPkg/SgiPlatform.dec + SgiPkg/SgiPlatform.dec [FixedPcd] gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf index a1bd71fde761..7b536e823869 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf @@ -33,7 +33,7 @@ [Packages] ArmPlatformPkg/ArmPlatformPkg.dec EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec - Platform/ARM/SgiPkg/SgiPlatform.dec + SgiPkg/SgiPlatform.dec [FixedPcd] gArmPlatformTokenSpaceGuid.PcdCoreCount diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf index 9d89314a594e..7cfe42bba0f2 100644 --- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf +++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf @@ -20,7 +20,7 @@ [Packages] EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec OvmfPkg/OvmfPkg.dec - Platform/ARM/SgiPkg/SgiPlatform.dec + SgiPkg/SgiPlatform.dec [LibraryClasses] AcpiLib diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf index 4258eb9deadb..3ed6def28003 100644 --- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf +++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf @@ -30,7 +30,7 @@ [Packages] ArmPlatformPkg/ArmPlatformPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - Platform/ARM/SgiPkg/SgiPlatform.dec + SgiPkg/SgiPlatform.dec [LibraryClasses] ArmLib diff --git a/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf b/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf index 75a6ba2ae647..db13b59856fc 100644 --- a/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf +++ b/Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf @@ -19,7 +19,7 @@ [Packages] ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec MdePkg/MdePkg.dec - Platform/ARM/SgiPkg/SgiPlatform.dec + SgiPkg/SgiPlatform.dec [LibraryClasses] BaseLib diff --git a/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf b/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf index 74486eacd009..0b24102001c3 100644 --- a/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf +++ b/Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf @@ -20,7 +20,7 @@ [Sources.common] [Packages] ArmPlatformPkg/ArmPlatformPkg.dec MdePkg/MdePkg.dec - Platform/ARM/SgiPkg/SgiPlatform.dec + SgiPkg/SgiPlatform.dec [LibraryClasses] BaseLib diff --git a/Platform/ARM/SgiPkg/Library/NorFlashLib/StandaloneMmNorFlashLib.inf b/Platform/ARM/SgiPkg/Library/NorFlashLib/StandaloneMmNorFlashLib.inf index 96bbf1e42313..d98a4a252373 100644 --- a/Platform/ARM/SgiPkg/Library/NorFlashLib/StandaloneMmNorFlashLib.inf +++ b/Platform/ARM/SgiPkg/Library/NorFlashLib/StandaloneMmNorFlashLib.inf @@ -21,7 +21,7 @@ [Sources.common] [Packages] ArmPlatformPkg/ArmPlatformPkg.dec MdePkg/MdePkg.dec - Platform/ARM/SgiPkg/SgiPlatform.dec + SgiPkg/SgiPlatform.dec [LibraryClasses] BaseLib diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf index 22e247ea4fae..f86167cccd70 100644 --- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf +++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf @@ -18,7 +18,7 @@ [Packages] EmbeddedPkg/EmbeddedPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - Platform/ARM/SgiPkg/SgiPlatform.dec + SgiPkg/SgiPlatform.dec StandaloneMmPkg/StandaloneMmPkg.dec [LibraryClasses] diff --git a/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf b/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf index 407160c07563..12677b8c7c78 100644 --- a/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf +++ b/Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf @@ -15,7 +15,7 @@ [Defines] [Packages] EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec - Platform/ARM/SgiPkg/SgiPlatform.dec + SgiPkg/SgiPlatform.dec [LibraryClasses] FdtLib diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc index 2cb4895cfcff..601d48f5d804 100644 --- a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc +++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc @@ -21,7 +21,7 @@ [Defines] SUPPORTED_ARCHITECTURES = AARCH64 BUILD_TARGETS = DEBUG|RELEASE|NOOPT SKUID_IDENTIFIER = DEFAULT - FLASH_DEFINITION = Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf + FLASH_DEFINITION = SgiPkg/PlatformStandaloneMm.fdf DEFINE DEBUG_MESSAGE = TRUE # LzmaF86 @@ -29,7 +29,7 @@ [Defines] # include common definitions. !include MdePkg/MdeLibs.dsc.inc -!include Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc +!include SgiPkg/SgiPlatformMm.dsc.inc ################################################################################ # diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc b/Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc index 46c2ae3529d1..ef833654099a 100644 --- a/Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc +++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm2.dsc @@ -20,7 +20,7 @@ [Defines] SUPPORTED_ARCHITECTURES = AARCH64 BUILD_TARGETS = DEBUG|RELEASE|NOOPT SKUID_IDENTIFIER = DEFAULT - FLASH_DEFINITION = Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf + FLASH_DEFINITION = SgiPkg/PlatformStandaloneMm.fdf DEFINE DEBUG_MESSAGE = TRUE # LzmaF86 @@ -28,7 +28,7 @@ [Defines] # include common definitions. !include MdePkg/MdeLibs.dsc.inc -!include Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc +!include SgiPkg/SgiPlatformMm.dsc.inc ################################################################################ # diff --git a/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.dsc b/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.dsc index edd5a49315be..501fefe7edc4 100644 --- a/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.dsc +++ b/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.dsc @@ -18,13 +18,13 @@ [Defines] SUPPORTED_ARCHITECTURES = AARCH64|ARM BUILD_TARGETS = NOOPT|DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT - FLASH_DEFINITION = Platform/ARM/SgiPkg/SgiPlatform.fdf - BOARD_DXE_FV_COMPONENTS = Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.fdf.inc + FLASH_DEFINITION = SgiPkg/SgiPlatform.fdf + BOARD_DXE_FV_COMPONENTS = SgiPkg/RdE1Edge/RdE1Edge.fdf.inc BUILD_NUMBER = 1 # include common definitions from SgiPlatform.dsc -!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc -!include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc +!include SgiPkg/SgiPlatform.dsc.inc +!include SgiPkg/SgiMemoryMap.dsc.inc # include common/basic libraries from MdePkg. !include MdePkg/MdeLibs.dsc.inc @@ -52,4 +52,4 @@ [PcdsFixedAtBuild.common] ################################################################################ [Components.common] - Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf + SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf diff --git a/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.fdf.inc b/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.fdf.inc index 056fc55c098a..d86a45276892 100644 --- a/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.fdf.inc +++ b/Platform/ARM/SgiPkg/RdE1Edge/RdE1Edge.fdf.inc @@ -7,4 +7,4 @@ # Per-platform additional content of the DXE phase firmware volume # ACPI support - INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf + INF RuleOverride=ACPITABLE SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf diff --git a/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.dsc b/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.dsc index 37f0deed6b45..a6288b6dda01 100644 --- a/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.dsc +++ b/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.dsc @@ -18,13 +18,13 @@ [Defines] SUPPORTED_ARCHITECTURES = AARCH64|ARM BUILD_TARGETS = NOOPT|DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT - FLASH_DEFINITION = Platform/ARM/SgiPkg/SgiPlatform.fdf - BOARD_DXE_FV_COMPONENTS = Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.fdf.inc + FLASH_DEFINITION = SgiPkg/SgiPlatform.fdf + BOARD_DXE_FV_COMPONENTS = SgiPkg/RdN1Edge/RdN1Edge.fdf.inc BUILD_NUMBER = 1 # include common definitions from SgiPlatform.dsc -!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc -!include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc +!include SgiPkg/SgiPlatform.dsc.inc +!include SgiPkg/SgiMemoryMap.dsc.inc # include common/basic libraries from MdePkg. !include MdePkg/MdeLibs.dsc.inc @@ -52,4 +52,4 @@ [PcdsFixedAtBuild.common] ################################################################################ [Components.common] - Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf + SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf diff --git a/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.fdf.inc b/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.fdf.inc index 4b191ca55cb9..3cf8ceae0bd8 100644 --- a/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.fdf.inc +++ b/Platform/ARM/SgiPkg/RdN1Edge/RdN1Edge.fdf.inc @@ -7,4 +7,4 @@ # Per-platform additional content of the DXE phase firmware volume # ACPI support - INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf + INF RuleOverride=ACPITABLE SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf diff --git a/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.dsc b/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.dsc index 7449c75be4da..143902b8972c 100644 --- a/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.dsc +++ b/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.dsc @@ -18,13 +18,13 @@ [Defines] SUPPORTED_ARCHITECTURES = AARCH64|ARM BUILD_TARGETS = NOOPT|DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT - FLASH_DEFINITION = Platform/ARM/SgiPkg/SgiPlatform.fdf - BOARD_DXE_FV_COMPONENTS = Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.fdf.inc + FLASH_DEFINITION = SgiPkg/SgiPlatform.fdf + BOARD_DXE_FV_COMPONENTS = SgiPkg/RdN1EdgeX2/RdN1EdgeX2.fdf.inc BUILD_NUMBER = 1 # include common definitions from SgiPlatform.dsc -!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc -!include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc +!include SgiPkg/SgiPlatform.dsc.inc +!include SgiPkg/SgiMemoryMap.dsc.inc # include common/basic libraries from MdePkg. !include MdePkg/MdeLibs.dsc.inc @@ -55,4 +55,4 @@ [PcdsFixedAtBuild.common] ################################################################################ [Components.common] - Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf + SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf diff --git a/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.fdf.inc b/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.fdf.inc index 369264a916b4..6f2cb5e380af 100644 --- a/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.fdf.inc +++ b/Platform/ARM/SgiPkg/RdN1EdgeX2/RdN1EdgeX2.fdf.inc @@ -7,4 +7,4 @@ # Per-platform additional content of the DXE phase firmware volume # ACPI support - INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf + INF RuleOverride=ACPITABLE SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf diff --git a/Platform/ARM/SgiPkg/RdN2/RdN2.dsc b/Platform/ARM/SgiPkg/RdN2/RdN2.dsc index adce7ee90ff8..9ba3c9f9bfae 100644 --- a/Platform/ARM/SgiPkg/RdN2/RdN2.dsc +++ b/Platform/ARM/SgiPkg/RdN2/RdN2.dsc @@ -18,13 +18,13 @@ [Defines] SUPPORTED_ARCHITECTURES = AARCH64|ARM BUILD_TARGETS = NOOPT|DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT - FLASH_DEFINITION = Platform/ARM/SgiPkg/SgiPlatform.fdf - BOARD_DXE_FV_COMPONENTS = Platform/ARM/SgiPkg/RdN2/RdN2.fdf.inc + FLASH_DEFINITION = SgiPkg/SgiPlatform.fdf + BOARD_DXE_FV_COMPONENTS = SgiPkg/RdN2/RdN2.fdf.inc BUILD_NUMBER = 1 # include common definitions from SgiPlatform.dsc -!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc -!include Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc +!include SgiPkg/SgiPlatform.dsc.inc +!include SgiPkg/SgiMemoryMap2.dsc.inc # include common/basic libraries from MdePkg. !include MdePkg/MdeLibs.dsc.inc @@ -52,4 +52,4 @@ [PcdsFixedAtBuild.common] ################################################################################ [Components.common] - Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf + SgiPkg/AcpiTables/RdN2AcpiTables.inf diff --git a/Platform/ARM/SgiPkg/RdN2/RdN2.fdf.inc b/Platform/ARM/SgiPkg/RdN2/RdN2.fdf.inc index ebd6ed90530c..ee7d309594fc 100644 --- a/Platform/ARM/SgiPkg/RdN2/RdN2.fdf.inc +++ b/Platform/ARM/SgiPkg/RdN2/RdN2.fdf.inc @@ -7,4 +7,4 @@ # Per-platform additional content of the DXE phase firmware volume # ACPI support - INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf + INF RuleOverride=ACPITABLE SgiPkg/AcpiTables/RdN2AcpiTables.inf diff --git a/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.dsc b/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.dsc index c26f652cb9e9..f16cc4079f9a 100644 --- a/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.dsc +++ b/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.dsc @@ -20,13 +20,13 @@ [Defines] SUPPORTED_ARCHITECTURES = AARCH64 BUILD_TARGETS = NOOPT|DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT - FLASH_DEFINITION = Platform/ARM/SgiPkg/SgiPlatform.fdf - BOARD_DXE_FV_COMPONENTS = Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.fdf.inc + FLASH_DEFINITION = SgiPkg/SgiPlatform.fdf + BOARD_DXE_FV_COMPONENTS = SgiPkg/RdN2Cfg1/RdN2Cfg1.fdf.inc BUILD_NUMBER = 1 # include common definitions from SgiPlatform.dsc -!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc -!include Platform/ARM/SgiPkg/SgiMemoryMap2.dsc.inc +!include SgiPkg/SgiPlatform.dsc.inc +!include SgiPkg/SgiMemoryMap2.dsc.inc # include common/basic libraries from MdePkg. !include MdePkg/MdeLibs.dsc.inc @@ -54,4 +54,4 @@ [PcdsFixedAtBuild.common] ################################################################################ [Components.common] - Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf + SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf diff --git a/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.fdf.inc b/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.fdf.inc index ef0c02afb4f4..be13d61d6eb6 100644 --- a/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.fdf.inc +++ b/Platform/ARM/SgiPkg/RdN2Cfg1/RdN2Cfg1.fdf.inc @@ -9,4 +9,4 @@ # Per-platform additional content of the DXE phase firmware volume # ACPI support - INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf + INF RuleOverride=ACPITABLE SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf diff --git a/Platform/ARM/SgiPkg/RdV1/RdV1.dsc b/Platform/ARM/SgiPkg/RdV1/RdV1.dsc index a878d28df7cb..26d8f82a062f 100644 --- a/Platform/ARM/SgiPkg/RdV1/RdV1.dsc +++ b/Platform/ARM/SgiPkg/RdV1/RdV1.dsc @@ -18,13 +18,13 @@ [Defines] SUPPORTED_ARCHITECTURES = AARCH64|ARM BUILD_TARGETS = NOOPT|DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT - FLASH_DEFINITION = Platform/ARM/SgiPkg/SgiPlatform.fdf - BOARD_DXE_FV_COMPONENTS = Platform/ARM/SgiPkg/RdV1/RdV1.fdf.inc + FLASH_DEFINITION = SgiPkg/SgiPlatform.fdf + BOARD_DXE_FV_COMPONENTS = SgiPkg/RdV1/RdV1.fdf.inc BUILD_NUMBER = 1 # include common definitions from SgiPlatform.dsc -!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc -!include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc +!include SgiPkg/SgiPlatform.dsc.inc +!include SgiPkg/SgiMemoryMap.dsc.inc # include common/basic libraries from MdePkg. !include MdePkg/MdeLibs.dsc.inc @@ -52,4 +52,4 @@ [PcdsFixedAtBuild.common] ################################################################################ [Components.common] - Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf + SgiPkg/AcpiTables/RdV1AcpiTables.inf diff --git a/Platform/ARM/SgiPkg/RdV1/RdV1.fdf.inc b/Platform/ARM/SgiPkg/RdV1/RdV1.fdf.inc index 1277bf39c162..f6c6f8d76119 100644 --- a/Platform/ARM/SgiPkg/RdV1/RdV1.fdf.inc +++ b/Platform/ARM/SgiPkg/RdV1/RdV1.fdf.inc @@ -7,4 +7,4 @@ # Per-platform additional content of the DXE phase firmware volume # ACPI support - INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf + INF RuleOverride=ACPITABLE SgiPkg/AcpiTables/RdV1AcpiTables.inf diff --git a/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.dsc b/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.dsc index 578cb74fa06a..e7937a838df8 100644 --- a/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.dsc +++ b/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.dsc @@ -18,13 +18,13 @@ [Defines] SUPPORTED_ARCHITECTURES = AARCH64|ARM BUILD_TARGETS = NOOPT|DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT - FLASH_DEFINITION = Platform/ARM/SgiPkg/SgiPlatform.fdf - BOARD_DXE_FV_COMPONENTS = Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.fdf.inc + FLASH_DEFINITION = SgiPkg/SgiPlatform.fdf + BOARD_DXE_FV_COMPONENTS = SgiPkg/RdV1Mc/RdV1Mc.fdf.inc BUILD_NUMBER = 1 # include common definitions from SgiPlatform.dsc -!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc -!include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc +!include SgiPkg/SgiPlatform.dsc.inc +!include SgiPkg/SgiMemoryMap.dsc.inc # include common/basic libraries from MdePkg. !include MdePkg/MdeLibs.dsc.inc @@ -55,4 +55,4 @@ [PcdsFixedAtBuild.common] ################################################################################ [Components.common] - Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf + SgiPkg/AcpiTables/RdV1McAcpiTables.inf diff --git a/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.fdf.inc b/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.fdf.inc index 6b83893fe0fe..fe1febf11fcb 100644 --- a/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.fdf.inc +++ b/Platform/ARM/SgiPkg/RdV1Mc/RdV1Mc.fdf.inc @@ -7,4 +7,4 @@ # Per-platform additional content of the DXE phase firmware volume # ACPI support - INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf + INF RuleOverride=ACPITABLE SgiPkg/AcpiTables/RdV1McAcpiTables.inf diff --git a/Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc b/Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc index 50790135a6d4..a018187c96bd 100644 --- a/Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc +++ b/Platform/ARM/SgiPkg/Sgi575/Sgi575.dsc @@ -18,13 +18,13 @@ [Defines] SUPPORTED_ARCHITECTURES = AARCH64|ARM BUILD_TARGETS = NOOPT|DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT - FLASH_DEFINITION = Platform/ARM/SgiPkg/SgiPlatform.fdf - BOARD_DXE_FV_COMPONENTS = Platform/ARM/SgiPkg/Sgi575/Sgi575.fdf.inc + FLASH_DEFINITION = SgiPkg/SgiPlatform.fdf + BOARD_DXE_FV_COMPONENTS = SgiPkg/Sgi575/Sgi575.fdf.inc BUILD_NUMBER = 1 # include common definitions from SgiPlatform.dsc -!include Platform/ARM/SgiPkg/SgiPlatform.dsc.inc -!include Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc +!include SgiPkg/SgiPlatform.dsc.inc +!include SgiPkg/SgiMemoryMap.dsc.inc # include common/basic libraries from MdePkg. !include MdePkg/MdeLibs.dsc.inc @@ -52,4 +52,4 @@ [PcdsFixedAtBuild.common] ################################################################################ [Components.common] - Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf + SgiPkg/AcpiTables/Sgi575AcpiTables.inf diff --git a/Platform/ARM/SgiPkg/Sgi575/Sgi575.fdf.inc b/Platform/ARM/SgiPkg/Sgi575/Sgi575.fdf.inc index 3748d86efdf4..77b8e5c02967 100644 --- a/Platform/ARM/SgiPkg/Sgi575/Sgi575.fdf.inc +++ b/Platform/ARM/SgiPkg/Sgi575/Sgi575.fdf.inc @@ -7,4 +7,4 @@ # Per-platform additional content of the DXE phase firmware volume # ACPI support - INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf + INF RuleOverride=ACPITABLE SgiPkg/AcpiTables/Sgi575AcpiTables.inf diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc index 7e37732fb93c..c6e1be9eedda 100644 --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause-Patent # -!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +!include VExpressPkg/ArmVExpress.dsc.inc [Defines] # To allow the use of secure storage, set this to TRUE. @@ -28,13 +28,13 @@ [LibraryClasses.common] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf - ArmPlatformSysConfigLib|Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf - ArmPlatformLib|Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf + ArmPlatformSysConfigLib|VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf + ArmPlatformLib|SgiPkg/Library/PlatformLib/PlatformLib.inf BasePathLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf EfiResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf LcdHwLib|ArmPlatformPkg/Library/HdLcd/HdLcd.inf - LcdPlatformLib|Platform/ARM/SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf - NorFlashPlatformLib|Platform/ARM/SgiPkg/Library/NorFlashLib/NorFlashLib.inf + LcdPlatformLib|SgiPkg/Library/HdLcdArmSgiLib/HdLcdArmSgiLib.inf + NorFlashPlatformLib|SgiPkg/Library/NorFlashLib/NorFlashLib.inf HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf !if $(SECURE_BOOT_ENABLE) == TRUE @@ -78,7 +78,7 @@ [LibraryClasses.common.DXE_CORE] [LibraryClasses.common.DXE_DRIVER] FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf - PciHostBridgeLib|Platform/ARM/SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf + PciHostBridgeLib|SgiPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf PciLib|MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf @@ -232,7 +232,7 @@ [Components.common] NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf } - Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf + SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf # # DXE @@ -299,12 +299,12 @@ [Components.common] # SMBIOS/DMI # MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf - Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf + SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf # # platform driver # - Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf + SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf # # FAT filesystem + GPT/MBR partitioning diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf b/Platform/ARM/SgiPkg/SgiPlatform.fdf index 1e72c1d0544c..80046643069f 100644 --- a/Platform/ARM/SgiPkg/SgiPlatform.fdf +++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf @@ -113,7 +113,7 @@ [FV.FvMain] # SMBIOS/DMI # INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf - INF Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf + INF SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf # Required by PCI INF ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf @@ -182,7 +182,7 @@ [FV.FvMain] # # Platform driver # - INF Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf + INF SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf # # Bds @@ -228,7 +228,7 @@ [FV.FVMAIN_COMPACT] INF MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf - INF Platform/ARM/SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf + INF SgiPkg/Library/SgiPlatformPei/SgiPlatformPei.inf FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 { SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE { diff --git a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc index 5287e1f8e568..6e457e8127c6 100644 --- a/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc +++ b/Platform/ARM/SgiPkg/SgiPlatformMm.dsc.inc @@ -63,7 +63,7 @@ [LibraryClasses.common.MM_STANDALONE] AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf - NorFlashPlatformLib|Platform/ARM/SgiPkg/Library/NorFlashLib/StandaloneMmNorFlashLib.inf + NorFlashPlatformLib|SgiPkg/Library/NorFlashLib/StandaloneMmNorFlashLib.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc index 79ce9658fefa..3682af4dc44c 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc @@ -24,33 +24,33 @@ [Defines] SUPPORTED_ARCHITECTURES = ARM BUILD_TARGETS = DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT - FLASH_DEFINITION = Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf + FLASH_DEFINITION = VExpressPkg/ArmVExpress-CTA15-A7.fdf DEFINE EDK2_SKIP_PEICORE = 1 DEFINE ARM_BIGLITTLE_TC2 = 1 # We build for the TC2 hardware by default -!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +!include VExpressPkg/ArmVExpress.dsc.inc !include MdePkg/MdeLibs.dsc.inc [LibraryClasses.common] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf - ArmPlatformLib|Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf + ArmPlatformLib|VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf - ArmPlatformSysConfigLib|Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf + ArmPlatformSysConfigLib|VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf - #DebugAgentTimerLib|Platform/ARM/VExpressPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf + #DebugAgentTimerLib|VExpressPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf # ARM General Interrupt Driver in Secure and Non-secure ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf LcdHwLib|ArmPlatformPkg/Library/HdLcd/HdLcd.inf - LcdPlatformLib|Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf + LcdPlatformLib|VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf [LibraryClasses.common.DXE_RUNTIME_DRIVER] - ArmPlatformSysConfigLib|Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf + ArmPlatformSysConfigLib|VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf [LibraryClasses.ARM] ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf @@ -60,7 +60,7 @@ [LibraryClasses.ARM] # syscfg MMIO register implementation on ARM. # This will not work at actual runtime. # - ResetSystemLib|Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf + ResetSystemLib|VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf [BuildOptions] !ifdef ARM_BIGLITTLE_TC2 @@ -68,11 +68,11 @@ [BuildOptions] *_*_ARM_PP_FLAGS = -DARM_BIGLITTLE_TC2=1 !endif - RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A15 -I$(WORKSPACE)/Platform/ARM/VExpressPkg/Include/Platform/CTA15-A7 + RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A15 -I$(WORKSPACE)/VExpressPkg/Include/Platform/CTA15-A7 - GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a15 -I$(WORKSPACE)/Platform/ARM/VExpressPkg/Include/Platform/CTA15-A7 + GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a15 -I$(WORKSPACE)/VExpressPkg/Include/Platform/CTA15-A7 - XCODE:*_*_ARM_PLATFORM_FLAGS = -I$(WORKSPACE)/Platform/ARM/VExpressPkg/Include/Platform/CTA15-A7 + XCODE:*_*_ARM_PLATFORM_FLAGS = -I$(WORKSPACE)/VExpressPkg/Include/Platform/CTA15-A7 ################################################################################ # @@ -189,7 +189,7 @@ [Components.common] # ArmPlatformPkg/PrePi/PeiMPCore.inf { - ArmPlatformLib|Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf + ArmPlatformLib|VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf } # @@ -237,7 +237,7 @@ [Components.common] # # Platform # - Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf + VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf # # Filesystems @@ -250,10 +250,10 @@ [Components.common] # Multimedia Card Interface # EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf - Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf + VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf # SMSC LAN 9118 - Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf + VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf # # FAT filesystem + GPT/MBR partitioning diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf index 6bb1d540fe35..00dc813b69fb 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf @@ -97,13 +97,13 @@ [FV.FvMain] # # Platform # - INF Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf + INF VExpressPkg/Drivers/ArmVExpressDxe/ArmHwDxe.inf # # Multimedia Card Interface # INF EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf - INF Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf + INF VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf # # Filesystems @@ -126,14 +126,14 @@ [FV.FvMain] # # USB support # - INF Platform/ARM/VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf + INF VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf # # Android Fastboot # INF EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf INF EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf - INF Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf + INF VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf # ACPI Support INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf @@ -141,9 +141,9 @@ [FV.FvMain] # # Networking stack # -!include Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc +!include VExpressPkg/ArmVExpress-networking.fdf.inc - INF Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf + INF VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf # # UEFI application @@ -171,7 +171,7 @@ [FV.FvMain] # Example to add a Device Tree to the Firmware Volume #FILE FREEFORM = PCD(gArmVExpressTokenSpaceGuid.PcdFdtVExpressHwA15x2A7x3) { - # SECTION RAW = Platform/ARM/VExpressPkg/Fdts/vexpress-v2p-ca15_a7.dtb + # SECTION RAW = VExpressPkg/Fdts/vexpress-v2p-ca15_a7.dtb #} [FV.FVMAIN_COMPACT] diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc index cf7350649edb..98d9049a6e14 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc @@ -23,7 +23,7 @@ [Defines] SUPPORTED_ARCHITECTURES = AARCH64 BUILD_TARGETS = DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT - FLASH_DEFINITION = Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf + FLASH_DEFINITION = VExpressPkg/ArmVExpress-FVP-AArch64.fdf !ifndef ARM_FVP_RUN_NORFLASH DEFINE EDK2_SKIP_PEICORE=1 @@ -31,19 +31,19 @@ [Defines] DT_SUPPORT = FALSE -!include Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +!include VExpressPkg/ArmVExpress.dsc.inc !include MdePkg/MdeLibs.dsc.inc !include DynamicTablesPkg/DynamicTables.dsc.inc [LibraryClasses.common] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf - ArmPlatformLib|Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf + ArmPlatformLib|VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf - ArmPlatformSysConfigLib|Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf + ArmPlatformSysConfigLib|VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf !ifdef EDK2_ENABLE_PL111 LcdHwLib|ArmPlatformPkg/Library/PL111Lcd/PL111Lcd.inf - LcdPlatformLib|Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf + LcdPlatformLib|VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf !endif # Virtio Support @@ -53,24 +53,24 @@ [LibraryClasses.common] FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf !endif - DtPlatformDtbLoaderLib|Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf + DtPlatformDtbLoaderLib|VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf [LibraryClasses.common.DXE_RUNTIME_DRIVER] - ArmPlatformSysConfigLib|Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf + ArmPlatformSysConfigLib|VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf [LibraryClasses.common.SEC] - ArmPlatformLib|Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf + ArmPlatformLib|VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf [LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.UEFI_APPLICATION, LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.DXE_DRIVER] PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf - PciHostBridgeLib|Platform/ARM/VExpressPkg/Library/ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.inf + PciHostBridgeLib|VExpressPkg/Library/ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.inf PciLib|MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf [BuildOptions] - GCC:*_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/Platform/ARM/VExpressPkg/Include/Platform/RTSM + GCC:*_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/VExpressPkg/Include/Platform/RTSM ################################################################################ @@ -204,7 +204,7 @@ [Components.common] # UEFI is placed in RAM by bootloader ArmPlatformPkg/PrePi/PeiUniCore.inf { - ArmPlatformLib|Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf + ArmPlatformLib|VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf } !else # UEFI lives in FLASH and copies itself to RAM @@ -282,7 +282,7 @@ [Components.common] !endif } - Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf { + VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf { gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x1c090000 gArmPlatformTokenSpaceGuid.PL011UartInterrupt|0x25 @@ -309,12 +309,12 @@ [Components.common] # Multimedia Card Interface # EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf - Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf + VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf # # Platform Driver # - Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf + VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf # diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf index 7635cb7a8406..102965615207 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf @@ -94,7 +94,7 @@ [FV.FvMain] INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf # Configuration Manager - INF Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf + INF VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf # # Dynamic Table fdf @@ -135,7 +135,7 @@ [FV.FvMain] # Multimedia Card Interface # INF EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf - INF Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf + INF VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf # # SMBIOS Support @@ -145,12 +145,12 @@ [FV.FvMain] # # Platform Driver # - INF Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf + INF VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf !ifdef EDK2_ENABLE_SMSC_91X -!include Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc - INF Platform/ARM/VExpressPkg/Drivers/Lan91xDxe/Lan91xDxe.inf +!include VExpressPkg/ArmVExpress-networking.fdf.inc + INF VExpressPkg/Drivers/Lan91xDxe/Lan91xDxe.inf !endif # @@ -196,12 +196,12 @@ [FV.FvMain] # builtin device tree binaries -- order matches ARM_VEXPRESS_PLATFORM_ID FILE FREEFORM = 25462CDA-221F-47DF-AC1D-259CFAA4E326 { - SECTION RAW = Platform/ARM/VExpressPkg/DeviceTree/fvp-base-gicv2-psci.dtb - SECTION RAW = Platform/ARM/VExpressPkg/DeviceTree/fvp-base-gicv2legacy-psci.dtb - SECTION RAW = Platform/ARM/VExpressPkg/DeviceTree/fvp-base-gicv3-psci.dtb - SECTION RAW = Platform/ARM/VExpressPkg/DeviceTree/fvp-foundation-gicv2-psci.dtb - SECTION RAW = Platform/ARM/VExpressPkg/DeviceTree/fvp-foundation-gicv2legacy-psci.dtb - SECTION RAW = Platform/ARM/VExpressPkg/DeviceTree/fvp-foundation-gicv3-psci.dtb + SECTION RAW = VExpressPkg/DeviceTree/fvp-base-gicv2-psci.dtb + SECTION RAW = VExpressPkg/DeviceTree/fvp-base-gicv2legacy-psci.dtb + SECTION RAW = VExpressPkg/DeviceTree/fvp-base-gicv3-psci.dtb + SECTION RAW = VExpressPkg/DeviceTree/fvp-foundation-gicv2-psci.dtb + SECTION RAW = VExpressPkg/DeviceTree/fvp-foundation-gicv2legacy-psci.dtb + SECTION RAW = VExpressPkg/DeviceTree/fvp-foundation-gicv3-psci.dtb } !endif diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc index 1381867ac055..60f1926aced5 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -80,8 +80,8 @@ [LibraryClasses.common] # Versatile Express Specific Libraries PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf - ArmPlatformSysConfigLib|Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf - NorFlashPlatformLib|Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf + ArmPlatformSysConfigLib|VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf + NorFlashPlatformLib|VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf # ARM PL031 RTC Driver @@ -425,7 +425,7 @@ [Components.common] !include NetworkPkg/Network.dsc.inc !ifdef EDK2_ENABLE_SMSC_91X # SMSC LAN 91C111 - Platform/ARM/VExpressPkg/Drivers/Lan91xDxe/Lan91xDxe.inf + VExpressPkg/Drivers/Lan91xDxe/Lan91xDxe.inf !endif # @@ -433,7 +433,7 @@ [Components.common] # EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf - Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf + VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf # FV Filesystem MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf @@ -464,4 +464,4 @@ [Components.common] [Components.ARM] # ISP1761 USB OTG Controller - Platform/ARM/VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf + VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf index b53daf51d4b1..bbb3dd02ef8d 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf @@ -31,7 +31,7 @@ [Packages] DynamicTablesPkg/DynamicTablesPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec + VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] ArmPlatformLib diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf index 14e02ad51d90..26798cdfb22c 100644 --- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf +++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressDxe/ArmFvpDxe.inf @@ -23,7 +23,7 @@ [Packages] ArmPlatformPkg/ArmPlatformPkg.dec OvmfPkg/OvmfPkg.dec ArmCommonPkg/ArmCommonPkg.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec + VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] ArmShellCmdRunAxfLib diff --git a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf index d95dc0268eba..5121177324d5 100644 --- a/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf +++ b/Platform/ARM/VExpressPkg/Drivers/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf @@ -39,7 +39,7 @@ [Packages] MdeModulePkg/MdeModulePkg.dec ArmPlatformPkg/ArmPlatformPkg.dec ArmPkg/ArmPkg.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec + VExpressPkg/ArmVExpressPkg.dec [Pcd] gArmVExpressTokenSpaceGuid.PcdAndroidFastbootNvmDevicePath diff --git a/Platform/ARM/VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf b/Platform/ARM/VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf index 40efb73f5db9..2ebcf910ed2d 100644 --- a/Platform/ARM/VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf +++ b/Platform/ARM/VExpressPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf @@ -40,7 +40,7 @@ [Packages] EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec + VExpressPkg/ArmVExpressPkg.dec [Pcd] gArmVExpressTokenSpaceGuid.PcdIsp1761BaseAddress diff --git a/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf b/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf index b289f80c35a5..988eb4a23ea0 100644 --- a/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf +++ b/Platform/ARM/VExpressPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf @@ -31,7 +31,7 @@ [Packages] NetworkPkg/NetworkPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec + VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] BaseLib diff --git a/Platform/ARM/VExpressPkg/Drivers/Lan91xDxe/Lan91xDxe.inf b/Platform/ARM/VExpressPkg/Drivers/Lan91xDxe/Lan91xDxe.inf index 11a9f74c50f4..61fa01dbfa7e 100644 --- a/Platform/ARM/VExpressPkg/Drivers/Lan91xDxe/Lan91xDxe.inf +++ b/Platform/ARM/VExpressPkg/Drivers/Lan91xDxe/Lan91xDxe.inf @@ -33,7 +33,7 @@ [Packages] MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec NetworkPkg/NetworkPkg.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec + VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] ArmLib diff --git a/Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf b/Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf index 34690a135e16..ff1407aefd4e 100644 --- a/Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf +++ b/Platform/ARM/VExpressPkg/Drivers/PL180MciDxe/PL180MciDxe.inf @@ -29,7 +29,7 @@ [Sources.common] [Packages] EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec + VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] BaseLib diff --git a/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.inf b/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.inf index 784e84bd9293..c230d33510db 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.inf +++ b/Platform/ARM/VExpressPkg/Library/ArmMaliDpLib/ArmMaliDpLib.inf @@ -20,7 +20,7 @@ [Sources.common] [Packages] ArmPlatformPkg/ArmPlatformPkg.dec MdePkg/MdePkg.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec + VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] BaseLib diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf index 7992ffa22c91..823233a4153b 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressDtPlatformDtbLoaderLib/ArmVExpressDtPlatformDtbLoaderLib.inf @@ -20,7 +20,7 @@ [Sources] [Packages] ArmPkg/ArmPkg.dec MdePkg/MdePkg.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec + VExpressPkg/ArmVExpressPkg.dec EmbeddedPkg/EmbeddedPkg.dec [LibraryClasses] diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf index e585fe6c1876..d2bf15aa405e 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibCTA15-A7/ArmVExpressLib.inf @@ -20,7 +20,7 @@ [Packages] EmbeddedPkg/EmbeddedPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec + VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] IoLib diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf index 929dadc28a84..8ff24785939a 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf @@ -19,7 +19,7 @@ [Packages] EmbeddedPkg/EmbeddedPkg.dec ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec + VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] IoLib diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf index ede7ab0a32ce..7271ff5ab298 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLibSec.inf @@ -16,7 +16,7 @@ [Defines] [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec + VExpressPkg/ArmVExpressPkg.dec EmbeddedPkg/EmbeddedPkg.dec ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.inf index e5080074e2e9..39e6d0e112b4 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.inf +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.inf @@ -29,7 +29,7 @@ [Packages] ArmPkg/ArmPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec + VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] IoLib diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf index 36f447ee79bd..feb00a41c4ff 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf @@ -22,7 +22,7 @@ [Sources.common] [Packages] ArmPlatformPkg/ArmPlatformPkg.dec MdePkg/MdePkg.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec + VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] BaseLib diff --git a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf index 5179165f98e2..5aa8aefb790d 100644 --- a/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf +++ b/Platform/ARM/VExpressPkg/Library/ArmVExpressSysConfigRuntimeLib/ArmVExpressSysConfigRuntimeLib.inf @@ -23,7 +23,7 @@ [Sources.common] [Packages] ArmPlatformPkg/ArmPlatformPkg.dec MdePkg/MdePkg.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec + VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] BaseLib diff --git a/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf index 191261d0629a..aa4d98b91935 100644 --- a/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf +++ b/Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf @@ -22,7 +22,7 @@ [Sources.common] [Packages] ArmPlatformPkg/ArmPlatformPkg.dec MdePkg/MdePkg.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec + VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] ArmPlatformSysConfigLib diff --git a/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf index a411ba4d0072..736230e53160 100644 --- a/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf +++ b/Platform/ARM/VExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpressLib.inf @@ -19,7 +19,7 @@ [Sources.common] [Packages] MdePkg/MdePkg.dec ArmPlatformPkg/ArmPlatformPkg.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec + VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] BaseLib diff --git a/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf b/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf index 999a0814f508..afa950846260 100644 --- a/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf +++ b/Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf @@ -22,7 +22,7 @@ [Sources.common] [Packages] ArmPlatformPkg/ArmPlatformPkg.dec MdePkg/MdePkg.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec + VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] ArmPlatformSysConfigLib diff --git a/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf b/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf index e18df3c0baec..37e00bd5bc60 100644 --- a/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf +++ b/Platform/ARM/VExpressPkg/Library/ResetSystemLib/ResetSystemLib.inf @@ -24,7 +24,7 @@ [Packages] ArmPlatformPkg/ArmPlatformPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec + VExpressPkg/ArmVExpressPkg.dec [LibraryClasses] DebugLib diff --git a/Platform/Comcast/RDKQemu/RDKQemu.fdf b/Platform/Comcast/RDKQemu/RDKQemu.fdf index 953a72c955c4..50b1929d6136 100644 --- a/Platform/Comcast/RDKQemu/RDKQemu.fdf +++ b/Platform/Comcast/RDKQemu/RDKQemu.fdf @@ -111,7 +111,7 @@ [FV.FVMAIN_COMPACT] # # The UEFI driver is at the end of the list of the driver to be dispatched # after the device drivers (eg: Ethernet) to ensure we have support for them. - #INF Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf + #INF Drivers/FdtPlatformDxe/FdtPlatformDxe.inf FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 { SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE { diff --git a/Readme.md b/Readme.md index 62876b4b7d75..c9fd8e987cb7 100644 --- a/Readme.md +++ b/Readme.md @@ -157,7 +157,7 @@ $ NUM_CPUS=$((`getconf _NPROCESSORS_ONLN` + 2)) For the toolchain tag, use GCC5 for gcc version 5 or later, GCC4x for earlier versions, or CLANG35/CLANG38 as appropriate when building with clang. ``` -$ build -n $NUM_CPUS -a AARCH64 -t GCC5 -p Platform/ARM/JunoPkg/ArmJuno.dsc +$ build -n $NUM_CPUS -a AARCH64 -t GCC5 -p JunoPkg/ArmJuno.dsc ``` (Note that the description file gets resolved by the build command through searching in all locations specified in **PACKAGES_PATH**.) -- 2.17.1