diff options
-rw-r--r-- | bootloader/iaudio_coldfire.c | 3 | ||||
-rw-r--r-- | firmware/target/coldfire/iaudio/m3/power-m3.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/bootloader/iaudio_coldfire.c b/bootloader/iaudio_coldfire.c index bb7fbebd3e..0f3798d783 100644 --- a/bootloader/iaudio_coldfire.c +++ b/bootloader/iaudio_coldfire.c | |||
@@ -180,7 +180,8 @@ void main(void) | |||
180 | { | 180 | { |
181 | /* No need to check for USB connection here, as USB is handled | 181 | /* No need to check for USB connection here, as USB is handled |
182 | * in the cowon loader. */ | 182 | * in the cowon loader. */ |
183 | printf("Hold switch on"); | 183 | if (on_button || rc_on_button) |
184 | printf("Hold switch on"); | ||
184 | shutdown(); | 185 | shutdown(); |
185 | } | 186 | } |
186 | 187 | ||
diff --git a/firmware/target/coldfire/iaudio/m3/power-m3.c b/firmware/target/coldfire/iaudio/m3/power-m3.c index a7f3fc46be..475f64ec4a 100644 --- a/firmware/target/coldfire/iaudio/m3/power-m3.c +++ b/firmware/target/coldfire/iaudio/m3/power-m3.c | |||
@@ -37,9 +37,11 @@ void power_init(void) | |||
37 | and_l(~0x00000020, &GPIO1_ENABLE); | 37 | and_l(~0x00000020, &GPIO1_ENABLE); |
38 | or_l(0x00000020, &GPIO1_FUNCTION); | 38 | or_l(0x00000020, &GPIO1_FUNCTION); |
39 | 39 | ||
40 | #ifndef BOOTLOADER | ||
40 | /* FIXME: Just disable the multi-colour LED for now. */ | 41 | /* FIXME: Just disable the multi-colour LED for now. */ |
41 | and_l(~0x00000210, &GPIO1_OUT); | 42 | and_l(~0x00000210, &GPIO1_OUT); |
42 | and_l(~0x00008000, &GPIO_OUT); | 43 | and_l(~0x00008000, &GPIO_OUT); |
44 | #endif | ||
43 | } | 45 | } |
44 | 46 | ||
45 | bool charger_inserted(void) | 47 | bool charger_inserted(void) |