|
|
|
@ -158,13 +158,8 @@ typedef int (init_fnc_t) (void); |
|
|
|
|
|
|
|
|
|
static int init_baudrate (void) |
|
|
|
|
{ |
|
|
|
|
char tmp[64]; /* long enough for environment variables */ |
|
|
|
|
int i = getenv_f("baudrate", tmp, sizeof (tmp)); |
|
|
|
|
|
|
|
|
|
gd->baudrate = (i > 0) |
|
|
|
|
? (int) simple_strtoul (tmp, NULL, 10) |
|
|
|
|
: CONFIG_BAUDRATE; |
|
|
|
|
return (0); |
|
|
|
|
gd->baudrate = getenv_ulong("baudrate", 10, CONFIG_BAUDRATE); |
|
|
|
|
return 0; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/***********************************************************************/ |
|
|
|
@ -374,9 +369,7 @@ void board_init_f (ulong bootflag) |
|
|
|
|
gd_t *id; |
|
|
|
|
init_fnc_t **init_fnc_ptr; |
|
|
|
|
#ifdef CONFIG_PRAM |
|
|
|
|
int i; |
|
|
|
|
ulong reg; |
|
|
|
|
uchar tmp[64]; /* long enough for environment variables */ |
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
/* Pointer is writable since we allocated a register for it */ |
|
|
|
@ -448,10 +441,9 @@ void board_init_f (ulong bootflag) |
|
|
|
|
/*
|
|
|
|
|
* reserve protected RAM |
|
|
|
|
*/ |
|
|
|
|
i = getenv_f("pram", (char *)tmp, sizeof (tmp)); |
|
|
|
|
reg = (i > 0) ? simple_strtoul ((const char *)tmp, NULL, 10) : CONFIG_PRAM; |
|
|
|
|
reg = getenv_ulong("pram", 10, CONFIG_PRAM); |
|
|
|
|
addr -= (reg << 10); /* size is in kB */ |
|
|
|
|
debug ("Reserving %ldk for protected RAM at %08lx\n", reg, addr); |
|
|
|
|
debug("Reserving %ldk for protected RAM at %08lx\n", reg, addr); |
|
|
|
|
#endif /* CONFIG_PRAM */ |
|
|
|
|
|
|
|
|
|
/* round down to next 4 kB limit */ |
|
|
|
@ -933,9 +925,7 @@ void board_init_r (gd_t *id, ulong dest_addr) |
|
|
|
|
udelay (20); |
|
|
|
|
|
|
|
|
|
/* Initialize from environment */ |
|
|
|
|
if ((s = getenv ("loadaddr")) != NULL) { |
|
|
|
|
load_addr = simple_strtoul (s, NULL, 16); |
|
|
|
|
} |
|
|
|
|
load_addr = getenv_ulong("loadaddr", 16, load_addr); |
|
|
|
|
#if defined(CONFIG_CMD_NET) |
|
|
|
|
if ((s = getenv ("bootfile")) != NULL) { |
|
|
|
|
copy_filename (BootFile, s, sizeof (BootFile)); |
|
|
|
@ -1018,18 +1008,11 @@ void board_init_r (gd_t *id, ulong dest_addr) |
|
|
|
|
* taking into account the protected RAM at top of memory |
|
|
|
|
*/ |
|
|
|
|
{ |
|
|
|
|
ulong pram; |
|
|
|
|
ulong pram = 0; |
|
|
|
|
uchar memsz[32]; |
|
|
|
|
#ifdef CONFIG_PRAM |
|
|
|
|
char *s; |
|
|
|
|
|
|
|
|
|
if ((s = getenv ("pram")) != NULL) { |
|
|
|
|
pram = simple_strtoul (s, NULL, 10); |
|
|
|
|
} else { |
|
|
|
|
pram = CONFIG_PRAM; |
|
|
|
|
} |
|
|
|
|
#else |
|
|
|
|
pram=0; |
|
|
|
|
#ifdef CONFIG_PRAM |
|
|
|
|
pram = getenv_ulong("pram", 10, CONFIG_PRAM); |
|
|
|
|
#endif |
|
|
|
|
#ifdef CONFIG_LOGBUFFER |
|
|
|
|
#ifndef CONFIG_ALT_LB_ADDR |
|
|
|
|