From 36c7e6efb372848edbbcd16c196003d0d93c2e2a Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Fri, 29 Jun 2012 13:52:27 +0200 Subject: microblaze: Remove extern from board.c eth_init() is defined at include/net.h. Signed-off-by: Michal Simek Acked-by: Simon Glass --- arch/microblaze/lib/board.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'arch/microblaze/lib/board.c') diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c index f3679d536b..7c001d1217 100644 --- a/arch/microblaze/lib/board.c +++ b/arch/microblaze/lib/board.c @@ -41,10 +41,6 @@ extern int gpio_init (void); #ifdef CONFIG_SYS_INTC_0 extern int interrupts_init (void); #endif - -#if defined(CONFIG_CMD_NET) -extern int eth_init (bd_t * bis); -#endif #ifdef CONFIG_SYS_TIMER_0 extern int timer_init (void); #endif -- cgit From e0bb305df88c98215da6d16af3709863d59ee256 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 2 Jul 2012 10:31:29 +0200 Subject: microblaze: Call serial multi initialization Signed-off-by: Michal Simek Acked-by: Simon Glass --- arch/microblaze/lib/board.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'arch/microblaze/lib/board.c') diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c index 7c001d1217..d3f2595354 100644 --- a/arch/microblaze/lib/board.c +++ b/arch/microblaze/lib/board.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -113,6 +114,10 @@ void board_init (void) */ mem_malloc_init (CONFIG_SYS_MALLOC_BASE, CONFIG_SYS_MALLOC_LEN); +#ifdef CONFIG_SERIAL_MULTI + serial_initialize(); +#endif + for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) { WATCHDOG_RESET (); if ((*init_fnc_ptr) () != 0) { -- cgit From 575a3d21f6d7cbb653e48a957d0b2db944f2b9b3 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 10 Jul 2012 10:31:31 +0200 Subject: microblaze: intc: Clear interrupt code Clear and prepare for device-tree driven configuration. Remove CONFIG_SYS_INTC_0 definition Use dynamic allocation instead of static. Signed-off-by: Michal Simek Acked-by: Simon Glass --- arch/microblaze/lib/board.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'arch/microblaze/lib/board.c') diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c index d3f2595354..b80250a6bc 100644 --- a/arch/microblaze/lib/board.c +++ b/arch/microblaze/lib/board.c @@ -33,15 +33,13 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; #ifdef CONFIG_SYS_GPIO_0 extern int gpio_init (void); #endif -#ifdef CONFIG_SYS_INTC_0 -extern int interrupts_init (void); -#endif #ifdef CONFIG_SYS_TIMER_0 extern int timer_init (void); #endif @@ -70,9 +68,7 @@ init_fnc_t *init_sequence[] = { #ifdef CONFIG_SYS_GPIO_0 gpio_init, #endif -#ifdef CONFIG_SYS_INTC_0 interrupts_init, -#endif #ifdef CONFIG_SYS_TIMER_0 timer_init, #endif -- cgit