public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Michael D Kinney" <michael.d.kinney@intel.com>
To: devel@edk2.groups.io
Cc: Zailiang Sun <zailiang.sun@intel.com>,
	Yi Qian <yi.qian@intel.com>, Gary Lin <glin@suse.com>
Subject: [edk2-platforms Patch V3 11/12] Vlv2TbltDevicePkg: Remove __GNUC__ specific #ifdefs
Date: Mon, 22 Jul 2019 15:58:58 -0700	[thread overview]
Message-ID: <20190722225859.24724-12-michael.d.kinney@intel.com> (raw)
In-Reply-To: <20190722225859.24724-1-michael.d.kinney@intel.com>

Remove #ifdefs for __GNUC__, so the builds are the
same for GCC, VS20xx, and XCODE5.  This resolves an
XCODE5 build break for an unsupported pragma.

Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Gary Lin <glin@suse.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 .../AcpiPlatform/AcpiPlatform.c               |  3 --
 .../BoardClkGens/BoardClkGens.c               |  8 ----
 .../PlatformInitPei/CpuInitPeim.c             | 12 -----
 .../PlatformInitPei/PlatformEarlyInit.c       | 46 -------------------
 .../PlatformInitPei/PlatformEarlyInit.h       |  6 ---
 5 files changed, 75 deletions(-)

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
index 3e0b978120..37f899d7f5 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
@@ -51,9 +51,6 @@ CHAR16    gACPIOSFRRefDataBlockVariableName[] = ACPI_OSFR_REF_DATA_BLOCK_VARIABL
 CHAR16    gACPIOSFRMfgStringVariableName[] = ACPI_OSFR_MFG_STRING_VARIABLE_NAME;
 
 EFI_GLOBAL_NVS_AREA_PROTOCOL            mGlobalNvsArea;
-#ifndef __GNUC__
-#pragma optimize("", off)
-#endif
 BOOLEAN                   mFirstNotify;
 EFI_PLATFORM_INFO_HOB     *mPlatformInfo;
 EFI_GUID                  mSystemConfigurationGuid = SYSTEM_CONFIGURATION_GUID;
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c b/Platform/Intel/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
index 4356f7b366..f00f10cfcc 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
@@ -12,10 +12,6 @@
 #include <Ppi/ReadOnlyVariable2.h>
 #include <Library/BaseMemoryLib.h>
 
-#ifndef __GNUC__
-#pragma optimize( "", off )
-#endif
-
 #define CLKGEN_EN 1
 #define EFI_DEBUG 1
 
@@ -415,7 +411,3 @@ InstallPlatformClocksNotify (
   return EFI_SUCCESS;
 
 }
-
-#ifndef __GNUC__
-#pragma optimize( "", on )
-#endif
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/CpuInitPeim.c b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/CpuInitPeim.c
index a3a3d5cbc9..d52c449318 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/CpuInitPeim.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/CpuInitPeim.c
@@ -28,17 +28,5 @@ PlatformCpuInit (
   IN EFI_PLATFORM_CPU_INFO       *PlatformCpuInfo
   )
 {
-  BOOLEAN                     ResetRequired;
-
-  //
-  // Variable initialization
-  //
-  ResetRequired = FALSE;
-
-
-  if (ResetRequired) {
-    CpuOnlyReset(PeiServices);
-  }
-
   return EFI_SUCCESS;
 }
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c
index d3e62e3bd0..59845a69c4 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.c
@@ -17,15 +17,6 @@ Abstract:
 
 #include "PlatformEarlyInit.h"
 
