[Linaro-uefi,5/5] Platform/ARM/FVP: switch to generic BDS

Drop the USE_ARM_BDS define, and replace both the ARM and Intel BDSs with
the generic BDS.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc | 12 +++++++-----
 Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf |  7 ++-----
 Platforms/ARM/VExpress/ArmVExpress.dsc.inc         |  8 --------
 3 files changed, 9 insertions(+), 18 deletions(-)

On Tue, Oct 25, 2016 at 06:15:36PM +0100, Ard Biesheuvel wrote:
> Drop the USE_ARM_BDS define, and replace both the ARM and Intel BDSs with
> the generic BDS.
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Same as last one - I'd prefer non-screams from Ryan/Evan, but:
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

> ---
>  Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc | 12 +++++++-----
>  Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf |  7 ++-----
>  Platforms/ARM/VExpress/ArmVExpress.dsc.inc         |  8 --------
>  3 files changed, 9 insertions(+), 18 deletions(-)
> 
> diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc
> index d019b09f6456..cf4b803096f1 100644
> --- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc
> +++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc
> @@ -315,10 +315,12 @@
>    # Bds
>    #
>    MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
> -!if $(USE_ARM_BDS) == TRUE
> -  ArmPlatformPkg/Bds/Bds.inf
> -!else
>    MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
>    MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
> -  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
> -!endif
> +  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
> +  MdeModulePkg/Application/UiApp/UiApp.inf {
> +    <LibraryClasses>
> +      NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
> +      NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf
> +      NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
> +  }
> diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf
> index 74cc18fc012e..2ace4d8e04c3 100644
> --- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf
> +++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.fdf
> @@ -162,12 +162,10 @@ FvNameGuid         = 87940482-fc81-41c3-87e6-399cf85ac8a0
>    # Bds
>    #
>    INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
> -!if $(USE_ARM_BDS) == TRUE
> -  INF ArmPlatformPkg/Bds/Bds.inf
> -!else
>    INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
>    INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
> -  INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
> +  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
> +  INF MdeModulePkg/Application/UiApp/UiApp.inf
>  
>    #
>    # TianoCore logo (splash screen)
> @@ -175,7 +173,6 @@ FvNameGuid         = 87940482-fc81-41c3-87e6-399cf85ac8a0
>    FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
>     SECTION RAW = MdeModulePkg/Logo/Logo.bmp
>    }
> -!endif
>  
>    # FV Filesystem
>    INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf
> diff --git a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc
> index 99d97c8995ca..56f22a01f69b 100644
> --- a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc
> +++ b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc
> @@ -12,7 +12,6 @@
>  #
>  
>  [Defines]
> -  USE_ARM_BDS         = FALSE
>    SECURE_BOOT_ENABLE  = FALSE
>  
>  [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]
> @@ -119,7 +118,6 @@
>    SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf
>  
>    # BDS Libraries
> -  BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf
>    UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
>    PlatformBootManagerLib|ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
>  
> @@ -151,12 +149,8 @@
>  !endif
>    VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
>  
> -!if $(USE_ARM_BDS) == FALSE
>    CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
> -  GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
> -  PlatformBdsLib|ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf
>    CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
> -!endif
>  
>  [LibraryClasses.common.SEC]
>    ArmPlatformSecExtraActionLib|ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf
> @@ -432,10 +426,8 @@
>    # Shell.
>    gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
>  
> -!if $(USE_ARM_BDS) == FALSE
>    gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE
>    gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }
> -!endif
>  
>    # use the TTY terminal type (which has a working backspace)
>    gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4
> -- 
> 2.7.4
>