Vlv2TbltDevicePkg: Remove use of BIOS ID tools

Remove the use of VLV2 specific BIOS ID tools.

Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>

18 files changed, 33 insertions, 500 deletions

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/BiosIdD.env b/Platform/Intel/Vlv2TbltDevicePkg/BiosIdD.env
deleted file mode 100644
index 85313dfb..00000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/BiosIdD.env
+++ /dev/null
@@ -1,25 +0,0 @@
-#/** @file

-#  This file is used to define the BIOS ID parameters of the build.

-#  This file is processed by GenBiosId.

-#  The BIOS ID format conforms to "BIOS Revision Identification Specification", Rev. 0.7, 6/27/2001.

-#

-#  BIOS ID string format:

-#    $(BOARD_ID)$(BOARD_REV).$(OEM_ID).$(VERSION_MAJOR).$(BUILD_TYPE)$(VERSION_MINOR).YYMMDDHHMM

-#  All fields must have a fixed length.

-#    Example: "TRFTCRB1.86C.0008.D03.0506081529"

-#

-#  Copyright (c) 2008  - 2015, Intel Corporation. All rights reserved.<BR>

-#                                                                                  


-# SPDX-License-Identifier: BSD-2-Clause-Patent

-

-#                                                                                  


-#

-#**/

-

-BOARD_REV     = 1

-OEM_ID        = I32

-BUILD_TYPE    = D

-

-BOARD_ID = BLAKCRB

-VERSION_MAJOR = 0084

-VERSION_MINOR = 01

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/BiosIdR.env b/Platform/Intel/Vlv2TbltDevicePkg/BiosIdR.env
deleted file mode 100644
index 4af249dc..00000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/BiosIdR.env
+++ /dev/null
@@ -1,25 +0,0 @@
-#/** @file

-#  This file is used to define the BIOS ID parameters of the build.

-#  This file is processed by GenBiosId.

-#  The BIOS ID format conforms to "BIOS Revision Identification Specification", Rev. 0.7, 6/27/2001.

-#

-#  BIOS ID string format:

-#    $(BOARD_ID)$(BOARD_REV).$(OEM_ID).$(VERSION_MAJOR).$(BUILD_TYPE)$(VERSION_MINOR).YYMMDDHHMM

-#  All fields must have a fixed length.

-#    Example: "TRFTCRB1.86C.0008.D03.0506081529"

-#

-#  Copyright (c) 2008  - 2015, Intel Corporation. All rights reserved.<BR>

-#                                                                                  


-# SPDX-License-Identifier: BSD-2-Clause-Patent

-

-#                                                                                  


-#

-#**/

-

-BOARD_REV     = 1

-OEM_ID        = I32

-BUILD_TYPE    = R

-

-BOARD_ID = BLAKCRB

-VERSION_MAJOR = 0084

-VERSION_MINOR = 01

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/BiosIdx64D.env b/Platform/Intel/Vlv2TbltDevicePkg/BiosIdx64D.env
deleted file mode 100644
index a2173b7e..00000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/BiosIdx64D.env
+++ /dev/null
@@ -1,25 +0,0 @@
-#/** @file

-#  This file is used to define the BIOS ID parameters of the build.

-#  This file is processed by GenBiosId.

-#  The BIOS ID format conforms to "BIOS Revision Identification Specification", Rev. 0.7, 6/27/2001.

-#

-#  BIOS ID string format:

-#    $(BOARD_ID)$(BOARD_REV).$(OEM_ID).$(VERSION_MAJOR).$(BUILD_TYPE)$(VERSION_MINOR).YYMMDDHHMM

-#  All fields must have a fixed length.

-#    Example: "TRFTCRB1.86C.0008.D03.0506081529"

-#

-#  Copyright (c) 2008  - 2015, Intel Corporation. All rights reserved.<BR>

-#                                                                                  


-# SPDX-License-Identifier: BSD-2-Clause-Patent

