efi: Set RUN_64BIT correctly for the EFI app

The U-Boot EFI app can run as a 64-bit program, so set the Kconfig
correctly in that case. Make sure it doesn't build SPL, since there is
no need to switch from 32 to 64 bit when running.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 07be5cd05ec0f105d062da0ded2f1fa76b59bbbe..99e59d94c6069bf97a682fcf4089ecf1a9e83bc3 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -32,8 +32,8 @@ config X86_RUN_32BIT
 config X86_RUN_64BIT
        bool "64-bit"
        select X86_64
-       select SPL
-       select SPL_SEPARATE_BSS
+       select SPL if !EFI_APP
+       select SPL_SEPARATE_BSS if !EFI_APP
        help
          Build U-Boot as a 64-bit binary with a 32-bit SPL. This is
          experimental and many features are missing. U-Boot SPL starts up,

diff --git a/configs/efi-x86_app64_defconfig b/configs/efi-x86_app64_defconfig
index dae4884049352ca729ebdeeab871952bfb77d7ce..f1cf43c1ef66cf61cfae5a4979f9b8903fce7a0b 100644 (file)
--- a/configs/efi-x86_app64_defconfig
+++ b/configs/efi-x86_app64_defconfig
@@ -4,6 +4,7 @@ CONFIG_ENV_SIZE=0x1000
 CONFIG_DEFAULT_DEVICE_TREE="efi-x86_app"
 CONFIG_DEBUG_UART_BASE=0
 CONFIG_DEBUG_UART_CLOCK=0
+CONFIG_X86_RUN_64BIT=y
 CONFIG_VENDOR_EFI=y
 CONFIG_TARGET_EFI_APP64=y
 CONFIG_DEBUG_UART=y