summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv7/omap-common/boot-common.c
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-10-02 08:10:36 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-10-02 08:10:36 +0200
commit5c8d5b6fc15fc2c52d74c266d9fe6eb5f75cbcb4 (patch)
tree10c4a86397d7ac6ae9a6bcc0e9438dd620246404 /arch/arm/cpu/armv7/omap-common/boot-common.c
parent12eba1b49380988fd87cc0b3af44014cca8b71c4 (diff)
parent827512fb1154c05c6eb1e2259e936df55c98a535 (diff)
downloadblackbird-obmc-uboot-5c8d5b6fc15fc2c52d74c266d9fe6eb5f75cbcb4.tar.gz
blackbird-obmc-uboot-5c8d5b6fc15fc2c52d74c266d9fe6eb5f75cbcb4.zip
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu/armv7/omap-common/boot-common.c')
-rw-r--r--arch/arm/cpu/armv7/omap-common/boot-common.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c
index 6b4772b684..0ffa03ac01 100644
--- a/arch/arm/cpu/armv7/omap-common/boot-common.c
+++ b/arch/arm/cpu/armv7/omap-common/boot-common.c
@@ -76,6 +76,9 @@ void spl_board_init(void)
#if defined(CONFIG_AM33XX) && defined(CONFIG_SPL_MUSB_NEW_SUPPORT)
arch_misc_init();
#endif
+#ifdef CONFIG_AM33XX
+ am33xx_spl_board_init();
+#endif
}
int board_mmc_init(bd_t *bis)
OpenPOWER on IntegriCloud