From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5913721D2E633 for ; Wed, 23 Aug 2017 20:14:10 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Aug 2017 20:16:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,419,1498546800"; d="dat'59?scan'59,208,59";a="1007082103" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga003.jf.intel.com with ESMTP; 23 Aug 2017 20:16:44 -0700 Received: from fmsmsx112.amr.corp.intel.com (10.18.116.6) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 23 Aug 2017 20:16:43 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by FMSMSX112.amr.corp.intel.com (10.18.116.6) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 23 Aug 2017 20:16:43 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.183]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.219]) with mapi id 14.03.0319.002; Thu, 24 Aug 2017 11:16:04 +0800 From: "Guo, Mang" To: "edk2-devel@lists.01.org" Thread-Topic: [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017 02/1 BroxtonPlatformPkg: Code cleanup Thread-Index: AdMch1F6bCOC1pInSvGO4MQj6FSftw== Date: Thu, 24 Aug 2017 03:16:03 +0000 Message-ID: <22D2C85ED001C54AA20BFE3B0E4751D15253FC04@shsmsx102.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: <22D2C85ED001C54AA20BFE3B0E4751D15253FC04@shsmsx102.ccr.corp.intel.com> x-originating-ip: [10.239.127.40] MIME-Version: 1.0 X-Content-Filtered-By: Mailman/MimeDel 2.1.22 Subject: [Patch][edk2-platforms/devel-MinnowBoard3-UDK2017 02/1 BroxtonPlatformPkg: Code cleanup X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Aug 2017 03:14:10 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Guo Mang --- .../BensonGlacier/BoardInitPreMem/BoardInit.c | 11 +------ .../BensonGlacier/BoardInitPreMem/BoardInit.h | 16 +++++++-- .../Common/Acpi/AcpiTablesPCAT/AcpiTablePlatform.h | 4 +-- .../Common/Acpi/AcpiTablesPCAT/ScLpss.asl | 38 +-----------------= ---- .../PlatformPreMemPei/BoardGpiosPreMem.c | 4 +-- .../PlatformPreMemPei/PlatformInitPreMem.c | 2 +- .../PlatformSetupDxe/PlatformSetupDxe.c | 1 + 7 files changed, 22 insertions(+), 54 deletions(-) diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMe= m/BoardInit.c b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPr= eMem/BoardInit.c index 122ed9a..24cfaf3 100644 --- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/Board= Init.c +++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/Board= Init.c @@ -13,16 +13,7 @@ =20 **/ =20 -#include -#include -#include -#include -#include -#include -#include #include "BoardInit.h" -#include "PlatformId.h" -#include "BoardInitMiscs.h" =20 EFI_STATUS EFIAPI @@ -60,7 +51,7 @@ BensonGlacierPreMemInit ( UINT8 FabId; =20 BoardId =3D 0; - FabId =3D 0; + FabId =3D 0; Status =3D PeiServicesLocatePpi ( &gBoardPreMemInitDoneGuid, 0, diff --git a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMe= m/BoardInit.h b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPr= eMem/BoardInit.h index 0a549c2..3153776 100644 --- a/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/Board= Init.h +++ b/Platform/BroxtonPlatformPkg/Board/BensonGlacier/BoardInitPreMem/Board= Init.h @@ -18,10 +18,22 @@ #define _BENSON_BOARDINIT_H_ =20 #include -#include + +#include + +#include +#include +#include #include +#include +#include +#include #include -#include + +#include + +#include "BoardInitMiscs.h" +#include "PlatformId.h" =20 VOID BensonGpioTest (VOID); =20 diff --git a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/AcpiTab= lePlatform.h b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/AcpiT= ablePlatform.h index f588165..73e1dda 100644 --- a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/AcpiTablePlatf= orm.h +++ b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/AcpiTablePlatf= orm.h @@ -2,7 +2,7 @@ This file describes the contents of the ACPI Fixed ACPI Description Tabl= e (FADT). =20 - Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -23,7 +23,7 @@ // ACPI table information used to initialize tables. // #define EFI_ACPI_OEM_ID 'I','N','T','E','L',' ' // OEMID 6 byt= es long -#define EFI_ACPI_OEM_TABLE_ID SIGNATURE_64('L','A','N','F','O','R','D'= ,'C') // OEM table id 8 bytes long +#define EFI_ACPI_OEM_TABLE_ID SIGNATURE_64('M','I','N','N','O','W','v'= ,'3') // OEM table id 8 bytes long #define EFI_ACPI_OEM_REVISION 0x00000005 #define EFI_ACPI_CREATOR_ID SIGNATURE_32('M','S','F','T') #define EFI_ACPI_CREATOR_REVISION 0x0100000D diff --git a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/ScLpss.= asl b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/ScLpss.asl index 9ad39c8..bb462b7 100644 --- a/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/ScLpss.asl +++ b/Platform/BroxtonPlatformPkg/Common/Acpi/AcpiTablesPCAT/ScLpss.asl @@ -1,7 +1,7 @@ /** @file ACPI DSDT table =20 - Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -47,24 +47,6 @@ scope (\_SB.PCI0) { Return (RBUF) } =20 - Device (VUT0) { - Name (_HID, "INT3511") - Method (_STA, 0x0, NotSerialized) - { - If(LEqual(OSYS,2015)) { - Return(0xf) - } - else { - Return(0) - } - } - Method(_CRS, 0x0, NotSerialized){ - Name(SBUF, ResourceTemplate (){ - UARTSerialBus(115200,,,0xfc,,,,32,32,"\\_SB.PCI0.URT1" ) - }) - Return (SBUF) - } - } //Device (VUT0) =20 } // Device (URT1) =20 @@ -91,24 +73,6 @@ scope (\_SB.PCI0) { PSAT, 32 } =20 - Device (VUT1) { - Name (_HID, "INT3512") - Method (_STA, 0x0, NotSerialized) - { - If(LEqual(OSYS,2015)) { - Return(0xf) - } - else { - Return(0) - } - } - Method(_CRS, 0x0, NotSerialized){ - Name(SBUF, ResourceTemplate (){ - UARTSerialBus(115200,,,0xfc,,,,32,32,"\\_SB.PCI0.URT2" ) - }) - Return (SBUF) - } - } // Device(VUT1) } // Device (URT2) =20 // diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPr= eMemPei/BoardGpiosPreMem.c b/Platform/BroxtonPlatformPkg/Common/PlatformSet= tings/PlatformPreMemPei/BoardGpiosPreMem.c index 73b9afc..7116ba1 100644 --- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei= /BoardGpiosPreMem.c +++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei= /BoardGpiosPreMem.c @@ -1,7 +1,7 @@ /** @file Gpio setting for multiplatform before Memory init. =20 - Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -281,7 +281,7 @@ MultiPlatformGpioUpdatePreMem ( if (SystemConfiguration.LowPowerS0Idle =3D=3D TRUE) { LpcGpioSize =3D sizeof (LpcGpio) / sizeof (LpcGpio[0]); // - // Set Indxe =3D 1 becasue the first element of LpcGpio[] has alread= y set to IOS_Masked. + // Set Index =3D 1 becasue the first element of LpcGpio[] has alread= y set to IOS_Masked. // for (Index =3D 1; Index < LpcGpioSize; Index++) { =20 diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPr= eMemPei/PlatformInitPreMem.c b/Platform/BroxtonPlatformPkg/Common/PlatformS= ettings/PlatformPreMemPei/PlatformInitPreMem.c index 49121ae..f6d6910 100644 --- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei= /PlatformInitPreMem.c +++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformPreMemPei= /PlatformInitPreMem.c @@ -1028,7 +1028,7 @@ PlatformInitPreMemEntryPoint ( MultiPlatformGpioUpdatePreMem (); =20 // - //Print out Patch version string (BXT) + // Print out Patch version string (BXT) // AsmWriteMsr64 (0x8B, 0); AsmCpuid (0x1, NULL, NULL, NULL, NULL); diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSe= tupDxe/PlatformSetupDxe.c b/Platform/BroxtonPlatformPkg/Common/PlatformSett= ings/PlatformSetupDxe/PlatformSetupDxe.c index ff59496..06dffcd 100644 --- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/= PlatformSetupDxe.c +++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/= PlatformSetupDxe.c @@ -148,6 +148,7 @@ LoadPlatformDefaultValues ( if (Private->FakeNvData.PmicSetupDefault =3D=3D 1) { Private->FakeNvData.EnableRenderStandby =3D FALSE; } + break; default: break; } --=20 2.10.1.windows.1