brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-08-16 23:18:51 +09:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wolfgang Denk 2009-10-15 22:13:37 +02:00
commit 9efe379a0e
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cpu/blackfin/interrupts.c
View File

@ -20,6 +20,7 @@
#include <common.h> #include <common.h>
#include <config.h> #include <config.h>
#include <watchdog.h>
#include <asm/blackfin.h> #include <asm/blackfin.h>
#include "cpu.h" #include "cpu.h"
@ -70,6 +71,8 @@ void udelay(unsigned long usec)
cclk = (CONFIG_CCLK_HZ); cclk = (CONFIG_CCLK_HZ);
while (usec > 1) { while (usec > 1) {
WATCHDOG_RESET();
/* /*
* how many clock ticks to delay? * how many clock ticks to delay?
* - request(in useconds) * clock_ticks(Hz) / useconds/second * - request(in useconds) * clock_ticks(Hz) / useconds/second

3
include/asm-blackfin/config.h
View File

@ -18,6 +18,9 @@
# define CONFIG_BFIN_SCRATCH_REG retn # define CONFIG_BFIN_SCRATCH_REG retn
#endif #endif
/* Relocation to SDRAM works on all Blackfin boards */
#define CONFIG_RELOC_FIXUP_WORKS
/* Make sure the structure is properly aligned */ /* Make sure the structure is properly aligned */
#if ((CONFIG_SYS_GBL_DATA_ADDR & -4) != CONFIG_SYS_GBL_DATA_ADDR) #if ((CONFIG_SYS_GBL_DATA_ADDR & -4) != CONFIG_SYS_GBL_DATA_ADDR)
# error CONFIG_SYS_GBL_DATA_ADDR: must be 4 byte aligned # error CONFIG_SYS_GBL_DATA_ADDR: must be 4 byte aligned

1
include/asm-blackfin/global_data.h
View File

@ -44,7 +44,6 @@ typedef struct global_data {
unsigned long baudrate; unsigned long baudrate;
unsigned long have_console; /* serial_init() was called */ unsigned long have_console; /* serial_init() was called */
phys_size_t ram_size; /* RAM size */ phys_size_t ram_size; /* RAM size */
unsigned long reloc_off; /* Relocation Offset */
unsigned long env_addr; /* Address of Environment struct */ unsigned long env_addr; /* Address of Environment struct */
unsigned long env_valid; /* Checksum of Environment valid? */ unsigned long env_valid; /* Checksum of Environment valid? */
#if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER) #if defined(CONFIG_POST) || defined(CONFIG_LOGBUFFER)

6
lib_blackfin/board.c
View File

@ -278,7 +278,6 @@ static void board_net_init_r(bd_t *bd)
bb_miiphy_init(); bb_miiphy_init();
#endif #endif
#ifdef CONFIG_CMD_NET #ifdef CONFIG_CMD_NET
uchar enetaddr[6];
char *s; char *s;
if ((s = getenv("bootfile")) != NULL) if ((s = getenv("bootfile")) != NULL)
@ -288,15 +287,11 @@ static void board_net_init_r(bd_t *bd)
printf("Net: "); printf("Net: ");
eth_initialize(gd->bd); eth_initialize(gd->bd);
eth_getenv_enetaddr("ethaddr", enetaddr);
printf("MAC: %pM\n", enetaddr);
#endif #endif
} }
void board_init_r(gd_t * id, ulong dest_addr) void board_init_r(gd_t * id, ulong dest_addr)
{ {
extern void malloc_bin_reloc(void);
char *s; char *s;
bd_t *bd; bd_t *bd;
gd = id; gd = id;
@ -310,7 +305,6 @@ void board_init_r(gd_t * id, ulong dest_addr)
/* initialize malloc() area */ /* initialize malloc() area */
mem_malloc_init(CONFIG_SYS_MALLOC_BASE, CONFIG_SYS_MALLOC_LEN); mem_malloc_init(CONFIG_SYS_MALLOC_BASE, CONFIG_SYS_MALLOC_LEN);
malloc_bin_reloc();
#if !defined(CONFIG_SYS_NO_FLASH) #if !defined(CONFIG_SYS_NO_FLASH)
/* Initialize the flash and protect u-boot by default */ /* Initialize the flash and protect u-boot by default */