Browse Source

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>
tags/2020-06-01
Bin Meng 2 years ago
parent
commit
3ebd892fda
13 changed files with 18 additions and 18 deletions
  1. +1
    -1
      arch/x86/cpu/efi/Makefile
  2. +0
    -0
      arch/x86/cpu/efi/app.c
  3. +1
    -1
      arch/x86/cpu/intel_common/Makefile
  4. +1
    -1
      arch/x86/dts/Makefile
  5. +2
    -2
      arch/x86/dts/efi-x86_app.dts
  6. +3
    -3
      board/efi/Kconfig
  7. +3
    -3
      board/efi/efi-x86_app/Kconfig
  8. +0
    -0
      board/efi/efi-x86_app/MAINTAINERS
  9. +1
    -1
      board/efi/efi-x86_app/Makefile
  10. +0
    -0
      board/efi/efi-x86_app/app.c
  11. +2
    -2
      configs/efi-x86_app_defconfig
  12. +4
    -4
      doc/README.u-boot_on_efi
  13. +0
    -0
      include/configs/efi-x86_app.h

+ 1
- 1
arch/x86/cpu/efi/Makefile View File

@@ -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



arch/x86/cpu/efi/efi.c → arch/x86/cpu/efi/app.c View File


+ 1
- 1
arch/x86/cpu/intel_common/Makefile View File

@@ -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

+ 1
- 1
arch/x86/dts/Makefile View File

@@ -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 \


arch/x86/dts/efi.dts → arch/x86/dts/efi-x86_app.dts View File

@@ -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;

+ 3
- 3
board/efi/Kconfig View File

@@ -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

board/efi/efi-x86/Kconfig → board/efi/efi-x86_app/Kconfig View File

@@ -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

board/efi/efi-x86/MAINTAINERS → board/efi/efi-x86_app/MAINTAINERS View File


board/efi/efi-x86/Makefile → board/efi/efi-x86_app/Makefile View File

@@ -2,4 +2,4 @@
#
# Copyright (c) 2015 Google, Inc

obj-y += efi.o
obj-y += app.o

board/efi/efi-x86/efi.c → board/efi/efi-x86_app/app.c View File


configs/efi-x86_defconfig → configs/efi-x86_app_defconfig View File

@@ -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

+ 4
- 4
doc/README.u-boot_on_efi View File

@@ -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


include/configs/efi-x86.h → include/configs/efi-x86_app.h View File


Loading…
Cancel
Save