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 <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/cpu/efi/Makefile b/arch/x86/cpu/efi/Makefile
index 32c2ddedb9469e86db322dcbf4ef1e90c2096190..9716a4ebe087e972c045bda6e6d38d542993e25b 100644 (file)
--- 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
similarity index 100%
rename from arch/x86/cpu/efi/efi.c
rename to arch/x86/cpu/efi/app.c

diff --git a/arch/x86/cpu/intel_common/Makefile b/arch/x86/cpu/intel_common/Makefile
index c0fcf0ce78fe406773bbfb4255ed324491d7c317..bf798c287f38c34f1b6d4c4676196cf78da07667 100644 (file)
--- 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 9872c0473914ea62b91e962cf1a3a28d52cbb856..37e4fdc7601d9c075549e06ab79b29263138bd9d 100644 (file)
--- 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
similarity index 82%
rename from arch/x86/dts/efi.dts
rename to arch/x86/dts/efi-x86_app.dts
index 62ae96a3f3fa184e37b2cfc43cab2dda2ec68646..e70e3516180d9d0421953b017c76101628c8b502 100644 (file)
--- 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 d37f6ff28864834d20c06bf1efbf33e1411039a3..291bd2ca154ac08906a5cc9db9332384dca5e1c6 100644 (file)
--- 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
similarity index 64%
rename from board/efi/efi-x86/Kconfig
rename to board/efi/efi-x86_app/Kconfig
index fa609ba5d21178a32c00a5e7541f12f3e10e856a..ae87bf34d37929c06785fd9e2528d909a094431a 100644 (file)
--- 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
similarity index 100%
rename from board/efi/efi-x86/MAINTAINERS
rename to board/efi/efi-x86_app/MAINTAINERS

diff --git a/board/efi/efi-x86/Makefile b/board/efi/efi-x86_app/Makefile
similarity index 82%
rename from board/efi/efi-x86/Makefile
rename to board/efi/efi-x86_app/Makefile
index 209728341beaa9be14da9900e9c9831ad5cdba72..cb48d1ccc20979f2126f81cc7a61ec3f8adadc9d 100644 (file)
--- 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
similarity index 100%
rename from board/efi/efi-x86/efi.c
rename to board/efi/efi-x86_app/app.c

diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_app_defconfig
similarity index 92%
rename from configs/efi-x86_defconfig
rename to configs/efi-x86_app_defconfig
index a2f072b2f2e55c70339c5098e386d3c65043d648..9c1d5e786ea2ea70605d60873ab179e7e7ec26d1 100644 (file)
--- 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 8fba112e116626ea67c279330ef3d50cf7015421..e12dd4e3e658bf7b55115cce094a20ac98a94ab1 100644 (file)
--- 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
similarity index 100%
rename from include/configs/efi-x86.h
rename to include/configs/efi-x86_app.h