summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-11-06 09:17:17 -0500
committerTom Rini <trini@konsulko.com>2015-11-06 09:17:17 -0500
commit250ea267d875ce3ff0e046308d31f51ff8d3b5e8 (patch)
tree6ea5aa35609f026ede34bad73d81b635d82eec0d /common
parentc3c016cf75360c2a0d0a065b64b438aaf7720576 (diff)
parent347ea94e2a954ab70f64a3f43d9b374cf4640f26 (diff)
downloadu-boot-imx-250ea267d875ce3ff0e046308d31f51ff8d3b5e8.zip
u-boot-imx-250ea267d875ce3ff0e046308d31f51ff8d3b5e8.tar.gz
u-boot-imx-250ea267d875ce3ff0e046308d31f51ff8d3b5e8.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'common')
-rw-r--r--common/board_f.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/common/board_f.c b/common/board_f.c
index 7632041..a12ac28 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -551,7 +551,7 @@ static int display_new_sp(void)
return 0;
}
-#if defined(CONFIG_PPC) || defined(CONFIG_M68K)
+#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_MIPS)
static int setup_board_part1(void)
{
bd_t *bd = gd->bd;
@@ -580,7 +580,9 @@ static int setup_board_part1(void)
return 0;
}
+#endif
+#if defined(CONFIG_PPC) || defined(CONFIG_M68K)
static int setup_board_part2(void)
{
bd_t *bd = gd->bd;
@@ -933,8 +935,10 @@ static init_fnc_t init_sequence_f[] = {
reserve_stacks,
setup_dram_config,
show_dram_config,
-#if defined(CONFIG_PPC) || defined(CONFIG_M68K)
+#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_MIPS)
setup_board_part1,
+#endif
+#if defined(CONFIG_PPC) || defined(CONFIG_M68K)
INIT_FUNC_WATCHDOG_RESET
setup_board_part2,
#endif