SMBIOS / SLP2.0 / IDE Mode / BIOS Name / Legacy Security String

6 files changed, 26 insertions, 26 deletions

diff --git a/Board/EM/AAEONSecurity/AAEONSecurity.sdl b/Board/EM/AAEONSecurity/AAEONSecurity.sdl
index bf52f4c..b557745 100644
--- a/Board/EM/AAEONSecurity/AAEONSecurity.sdl
+++ b/Board/EM/AAEONSecurity/AAEONSecurity.sdl
@@ -35,7 +35,7 @@ End
 
 TOKEN
 	Name  = "SIGNATURE_ADDRESS2"
-	Value  = "0xFF5F5"
+	Value  = "0xFF5EF"
 	TokenType = Integer
 	TargetMAK = Yes
 	TargetH = Yes
diff --git a/Board/EM/Platform/AcpiPlatform.c b/Board/EM/Platform/AcpiPlatform.c
index 19b8d21..c0c9bfa 100644
--- a/Board/EM/Platform/AcpiPlatform.c
+++ b/Board/EM/Platform/AcpiPlatform.c
@@ -1204,9 +1204,9 @@ VOID LoadDbgpTable()
     EFI_STATUS                      Status = EFI_SUCCESS;
     EFI_ACPI_DEBUG_PORT_DESCRIPTION_TABLE   *DBGP;
     EFI_ACPI_SUPPORT_PROTOCOL       *As;
-    UINT8                           OemId[6] = CONVERT_TO_STRING(T_ACPI_OEM_ID);
+    UINT8                           OemId[6] = T_ACPI_OEM_ID ;//CONVERT_TO_STRING(T_ACPI_OEM_ID);
     UINT8                           OemTblId[8] = \
-                                            CONVERT_TO_STRING(T_ACPI_OEM_TBL_ID);
+                                            T_ACPI_OEM_TBL_ID ;//CONVERT_TO_STRING(T_ACPI_OEM_TBL_ID);
     UINTN                           mDbgpTblHandle;
 
 
diff --git a/Board/EM/RapidStartWrapper/RapidStartSetup/RapidStartSetup.sd b/Board/EM/RapidStartWrapper/RapidStartSetup/RapidStartSetup.sd
index 8726d65..47120ac 100644
--- a/Board/EM/RapidStartWrapper/RapidStartSetup/RapidStartSetup.sd
+++ b/Board/EM/RapidStartWrapper/RapidStartSetup/RapidStartSetup.sd
@@ -233,9 +233,9 @@
     oneof varid    = SETUP_DATA.SataInterfaceMode,\
       prompt       = STRING_TOKEN (STR_SATA_MODE_SELECTION_PROMPT),\
       help         = STRING_TOKEN (STR_SATA_MODE_SELECTION_HELP),\
-      option text  = STRING_TOKEN (STR_SATA_IDE), value = SATA_MODE_IDE, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED | INTERACTIVE, key = AUTO_ID(KEY_IDE);\
-      option text  = STRING_TOKEN (STR_SATA_AHCI), value = SATA_MODE_AHCI, flags = RESET_REQUIRED, key = AUTO_ID(KEY_AHCI);\
-      option text  = STRING_TOKEN (STR_SATA_RAID), value = SATA_MODE_RAID, flags = RESET_REQUIRED, key = AUTO_ID(KEY_RAID);\
+      option text  = STRING_TOKEN (STR_SATA_IDE), value = SATA_MODE_IDE, flags = RESET_REQUIRED | INTERACTIVE, key = AUTO_ID(KEY_IDE);\
+      option text  = STRING_TOKEN (STR_SATA_AHCI), value = SATA_MODE_AHCI, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED | INTERACTIVE, key = AUTO_ID(KEY_AHCI);\
+      option text  = STRING_TOKEN (STR_SATA_RAID), value = SATA_MODE_RAID, flags = RESET_REQUIRED | INTERACTIVE, key = AUTO_ID(KEY_RAID);\
     endoneof;\
   SUPPRESS_GRAYOUT_ENDIF
 #endif
