Nt32Pkg/Nt32Pkg.dsc: Remove EdkCompatibilityPkg information

[mirror_edk2.git] / MdePkg / MdePkg.uni

diff --git a/MdePkg/MdePkg.uni b/MdePkg/MdePkg.uni
index 18bb01f2199b43491c75af8af245706d89c4eb1b..f5a8ed1618f989a3befd1babf44741d94be00732 100644 (file)
--- a/MdePkg/MdePkg.uni
+++ b/MdePkg/MdePkg.uni
@@ -4,14 +4,14 @@
 // It also provides the definitions(including PPIs/PROTOCOLs/GUIDs) of\r
 // EFI1.10/UEFI2.4/PI1.3 and some Industry Standards.\r
 //\r
-// Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
 // Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
 //\r
 // This program and the accompanying materials are licensed and made available under\r
 // the terms and conditions of the BSD License which accompanies this distribution.\r
 // The full text of the license may be found at\r
 // http://opensource.org/licenses/bsd-license.php\r
-// \r
+//\r
 // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 //\r
@@ -148,6 +148,13 @@
                                                                                          "0  - No length check for unicode string.<BR>\n"\r
                                                                                          ">0 - Maximum length of unicode string.<BR>"\r
 \r
+#string STR_gEfiMdePkgTokenSpaceGuid_PcdControlFlowEnforcementPropertyMask_PROMPT  #language en-US "Enable control flow enforcement."\r
+\r
+#string STR_gEfiMdePkgTokenSpaceGuid_PcdControlFlowEnforcementPropertyMask_HELP  #language en-US  "Indicates the control flow enforcement enabling state.\n"\r
+                                                                                                  "If enabled, it uses control flow enforcement technology to prevent ROP or JOP.<BR><BR>\n"\r
+                                                                                                  " BIT0 - SMM CET Shadow Stack is enabled.<BR>\n"\r
+                                                                                                  " Other - reserved"\r
+\r
 #string STR_gEfiMdePkgTokenSpaceGuid_PcdMaximumAsciiStringLength_PROMPT  #language en-US "Maximum Length of Ascii String"\r
 \r
 #string STR_gEfiMdePkgTokenSpaceGuid_PcdMaximumAsciiStringLength_HELP  #language en-US "Sets the maximum number of ASCII characters used for string functions.  This affects the following BaseLib functions: AsciiStrLen(), AsciiStrSize(), AsciiStrCmp(), AsciiStrnCmp(), AsciiStrCpy(), AsciiStrnCpy(). <BR><BR>\n"\r
@@ -334,10 +341,6 @@
                                                                                   "2 - VT100+<BR>\n"\r
                                                                                   "3 - UTF8<BR>"\r
 \r
-#string STR_gEfiMdePkgTokenSpaceGuid_PcdIoBlockBaseAddressForIpf_PROMPT  #language en-US "IA64 IO Port Space Base Address."\r
-\r
-#string STR_gEfiMdePkgTokenSpaceGuid_PcdIoBlockBaseAddressForIpf_HELP  #language en-US "The base address of IO port space for IA64 arch."\r
-\r
 #string STR_gEfiMdePkgTokenSpaceGuid_PcdComponentNameDisable_PROMPT  #language en-US "Disable Component Name Protocol"\r
 \r
 #string STR_gEfiMdePkgTokenSpaceGuid_PcdComponentNameDisable_HELP  #language en-US "Indicates if the component name protocol will be installed.<BR><BR>\n"\r