]> git.dujemihanovic.xyz Git - u-boot.git/commit
efi_loader: Don't carve out memory reservations too early
authorMark Kettenis <kettenis@openbsd.org>
Thu, 15 Feb 2024 23:25:34 +0000 (00:25 +0100)
committerHeinrich Schuchardt <heinrich.schuchardt@canonical.com>
Wed, 13 Mar 2024 07:06:57 +0000 (08:06 +0100)
commit1431ab8b6c1e215419391c0966e24933f173a58f
tree6e2ad3983529b78f4759cf1b6c2d195916e491df
parent0dc8cbda52a11addd0abe7bea77927fc2ba88d77
efi_loader: Don't carve out memory reservations too early

Moving the efi_carve_out_dt_rsv() call in commit 1be415b21b2d
("efi_loader: create memory reservations in ACPI case")
broke boards that create additional memory reservations in
ft_board_setup() since it is now called before those additional
memory reservations are made.  This is the case for the rk3588
boards and breaks booting OpenBSD on those boards.

Move the call back to its original location and add a call in
the code path used for ACPI.

Fixes: 1be415b21b2d ("efi_loader: create memory reservations in ACPI case")
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
lib/efi_loader/efi_helper.c