On Tue, Sep 01, 2015 at 11:58:23AM +0200, Ard Biesheuvel wrote:
> This adds support for the Intel BDS, by introducing a define
> 'USE_ARM_BDS' which defaults to TRUE, and can be overridden on
> the build command line.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
> Reviewed-by: Ryan Harkin <ryan.har...@linaro.org>
> ---
> ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc | 6 ++++++
> ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf | 13 +++++++++++++
> ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc | 15
> +++++++++++++++
> 3 files changed, 34 insertions(+)
>
> diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
> b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
> index 3f363064b23f..159194c8c731 100644
> --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
> +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
> @@ -305,4 +305,10 @@ [Components.common]
> # 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
> diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
> b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
> index 1d92d6f34832..2ab99e98c238 100644
> --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
> +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.fdf
> @@ -197,7 +197,20 @@ [FV.FvMain]
> # 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
> +
> + #
> + # TianoCore logo (splash screen)
> + #
> + FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile)
> {
> + SECTION RAW = MdeModulePkg/Logo/Logo.bmp
> + }
> +!endif
>
> # Legacy Linux Loader
> INF ArmPkg/Application/LinuxLoader/LinuxLoader.inf
> diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
> b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
> index dc69bbbf747c..03f8c2cd2160 100644
> --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
> +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
> @@ -12,6 +12,9 @@
> #
> #
>
> +[Defines]
> + USE_ARM_BDS = FALSE
> +
> [BuildOptions.AARCH64.EDKII.DXE_RUNTIME_DRIVER]
> GCC:*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x10000
>
> @@ -132,6 +135,13 @@ [LibraryClasses.common]
>
> AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
> 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
>
> ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Sec/SecArmPlatformGlobalVariableLib.inf
> @@ -398,6 +408,11 @@ [PcdsFixedAtBuild.common]
> # 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
> +
> [Components.common]
> MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
>
> --
> 1.9.1
>
With the TRUE/FALSE message fix:
Reviewed-by: Leif Lindholm <leif.lindh...@linaro.org>
Tested-by: Leif Lindholm <leif.lindh...@linaro.org>
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