-

-#                                                                                  


-#

-#**/

-

-BOARD_REV     = 1

-OEM_ID        = X64

-BUILD_TYPE    = D

-

-VERSION_MAJOR = 0084

-VERSION_MINOR = 01

-BOARD_ID = BBAYCRB 

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/BiosIdx64R.env b/Platform/Intel/Vlv2TbltDevicePkg/BiosIdx64R.env
deleted file mode 100644
index c235177e..00000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/BiosIdx64R.env
+++ /dev/null
@@ -1,25 +0,0 @@
-#/** @file

-#  This file is used to define the BIOS ID parameters of the build.

-#  This file is processed by GenBiosId.

-#  The BIOS ID format conforms to "BIOS Revision Identification Specification", Rev. 0.7, 6/27/2001.

-#

-#  BIOS ID string format:

-#    $(BOARD_ID)$(BOARD_REV).$(OEM_ID).$(VERSION_MAJOR).$(BUILD_TYPE)$(VERSION_MINOR).YYMMDDHHMM

-#  All fields must have a fixed length.

-#    Example: "TRFTCRB1.86C.0008.D03.0506081529"

-#

-#  Copyright (c) 2008  - 2015, Intel Corporation. All rights reserved.<BR>

-#                                                                                  


-# SPDX-License-Identifier: BSD-2-Clause-Patent

-

-#                                                                                  


-#

-#**/

-

-BOARD_REV     = 1

-OEM_ID        = X64

-BUILD_TYPE    = R

-

-VERSION_MAJOR = 0084

-VERSION_MINOR = 01

-BOARD_ID = BBAYCRB 

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/GenBiosId b/Platform/Intel/Vlv2TbltDevicePkg/GenBiosId
deleted file mode 100755
index ef1578f2..00000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/GenBiosId
+++ /dev/null
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/GenBiosId.exe b/Platform/Intel/Vlv2TbltDevicePkg/GenBiosId.exe
deleted file mode 100644
index 323b87c4..00000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/GenBiosId.exe
+++ /dev/null
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Include/Guid/BiosId.h b/Platform/Intel/Vlv2TbltDevicePkg/Include/Guid/BiosId.h
deleted file mode 100644
index e86fc852..00000000
--- a/Platform/Intel/Vlv2TbltDevicePkg/Include/Guid/BiosId.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*++

-

-Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved

-                                                                                   


-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-                                                                                   


-

-

-Module Name:

-

-    BiosId.h

-

-Abstract:

-

-    GUIDs used for Bios ID.

-

---*/

-

-#ifndef _BIOS_ID_H_

-#define _BIOS_ID_H_

-

-

-#define EFI_BIOS_ID_GUID \

-{ 0xC3E36D09, 0x8294, 0x4b97, 0xA8, 0x57, 0xD5, 0x28, 0x8F, 0xE3, 0x3E, 0x28 }

-

-

-extern EFI_GUID gEfiBiosIdGuid;

-

-#endif

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/BiosIdLib.h b/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/BiosIdLib.h
index 484b3582..bd08c9a8 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/BiosIdLib.h
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Include/Library/BiosIdLib.h
@@ -1,11 +1,8 @@
 /*++

 

-  Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>

-                                                                                   


-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-                                                                                   


+  Copyright (c) 2004  - 2019, Intel Corporation. All rights reserved.<BR>

 

+  SPDX-License-Identifier: BSD-2-Clause-Patent

 

 Module Name:

 

@@ -67,21 +64,6 @@ typedef struct {
 #pragma pack()

 

 /**

-  This function returns BIOS ID by searching HOB or FV.

-

-  @param[in]  BiosIdImage         The BIOS ID got from HOB or FV

-

-  @retval  EFI_SUCCESS            All parameters were valid and BIOS ID has been got.

-  @retval  EFI_NOT_FOUND          BiosId image is not found, and no parameter will be modified.

-  @retval  EFI_INVALID_PARAMETER  The parameter is NULL.

-

-**/

