summaryrefslogtreecommitdiff
path: root/lib_ppc
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-08-10 20:33:06 +0200
committerStefan Roese <sr@denx.de>2007-08-10 20:33:06 +0200
commit59530af55613a8c5fac3c4e0f5fbcf2f1611c483 (patch)
treef16287c465c5f577cbfc22ae8ee3a1f979519af0 /lib_ppc
parentc74b2108e31fe09bd1c5d291c3cf360510d4f13e (diff)
parent99c2fdab91bc633e46fb41dbaa629f87ccf6e00f (diff)
downloadu-boot-imx-59530af55613a8c5fac3c4e0f5fbcf2f1611c483.zip
u-boot-imx-59530af55613a8c5fac3c4e0f5fbcf2f1611c483.tar.gz
u-boot-imx-59530af55613a8c5fac3c4e0f5fbcf2f1611c483.tar.bz2
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'lib_ppc')
-rw-r--r--lib_ppc/board.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index 325f5c2..c87d46c 100644
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -309,7 +309,9 @@ init_fnc_t *init_sequence[] = {
prt_8260_rsr,
prt_8260_clks,
#endif /* CONFIG_8260 */
-
+#if defined(CONFIG_MPC83XX)
+ prt_83xx_rsr,
+#endif
checkcpu,
#if defined(CONFIG_MPC5xxx)
prt_mpc5xxx_clks,
@@ -376,7 +378,7 @@ void board_init_f (ulong bootflag)
/* compiler optimization barrier needed for GCC >= 3.4 */
__asm__ __volatile__("": : :"memory");
-#if !defined(CONFIG_CPM2)
+#if !defined(CONFIG_CPM2) && !defined(CONFIG_MPC83XX)
/* Clear initial global data */
memset ((void *) gd, 0, sizeof (gd_t));
#endif