From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Mon, 9 Mar 2015 06:47:18 +0000 (+0100)
Subject: common/board_r: Restore non-cached memory setup
X-Git-Tag: v2015.04-rc4~47
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=671fa63e79053c33456c198c1e0f74262b0b2548;p=u-boot

common/board_r: Restore non-cached memory setup

This fixes a regression of e310b93ec1, affecting Ethernet on the Jetson
TK1, e.g.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

diff --git a/common/board_r.c b/common/board_r.c
index 38be09b8c1..0335f6bde6 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -271,6 +271,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)
 {
@@ -698,6 +706,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,