From e90f961593e92fa5d98efa67b569e7efe5f4fbe0 Mon Sep 17 00:00:00 2001 From: Bertrik Sikken Date: Sat, 29 Oct 2011 17:08:05 +0000 Subject: 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 --- rbutil/mkamsboot/dualboot/dualboot.S | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'rbutil/mkamsboot/dualboot/dualboot.S') 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: bne boot_of @ branch directly to OF if either pin high #elif defined(SANSA_CLIPZIP) - @ just boot the OF - b boot_of + @ read pins + ldr r0, =GPIOA + ldr r1, [r0, #4*(1<<6)] @ read GPIO A6 "vol-" + + cmp r1, #0 @ test input from pins + bne boot_of @ branch directly to OF if either pin high #elif defined(SANSA_C200V2) .set BUTTON_LEFT, (1<< 2) -- cgit v1.2.3