Revision: 17443 http://sourceforge.net/p/edk2/code/17443 Author: oliviermartin Date: 2015-05-13 18:25:47 +0000 (Wed, 13 May 2015) Log Message: ----------- ArmPlaformPkg: Replaced gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut
... since gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut has recently been introduced. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin <olivier.mar...@arm.com> Reviewed-by: Ronald Cron <ronald.c...@arm.com> Modified Paths: -------------- trunk/edk2/ArmPlatformPkg/ArmPlatformPkg.dec trunk/edk2/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc trunk/edk2/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc trunk/edk2/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc trunk/edk2/ArmPlatformPkg/Bds/Bds.inf trunk/edk2/BeagleBoardPkg/BeagleBoardPkg.dsc Modified: trunk/edk2/ArmPlatformPkg/ArmPlatformPkg.dec =================================================================== --- trunk/edk2/ArmPlatformPkg/ArmPlatformPkg.dec 2015-05-13 18:24:45 UTC (rev 17442) +++ trunk/edk2/ArmPlatformPkg/ArmPlatformPkg.dec 2015-05-13 18:25:47 UTC (rev 17443) @@ -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 Modified: trunk/edk2/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc =================================================================== --- trunk/edk2/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc 2015-05-13 18:24:45 UTC (rev 17442) +++ trunk/edk2/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc 2015-05-13 18:25:47 UTC (rev 17443) @@ -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] # Modified: trunk/edk2/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc =================================================================== --- trunk/edk2/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc 2015-05-13 18:24:45 UTC (rev 17442) +++ trunk/edk2/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc 2015-05-13 18:25:47 UTC (rev 17443) @@ -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 Modified: trunk/edk2/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc =================================================================== --- trunk/edk2/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc 2015-05-13 18:24:45 UTC (rev 17442) +++ trunk/edk2/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc 2015-05-13 18:25:47 UTC (rev 17443) @@ -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. Modified: trunk/edk2/ArmPlatformPkg/Bds/Bds.inf =================================================================== --- trunk/edk2/ArmPlatformPkg/Bds/Bds.inf 2015-05-13 18:24:45 UTC (rev 17442) +++ trunk/edk2/ArmPlatformPkg/Bds/Bds.inf 2015-05-13 18:25:47 UTC (rev 17443) @@ -73,7 +73,7 @@ gArmPlatformTokenSpaceGuid.PcdDefaultBootInitrdPath gArmPlatformTokenSpaceGuid.PcdDefaultBootArgument gArmPlatformTokenSpaceGuid.PcdDefaultBootType - gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut + gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut gArmPlatformTokenSpaceGuid.PcdDefaultConInPaths gArmPlatformTokenSpaceGuid.PcdDefaultConOutPaths Modified: trunk/edk2/BeagleBoardPkg/BeagleBoardPkg.dsc =================================================================== --- trunk/edk2/BeagleBoardPkg/BeagleBoardPkg.dsc 2015-05-13 18:24:45 UTC (rev 17442) +++ trunk/edk2/BeagleBoardPkg/BeagleBoardPkg.dsc 2015-05-13 18:25:47 UTC (rev 17443) @@ -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()" ------------------------------------------------------------------------------ One dashboard for servers and applications across Physical-Virtual-Cloud Widest out-of-the-box monitoring support with 50+ applications Performance metrics, stats and reports that give you Actionable Insights Deep dive visibility with transaction tracing using APM Insight. http://ad.doubleclick.net/ddm/clk/290420510;117567292;y _______________________________________________ edk2-commits mailing list edk2-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/edk2-commits