diff options
| -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 | ||||
| -rw-r--r-- | board/efi/Kconfig | 6 | ||||
| -rw-r--r-- | board/efi/efi-x86_app/Kconfig (renamed from board/efi/efi-x86/Kconfig) | 6 | ||||
| -rw-r--r-- | board/efi/efi-x86_app/MAINTAINERS (renamed from board/efi/efi-x86/MAINTAINERS) | 0 | ||||
| -rw-r--r-- | board/efi/efi-x86_app/Makefile (renamed from board/efi/efi-x86/Makefile) | 2 | ||||
| -rw-r--r-- | board/efi/efi-x86_app/app.c (renamed from board/efi/efi-x86/efi.c) | 0 | ||||
| -rw-r--r-- | configs/efi-x86_app_defconfig (renamed from configs/efi-x86_defconfig) | 4 | ||||
| -rw-r--r-- | doc/README.u-boot_on_efi | 8 | ||||
| -rw-r--r-- | include/configs/efi-x86_app.h (renamed from include/configs/efi-x86.h) | 0 |
13 files changed, 18 insertions, 18 deletions
diff --git a/arch/x86/cpu/efi/Makefile b/arch/x86/cpu/efi/Makefile index 32c2ddedb9..9716a4ebe0 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 cda4fabe15..cda4fabe15 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 c0fcf0ce78..bf798c287f 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 9872c04739..37e4fdc760 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 62ae96a3f3..e70e351618 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; diff --git a/board/efi/Kconfig b/board/efi/Kconfig index d37f6ff288..291bd2ca15 100644 --- a/board/efi/Kconfig +++ b/board/efi/Kconfig @@ -4,8 +4,8 @@ choice prompt "Mainboard model" optional -config TARGET_EFI - bool "efi" +config TARGET_EFI_APP + bool "efi application" help This target is used for running U-Boot on top of EFI. In this case EFI does the early initialisation, and U-Boot @@ -22,7 +22,7 @@ config TARGET_EFI_PAYLOAD endchoice -source "board/efi/efi-x86/Kconfig" +source "board/efi/efi-x86_app/Kconfig" source "board/efi/efi-x86_payload/Kconfig" endif diff --git a/board/efi/efi-x86/Kconfig b/board/efi/efi-x86_app/Kconfig index fa609ba5d2..ae87bf34d3 100644 --- a/board/efi/efi-x86/Kconfig +++ b/board/efi/efi-x86_app/Kconfig @@ -1,7 +1,7 @@ -if TARGET_EFI +if TARGET_EFI_APP config SYS_BOARD - default "efi-x86" + default "efi-x86_app" config SYS_VENDOR default "efi" @@ -10,6 +10,6 @@ config SYS_SOC default "efi" config SYS_CONFIG_NAME - default "efi-x86" + default "efi-x86_app" endif diff --git a/board/efi/efi-x86/MAINTAINERS b/board/efi/efi-x86_app/MAINTAINERS index a44c7c64be..a44c7c64be 100644 --- a/board/efi/efi-x86/MAINTAINERS +++ b/board/efi/efi-x86_app/MAINTAINERS diff --git a/board/efi/efi-x86/Makefile b/board/efi/efi-x86_app/Makefile index 209728341b..cb48d1ccc2 100644 --- a/board/efi/efi-x86/Makefile +++ b/board/efi/efi-x86_app/Makefile @@ -2,4 +2,4 @@ # # Copyright (c) 2015 Google, Inc -obj-y += efi.o +obj-y += app.o diff --git a/board/efi/efi-x86/efi.c b/board/efi/efi-x86_app/app.c index da3445bb1d..da3445bb1d 100644 --- a/board/efi/efi-x86/efi.c +++ b/board/efi/efi-x86_app/app.c diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_app_defconfig index a2f072b2f2..9c1d5e786e 100644 --- a/configs/efi-x86_defconfig +++ b/configs/efi-x86_app_defconfig @@ -2,8 +2,8 @@ CONFIG_X86=y CONFIG_DEBUG_UART_BASE=0 CONFIG_DEBUG_UART_CLOCK=0 CONFIG_VENDOR_EFI=y -CONFIG_DEFAULT_DEVICE_TREE="efi" -CONFIG_TARGET_EFI=y +CONFIG_DEFAULT_DEVICE_TREE="efi-x86_app" +CONFIG_TARGET_EFI_APP=y CONFIG_DEBUG_UART=y CONFIG_FIT=y CONFIG_USE_BOOTARGS=y diff --git a/doc/README.u-boot_on_efi b/doc/README.u-boot_on_efi index 8fba112e11..e12dd4e3e6 100644 --- a/doc/README.u-boot_on_efi +++ b/doc/README.u-boot_on_efi @@ -65,10 +65,10 @@ for that board. It will be either 32-bit or 64-bit. Alternatively, you can opt for using QEMU [1] and the OVMF [2], as detailed below. To build U-Boot as an EFI application (32-bit EFI required), enable CONFIG_EFI -and CONFIG_EFI_APP. The efi-x86 config (efi-x86_defconfig) is set up for this. -Just build U-Boot as normal, e.g. +and CONFIG_EFI_APP. The efi-x86_app config (efi-x86_app_defconfig) is set up +for this. Just build U-Boot as normal, e.g. - make efi-x86_defconfig + make efi-x86_app_defconfig make To build U-Boot as an EFI payload (32-bit or 64-bit EFI can be used), enable @@ -234,7 +234,7 @@ lib/efi arch/x86/cpu/efi x86 support code for running as an EFI application and payload -board/efi/efi-x86/efi.c +board/efi/efi-x86_app/efi.c x86 board code for running as an EFI application board/efi/efi-x86_payload diff --git a/include/configs/efi-x86.h b/include/configs/efi-x86_app.h index 33418cfbec..33418cfbec 100644 --- a/include/configs/efi-x86.h +++ b/include/configs/efi-x86_app.h |