diff --git a/Board/EM/Setup/Setup.c b/Board/EM/Setup/Setup.c
index 5900319..03f077b 100644
--- a/Board/EM/Setup/Setup.c
+++ b/Board/EM/Setup/Setup.c
@@ -560,24 +560,24 @@ VOID InitMain(EFI_HII_HANDLE HiiHandle)
         *(UINT16*)&pST->FirmwareRevision % 100 / 10,
         *(UINT16*)&pST->FirmwareRevision % 10
     );
-    InitString(
-        HiiHandle,STRING_TOKEN(STR_BIOS_VERSION_VALUE),
-#if PROJECT_BUILD_NUMBER_IN_TITLE_SUPPORTED && defined (PROJECT_BUILD)
-#ifdef EFIx64
-        L"%s %d.%02d.%03d x64",
-#else
-        L"%s %d.%02d.%03d",
-#endif
-        STR(PROJECT_TAG), PROJECT_MAJOR_VERSION, PROJECT_MINOR_VERSION, PROJECT_BUILD
-#else //#if PROJECT_BUILD_NUMBER_IN_TITLE_SUPPORTED && defined (PROJECT_BUILD)
-#ifdef EFIx64
-        L"%s %d.%02d x64",
-#else
-        L"%s %d.%02d",
-#endif
-        STR(PROJECT_TAG), PROJECT_MAJOR_VERSION, PROJECT_MINOR_VERSION
-#endif//#if PROJECT_BUILD_NUMBER_IN_TITLE_SUPPORTED && defined (PROJECT_BUILD)
-    );
+//    InitString(
+//        HiiHandle,STRING_TOKEN(STR_BIOS_VERSION_VALUE),
+//#if PROJECT_BUILD_NUMBER_IN_TITLE_SUPPORTED && defined (PROJECT_BUILD)
+//#ifdef EFIx64
+//        L"%s %d.%02d.%03d x64",
+//#else
+//        L"%s %d.%02d.%03d",
+//#endif
+//        STR(PROJECT_TAG), PROJECT_MAJOR_VERSION, PROJECT_MINOR_VERSION, PROJECT_BUILD
+//#else //#if PROJECT_BUILD_NUMBER_IN_TITLE_SUPPORTED && defined (PROJECT_BUILD)
+//#ifdef EFIx64
+//        L"%s %d.%02d x64",
+//#else
+//        L"%s %d.%02d",
+//#endif
+//        STR(PROJECT_TAG), PROJECT_MAJOR_VERSION, PROJECT_MINOR_VERSION
+//#endif//#if PROJECT_BUILD_NUMBER_IN_TITLE_SUPPORTED && defined (PROJECT_BUILD)
+//    );
     InitString(
         HiiHandle,STRING_TOKEN(STR_BIOS_DATE_VALUE),
         L"%s %s", L_TODAY, L_NOW
diff --git a/Board/EM/Setup/Setup.uni b/Board/EM/Setup/Setup.uni
index d6d5d35..2d6a67b 100644
--- a/Board/EM/Setup/Setup.uni
+++ b/Board/EM/Setup/Setup.uni
diff --git a/Board/SB/SBSetup/SB.sd b/Board/SB/SBSetup/SB.sd
index a8a2b07..d944b68 100644
--- a/Board/SB/SBSetup/SB.sd
+++ b/Board/SB/SBSetup/SB.sd
@@ -4161,8 +4161,8 @@
   oneof varid    = SETUP_DATA.SataInterfaceMode,\
     prompt       = STRING_TOKEN (STR_SATA_MODE_SELECTION_PROMPT),\
     help         = STRING_TOKEN (STR_SATA_MODE_SELECTION_HELP),\
-    option text  = STRING_TOKEN (STR_SATA_IDE), value = SATA_MODE_IDE, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED, key = 0;\
-    option text  = STRING_TOKEN (STR_SATA_AHCI), value = SATA_MODE_AHCI, flags = RESET_REQUIRED, key = 0;\
+    option text  = STRING_TOKEN (STR_SATA_IDE), value = SATA_MODE_IDE, flags = RESET_REQUIRED, key = 0;\
+    option text  = STRING_TOKEN (STR_SATA_AHCI), value = SATA_MODE_AHCI, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED, key = 0;\
     option text  = STRING_TOKEN (STR_SATA_RAID), value = SATA_MODE_RAID, flags = RESET_REQUIRED, key = 0;\
   endoneof;