On 07/08/15 21:02, Roy Franz wrote:
> Enable selecting the TtyTerminal type for the ARM BDS build of QEMU using
> the TTY_TERMINAL define.
> Convert INTEL_BDS define to check for value (!if) rather than just definition
> (!ifdef) to allow setting of either value on command line.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Roy Franz <roy.fr...@linaro.org>
> ---
> ArmVirtPkg/ArmVirtQemu.dsc | 11 ++++++++---
> ArmVirtPkg/ArmVirtQemu.fdf | 4 ++--
> 2 files changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
> index 0671469..fbc2b12 100644
> --- a/ArmVirtPkg/ArmVirtQemu.dsc
> +++ b/ArmVirtPkg/ArmVirtQemu.dsc
> @@ -57,7 +57,7 @@
> TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
> NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf
>
> -!ifdef INTEL_BDS
> +!if $(INTEL_BDS) == TRUE
> CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
>
> GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
>
> PlatformBdsLib|ArmVirtPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf
> @@ -138,8 +138,13 @@
> #
> # Settings for ARM BDS -- use the serial console (ConIn & ConOut).
> #
> +!if $(TTY_TERMINAL) == TRUE
> +
> gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenMsg(7D916D80-5BB1-458C-A48F-E25FDD51EF94)"
> +
> gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenMsg(7D916D80-5BB1-458C-A48F-E25FDD51EF94)"
> +!else
>
> gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenVt100()"
>
> gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenVt100()"
> +!endif
> gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3
>
> #
> @@ -163,7 +168,7 @@
> # initial location of the device tree blob passed by QEMU -- base of DRAM
> gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x40000000
>
> -!ifdef INTEL_BDS
> +!if $(INTEL_BDS) == TRUE
> gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE
> gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04,
> 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }
> !endif
> @@ -313,7 +318,7 @@
> # Bds
> #
> MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
> -!ifdef INTEL_BDS
> +!if $(INTEL_BDS) == TRUE
> MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
> MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
> IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
> diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf
> index e822fdf..30556f5 100644
> --- a/ArmVirtPkg/ArmVirtQemu.fdf
> +++ b/ArmVirtPkg/ArmVirtQemu.fdf
> @@ -169,7 +169,7 @@ READ_LOCK_STATUS = TRUE
> # Bds
> #
> INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
> -!ifdef INTEL_BDS
> +!if $(INTEL_BDS) == TRUE
> INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
> INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
> INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
> @@ -227,7 +227,7 @@ READ_LOCK_STATUS = TRUE
> INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
> INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
>
> -!ifdef INTEL_BDS
> +!if $(INTEL_BDS) == TRUE
> #
> # TianoCore logo (splash screen)
> #
>
The INTEL_BDS conditional conversion should have been a separate patch,
but I won't risk you throwing a keyboard at me, should we ever meet in
person, so I won't insist ;)
Reviewed-by: Laszlo Ersek <ler...@redhat.com>
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-devel