-#ifdef __GNUC__
-#pragma GCC push_options
-#pragma GCC optimize ("O0")
-#else
-#pragma optimize ("", off)
-#endif
-
-
-
 static EFI_PEI_STALL_PPI  mStallPpi = {
   PEI_STALL_RESOLUTION,
   Stall
@@ -963,40 +954,3 @@ PlatformEarlyInitEntry (
 
   return Status;
 }
-
-EFI_STATUS
-EFIAPI
-CpuOnlyReset (
-  IN CONST EFI_PEI_SERVICES   **PeiServices
-  )
-{
-//  MsgBus32Write(CDV_UNIT_PUNIT, PUNIT_CPU_RST, 0x01)
-#ifdef __GNUC__
-  __asm__
-  (
-   "xorl %ecx, %ecx\n"
-   "1:hlt; hlt; hlt\n"
-   "jmp 1b\n"
-  );
-#else
-  _asm {
-    xor   ecx, ecx
-  HltLoop:
-    hlt
-    hlt
-    hlt
-    loop  HltLoop
-  }
-#endif
-  //
-  // If we get here we need to mark it as a failure.
-  //
-  return EFI_UNSUPPORTED;
-}
-
-
-#ifdef __GNUC__
-#pragma GCC pop_options
-#else
-#pragma optimize ("", on)
-#endif
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h
index 8c02adba64..4c6b0795ec 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformInitPei/PlatformEarlyInit.h
@@ -1375,12 +1375,6 @@ BOOLEAN
 IsA16Inverted (
   );
 
-EFI_STATUS
-EFIAPI
-CpuOnlyReset (
-  IN CONST EFI_PEI_SERVICES   **PeiServices
-  );
-
 EFI_STATUS
 EFIAPI
 InitLan (
-- 
2.21.0.windows.1


  parent reply	other threads:[~2019-07-22 22:59 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-22 22:58 [edk2-platforms Patch V3 00/12] Vlv2Tbl2DevicePkg: Remove Linux/Windows differences Michael D Kinney
2019-07-22 22:58 ` [edk2-platforms Patch V3 01/12] Vlv2TbltDevicePkg/PlatformPei: Add boot mode detection Michael D Kinney
2019-07-23  1:29   ` Sun, Zailiang
2019-07-22 22:58 ` [edk2-platforms Patch V3 02/12] Vlv2TbltDevicePkg: Convert use of FCE tool to Structured PCD Michael D Kinney
2019-07-23  1:30   ` Sun, Zailiang
2019-07-22 22:58 ` [edk2-platforms Patch V3 03/12] Vlv2TbltDevicePkg: Remove Linux/GCC specific DSC/FDF files Michael D Kinney
2019-07-23  1:30   ` Sun, Zailiang
2019-07-23  8:28   ` Gary Lin
2019-07-22 22:58 ` [edk2-platforms Patch V3 04/12] Vlv2TbltDevicePkg: Convert BAT/sh Capsule scripts to Python Michael D Kinney
2019-07-23  1:30   ` [edk2-devel] " Sun, Zailiang
2019-07-23  8:43   ` Gary Lin
2019-07-22 22:58 ` [edk2-platforms Patch V3 05/12] Vlv2Tbl2DevicePkg: Convert BAT/sh Build " Michael D Kinney
2019-07-23  1:30   ` Sun, Zailiang
2019-07-23  8:27   ` Gary Lin
2019-07-22 22:58 ` [edk2-platforms Patch V3 06/12] Vlv2TbltDevicePkg: Remove non ASCII characters from source files Michael D Kinney
2019-07-23  1:31   ` Sun, Zailiang
2019-07-23  8:46   ` Gary Lin
2019-07-22 22:58 ` [edk2-platforms Patch V3 07/12] Vlv2Tbl2DevicePkg/EfiRegTableLib: Use S3_BOOT_SCRIPT_LIB_WIDTH Michael D Kinney
2019-07-23  1:31   ` Sun, Zailiang
2019-07-23  8:52   ` Gary Lin
2019-07-22 22:58 ` [edk2-platforms Patch V3 08/12] Vlv2TbltDevicePkg/PlatformDxe: Add missing #if Michael D Kinney
2019-07-23  1:31   ` Sun, Zailiang
2019-07-22 22:58 ` [edk2-platforms Patch V3 09/12] Vlv2TbltDevicePkg: Add XCODE5 4K alignment DLINK_FLAGS Michael D Kinney
2019-07-23  1:31   ` Sun, Zailiang
2019-07-22 22:58 ` [edk2-platforms Patch V3 10/12] Vlv2TbltDevicePkg: Fix XCODE5 build errors Michael D Kinney
2019-07-23  1:31   ` Sun, Zailiang
2019-07-22 22:58 ` Michael D Kinney [this message]
2019-07-23  1:31   ` [edk2-devel] [edk2-platforms Patch V3 11/12] Vlv2TbltDevicePkg: Remove __GNUC__ specific #ifdefs Sun, Zailiang
2019-07-22 22:58 ` [edk2-platforms Patch V3 12/12] Vlv2TbltDevicePkg/PlatformDxe: Use S3BootScriptWidth enums Michael D Kinney
2019-07-23  1:31   ` Sun, Zailiang
2019-07-23  8:54   ` Gary Lin
2019-07-23  1:29 ` [edk2-platforms Patch V3 00/12] Vlv2Tbl2DevicePkg: Remove Linux/Windows differences Sun, Zailiang
2019-07-23  8:57 ` Gary Lin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190722225859.24724-12-michael.d.kinney@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox