[FIXUPS edk2-platforms 0/3] SbsaQemu layout changes and minor cleanup

[FIXUPS edk2-platforms 0/3] SbsaQemu layout changes and minor cleanup

[Leif Lindholm]

The SbsaQemu platform port has been in flight for a long time now,
so to facilitate getting it merged, here is a set of proposed layout
changes and minor tweaks that I would prefer to have included.

I also propose changing the commit message as follows:
---
SbsaQemu: add port for SbsaQemu platform

From: Radoslaw Biernacki <radoslaw.biernacki@linaro.org>

The QEMU sbsa-ref platform provides an SBSA-compliant platform,
providing EL3/EL2 support, non-virtio inerfaces, etc. This patch adds
initial support for this platform.

We are using FDF to compose EFI flash images with TF-A images.
Flash0 (secure) is used by BL1 and FIP (BL2 + BL31).
Flash1 contains EFI code and EFI variables.

Signed-off-by: Tanmay Jagdale <tanmay.jagdale@linaro.org>
---

If Graeme, Radek, or Tanmay acks this set, I will squash this into the
v4 SbsaQemu patch and push it.

Leif Lindholm (3):
  Silicon/Qemu: mirror Platform layout
  Silicon/Qemu: clean up SbsaQemu.dec
  Maintainers.txt: update format

 Maintainers.txt                               | 23 ++++++++-----------
 Platform/Qemu/SbsaQemu/SbsaQemu.dsc           |  8 +++----
 Platform/Qemu/SbsaQemu/SbsaQemu.fdf           |  2 +-
 .../SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c |  0
 .../SbsaQemuPlatformDxe.inf                   |  2 +-
 .../Library/SbsaQemuLib/SbsaQemuHelper.S      |  0
 .../Library/SbsaQemuLib/SbsaQemuLib.c         |  0
 .../Library/SbsaQemuLib/SbsaQemuLib.inf       |  2 +-
 .../Library/SbsaQemuLib/SbsaQemuMem.c         |  0
 .../SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.c |  0
 .../SbsaQemuNorFlashLib.inf                   |  0
 .../SbsaQemuPciHostBridgeLib.c                |  0
 .../SbsaQemuPciHostBridgeLib.inf              |  0
 .../SbsaQemu.dec}                             |  3 ---
 14 files changed, 16 insertions(+), 24 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} (93%)

-- 
2.20.1

[FIXUPS edk2-platforms 1/3] Silicon/Qemu: mirror Platform layout

[Leif Lindholm]

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

[FIXUPS edk2-platforms 2/3] Silicon/Qemu: clean up SbsaQemu.dec

[Leif Lindholm]

For some reason, SbsaQemu.dec holds a spurious LibraryClasses
declaration for ArmPlatformLib - nuke it.

Signed-off-by: Leif Lindholm <leif@nuviainc.com>
---
 Silicon/Qemu/SbsaQemu/SbsaQemu.dec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Silicon/Qemu/SbsaQemu/SbsaQemu.dec b/Silicon/Qemu/SbsaQemu/SbsaQemu.dec
index 98aff2a613eb..cd879f4dbd96 100644
--- a/Silicon/Qemu/SbsaQemu/SbsaQemu.dec
+++ b/Silicon/Qemu/SbsaQemu/SbsaQemu.dec
@@ -24,9 +24,6 @@ [Defines]
 #[Includes.common]
 #  Include                        # Root include for the package
 
-[LibraryClasses]
-  ArmPlatformLib|Include/Library/ArmPlatformLib.h
-
 [Guids.common]
   gArmVirtSbsaQemuPlatformTokenSpaceGuid   = { 0xaab3bea9, 0xa8e8, 0x4e76, { 0xb5, 0x3a, 0x35, 0x22, 0x11, 0xce, 0xf7, 0xf7 } }
 
-- 
2.20.1

[FIXUPS edk2-platforms 3/3] Maintainers.txt: update format

[Leif Lindholm]

Since this set started, edk2-platforms has migrated to the new
Maintainers.txt format - adjust the entry accordingly. As part
of this, squash Platform and Silicon portions into a single
section entry.
Also, flip Graeme Gregory from M: to R:, since he does not have
repository write access.

Signed-off-by: Leif Lindholm <leif@nuviainc.com>
---
 Maintainers.txt | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/Maintainers.txt b/Maintainers.txt
