2 files changed, 18 insertions, 8 deletions
diff --git a/demos/AVR-AT90CANx-GCC/main.c b/demos/AVR-AT90CANx-GCC/main.c
index f922efed0..79888a55a 100644
--- a/demos/AVR-AT90CANx-GCC/main.c
+++ b/demos/AVR-AT90CANx-GCC/main.c
@@ -38,6 +38,9 @@ static void TimerHandler(eventid_t id) {
     TestThread(&SD2);
 }
 
+/*
+ * Application entry point.
+ */
 int main(int argc, char **argv) {
   static EvTimer evt;
   static evhandler_t handlers[1] = {
@@ -45,12 +48,14 @@ int main(int argc, char **argv) {
   };
   static EventListener el0;
 
-  hwinit();
-
   /*
-   * The main() function becomes a thread here then the interrupts are
-   * enabled and ChibiOS/RT goes live.
+   * System initializations.
+   * - HAL initialization, this also initializes the configured device drivers
+   *   and performs the board-specific initializations.
+   * - Kernel initialization, the main() function becomes a thread and the
+   *   RTOS is active.
    */
+  halInit();
   chSysInit();
 
   /*
diff --git a/demos/AVR-ATmega128-GCC/main.c b/demos/AVR-ATmega128-GCC/main.c
index b63d793b5..c02ef5404 100644
--- a/demos/AVR-ATmega128-GCC/main.c
+++ b/demos/AVR-ATmega128-GCC/main.c
@@ -41,6 +41,9 @@ static void TimerHandler(eventid_t id) {
     TestThread(&SD2);
 }
 
+/*
+ * Application entry point.
+ */
 int main(int argc, char **argv) {
   static EvTimer evt;
   static evhandler_t handlers[1] = {
@@ -48,12 +51,14 @@ int main(int argc, char **argv) {
   };
   static EventListener el0;
 
-  hwinit();
-
   /*
-   * The main() function becomes a thread here then the interrupts are
-   * enabled and ChibiOS/RT goes live.
+   * System initializations.
+   * - HAL initialization, this also initializes the configured device drivers
+   *   and performs the board-specific initializations.
+   * - Kernel initialization, the main() function becomes a thread and the
+   *   RTOS is active.
    */
+  halInit();
   chSysInit();
 
   /*