firmware: board init with a ctor does not seem a good idea to me because i need binar...

diff --git a/src/target/firmware/apps/layer1/main.c b/src/target/firmware/apps/layer1/main.c
index e3dc281..1832d12 100644 (file)
--- 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 ba0513f..36b594b 100644 (file)
--- 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 663c83d..8ecee1b 100644 (file)
--- 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 c2fb601..9783ef3 100644 (file)
--- 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 */