index f9e2ca54f40d..9fc41187b747 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -251,6 +251,15 @@ F: Silicon/NXP/
 M: Leif Lindholm <leif@nuviainc.com>
 R: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
 
+QEMU sbsa-ref platform
+F: Platform/Qemu/SbsaQemu/
+F: Silicon/Qemu/SbsaQemu/
+M: Ard Biesheuvel <ard.biesheuvel@arm.com>
+M: Leif Lindholm <leif@nuviainc.com>
+R: Graeme Gregory <graeme.gregory@linaro.org>
+R: Radoslaw Biernacki <rad@semihalf.com>
+R: Tanmay Jagdale <tanmay.jagdale@linaro.org>
+
 Raspberry Pi platforms and silicon
 F: Platform/RaspberryPi/
 F: Silicon/Broadcom/
@@ -264,17 +273,3 @@ F: Silicon/NXP/Library/Pcf8563RealTimeClockLib/
 F: Silicon/Socionext/
 M: Ard Biesheuvel <ard.biesheuvel@arm.com>
 M: Leif Lindholm <leif@nuviainc.com>
-
-Silicon/Qemu
-M: Ard Biesheuvel <ard.biesheuvel@arm.com>
-M: Leif Lindholm <leif@nuviainc.com>
-M: Graeme Gregory <graeme.gregory@linaro.org>
-R: Radoslaw Biernacki <rad@semihalf.com>
-R: Tanmay Jagdale <tanmay.jagdale@linaro.org>
-
-Platform/Qemu/SbsaQemu
-M: Ard Biesheuvel <ard.biesheuvel@arm.com>
-M: Leif Lindholm <leif@nuviainc.com>
-M: Graeme Gregory <graeme.gregory@linaro.org>
-R: Radoslaw Biernacki <rad@semihalf.com>
-R: Tanmay Jagdale <tanmay.jagdale@linaro.org>
-- 
2.20.1

Re: [FIXUPS edk2-platforms 0/3] SbsaQemu layout changes and minor cleanup

[graeme.gregory]

On Sat, May 23, 2020 at 12:39:41AM +0100, Leif Lindholm wrote:
> The SbsaQemu platform port has been in flight for a long time now,
> so to facilitate getting it merged, here is a set of proposed layout
> changes and minor tweaks that I would prefer to have included.
> 
> I also propose changing the commit message as follows:
> ---
> SbsaQemu: add port for SbsaQemu platform
> 
> From: Radoslaw Biernacki <radoslaw.biernacki@linaro.org>
> 
> The QEMU sbsa-ref platform provides an SBSA-compliant platform,
> providing EL3/EL2 support, non-virtio inerfaces, etc. This patch adds
> initial support for this platform.
> 
> We are using FDF to compose EFI flash images with TF-A images.
> Flash0 (secure) is used by BL1 and FIP (BL2 + BL31).
> Flash1 contains EFI code and EFI variables.
> 
> Signed-off-by: Tanmay Jagdale <tanmay.jagdale@linaro.org>
> ---
> 
> If Graeme, Radek, or Tanmay acks this set, I will squash this into the
> v4 SbsaQemu patch and push it.
> 
Looks all good to me.

Acked-by: Graeme Gregory <graeme.gregory@linaro.org>

> Leif Lindholm (3):
>   Silicon/Qemu: mirror Platform layout
>   Silicon/Qemu: clean up SbsaQemu.dec
>   Maintainers.txt: update format
> 
>  Maintainers.txt                               | 23 ++++++++-----------
>  Platform/Qemu/SbsaQemu/SbsaQemu.dsc           |  8 +++----
>  Platform/Qemu/SbsaQemu/SbsaQemu.fdf           |  2 +-
>  .../SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c |  0
>  .../SbsaQemuPlatformDxe.inf                   |  2 +-
>  .../Library/SbsaQemuLib/SbsaQemuHelper.S      |  0
>  .../Library/SbsaQemuLib/SbsaQemuLib.c         |  0
>  .../Library/SbsaQemuLib/SbsaQemuLib.inf       |  2 +-
>  .../Library/SbsaQemuLib/SbsaQemuMem.c         |  0
>  .../SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.c |  0
>  .../SbsaQemuNorFlashLib.inf                   |  0
>  .../SbsaQemuPciHostBridgeLib.c                |  0
>  .../SbsaQemuPciHostBridgeLib.inf              |  0
>  .../SbsaQemu.dec}                             |  3 ---
>  14 files changed, 16 insertions(+), 24 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} (93%)
> 
> -- 
> 2.20.1
> 

