[edk2-devel] [edk2-platforms Patch V3 12/12] Vlv2TbltDevicePkg/PlatformDxe: Use S3BootScriptWidth enums

Gary Lin glin at suse.com
Tue Jul 23 08:54:39 UTC 2019


On Mon, Jul 22, 2019 at 03:58:59PM -0700, Michael D Kinney wrote:
> Update to use S3BootScriptWidth enum values instead of
> EfiBootScriptWidth enum values when calling S3BootScriptLib
> services.  This fixes an XCODE5 build failure.
> 
Reviewed-by: Gary Lin <glin at suse.com>

> Cc: Zailiang Sun <zailiang.sun at intel.com>
> Cc: Yi Qian <yi.qian at intel.com>
> Cc: Gary Lin <glin at suse.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney at intel.com>
> ---
>  .../Intel/Vlv2TbltDevicePkg/PlatformDxe/Platform.c     | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/Platform.c b/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/Platform.c
> index 0bc3f44c49..d9782aafba 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/Platform.c
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/Platform.c
> @@ -968,25 +968,25 @@ PchInitBeforeBoot()
>    // Saved SPI Opcode menu to fix EFI variable unable to write after S3 resume.
>    //
>    S3BootScriptSaveMemWrite (
> -                         EfiBootScriptWidthUint32,
> +                         S3BootScriptWidthUint32,
>                           (UINTN)(SPI_BASE_ADDRESS + (R_PCH_SPI_OPMENU0)),
>                           1,
>                           (VOID *)(UINTN)(SPI_BASE_ADDRESS + (R_PCH_SPI_OPMENU0)));
>  
>    S3BootScriptSaveMemWrite (
> -                         EfiBootScriptWidthUint32,
> +                         S3BootScriptWidthUint32,
>                           (UINTN)(SPI_BASE_ADDRESS + (R_PCH_SPI_OPMENU1)),
>                           1,
>                           (VOID *)(UINTN)(SPI_BASE_ADDRESS + (R_PCH_SPI_OPMENU1)));
>  
>    S3BootScriptSaveMemWrite (
> -                         EfiBootScriptWidthUint16,
> +                         S3BootScriptWidthUint16,
>                           (UINTN)(SPI_BASE_ADDRESS + R_PCH_SPI_OPTYPE),
>                           1,
>                           (VOID *)(UINTN)(SPI_BASE_ADDRESS + R_PCH_SPI_OPTYPE));
>  
>    S3BootScriptSaveMemWrite (
> -                         EfiBootScriptWidthUint16,
> +                         S3BootScriptWidthUint16,
>                           (UINTN)(SPI_BASE_ADDRESS + R_PCH_SPI_PREOP),
>                           1,
>                           (VOID *)(UINTN)(SPI_BASE_ADDRESS + R_PCH_SPI_PREOP));
> @@ -995,7 +995,7 @@ PchInitBeforeBoot()
>    // Saved MTPMC_1 for S3 resume.
>    //
>    S3BootScriptSaveMemWrite (
> -                         EfiBootScriptWidthUint32,
> +                         S3BootScriptWidthUint32,
>                           (UINTN)(PMC_BASE_ADDRESS + R_PCH_PMC_MTPMC1),
>                           1,
>                           (VOID *)(UINTN)(PMC_BASE_ADDRESS + R_PCH_PMC_MTPMC1));
> -- 
> 2.21.0.windows.1
> 
> 

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#44230): https://edk2.groups.io/g/devel/message/44230
Mute This Topic: https://groups.io/mt/32564739/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-





More information about the edk2-devel-archive mailing list