On 3/24/22 14:54, Masahisa Kojima wrote:
This patch series adds the menu-driven boot device selection,
by extending the existing "bootmenu" to include UEFI and distro_boot
related entries, and supports menu-driven UEFI boot variable
maintenance.
This patch series also includes the removable media support
that UEFI specification requires to support.
The menu example is as follows.
*** U-Boot Boot Menu ***
bootmenu_00 : Boot 1. kernel
bootmenu_01 : Boot 2. kernel
bootmenu_02 : Reset board
UEFI BOOT0000 : debian
UEFI BOOT0001 : ubuntu
UEFI BOOT0002 : mmc0:1
UEFI BOOT0003 : mmc0:2
UEFI BOOT0004 : nvme0:1
UEFI BOOT0005 : nvme0:2
UEFI BOOT0006 : usb0:2
UEFI BOOT0007 : usb1:1
UEFI BOOT0008 : usb1:2
distro_boot : usb0
distro_boot : scsi0
distro_boot : virtio0
distro_boot : dhcp
Press UP/DOWN to move, ENTER to select, ESC/CTRL+C to quit
[Major changes from RFC v3]
- add Kconfig option to disable U-Boot console
- add UEFI boot variable maintenance feature
- support removable media support and user selection
- app bootmenu enhancement documentation
[How to run on QEMU(arm64)]
1) clone source code
$ git clone https://git.linaro.org/people/masahisa.kojima/u-boot.git \
-b kojima/bootmenu_v4_upstream_0324 --depth 1
2) prepare U-Boot .config
$ make qemu_arm64_menuconfig
then, enable CONFIG_CMD_BOOTMENU and CONFIG_AUTOBOOT_MENU_SHOW
3) run on QEMU(arm64) example
$ qemu-system-aarch64 -machine virt,gic-version=3 -cpu cortex-a57 -m 4G
-nographic \
-no-acpi -bios ./u-boot.bin -hda xxx.img
I applied the series to origin/master and added the two config options.
This is the output if the disk image does not have an EFI partition:
Found 0 disks
No EFI system partition
Unable to find TPMv2 device
Even if there is no EFI system partition on virtio 0 I would expect the
menu to be shown.
When having an image with an EFI system partition I get:
*** U-Boot Boot Menu ***
UEFI BOOT0003 : test3
UEFI BOOT00A0 : hello
UEFI BOOT0000 : virtio0:1
distro_boot : usb0
distro_boot : scsi0
distro_boot : virtio0
distro_boot : nvme0
distro_boot : dhcp
UEFI Boot Manager Maintenance
U-Boot console
The entries usb0, scsi0, nvme0 should not exist as there is no such device.
=> lsblk
Block Driver Devices
-----------------------------
efi_blk : <none>
nvme-blk : <none>
scsi_blk : <none>
usb_storage_blk : <none>
virtio-blk : virtio 0
When I select "U-Boot console" the prompt is written in the middle of
the screen. I would expect the screen to be cleared.
If I disable networking, I get
Missing RNG device for EFI_RNG_PROTOCOL
No EFI system partition
Unable to find TPMv2 device
=>
though the disk has an EFI partition.
So this series needs some rework.
Best regards
Heinrich
AKASHI Takahiro (2):
efi_loader: export efi_locate_device_handle()
efi_loader: bootmgr: add booting from removable media
Masahisa Kojima (9):
bootmenu: fix menu API error handling
lib/charset: add u16_strlcat() function
test: unit test for u16_strlcat()
menu: always show the menu regardless of the number or entry
bootmenu: add UEFI and disto_boot entries
bootmenu: factor out the user input handling
efi_loader: add menu-driven UEFI Boot Variable maintenance
bootmenu: add removable media entries
doc:bootmenu: add UEFI boot variable and distro boot support
cmd/Kconfig | 10 +
cmd/bootmenu.c | 678 +++++++----
common/menu.c | 139 ++-
doc/usage/bootmenu.rst | 65 ++
include/charset.h | 15 +
include/config_distro_bootcmd.h | 14 +-
include/efi_default_filename.h | 26 +
include/efi_loader.h | 63 ++
include/menu.h | 20 +
lib/charset.c | 21 +
lib/efi_loader/Makefile | 1 +
lib/efi_loader/efi_bootmenu_maintenance.c | 1244 +++++++++++++++++++++
lib/efi_loader/efi_bootmgr.c | 50 +-
lib/efi_loader/efi_boottime.c | 59 +-
lib/efi_loader/efi_console.c | 81 ++
lib/efi_loader/efi_disk.c | 11 +
lib/efi_loader/efi_file.c | 75 +-
test/unicode_ut.c | 45 +
18 files changed, 2357 insertions(+), 260 deletions(-)
create mode 100644 include/efi_default_filename.h
create mode 100644 lib/efi_loader/efi_bootmenu_maintenance.c
