Move this so we can include it from sandbox, needed since it is in a bloblist and must have a check.
Signed-off-by: Simon Glass sjg@chromium.org ---
arch/x86/cpu/apollolake/acpi.c | 2 +- arch/x86/cpu/intel_common/acpi.c | 2 +- arch/x86/include/asm/arch-apollolake/global_nvs.h | 2 +- board/google/chromebook_coral/coral.c | 2 +- {arch/x86/include/asm => include}/intel_gnvs.h | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename {arch/x86/include/asm => include}/intel_gnvs.h (100%)
diff --git a/arch/x86/cpu/apollolake/acpi.c b/arch/x86/cpu/apollolake/acpi.c index fd21c0b4968..2822b8d06d1 100644 --- a/arch/x86/cpu/apollolake/acpi.c +++ b/arch/x86/cpu/apollolake/acpi.c @@ -13,6 +13,7 @@ #include <common.h> #include <cpu.h> #include <dm.h> +#include <intel_gnvs.h> #include <log.h> #include <p2sb.h> #include <pci.h> @@ -21,7 +22,6 @@ #include <asm/acpi_table.h> #include <asm/cpu_common.h> #include <asm/intel_acpi.h> -#include <asm/intel_gnvs.h> #include <asm/intel_pinctrl.h> #include <asm/intel_pinctrl_defs.h> #include <asm/intel_regs.h> diff --git a/arch/x86/cpu/intel_common/acpi.c b/arch/x86/cpu/intel_common/acpi.c index 15f19da2067..4a288e85252 100644 --- a/arch/x86/cpu/intel_common/acpi.c +++ b/arch/x86/cpu/intel_common/acpi.c @@ -12,6 +12,7 @@ #include <bloblist.h> #include <cpu.h> #include <dm.h> +#include <intel_gnvs.h> #include <acpi/acpigen.h> #include <asm/acpigen.h> #include <asm/acpi_table.h> @@ -23,7 +24,6 @@ #include <asm/mpspec.h> #include <asm/smm.h> #include <asm/turbo.h> -#include <asm/intel_gnvs.h> #include <asm/arch/iomap.h> #include <asm/arch/pm.h> #include <asm/arch/systemagent.h> diff --git a/arch/x86/include/asm/arch-apollolake/global_nvs.h b/arch/x86/include/asm/arch-apollolake/global_nvs.h index ef8eb228dbe..639d8f2de78 100644 --- a/arch/x86/include/asm/arch-apollolake/global_nvs.h +++ b/arch/x86/include/asm/arch-apollolake/global_nvs.h @@ -10,6 +10,6 @@ #ifndef _GLOBAL_NVS_H_ #define _GLOBAL_NVS_H_
-#include <asm/intel_gnvs.h> +#include <intel_gnvs.h>
#endif /* _GLOBAL_NVS_H_ */ diff --git a/board/google/chromebook_coral/coral.c b/board/google/chromebook_coral/coral.c index 53c5171d02b..ca63cf4ef51 100644 --- a/board/google/chromebook_coral/coral.c +++ b/board/google/chromebook_coral/coral.c @@ -11,13 +11,13 @@ #include <cros_ec.h> #include <dm.h> #include <init.h> +#include <intel_gnvs.h> #include <log.h> #include <sysinfo.h> #include <acpi/acpigen.h> #include <asm-generic/gpio.h> #include <asm/acpi_nhlt.h> #include <asm/cb_sysinfo.h> -#include <asm/intel_gnvs.h> #include <asm/intel_pinctrl.h> #include <dm/acpi.h> #include <linux/delay.h> diff --git a/arch/x86/include/asm/intel_gnvs.h b/include/intel_gnvs.h similarity index 100% rename from arch/x86/include/asm/intel_gnvs.h rename to include/intel_gnvs.h