diff options
Diffstat (limited to 'arch/x86/cpu')
| -rw-r--r-- | arch/x86/cpu/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/cpu/apollolake/acpi.c | 2 | ||||
| -rw-r--r-- | arch/x86/cpu/efi/Kconfig | 2 | ||||
| -rw-r--r-- | arch/x86/cpu/intel_common/acpi.c | 2 | ||||
| -rw-r--r-- | arch/x86/cpu/intel_common/intel_opregion.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/x86_64/Makefile | 2 |
6 files changed, 5 insertions, 6 deletions
diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile index cc55c8fa39c..5150edb833f 100644 --- a/arch/x86/cpu/Makefile +++ b/arch/x86/cpu/Makefile @@ -47,7 +47,7 @@ obj-$(CONFIG_INTEL_BRASWELL) += braswell/ obj-$(CONFIG_INTEL_BROADWELL) += broadwell/ obj-$(CONFIG_SYS_COREBOOT) += coreboot/ obj-$(CONFIG_SYS_SLIMBOOTLOADER) += slimbootloader/ -obj-$(CONFIG_EFI) += efi/ +obj-$(CONFIG_EFI_CLIENT) += efi/ obj-$(CONFIG_QEMU) += qemu/ obj-$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE) += ivybridge/ obj-$(CONFIG_INTEL_QUARK) += quark/ diff --git a/arch/x86/cpu/apollolake/acpi.c b/arch/x86/cpu/apollolake/acpi.c index 93040e7bb37..f32a10daedd 100644 --- a/arch/x86/cpu/apollolake/acpi.c +++ b/arch/x86/cpu/apollolake/acpi.c @@ -12,6 +12,7 @@ #include <cpu.h> #include <dm.h> +#include <intel_gnvs.h> #include <log.h> #include <p2sb.h> #include <pci.h> @@ -20,7 +21,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/efi/Kconfig b/arch/x86/cpu/efi/Kconfig index e0975d34d36..f5288013a8a 100644 --- a/arch/x86/cpu/efi/Kconfig +++ b/arch/x86/cpu/efi/Kconfig @@ -1,4 +1,4 @@ -if EFI +if EFI_CLIENT config SYS_CAR_ADDR hex diff --git a/arch/x86/cpu/intel_common/acpi.c b/arch/x86/cpu/intel_common/acpi.c index 982149b394e..8688232ec34 100644 --- a/arch/x86/cpu/intel_common/acpi.c +++ b/arch/x86/cpu/intel_common/acpi.c @@ -11,6 +11,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/cpu/intel_common/intel_opregion.c b/arch/x86/cpu/intel_common/intel_opregion.c index 4a2717b3584..78caff0dc12 100644 --- a/arch/x86/cpu/intel_common/intel_opregion.c +++ b/arch/x86/cpu/intel_common/intel_opregion.c @@ -31,7 +31,6 @@ static int locate_vbt(char **vbtp, int *sizep) size = vbt.size; if (size > sizeof(vbt_data)) return log_msg_ret("vbt", -E2BIG); - vbt.image_pos += CONFIG_ROM_SIZE; ret = spi_flash_read_dm(dev, vbt.image_pos, size, vbt_data); if (ret) return log_msg_ret("read", ret); diff --git a/arch/x86/cpu/x86_64/Makefile b/arch/x86/cpu/x86_64/Makefile index e929563b2c1..cb23c071aa3 100644 --- a/arch/x86/cpu/x86_64/Makefile +++ b/arch/x86/cpu/x86_64/Makefile @@ -5,6 +5,6 @@ obj-y += cpu.o interrupts.o setjmp.o -ifndef CONFIG_EFI +ifndef CONFIG_EFI_CLIENT obj-y += misc.o endif |