1 files changed, 18 insertions, 4 deletions
diff --git a/demos/ARM7-AT91SAM7X-GCC/board.c b/demos/ARM7-AT91SAM7X-GCC/board.c
index 4bc78f086..8a4b7c4ea 100644
--- a/demos/ARM7-AT91SAM7X-GCC/board.c
+++ b/demos/ARM7-AT91SAM7X-GCC/board.c
@@ -54,11 +54,11 @@ static void SYSIrqHandler(void) {
 }
 
 /*
- * Board initialization code.
+ * Early initialization code.
+ * This initialization is performed just after reset before BSS and DATA
+ * segments initialization.
  */
-void hwinit(void) {
-  int i;
-
+void hwinit0(void) {
   /*
    * Flash Memory: 1 wait state, about 50 cycles in a microsecond.
    */
@@ -99,6 +99,15 @@ void hwinit(void) {
   AT91C_BASE_PMC->PMC_PCER   = (1 << AT91C_ID_PIOA) | (1 << AT91C_ID_PIOB);
   AT91C_BASE_PIOA->PIO_PER   = 0xFFFFFFFF;
   AT91C_BASE_PIOB->PIO_PER   = 0xFFFFFFFF;
+}
+
+/*
+ * Late initialization code.
+ * This initialization is performed after BSS and DATA segments initialization
+ * and before invoking the main() function.
+ */
+void hwinit1(void) {
+  int i;
 
   /*
    * Default AIC setup, the device drivers will modify it as needed.
@@ -150,4 +159,9 @@ void hwinit(void) {
   AT91C_BASE_PIOA->PIO_PDR   = AT91C_PA3_RTS0 | AT91C_PA4_CTS0;
   AT91C_BASE_PIOA->PIO_ASR   = AT91C_PIO_PA3 | AT91C_PIO_PA4;
   AT91C_BASE_PIOA->PIO_PPUDR = AT91C_PIO_PA3 | AT91C_PIO_PA4;
+
+  /*
+   * ChibiOS/RT initialization.
+   */
+  chSysInit();
 }