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

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

[Ahmad Fatoum]

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@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


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

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

[Sascha Hauer]

On Wed, Jun 08, 2022 at 10:27:09PM +0200, Ahmad Fatoum wrote:
> 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@pengutronix.de>
> ---
> Please squash
> ---
>  common/booti.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> 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
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox