UefiCpuPkg/MtrrLib: Add MtrrSetMemoryAttributeInMtrrSettings()

[mirror_edk2.git] / IntelFrameworkModulePkg / IntelFrameworkModulePkg.dec

diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
index 2baee1a93e0fc8ee26e302fe9ecf80b0585805da..8bbde8e2c9c8ae00e36be603e5019dade709d37c 100644 (file)
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
@@ -4,7 +4,7 @@
 # This package contains the definitions and module implementation\r
 # which follows Intel EFI Framework Specification.\r
 #\r
-# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
@@ -21,7 +21,7 @@
   PACKAGE_NAME                   = IntelFrameworkModulePkg\r
   PACKAGE_UNI_FILE               = IntelFrameworkModulePkg.uni\r
   PACKAGE_GUID                   = 88894582-7553-4822-B484-624E24B6DECF\r
-  PACKAGE_VERSION                = 0.93\r
+  PACKAGE_VERSION                = 0.96\r
 \r
 [Includes]\r
   Include                        # Root include for the package\r
@@ -46,11 +46,6 @@
   #  Include/Guid/TianoDecompress.h\r
   gTianoCustomDecompressGuid     = { 0xA31280AD, 0x481E, 0x41B6, { 0x95, 0xE8, 0x12, 0x7F, 0x4C, 0x98, 0x47, 0x79 }}\r
 \r
-  ## GUID indicates the LZMA custom compress/decompress algorithm.\r
-  #  Include/Guid/LzmaDecompress.h\r
-  gLzmaCustomDecompressGuid      = { 0xEE4E5898, 0x3914, 0x4259, { 0x9D, 0x6E, 0xDC, 0x7B, 0xD7, 0x94, 0x03, 0xCF }}\r
-  gLzmaF86CustomDecompressGuid     = { 0xD42AE6BD, 0x1352, 0x4bfb, { 0x90, 0x9A, 0xCA, 0x72, 0xA6, 0xEA, 0xE8, 0x89 }}\r
-\r
   ## Include/Guid/AcpiVariable.h\r
   gEfiAcpiVariableCompatiblityGuid   = { 0xc020489e, 0x6db2, 0x4ef2, { 0x9a, 0xa5, 0xca, 0x6,  0xfc, 0x11, 0xd3, 0x6a }}\r
 \r
@@ -193,41 +188,6 @@
   # @Prompt Boot State Flag\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState|TRUE|BOOLEAN|0x0001002f\r
 \r
-  ## The number of seconds that the firmware will wait before initiating the original default boot selection. \r
-  #  A value of 0 indicates that the default boot selection is to be initiated immediately on boot. \r
-  #  The value of 0xFFFF then firmware will wait for user input before booting.\r
-  # @Prompt Boot Timeout (s)\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut|0xffff|UINT16|0x40000001\r
-\r
-  ## Error level for hardware recorder. \r
-  #  If value 0, platform does not support feature of hardware error record.\r
-  # @Prompt Error Level For Hardware Recorder\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdHardwareErrorRecordLevel|0|UINT16|0x40000002\r
-\r
-[PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]\r
-  #  The 4 PCDs below are used to specify the video resolution and text mode of text setup.\r
-  #  To make text setup work in this resolution, PcdVideoHorizontalResolution, PcdVideoVerticalResolution,\r
-  #  PcdConOutColumn and PcdConOutRow in MdeModulePkg.dec should be created as PcdsDynamic or PcdsDynamicEx\r
-  #  in platform DSC file. Then BDS setup will update these PCDs defined in MdeModulePkg.dec and reconnect\r
-  #  console drivers (GraphicsConsole, Terminal, Consplitter) to make the video resolution and text mode work\r
-  #  for text setup.\r
-\r
-  ## Specify the video horizontal resolution of text setup.\r
-  # @Prompt Video Horizontal Resolution of Text Setup\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|800|UINT32|0x50000001\r
-  \r
-  ## Specify the video vertical resolution of text setup.\r
-  # @Prompt Video Vertical Resolution of Text Setup\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|600|UINT32|0x50000002\r
-\r
-  ## Specify the console output column of text setup.\r
-  # @Prompt Console Output Column of Text Setup\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupConOutColumn|80|UINT32|0x50000003\r
-  \r
-  ## Specify the console output row of text setup.\r
-  # @Prompt Console Output Row of Text Setup\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdSetupConOutRow|25|UINT32|0x50000004\r
-\r
 [PcdsFixedAtBuild, PcdsDynamic, PcdsDynamicEx, PcdsPatchableInModule]\r
   ## I/O Base address of floppy device controller.\r
   # @Prompt I/O Base Address of Floppy Device Controller\r
@@ -271,11 +231,15 @@
   # The value should be a multiple of 4KB.\r
   # The range should be below the EBDA reserved range from \r
   # (CONVENTIONAL_MEMORY_TOP - Reserved EBDA Memory Size) to CONVENTIONAL_MEMORY_TOP.\r
+  # @Prompt Reserved Memory Base Address for OPROM\r
+  # @Expression 0x80000001 | (gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemoryBase >= 0x20000) AND ((gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemoryBase & 0x1000) == 0)\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemoryBase|0x60000|UINT32|0x3000000c\r
   \r
   ## Specify memory size with bytes for OPROM to find free memory.\r
   #  The value should be a multiple of 4KB. And the range should be below the EBDA reserved range from \r
   # (CONVENTIONAL_MEMORY_TOP - Reserved EBDA Memory Size) to CONVENTIONAL_MEMORY_TOP.\r
+  # @Prompt Reserved Memory Size for OPROM\r
+  # @Expression 0x80000001 | (gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemorySize < 0x80000) AND ((gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemorySize & 0x1000) == 0)\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdOpromReservedMemorySize|0x28000|UINT32|0x3000000d\r
 \r
   ## Specify memory size with page number for a pre-allocated reserved memory to be used\r