From ee49dbfcbb66699685fb4ce393b3f34bafa42eb3 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Mon, 20 Nov 2017 10:55:03 +0000 Subject: Platform/ARM/Juno: move to migrated FdtPlatformDxe Move Juno to the migrated version of FdtPlatformDxe. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- Platform/ARM/JunoPkg/ArmJuno.dsc | 6 +++--- Platform/ARM/JunoPkg/ArmJuno.fdf | 2 +- Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf | 3 ++- Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 5 +---- 4 files changed, 7 insertions(+), 9 deletions(-) (limited to 'Platform') diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc index 58bbc6ed9f..1156091802 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.dsc +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc @@ -202,7 +202,7 @@ # character "empty" string, to allow to be able to set FDT text device paths # up to 128 characters long. # - gEmbeddedTokenSpaceGuid.PcdFdtDevicePaths|L" " + gFdtPlatformDxeTokenSpaceGuid.PcdFdtDevicePaths|L" " # Not all Juno platforms support PCI. This dynamic PCD disables or enable # PCI support. @@ -354,9 +354,9 @@ # # FDT installation # - EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf { + Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf { - BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf + BdsLib|Platform/ARM/Library/BdsLib/BdsLib.inf } [Components.AARCH64] diff --git a/Platform/ARM/JunoPkg/ArmJuno.fdf b/Platform/ARM/JunoPkg/ArmJuno.fdf index bb78e1fa85..52586135b5 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.fdf +++ b/Platform/ARM/JunoPkg/ArmJuno.fdf @@ -230,7 +230,7 @@ FvNameGuid = B73FE497-B92E-416e-8326-45AD0D270092 # # 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 + INF Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf !if $(ARCH) == AARCH64 # diff --git a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf index b215a3bc88..0e53a49ee2 100644 --- a/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf +++ b/Platform/ARM/JunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf @@ -28,6 +28,7 @@ EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec + Platform/ARM/Drivers/FdtPlatformDxe/FdtPlatformDxe.dec Platform/ARM/JunoPkg/ArmJuno.dec [LibraryClasses] @@ -80,7 +81,7 @@ gArmTokenSpaceGuid.PcdPciBusMax [Pcd] - gEmbeddedTokenSpaceGuid.PcdFdtDevicePaths + gFdtPlatformDxeTokenSpaceGuid.PcdFdtDevicePaths gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration [Depex] diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc index 97433a8c0e..d4c38747b3 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -457,10 +457,7 @@ # # Android Fastboot # - EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf { - - BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf - } + EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf -- cgit v1.2.3