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

diff --git a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf
index f399c91ffe71e94f2076a002c5850b89ff5dc663..4467804b17fcf99cafe59a7959bc3aa76e971666 100644 (file)
--- 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\r
   INF RuleOverride=ACPITABLE ArmPlatformPkg/ArmJunoPkg/AcpiTables/AcpiTables.inf\r
 \r
-  #\r
-  # FDT installation\r
-  #\r
-  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf\r
-\r
   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
 \r
   #\r
@@ -192,6 +187,13 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
   INF ArmPlatformPkg/Bds/Bds.inf\r
 \r
+  #\r
+  # FDT installation\r
+  #\r
+  # The UEFI driver is at the end of the list of the driver to be dispatched\r
+  # after the device drivers (eg: Ethernet) to ensure we have support for them.\r
+  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf\r
+\r
 [FV.FVMAIN_COMPACT]\r
 FvAlignment        = 8\r
 ERASE_POLARITY     = 1\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
index 7390db30b9f56b7f0da05cbbdbd92b08d050e33b..893fb866b7bc5267fb4601f06ad79e3f8e315fdc 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
@@ -104,11 +104,6 @@ READ_LOCK_STATUS   = TRUE
   #\r
   INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf\r
 \r
-  #\r
-  # FDT installation\r
-  #\r
-  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf\r
-\r
   #\r
   # Multimedia Card Interface\r
   #\r
@@ -179,6 +174,13 @@ READ_LOCK_STATUS   = TRUE
   # FV Filesystem\r
   INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
 \r
+  #\r
+  # FDT installation\r
+  #\r
+  # The UEFI driver is at the end of the list of the driver to be dispatched\r
+  # after the device drivers (eg: Ethernet) to ensure we have support for them.\r
+  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf\r
+\r
   # Example to add a Device Tree to the Firmware Volume\r
   #FILE FREEFORM = PCD(gArmVExpressTokenSpaceGuid.PcdFdtVExpressHwA15x2A7x3) {\r
   #  SECTION RAW = ArmPlatformPkg/ArmVExpressPkg/Fdts/vexpress-v2p-ca15_a7.dtb\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
index a2a4add74dd738f48f731f83b536fd52c7e01c56..6ee0b06f41f116e50b6126a1e0c65df61715bca7 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
@@ -194,11 +194,6 @@ READ_LOCK_STATUS   = TRUE
   # Versatile Express FileSystem\r
   INF ArmPlatformPkg/FileSystem/BootMonFs/BootMonFs.inf\r
 \r
-  #\r
-  # FDT installation\r
-  #\r
-  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf\r
-\r
   #\r
   # Multimedia Card Interface\r
   #\r
@@ -248,6 +243,13 @@ READ_LOCK_STATUS   = TRUE
   # FV Filesystem\r
   INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
 \r
+  #\r
+  # FDT installation\r
+  #\r
+  # The UEFI driver is at the end of the list of the driver to be dispatched\r
+  # after the device drivers (eg: Ethernet) to ensure we have support for them.\r
+  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf\r
+\r
   # Example to add a Device Tree to the Firmware Volume\r
   #FILE FREEFORM = PCD(gArmVExpressTokenSpaceGuid.PcdFdtVExpressHwA9x4) {\r
   #  SECTION RAW = ArmPlatformPkg/ArmVExpressPkg/Fdts/vexpress-v2p-ca9.dtb\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
index 1c709771b5716f77460943de1ae08c817f7f56b7..e7e6dc14464c3e6d1690e51b3aa6b8f539e9ecac 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
@@ -191,11 +191,6 @@ READ_LOCK_STATUS   = TRUE
   INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf\r
   INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
 \r
-  #\r
-  # FDT installation\r
-  #\r
-  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf\r
-\r
   #\r
   # UEFI application (Shell Embedded Boot Loader)\r
   #\r
@@ -210,6 +205,13 @@ READ_LOCK_STATUS   = TRUE
   # FV Filesystem\r
   INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
 \r
+  #\r
+  # FDT installation\r
+  #\r
+  # The UEFI driver is at the end of the list of the driver to be dispatched\r
+  # after the device drivers (eg: Ethernet) to ensure we have support for them.\r
+  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf\r
+\r
 [FV.FVMAIN_COMPACT]\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
index e7871903285c6d8a62def0c443ce0da86491999c..899419673704cffb9ae5ce07f072c62a4f70ddb5 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
@@ -192,11 +192,6 @@ READ_LOCK_STATUS   = TRUE
   INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf\r
   INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
 \r
-  #\r
-  # FDT installation\r
-  #\r
-  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf\r
-\r
   #\r
   # UEFI application (Shell Embedded Boot Loader)\r
   #\r
