From 3ebd892fda2d07f153a14cb30e60ae707e9e4208 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Tue, 12 Jun 2018 08:36:24 -0700 Subject: x86: Rename efi-x86 target to efi-x86_app To avoid confusion, let's rename the efi-x86 target to efi-x86_app. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- arch/x86/cpu/efi/Makefile | 2 +- arch/x86/cpu/efi/app.c | 32 ++++++++++++++++++++++++++++++++ arch/x86/cpu/efi/efi.c | 32 -------------------------------- arch/x86/cpu/intel_common/Makefile | 2 +- arch/x86/dts/Makefile | 2 +- arch/x86/dts/efi-x86_app.dts | 26 ++++++++++++++++++++++++++ arch/x86/dts/efi.dts | 26 -------------------------- 7 files changed, 61 insertions(+), 61 deletions(-) create mode 100644 arch/x86/cpu/efi/app.c delete mode 100644 arch/x86/cpu/efi/efi.c create mode 100644 arch/x86/dts/efi-x86_app.dts delete mode 100644 arch/x86/dts/efi.dts (limited to 'arch') 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/app.c b/arch/x86/cpu/efi/app.c new file mode 100644 index 00000000000..cda4fabe15a --- /dev/null +++ b/arch/x86/cpu/efi/app.c @@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2015 Google, Inc + */ + +#include +#include +#include + +int arch_cpu_init(void) +{ + return 0; +} + +int checkcpu(void) +{ + return 0; +} + +int print_cpuinfo(void) +{ + return default_print_cpuinfo(); +} + +void board_final_cleanup(void) +{ +} + +int misc_init_r(void) +{ + return 0; +} diff --git a/arch/x86/cpu/efi/efi.c b/arch/x86/cpu/efi/efi.c deleted file mode 100644 index cda4fabe15a..00000000000 --- a/arch/x86/cpu/efi/efi.c +++ /dev/null @@ -1,32 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (c) 2015 Google, Inc - */ - -#include -#include -#include - -int arch_cpu_init(void) -{ - return 0; -} - -int checkcpu(void) -{ - return 0; -} - -int print_cpuinfo(void) -{ - return default_print_cpuinfo(); -} - -void board_final_cleanup(void) -{ -} - -int misc_init_r(void) -{ - return 0; -} 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-x86_app.dts b/arch/x86/dts/efi-x86_app.dts new file mode 100644 index 00000000000..e70e3516180 --- /dev/null +++ b/arch/x86/dts/efi-x86_app.dts @@ -0,0 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2015 Google, Inc + */ + +/dts-v1/; + +/include/ "skeleton.dtsi" +/include/ "tsc_timer.dtsi" + +/ { + model = "EFI x86 Application"; + compatible = "efi,x86-app"; + + chosen { + stdout-path = &serial; + }; + + tsc-timer { + clock-frequency = <1000000000>; + }; + + serial: serial { + compatible = "efi,uart"; + }; +}; diff --git a/arch/x86/dts/efi.dts b/arch/x86/dts/efi.dts deleted file mode 100644 index 62ae96a3f3f..00000000000 --- a/arch/x86/dts/efi.dts +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (c) 2015 Google, Inc - */ - -/dts-v1/; - -/include/ "skeleton.dtsi" -/include/ "tsc_timer.dtsi" - -/ { - model = "EFI"; - compatible = "efi,app"; - - chosen { - stdout-path = &serial; - }; - - tsc-timer { - clock-frequency = <1000000000>; - }; - - serial: serial { - compatible = "efi,uart"; - }; -}; -- cgit v1.3.1