diff options
| author | Bertrik Sikken <bertrik@sikken.nl> | 2011-10-29 17:08:05 +0000 |
|---|---|---|
| committer | Bertrik Sikken <bertrik@sikken.nl> | 2011-10-29 17:08:05 +0000 |
| commit | e90f961593e92fa5d98efa67b569e7efe5f4fbe0 (patch) | |
| tree | 70f01d2ac811ba161c22903824590d2690850efd /rbutil/mkamsboot/dualboot/dualboot.S | |
| parent | a8cde851fbcefdd33d826cf4b1f0daa8c0b48dc2 (diff) | |
| download | rockbox-e90f961593e92fa5d98efa67b569e7efe5f4fbe0.tar.gz rockbox-e90f961593e92fa5d98efa67b569e7efe5f4fbe0.zip | |
Sansa clip zip: update mkamsboot and fix various drivers to make it boot to the main firmware
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30853 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/mkamsboot/dualboot/dualboot.S')
| -rw-r--r-- | rbutil/mkamsboot/dualboot/dualboot.S | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/rbutil/mkamsboot/dualboot/dualboot.S b/rbutil/mkamsboot/dualboot/dualboot.S index 5d8fe1268c..4df69a45cc 100644 --- a/rbutil/mkamsboot/dualboot/dualboot.S +++ b/rbutil/mkamsboot/dualboot/dualboot.S | |||
| @@ -175,8 +175,12 @@ uclcopy: | |||
| 175 | bne boot_of @ branch directly to OF if either pin high | 175 | bne boot_of @ branch directly to OF if either pin high |
| 176 | 176 | ||
| 177 | #elif defined(SANSA_CLIPZIP) | 177 | #elif defined(SANSA_CLIPZIP) |
| 178 | @ just boot the OF | 178 | @ read pins |
| 179 | b boot_of | 179 | ldr r0, =GPIOA |
| 180 | ldr r1, [r0, #4*(1<<6)] @ read GPIO A6 "vol-" | ||
| 181 | |||
| 182 | cmp r1, #0 @ test input from pins | ||
| 183 | bne boot_of @ branch directly to OF if either pin high | ||
| 180 | 184 | ||
| 181 | #elif defined(SANSA_C200V2) | 185 | #elif defined(SANSA_C200V2) |
| 182 | .set BUTTON_LEFT, (1<< 2) | 186 | .set BUTTON_LEFT, (1<< 2) |