summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2015-03-09 07:47:18 +0100
committerTom Rini <trini@konsulko.com>2015-03-09 11:13:29 -0400
commit671fa63e79053c33456c198c1e0f74262b0b2548 (patch)
treebcd6b5b2396f99b08110eca07a9418d0fe24b473 /common
parentdd09f7e73c13f59bf7144667c35eb9e61eadf639 (diff)
downloadu-boot-imx-671fa63e79053c33456c198c1e0f74262b0b2548.zip
u-boot-imx-671fa63e79053c33456c198c1e0f74262b0b2548.tar.gz
u-boot-imx-671fa63e79053c33456c198c1e0f74262b0b2548.tar.bz2
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>
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 38be09b..0335f6b 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,