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 <[email protected]> Cc: Yi Qian <[email protected]> Cc: Michael Kinney <[email protected]> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: David Wei <[email protected]> --- Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h | 5 ++++- Vlv2TbltDevicePkg/PlatformPkg.fdf | 1 - Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 1 - Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 2 ++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h b/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h index d9ac9f79e1..b37be5ca6f 100644 --- a/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h +++ b/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h @@ -1,6 +1,6 @@ /** @file - Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR> + Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR> This program and the accompanying materials are licensed and made available under @@ -1310,6 +1310,9 @@ typedef struct { UINT8 GpioWakeCapability; UINT8 RtcBattery; UINT8 LpeAudioReportedByDSDT; + + UINT8 Uart1Int3511Com; // Report UART1 as COM with _HID INT3511 + CHAR16 SystemUuid[37]; } SYSTEM_CONFIGURATION; #pragma pack() diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf index f976b9fa40..0d13ad9f56 100644 --- 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 INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf INF NetworkPkg/TcpDxe/TcpDxe.inf - INF NetworkPkg/IScsiDxe/IScsiDxe.inf !if $(NETWORK_IP6_ENABLE) == TRUE INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf index 50032f7d5f..847286328a 100644 --- 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 INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf INF NetworkPkg/TcpDxe/TcpDxe.inf - INF NetworkPkg/IScsiDxe/IScsiDxe.inf !if $(NETWORK_IP6_ENABLE) == TRUE INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index 81f36bd73b..ccdd856cee 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -283,6 +283,8 @@ !endif ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf + ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf + HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf !if $(FTPM_ENABLE) == TRUE || $(NETWORK_ISCSI_ENABLE) == TRUE -- 2.14.1.windows.1 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
