From d5a2dad995b75e6d619ae479229fd90171b614f2 Mon Sep 17 00:00:00 2001 From: Ryan Harkin Date: Fri, 19 Jun 2015 13:08:21 +0100 Subject: Revert "ArmPlatformPkg/ArmJunoPkg : Use FdtPlatformDxe driver to install the FDT" This reverts part of the following commit that stops TC2 from booting: commit cae7af275ed6bc8873fb5469b861f37b59685e07 Author: Ronald Cron Date: Thu Feb 26 10:56:20 2015 +0000 ArmPlatformPkg/ArmJunoPkg : Use FdtPlatformDxe driver to install the FDT Remove the installation of the FDT for Juno into the UEFI Configuration Table from the Juno specific DXE driver. Use the FdtPlatformDxe driver to do it instead. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ronald Cron Reviewed-by: Olivier Martin git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16938 6f19259b-4bc3-4df7-8a09-765794883524 Signed-off-by: Ryan Harkin --- ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf | 5 ----- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf | 5 ----- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf | 5 ----- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf | 5 ----- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf | 5 ----- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf | 5 ----- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf | 5 ----- .../ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf | 5 ----- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf | 5 ----- ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc | 5 ----- EmbeddedPkg/EmbeddedPkg.dsc | 3 --- 11 files changed, 53 deletions(-) diff --git a/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf b/ArmPlatformPkg/ArmJunoPkg/ArmJuno.fdf index 5671a19c23..b121b02092 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 # diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf index 72afd9b39e..aff7d72afa 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf @@ -104,11 +104,6 @@ READ_LOCK_STATUS = TRUE # INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf - # - # FDT installation - # - INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf - # # Multimedia Card Interface # diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf index a2a4add74d..7aa9766a7b 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf @@ -194,11 +194,6 @@ READ_LOCK_STATUS = TRUE # Versatile Express FileSystem INF ArmPlatformPkg/FileSystem/BootMonFs/BootMonFs.inf - # - # FDT installation - # - INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf - # # Multimedia Card Interface # diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf index 9faed18697..6cfe659d21 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf @@ -202,11 +202,6 @@ READ_LOCK_STATUS = TRUE INF EmbeddedPkg/Drivers/LAN91xDxe/LAN91xDxe.inf !endif - # - # FDT installation - # - INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf - # # UEFI application (Shell Embedded Boot Loader) # diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf index e787190328..c0acb79d2a 100644 --- 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 INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf - # - # FDT installation - # - INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf - # # UEFI application (Shell Embedded Boot Loader) # diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf index 2088599e54..4b3d350860 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf @@ -198,11 +198,6 @@ READ_LOCK_STATUS = TRUE INF ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf - # - # FDT installation - # - INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf - # # UEFI application (Shell Embedded Boot Loader) # diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf index f0182bb532..3c93f7df7b 100644 --- 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 INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf - # - # FDT installation - # - INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf - # # UEFI application (Shell Embedded Boot Loader) # diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf index 4016281f71..14caf2ad4c 100644 --- 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 INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf - # - # FDT installation - # - INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf - !ifdef EDK2_ENABLE_SMSC_91X !include ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-networking.fdf.inc INF EmbeddedPkg/Drivers/LAN91xDxe/LAN91xDxe.inf diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf index 9f940235ec..01347ced7b 100644 --- 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 INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf - # - # FDT installation - # - INF EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf - # # UEFI application (Shell Embedded Boot Loader) # diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc index 0a417afe2c..03592ae5ea 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc @@ -429,8 +429,3 @@ # FV Filesystem MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf - - # - # FDT installation - # - EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc index 71546c3289..0049ae4db7 100644 --- a/EmbeddedPkg/EmbeddedPkg.dsc +++ b/EmbeddedPkg/EmbeddedPkg.dsc @@ -269,9 +269,6 @@ EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf - # FDT installation - EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf - !ifndef NO_LINUX_LOADER EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf -- cgit v1.2.3