| Message ID | 20210210194857.117699-2-alex.hung@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] fwts_framework: skip sbbr & ebbr on non-aarch64 systems | expand |
On 10/02/2021 19:48, Alex Hung wrote: > BugLink: https://bugs.launchpad.net/bugs/1915210 > > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > src/sbbr/acpitables/acpitables.c | 3 ++- > src/sbbr/fadt/fadt.c | 2 +- > src/sbbr/rsdp/rsdp.c | 2 +- > 3 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/src/sbbr/acpitables/acpitables.c b/src/sbbr/acpitables/acpitables.c > index 9e514e76..aed2908e 100644 > --- a/src/sbbr/acpitables/acpitables.c > +++ b/src/sbbr/acpitables/acpitables.c > @@ -16,7 +16,8 @@ > */ > #include "fwts.h" > > -#if defined(FWTS_HAS_ACPI) > +#if defined(FWTS_HAS_ACPI) && (FWTS_ARCH_AARCH64) > + > #include "acpi.h" > #include "accommon.h" > #include "acnamesp.h" > diff --git a/src/sbbr/fadt/fadt.c b/src/sbbr/fadt/fadt.c > index e4766881..2c3ead40 100644 > --- a/src/sbbr/fadt/fadt.c > +++ b/src/sbbr/fadt/fadt.c > @@ -20,7 +20,7 @@ > */ > #include "fwts.h" > > -#if defined(FWTS_HAS_ACPI) > +#if defined(FWTS_HAS_ACPI) && (FWTS_ARCH_AARCH64) > > #include "fwts_acpi_object_eval.h" > > diff --git a/src/sbbr/rsdp/rsdp.c b/src/sbbr/rsdp/rsdp.c > index 70f8ec5c..e8c5aacc 100644 > --- a/src/sbbr/rsdp/rsdp.c > +++ b/src/sbbr/rsdp/rsdp.c > @@ -17,7 +17,7 @@ > */ > #include "fwts.h" > > -#if defined(FWTS_HAS_ACPI) > +#if defined(FWTS_HAS_ACPI) && (FWTS_ARCH_AARCH64) > > #include <stdlib.h> > #include <stdio.h> > Acked-by: Colin Ian King <colin.king@canonical.com>
On 2/11/21 3:48 AM, Alex Hung wrote: > BugLink: https://bugs.launchpad.net/bugs/1915210 > > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > src/sbbr/acpitables/acpitables.c | 3 ++- > src/sbbr/fadt/fadt.c | 2 +- > src/sbbr/rsdp/rsdp.c | 2 +- > 3 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/src/sbbr/acpitables/acpitables.c b/src/sbbr/acpitables/acpitables.c > index 9e514e76..aed2908e 100644 > --- a/src/sbbr/acpitables/acpitables.c > +++ b/src/sbbr/acpitables/acpitables.c > @@ -16,7 +16,8 @@ > */ > #include "fwts.h" > > -#if defined(FWTS_HAS_ACPI) > +#if defined(FWTS_HAS_ACPI) && (FWTS_ARCH_AARCH64) > + > #include "acpi.h" > #include "accommon.h" > #include "acnamesp.h" > diff --git a/src/sbbr/fadt/fadt.c b/src/sbbr/fadt/fadt.c > index e4766881..2c3ead40 100644 > --- a/src/sbbr/fadt/fadt.c > +++ b/src/sbbr/fadt/fadt.c > @@ -20,7 +20,7 @@ > */ > #include "fwts.h" > > -#if defined(FWTS_HAS_ACPI) > +#if defined(FWTS_HAS_ACPI) && (FWTS_ARCH_AARCH64) > > #include "fwts_acpi_object_eval.h" > > diff --git a/src/sbbr/rsdp/rsdp.c b/src/sbbr/rsdp/rsdp.c > index 70f8ec5c..e8c5aacc 100644 > --- a/src/sbbr/rsdp/rsdp.c > +++ b/src/sbbr/rsdp/rsdp.c > @@ -17,7 +17,7 @@ > */ > #include "fwts.h" > > -#if defined(FWTS_HAS_ACPI) > +#if defined(FWTS_HAS_ACPI) && (FWTS_ARCH_AARCH64) > > #include <stdlib.h> > #include <stdio.h> > Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff --git a/src/sbbr/acpitables/acpitables.c b/src/sbbr/acpitables/acpitables.c index 9e514e76..aed2908e 100644 --- a/src/sbbr/acpitables/acpitables.c +++ b/src/sbbr/acpitables/acpitables.c @@ -16,7 +16,8 @@ */ #include "fwts.h" -#if defined(FWTS_HAS_ACPI) +#if defined(FWTS_HAS_ACPI) && (FWTS_ARCH_AARCH64) + #include "acpi.h" #include "accommon.h" #include "acnamesp.h" diff --git a/src/sbbr/fadt/fadt.c b/src/sbbr/fadt/fadt.c index e4766881..2c3ead40 100644 --- a/src/sbbr/fadt/fadt.c +++ b/src/sbbr/fadt/fadt.c @@ -20,7 +20,7 @@ */ #include "fwts.h" -#if defined(FWTS_HAS_ACPI) +#if defined(FWTS_HAS_ACPI) && (FWTS_ARCH_AARCH64) #include "fwts_acpi_object_eval.h" diff --git a/src/sbbr/rsdp/rsdp.c b/src/sbbr/rsdp/rsdp.c index 70f8ec5c..e8c5aacc 100644 --- a/src/sbbr/rsdp/rsdp.c +++ b/src/sbbr/rsdp/rsdp.c @@ -17,7 +17,7 @@ */ #include "fwts.h" -#if defined(FWTS_HAS_ACPI) +#if defined(FWTS_HAS_ACPI) && (FWTS_ARCH_AARCH64) #include <stdlib.h> #include <stdio.h>
BugLink: https://bugs.launchpad.net/bugs/1915210 Signed-off-by: Alex Hung <alex.hung@canonical.com> --- src/sbbr/acpitables/acpitables.c | 3 ++- src/sbbr/fadt/fadt.c | 2 +- src/sbbr/rsdp/rsdp.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-)