Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-03-16 06:46:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Pull request for UEFI sub-system for efi-2020-07-rc6 (2)

Browse source 
Fix an incorrect update of the GD register in efi_get_variable_common().
 Fix an incorrect check for an FDT reg property.
 Fix a device tree used for Python testing.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEbcT5xx8ppvoGt20zxIHbvCwFGsQFAl77MfMACgkQxIHbvCwF
 GsQGMQ//RWwaYS3Vi+hdLo6/Q9RpU4iDNWk1bYpRZOeHmxRXdl49FuzrfBMrnXGl
 c5DMlaKvBxeUTOFXFrqfnt/65EV/dLsnRxfblAfazk85d8EeDN8weVqfylazS1sq
 KhvoPfl9b6yI9+WU+OaHgoofK6z+K9zZZ3pPanQO7vCv08esdCU9XQpSK0wWpPdB
 M76+ETiJMBvCLzMVYmkCKhhuVol13LhJ+Cm4XMgvBLPyzMqBQYEwnRZLazC8j5QO
 Vx8LsUu28S1Kx929KD2y+ArtZmYKBC+NJ9wW3qloB9dKuCOJ+AUVZpJ9lG8FJk0r
 r6PUPkvg6QeXf/P7S0VgfA5ruZS/oU1ohTNBJmSXKk5RJeLyHt4eH0VJIbhb2ppa
 0hjWDGYzKTU5hR+XoQwPtsbhJF6HscBBf2AWfRJS0b9pLGoM2Nmh6/Kk9Z929hLK
 TLvoNBn5ol6D+wGeCXtgeWOXS4+f1wN/21tt1V5B4HKF0LGv8zLUhDH81jUWvDN9
 gWRONBCJza3V4Jco6mRy4lNSmLeUCtA51LcLT+Z+c8KFTJiuSHLLytK5zCQKWSIi
 3Gb4Yz5inLNqssdFelsavkvXdGnsXqqpoXag78fWPVPcI/ZD+c+VN5h1E0vqV8p8
 FlGNwSFwKzSVd0owsXiaqs4ikoeKdwJhBvPYZuBzb4cuIfID4Us=
 =6rZO
 -----END PGP SIGNATURE-----

Merge tag 'efi-2020-07-rc6-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

Pull request for UEFI sub-system for efi-2020-07-rc6 (2)

Fix an incorrect update of the GD register in efi_get_variable_common().
Fix an incorrect check for an FDT reg property.
Fix a device tree used for Python testing.
This commit is contained in:
Tom Rini 2020-06-30 17:15:39 -04:00
commit bcfe764ee9
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/bootefi.c
View file

@ -200,7 +200,7 @@ static void efi_carve_out_dt_rsv(void *fdt)
* The /reserved-memory node may have children with
* a size instead of a reg property.
*/
if (addr != FDT_ADDR_T_NONE &&
if (fdt_addr != FDT_ADDR_T_NONE &&
fdtdec_get_is_enabled(fdt, subnode))
efi_reserve_memory(fdt_addr, fdt_size);
subnode = fdt_next_subnode(fdt, subnode);

2
lib/efi_loader/efi_variable.c
View file

@ -606,7 +606,7 @@ static efi_status_t efi_get_variable_common(u16 *variable_name,
u32 attr;
if (!variable_name || !vendor || !data_size)
return EFI_EXIT(EFI_INVALID_PARAMETER);
return EFI_INVALID_PARAMETER;
ret = efi_to_native(&native_name, variable_name, vendor);
if (ret)

4
test/py/tests/test_efi_fit.py
View file

@ -106,14 +106,14 @@ FDT_DATA = '''
/ {
#address-cells = <1>;
#size-cells = <0>;
#size-cells = <1>;
model = "%(sys-arch)s %(fdt_type)s EFI FIT Boot Test";
compatible = "%(sys-arch)s";
reset@0 {
compatible = "%(sys-arch)s,reset";
reg = <0>;
reg = <0 4>;
};
};
'''