ArmPlatformPkg: Move the FDT platform driver at the end of the driver list

The Fdt platform driver has been moved at the end of the list
of the DXE/UEFI drivers to ensure the device drivers have been
dispatched prior to load the FDT platform driver.

For instance, if we want to load FDT from TFTP we must have
the ethernet driver to be already loaded.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
Reviewed-by: Ronald Cron <Ronald.Cron@arm.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17305 6f19259b-4bc3-4df7-8a09-765794883524

9 files changed, 63 insertions, 45 deletions

diff --git a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf
index f399c91ffe..4467804b17 100644
--- a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf
+++ b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf
@@ -113,11 +113,6 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf

   INF RuleOverride=ACPITABLE ArmPlatformPkg/ArmJunoPkg/AcpiTables/AcpiTables.inf

 

-  #

-  # FDT installation

-  #

-  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf

-

   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

 

   #

@@ -192,6 +187,13 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

   INF ArmPlatformPkg/Bds/Bds.inf

 

+  #

+  # FDT installation

+  #

+  # 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 EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf

+

 [FV.FVMAIN_COMPACT]

 FvAlignment        = 8

 ERASE_POLARITY     = 1

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
index 7390db30b9..893fb866b7 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
@@ -105,11 +105,6 @@ READ_LOCK_STATUS   = TRUE
   INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf

 

   #

-  # FDT installation

-  #

-  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf

-

-  #

   # Multimedia Card Interface

   #

   INF EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf

@@ -179,6 +174,13 @@ READ_LOCK_STATUS   = TRUE
   # FV Filesystem

   INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf

 

+  #

+  # FDT installation

+  #

+  # 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 EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf

+

   # Example to add a Device Tree to the Firmware Volume

   #FILE FREEFORM = PCD(gArmVExpressTokenSpaceGuid.PcdFdtVExpressHwA15x2A7x3) {

   #  SECTION RAW = ArmPlatformPkg/ArmVExpressPkg/Fdts/vexpress-v2p-ca15_a7.dtb

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
index a2a4add74d..6ee0b06f41 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
@@ -195,11 +195,6 @@ READ_LOCK_STATUS   = TRUE
   INF ArmPlatformPkg/FileSystem/BootMonFs/BootMonFs.inf

 

   #

-  # FDT installation

-  #

-  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf

-

-  #

   # Multimedia Card Interface

   #

   INF EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf

@@ -248,6 +243,13 @@ READ_LOCK_STATUS   = TRUE
   # FV Filesystem

   INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf

 

+  #

+  # FDT installation

+  #

+  # 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 EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf

+

   # Example to add a Device Tree to the Firmware Volume

   #FILE FREEFORM = PCD(gArmVExpressTokenSpaceGuid.PcdFdtVExpressHwA9x4) {

   #  SECTION RAW = ArmPlatformPkg/ArmVExpressPkg/Fdts/vexpress-v2p-ca9.dtb

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
index 1c709771b5..e7e6dc1446 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
@@ -192,11 +192,6 @@ READ_LOCK_STATUS   = TRUE
   INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf

 

   #

-  # FDT installation

-  #

-  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf

-

-  #

   # UEFI application (Shell Embedded Boot Loader)

   #

   INF ShellBinPkg/UefiShell/UefiShell.inf

@@ -210,6 +205,13 @@ READ_LOCK_STATUS   = TRUE
   # FV Filesystem

   INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf

 

+  #

+  # FDT installation

+  #

+  # 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 EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf

+

 [FV.FVMAIN_COMPACT]

 FvAlignment        = 16

 ERASE_POLARITY     = 1

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
index e787190328..8994196737 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
@@ -193,11 +193,6 @@ READ_LOCK_STATUS   = TRUE
   INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf

 

   #

-  # FDT installation

-  #

-  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf

-

-  #

   # UEFI application (Shell Embedded Boot Loader)

   #

   INF ShellBinPkg/UefiShell/UefiShell.inf

@@ -211,6 +206,13 @@ READ_LOCK_STATUS   = TRUE
   # FV Filesystem

   INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf

 

+  #

+  # FDT installation

+  #

+  # 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 EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf

+

   # Example to add a Device Tree to the Firmware Volume

   #FILE FREEFORM = PCD(gArmVExpressTokenSpaceGuid.PcdFdtVExpressFvpA15x1) {

   #  SECTION RAW = ArmPlatformPkg/ArmVExpressPkg/Fdts/rtsm_ve-ca15x1.dtb

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
index f62ae424e6..3d54f9ac65 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
@@ -193,11 +193,6 @@ READ_LOCK_STATUS   = TRUE
   INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf

 

   #

-  # FDT installation

-  #

-  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf

-

-  #

   # UEFI application (Shell Embedded Boot Loader)

   #

   INF ShellBinPkg/UefiShell/UefiShell.inf

@@ -211,6 +206,13 @@ READ_LOCK_STATUS   = TRUE
   # FV Filesystem

   INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf

 

+  #

+  # FDT installation

+  #

+  # 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 EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf

+

   # Example to add a Device Tree to the Firmware Volume

   #FILE FREEFORM = PCD(gArmVExpressTokenSpaceGuid.PcdFdtVExpressFvpA15x4) {

   #  SECTION RAW = ArmPlatformPkg/ArmVExpressPkg/Fdts/rtsm_ve-ca15x4.dtb

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
index f0182bb532..98000fb74d 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
@@ -179,11 +179,6 @@ READ_LOCK_STATUS   = TRUE
   INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf

 

   #

-  # FDT installation

-  #

-  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf

-

-  #

   # UEFI application (Shell Embedded Boot Loader)

   #

   INF ShellBinPkg/UefiShell/UefiShell.inf

@@ -197,6 +192,13 @@ READ_LOCK_STATUS   = TRUE
   # FV Filesystem

   INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf

 

+  #

+  # FDT installation

+  #

+  # 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 EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf

+

   # Example to add a Device Tree to the Firmware Volume

   #FILE FREEFORM = PCD(gArmVExpressTokenSpaceGuid.PcdFdtVExpressFvpA9x4) {

   #  SECTION RAW = ArmPlatformPkg/ArmVExpressPkg/Fdts/rtsm_ve-ca9x4.dtb

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf
index 7db45d2cf3..0c1166d22e 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf
@@ -166,11 +166,6 @@ READ_LOCK_STATUS   = TRUE
   INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf

 

   #

-  # FDT installation

-  #

-  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf

-

-  #

   # UEFI application (Shell Embedded Boot Loader)

   #

   INF ShellBinPkg/UefiShell/UefiShell.inf

@@ -181,6 +176,13 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

   INF ArmPlatformPkg/Bds/Bds.inf

 

+  #

+  # FDT installation

+  #

+  # 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 EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf

+

   # FV Filesystem

   INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf

 

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf
index 9f940235ec..9fc41428e4 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf
@@ -176,11 +176,6 @@ READ_LOCK_STATUS   = TRUE
   INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf

 

   #

-  # FDT installation

-  #

-  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf

-

-  #

   # UEFI application (Shell Embedded Boot Loader)

   #

   INF ShellBinPkg/UefiShell/UefiShell.inf

@@ -194,6 +189,13 @@ READ_LOCK_STATUS   = TRUE
   # FV Filesystem

   INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf

 

+  #

+  # FDT installation

+  #

+  # 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 EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf

+

 [FV.FVMAIN_COMPACT]

 FvAlignment        = 16

 ERASE_POLARITY     = 1