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>
This commit is contained in:
@@ -3,7 +3,7 @@
|
|||||||
# Copyright (c) 2015 Google, Inc
|
# Copyright (c) 2015 Google, Inc
|
||||||
|
|
||||||
ifdef CONFIG_EFI_APP
|
ifdef CONFIG_EFI_APP
|
||||||
obj-y += efi.o
|
obj-y += app.o
|
||||||
obj-y += sdram.o
|
obj-y += sdram.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@@ -10,7 +10,7 @@ obj-$(CONFIG_$(SPL_)X86_32BIT_INIT) += mrc.o
|
|||||||
endif
|
endif
|
||||||
obj-y += cpu.o
|
obj-y += cpu.o
|
||||||
obj-y += lpc.o
|
obj-y += lpc.o
|
||||||
ifndef CONFIG_TARGET_EFI
|
ifndef CONFIG_TARGET_EFI_APP
|
||||||
obj-y += microcode.o
|
obj-y += microcode.o
|
||||||
endif
|
endif
|
||||||
obj-y += pch.o
|
obj-y += pch.o
|
||||||
|
@@ -10,7 +10,7 @@ dtb-y += bayleybay.dtb \
|
|||||||
crownbay.dtb \
|
crownbay.dtb \
|
||||||
dfi-bt700-q7x-151.dtb \
|
dfi-bt700-q7x-151.dtb \
|
||||||
edison.dtb \
|
edison.dtb \
|
||||||
efi.dtb \
|
efi-x86_app.dtb \
|
||||||
efi-x86_payload.dtb \
|
efi-x86_payload.dtb \
|
||||||
galileo.dtb \
|
galileo.dtb \
|
||||||
minnowmax.dtb \
|
minnowmax.dtb \
|
||||||
|
@@ -9,8 +9,8 @@
|
|||||||
/include/ "tsc_timer.dtsi"
|
/include/ "tsc_timer.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
model = "EFI";
|
model = "EFI x86 Application";
|
||||||
compatible = "efi,app";
|
compatible = "efi,x86-app";
|
||||||
|
|
||||||
chosen {
|
chosen {
|
||||||
stdout-path = &serial;
|
stdout-path = &serial;
|
@@ -4,8 +4,8 @@ choice
|
|||||||
prompt "Mainboard model"
|
prompt "Mainboard model"
|
||||||
optional
|
optional
|
||||||
|
|
||||||
config TARGET_EFI
|
config TARGET_EFI_APP
|
||||||
bool "efi"
|
bool "efi application"
|
||||||
help
|
help
|
||||||
This target is used for running U-Boot on top of EFI. In
|
This target is used for running U-Boot on top of EFI. In
|
||||||
this case EFI does the early initialisation, and U-Boot
|
this case EFI does the early initialisation, and U-Boot
|
||||||
@@ -22,7 +22,7 @@ config TARGET_EFI_PAYLOAD
|
|||||||
|
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
source "board/efi/efi-x86/Kconfig"
|
source "board/efi/efi-x86_app/Kconfig"
|
||||||
source "board/efi/efi-x86_payload/Kconfig"
|
source "board/efi/efi-x86_payload/Kconfig"
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
if TARGET_EFI
|
if TARGET_EFI_APP
|
||||||
|
|
||||||
config SYS_BOARD
|
config SYS_BOARD
|
||||||
default "efi-x86"
|
default "efi-x86_app"
|
||||||
|
|
||||||
config SYS_VENDOR
|
config SYS_VENDOR
|
||||||
default "efi"
|
default "efi"
|
||||||
@@ -10,6 +10,6 @@ config SYS_SOC
|
|||||||
default "efi"
|
default "efi"
|
||||||
|
|
||||||
config SYS_CONFIG_NAME
|
config SYS_CONFIG_NAME
|
||||||
default "efi-x86"
|
default "efi-x86_app"
|
||||||
|
|
||||||
endif
|
endif
|
@@ -2,4 +2,4 @@
|
|||||||
#
|
#
|
||||||
# Copyright (c) 2015 Google, Inc
|
# Copyright (c) 2015 Google, Inc
|
||||||
|
|
||||||
obj-y += efi.o
|
obj-y += app.o
|
@@ -2,8 +2,8 @@ CONFIG_X86=y
|
|||||||
CONFIG_DEBUG_UART_BASE=0
|
CONFIG_DEBUG_UART_BASE=0
|
||||||
CONFIG_DEBUG_UART_CLOCK=0
|
CONFIG_DEBUG_UART_CLOCK=0
|
||||||
CONFIG_VENDOR_EFI=y
|
CONFIG_VENDOR_EFI=y
|
||||||
CONFIG_DEFAULT_DEVICE_TREE="efi"
|
CONFIG_DEFAULT_DEVICE_TREE="efi-x86_app"
|
||||||
CONFIG_TARGET_EFI=y
|
CONFIG_TARGET_EFI_APP=y
|
||||||
CONFIG_DEBUG_UART=y
|
CONFIG_DEBUG_UART=y
|
||||||
CONFIG_FIT=y
|
CONFIG_FIT=y
|
||||||
CONFIG_USE_BOOTARGS=y
|
CONFIG_USE_BOOTARGS=y
|
@@ -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.
|
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
|
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.
|
and CONFIG_EFI_APP. The efi-x86_app config (efi-x86_app_defconfig) is set up
|
||||||
Just build U-Boot as normal, e.g.
|
for this. Just build U-Boot as normal, e.g.
|
||||||
|
|
||||||
make efi-x86_defconfig
|
make efi-x86_app_defconfig
|
||||||
make
|
make
|
||||||
|
|
||||||
To build U-Boot as an EFI payload (32-bit or 64-bit EFI can be used), enable
|
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
|
arch/x86/cpu/efi
|
||||||
x86 support code for running as an EFI application and payload
|
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
|
x86 board code for running as an EFI application
|
||||||
|
|
||||||
board/efi/efi-x86_payload
|
board/efi/efi-x86_payload
|
||||||
|
Reference in New Issue
Block a user