diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-12-19 09:36:44 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-12-19 09:36:44 +0000 |
| commit | ada9fb82aac5f1bc2465d4555380c2bef40cb8d3 (patch) | |
| tree | f25a8b719465d6645644b97415aaa5d9a325c2ab /boards/EA_LPCXPRESSO_BB_1114 | |
| parent | 7d7d9727f9a280d63157ac9997fe271610f05b1e (diff) | |
| download | ChibiOS-ada9fb82aac5f1bc2465d4555380c2bef40cb8d3.tar.gz ChibiOS-ada9fb82aac5f1bc2465d4555380c2bef40cb8d3.tar.bz2 ChibiOS-ada9fb82aac5f1bc2465d4555380c2bef40cb8d3.zip | |
LPC1xxx board files and demos updated.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2498 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'boards/EA_LPCXPRESSO_BB_1114')
| -rw-r--r-- | boards/EA_LPCXPRESSO_BB_1114/board.c | 22 | ||||
| -rw-r--r-- | boards/EA_LPCXPRESSO_BB_1114/board.h | 4 |
2 files changed, 8 insertions, 18 deletions
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_ */
|