leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-microblaze

Browse Source 
* 'master' of git://git.denx.de/u-boot-microblaze:
  microblaze: Copy bootfile from variables
  microblaze: Fix unaligned.h for endians
  microblaze: Initialize jumptable and console
  microblaze: Support flashes on lower addresses
  microblaze: Call common console_init_f initialization function
This commit is contained in:
Wolfgang Denk 2011-10-12 22:42:28 +02:00
commit 37eefe80bb
3 changed files with 48 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
arch/microblaze/include/asm/processor.h
View File

@ -1 +1,31 @@
/* FIXME: Implement this! */
/*
* Copyright (C) 2011 Michal Simek <monstr@monstr.eu>
*
* See file CREDITS for list of people who contributed to this
* project.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
#ifndef __ASM_MICROBLAZE_PROCESSOR_H
#define __ASM_MICROBLAZE_PROCESSOR_H
/* References to section boundaries */
extern char __end[];
extern char __text_start[];
#endif /* __ASM_MICROBLAZE_PROCESSOR_H */

17
arch/microblaze/include/asm/unaligned.h
View File

@ -1,16 +1 @@
#ifndef _ASM_MICROBLAZE_UNALIGNED_H
#define _ASM_MICROBLAZE_UNALIGNED_H
#ifdef __KERNEL__
/*
* The Microblaze can do unaligned accesses itself in big endian mode.
*/
#include <linux/unaligned/access_ok.h>
#include <linux/unaligned/generic.h>
#define get_unaligned __get_unaligned_be
#define put_unaligned __put_unaligned_be
#endif /* __KERNEL__ */
#endif /* _ASM_MICROBLAZE_UNALIGNED_H */
#include <asm-generic/unaligned.h>

16
arch/microblaze/lib/board.c
View File

@ -31,6 +31,7 @@
#include <watchdog.h>
#include <stdio_dev.h>
#include <net.h>
#include <asm/processor.h>
DECLARE_GLOBAL_DATA_PTR;
@ -68,6 +69,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
@ -83,6 +85,8 @@ init_fnc_t *init_sequence[] = {
NULL,
};
unsigned long monitor_flash_len;
void board_init (void)
{
bd_t *bd;
@ -104,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
@ -160,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);
}
@ -174,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 */