summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <uwe@kleine-koenig.org>2013-02-13 09:47:25 +0100
committerUwe Kleine-König <uwe@kleine-koenig.org>2013-02-13 09:47:25 +0100
commit5057035cc67a8fa0f181eb706fec7bf475f2798f (patch)
treedcda667422518d6ca9ecf7975cd3238b6fe297c5
parent2364e5c5471d8bc465dce2c5f5f838f1a536b1e8 (diff)
downloadOSELAS.BSP-EnergyMicro-Gecko-5057035cc67a8fa0f181eb706fec7bf475f2798f.tar.gz
OSELAS.BSP-EnergyMicro-Gecko-5057035cc67a8fa0f181eb706fec7bf475f2798f.tar.xz
OSELAS.BSP-EnergyMicro-Gecko/geckoboot: don't wait to boot into Linux
-rw-r--r--local_src/geckoboot-2013.01.0/geckoboot.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/local_src/geckoboot-2013.01.0/geckoboot.S b/local_src/geckoboot-2013.01.0/geckoboot.S
index a9af840..ebf9a60 100644
--- a/local_src/geckoboot-2013.01.0/geckoboot.S
+++ b/local_src/geckoboot-2013.01.0/geckoboot.S
@@ -43,11 +43,13 @@ reset:
mov r1, #'G'
str r1, [r0]
+#ifdef CONFIG_WAIT_FOR_PB2
/* only boot into Linux when PB2 is pressed */
ldr r0, =(BC_REGISTER)
1: ldr r1, [r0, #8] @ BC_REGISTER->UIF_PB
tst r1, #2
bne 1b
+#endif
boot_linux:
/* Copy oftree to RAM */