5 files changed, 24 insertions, 13 deletions
diff --git a/demos/ARM7-LPC214x-GCC-minimal/Makefile b/demos/ARM7-LPC214x-GCC-minimal/Makefile
index d035f6f23..6450cad6b 100644
--- a/demos/ARM7-LPC214x-GCC-minimal/Makefile
+++ b/demos/ARM7-LPC214x-GCC-minimal/Makefile
@@ -80,7 +80,8 @@ ASRC = ../../ports/ARM7-LPC214x/chcore.c \
 TSRC =
 
 # List ASM source files here
-ASMSRC = ../../ports/ARM7-LPC214x/crt0.s ../../ports/ARM7/chsys.s
+ASMSRC = ../../ports/ARM7/crt0.s ../../ports/ARM7/chsys.s \
+         ../../ports/ARM7-LPC214x/vectors.s
 
 # List all user directories here
 UINCDIR = ../../src/include ../../src/lib \
diff --git a/demos/ARM7-LPC214x-GCC-minimal/Makefile.thumb b/demos/ARM7-LPC214x-GCC-minimal/Makefile.thumb
index ace728b15..f4fe4c25b 100644
--- a/demos/ARM7-LPC214x-GCC-minimal/Makefile.thumb
+++ b/demos/ARM7-LPC214x-GCC-minimal/Makefile.thumb
@@ -80,7 +80,8 @@ TSRC = ../../ports/ARM7-LPC214x/chcore.c \
        board.c main.c
 
 # List ASM source files here
-ASMSRC = ../../ports/ARM7-LPC214x/crt0.s ../../ports/ARM7/chsys.s
+ASMSRC = ../../ports/ARM7/crt0.s ../../ports/ARM7/chsys.s \
+         ../../ports/ARM7-LPC214x/vectors.s
 
 # List all user directories here
 UINCDIR = ../../src/include ../../src/lib \
diff --git a/demos/ARM7-LPC214x-GCC-minimal/board.c b/demos/ARM7-LPC214x-GCC-minimal/board.c
index e140f2359..3b3bd848e 100644
--- a/demos/ARM7-LPC214x-GCC-minimal/board.c
+++ b/demos/ARM7-LPC214x-GCC-minimal/board.c
@@ -58,10 +58,11 @@ static void T0IrqHandler(void) {
 }
 
 /*
- * Hardware initialization goes here.
- * NOTE: Interrupts are still disabled.
+ * Early initialization code.
+ * This initialization is performed just after reset before BSS and DATA
+ * segments initialization.
  */
-void hwinit(void) {
+void hwinit0(void) {
 
   /*
    * All peripherals clock disabled by default in order to save power.
@@ -106,6 +107,14 @@ void hwinit(void) {
   IO0SET = 0xFFFFFFFF;
   IO1DIR = VAL_FIO1DIR;
   IO1SET = 0xFFFFFFFF;
+}
+
+/*
+ * Late initialization code.
+ * This initialization is performed after BSS and DATA segments initialization
+ * and before invoking the main() function.
+ */
+void hwinit1(void) {
 
   /*
    * Interrupt vectors assignment.
@@ -132,4 +141,9 @@ void hwinit(void) {
 //  InitSSP();
 //  InitMMC();
 //  InitBuzzer();
+
+  /*
+   * ChibiOS/RT initialization.
+   */
+  chSysInit();
 }
diff --git a/demos/ARM7-LPC214x-GCC-minimal/ch.ld b/demos/ARM7-LPC214x-GCC-minimal/ch.ld
index bb59cec1c..81ab80dc6 100644
--- a/demos/ARM7-LPC214x-GCC-minimal/ch.ld
+++ b/demos/ARM7-LPC214x-GCC-minimal/ch.ld
@@ -48,7 +48,7 @@ SECTIONS
 	.text :
 	{
 		_text = .;
-                KEEP(*(.startup))
+                KEEP(*(vectors))
                 *(.text)
 		*(.text.*);
 		*(.rodata);
diff --git a/demos/ARM7-LPC214x-GCC-minimal/main.c b/demos/ARM7-LPC214x-GCC-minimal/main.c
index a7c896222..11fdd7b56 100644
--- a/demos/ARM7-LPC214x-GCC-minimal/main.c
+++ b/demos/ARM7-LPC214x-GCC-minimal/main.c
@@ -56,17 +56,12 @@ static msg_t Thread2(void *arg) {
 }
 
 /*
- * Entry point, the interrupts are disabled on entry.
+ * Entry point, note, the main() function is already a thread in the system
+ * on entry.
  */
 int main(int argc, char **argv) {
 
   /*
-   * The main() function becomes a thread here then the interrupts are
-   * enabled and ChibiOS/RT goes live.
-   */
-  chSysInit();
-
-  /*
    * Creates the blinker threads.
    */
   chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);