summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-11-30 19:08:28 (GMT)
committerTom Rini <trini@konsulko.com>2016-12-01 00:31:17 (GMT)
commita2cb31086f68cc0db95d4373e6dbdb612954f445 (patch)
tree0da2e0ac66e184ba536d525f5007d88cea6f0372 /common
parentbb417f1c9055dc17df08d1e2c9edc281ad19b648 (diff)
parent6fd596a1aa57bd431263f45b0c57ee8ae6b2403c (diff)
downloadu-boot-fsl-qoriq-a2cb31086f68cc0db95d4373e6dbdb612954f445.tar.xz
Merge branch 'master' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'common')
-rw-r--r--common/board_r.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/board_r.c b/common/board_r.c
index d959ad3..5496f45 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -191,7 +191,7 @@ static int initr_serial(void)
return 0;
}
-#if defined(CONFIG_PPC) || defined(CONFIG_M68K)
+#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_MIPS)
static int initr_trap(void)
{
/*
@@ -807,7 +807,7 @@ init_fnc_t init_sequence_r[] = {
#ifdef CONFIG_NEEDS_MANUAL_RELOC
initr_manual_reloc_cmdtable,
#endif
-#if defined(CONFIG_PPC) || defined(CONFIG_M68K)
+#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_MIPS)
initr_trap,
#endif
#ifdef CONFIG_ADDR_MAP