mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <sha@pengutronix.de>
To: Ahmad Fatoum <a.fatoum@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] fixup! ARM64/RISC-V: booti: support global.bootm.image.loadaddr
Date: Thu, 9 Jun 2022 09:37:03 +0200	[thread overview]
Message-ID: <20220609073703.GE1615@pengutronix.de> (raw)
In-Reply-To: <20220608202709.3821837-1-a.fatoum@pengutronix.de>

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


      reply	other threads:[~2022-06-09  7:38 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-08 20:27 Ahmad Fatoum
2022-06-09  7:37 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220609073703.GE1615@pengutronix.de \
    --to=sha@pengutronix.de \
    --cc=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox