From: Simon Glass <sjg@chromium.org> Print a line that indicates if this is the app, to match the line shown for the payload, i.e.: Model: EFI x86 Application or: Model: EFI x86 Payload or: Model: EFI ARM Application Drop CONFIG_DISPLAY_BOARDINFO_LATE as it is not needed. Note that there is no (generic) stub for ARM. Signed-off-by: Simon Glass <sjg@chromium.org> --- configs/efi-arm_app64_defconfig | 1 - configs/efi-x86_app32_defconfig | 1 - configs/efi-x86_app64_defconfig | 1 - configs/efi-x86_payload32_defconfig | 1 - configs/efi-x86_payload64_defconfig | 1 - lib/efi_client/Kconfig | 1 + 6 files changed, 1 insertion(+), 5 deletions(-) diff --git a/configs/efi-arm_app64_defconfig b/configs/efi-arm_app64_defconfig index f2ed6069d74..5298f2d84b0 100644 --- a/configs/efi-arm_app64_defconfig +++ b/configs/efi-arm_app64_defconfig @@ -17,7 +17,6 @@ CONFIG_USE_BOOTARGS=y CONFIG_SYS_PBSIZE=532 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_LOG=y -CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_MEMINFO=y diff --git a/configs/efi-x86_app32_defconfig b/configs/efi-x86_app32_defconfig index de97cb64ce7..d17f0f8c208 100644 --- a/configs/efi-x86_app32_defconfig +++ b/configs/efi-x86_app32_defconfig @@ -18,7 +18,6 @@ CONFIG_BOOTCOMMAND="bootflow scan -lbp" CONFIG_SYS_PBSIZE=532 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_LOG=y -CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_CMD_LSBLK=y CONFIG_CMD_CAT=y diff --git a/configs/efi-x86_app64_defconfig b/configs/efi-x86_app64_defconfig index 55daf7bec2a..ea9a2068565 100644 --- a/configs/efi-x86_app64_defconfig +++ b/configs/efi-x86_app64_defconfig @@ -20,7 +20,6 @@ CONFIG_BOOTCOMMAND="bootflow scan -lbp" CONFIG_SYS_PBSIZE=532 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_LOG=y -CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_EARLY_INIT_R=y CONFIG_CMD_LSBLK=y CONFIG_CMD_CAT=y diff --git a/configs/efi-x86_payload32_defconfig b/configs/efi-x86_payload32_defconfig index cf827fefd45..972608fca14 100644 --- a/configs/efi-x86_payload32_defconfig +++ b/configs/efi-x86_payload32_defconfig @@ -17,7 +17,6 @@ CONFIG_BOOTCOMMAND="ext2load scsi 0:3 01000000 /boot/vmlinuz; zboot 01000000" CONFIG_SYS_PBSIZE=532 CONFIG_PRE_CONSOLE_BUFFER=y CONFIG_SYS_CONSOLE_INFO_QUIET=y -CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_IDE=y CONFIG_CMD_MMC=y diff --git a/configs/efi-x86_payload64_defconfig b/configs/efi-x86_payload64_defconfig index bdf61e204a3..aacb043b294 100644 --- a/configs/efi-x86_payload64_defconfig +++ b/configs/efi-x86_payload64_defconfig @@ -18,7 +18,6 @@ CONFIG_BOOTARGS="root=/dev/sdb3 init=/sbin/init rootwait ro" CONFIG_SYS_PBSIZE=532 CONFIG_PRE_CONSOLE_BUFFER=y CONFIG_SYS_CONSOLE_INFO_QUIET=y -CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_IDE=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y diff --git a/lib/efi_client/Kconfig b/lib/efi_client/Kconfig index f05647f5144..743181834bf 100644 --- a/lib/efi_client/Kconfig +++ b/lib/efi_client/Kconfig @@ -4,6 +4,7 @@ menu "U-Boot as UEFI application" config EFI_CLIENT bool "Support running U-Boot from EFI" depends on X86 || ARM + imply DISPLAY_BOARDINFO imply X86_TSC_READ_BASE select EFI help -- 2.43.0