From ada9fb82aac5f1bc2465d4555380c2bef40cb8d3 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sun, 19 Dec 2010 09:36:44 +0000
Subject: LPC1xxx board files and demos updated.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2498 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 boards/EA_LPCXPRESSO_BB_1114/board.c | 22 +++++-----------------
 boards/EA_LPCXPRESSO_BB_1114/board.h |  4 +++-
 boards/EA_LPCXPRESSO_BB_1343/board.c | 22 +++++-----------------
 boards/EA_LPCXPRESSO_BB_1343/board.h |  4 +++-
 4 files changed, 16 insertions(+), 36 deletions(-)

(limited to 'boards')

diff --git a/boards/EA_LPCXPRESSO_BB_1114/board.c b/boards/EA_LPCXPRESSO_BB_1114/board.c
index 60fb7eed3..68e8efc05 100644
--- a/boards/EA_LPCXPRESSO_BB_1114/board.c
+++ b/boards/EA_LPCXPRESSO_BB_1114/board.c
@@ -34,25 +34,18 @@ const PALConfig pal_default_config = {
 
 /*
  * 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) {
 
   lpc111x_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) {
-
-  /*
-   * HAL initialization.
-   */
-  halInit();
+void boardInit(void) {
 
   /*
    * Extra, board-specific, initializations.
@@ -64,9 +57,4 @@ void hwinit1(void) {
                                            and makes it GPIO1_2.            */
   LPC_IOCON->PIO1_9 = 0xC0;             /* Disables pull-up on LED3R output.*/
   LPC_IOCON->PIO1_10 = 0xC0;            /* Disables pull-up on LED3G output.*/
-
-  /*
-   * ChibiOS/RT initialization.
-   */
-  chSysInit();
 }
diff --git a/boards/EA_LPCXPRESSO_BB_1114/board.h b/boards/EA_LPCXPRESSO_BB_1114/board.h
index e7f2b22d8..be7805709 100644
--- a/boards/EA_LPCXPRESSO_BB_1114/board.h
+++ b/boards/EA_LPCXPRESSO_BB_1114/board.h
@@ -86,12 +86,14 @@
 #define GPIO1_LED3G             10
 #define GPIO1_SPI0SEL           11
 
+#if !defined(_FROM_ASM_)
 #ifdef __cplusplus
 extern "C" {
 #endif
-  void hwinit(void);
+  void boardInit(void);
 #ifdef __cplusplus
 }
 #endif
+#endif /* _FROM_ASM_ */
 
 #endif /* _BOARD_H_ */
diff --git a/boards/EA_LPCXPRESSO_BB_1343/board.c b/boards/EA_LPCXPRESSO_BB_1343/board.c
index 4055ee116..a7844e76a 100644
--- a/boards/EA_LPCXPRESSO_BB_1343/board.c
+++ b/boards/EA_LPCXPRESSO_BB_1343/board.c
@@ -34,25 +34,18 @@ const PALConfig pal_default_config = {
 
 /*
  * 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) {
 
   LPC13xx_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) {
-
-  /*
-   * HAL initialization.
-   */
-  halInit();
+void boardInit(void) {
 
   /*
    * Extra, board-specific, initializations.
@@ -64,9 +57,4 @@ void hwinit1(void) {
                                            and makes it GPIO1_2.            */
   LPC_IOCON->PIO1_9 = 0xC0;             /* Disables pull-up on LED3R output.*/
   LPC_IOCON->PIO1_10 = 0xC0;            /* Disables pull-up on LED3G output.*/
-
-  /*
-   * ChibiOS/RT initialization.
-   */
-  chSysInit();
 }
diff --git a/boards/EA_LPCXPRESSO_BB_1343/board.h b/boards/EA_LPCXPRESSO_BB_1343/board.h
index 2375e8f64..dfcb1f3f9 100644
--- a/boards/EA_LPCXPRESSO_BB_1343/board.h
+++ b/boards/EA_LPCXPRESSO_BB_1343/board.h
@@ -81,12 +81,14 @@
 #define GPIO1_LED3G             10
 #define GPIO1_SPI0SEL           11
 
+#if !defined(_FROM_ASM_)
 #ifdef __cplusplus
 extern "C" {
 #endif
-  void hwinit(void);
+  void boardInit(void);
 #ifdef __cplusplus
 }
 #endif
+#endif /* _FROM_ASM_ */
 
 #endif /* _BOARD_H_ */
-- 
cgit v1.2.3