summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2015-01-01 15:10:39 -0500
committerTom Rini <trini@ti.com>2015-01-01 15:10:39 -0500
commita74a4a86a53726ba17de8ab863bec1cd60cf545e (patch)
tree2dcb09a706850fa6cb1377b00815be6b8f71f606 /common
parentb7b3b8c6a0bfc87047cb18a7abfa06fb6e9d0331 (diff)
parentcc0856cd149acc7069ae97ebe10b92090a65f575 (diff)
downloadblackbird-obmc-uboot-a74a4a86a53726ba17de8ab863bec1cd60cf545e.tar.gz
blackbird-obmc-uboot-a74a4a86a53726ba17de8ab863bec1cd60cf545e.zip
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Diffstat (limited to 'common')
-rw-r--r--common/board_r.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/common/board_r.c b/common/board_r.c
index 4eb7a023d4..a301cc226f 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -265,6 +265,14 @@ static int initr_malloc(void)
return 0;
}
+#ifdef CONFIG_SYS_NONCACHED_MEMORY
+static int initr_noncached(void)
+{
+ noncached_init();
+ return 0;
+}
+#endif
+
#ifdef CONFIG_DM
static int initr_dm(void)
{
@@ -687,6 +695,9 @@ init_fnc_t init_sequence_r[] = {
#endif
initr_barrier,
initr_malloc,
+#ifdef CONFIG_SYS_NONCACHED_MEMORY
+ initr_noncached,
+#endif
bootstage_relocate,
#ifdef CONFIG_DM
initr_dm,
OpenPOWER on IntegriCloud