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

15 files changed, 124 insertions, 57 deletions

diff --git a/BIOS_CUSTOM/OA20Marker.bin b/BIOS_CUSTOM/OA20Marker.bin
index 9e65faa..1488eeb 100644
--- a/BIOS_CUSTOM/OA20Marker.bin
+++ b/BIOS_CUSTOM/OA20Marker.bin
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;
 
diff --git a/CRB/CRB.sdl b/CRB/CRB.sdl
index b734437..8b19f99 100644
--- a/CRB/CRB.sdl
+++ b/CRB/CRB.sdl
@@ -1689,23 +1689,23 @@ TOKEN
 	TargetH = Yes
 End
 
-TOKEN
-	Name  = "BASE_BOARD_MANUFACTURER"
-	Value  = "$(DEFAULT_STRING)"
-	Help  = "Specifies the Board Manufacturer."
-	TokenType = Expression
-	TargetEQU = Yes
-	Token = "BASE_BOARD_INFO" "=" "1"
-End
-
-TOKEN
-	Name  = "BASE_BOARD_PRODUCT_NAME"
-	Value  = "$(DEFAULT_STRING)"
-	Help  = "Specifies the Product Name"
-	TokenType = Expression
-	TargetEQU = Yes
-	Token = "BASE_BOARD_INFO" "=" "1"
-End
+##TOKEN
+##	Name  = "BASE_BOARD_MANUFACTURER"
+##	Value  = "$(DEFAULT_STRING)"
+##	Help  = "Specifies the Board Manufacturer."
+##	TokenType = Expression
+##	TargetEQU = Yes
+##	Token = "BASE_BOARD_INFO" "=" "1"
+##End
+##
+##TOKEN
+##	Name  = "BASE_BOARD_PRODUCT_NAME"
+##	Value  = "$(DEFAULT_STRING)"
+##	Help  = "Specifies the Product Name"
+##	TokenType = Expression
+##	TargetEQU = Yes
+##	Token = "BASE_BOARD_INFO" "=" "1"
+##End
 
 TOKEN
 	Name  = "NO_OF_PHYSICAL_MEMORY_ARRAY"
diff --git a/CRB/CSP.sdl b/CRB/CSP.sdl
index 2846d6f..b45b47d 100644
--- a/CRB/CSP.sdl
+++ b/CRB/CSP.sdl
@@ -1627,6 +1627,24 @@ TOKEN
     TargetMAK = Yes
 End
 TOKEN
+	Name  = "T_ACPI_OEM_ID"
+	Value  = "{'G','R','G','B',00,00}"
+	Help  = "ACPI OEM Id -\a string value to be filled into ACPI table headers.\ If you want use spaces as leading or and trailing symbols \you must surround the whole expression in '|'. \For example | ABC  |. This will result in the generation of a \ #define ACPI_OEM_ID_MAK ' ABC  ' in the file Build\AcpiOemElinks.h \(created by Acpi.mak file). All tables generated by the \Acpi eModule will have the IDs with the values from \the generated file. To see how this works, refer to \the AcpiCore.c file and search for the string ACPI_OEM_ID_MAK. \Some modules which submit their own ACPI tables may \use the old method: CONVERT_TO_STRING(T_ACPI_OEM_ID). \If they are using this method, either '|' will be included \in their table's ID fields, or a build error will \occur because the two additional '|' characters \will make the string larger than the TableId size \of 6 characters. Contact the owners of the offending modules and /ask them to use ACPI_OEM_ID_MAK as it is used in AcpiCore.c."
+	TokenType = Expression
+	TargetMAK = Yes
+	TargetH = Yes
+	Range  = "1-6 characters"
+End
+TOKEN
+	Name  = "T_ACPI_OEM_TBL_ID"
+	Value  = "{'G','R','G','B','I','P','C',00}"
+	Help  = "ACPI OEM TBL Id -\a string value to be filled into ACPI table headers.\ If you want use spaces as leading or and trailing symbols \you must surround the whole expression in '|'. \For example | ABC  |. This will result in the generation of a \ #define ACPI_OEM_TBL_ID_MAK ' ABC  ' in the file Build\AcpiOemElinks.h \(created by Acpi.mak file). All tables generated by the \Acpi eModule will have the IDs with the values from \the generated file. To see how this works, refer to \the AcpiCore.c file and search for the string ACPI_OEM_ID_MAK. \Some modules which submit their own ACPI tables may \use the old method: CONVERT_TO_STRING(T_ACPI_OEM_ID). \If they are using this method, either '|' will be included \in their table's ID fields, or a build error will \occur because the two additional '|' characters \will make the string larger than the TableId size \of 8 characters. Contact the owners of the offending modules and /ask them to use ACPI_OEM_TBL_ID_MAK as it is used in AcpiCore.c."
+	TokenType = Expression
+	TargetMAK = Yes
+	TargetH = Yes
+	Range  = "1-8 characters"
+End
+TOKEN
     Name = "SLP_STRING"
     Value = "GRGBankingIPC1"
     Help = "SLP string."
