projects
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
and added files (forgot git commit -a again)
[u-boot.git]
/
lib_ppc
/
board.c
diff --git
a/lib_ppc/board.c
b/lib_ppc/board.c
index
f40bb25
..
251d62e
100644
(file)
--- a/
lib_ppc/board.c
+++ b/
lib_ppc/board.c
@@
-437,6
+437,10
@@
void board_init_f (ulong bootflag)
*/
addr -= len;
addr &= ~(4096 - 1);
*/
addr -= len;
addr &= ~(4096 - 1);
+#ifdef CONFIG_LINKSTATION
+ /* U-Boot code at 1 MB boundary to make it easier to debug */
+ addr &= ~(1048576 - 1);
+#endif
#ifdef CONFIG_E500
/* round down to next 64 kB limit so that IVPR stays aligned */
addr &= ~(65536 - 1);
#ifdef CONFIG_E500
/* round down to next 64 kB limit so that IVPR stays aligned */
addr &= ~(65536 - 1);
@@
-883,8
+887,10
@@
void board_init_r (gd_t *id, ulong dest_addr)
/* Initialize the jump table for applications */
jumptable_init ();
/* Initialize the jump table for applications */
jumptable_init ();
+#if !defined(CONFIG_LINKSTATION)
/* Initialize the console (after the relocation and devices init) */
console_init_r ();
/* Initialize the console (after the relocation and devices init) */
console_init_r ();
+#endif
#if defined(CONFIG_CCM) || \
defined(CONFIG_COGENT) || \
#if defined(CONFIG_CCM) || \
defined(CONFIG_COGENT) || \
@@
-937,6
+943,7
@@
void board_init_r (gd_t *id, ulong dest_addr)
if ((s = getenv ("loadaddr")) != NULL) {
load_addr = simple_strtoul (s, NULL, 16);
}
if ((s = getenv ("loadaddr")) != NULL) {
load_addr = simple_strtoul (s, NULL, 16);
}
+ debug("load_addr: %08lx\n", load_addr);
#if (CONFIG_COMMANDS & CFG_CMD_NET)
if ((s = getenv ("bootfile")) != NULL) {
copy_filename (BootFile, s, sizeof (BootFile));
#if (CONFIG_COMMANDS & CFG_CMD_NET)
if ((s = getenv ("bootfile")) != NULL) {
copy_filename (BootFile, s, sizeof (BootFile));
@@
-992,6
+999,11
@@
void board_init_r (gd_t *id, ulong dest_addr)
reset_phy ();
#endif
reset_phy ();
#endif
+#if defined(CONFIG_LINKSTATION)
+ /* The LinkStation uses the net console by default */
+ console_init_r ();
+#endif
+
#ifdef CONFIG_POST
post_run (NULL, POST_RAM | post_bootmode_get(0));
#endif
#ifdef CONFIG_POST
post_run (NULL, POST_RAM | post_bootmode_get(0));
#endif