Re: [edk2] [Patch V2 1/3] Vlv2TbltDevicePkg: ECP Cleanup.

2019-03-19 Thread Qian, Yi 
Reviewed by Qian, Yi 

Thanks
Qian Yi

> -Original Message-
> From: Sun, Zailiang
> Sent: Tuesday, March 19, 2019 4:33 PM
> To: edk2-devel@lists.01.org
> Cc: Qian, Yi ; Wei, David 
> Subject: [Patch V2 1/3] Vlv2TbltDevicePkg: ECP Cleanup.
> 
> In V2: no new changes
> 
> Remove modules of EdkCompatibilityPkg from DSC/FDF of Vlv2TbltDevicePkg
> to make this platform ECP free.
> 
> Test: Boot to 64-bit Windows 10.
> 
> Cc: Zailiang Sun 
> Cc: Yi Qian 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: David Wei 
> ---
>  Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c   |  8 
>  Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf |  4 ++--
>  Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c |  8 
>  Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf   |  4 ++--
>  Vlv2TbltDevicePkg/PlatformPei/BootMode.c| 56 
> ++--
> 
>  Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf   |  4 +---
>  Vlv2TbltDevicePkg/PlatformPkg.fdf   | 11 +--
>  Vlv2TbltDevicePkg/PlatformPkgGcc.fdf| 10 --
>  Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 87 
> ---
> 
>  Vlv2TbltDevicePkg/PlatformPkgIA32.dsc   | 91 
> +++
> 
>  Vlv2TbltDevicePkg/PlatformPkgX64.dsc| 87 
> -
> --
>  Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf   |  6 +++---
>  Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c  | 10 +-
>  Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf |  6 +++---
>  14 files changed, 30 insertions(+), 362 deletions(-)
> 
> diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
> b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
> index 4a913eb723..d575533319 100644
> --- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
> +++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
> @@ -1,6 +1,6 @@
>  /** @file
> 
> -  Copyright (c) 2004  - 2016, Intel Corporation. All rights reserved.
> +  Copyright (c) 2004  - 2018, Intel Corporation. All rights
> + reserved.
> 
> 
>This program and the accompanying materials are licensed and made
> available under @@ -35,7 +35,7 @@ Abstract:
> 
>  #include 
>  #include 
> -#include 
> +#include 
>  #include "AcpiPlatform.h"
>  #include "AcpiPlatformHooks.h"
>  #include "AcpiPlatformHooksLib.h"
> @@ -785,7 +785,7 @@ AcpiPlatformEntryPoint (
>EFI_STATUSStatus;
>EFI_STATUSAcpiStatus;
>EFI_ACPI_SUPPORT_PROTOCOL *AcpiSupport;
> -  EFI_FIRMWARE_VOLUME_PROTOCOL  *FwVol;
> +  EFI_FIRMWARE_VOLUME2_PROTOCOL  *FwVol;
>INTN  Instance;
>EFI_ACPI_COMMON_HEADER*CurrentTable;
>UINTN TableHandle;
> @@ -856,7 +856,7 @@ AcpiPlatformEntryPoint (
>//
>// Locate the firmware volume protocol.
>//
> -  Status = LocateSupportProtocol (&gEfiFirmwareVolumeProtocolGuid,
> (VOID **) &FwVol, 1);
> +  Status = LocateSupportProtocol (&gEfiFirmwareVolume2ProtocolGuid,
> + (VOID **) &FwVol, 1);
>ASSERT_EFI_ERROR (Status);
> 
>//
> diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf
> b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf
> index 24fa913b33..74a531369d 100644
> --- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf
> +++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf
> @@ -1,6 +1,6 @@
>  #
>  #
> -# Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
> +# Copyright (c)  1999  - 2018, Intel Corporation. All rights reserved
>  #
> 
>  # This program and the accompanying materials are licensed and made
> available under
> 
>  # the terms and conditions of the BSD License that accompanies this
> distribution.
> 
> @@ -77,7 +77,7 @@
>gEfiMpServiceProtocolGuid
>gEfiGlobalNvsAreaProtocolGuid
>gEfiTcgProtocolGuid
> -  gEfiFirmwareVolumeProtocolGuid
> +  gEfiFirmwareVolume2ProtocolGuid
>gIgdOpRegionProtocolGuid
> 
>  [Pcd]
> diff --git a/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c
> b/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c
> index 08f5df2a25..27ae9de7a0 100644
> --- a/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c
> +++ b/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c
> @@ -36,7 +36,7 @@ Abstract:
>  #include 
>  #include 
>  #include 
> -#include 
> +#include 
>  #include 
>  #include 
> 
> @@ -66,12 +66,12 @@ GetRawImage (
>EFI_HANDLE*HandleBuffer;
>UINTN HandleCount;
>UINTN Index;
> -  EFI_FIRMWARE_VOLUME_PROTOCOL  *Fv;
> +  EFI_FIRMWARE_VOLUME2_PROTOCOL  *Fv;
>UINT32Authenti

[edk2] [Patch V2 1/3] Vlv2TbltDevicePkg: ECP Cleanup.

2019-03-19 Thread Zailiang Sun 
In V2: no new changes

Remove modules of EdkCompatibilityPkg from DSC/FDF of Vlv2TbltDevicePkg to make
this platform ECP free.

Test: Boot to 64-bit Windows 10.

Cc: Zailiang Sun 
Cc: Yi Qian 
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: David Wei 
---
 Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c   |  8 
 Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf |  4 ++--
 Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c |  8 
 Vlv2TbltDevicePkg/PciPlatform/PciPlatform.inf   |  4 ++--
 Vlv2TbltDevicePkg/PlatformPei/BootMode.c| 56 
++--
 Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf   |  4 +---
 Vlv2TbltDevicePkg/PlatformPkg.fdf   | 11 +--
 Vlv2TbltDevicePkg/PlatformPkgGcc.fdf| 10 --
 Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 87 
---
 Vlv2TbltDevicePkg/PlatformPkgIA32.dsc   | 91 
+++
 Vlv2TbltDevicePkg/PlatformPkgX64.dsc| 87 
---
 Vlv2TbltDevicePkg/PlatformSmm/PlatformSmm.inf   |  6 +++---
 Vlv2TbltDevicePkg/VlvPlatformInitDxe/IgdOpRegion.c  | 10 +-
 Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf |  6 +++---
 14 files changed, 30 insertions(+), 362 deletions(-)

diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c 
b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
index 4a913eb723..d575533319 100644
--- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
+++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
@@ -1,6 +1,6 @@
 /** @file
 
-  Copyright (c) 2004  - 2016, Intel Corporation. All rights reserved.
+  Copyright (c) 2004  - 2018, Intel Corporation. All rights reserved.
 
 
   This program and the accompanying materials are licensed and made available 
under
@@ -35,7 +35,7 @@ Abstract:
 
 #include 
 #include 
-#include 
+#include 
 #include "AcpiPlatform.h"
 #include "AcpiPlatformHooks.h"
 #include "AcpiPlatformHooksLib.h"
@@ -785,7 +785,7 @@ AcpiPlatformEntryPoint (
   EFI_STATUSStatus;
   EFI_STATUSAcpiStatus;
   EFI_ACPI_SUPPORT_PROTOCOL *AcpiSupport;
-  EFI_FIRMWARE_VOLUME_PROTOCOL  *FwVol;
+  EFI_FIRMWARE_VOLUME2_PROTOCOL  *FwVol;
   INTN  Instance;
   EFI_ACPI_COMMON_HEADER*CurrentTable;
   UINTN TableHandle;
@@ -856,7 +856,7 @@ AcpiPlatformEntryPoint (
   //
   // Locate the firmware volume protocol.
   //
-  Status = LocateSupportProtocol (&gEfiFirmwareVolumeProtocolGuid, (VOID **) 
&FwVol, 1);
+  Status = LocateSupportProtocol (&gEfiFirmwareVolume2ProtocolGuid, (VOID **) 
&FwVol, 1);
   ASSERT_EFI_ERROR (Status);
 
   //
diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf 
b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf
index 24fa913b33..74a531369d 100644
--- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf
+++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.inf
@@ -1,6 +1,6 @@
 #
 #
-# Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
+# Copyright (c)  1999  - 2018, Intel Corporation. All rights reserved
 #  


 # This program and the accompanying materials are licensed and made available 
under

 # the terms and conditions of the BSD License that accompanies this 
distribution.  

@@ -77,7 +77,7 @@
   gEfiMpServiceProtocolGuid
   gEfiGlobalNvsAreaProtocolGuid
   gEfiTcgProtocolGuid
-  gEfiFirmwareVolumeProtocolGuid
+  gEfiFirmwareVolume2ProtocolGuid
   gIgdOpRegionProtocolGuid
 
 [Pcd]
diff --git a/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c 
b/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c
index 08f5df2a25..27ae9de7a0 100644
--- a/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c
+++ b/Vlv2TbltDevicePkg/PciPlatform/PciPlatform.c
@@ -36,7 +36,7 @@ Abstract:
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 
@@ -66,12 +66,12 @@ GetRawImage (
   EFI_HANDLE*HandleBuffer;
   UINTN HandleCount;
   UINTN Index;
-  EFI_FIRMWARE_VOLUME_PROTOCOL  *Fv;
+  EFI_FIRMWARE_VOLUME2_PROTOCOL  *Fv;
   UINT32AuthenticationStatus;
 
   Status = gBS->LocateHandleBuffer (
   ByProtocol,
-  &gEfiFirmwareVolumeProtocolGuid,
+  &gEfiFirmwareVolume2ProtocolGuid,
   NULL,
   &HandleCount,
   &HandleBuffer
@@ -86,7 +86,7 @@ GetRawImage (
   for (Index = 0; Index < HandleCount; Index++) {
 Status = gBS->HandleProtocol(