summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firmware/export/config-m200v4.h2
-rw-r--r--rbutil/mkamsboot/dualboot.S6
2 files changed, 4 insertions, 4 deletions
diff --git a/firmware/export/config-m200v4.h b/firmware/export/config-m200v4.h
index de66788f75..b5c4f56b9f 100644
--- a/firmware/export/config-m200v4.h
+++ b/firmware/export/config-m200v4.h
@@ -138,7 +138,7 @@
138 138
139#define BOOTFILE_EXT "sansa" 139#define BOOTFILE_EXT "sansa"
140#define BOOTFILE "rockbox." BOOTFILE_EXT 140#define BOOTFILE "rockbox." BOOTFILE_EXT
141#define BOOTDIR "/" 141#define BOOTDIR "/.rockbox"
142 142
143#define IBSS_ATTR_VOICE_STACK 143#define IBSS_ATTR_VOICE_STACK
144#define ICODE_ATTR_TREMOR_NOT_MDCT 144#define ICODE_ATTR_TREMOR_NOT_MDCT
diff --git a/rbutil/mkamsboot/dualboot.S b/rbutil/mkamsboot/dualboot.S
index 8cadca8174..4d19b020a3 100644
--- a/rbutil/mkamsboot/dualboot.S
+++ b/rbutil/mkamsboot/dualboot.S
@@ -119,7 +119,7 @@ uclcopy:
119 cmp r1, #0 /* C3 = #0 means button pressed */ 119 cmp r1, #0 /* C3 = #0 means button pressed */
120 beq boot_of 120 beq boot_of
121#elif defined(SANSA_M200V4) 121#elif defined(SANSA_M200V4)
122 /* SELECT button */ 122 /* LEFT button */
123.set row, (1<<5) /* enable output on A5 */ 123.set row, (1<<5) /* enable output on A5 */
124 ldr r0, =GPIOA 124 ldr r0, =GPIOA
125 mov r1, #row 125 mov r1, #row
@@ -129,9 +129,9 @@ uclcopy:
129.set col, (1<<0) /* read keyscan column A0 */ 129.set col, (1<<0) /* read keyscan column A0 */
130 ldr r2, [r0, #(4*col)] 130 ldr r2, [r0, #(4*col)]
131 131
132 /* check value read (0 means button pressed) */ 132 /* check value read (1 means button pressed) */
133 cmp r2, #0 133 cmp r2, #0
134 beq boot_of 134 bne boot_of
135#else 135#else
136 #error No target-specific key check defined! 136 #error No target-specific key check defined!
137#endif 137#endif