diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-30 17:15:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-30 17:15:39 -0400 |
| commit | bcfe764ee925d0820e82c69ccf75b71d142644c7 (patch) | |
| tree | 8a9914800558194df74705c06160c24f1aa8248e | |
| parent | 0b7d95531cf25a7c71bd9855135da5e7098e7b97 (diff) | |
| parent | b7cae5739741fad1327e64c18a0b30919bc77a0e (diff) | |
| download | u-boot-WIP/30Jun2020.tar.gz | |
Merge tag 'efi-2020-07-rc6-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efiWIP/30Jun2020
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.
| -rw-r--r-- | cmd/bootefi.c | 2 | ||||
| -rw-r--r-- | lib/efi_loader/efi_variable.c | 2 | ||||
| -rw-r--r-- | test/py/tests/test_efi_fit.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 8269153973..57552f99fc 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -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); diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index 6271dbcf41..c262cb5972 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -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) diff --git a/test/py/tests/test_efi_fit.py b/test/py/tests/test_efi_fit.py index beaf4a3c51..06fb151c13 100644 --- a/test/py/tests/test_efi_fit.py +++ b/test/py/tests/test_efi_fit.py @@ -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>; }; }; ''' |