On Monday 30 May 2022 09:32:53 Masahisa Kojima wrote: > Hi Heinrich, > > On Mon, 30 May 2022 at 01:16, Heinrich Schuchardt <xypron.g...@gmx.de> wrote: > > > > Dear Tom, > > > > this replaces pull request for efi-2022-07-rc4. > > > > The following changes since commit 4fe629d2e8bbda5f265e870d771b92be26e885f6: > > > > Merge https://source.denx.de/u-boot/custodians/u-boot-riscv > > (2022-05-27 08:50:42 -0400) > > > > are available in the Git repository at: > > > > https://source.denx.de/u-boot/custodians/u-boot-efi.git > > tags/efi-2022-07-rc4-2 > > > > for you to fetch changes up to de8471a30eb399d46412b2037ba76cfa258c6115: > > > > bootmenu: use utf-8 for menu title (2022-05-29 13:18:18 +0200) > > > > Gitlab CI showed no issues: > > https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/12157 > > > > ---------------------------------------------------------------- > > Pull request for efi-2022-07-rc4-2 > > > > UEFI: > > > > * fix a problem in loading an image from a short-path > > * fix building the bootmenu command for CONFIG_EFI_LOADER=n > > * correct the bootefi command syntax > > * add firmware management protocol to the documentation > > > > Others: > > > > * bootmenu: fix bootmenu title handling > > > > ---------------------------------------------------------------- > > AKASHI Takahiro (2): > > efi_loader: disk: add efi_disk_is_removable() > > efi_loader: bootmgr: fix a problem in loading an image from a > > short-path > > > > Bin Meng (2): > > doc: sandbox: Correct the memory size config option > > doc: sandbox: Add a note of disabling LTO when using gdb > > > > Heinrich Schuchardt (6): > > disk: incorrect message in is_gpt_valid() > > test: restore timeout after bootmenu unit test > > doc/build/gcc: add more required packages > > test: fix pylint warnings in test_efi_selftest.py > > test: don't change console timeout in EFI selftest. > > cmd/bootefi: correct command syntax > > > > Masahisa Kojima (3): > > bootmenu: U-Boot console is enabled as default > > lib/charset: fix compile warnings > > bootmenu: use utf-8 for menu title > > With your fix to the last patch, the bootmenu output > is as below. > > *** U-Boot Boot Menu *** > > Boot 1. kernel=bootm 0x82000000 > Boot 2. kernel=bootm 0x83000000 > Reset board=reset > U-Boot console > > Press UP/DOWN to move, ENTER to select, ESC/CTRL+C to quit > > The menu title includes both the title and command of "bootmenu_x". > Is it intended?
Hello! This is really not intended. Issue is in commit: https://source.denx.de/u-boot/custodians/u-boot-efi/-/commit/de8471a30eb399d46412b2037ba76cfa258c6115 There is line: 184 + entry->title = strdup(option); But it rather should be: 184 + entry->title = strndup(option, sep-option); > Thanks, > Masahias Kojima > > > > > Sean Anderson (2): > > valgrind: Disable on Risc-V > > doc: sandbox: Add additional valgrind documentation > > > > Vincent Stehlé (2): > > efi: fix documentation warnings > > doc/efi: add firmware management protocol to the documentation > > > > Kconfig | 1 + > > boot/Kconfig | 7 +++ > > cmd/Kconfig | 10 ---- > > cmd/bootefi.c | 21 +++++--- > > cmd/bootmenu.c | 47 ++++++++-------- > > disk/part_efi.c | 4 +- > > doc/api/efi.rst | 6 +++ > > doc/arch/sandbox.rst | 107 > > +++++++++++++++++++++++++++++++++---- > > doc/build/gcc.rst | 8 +-- > > doc/usage/cmd/bootefi.rst | 8 +-- > > include/charset.h | 2 +- > > include/efi_loader.h | 3 ++ > > lib/efi_loader/efi_bootmgr.c | 107 > > +++++++++++++++++++++++++++++++++++-- > > lib/efi_loader/efi_disk.c | 27 ++++++++++ > > lib/efi_loader/efi_firmware.c | 10 ++-- > > test/py/tests/test_bootmenu.py | 66 +++++++++++------------ > > test/py/tests/test_efi_selftest.py | 91 ++++++++++--------------------- > > 17 files changed, 359 insertions(+), 166 deletions(-)
