| Message ID | 20190925145750.200592-49-sjg@chromium.org |
|---|---|
| State | Accepted |
| Commit | 49a0f8cc964c612164ef101267f90266279409a7 |
| Delegated to: | Bin Meng |
| Headers | show |
| Series | x86: Add initial support for apollolake | expand |
On Wed, Sep 25, 2019 at 10:58 PM Simon Glass <sjg@chromium.org> wrote: > > At present this hedaer is only available on x86. To allow sandbox to use > it for testing, move it to a common location. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > arch/x86/cpu/baytrail/acpi.c | 2 +- > arch/x86/cpu/cpu.c | 2 +- > arch/x86/cpu/wakeup.S | 2 +- > arch/x86/lib/acpi_s3.c | 2 +- > arch/x86/lib/coreboot_table.c | 2 +- > arch/x86/lib/fsp/fsp_common.c | 2 +- > arch/x86/lib/fsp1/fsp_common.c | 2 +- > drivers/pci/pci_rom.c | 2 +- > drivers/sysreset/sysreset_x86.c | 2 +- > {arch/x86/include/asm => include}/acpi_s3.h | 0 > 10 files changed, 9 insertions(+), 9 deletions(-) > rename {arch/x86/include/asm => include}/acpi_s3.h (100%) > Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
On Sat, Oct 5, 2019 at 11:33 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > On Wed, Sep 25, 2019 at 10:58 PM Simon Glass <sjg@chromium.org> wrote: > > > > At present this hedaer is only available on x86. To allow sandbox to use > > it for testing, move it to a common location. > > > > Signed-off-by: Simon Glass <sjg@chromium.org> > > --- > > > > arch/x86/cpu/baytrail/acpi.c | 2 +- > > arch/x86/cpu/cpu.c | 2 +- > > arch/x86/cpu/wakeup.S | 2 +- > > arch/x86/lib/acpi_s3.c | 2 +- > > arch/x86/lib/coreboot_table.c | 2 +- > > arch/x86/lib/fsp/fsp_common.c | 2 +- > > arch/x86/lib/fsp1/fsp_common.c | 2 +- > > drivers/pci/pci_rom.c | 2 +- > > drivers/sysreset/sysreset_x86.c | 2 +- > > {arch/x86/include/asm => include}/acpi_s3.h | 0 > > 10 files changed, 9 insertions(+), 9 deletions(-) > > rename {arch/x86/include/asm => include}/acpi_s3.h (100%) > > > > Reviewed-by: Bin Meng <bmeng.cn@gmail.com> applied to u-boot-x86/next, thanks!
diff --git a/arch/x86/cpu/baytrail/acpi.c b/arch/x86/cpu/baytrail/acpi.c index 1e3829a433c..f44228e6939 100644 --- a/arch/x86/cpu/baytrail/acpi.c +++ b/arch/x86/cpu/baytrail/acpi.c @@ -4,10 +4,10 @@ */ #include <common.h> +#include <acpi_s3.h> #include <cpu.h> #include <dm.h> #include <dm/uclass-internal.h> -#include <asm/acpi_s3.h> #include <asm/acpi_table.h> #include <asm/io.h> #include <asm/tables.h> diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index e0b24c8df29..9cafd39ec91 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -19,13 +19,13 @@ */ #include <common.h> +#include <acpi_s3.h> #include <command.h> #include <dm.h> #include <errno.h> #include <malloc.h> #include <syscon.h> #include <asm/acpi.h> -#include <asm/acpi_s3.h> #include <asm/acpi_table.h> #include <asm/control_regs.h> #include <asm/coreboot_tables.h> diff --git a/arch/x86/cpu/wakeup.S b/arch/x86/cpu/wakeup.S index 663b02f27d8..244ca1276af 100644 --- a/arch/x86/cpu/wakeup.S +++ b/arch/x86/cpu/wakeup.S @@ -5,7 +5,7 @@ * From coreboot src/arch/x86/wakeup.S */ -#include <asm/acpi_s3.h> +#include <acpi_s3.h> #include <asm/processor.h> #include <asm/processor-flags.h> diff --git a/arch/x86/lib/acpi_s3.c b/arch/x86/lib/acpi_s3.c index 03917188a9b..197636c4b50 100644 --- a/arch/x86/lib/acpi_s3.c +++ b/arch/x86/lib/acpi_s3.c @@ -4,8 +4,8 @@ */ #include <common.h> +#include <acpi_s3.h> #include <asm/acpi.h> -#include <asm/acpi_s3.h> #include <asm/acpi_table.h> #include <asm/post.h> #include <linux/linkage.h> diff --git a/arch/x86/lib/coreboot_table.c b/arch/x86/lib/coreboot_table.c index 2d08a2db0db..8685aa30467 100644 --- a/arch/x86/lib/coreboot_table.c +++ b/arch/x86/lib/coreboot_table.c @@ -4,8 +4,8 @@ */ #include <common.h> +#include <acpi_s3.h> #include <vbe.h> -#include <asm/acpi_s3.h> #include <asm/coreboot_tables.h> #include <asm/e820.h> diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c index 6678d75ffd5..40ba866d77c 100644 --- a/arch/x86/lib/fsp/fsp_common.c +++ b/arch/x86/lib/fsp/fsp_common.c @@ -4,10 +4,10 @@ */ #include <common.h> +#include <acpi_s3.h> #include <dm.h> #include <errno.h> #include <rtc.h> -#include <asm/acpi_s3.h> #include <asm/cmos_layout.h> #include <asm/early_cmos.h> #include <asm/io.h> diff --git a/arch/x86/lib/fsp1/fsp_common.c b/arch/x86/lib/fsp1/fsp_common.c index 285ef72ebf8..e8066d8de39 100644 --- a/arch/x86/lib/fsp1/fsp_common.c +++ b/arch/x86/lib/fsp1/fsp_common.c @@ -4,10 +4,10 @@ */ #include <common.h> +#include <acpi_s3.h> #include <dm.h> #include <errno.h> #include <rtc.h> -#include <asm/acpi_s3.h> #include <asm/cmos_layout.h> #include <asm/early_cmos.h> #include <asm/io.h> diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c index 2cede1211bb..1d4064e3769 100644 --- a/drivers/pci/pci_rom.c +++ b/drivers/pci/pci_rom.c @@ -35,7 +35,7 @@ #include <linux/screen_info.h> #ifdef CONFIG_X86 -#include <asm/acpi_s3.h> +#include <acpi_s3.h> DECLARE_GLOBAL_DATA_PTR; #endif diff --git a/drivers/sysreset/sysreset_x86.c b/drivers/sysreset/sysreset_x86.c index 072f7948efa..8e2d1eaa7a1 100644 --- a/drivers/sysreset/sysreset_x86.c +++ b/drivers/sysreset/sysreset_x86.c @@ -6,11 +6,11 @@ */ #include <common.h> +#include <acpi_s3.h> #include <dm.h> #include <efi_loader.h> #include <pch.h> #include <sysreset.h> -#include <asm/acpi_s3.h> #include <asm/io.h> #include <asm/processor.h> diff --git a/arch/x86/include/asm/acpi_s3.h b/include/acpi_s3.h similarity index 100% rename from arch/x86/include/asm/acpi_s3.h rename to include/acpi_s3.h
At present this hedaer is only available on x86. To allow sandbox to use it for testing, move it to a common location. Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/x86/cpu/baytrail/acpi.c | 2 +- arch/x86/cpu/cpu.c | 2 +- arch/x86/cpu/wakeup.S | 2 +- arch/x86/lib/acpi_s3.c | 2 +- arch/x86/lib/coreboot_table.c | 2 +- arch/x86/lib/fsp/fsp_common.c | 2 +- arch/x86/lib/fsp1/fsp_common.c | 2 +- drivers/pci/pci_rom.c | 2 +- drivers/sysreset/sysreset_x86.c | 2 +- {arch/x86/include/asm => include}/acpi_s3.h | 0 10 files changed, 9 insertions(+), 9 deletions(-) rename {arch/x86/include/asm => include}/acpi_s3.h (100%)