From c735ff2ac0972a9f7563ed68192c41dbe3bbbea4 Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Tue, 28 Feb 2012 20:59:59 +0100 Subject: mkimxboot/fuze+: fix booting to the OF Change-Id: I51db192d9c88952173acac6558941ba6421a31dd --- rbutil/mkimxboot/dualboot.c | 4 ++-- rbutil/mkimxboot/dualboot/dualboot.S | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'rbutil') diff --git a/rbutil/mkimxboot/dualboot.c b/rbutil/mkimxboot/dualboot.c index 3e7f169cbf..c2998956de 100644 --- a/rbutil/mkimxboot/dualboot.c +++ b/rbutil/mkimxboot/dualboot.c @@ -3,8 +3,8 @@ #include "dualboot.h" unsigned char dualboot_fuzeplus[128] = { - 0x70, 0x40, 0x2d, 0xe9, 0x5c, 0x20, 0x9f, 0xe5, 0x00, 0x20, 0x92, 0xe5, 0x01, 0x01, 0x12, 0xe3, - 0x00, 0x00, 0xa0, 0x03, 0x1e, 0xff, 0x2f, 0x01, 0x4c, 0x20, 0x9f, 0xe5, 0x00, 0x40, 0xa0, 0xe3, + 0x60, 0x20, 0x9f, 0xe5, 0x00, 0x20, 0x92, 0xe5, 0x01, 0x01, 0x12, 0xe3, 0x00, 0x00, 0xa0, 0x03, + 0x1e, 0xff, 0x2f, 0x01, 0x70, 0x40, 0x2d, 0xe9, 0x4c, 0x20, 0x9f, 0xe5, 0x00, 0x40, 0xa0, 0xe3, 0x48, 0x30, 0x9f, 0xe5, 0x00, 0x30, 0x93, 0xe5, 0x03, 0x35, 0xa0, 0xe1, 0x23, 0x3f, 0xa0, 0xe1, 0x01, 0x00, 0x53, 0xe3, 0x03, 0x40, 0x84, 0x00, 0x01, 0x20, 0x52, 0xe2, 0xf7, 0xff, 0xff, 0x1a, 0x2c, 0x20, 0x9f, 0xe5, 0x02, 0x00, 0x54, 0xe1, 0x02, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x81, 0xe5, diff --git a/rbutil/mkimxboot/dualboot/dualboot.S b/rbutil/mkimxboot/dualboot/dualboot.S index 1b9edb015f..645a7889cb 100644 --- a/rbutil/mkimxboot/dualboot/dualboot.S +++ b/rbutil/mkimxboot/dualboot/dualboot.S @@ -23,7 +23,6 @@ .global start @ int start(uint32_t arg, uint32_t *result_id) start: - stmfd sp!, {r4-r6,lr} #if defined(SANSA_FUZEPLUS) /* If volume down key is hold, return so that the OF can boot */ ldr r2, =0x80018610 @ HW_PINCTRL_DIN1 @@ -32,6 +31,7 @@ start: moveq r0, #0 @ return 0, continue boot bxeq lr /* otherwise monitor the power button for a short time */ + stmfd sp!, {r4-r6,lr} ldr r2, =550000 @ loop count ldr r4, =0 @ number of times PSWITCH was 1 pswitch_monitor_loop: -- cgit v1.2.3