From: "Leif Lindholm" <leif@nuviainc.com>
To: devel@edk2.groups.io
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>,
Graeme Gregory <graeme.gregory@linaro.org>,
Radoslaw Biernacki <rad@semihalf.com>,
Tanmay Jagdale <tanmay.jagdale@linaro.org>
Subject: [FIXUPS edk2-platforms 1/3] Silicon/Qemu: mirror Platform layout
Date: Sat, 23 May 2020 00:39:42 +0100 [thread overview]
Message-ID: <20200522233944.6845-2-leif@nuviainc.com> (raw)
In-Reply-To: <20200522233944.6845-1-leif@nuviainc.com>
Platform/Qemu is empty, apart from the SbsaQemu dirctory, which holds
SbsaQemu.dsc and SbsaQemu.fdf. Silicon/Qemu held Drivers, Library and
a file called SbsaQemuPkg.dec. Move them all into a subdirectory called
SbsaQemu, and drop the Pkg but from the .dec name.
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
---
Platform/Qemu/SbsaQemu/SbsaQemu.dsc | 8 ++++----
Platform/Qemu/SbsaQemu/SbsaQemu.fdf | 2 +-
.../Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c | 0
.../Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf | 2 +-
.../{ => SbsaQemu}/Library/SbsaQemuLib/SbsaQemuHelper.S | 0
.../Qemu/{ => SbsaQemu}/Library/SbsaQemuLib/SbsaQemuLib.c | 0
.../{ => SbsaQemu}/Library/SbsaQemuLib/SbsaQemuLib.inf | 2 +-
.../Qemu/{ => SbsaQemu}/Library/SbsaQemuLib/SbsaQemuMem.c | 0
.../Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.c | 0
.../Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.inf | 0
.../SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c | 0
.../SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.inf | 0
Silicon/Qemu/{SbsaQemuPkg.dec => SbsaQemu/SbsaQemu.dec} | 0
13 files changed, 7 insertions(+), 7 deletions(-)
rename Silicon/Qemu/{ => SbsaQemu}/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c (100%)
rename Silicon/Qemu/{ => SbsaQemu}/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf (92%)
rename Silicon/Qemu/{ => SbsaQemu}/Library/SbsaQemuLib/SbsaQemuHelper.S (100%)
rename Silicon/Qemu/{ => SbsaQemu}/Library/SbsaQemuLib/SbsaQemuLib.c (100%)
rename Silicon/Qemu/{ => SbsaQemu}/Library/SbsaQemuLib/SbsaQemuLib.inf (92%)
rename Silicon/Qemu/{ => SbsaQemu}/Library/SbsaQemuLib/SbsaQemuMem.c (100%)
rename Silicon/Qemu/{ => SbsaQemu}/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.c (100%)
rename Silicon/Qemu/{ => SbsaQemu}/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.inf (100%)
rename Silicon/Qemu/{ => SbsaQemu}/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c (100%)
rename Silicon/Qemu/{ => SbsaQemu}/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.inf (100%)
rename Silicon/Qemu/{SbsaQemuPkg.dec => SbsaQemu/SbsaQemu.dec} (100%)
diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
index 8c6b062f8467..4db3ab465163 100644
--- a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
+++ b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
@@ -162,7 +162,7 @@ [LibraryClasses.common]
ArmPlatformLib|ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
- NorFlashPlatformLib|Silicon/Qemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.inf
+ NorFlashPlatformLib|Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.inf
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
@@ -170,7 +170,7 @@ [LibraryClasses.common]
CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
- PciHostBridgeLib|Silicon/Qemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.inf
+ PciHostBridgeLib|Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.inf
FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf
@@ -218,7 +218,7 @@ [LibraryClasses.common.PEIM]
PeiServicesTablePointerLib|ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
- ArmPlatformLib|Silicon/Qemu/Library/SbsaQemuLib/SbsaQemuLib.inf
+ ArmPlatformLib|Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuLib.inf
[LibraryClasses.common.DXE_CORE]
HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
@@ -640,7 +640,7 @@ [Components.common]
!include NetworkPkg/Network.dsc.inc
# NonDiscoverableDevices
- Silicon/Qemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf
+ Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf
MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf
# IDE/AHCI Support
diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.fdf b/Platform/Qemu/SbsaQemu/SbsaQemu.fdf
index 04639c9a46e2..be7c78acebfd 100644
--- a/Platform/Qemu/SbsaQemu/SbsaQemu.fdf
+++ b/Platform/Qemu/SbsaQemu/SbsaQemu.fdf
@@ -288,7 +288,7 @@ [FV.FVMAIN_COMPACT]
INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
# NonDiscoverableDevices
- INF Silicon/Qemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf
+ INF Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf
INF MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf
#VGA
diff --git a/Silicon/Qemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c
similarity index 100%
rename from Silicon/Qemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c
rename to Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c
diff --git a/Silicon/Qemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf
similarity index 92%
rename from Silicon/Qemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf
rename to Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf
index 42a373ee0ed2..21d2135f6d17 100644
--- a/Silicon/Qemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf
+++ b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf
@@ -24,7 +24,7 @@ [Packages]
EmbeddedPkg/EmbeddedPkg.dec
MdeModulePkg/MdeModulePkg.dec
MdePkg/MdePkg.dec
- Silicon/Qemu/SbsaQemuPkg.dec
+ Silicon/Qemu/SbsaQemu/SbsaQemu.dec
[LibraryClasses]
PcdLib
diff --git a/Silicon/Qemu/Library/SbsaQemuLib/SbsaQemuHelper.S b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuHelper.S
similarity index 100%
rename from Silicon/Qemu/Library/SbsaQemuLib/SbsaQemuHelper.S
rename to Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuHelper.S
diff --git a/Silicon/Qemu/Library/SbsaQemuLib/SbsaQemuLib.c b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuLib.c
similarity index 100%
rename from Silicon/Qemu/Library/SbsaQemuLib/SbsaQemuLib.c
rename to Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuLib.c
diff --git a/Silicon/Qemu/Library/SbsaQemuLib/SbsaQemuLib.inf b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuLib.inf
similarity index 92%
rename from Silicon/Qemu/Library/SbsaQemuLib/SbsaQemuLib.inf
rename to Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuLib.inf
index 9eb69eba71d3..c067a80cc715 100644
--- a/Silicon/Qemu/Library/SbsaQemuLib/SbsaQemuLib.inf
+++ b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuLib.inf
@@ -26,7 +26,7 @@ [Packages]
EmbeddedPkg/EmbeddedPkg.dec
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- Silicon/Qemu/SbsaQemuPkg.dec
+ Silicon/Qemu/SbsaQemu/SbsaQemu.dec
[LibraryClasses]
ArmLib
diff --git a/Silicon/Qemu/Library/SbsaQemuLib/SbsaQemuMem.c b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuMem.c
similarity index 100%
rename from Silicon/Qemu/Library/SbsaQemuLib/SbsaQemuMem.c
rename to Silicon/Qemu/SbsaQemu/Library/SbsaQemuLib/SbsaQemuMem.c
diff --git a/Silicon/Qemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.c b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.c
similarity index 100%
rename from Silicon/Qemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.c
rename to Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.c
diff --git a/Silicon/Qemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.inf b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.inf
similarity index 100%
rename from Silicon/Qemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.inf
rename to Silicon/Qemu/SbsaQemu/Library/SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.inf
diff --git a/Silicon/Qemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c
similarity index 100%
rename from Silicon/Qemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c
rename to Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c
diff --git a/Silicon/Qemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.inf b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.inf
similarity index 100%
rename from Silicon/Qemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.inf
rename to Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.inf
diff --git a/Silicon/Qemu/SbsaQemuPkg.dec b/Silicon/Qemu/SbsaQemu/SbsaQemu.dec
similarity index 100%
rename from Silicon/Qemu/SbsaQemuPkg.dec
rename to Silicon/Qemu/SbsaQemu/SbsaQemu.dec
--
2.20.1
next prev parent reply other threads:[~2020-05-22 23:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-22 23:39 [FIXUPS edk2-platforms 0/3] SbsaQemu layout changes and minor cleanup Leif Lindholm
2020-05-22 23:39 ` Leif Lindholm [this message]
2020-05-25 12:50 ` [edk2-devel] [FIXUPS edk2-platforms 1/3] Silicon/Qemu: mirror Platform layout Philippe Mathieu-Daudé
2020-05-22 23:39 ` [FIXUPS edk2-platforms 2/3] Silicon/Qemu: clean up SbsaQemu.dec Leif Lindholm
2020-05-22 23:39 ` [FIXUPS edk2-platforms 3/3] Maintainers.txt: update format Leif Lindholm
2020-05-23 20:49 ` [FIXUPS edk2-platforms 0/3] SbsaQemu layout changes and minor cleanup graeme.gregory
2020-05-25 12:53 ` [edk2-devel] " Philippe Mathieu-Daudé
2020-05-25 16:14 ` Radosław Biernacki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200522233944.6845-2-leif@nuviainc.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox