From patchwork Mon Mar 9 06:47:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 447916 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 39D87140146 for ; Mon, 9 Mar 2015 18:45:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C6D57A74C2; Mon, 9 Mar 2015 08:42:11 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id s-u6E0rmaQDs; Mon, 9 Mar 2015 08:42:11 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AB2ECA7549; Mon, 9 Mar 2015 08:38:58 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5EB3F4A032 for ; Mon, 9 Mar 2015 07:47:23 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tKkzln9MlTgd for ; Mon, 9 Mar 2015 07:47:23 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from david.siemens.de (david.siemens.de [192.35.17.14]) by theia.denx.de (Postfix) with ESMTPS id 29A334A01B for ; Mon, 9 Mar 2015 07:47:19 +0100 (CET) Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.14.3/8.14.3) with ESMTP id t296lIAJ017825; Mon, 9 Mar 2015 07:47:19 +0100 Received: from md1f2u6c.ww002.siemens.net ([139.22.33.243]) by mail1.siemens.de (8.14.3/8.14.3) with SMTP id t296lIJo001310; Mon, 9 Mar 2015 07:47:18 +0100 Message-ID: <54FD41F6.5060208@siemens.com> Date: Mon, 09 Mar 2015 07:47:18 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Tom Rini , U-Boot Mailing List Cc: Thierry Reding , Angelo Dureghello Subject: [U-Boot] [PATCH] common/board_r: Restore non-cached memory setup X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This fixes a regression of e310b93ec1, affecting Ethernet on the Jetson TK1, e.g. Signed-off-by: Jan Kiszka --- common/board_r.c | 11 +++++++++++ 1 file changed, 11 insertions(+) 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,