summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2012-02-28 20:59:59 +0100
committerAmaury Pouly <amaury.pouly@gmail.com>2012-02-28 21:00:23 +0100
commitc735ff2ac0972a9f7563ed68192c41dbe3bbbea4 (patch)
treeedc3be02585d5c2fefab8151858395500438f902
parentd96a32d01ab2d691811b452f5e7f898582f25492 (diff)
downloadrockbox-c735ff2ac0972a9f7563ed68192c41dbe3bbbea4.tar.gz
rockbox-c735ff2ac0972a9f7563ed68192c41dbe3bbbea4.zip
mkimxboot/fuze+: fix booting to the OF
Change-Id: I51db192d9c88952173acac6558941ba6421a31dd
-rw-r--r--rbutil/mkimxboot/dualboot.c4
-rw-r--r--rbutil/mkimxboot/dualboot/dualboot.S2
2 files changed, 3 insertions, 3 deletions
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 @@
3#include "dualboot.h" 3#include "dualboot.h"
4 4
5unsigned char dualboot_fuzeplus[128] = { 5unsigned char dualboot_fuzeplus[128] = {
6 0x70, 0x40, 0x2d, 0xe9, 0x5c, 0x20, 0x9f, 0xe5, 0x00, 0x20, 0x92, 0xe5, 0x01, 0x01, 0x12, 0xe3, 6 0x60, 0x20, 0x9f, 0xe5, 0x00, 0x20, 0x92, 0xe5, 0x01, 0x01, 0x12, 0xe3, 0x00, 0x00, 0xa0, 0x03,
7 0x00, 0x00, 0xa0, 0x03, 0x1e, 0xff, 0x2f, 0x01, 0x4c, 0x20, 0x9f, 0xe5, 0x00, 0x40, 0xa0, 0xe3, 7 0x1e, 0xff, 0x2f, 0x01, 0x70, 0x40, 0x2d, 0xe9, 0x4c, 0x20, 0x9f, 0xe5, 0x00, 0x40, 0xa0, 0xe3,
8 0x48, 0x30, 0x9f, 0xe5, 0x00, 0x30, 0x93, 0xe5, 0x03, 0x35, 0xa0, 0xe1, 0x23, 0x3f, 0xa0, 0xe1, 8 0x48, 0x30, 0x9f, 0xe5, 0x00, 0x30, 0x93, 0xe5, 0x03, 0x35, 0xa0, 0xe1, 0x23, 0x3f, 0xa0, 0xe1,
9 0x01, 0x00, 0x53, 0xe3, 0x03, 0x40, 0x84, 0x00, 0x01, 0x20, 0x52, 0xe2, 0xf7, 0xff, 0xff, 0x1a, 9 0x01, 0x00, 0x53, 0xe3, 0x03, 0x40, 0x84, 0x00, 0x01, 0x20, 0x52, 0xe2, 0xf7, 0xff, 0xff, 0x1a,
10 0x2c, 0x20, 0x9f, 0xe5, 0x02, 0x00, 0x54, 0xe1, 0x02, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x81, 0xe5, 10 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 @@
23.global start 23.global start
24@ int start(uint32_t arg, uint32_t *result_id) 24@ int start(uint32_t arg, uint32_t *result_id)
25start: 25start:
26 stmfd sp!, {r4-r6,lr}
27#if defined(SANSA_FUZEPLUS) 26#if defined(SANSA_FUZEPLUS)
28 /* If volume down key is hold, return so that the OF can boot */ 27 /* If volume down key is hold, return so that the OF can boot */
29 ldr r2, =0x80018610 @ HW_PINCTRL_DIN1 28 ldr r2, =0x80018610 @ HW_PINCTRL_DIN1
@@ -32,6 +31,7 @@ start:
32 moveq r0, #0 @ return 0, continue boot 31 moveq r0, #0 @ return 0, continue boot
33 bxeq lr 32 bxeq lr
34 /* otherwise monitor the power button for a short time */ 33 /* otherwise monitor the power button for a short time */
34 stmfd sp!, {r4-r6,lr}
35 ldr r2, =550000 @ loop count 35 ldr r2, =550000 @ loop count
36 ldr r4, =0 @ number of times PSWITCH was 1 36 ldr r4, =0 @ number of times PSWITCH was 1
37pswitch_monitor_loop: 37pswitch_monitor_loop: