Vlv2TbltDevicePkg:Fix build and boot failure of Minnowboard Max platform.

Remove the duplicated IScsiDxe driver from FDF; Add required shell libraries; Update SYSTEM_CONFIGURATION data structure.

Test: Install and boot Windows 10.

Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Michael Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: David Wei <david.wei@intel.com>

diff --git a/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h b/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
index d9ac9f79e1a3e2582876b049db79ee20a025679e..b37be5ca6f145f131245acec1d946cfd8b500fb6 100644 (file)
--- a/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
+++ b/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-  Copyright (c) 2004  - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2004  - 2018, Intel Corporation. All rights reserved.<BR>\r
 \r
 \r
   This program and the accompanying materials are licensed and made available under\r
@@ -1310,6 +1310,9 @@ typedef struct {
   UINT8   GpioWakeCapability;\r
   UINT8   RtcBattery;\r
   UINT8   LpeAudioReportedByDSDT;\r
+  \r
+  UINT8   Uart1Int3511Com; // Report UART1 as COM with _HID INT3511\r
+  CHAR16  SystemUuid[37];\r
 \r
 } SYSTEM_CONFIGURATION;\r
 #pragma pack()\r

diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index f976b9fa4057e14c6e639103259d504efd926529..0d13ad9f56900b01851de76a8a2e4f1a95c0c314 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -743,7 +743,6 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
   INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
   INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
   INF  NetworkPkg/TcpDxe/TcpDxe.inf\r
-  INF  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
   !if $(NETWORK_IP6_ENABLE) == TRUE\r
   INF  NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
   INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r

diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index 50032f7d5f194402b1660ac86463b388ad5c2474..847286328a9298672227dab241bf68ea8c4d01c1 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -699,7 +699,6 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
   INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
   INF  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
   INF  NetworkPkg/TcpDxe/TcpDxe.inf\r
-  INF  NetworkPkg/IScsiDxe/IScsiDxe.inf\r
   !if $(NETWORK_IP6_ENABLE) == TRUE\r
   INF  NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
   INF  NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r

diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 81f36bd73b285cccaf72370a5c1db2171a3ccbe1..ccdd856ceef93df3f9405830e838bc30f8f9c3a9 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -283,6 +283,8 @@
 !endif\r
   ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf\r
   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
+  ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf\r
+  HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf\r
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf\r
 !if $(FTPM_ENABLE) == TRUE || $(NETWORK_ISCSI_ENABLE) == TRUE\r