random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-17 22:28:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pull request efi-2024-10-rc3

Browse Source 
UEFI:
 
 * efi_loader: use list_count_nodes() in efi_protocols_per_handle()
 * efi_loader: correct description of efi_get_distro_fdt_name
 * boot: set correct block device name in set_efi_bootdev()
 * configs: enable efidebug and EFI http boot on QEMU aarch64
 
 Other:
 
 * Makefile: don't use CFLAGS for environment text file
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEK7wKXt3/btL6/yA+hO4vgnE3U0sFAma4Ye4ACgkQhO4vgnE3
 U0tKOBAAvgrM3HhoNaeAJ2u9rg4UT9ltpM/zNhiNn5Uf2vPsueToGZ4mVfK3Rsdz
 VKST69aCqqhVL7hR2phgPYMV7rnY+gROAcJ9YRRgFMhutWD/u5tH3fapfk5ZbQve
 llG5OEXPIwoVX59j7uQrUqW7LI696tjaPqip/svwb5aplpi6VtA0BsYga+c9osYZ
 le3ke+jFksl2sIRfbfpCD3rj5lHTf34k2MeZKDBSvjlfCActjnw3fUZ+234J1cEF
 IlijSYUH02M7fNZOpOiSMwyRusgeV/khkwhSdFt4KNegGS8dHVlfo8K4Op486Z7E
 TQpfYCRgyN6AGcSPF5MiVcFpuL34WhGYJnwdue0cP47PP0OwG09GXh7ibEMR+Yr+
 rsVwhv4mdE8+nRWGRB81ZMlqwjqe9OWKn6Q3mT+6nEczRJ5wZ6HL+PeuiQddh/oP
 Y25+F0JcsZRY/7fkzdTAPEP2CfBlP/lxQTqyXoIejPGmMENWGUTnFX1isff2RHlr
 f9pR2L6LB+pmVc8RruHC673acaki6Idz6iLPklYNTB7L8rowLGw1UA1YDzz9VEje
 pT6MW7TQCWnAamMklTZalSbwW0WF3a98KSRHH4Br7QPiULqkTXsXsVmLzw5ROmOW
 1SkvxwWateSYnLgHCm8KBMFxE6WEkUtVTZeoixVWjb999wkHCNY=
 =XKMc
 -----END PGP SIGNATURE-----

Merge tag 'efi-2024-10-rc3' of https://source.denx.de/u-boot/custodians/u-boot-efi

Pull request efi-2024-10-rc3

UEFI:

* efi_loader: use list_count_nodes() in efi_protocols_per_handle()
* efi_loader: correct description of efi_get_distro_fdt_name
* boot: set correct block device name in set_efi_bootdev()
* configs: enable efidebug and EFI http boot on QEMU aarch64

Other:

* Makefile: don't use CFLAGS for environment text file
This commit is contained in:
Tom Rini 2024-08-12 07:57:34 -06:00
commit 40198f86f0
5 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1839,7 +1839,7 @@ ENV_FILE := $(if $(ENV_SOURCE_FILE),$(ENV_FILE_CFG),$(wildcard $(ENV_FILE_BOARD)
quiet_cmd_gen_envp = ENVP $@
cmd_gen_envp = \
if [ -s "$(ENV_FILE)" ]; then \
$(CPP) -P $(CFLAGS) -x assembler-with-cpp -undef \
$(CPP) -P $(cpp_flags) -x assembler-with-cpp -undef \
-D__ASSEMBLY__ \
-D__UBOOT_CONFIG__ \
-I . -I include -I $(srctree)/include \

7
boot/bootmeth_efi.c
View File

@ -100,11 +100,10 @@ static void set_efi_bootdev(struct blk_desc *desc, struct bootflow *bflow)
if (last_slash)
*last_slash = '\0';
log_debug("setting bootdev %s, %s, %s, %p, %x\n",
dev_get_uclass_name(media_dev), devnum_str, bflow->fname,
bflow->buf, size);
dev_name = device_get_uclass_id(media_dev) == UCLASS_MASS_STORAGE ?
"usb" : dev_get_uclass_name(media_dev);
"usb" : blk_get_uclass_name(device_get_uclass_id(media_dev));
log_debug("setting bootdev %s, %s, %s, %p, %x\n",
dev_name, devnum_str, bflow->fname, bflow->buf, size);
efi_set_bootdev(dev_name, devnum_str, bflow->fname, bflow->buf, size);
}

2
configs/qemu_arm64_defconfig
View File

@ -33,6 +33,7 @@ CONFIG_CMD_NVEDIT_EFI=y
CONFIG_CMD_DFU=y
CONFIG_CMD_MTD=y
CONFIG_CMD_PCI=y
CONFIG_CMD_EFIDEBUG=y
CONFIG_CMD_TPM=y
CONFIG_CMD_MTDPARTS=y
CONFIG_ENV_IS_IN_FLASH=y
@ -68,3 +69,4 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_PCI=y
CONFIG_SEMIHOSTING=y
CONFIG_TPM=y
CONFIG_EFI_HTTP_BOOT=y

6
lib/efi_loader/efi_boottime.c
View File

@ -2509,16 +2509,12 @@ static efi_status_t EFIAPI efi_protocols_per_handle(
return EFI_EXIT(EFI_INVALID_PARAMETER);
*protocol_buffer = NULL;
*protocol_buffer_count = 0;
efiobj = efi_search_obj(handle);
if (!efiobj)
return EFI_EXIT(EFI_INVALID_PARAMETER);
/* Count protocols */
list_for_each(protocol_handle, &efiobj->protocols) {
++*protocol_buffer_count;
}
*protocol_buffer_count = list_count_nodes(&efiobj->protocols);
/* Copy GUIDs */
if (*protocol_buffer_count) {

2
lib/efi_loader/efi_fdt.c
View File

@ -14,7 +14,7 @@
#include <vsprintf.h>
/**
* distro_efi_get_fdt_name() - get the filename for reading the .dtb file
* efi_get_distro_fdt_name() - get the filename for reading the .dtb file
*
* @fname: buffer for filename
* @size: buffer size