diff options
author | Ingo Albrecht <prom@berlin.ccc.de> | 2010-07-14 08:04:59 +0200 |
---|---|---|
committer | Ingo Albrecht <prom@berlin.ccc.de> | 2010-07-20 14:41:20 +0200 |
commit | 72dc56e2e2467757c33d396f020bbc06b561db10 (patch) | |
tree | 661ac91c9fc6ec348b2278ec9347fc70a2a4cfee /src | |
parent | 45b509e0a5692d869c2bb46ddf9bc136be901551 (diff) |
firmware: board init with a ctor does not seem a good idea to me because i need binaries without board init
Diffstat (limited to 'src')
-rw-r--r-- | src/target/firmware/apps/layer1/main.c | 2 | ||||
-rw-r--r-- | src/target/firmware/board/compal_e88/init.c | 2 | ||||
-rw-r--r-- | src/target/firmware/board/compal_e99/init.c | 2 | ||||
-rw-r--r-- | src/target/firmware/include/board.h | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/src/target/firmware/apps/layer1/main.c b/src/target/firmware/apps/layer1/main.c index e3dc2811..1832d12f 100644 --- a/src/target/firmware/apps/layer1/main.c +++ b/src/target/firmware/apps/layer1/main.c @@ -54,6 +54,8 @@ static void key_handler(enum key_codes code, enum key_states state); int main(void) { + board_init(); + puts("\n\nHello World from " __FILE__ " program code\n"); puts(hr); diff --git a/src/target/firmware/board/compal_e88/init.c b/src/target/firmware/board/compal_e88/init.c index ba0513f1..36b594bc 100644 --- a/src/target/firmware/board/compal_e88/init.c +++ b/src/target/firmware/board/compal_e88/init.c @@ -74,7 +74,7 @@ static void board_io_init(void) writew(reg, ARMIO_LATCH_OUT); } -static void __ctor_board board_init(void) +void board_init(void) { /* Configure the memory interface */ calypso_mem_cfg(CALYPSO_nCS0, 3, CALYPSO_MEM_16bit, 1); diff --git a/src/target/firmware/board/compal_e99/init.c b/src/target/firmware/board/compal_e99/init.c index 663c83d5..8ecee1b0 100644 --- a/src/target/firmware/board/compal_e99/init.c +++ b/src/target/firmware/board/compal_e99/init.c @@ -75,7 +75,7 @@ static void board_io_init(void) writew(reg, ARMIO_LATCH_OUT); } -static void __ctor_board board_init(void) +void board_init(void) { /* Disable watchdog (compal loader leaves it enabled) */ wdog_enable(0); diff --git a/src/target/firmware/include/board.h b/src/target/firmware/include/board.h index c2fb6018..9783ef3e 100644 --- a/src/target/firmware/include/board.h +++ b/src/target/firmware/include/board.h @@ -3,4 +3,6 @@ extern const char *target_board; +void board_init(void); + #endif /* _BOARD_H */ |