@@ -211,6 +206,13 @@ READ_LOCK_STATUS   = TRUE
   # FV Filesystem\r
   INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
 \r
+  #\r
+  # FDT installation\r
+  #\r
+  # The UEFI driver is at the end of the list of the driver to be dispatched\r
+  # after the device drivers (eg: Ethernet) to ensure we have support for them.\r
+  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf\r
+\r
   # Example to add a Device Tree to the Firmware Volume\r
   #FILE FREEFORM = PCD(gArmVExpressTokenSpaceGuid.PcdFdtVExpressFvpA15x1) {\r
   #  SECTION RAW = ArmPlatformPkg/ArmVExpressPkg/Fdts/rtsm_ve-ca15x1.dtb\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
index f62ae424e6bb37a5092614397d8f12d9dd83ded3..3d54f9ac65e55cbb735b986029956104c934cec3 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
@@ -192,11 +192,6 @@ READ_LOCK_STATUS   = TRUE
   INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf\r
   INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
 \r
-  #\r
-  # FDT installation\r
-  #\r
-  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf\r
-\r
   #\r
   # UEFI application (Shell Embedded Boot Loader)\r
   #\r
@@ -211,6 +206,13 @@ READ_LOCK_STATUS   = TRUE
   # FV Filesystem\r
   INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
 \r
+  #\r
+  # FDT installation\r
+  #\r
+  # The UEFI driver is at the end of the list of the driver to be dispatched\r
+  # after the device drivers (eg: Ethernet) to ensure we have support for them.\r
+  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf\r
+\r
   # Example to add a Device Tree to the Firmware Volume\r
   #FILE FREEFORM = PCD(gArmVExpressTokenSpaceGuid.PcdFdtVExpressFvpA15x4) {\r
   #  SECTION RAW = ArmPlatformPkg/ArmVExpressPkg/Fdts/rtsm_ve-ca15x4.dtb\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
index f0182bb532a5ccc175a04e48c2a267f92e03d36b..98000fb74db3f5691a7fe69400ff5d28762f6f1d 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
@@ -178,11 +178,6 @@ READ_LOCK_STATUS   = TRUE
   INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf\r
   INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
 \r
-  #\r
-  # FDT installation\r
-  #\r
-  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf\r
-\r
   #\r
   # UEFI application (Shell Embedded Boot Loader)\r
   #\r
@@ -197,6 +192,13 @@ READ_LOCK_STATUS   = TRUE
   # FV Filesystem\r
   INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
 \r
+  #\r
+  # FDT installation\r
+  #\r
+  # The UEFI driver is at the end of the list of the driver to be dispatched\r
+  # after the device drivers (eg: Ethernet) to ensure we have support for them.\r
+  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf\r
+\r
   # Example to add a Device Tree to the Firmware Volume\r
   #FILE FREEFORM = PCD(gArmVExpressTokenSpaceGuid.PcdFdtVExpressFvpA9x4) {\r
   #  SECTION RAW = ArmPlatformPkg/ArmVExpressPkg/Fdts/rtsm_ve-ca9x4.dtb\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf
index 7db45d2cf38a22ec93bf1e6030025aab60f7d948..0c1166d22e51c920eeda42ba932abe32011f5aa3 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf
@@ -165,11 +165,6 @@ READ_LOCK_STATUS   = TRUE
   INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf\r
   INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
 \r
-  #\r
-  # FDT installation\r
-  #\r
-  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf\r
-\r
   #\r
   # UEFI application (Shell Embedded Boot Loader)\r
   #\r
@@ -181,6 +176,13 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
   INF ArmPlatformPkg/Bds/Bds.inf\r
 \r
+  #\r
+  # FDT installation\r
+  #\r
+  # The UEFI driver is at the end of the list of the driver to be dispatched\r
+  # after the device drivers (eg: Ethernet) to ensure we have support for them.\r
+  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf\r
+\r
   # FV Filesystem\r
   INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
 \r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf
index 9f940235ecd296dd9a97d04e188dfd9d9e424774..9fc41428e441bee0592d86f24bed0c2cb1f3876d 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf
@@ -175,11 +175,6 @@ READ_LOCK_STATUS   = TRUE
   INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf\r
   INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
 \r
-  #\r
-  # FDT installation\r
-  #\r
-  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf\r
-\r
   #\r
   # UEFI application (Shell Embedded Boot Loader)\r
   #\r
@@ -194,6 +189,13 @@ READ_LOCK_STATUS   = TRUE
   # FV Filesystem\r
   INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
 \r
+  #\r
+  # FDT installation\r
+  #\r
+  # The UEFI driver is at the end of the list of the driver to be dispatched\r
+  # after the device drivers (eg: Ethernet) to ensure we have support for them.\r
+  INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf\r
+\r
 [FV.FVMAIN_COMPACT]\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r