From 077a4e6b9872eb18ae5dfa615f40753d5272c225 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 21 Jul 2011 09:52:25 +0200 Subject: microblaze: Call common console_init_f initialization function Calling console_init_f enables CTRL+C usage. Signed-off-by: Michal Simek --- arch/microblaze/lib/board.c | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/microblaze/lib') diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c index d97543b..5510c12 100644 --- a/arch/microblaze/lib/board.c +++ b/arch/microblaze/lib/board.c @@ -68,6 +68,7 @@ typedef int (init_fnc_t) (void); init_fnc_t *init_sequence[] = { env_init, serial_init, + console_init_f, #ifdef CONFIG_SYS_GPIO_0 gpio_init, #endif -- cgit v1.1 From a93c1a171ce012bbbba09bbaad22c8e516a589f9 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 21 Jul 2011 11:01:58 +0200 Subject: microblaze: Support flashes on lower addresses Signed-off-by: Michal Simek --- arch/microblaze/lib/board.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'arch/microblaze/lib') diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c index 5510c12..df27c1c 100644 --- a/arch/microblaze/lib/board.c +++ b/arch/microblaze/lib/board.c @@ -31,6 +31,7 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -84,6 +85,8 @@ init_fnc_t *init_sequence[] = { NULL, }; +unsigned long monitor_flash_len; + void board_init (void) { bd_t *bd; @@ -105,6 +108,8 @@ void board_init (void) bd->bi_memsize = CONFIG_SYS_SDRAM_SIZE; gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */ + monitor_flash_len = __end - __text_start; + /* * The Malloc area is immediately below the monitor copy in DRAM * aka CONFIG_SYS_MONITOR_BASE - Note there is no need for reloc_off -- cgit v1.1 From aa7acdd5094b0463301af1cf00186ff5ff2a8082 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 21 Jul 2011 10:30:42 +0200 Subject: microblaze: Initialize jumptable and console This changes were done to get support for netconsole. Signed-off-by: Michal Simek --- arch/microblaze/lib/board.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'arch/microblaze/lib') diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c index df27c1c..d677329 100644 --- a/arch/microblaze/lib/board.c +++ b/arch/microblaze/lib/board.c @@ -166,6 +166,12 @@ void board_init (void) /* Initialize stdio devices */ stdio_init (); + /* Initialize the jump table for applications */ + jumptable_init(); + + /* Initialize the console (after the relocation and devices init) */ + console_init_r(); + if ((s = getenv ("loadaddr")) != NULL) { load_addr = simple_strtoul (s, NULL, 16); } -- cgit v1.1 From 2267e2d132b6c5edb3312a85da1a2523437a4532 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 21 Jul 2011 09:47:15 +0200 Subject: microblaze: Copy bootfile from variables Setup bootfile. Signed-off-by: Michal Simek --- arch/microblaze/lib/board.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'arch/microblaze/lib') diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c index d677329..ca5882d 100644 --- a/arch/microblaze/lib/board.c +++ b/arch/microblaze/lib/board.c @@ -186,6 +186,10 @@ void board_init (void) uchar enetaddr[6]; eth_getenv_enetaddr("ethaddr", enetaddr); printf("MAC: %pM\n", enetaddr); + + s = getenv("bootfile"); + if (s != NULL) + copy_filename(BootFile, s, sizeof(BootFile)); #endif /* main_loop */ -- cgit v1.1