ArmPlaformPkg: Replaced gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut

... since gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut has recently
been introduced.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
Reviewed-by: Ronald Cron <Ronald.Cron@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17443 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/ArmPlatformPkg.dec b/ArmPlatformPkg/ArmPlatformPkg.dec
index 58328345bd06295ae98c464d419d1c426ce9b909..4100b15e516c8568af9cc1ccd0b8a0b7edce35ac 100644 (file)
--- a/ArmPlatformPkg/ArmPlatformPkg.dec
+++ b/ArmPlatformPkg/ArmPlatformPkg.dec
@@ -140,10 +140,6 @@
   #  - 2 = a Linux kernel with FDT support\r
   gArmPlatformTokenSpaceGuid.PcdDefaultBootType|0|UINT32|0x00000010\r
 \r
-  ## Timeout value for displaying progressing bar in before boot OS.\r
-  #  According to UEFI 2.0 spec, the default TimeOut should be 0xffff.\r
-  gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut|0xffff|UINT16|0x0000001A\r
-\r
   gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L""|VOID*|0x0000001B\r
   gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L""|VOID*|0x0000001C\r
 \r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc
index 1715bc99149c2fc8b1452f070974b32bfadda04e..9f5b384c85bd60accaac4a2b54f3891ff9293958 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc
@@ -310,7 +310,7 @@
   # Use the Serial console (ConIn & ConOut) and the Graphic driver (ConOut)\r
   gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi();VenHw(407B4008-BF5B-11DF-9547-CF16E0D72085)"\r
   gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()"\r
-  gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut|10\r
+  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10\r
 \r
 [Components.common]\r
   #\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
index 1d56576c47f03ceb890447ae76095fa6e56714aa..00dfbec74fb12183e3db8f5a908c49ea7dc81bd6 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
@@ -381,7 +381,7 @@
   # Use the serial console (ConIn & ConOut) and the Graphic driver (ConOut)\r
   gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi();VenHw(CE660500-824D-11E0-AC72-0002A5D5C51B)"\r
   gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi()"\r
-  gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut|10\r
+  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10\r
 \r
   # RunAxf support via Dynamic Shell Command protocol\r
   # We want to use the Shell Libraries but don't want it to initialise\r

diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc
index 69bf34e29a38391c16bf2bd09c13e26f42a3564e..4ce27f911903512021af425224801d47c1800cd1 100644 (file)
--- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc
+++ b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc
@@ -139,7 +139,7 @@
   #\r
   gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenVt100()"\r
   gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenVt100()"\r
-  gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut|3\r
+  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3\r
 \r
   #\r
   # ARM Virtual Architectural Timer -- fetch frequency from QEMU (TCG) or KVM\r
@@ -210,8 +210,6 @@
   gArmVirtualizationTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0\r
   gArmVirtualizationTokenSpaceGuid.PcdFwCfgDataAddress|0x0\r
 \r
-  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3\r
-\r
   #\r
   # Set video resolution for boot options and for text setup.\r
   # PlatformDxe can set the former at runtime.\r

diff --git a/ArmPlatformPkg/Bds/Bds.inf b/ArmPlatformPkg/Bds/Bds.inf
index d49b0efdcba5ed88e1a6ff473d25d37b34085a8a..e04c86db1774d3015066ada979d9363f6ed3ac7b 100644 (file)
--- a/ArmPlatformPkg/Bds/Bds.inf
+++ b/ArmPlatformPkg/Bds/Bds.inf
@@ -73,7 +73,7 @@
   gArmPlatformTokenSpaceGuid.PcdDefaultBootInitrdPath\r
   gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument\r
   gArmPlatformTokenSpaceGuid.PcdDefaultBootType\r
-  gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut\r
+  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut\r
   gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths\r
   gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths\r
 \r

diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
index d07caeb1b5ee6cacb55abc2033d86811ae1bc3f1..9eb364edd65926276a882b5bd917da33b737a42e 100644 (file)
--- a/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -354,7 +354,7 @@
   gArmPlatformTokenSpaceGuid.PcdDefaultBootDevicePath|L"VenHw(B615F1F5-5088-43CD-809C-A16E52487D00)/HD(1,MBR,0x00000000,0x3F,0x19FC0)/zImage"\r
   gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|"console=tty0 console=ttyS2,115200n8 root=UUID=a4af765b-c2b5-48f4-9564-7a4e9104c4f6 rootwait ro earlyprintk"\r
   gArmPlatformTokenSpaceGuid.PcdDefaultBootType|1\r
-  gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut|10\r
+  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10\r
 \r
   gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi();VenHw(E68088EF-D1A4-4336-C1DB-4D3A204730A6)"\r
   gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()"\r