From ada17bc975be79620c126ae9a856e45c866f5701 Mon Sep 17 00:00:00 2001 From: Alexei Fedorov Date: Mon, 30 Apr 2018 17:29:05 +0100 Subject: Platform/ARM: Map Platform Boot Timeout PCD to global NV variable Table 13 of UEFI Specification 2.7A describes Timeout global variable as NV (non-volatile), however gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut is defined in [PcdsFixedAtBuild.common] section of Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc. This prevents the timeout value from being persistent across resets and power cycles, see BdsEntry() code in MdeModulePkg/Universal/BdsDxe/BdsEntry.c: // // Initialize L"Timeout" EFI global variable. // BootTimeOut = PcdGet16 (PcdPlatformBootTimeOut); This patch fixes the above issue by mapping PcdPlatformBootTimeOut to global NV variable "Timeout" as a PcdsDynamicHii PCD. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Alexei Fedorov Reviewed-by: Evan Lloyd Reviewed-by: Ard Biesheuvel --- Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc index 7cb4793732..de201b0c81 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -1,5 +1,5 @@ # -# Copyright (c) 2011-2015, ARM Limited. All rights reserved. +# Copyright (c) 2011-2018, ARM Limited. All rights reserved. # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -353,8 +353,6 @@ # List of Device Paths that support BootMonFs gArmBootMonFsTokenSpaceGuid.PcdBootMonFsSupportedDevicePaths|L"VenHw(E7223039-5836-41E1-B542-D7EC736C5E59);VenHw(1F15DA3C-37FF-4070-B471-BB4AF12A724A)" - gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10 - # RunAxf support via Dynamic Shell Command protocol # We want to use the Shell Libraries but don't want it to initialise # automatically. We initialise the libraries when the command is called by the @@ -399,6 +397,9 @@ # gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|TRUE +[PcdsDynamicHii.common.DEFAULT] + gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|10 + [Components.common] MdeModulePkg/Universal/PCD/Dxe/Pcd.inf { -- cgit v1.2.3