From fa1b222c21a4c2aee932d6605facb9706bf0dae3 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sun, 19 Dec 2010 11:02:56 +0000
Subject: PPC board files and demo updated (to be tested).

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2503 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 boards/GENERIC_SPC563/board.c | 22 +++++-----------------
 boards/GENERIC_SPC563/board.h |  5 +++--
 2 files changed, 8 insertions(+), 19 deletions(-)

(limited to 'boards')

diff --git a/boards/GENERIC_SPC563/board.c b/boards/GENERIC_SPC563/board.c
index 63e882851..8356f122d 100644
--- a/boards/GENERIC_SPC563/board.c
+++ b/boards/GENERIC_SPC563/board.c
@@ -22,20 +22,18 @@
 
 /*
  * Early initialization code.
- * This initialization is performed just after reset before BSS and DATA
- * segments initialization.
+ * This initialization must be performed just after stack setup and before
+ * any other initialization.
  */
-void hwinit0(void) {
+void __early_init(void) {
 
   spc563_clock_init();
 }
 
 /*
- * Late initialization code.
- * This initialization is performed after BSS and DATA segments initialization
- * and before invoking the main() function.
+ * Board-specific initialization code.
  */
-void hwinit1(void) {
+void boardInit(void) {
 
   /*
    * Various initialization (temporary code).
@@ -50,14 +48,4 @@ void hwinit1(void) {
   SIU.PCR[GPIO_BUTTON4].R  = 0x0100;                /* IBE.                 */
   SIU.PCR[GPIO_SCI_A_TX].R = 0x0500;                /* Primary | IBE.       */
   SIU.PCR[GPIO_SCI_A_RX].R = 0x0500;                /* Primary | IBE.       */
-
-  /*
-   * HAL initialization.
-   */
-  halInit();
-
-  /*
-   * ChibiOS/RT initialization.
-   */
-  chSysInit();
 }
diff --git a/boards/GENERIC_SPC563/board.h b/boards/GENERIC_SPC563/board.h
index 78213a1ae..53c1140ce 100644
--- a/boards/GENERIC_SPC563/board.h
+++ b/boards/GENERIC_SPC563/board.h
@@ -53,13 +53,14 @@
 #define GPIO_LED3       190
 #define GPIO_LED4       191
 
+#if !defined(_FROM_ASM_)
 #ifdef __cplusplus
 extern "C" {
 #endif
-  void hwinit0(void);
-  void hwinit1(void);
+  void boardInit(void);
 #ifdef __cplusplus
 }
 #endif
+#endif /* _FROM_ASM_ */
 
 #endif /* _BOARD_H_ */
-- 
cgit v1.2.3