summaryrefslogtreecommitdiff
path: root/arch/microblaze/lib
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2012-07-04 13:12:37 +0200
committerMichal Simek <monstr@monstr.eu>2012-09-11 09:24:58 +0200
commit2380b8f529ae95cc51fa475e83101e40f4191a43 (patch)
treee5148174ae1255a921a514537ac40fab4d5145cf /arch/microblaze/lib
parentbcbb046bd5cba6acb07aa99cad728726be8359e6 (diff)
downloadu-boot-imx-2380b8f529ae95cc51fa475e83101e40f4191a43.zip
u-boot-imx-2380b8f529ae95cc51fa475e83101e40f4191a43.tar.gz
u-boot-imx-2380b8f529ae95cc51fa475e83101e40f4191a43.tar.bz2
microblaze: Clean microblaze initialization
Move board specific function to board_init function in board/ folder Remove externs from generic board.c Use board_init_f function in board.c file. Signed-off-by: Michal Simek <monstr@monstr.eu> Acked-by: Stephan Linz <linz@li-pro.net>
Diffstat (limited to 'arch/microblaze/lib')
-rw-r--r--arch/microblaze/lib/board.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c
index fde109f..b450367 100644
--- a/arch/microblaze/lib/board.c
+++ b/arch/microblaze/lib/board.c
@@ -39,13 +39,6 @@
DECLARE_GLOBAL_DATA_PTR;
-#ifdef CONFIG_SYS_GPIO_0
-extern int gpio_init (void);
-#endif
-#ifdef CONFIG_SYS_FSL_2
-extern void fsl_init2 (void);
-#endif
-
/*
* All attempts to come up with a "common" initialization sequence
* that works for all boards and architectures failed: some of the
@@ -67,20 +60,14 @@ init_fnc_t *init_sequence[] = {
#endif
serial_init,
console_init_f,
-#ifdef CONFIG_SYS_GPIO_0
- gpio_init,
-#endif
interrupts_init,
timer_init,
-#ifdef CONFIG_SYS_FSL_2
- fsl_init2,
-#endif
NULL,
};
unsigned long monitor_flash_len;
-void board_init (void)
+void board_init_f(ulong not_used)
{
bd_t *bd;
init_fnc_t **init_fnc_ptr;
@@ -189,6 +176,8 @@ void board_init (void)
/* Initialize the console (after the relocation and devices init) */
console_init_r();
+ board_init();
+
/* Initialize from environment */
load_addr = getenv_ulong("loadaddr", 16, load_addr);