From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:53520)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1atDVK-0001rE-1n
	for qemu-devel@nongnu.org; Thu, 21 Apr 2016 08:14:42 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1atDVJ-0002tv-7G
	for qemu-devel@nongnu.org; Thu, 21 Apr 2016 08:14:41 -0400
Received: from mail-vk0-x235.google.com ([2607:f8b0:400c:c05::235]:34077)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1atDVJ-0002tZ-3V
	for qemu-devel@nongnu.org; Thu, 21 Apr 2016 08:14:41 -0400
Received: by mail-vk0-x235.google.com with SMTP id e185so95463386vkb.1
	for <qemu-devel@nongnu.org>; Thu, 21 Apr 2016 05:14:40 -0700 (PDT)
MIME-Version: 1.0
In-Reply-To: <1461188128-1107-1-git-send-email-sylvain@sylvaingarrigues.com>
References: <1461188128-1107-1-git-send-email-sylvain@sylvaingarrigues.com>
From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 21 Apr 2016 13:14:20 +0100
Message-ID: <CAFEAcA-Dzrdr-WbbHk06v3GJAe6Ah2hFTn8C=YX0M_q+ScBh7A@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [Qemu-devel] [PATCH] Fix the ARM bootloader so that r0 is
 always 0 before jumping to the kernel entry point
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Sylvain Garrigues <sylvain@sylvaingarrigues.com>
Cc: qemu-arm <qemu-arm@nongnu.org>, QEMU Developers <qemu-devel@nongnu.org>

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