[PATCH] fixup! ARM64/RISC-V: booti: support global.bootm.image.loadaddr

Ahmad Fatoum a.fatoum at pengutronix.de
Wed Jun 8 13:27:09 PDT 2022


data->os_address may be UIMAGE_INVALID_ADDRESS, in which case, barebox
should determine on its own, which address to use.

Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
---
Please squash
---
 common/booti.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/booti.c b/common/booti.c
index fbf0d8008443..dde1605fe1f1 100644
--- a/common/booti.c
+++ b/common/booti.c
@@ -12,7 +12,8 @@ static unsigned long get_kernel_address(unsigned long os_address,
 	resource_size_t start, end;
 	int ret;
 
-	if (os_address == UIMAGE_SOME_ADDRESS) {
+	if (os_address == UIMAGE_SOME_ADDRESS ||
+	    os_address == UIMAGE_INVALID_ADDRESS) {
 		ret = memory_bank_first_find_space(&start, &end);
 		if (ret)
 			return UIMAGE_INVALID_ADDRESS;
-- 
2.30.2




More information about the barebox mailing list