]> git.sur5r.net Git - u-boot/commitdiff
x86: Rename efi-x86 target to efi-x86_app
authorBin Meng <bmeng.cn@gmail.com>
Tue, 12 Jun 2018 15:36:24 +0000 (08:36 -0700)
committerBin Meng <bmeng.cn@gmail.com>
Sun, 17 Jun 2018 13:16:04 +0000 (21:16 +0800)
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>
21 files changed:
arch/x86/cpu/efi/Makefile
arch/x86/cpu/efi/app.c [new file with mode: 0644]
arch/x86/cpu/efi/efi.c [deleted file]
arch/x86/cpu/intel_common/Makefile
arch/x86/dts/Makefile
arch/x86/dts/efi-x86_app.dts [new file with mode: 0644]
arch/x86/dts/efi.dts [deleted file]
board/efi/Kconfig
board/efi/efi-x86/Kconfig [deleted file]
board/efi/efi-x86/MAINTAINERS [deleted file]
board/efi/efi-x86/Makefile [deleted file]
board/efi/efi-x86/efi.c [deleted file]
board/efi/efi-x86_app/Kconfig [new file with mode: 0644]
board/efi/efi-x86_app/MAINTAINERS [new file with mode: 0644]
board/efi/efi-x86_app/Makefile [new file with mode: 0644]
board/efi/efi-x86_app/app.c [new file with mode: 0644]
configs/efi-x86_app_defconfig [new file with mode: 0644]
configs/efi-x86_defconfig [deleted file]
doc/README.u-boot_on_efi
include/configs/efi-x86.h [deleted file]
include/configs/efi-x86_app.h [new file with mode: 0644]

