diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2019-01-01 23:27:24 -0500 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2019-01-01 23:30:44 -0500 |
commit | 88cae9d13dcb7164d2445dca837ed76ac405ecd5 (patch) | |
tree | 63835a00d8eca55cb5ec9fb6dfd097128220f046 /firmware/target/coldfire | |
parent | 7e7ca0c85847e0b7eff094710cc5167df4e852da (diff) | |
download | rockbox-88cae9d13dcb7164d2445dca837ed76ac405ecd5.tar.gz rockbox-88cae9d13dcb7164d2445dca837ed76ac405ecd5.zip |
Coldfire: Don't clobber alwarm wakeup signal in dualboot mode
(See FS#7814 for details)
Change-Id: I6a09a8dfe1abc3a396ca8afe1dbbf1d203c7e3e2
Diffstat (limited to 'firmware/target/coldfire')
-rw-r--r-- | firmware/target/coldfire/crt0.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/firmware/target/coldfire/crt0.S b/firmware/target/coldfire/crt0.S index 5e73131894..34492ec853 100644 --- a/firmware/target/coldfire/crt0.S +++ b/firmware/target/coldfire/crt0.S | |||
@@ -46,6 +46,10 @@ start: | |||
46 | lea MBAR2, %a1 | 46 | lea MBAR2, %a1 |
47 | move.l (%a1), %a0 /* store GPIO_READ result for button check in main() */ | 47 | move.l (%a1), %a0 /* store GPIO_READ result for button check in main() */ |
48 | 48 | ||
49 | tst.b 0x30000000 /* preloader sets this to 1 | ||
50 | if woke up due to RTC alarm */ | ||
51 | bne .loadrockbox | ||
52 | |||
49 | /* Wait ~3 seconds for ON-button release. We need roughly 300ns per | 53 | /* Wait ~3 seconds for ON-button release. We need roughly 300ns per |
50 | iteration, so we check 10000000 times to reach the desired delay */ | 54 | iteration, so we check 10000000 times to reach the desired delay */ |
51 | move.l #10000000, %d0 | 55 | move.l #10000000, %d0 |