summaryrefslogtreecommitdiff
path: root/lib_ppc
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-11-18 21:40:38 +0100
committerWolfgang Denk <wd@denx.de>2008-11-18 21:40:38 +0100
commite0b0ec843085f96f4fe0738424835ee90e58bc00 (patch)
tree1136f04350b8fb4dcce0d94e69024e64ad0b5605 /lib_ppc
parentedf3fe7d39a1ee07353128af5221422ce9ccfad6 (diff)
parent3f510db522d160179dff3ddcce9b18f6241c2c24 (diff)
downloadu-boot-imx-e0b0ec843085f96f4fe0738424835ee90e58bc00.zip
u-boot-imx-e0b0ec843085f96f4fe0738424835ee90e58bc00.tar.gz
u-boot-imx-e0b0ec843085f96f4fe0738424835ee90e58bc00.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mpc86xx
Diffstat (limited to 'lib_ppc')
-rw-r--r--lib_ppc/board.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index ce07c4e..289a32a 100644
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -689,6 +689,11 @@ void board_init_r (gd_t *id, ulong dest_addr)
WATCHDOG_RESET ();
+ /*
+ * Setup trap handlers
+ */
+ trap_init (dest_addr);
+
#if defined(CONFIG_BOARD_EARLY_INIT_R)
board_early_init_r ();
#endif
@@ -765,11 +770,6 @@ void board_init_r (gd_t *id, ulong dest_addr)
asm ("sync ; isync");
- /*
- * Setup trap handlers
- */
- trap_init (dest_addr);
-
#if !defined(CONFIG_SYS_NO_FLASH)
puts ("FLASH: ");