| Message ID | 20230428120405.3770496-2-nikos.nikoleris@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | EFI and ACPI support for arm64 | expand |
On 4/28/23 20:03, Nikos Nikoleris wrote: > Move acpi.h to lib to make it available for other architectures. > > Signed-off-by: Nikos Nikoleris <nikos.nikoleris@arm.com> Reviewed-by: Shaoqin Huang <shahuang@redhat.com> > --- > x86/Makefile.common | 2 +- > lib/x86/asm/setup.h | 2 +- > lib/{x86 => }/acpi.h | 4 ++-- > lib/{x86 => }/acpi.c | 0 > x86/s3.c | 2 +- > x86/vmexit.c | 2 +- > 6 files changed, 6 insertions(+), 6 deletions(-) > rename lib/{x86 => }/acpi.h (99%) > rename lib/{x86 => }/acpi.c (100%) > > diff --git a/x86/Makefile.common b/x86/Makefile.common > index 365e199f..9f2bc93f 100644 > --- a/x86/Makefile.common > +++ b/x86/Makefile.common > @@ -2,6 +2,7 @@ > > all: directories test_cases > > +cflatobjs += lib/acpi.o > cflatobjs += lib/pci.o > cflatobjs += lib/pci-edu.o > cflatobjs += lib/alloc.o > @@ -18,7 +19,6 @@ cflatobjs += lib/x86/apic.o > cflatobjs += lib/x86/atomic.o > cflatobjs += lib/x86/desc.o > cflatobjs += lib/x86/isr.o > -cflatobjs += lib/x86/acpi.o > cflatobjs += lib/x86/stack.o > cflatobjs += lib/x86/fault_test.o > cflatobjs += lib/x86/delay.o > diff --git a/lib/x86/asm/setup.h b/lib/x86/asm/setup.h > index 1f384274..458eac85 100644 > --- a/lib/x86/asm/setup.h > +++ b/lib/x86/asm/setup.h > @@ -4,7 +4,7 @@ > unsigned long setup_tss(u8 *stacktop); > > #ifdef CONFIG_EFI > -#include "x86/acpi.h" > +#include "acpi.h" > #include "x86/apic.h" > #include "x86/processor.h" > #include "x86/smp.h" > diff --git a/lib/x86/acpi.h b/lib/acpi.h > similarity index 99% > rename from lib/x86/acpi.h > rename to lib/acpi.h > index 67ba3899..1e89840c 100644 > --- a/lib/x86/acpi.h > +++ b/lib/acpi.h > @@ -1,5 +1,5 @@ > -#ifndef _X86_ACPI_H_ > -#define _X86_ACPI_H_ > +#ifndef _ACPI_H_ > +#define _ACPI_H_ > > #include "libcflat.h" > > diff --git a/lib/x86/acpi.c b/lib/acpi.c > similarity index 100% > rename from lib/x86/acpi.c > rename to lib/acpi.c > diff --git a/x86/s3.c b/x86/s3.c > index 6e41d0c4..378d37ae 100644 > --- a/x86/s3.c > +++ b/x86/s3.c > @@ -1,5 +1,5 @@ > #include "libcflat.h" > -#include "x86/acpi.h" > +#include "acpi.h" > #include "asm/io.h" > > static u32* find_resume_vector_addr(void) > diff --git a/x86/vmexit.c b/x86/vmexit.c > index 2e8866e1..9260accc 100644 > --- a/x86/vmexit.c > +++ b/x86/vmexit.c > @@ -1,9 +1,9 @@ > #include "libcflat.h" > +#include "acpi.h" > #include "smp.h" > #include "pci.h" > #include "x86/vm.h" > #include "x86/desc.h" > -#include "x86/acpi.h" > #include "x86/apic.h" > #include "x86/isr.h" >
diff --git a/x86/Makefile.common b/x86/Makefile.common index 365e199f..9f2bc93f 100644 --- a/x86/Makefile.common +++ b/x86/Makefile.common @@ -2,6 +2,7 @@ all: directories test_cases +cflatobjs += lib/acpi.o cflatobjs += lib/pci.o cflatobjs += lib/pci-edu.o cflatobjs += lib/alloc.o @@ -18,7 +19,6 @@ cflatobjs += lib/x86/apic.o cflatobjs += lib/x86/atomic.o cflatobjs += lib/x86/desc.o cflatobjs += lib/x86/isr.o -cflatobjs += lib/x86/acpi.o cflatobjs += lib/x86/stack.o cflatobjs += lib/x86/fault_test.o cflatobjs += lib/x86/delay.o diff --git a/lib/x86/asm/setup.h b/lib/x86/asm/setup.h index 1f384274..458eac85 100644 --- a/lib/x86/asm/setup.h +++ b/lib/x86/asm/setup.h @@ -4,7 +4,7 @@ unsigned long setup_tss(u8 *stacktop); #ifdef CONFIG_EFI -#include "x86/acpi.h" +#include "acpi.h" #include "x86/apic.h" #include "x86/processor.h" #include "x86/smp.h" diff --git a/lib/x86/acpi.h b/lib/acpi.h similarity index 99% rename from lib/x86/acpi.h rename to lib/acpi.h index 67ba3899..1e89840c 100644 --- a/lib/x86/acpi.h +++ b/lib/acpi.h @@ -1,5 +1,5 @@ -#ifndef _X86_ACPI_H_ -#define _X86_ACPI_H_ +#ifndef _ACPI_H_ +#define _ACPI_H_ #include "libcflat.h" diff --git a/lib/x86/acpi.c b/lib/acpi.c similarity index 100% rename from lib/x86/acpi.c rename to lib/acpi.c diff --git a/x86/s3.c b/x86/s3.c index 6e41d0c4..378d37ae 100644 --- a/x86/s3.c +++ b/x86/s3.c @@ -1,5 +1,5 @@ #include "libcflat.h" -#include "x86/acpi.h" +#include "acpi.h" #include "asm/io.h" static u32* find_resume_vector_addr(void) diff --git a/x86/vmexit.c b/x86/vmexit.c index 2e8866e1..9260accc 100644 --- a/x86/vmexit.c +++ b/x86/vmexit.c @@ -1,9 +1,9 @@ #include "libcflat.h" +#include "acpi.h" #include "smp.h" #include "pci.h" #include "x86/vm.h" #include "x86/desc.h" -#include "x86/acpi.h" #include "x86/apic.h" #include "x86/isr.h"
Move acpi.h to lib to make it available for other architectures. Signed-off-by: Nikos Nikoleris <nikos.nikoleris@arm.com> --- x86/Makefile.common | 2 +- lib/x86/asm/setup.h | 2 +- lib/{x86 => }/acpi.h | 4 ++-- lib/{x86 => }/acpi.c | 0 x86/s3.c | 2 +- x86/vmexit.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename lib/{x86 => }/acpi.h (99%) rename lib/{x86 => }/acpi.c (100%)