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

6 files changed, 5 insertions, 11 deletions

diff --git a/ArmPlatformPkg/ArmPlatformPkg.dec b/ArmPlatformPkg/ArmPlatformPkg.dec
index 58328345bd..4100b15e51 100644
--- a/ArmPlatformPkg/ArmPlatformPkg.dec
+++ b/ArmPlatformPkg/ArmPlatformPkg.dec
@@ -140,10 +140,6 @@
   #  - 2 = a Linux kernel with FDT support

   gArmPlatformTokenSpaceGuid.PcdDefaultBootType|0|UINT32|0x00000010

 

-  ## Timeout value for displaying progressing bar in before boot OS.

-  #  According to UEFI 2.0 spec, the default TimeOut should be 0xffff.

-  gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut|0xffff|UINT16|0x0000001A

-

   gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L""|VOID*|0x0000001B

   gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L""|VOID*|0x0000001C

 

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc
index 1715bc9914..9f5b384c85 100644
--- 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)

   gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi();VenHw(407B4008-BF5B-11DF-9547-CF16E0D72085)"

   gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()"

-  gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut|10

+  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10

 

 [Components.common]

   #

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
index 1d56576c47..00dfbec74f 100644
--- 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)

   gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi();VenHw(CE660500-824D-11E0-AC72-0002A5D5C51B)"

   gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(38400,8,N,1)/VenPcAnsi()"

-  gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut|10

+  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10

 

   # RunAxf support via Dynamic Shell Command protocol

   # We want to use the Shell Libraries but don't want it to initialise

diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc
index 69bf34e29a..4ce27f9119 100644
--- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc
+++ b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc
@@ -139,7 +139,7 @@
   #

   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()"

-  gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut|3

+  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3

 

   #

   # ARM Virtual Architectural Timer -- fetch frequency from QEMU (TCG) or KVM

@@ -210,8 +210,6 @@
   gArmVirtualizationTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0

   gArmVirtualizationTokenSpaceGuid.PcdFwCfgDataAddress|0x0

 

-  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3

-

   #

   # Set video resolution for boot options and for text setup.

   # PlatformDxe can set the former at runtime.

diff --git a/ArmPlatformPkg/Bds/Bds.inf b/ArmPlatformPkg/Bds/Bds.inf
index d49b0efdcb..e04c86db17 100644
--- a/ArmPlatformPkg/Bds/Bds.inf
+++ b/ArmPlatformPkg/Bds/Bds.inf
@@ -73,7 +73,7 @@
   gArmPlatformTokenSpaceGuid.PcdDefaultBootInitrdPath

   gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument

   gArmPlatformTokenSpaceGuid.PcdDefaultBootType

-  gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut

+  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut

   gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths

   gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths

 

diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
index d07caeb1b5..9eb364edd6 100644
--- 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"

   gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument|"console=tty0 console=ttyS2,115200n8 root=UUID=a4af765b-c2b5-48f4-9564-7a4e9104c4f6 rootwait ro earlyprintk"

   gArmPlatformTokenSpaceGuid.PcdDefaultBootType|1

-  gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut|10

+  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10

 

   gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi();VenHw(E68088EF-D1A4-4336-C1DB-4D3A204730A6)"

   gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths|L"VenHw(D3987D4B-971A-435F-8CAF-4967EB627241)/Uart(115200,8,N,1)/VenPcAnsi()"