Re: [edk2-devel] [FIXUPS edk2-platforms 1/3] Silicon/Qemu: mirror Platform layout

[Philippe Mathieu-Daudé]

On 5/23/20 1:39 AM, Leif Lindholm wrote:
> Platform/Qemu is empty, apart from the SbsaQemu dirctory, which holds

Typo dirctory -> directory.

> 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(-)

Re: [edk2-devel] [FIXUPS edk2-platforms 0/3] SbsaQemu layout changes and minor cleanup

[Philippe Mathieu-Daudé]

On 5/23/20 1:39 AM, Leif Lindholm wrote:
> The SbsaQemu platform port has been in flight for a long time now,
> so to facilitate getting it merged, here is a set of proposed layout
> changes and minor tweaks that I would prefer to have included.
> 
> I also propose changing the commit message as follows:
> ---
> SbsaQemu: add port for SbsaQemu platform
> 
> From: Radoslaw Biernacki <radoslaw.biernacki@linaro.org>
> 
> The QEMU sbsa-ref platform provides an SBSA-compliant platform,
> providing EL3/EL2 support, non-virtio inerfaces, etc. This patch adds
> initial support for this platform.
> 
> We are using FDF to compose EFI flash images with TF-A images.
> Flash0 (secure) is used by BL1 and FIP (BL2 + BL31).
> Flash1 contains EFI code and EFI variables.
> 
> Signed-off-by: Tanmay Jagdale <tanmay.jagdale@linaro.org>
> ---

For:
- "SbsaQemu: EFI implementation for SbsaQemu platform" v4
- previous patch ^ + update description
- typo "directory" fixed
- rest of this series:

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>

Re: [FIXUPS edk2-platforms 0/3] SbsaQemu layout changes and minor cleanup

[Radosław Biernacki]

Thank you Leif.
Looks good to me.

Reviewed-by: Radoslaw Biernacki <rad@semihalf.com>

sob., 23 maj 2020 o 01:39 Leif Lindholm <leif@nuviainc.com> napisał(a):
>
> The SbsaQemu platform port has been in flight for a long time now,
> so to facilitate getting it merged, here is a set of proposed layout
> changes and minor tweaks that I would prefer to have included.
>
> I also propose changing the commit message as follows:
> ---
> SbsaQemu: add port for SbsaQemu platform
>
> From: Radoslaw Biernacki <radoslaw.biernacki@linaro.org>
>
> The QEMU sbsa-ref platform provides an SBSA-compliant platform,
> providing EL3/EL2 support, non-virtio inerfaces, etc. This patch adds
> initial support for this platform.
>
> We are using FDF to compose EFI flash images with TF-A images.
> Flash0 (secure) is used by BL1 and FIP (BL2 + BL31).
> Flash1 contains EFI code and EFI variables.
>
> Signed-off-by: Tanmay Jagdale <tanmay.jagdale@linaro.org>
> ---
>
> If Graeme, Radek, or Tanmay acks this set, I will squash this into the
> v4 SbsaQemu patch and push it.
>
> Leif Lindholm (3):
>   Silicon/Qemu: mirror Platform layout
>   Silicon/Qemu: clean up SbsaQemu.dec
>   Maintainers.txt: update format
>
>  Maintainers.txt                               | 23 ++++++++-----------
>  Platform/Qemu/SbsaQemu/SbsaQemu.dsc           |  8 +++----
>  Platform/Qemu/SbsaQemu/SbsaQemu.fdf           |  2 +-
>  .../SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c |  0
>  .../SbsaQemuPlatformDxe.inf                   |  2 +-
>  .../Library/SbsaQemuLib/SbsaQemuHelper.S      |  0
>  .../Library/SbsaQemuLib/SbsaQemuLib.c         |  0
>  .../Library/SbsaQemuLib/SbsaQemuLib.inf       |  2 +-
>  .../Library/SbsaQemuLib/SbsaQemuMem.c         |  0
>  .../SbsaQemuNorFlashLib/SbsaQemuNorFlashLib.c |  0
>  .../SbsaQemuNorFlashLib.inf                   |  0
>  .../SbsaQemuPciHostBridgeLib.c                |  0
>  .../SbsaQemuPciHostBridgeLib.inf              |  0
>  .../SbsaQemu.dec}                             |  3 ---
>  14 files changed, 16 insertions(+), 24 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} (93%)
>
> --
> 2.20.1
>