qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: Sylvain Garrigues <sylvain@sylvaingarrigues.com>
Cc: qemu-arm <qemu-arm@nongnu.org>, QEMU Developers <qemu-devel@nongnu.org>
Subject: Re: [Qemu-devel] [PATCH] Fix the ARM bootloader so that r0 is always 0 before jumping to the kernel entry point
Date: Thu, 21 Apr 2016 13:14:20 +0100	[thread overview]
Message-ID: <CAFEAcA-Dzrdr-WbbHk06v3GJAe6Ah2hFTn8C=YX0M_q+ScBh7A@mail.gmail.com> (raw)
In-Reply-To: <1461188128-1107-1-git-send-email-sylvain@sylvaingarrigues.com>

On 20 April 2016 at 22:35, Sylvain Garrigues
<sylvain@sylvaingarrigues.com> wrote:
> Signed-off-by: Sylvain Garrigues <sylvain@sylvaingarrigues.com>
> ---
>  hw/arm/boot.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/arm/boot.c b/hw/arm/boot.c
> index 5975fbf..5876945 100644
> --- a/hw/arm/boot.c
> +++ b/hw/arm/boot.c
> @@ -68,7 +68,7 @@ static const ARMInsnFixup bootloader_aarch64[] = {
>   */
>
>  static const ARMInsnFixup bootloader[] = {
> -    { 0xe28fe008 }, /* add     lr, pc, #8 */
> +    { 0xe28fe004 }, /* add     lr, pc, #4 */
>      { 0xe51ff004 }, /* ldr     pc, [pc, #-4] */
>      { 0, FIXUP_BOARD_SETUP },
>  #define BOOTLOADER_NO_BOARD_SETUP_OFFSET 3

Applied, to master, thanks. (I expanded the commit message a bit.)

-- PMM

      reply	other threads:[~2016-04-21 12:14 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-20 21:35 [Qemu-devel] [PATCH] Fix the ARM bootloader so that r0 is always 0 before jumping to the kernel entry point Sylvain Garrigues
2016-04-21 12:14 ` Peter Maydell [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='CAFEAcA-Dzrdr-WbbHk06v3GJAe6Ah2hFTn8C=YX0M_q+ScBh7A@mail.gmail.com' \
    --to=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=sylvain@sylvaingarrigues.com \
    /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;
as well as URLs for NNTP newsgroup(s).