-EFI_STATUS

-GetBiosId (

-  OUT BIOS_ID_IMAGE     *BiosIdImage

-  );

-

-/**

   This function returns the Version & Release Date and Time by getting and converting

   BIOS ID.

 

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.c b/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.c
index 3f0e20c7..f6ab3731 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.c
@@ -1,10 +1,8 @@
 /*++

 

-Copyright (c) 2011  - 2014, Intel Corporation. All rights reserved

-                                                                                   


-  SPDX-License-Identifier: BSD-2-Clause-Patent

+Copyright (c) 2011  - 2019, Intel Corporation. All rights reserved

 

-                                                                                   


+  SPDX-License-Identifier: BSD-2-Clause-Patent

 

 Module Name:

 

@@ -21,237 +19,8 @@ Abstract:
 

 #include <PiDxe.h>

 #include <Library/BaseLib.h>

-#include <Library/HobLib.h>

-#include <Library/UefiBootServicesTableLib.h>

-#include <Library/BaseMemoryLib.h>

-#include <Library/DebugLib.h>

 

 #include <Library/BiosIdLib.h>

-#include <Guid/BiosId.h>

-#include <Protocol/FirmwareVolume2.h>

-#include <Protocol/LoadedImage.h>

-

-

-EFI_STATUS

-GetImageFromFv (

-  IN  EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv,

-  IN  EFI_GUID           *NameGuid,

-  IN  EFI_SECTION_TYPE   SectionType,

-  OUT VOID               **Buffer,

-  OUT UINTN              *Size

-  )

-{

-  EFI_STATUS                Status;

-  EFI_FV_FILETYPE           FileType;

-  EFI_FV_FILE_ATTRIBUTES    Attributes;

-  UINT32                    AuthenticationStatus;

-

-  //

-  // Read desired section content in NameGuid file

-  //

-  *Buffer     = NULL;

-  *Size       = 0;

-  Status      = Fv->ReadSection (

-                      Fv,

-                      NameGuid,

-                      SectionType,

-                      0,

-                      Buffer,

-                      Size,

-                      &AuthenticationStatus

-                      );

-

-  if (EFI_ERROR (Status) && (SectionType == EFI_SECTION_TE)) {

-    //

-    // Try reading PE32 section, since the TE section does not exist

-    //

-    *Buffer = NULL;

-    *Size   = 0;

-    Status  = Fv->ReadSection (

-                    Fv,

-                    NameGuid,

-                    EFI_SECTION_PE32,

-                    0,

-                    Buffer,

-                    Size,

-                    &AuthenticationStatus

-                    );

-  }

-

-  if (EFI_ERROR (Status) &&

-      ((SectionType == EFI_SECTION_TE) || (SectionType == EFI_SECTION_PE32))) {

-    //

-    // Try reading raw file, since the desired section does not exist

-    //

-    *Buffer = NULL;

-    *Size   = 0;

-    Status  = Fv->ReadFile (

-                    Fv,

-                    NameGuid,

-                    Buffer,

-                    Size,

-                    &FileType,

-                    &Attributes,

-                    &AuthenticationStatus

-                    );

-  }

-

-  return Status;

-}

-

-

-EFI_STATUS

-GetImageEx (

-  IN  EFI_HANDLE         ImageHandle,

-  IN  EFI_GUID           *NameGuid,

-  IN  EFI_SECTION_TYPE   SectionType,

-  OUT VOID               **Buffer,

-  OUT UINTN              *Size,

-  BOOLEAN                WithinImageFv

-  )

-{

-  EFI_STATUS                    Status;

-  EFI_HANDLE                    *HandleBuffer;

-  UINTN                         HandleCount;

-  UINTN                         Index;

-  EFI_LOADED_IMAGE_PROTOCOL     *LoadedImage;

-

-  EFI_FIRMWARE_VOLUME2_PROTOCOL *ImageFv;

-  EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv;

-

-

-  if (ImageHandle == NULL && WithinImageFv) {

-    return EFI_INVALID_PARAMETER;

-  }

-

-  Status  = EFI_NOT_FOUND;

-  ImageFv = NULL;

-  if (ImageHandle != NULL) {

-    Status = gBS->HandleProtocol (

-                    ImageHandle,

-                    &gEfiLoadedImageProtocolGuid,

-                    (VOID **) &LoadedImage

-                    );

-    if (EFI_ERROR (Status)) {

-      return Status;

-    }

-    Status = gBS->HandleProtocol (

-                    LoadedImage->DeviceHandle,

-                    &gEfiFirmwareVolume2ProtocolGuid,

-                    (VOID **) &ImageFv

-                    );

-    if (!EFI_ERROR (Status)) {

-      Status = GetImageFromFv (ImageFv, NameGuid, SectionType, Buffer, Size);

-    }

-  }

-

-  if (Status == EFI_SUCCESS || WithinImageFv) {

-    return Status;

-  }

-

-  Status = gBS->LocateHandleBuffer (

-                  ByProtocol,

-                  &gEfiFirmwareVolume2ProtocolGuid,

-                  NULL,

-                  &HandleCount,

-                  &HandleBuffer

-                  );

-  if (EFI_ERROR (Status)) {

-    return Status;

-  }

-

-  //

-  // Find desired image in all Fvs

-  //

-  for (Index = 0; Index < HandleCount; ++Index) {

-    Status = gBS->HandleProtocol (

-                    HandleBuffer[Index],

-                    &gEfiFirmwareVolume2ProtocolGuid,

-                    (VOID**)&Fv

-                    );

-

-    if (EFI_ERROR (Status)) {

-      gBS->FreePool(HandleBuffer);

-      return Status;

-    }

-

-    if (ImageFv != NULL && Fv == ImageFv) {

-      continue;

-    }

-

-    Status = GetImageFromFv (Fv, NameGuid, SectionType, Buffer, Size);

-

-    if (!EFI_ERROR (Status)) {

-      break;

-    }

-  }

-  gBS->FreePool(HandleBuffer);

-

-  //

-  // Not found image

-  //

-  if (Index == HandleCount) {

-    return EFI_NOT_FOUND;

-  }

-

-  return EFI_SUCCESS;

-}

-

-/**

-  This function returns BIOS ID by searching HOB or FV.

-

-  @param BiosIdImage             The BIOS ID got from HOB or FV.

-

-  @retval EFI_SUCCESS            All parameters were valid and BIOS ID has been got.

-  @retval EFI_NOT_FOUND          BiosId image is not found, and no parameter will be modified.

-  @retval EFI_INVALID_PARAMETER  The parameter is NULL.

-

-**/

-EFI_STATUS

-GetBiosId (

-  OUT BIOS_ID_IMAGE     *BiosIdImage

-  )

-

-{

-  EFI_STATUS    Status;

-  VOID          *Address = NULL;

-  UINTN         Size = 0;

-

-    DEBUG ((EFI_D_INFO, "Get BIOS ID from FV\n"));

-

-    Status = GetImageEx (

-               NULL,

-               &gEfiBiosIdGuid,

-               EFI_SECTION_RAW,

-               &Address,

-               &Size,

-               FALSE

-               );

-

-    if (Status == EFI_SUCCESS) {

-      //

-      // BiosId image is present in FV

-      //

-      if (Address != NULL) {

-        Size = sizeof (BIOS_ID_IMAGE);

-        gBS->CopyMem (

-              (void *) BiosIdImage,

-              Address,

-              Size

-              );

-        //

-        // GetImage () allocated buffer for Address, now clear it.

-        //

-        gBS->FreePool (Address);

-

-        DEBUG ((EFI_D_INFO, "Get BIOS ID from FV successfully\n"));

-        DEBUG ((EFI_D_INFO, "BIOS ID: %s\n", (CHAR16 *) (&(BiosIdImage->BiosIdString))));

-

-        return EFI_SUCCESS;

-      }

-    }

-  return EFI_NOT_FOUND;

-}

 

 /**

   This function returns the Version & Release Date and Time by getting and converting

@@ -273,47 +42,39 @@ GetBiosVersionDateTime (
   OUT CHAR16    *BiosReleaseTime OPTIONAL

   )

 {

-  EFI_STATUS        Status;

-  BIOS_ID_IMAGE     BiosIdImage;

-

   if ((BiosVersion == NULL) && (BiosReleaseDate == NULL) && (BiosReleaseTime == NULL)) {

     return EFI_INVALID_PARAMETER;

   }

 

-  Status = GetBiosId (&BiosIdImage);

-  if (EFI_ERROR (Status)) {

-    return EFI_NOT_FOUND;

-  }

-

   if (BiosVersion != NULL) {

     //

     // Fill the BiosVersion data from the BIOS ID.

     //

-    StrCpy (BiosVersion, (CHAR16 *) (&(BiosIdImage.BiosIdString)));

+    StrCpy (BiosVersion, L"MNW2MAX1.X64.0084.D01");

   }

 

   if (BiosReleaseDate != NULL) {

     //

     // Fill the build timestamp date from the BIOS ID in the "MM/DD/YY" format.

     //

-    BiosReleaseDate[0] = BiosIdImage.BiosIdString.TimeStamp[2];

-    BiosReleaseDate[1] = BiosIdImage.BiosIdString.TimeStamp[3];

-    BiosReleaseDate[2] = (CHAR16) ((UINT8) ('/'));

+    BiosReleaseDate[0] = L'0';

+    BiosReleaseDate[1] = L'1';

+    BiosReleaseDate[2] = L'/';

 

-    BiosReleaseDate[3] = BiosIdImage.BiosIdString.TimeStamp[4];

-    BiosReleaseDate[4] = BiosIdImage.BiosIdString.TimeStamp[5];

-    BiosReleaseDate[5] = (CHAR16) ((UINT8) ('/'));

+    BiosReleaseDate[3] = L'0';

+    BiosReleaseDate[4] = L'1';

+    BiosReleaseDate[5] = L'/';

 

     //

     // Add 20 for SMBIOS table

     // Current Linux kernel will misjudge 09 as year 0, so using 2009 for SMBIOS table

     //

-    BiosReleaseDate[6] = '2';

-    BiosReleaseDate[7] = '0';

-    BiosReleaseDate[8] = BiosIdImage.BiosIdString.TimeStamp[0];

-    BiosReleaseDate[9] = BiosIdImage.BiosIdString.TimeStamp[1];

+    BiosReleaseDate[6] = L'2';

+    BiosReleaseDate[7] = L'0';

+    BiosReleaseDate[8] = L'1';

+    BiosReleaseDate[9] = L'9';

 

-    BiosReleaseDate[10] = (CHAR16) ((UINT8) ('\0'));

+    BiosReleaseDate[10] = L'\0';

   }

 

   if (BiosReleaseTime != NULL) {

@@ -322,14 +83,14 @@ GetBiosVersionDateTime (
     // Fill the build timestamp time from the BIOS ID in the "HH:MM" format.

     //

 

-    BiosReleaseTime[0] = BiosIdImage.BiosIdString.TimeStamp[6];

-    BiosReleaseTime[1] = BiosIdImage.BiosIdString.TimeStamp[7];

-    BiosReleaseTime[2] = (CHAR16) ((UINT8) (':'));

+    BiosReleaseTime[0] = L'0';

+    BiosReleaseTime[1] = L'0';

+    BiosReleaseTime[2] = L':';

 

-    BiosReleaseTime[3] = BiosIdImage.BiosIdString.TimeStamp[8];

-    BiosReleaseTime[4] = BiosIdImage.BiosIdString.TimeStamp[9];

+    BiosReleaseTime[3] = L'0';

+    BiosReleaseTime[4] = L'0';

 

-    BiosReleaseTime[5] = (CHAR16) ((UINT8) ('\0'));

+    BiosReleaseTime[5] = L'\0';

   }

 

   return  EFI_SUCCESS;

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf b/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf
index 3e53680d..0d38d73a 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/BiosIdLib/BiosIdLib.inf
@@ -1,11 +1,8 @@
 #/*++

 #

-# Copyright (c)  2010  - 2014, Intel Corporation. All rights reserved

-#                                                                                  


+# Copyright (c)  2010  - 2019, Intel Corporation. All rights reserved

+#

 # SPDX-License-Identifier: BSD-2-Clause-Patent

-

-#                                                                                  


-

 #

 #  Module Name:

 #

@@ -34,17 +31,3 @@
   MdeModulePkg/MdeModulePkg.dec

   Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec

   Vlv2TbltDevicePkg/PlatformPkg.dec

-

-[LibraryClasses]

-  HobLib

-

-[Guids]

-  gEfiBiosIdGuid

-

-[Protocols]

-  gEfiLoadedImageProtocolGuid

-  gEfiFirmwareVolume2ProtocolGuid

-

-[Depex]

-  gEfiLoadedImageProtocolGuid AND

-  gEfiFirmwareVolume2ProtocolGuid

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
index a81f102b..0c432642 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
@@ -73,9 +73,9 @@
   EfiRegTableLib

   BiosIdLib

   BaseCryptLib

+  HobLib

 

 [Guids]

-  gEfiBiosIdGuid

   gEfiPlatformBootModeGuid

   gEfiBoardFeaturesGuid

   gItkDataVarGuid

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.dec b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.dec
index 786b4f6e..bfde7be3 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.dec
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.dec
@@ -37,7 +37,6 @@
   gProcessorProducerGuid                  = { 0x1bf06aea, 0x5bec, 0x4a8d, { 0x95, 0x76, 0x74, 0x9b, 0x09, 0x56, 0x2d, 0x30 } }

   gEfiPowerOnHobGuid                      = { 0x0468a601, 0xc535, 0x46fd, { 0xa9, 0x5d, 0xbb, 0xab, 0x99, 0x1b, 0x17, 0x8c } }

   gEfiPlatformCpuInfoGuid                 = { 0xbb9c7ab7, 0xb8d9, 0x4bf3, { 0x9c, 0x29, 0x9b, 0xf3, 0x41, 0xe2, 0x17, 0xbc } }

-  gEfiBiosIdGuid                          = { 0xC3E36D09, 0x8294, 0x4b97, { 0xA8, 0x57, 0xD5, 0x28, 0x8F, 0xE3, 0x3E, 0x28 } }

   gEfiPlatformBootModeGuid                = { 0xce845704, 0x1683, 0x4d38, { 0xa4, 0xf9, 0x7d, 0x0b, 0x50, 0x77, 0x57, 0x93 } }

   gEfiBoardFeaturesGuid                   = { 0x94b9e8ae, 0x8877, 0x479a, { 0x98, 0x42, 0xf5, 0x97, 0x4b, 0x82, 0xce, 0xd3 } }

   gItkDataVarGuid                         = { 0x3812723d, 0x7e48, 0x4e29, { 0xbc, 0x27, 0xf5, 0xa3, 0x9a, 0xc9, 0x4e, 0xf1 } }

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
index 3165be1f..4c60d0a0 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -381,10 +381,6 @@ APRIORI DXE {
   INF  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf

   }

 

-FILE FREEFORM = C3E36D09-8294-4b97-A857-D5288FE33E28 {

-    SECTION RAW = $(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/$(DXE_ARCHITECTURE)/BiosId.bin

-  }

-

   #

   # EDK II Related Platform codes

   #

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index 03941dd2..61e1adcd 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -327,10 +327,6 @@ APRIORI DXE {
   INF  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf

   }

 

-FILE FREEFORM = C3E36D09-8294-4b97-A857-D5288FE33E28 {

-    SECTION RAW = $(OUTPUT_DIRECTORY)/$(TARGET)_$(TOOL_CHAIN_TAG)/$(DXE_ARCHITECTURE)/BiosId.bin

-  }

-

   #

   # EDK II Related Platform codes

   #

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf
index 1afd8a25..b7455744 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformSetupDxe/PlatformSetupDxe.inf
@@ -80,6 +80,7 @@
   BiosIdLib

   CpuIA32Lib

   IoLib

+  HobLib

 

 [Guids]

   ##  This GUID C Name is not required for build since it is from UefiLib and not directly used by this module source.

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorFunction.c b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorFunction.c
index 1817f456..fb4fa820 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorFunction.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/SmBiosMiscDxe/MiscBiosVendorFunction.c
@@ -1,11 +1,8 @@
 /*++

 

-Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>

-                                                                                   


-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-                                                                                   


+Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>

 

+  SPDX-License-Identifier: BSD-2-Clause-Patent

 

 Module Name:

 

@@ -166,7 +163,6 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBiosVendor)
   SMBIOS_TABLE_TYPE0    *SmbiosRecord;

   EFI_SMBIOS_HANDLE     SmbiosHandle;

   EFI_MISC_BIOS_VENDOR *ForType0InputData;

-  BIOS_ID_IMAGE         BiosIdImage;

   UINT16                UVerStr[32];

   UINTN                 LoopIndex;

   UINTN                 CopyIndex;

@@ -183,7 +179,6 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBiosVendor)
   if (RecordData == NULL) {

     return EFI_INVALID_PARAMETER;

   }

-  GetBiosId (&BiosIdImage);

 

   //

   //  Add VLV2 BIOS Version and Release data

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
index 8cf8938a..5cae78bb 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
@@ -137,19 +137,15 @@ if /i "%~1"=="/IA32" (
 :: Required argument(s)

 if "%~1"=="" goto Usage

 

-::Remove the values for Platform_Type and Build_Target from BiosIdX.env and stage in Conf\

 if "%Arch%"=="IA32" (

-    findstr /b /v "BOARD_ID  BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdR.env > %WORKSPACE%\Conf\BiosId.env

     echo DEFINE X64_CONFIG = FALSE  >> %auto_config_inc%

 ) else if "%Arch%"=="X64" (

-    findstr /b /v "BOARD_ID  BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdx64R.env > %WORKSPACE%\Conf\BiosId.env

     echo DEFINE X64_CONFIG = TRUE  >> %auto_config_inc%

 )

 

 :: -- Build flags settings for each Platform --

-echo Setting  %1  platform configuration and BIOS ID...

+echo Setting  %1  platform configuration...

 if /i "%~1" == "MNW2" (

-    echo BOARD_ID = MNW2MAX >> %WORKSPACE%\Conf\BiosId.env

     echo DEFINE ENBDT_PF_BUILD = TRUE   >> %auto_config_inc%

     

 ) else (

@@ -160,10 +156,8 @@ set Platform_Type=%~1
 

 if /i "%~2" == "RELEASE" (

     set target=RELEASE

-    echo BUILD_TYPE = R >> %WORKSPACE%\Conf\BiosId.env

 ) else (

     set target=DEBUG

-    echo BUILD_TYPE = D >> %WORKSPACE%\Conf\BiosId.env

 )

 

 ::**********************************************************************

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
index ec3a325d..1eefa5de 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
+++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
@@ -97,11 +97,6 @@ for (( i=1; i<=$#; ))
         rm -r Build
       fi
       shift
-    elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/ECP" ]; then
-      ECP_SOURCE=$WORKSPACE/EdkCompatibilityPkgEcp
-      EDK_SOURCE=$WORKSPACE/EdkCompatibilityPkgEcp
-      echo DEFINE ECP_BUILD_ENABLE = TRUE >> $auto_config_inc
-      shift
     elif [ "$(echo $1 | tr 'a-z' 'A-Z')" == "/X64" ]; then
       Arch=X64
       shift
@@ -113,10 +108,6 @@ for (( i=1; i<=$#; ))
     fi
   done
 
-
-
-
-
 ## Required argument(s)
 if [ "$2" == "" ]; then
   Usage
@@ -203,54 +194,19 @@ fi
 ##**********************************************************************
 ## Build BIOS
 ##**********************************************************************
-echo Skip "Running UniTool..."
-echo "Make GenBiosId Tool..."
-BUILD_PATH=Build/$PLATFORM_PACKAGE/"$TARGET"_"$TOOL_CHAIN_TAG"
-if [ ! -d "$BUILD_PATH/$Arch" ]; then
-  mkdir -p $BUILD_PATH/$Arch
-fi
-if [ -e "$BUILD_PATH/$Arch/BiosId.bin" ]; then
-  rm -f $BUILD_PATH/$Arch/BiosId.bin
-fi
-
-
-./$PLATFORM_PACKAGE/GenBiosId -i Conf/BiosId.env -o $BUILD_PATH/$Arch/BiosId.bin
-
-
 echo "Invoking EDK2 build..."
 build
 
-if [ $SpiLock == "1" ]; then
-  IFWI_HEADER_FILE=./$PLATFORM_PACKAGE/Stitch/IFWIHeader/IFWI_HEADER_SPILOCK.bin
-else
-  IFWI_HEADER_FILE=./$PLATFORM_PACKAGE/Stitch/IFWIHeader/IFWI_HEADER.bin
-fi
-
-echo $IFWI_HEADER_FILE
-
 ##**********************************************************************
 ## Post Build processing and cleanup
 ##**********************************************************************
-
 echo Skip "Running fce..."
 
-echo Skip "Running KeyEnroll..."
-
-## Set the Board_Id, Build_Type, Version_Major, and Version_Minor environment variables
-VERSION_MAJOR=$(grep '^VERSION_MAJOR' Conf/BiosId.env | cut -d ' ' -f 3 | cut -c 1-4)
-VERSION_MINOR=$(grep '^VERSION_MINOR' Conf/BiosId.env | cut -d ' ' -f 3 | cut -c 1-2)
-BOARD_ID=$(grep '^BOARD_ID' Conf/BiosId.env | cut -d ' ' -f 3 | cut -c 1-7)
-BIOS_Name="$BOARD_ID"_"$Arch"_"$BUILD_TYPE"_"$VERSION_MAJOR"_"$VERSION_MINOR".ROM
-BIOS_ID="$BOARD_ID"_"$Arch"_"$BUILD_TYPE"_"$VERSION_MAJOR"_"$VERSION_MINOR"_GCC.bin
-SEC_VERSION=1.0.2.1060v5
-cat $IFWI_HEADER_FILE ../Vlv2Binaries/Vlv2SocBinPkg/SEC/$SEC_VERSION/VLV_SEC_REGION.bin ../Vlv2Binaries/Vlv2SocBinPkg/SEC/$SEC_VERSION/Vacant.bin $BUILD_PATH/FV/VLV.fd > ./$PLATFORM_PACKAGE/Stitch/$BIOS_ID
-
-
-echo Skip "Running BIOS_Signing ..."
+##**********************************************************************
+## Build Capsules
+##**********************************************************************
+build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc
 
 echo
-echo Build location:     $BUILD_PATH
-echo BIOS ROM Created:   $BIOS_Name
-echo
 echo -------------------- The EDKII BIOS build has successfully completed. --------------------
 echo