aboutsummaryrefslogtreecommitdiff
path: root/Platforms
diff options
context:
space:
mode:
authorAlexei Fedorov <Alexei.Fedorov@arm.com>2016-06-08 17:59:14 +0100
committerLeif Lindholm <leif.lindholm@linaro.org>2016-06-28 10:56:22 +0100
commitb52d0b38cfb642a34534a63e045c903d43263adb (patch)
treeede4f9f0738583149fe188c306bdca92702925a6 /Platforms
parentce9c1b7dbb2f5d506240626c77b685adbdeeda8e (diff)
Platforms/ARM/Juno: Fix FADT Compilation Bug
#if ARM_JUNO_ACPI_5_0 causes the GCC error listed below k:\edk2\OpenPlatformPkg\Platforms\ARM\Juno\AcpiTables\Fadt.aslc:76:22: error: #if with no expression when ARM_JUNO_ACPI_5_0 is defined in edk2\ArmPlatformPkg\ArmJunoPkg\Include\ArmPlatform.h: The problem occurs because the macro is defined but has no value. The bug is corrected by replacing #if ARM_JUNO_ACPI_5_0 with #ifdef ARM_JUNO_ACPI_5_0 This usage is also consistent with that on line 20 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Alexei Fedorov <Alexei.Fedorov@arm.com> Signed-off-by: Evan Lloyd <Evan.Lloyd@arm.com> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Diffstat (limited to 'Platforms')
-rw-r--r--Platforms/ARM/Juno/AcpiTables/Fadt.aslc4
1 files changed, 2 insertions, 2 deletions
diff --git a/Platforms/ARM/Juno/AcpiTables/Fadt.aslc b/Platforms/ARM/Juno/AcpiTables/Fadt.aslc
index eafdecb..6b75629 100644
--- a/Platforms/ARM/Juno/AcpiTables/Fadt.aslc
+++ b/Platforms/ARM/Juno/AcpiTables/Fadt.aslc
@@ -1,7 +1,7 @@
/** @file
* Fixed ACPI Description Table (FADT)
*
-* Copyright (c) 2012 - 2014, ARM Limited. All rights reserved.
+* Copyright (c) 2012 - 2016, ARM Limited. All rights reserved.
*
* This program and the accompanying materials
* are licensed and made available under the terms and conditions of the BSD License
@@ -72,7 +72,7 @@ EFI_ACPI_5_1_FIXED_ACPI_DESCRIPTION_TABLE Fadt = {
EFI_ACPI_5_0_HW_REDUCED_ACPI | EFI_ACPI_5_0_LOW_POWER_S0_IDLE_CAPABLE, // UINT32 Flags
NULL_GAS, // EFI_ACPI_5_0_GENERIC_ADDRESS_STRUCTURE ResetReg
0, // UINT8 ResetValue
-#if ARM_JUNO_ACPI_5_0
+#ifdef ARM_JUNO_ACPI_5_0
{EFI_ACPI_RESERVED_BYTE,EFI_ACPI_RESERVED_BYTE,EFI_ACPI_RESERVED_BYTE}, // UINT8 Reserved2[3]
#else
EFI_ACPI_5_1_ARM_PSCI_COMPLIANT, // UINT16 ArmBootArchFlags