diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/cpu/efi/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/cpu/efi/app.c (renamed from arch/x86/cpu/efi/efi.c) | 0 | ||||
| -rw-r--r-- | arch/x86/cpu/intel_common/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/dts/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/dts/efi-x86_app.dts (renamed from arch/x86/dts/efi.dts) | 4 |
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/cpu/efi/Makefile b/arch/x86/cpu/efi/Makefile index 32c2ddedb94..9716a4ebe08 100644 --- a/arch/x86/cpu/efi/Makefile +++ b/arch/x86/cpu/efi/Makefile @@ -3,7 +3,7 @@ # Copyright (c) 2015 Google, Inc ifdef CONFIG_EFI_APP -obj-y += efi.o +obj-y += app.o obj-y += sdram.o endif diff --git a/arch/x86/cpu/efi/efi.c b/arch/x86/cpu/efi/app.c index cda4fabe15a..cda4fabe15a 100644 --- a/arch/x86/cpu/efi/efi.c +++ b/arch/x86/cpu/efi/app.c diff --git a/arch/x86/cpu/intel_common/Makefile b/arch/x86/cpu/intel_common/Makefile index c0fcf0ce78f..bf798c287f3 100644 --- a/arch/x86/cpu/intel_common/Makefile +++ b/arch/x86/cpu/intel_common/Makefile @@ -10,7 +10,7 @@ obj-$(CONFIG_$(SPL_)X86_32BIT_INIT) += mrc.o endif obj-y += cpu.o obj-y += lpc.o -ifndef CONFIG_TARGET_EFI +ifndef CONFIG_TARGET_EFI_APP obj-y += microcode.o endif obj-y += pch.o diff --git a/arch/x86/dts/Makefile b/arch/x86/dts/Makefile index 9872c047391..37e4fdc7601 100644 --- a/arch/x86/dts/Makefile +++ b/arch/x86/dts/Makefile @@ -10,7 +10,7 @@ dtb-y += bayleybay.dtb \ crownbay.dtb \ dfi-bt700-q7x-151.dtb \ edison.dtb \ - efi.dtb \ + efi-x86_app.dtb \ efi-x86_payload.dtb \ galileo.dtb \ minnowmax.dtb \ diff --git a/arch/x86/dts/efi.dts b/arch/x86/dts/efi-x86_app.dts index 62ae96a3f3f..e70e3516180 100644 --- a/arch/x86/dts/efi.dts +++ b/arch/x86/dts/efi-x86_app.dts @@ -9,8 +9,8 @@ /include/ "tsc_timer.dtsi" / { - model = "EFI"; - compatible = "efi,app"; + model = "EFI x86 Application"; + compatible = "efi,x86-app"; chosen { stdout-path = &serial; |