@@ -1657,4 +1675,51 @@ TOKEN
 	Help  = "Support for UEFI specification v 2.3.1 section 3.4.1.1 and 3.4.1.2 to load the default boot image (efi\boot\boot####.efi) from any of the available file system if no boot option found. 1 = Enabling default image boot and 0 = Disabling default image boot."
 	TokenType = Boolean
 	TargetH = Yes
-End
\ No newline at end of file
+End
+
+TOKEN
+	Name  = "SYSTEM_MANUFACTURER"
+	Value  = "Deepware"
+	Help  = "Specifies the System Manufacturer Name."
+	TokenType = Expression
+	TargetEQU = Yes
+End
+TOKEN
+	Name  = "SYSTEM_PRODUCT_NAME"
+	Value  = "DW01"
+	Help  = "Specifies the System Product Name"
+	TokenType = Expression
+	TargetEQU = Yes
+End
+TOKEN
+	Name  = "SYSTEM_VERSION"
+	Value  = "V1.01"
+	Help  = "Specifies the System Product Version."
+	TokenType = Expression
+	TargetEQU = Yes
+End
+TOKEN
+	Name  = "BASE_BOARD_MANUFACTURER"
+	Value  = "Deepware"
+	Help  = "Specifies the Board Manufacturer."
+	TokenType = Expression
+	TargetEQU = Yes
+	Token = "BASE_BOARD_INFO" "=" "1"
+End
+TOKEN
+	Name  = "BASE_BOARD_PRODUCT_NAME"
+	Value  = "DW01"
+	Help  = "Specifies the Product Name"
+	TokenType = Expression
+	TargetEQU = Yes
+	Token = "BASE_BOARD_INFO" "=" "1"
+End
+TOKEN
+	Name  = "BASE_BOARD_VERSION"
+	Value  = "V1.01"
+	Help  = "Specifies the Product Version."
+	TokenType = Expression
+	TargetEQU = Yes
+	Token = "BASE_BOARD_INFO" "=" "1"
+#	Token = "NUMBER_OF_BASEBOARDS" "=" "1"
+End
diff --git a/Chipset/NB/NBDxe.c b/Chipset/NB/NBDxe.c
index 15dbbd0..86ff085 100644
--- a/Chipset/NB/NBDxe.c
+++ b/Chipset/NB/NBDxe.c
@@ -2241,8 +2241,8 @@ VOID NbExitPmAuthProtocolCallback (
 //----------------------------------------------------------------------------
 #if (ACPI_SUPPORT)
 
-UINT8    ACPI_OEM_ID[6]     = CONVERT_TO_STRING(T_ACPI_OEM_ID);
-UINT8    ACPI_OEM_TBL_ID[8] = CONVERT_TO_STRING(T_ACPI_OEM_TBL_ID);
+UINT8    ACPI_OEM_ID[6]     = T_ACPI_OEM_ID ;//CONVERT_TO_STRING(T_ACPI_OEM_ID);
+UINT8    ACPI_OEM_TBL_ID[8] = T_ACPI_OEM_TBL_ID ;//CONVERT_TO_STRING(T_ACPI_OEM_TBL_ID);
 
 UINTN           mMcfgTblHandle=0;
 EFI_EVENT       mAcpiEvent;
diff --git a/Chipset/SB/SBDxe.c b/Chipset/SB/SBDxe.c
index b5fca98..2edabb1 100644
--- a/Chipset/SB/SBDxe.c
+++ b/Chipset/SB/SBDxe.c
@@ -2013,9 +2013,9 @@ VOID CreateSbAcpiCallback (
     UINT32                      OldSbAslBufVarPtr = 0;
     UINT32                      Attributes = 0;
     UINTN                       VarSize;
-    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);
 
     // It must be only one instance of such protocol
     Status = pBS->LocateProtocol(&gEfiAcpiSupportGuid, NULL, &As);
diff --git a/Core/CSPLib/FID.c b/Core/CSPLib/FID.c
index 8b33f92..17b0ba0 100644
--- a/Core/CSPLib/FID.c
+++ b/Core/CSPLib/FID.c
@@ -81,8 +81,10 @@ FW_VERSION  FwVersionData = {
     TWO_DIGIT_MINUTE_INT,
     TWO_DIGIT_SECOND_INT,
     0xffff,
-    CONVERT_TO_STRING(T_ACPI_OEM_ID),
-    CONVERT_TO_STRING(T_ACPI_OEM_TBL_ID),
+//    CONVERT_TO_STRING(T_ACPI_OEM_ID),
+//    CONVERT_TO_STRING(T_ACPI_OEM_TBL_ID),
+    T_ACPI_OEM_ID,
+    T_ACPI_OEM_TBL_ID,
     49,
     { 
         0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
diff --git a/Core/EM/ACPI/AcpiCore.c b/Core/EM/ACPI/AcpiCore.c
index 7cb3366..fa37a46 100644
--- a/Core/EM/ACPI/AcpiCore.c
+++ b/Core/EM/ACPI/AcpiCore.c
@@ -586,8 +586,8 @@ MADT_ENTRY_HEADER * BuildLocalApicNmi(
     IN UINT16 Flags
     );
 
-UINT8    ACPI_OEM_ID[6]     = ACPI_OEM_ID_MAK;     //"A M I";      //add 0 at the end.OemId 6 bytes
-UINT8    ACPI_OEM_TBL_ID[8] = ACPI_OEM_TBL_ID_MAK; //"ALASKA"; //add 0 at the end.OemTableId  8 bytes
+UINT8    ACPI_OEM_ID[6]     = T_ACPI_OEM_ID ;//ACPI_OEM_ID_MAK;     //"A M I";      //add 0 at the end.OemId 6 bytes
+UINT8    ACPI_OEM_TBL_ID[8] = T_ACPI_OEM_TBL_ID ;//ACPI_OEM_TBL_ID_MAK; //"ALASKA"; //add 0 at the end.OemTableId  8 bytes
 
 #if defined(OemActivation_SUPPORT) && (OemActivation_SUPPORT == 1)
 #define EFI_OA3_MSDM_VARIABLE   L"OA3MSDMvariable"
diff --git a/Core/EM/ACPI/mptable.c b/Core/EM/ACPI/mptable.c
index 66fe0d4..9260a7b 100644
--- a/Core/EM/ACPI/mptable.c
+++ b/Core/EM/ACPI/mptable.c
@@ -188,8 +188,8 @@ static VOID *MpsExTableCurrentPointer = NULL;
 static UINT16  BaseTableLength = 0;
 static UINT16  BaseTableEntryCount = 0;
 static UINT16  ExtendedTableLength = 0;
-static UINT8   OemId[8] = CONVERT_TO_STRING(T_ACPI_OEM_TBL_ID);   //{ 0,1,2,3,4,5,6,7 };
-static UINT8   ProductId[12] = CONVERT_TO_STRING(T_ACPI_OEM_ID);   //{ 0,1,2,3,4,5,6,7,8,9,0xA, 0xB };
+static UINT8   OemId[8] = T_ACPI_OEM_TBL_ID ;//CONVERT_TO_STRING(T_ACPI_OEM_TBL_ID);   //{ 0,1,2,3,4,5,6,7 };
+static UINT8   ProductId[12] = T_ACPI_OEM_ID ;//CONVERT_TO_STRING(T_ACPI_OEM_ID);   //{ 0,1,2,3,4,5,6,7,8,9,0xA, 0xB };
 
 static BUS_INFO BusEntry[MP_TABLE_MAX_BUS_ENTRIES];
 static UINT8    MaxBusId = 0;
diff --git a/Core/EM/SMM/SmmCommunicate.c b/Core/EM/SMM/SmmCommunicate.c
index 929118e..6eeb459 100644
--- a/Core/EM/SMM/SmmCommunicate.c
+++ b/Core/EM/SMM/SmmCommunicate.c
@@ -28,7 +28,7 @@
 // [Category]  	Bug Fix
 // [Severity]  	Important
 // [Symptom]  	Using SMM Communication can cause OS to hang
-// [RootCause]  	SMM Communication Protocol’s Communicate API does not
+// [RootCause]  	SMM Communication Protocol�s Communicate API does not
 // function in UEFI OS after Exit boot services event because
 // ConvertPointer() did not convert SMM_COMMUNICATE_DATA *gCommunicateData
 // pointer from a Physical Memory Map Pointer to a Virtual Memory Map
@@ -251,8 +251,8 @@ ACPI_SMM_COMM_TABLE gAcpiSmmCommTable =
      sizeof(ACPI_SMM_COMM_TABLE),
      1, //Revision
      0, //Checksum
-     CONVERT_TO_STRING(T_ACPI_OEM_ID),
-     CONVERT_TO_STRING(T_ACPI_OEM_TBL_ID),
+     T_ACPI_OEM_ID, //CONVERT_TO_STRING(T_ACPI_OEM_ID),
+     T_ACPI_OEM_TBL_ID, //CONVERT_TO_STRING(T_ACPI_OEM_TBL_ID),
      ACPI_OEM_REV,
      0, //Creator ID
      0, //Creator Revision,