From: Ruiyu Ni Date: Wed, 6 May 2015 04:45:53 +0000 (+0000) Subject: Vlv2TbltDevicePkg: Use the new PCDs defined in MdePkg and MdeModulePkg. X-Git-Tag: edk2-stable201903~9926 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=58183d391c1efd4488a64412be28ab9bfd25a7db;hp=d43a0a557f4c910d984152e204b1313c58cac116 Vlv2TbltDevicePkg: Use the new PCDs defined in MdePkg and MdeModulePkg. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu Ni git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17326 6f19259b-4bc3-4df7-8a09-765794883524 --- diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf index 3c56159664..da268b2a54 100644 --- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf +++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf @@ -1,7 +1,7 @@ #/** @file # Component name for module PlatformBootManagerLib # -# Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2008 - 2015, Intel Corporation. All rights reserved.
# # This program and the accompanying materials are licensed and made available under # the terms and conditions of the BSD License that accompanies this distribution. @@ -104,7 +104,7 @@ gPlatformModuleTokenSpaceGuid.PcdFlashFvRecoveryBase gPlatformModuleTokenSpaceGuid.PcdFlashFvShellBase gPlatformModuleTokenSpaceGuid.PcdFlashFvShellSize - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut + gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile gPlatformModuleTokenSpaceGuid.PcdIFWISigBaseAddress @@ -113,8 +113,8 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupConOutColumn - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupConOutRow - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution + gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutColumn + gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutRow + gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution + gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index 54ddd0089c..29ac7c1b0b 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -1,7 +1,7 @@ #/** @file # Platform description. # -# Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2012 - 2015, Intel Corporation. All rights reserved.
# # This program and the accompanying materials are licensed and made available under # the terms and conditions of the BSD License that accompanies this distribution. @@ -802,8 +802,8 @@ ############################################################################################### [PcdsDynamicHii.common.DEFAULT] - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5 # Variable: L"Timeout" - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupport"|gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport" + gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5 # Variable: L"Timeout" + gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupport"|gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport" gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState|L"BootState"|gEfiBootStateGuid|0x0|TRUE [PcdsDynamicDefault.common.DEFAULT] @@ -827,13 +827,13 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|100 ## The PCD is used to specify the video horizontal resolution of text setup. - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|800 + gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|800 ## The PCD is used to specify the video vertical resolution of text setup. - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|600 + gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|600 ## The PCD is used to specify the console output column of text setup. - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupConOutColumn|100 + gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutColumn|100 ## The PCD is used to specify the console output column of text setup. - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupConOutRow|31 + gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutRow|31 !if $(TPM_ENABLED) == TRUE gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy|1 diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index 9ba5a69734..333b800e4e 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -1,7 +1,7 @@ #/** @file # Platform description. # -# Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2012 - 2015, Intel Corporation. All rights reserved.
# # This program and the accompanying materials are licensed and made available under # the terms and conditions of the BSD License that accompanies this distribution. @@ -801,8 +801,8 @@ ############################################################################################### [PcdsDynamicHii.common.DEFAULT] - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5 # Variable: L"Timeout" - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupport"|gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport" + gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5 # Variable: L"Timeout" + gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupport"|gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport" gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState|L"BootState"|gEfiBootStateGuid|0x0|TRUE [PcdsDynamicDefault.common.DEFAULT] @@ -828,13 +828,13 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|100 ## The PCD is used to specify the video horizontal resolution of text setup. - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|800 + gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|800 ## The PCD is used to specify the video vertical resolution of text setup. - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|600 + gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|600 ## The PCD is used to specify the console output column of text setup. - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupConOutColumn|100 + gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutColumn|100 ## The PCD is used to specify the console output column of text setup. - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupConOutRow|31 + gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutRow|31 !if $(TPM_ENABLED) == TRUE gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy|1 diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index 264b3b1ea4..f49195b4c0 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -1,7 +1,7 @@ #/** @file # Platform description. # -# Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2012 - 2015, Intel Corporation. All rights reserved.
# # This program and the accompanying materials are licensed and made available under # the terms and conditions of the BSD License that accompanies this distribution. @@ -801,8 +801,8 @@ ############################################################################################### [PcdsDynamicHii.common.DEFAULT] - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5 # Variable: L"Timeout" - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupport"|gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport" + gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5 # Variable: L"Timeout" + gEfiMdePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|L"HwErrRecSupport"|gEfiGlobalVariableGuid|0x0|1 # Variable: L"HwErrRecSupport" gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState|L"BootState"|gEfiBootStateGuid|0x0|TRUE [PcdsDynamicDefault.common.DEFAULT] @@ -828,13 +828,13 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|100 ## The PCD is used to specify the video horizontal resolution of text setup. - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|800 + gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|800 ## The PCD is used to specify the video vertical resolution of text setup. - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|600 + gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|600 ## The PCD is used to specify the console output column of text setup. - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupConOutColumn|100 + gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutColumn|100 ## The PCD is used to specify the console output column of text setup. - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupConOutRow|31 + gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutRow|31 !if $(TPM_ENABLED) == TRUE gEfiSecurityPkgTokenSpaceGuid.PcdTpmInitializationPolicy|1