projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
[oweals/u-boot.git]
/
board
/
mpl
/
pip405
/
pip405.c
diff --git
a/board/mpl/pip405/pip405.c
b/board/mpl/pip405/pip405.c
index 8724e27af2ec124c32a83209e799fd4c8bd4635f..677437d09ea99526698509403cddf7b54c439524 100644
(file)
--- a/
board/mpl/pip405/pip405.c
+++ b/
board/mpl/pip405/pip405.c
@@
-28,6
+28,7
@@
#include "pip405.h"
#include <asm/processor.h>
#include <i2c.h>
#include "pip405.h"
#include <asm/processor.h>
#include <i2c.h>
+#include <stdio_dev.h>
#include "../common/isa.h"
#include "../common/common_util.h"
#include "../common/isa.h"
#include "../common/common_util.h"
@@
-668,7
+669,7
@@
int misc_init_r (void)
/* if PIP405 has booted from PCI, reset CCR0[24] as described in errata PCI_18 */
if (mfdcr(strap) & PSR_ROM_LOC)
/* if PIP405 has booted from PCI, reset CCR0[24] as described in errata PCI_18 */
if (mfdcr(strap) & PSR_ROM_LOC)
- mtspr(
ccr0, (mfspr(ccr
0) & ~0x80));
+ mtspr(
SPRN_CCR0, (mfspr(SPRN_CCR
0) & ~0x80));
return (0);
}
return (0);
}
@@
-705,7
+706,7
@@
int last_stage_init (void)
{
print_pip405_rev ();
isa_init ();
{
print_pip405_rev ();
isa_init ();
- s
how_stdio_dev
();
+ s
tdio_print_current_devices
();
check_env();
return 0;
}
check_env();
return 0;
}