index 32c2ddedb9469e86db322dcbf4ef1e90c2096190..9716a4ebe087e972c045bda6e6d38d542993e25b 100644 (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
 
diff --git a/arch/x86/cpu/efi/app.c b/arch/x86/cpu/efi/app.c
new file mode 100644 (file)
index 0000000..cda4fab
--- /dev/null
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (c) 2015 Google, Inc
+ */
+
+#include <common.h>
+#include <fdtdec.h>
+#include <netdev.h>
+
+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 (file)
index cda4fab..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (c) 2015 Google, Inc
- */
-
-#include <common.h>
-#include <fdtdec.h>
-#include <netdev.h>
-
-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;
-}
index c0fcf0ce78fe406773bbfb4255ed324491d7c317..bf798c287f38c34f1b6d4c4676196cf78da07667 100644 (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
index 9872c0473914ea62b91e962cf1a3a28d52cbb856..37e4fdc7601d9c075549e06ab79b29263138bd9d 100644 (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 \
diff --git a/arch/x86/dts/efi-x86_app.dts b/arch/x86/dts/efi-x86_app.dts
new file mode 100644 (file)
index 0000000..e70e351
--- /dev/null
@@ -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 (file)
index 62ae96a..0000000
+++ /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";
-       };
-};
index d37f6ff28864834d20c06bf1efbf33e1411039a3..291bd2ca154ac08906a5cc9db9332384dca5e1c6 100644 (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
diff --git a/board/efi/efi-x86/Kconfig b/board/efi/efi-x86/Kconfig
deleted file mode 100644 (file)
index fa609ba..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-if TARGET_EFI
-
-config SYS_BOARD
-       default "efi-x86"
-
-config SYS_VENDOR
-       default "efi"
-
-config SYS_SOC
-       default "efi"
-
-config SYS_CONFIG_NAME
-       default "efi-x86"
-
-endif
diff --git a/board/efi/efi-x86/MAINTAINERS b/board/efi/efi-x86/MAINTAINERS
deleted file mode 100644 (file)
index a44c7c6..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-EFI-X86 BOARD
-M:     Simon Glass <sjg@chromium.org>
-S:     Maintained
-F:     board/efi/efi-x86/
-F:     include/configs/efi-x86.h
-F:     configs/efi-x86_defconfig
diff --git a/board/efi/efi-x86/Makefile b/board/efi/efi-x86/Makefile
deleted file mode 100644 (file)
index 2097283..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Copyright (c) 2015 Google, Inc
-
-obj-y  += efi.o
diff --git a/board/efi/efi-x86/efi.c b/board/efi/efi-x86/efi.c
deleted file mode 100644 (file)
index da3445b..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2015 Google, Inc
- */
-
-#include <common.h>
diff --git a/board/efi/efi-x86_app/Kconfig b/board/efi/efi-x86_app/Kconfig
new file mode 100644 (file)
index 0000000..ae87bf3
--- /dev/null
@@ -0,0 +1,15 @@
+if TARGET_EFI_APP
+
+config SYS_BOARD
+       default "efi-x86_app"
+
+config SYS_VENDOR
+       default "efi"
+
+config SYS_SOC
+       default "efi"
+
+config SYS_CONFIG_NAME
+       default "efi-x86_app"
+
+endif
diff --git a/board/efi/efi-x86_app/MAINTAINERS b/board/efi/efi-x86_app/MAINTAINERS
new file mode 100644 (file)
index 0000000..a44c7c6
--- /dev/null
@@ -0,0 +1,6 @@
+EFI-X86 BOARD
+M:     Simon Glass <sjg@chromium.org>
+S:     Maintained
+F:     board/efi/efi-x86/
+F:     include/configs/efi-x86.h
+F:     configs/efi-x86_defconfig
diff --git a/board/efi/efi-x86_app/Makefile b/board/efi/efi-x86_app/Makefile
new file mode 100644 (file)
index 0000000..cb48d1c
--- /dev/null
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Copyright (c) 2015 Google, Inc
+
+obj-y  += app.o
diff --git a/board/efi/efi-x86_app/app.c b/board/efi/efi-x86_app/app.c
new file mode 100644 (file)
index 0000000..da3445b
--- /dev/null
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2015 Google, Inc
+ */
+
+#include <common.h>
diff --git a/configs/efi-x86_app_defconfig b/configs/efi-x86_app_defconfig
new file mode 100644 (file)
index 0000000..9c1d5e7
--- /dev/null
@@ -0,0 +1,35 @@
+CONFIG_X86=y
+CONFIG_DEBUG_UART_BASE=0
+CONFIG_DEBUG_UART_CLOCK=0
+CONFIG_VENDOR_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
+CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_LAST_STAGE_INIT=y
+CONFIG_HUSH_PARSER=y
+# CONFIG_CMD_BOOTM is not set
+CONFIG_CMD_PART=y
+# CONFIG_CMD_SF_TEST is not set
+# CONFIG_CMD_NET is not set
+CONFIG_CMD_TIME=y
+CONFIG_CMD_EXT2=y
+CONFIG_CMD_EXT4=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_CMD_FAT=y
+CONFIG_CMD_FS_GENERIC=y
+CONFIG_MAC_PARTITION=y
+CONFIG_ISO_PARTITION=y
+CONFIG_EFI_PARTITION=y
+CONFIG_OF_EMBED=y
+CONFIG_REGMAP=y
+CONFIG_SYSCON=y
+# CONFIG_DM_ETH is not set
+CONFIG_DEBUG_EFI_CONSOLE=y
+# CONFIG_REGEX is not set
+CONFIG_EFI=y
+# CONFIG_EFI_LOADER is not set
diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig
deleted file mode 100644 (file)
index a2f072b..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-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_DEBUG_UART=y
-CONFIG_FIT=y
-CONFIG_USE_BOOTARGS=y
-CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro"
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_DISPLAY_BOARDINFO_LATE=y
-CONFIG_LAST_STAGE_INIT=y
-CONFIG_HUSH_PARSER=y
-# CONFIG_CMD_BOOTM is not set
-CONFIG_CMD_PART=y
-# CONFIG_CMD_SF_TEST is not set
-# CONFIG_CMD_NET is not set
-CONFIG_CMD_TIME=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
-CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
-CONFIG_MAC_PARTITION=y
-CONFIG_ISO_PARTITION=y
-CONFIG_EFI_PARTITION=y
-CONFIG_OF_EMBED=y
-CONFIG_REGMAP=y
-CONFIG_SYSCON=y
-# CONFIG_DM_ETH is not set
-CONFIG_DEBUG_EFI_CONSOLE=y
-# CONFIG_REGEX is not set
-CONFIG_EFI=y
-# CONFIG_EFI_LOADER is not set
index 8fba112e116626ea67c279330ef3d50cf7015421..e12dd4e3e658bf7b55115cce094a20ac98a94ab1 100644 (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
diff --git a/include/configs/efi-x86.h b/include/configs/efi-x86.h
deleted file mode 100644 (file)
index 33418cf..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (c) 2015 Google, Inc
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <configs/x86-common.h>
-
-#undef CONFIG_TPM_TIS_BASE_ADDRESS
-
-#define CONFIG_STD_DEVICES_SETTINGS     "stdin=usbkbd,vga,serial\0" \
-                                       "stdout=vga,serial\0" \
-                                       "stderr=vga,serial\0"
-
-#endif
diff --git a/include/configs/efi-x86_app.h b/include/configs/efi-x86_app.h
new file mode 100644 (file)
index 0000000..33418cf
--- /dev/null
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (c) 2015 Google, Inc
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#include <configs/x86-common.h>
+
+#undef CONFIG_TPM_TIS_BASE_ADDRESS
+
+#define CONFIG_STD_DEVICES_SETTINGS     "stdin=usbkbd,vga,serial\0" \
+                                       "stdout=vga,serial\0" \
+                                       "stderr=vga,serial\0"
+
+#endif