From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: michael.d.kinney@intel.com) Received: from mga04.intel.com (mga04.intel.com []) by groups.io with SMTP; Mon, 22 Jul 2019 15:59:07 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Jul 2019 15:59:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,296,1559545200"; d="scan'208";a="169386514" Received: from mdkinney-mobl2.amr.corp.intel.com ([10.254.83.213]) by fmsmga008.fm.intel.com with ESMTP; 22 Jul 2019 15:59:07 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian , Gary Lin Subject: [edk2-platforms Patch V3 12/12] Vlv2TbltDevicePkg/PlatformDxe: Use S3BootScriptWidth enums Date: Mon, 22 Jul 2019 15:58:59 -0700 Message-Id: <20190722225859.24724-13-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190722225859.24724-1-michael.d.kinney@intel.com> References: <20190722225859.24724-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Update to use S3BootScriptWidth enum values instead of EfiBootScriptWidth enum values when calling S3BootScriptLib services. This fixes an XCODE5 build failure. Cc: Zailiang Sun Cc: Yi Qian Cc: Gary Lin Signed-off-by: Michael D Kinney --- .../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