From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36973)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <sylvain@iCladMac.local>) id 1atC3o-0002nL-Q7
	for qemu-devel@nongnu.org; Thu, 21 Apr 2016 06:42:13 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <sylvain@iCladMac.local>) id 1atC3o-0004KL-22
	for qemu-devel@nongnu.org; Thu, 21 Apr 2016 06:42:12 -0400
From: Sylvain Garrigues <sylvain@sylvaingarrigues.com>
Date: Wed, 20 Apr 2016 23:35:28 +0200
Message-Id: <1461188128-1107-1-git-send-email-sylvain@sylvaingarrigues.com>
Subject: [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: Peter Maydell <peter.maydell@linaro.org>, qemu-arm@nongnu.org
Cc: qemu-devel@nongnu.org, Sylvain Garrigues <sylvain@sylvaingarrigues.com>

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