Thanks, pushed (with a minor trimming of the subject line).

On Tue, Jun 28, 2016 at 10:51:09AM +0100, evan.lloyd@arm.com wrote:

From: Alexei Fedorov Alexei.Fedorov@arm.com

#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

---

Platforms/ARM/Juno/AcpiTables/Fadt.aslc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Platforms/ARM/Juno/AcpiTables/Fadt.aslc b/Platforms/ARM/Juno/AcpiTables/Fadt.aslc index eafdecb8aff74a1c5899fcf552d73fce1d0cad2b..6b756292bdd14de7585c9c792a42542b88eb865e 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 -- Guid("CE165669-3EF3-493F-B85D-6190EE5B9759")