From patchwork Fri Apr 4 17:16:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murali Karicheri X-Patchwork-Id: 27853 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f72.google.com (mail-oa0-f72.google.com [209.85.219.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 61D4220369 for ; Fri, 4 Apr 2014 17:18:29 +0000 (UTC) Received: by mail-oa0-f72.google.com with SMTP id eb12sf11782793oac.11 for ; Fri, 04 Apr 2014 10:18:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=/iNDMIDAOJ9+R9soWRvDTpUZRB1kPXGVYQu5OmMlqQQ=; b=bqPjTEDJoAZHSXtSdm8Z638+XAbBpsgiVziyZXsQdZ/VDQa2B9PrnRMzuE4ummxs4R +7eFttM9FQmb82N5XEGC5LZyxmKbfoiIyTrAY1zX3GV5wuf+tz9nh2J53rMpDnCC9yVx 9XtZ3TnG9JOS0YxZFW1U8c/u0IT5MwyyBAH1iWPZAXpLLql9ibPMIn17L4wJGb3gYuQk elkFWLPmVxEvnZjEOFE0YbDrh3ER4mbJwuYZyVK4HXth8DBdEcYKkjr4akbB3eDn9zed tdwAL3dGfvM5V+Le1D/4fXCgUfqbzvMkUHY7GMTvD1jZ9liN6qOQDgqHtsQEO4+o4cvx aD2g== X-Gm-Message-State: ALoCoQmDiL/htrDbia2dXLCsH17AEBlilbo/S2t9uoebDLDIekFN1Bv4no9OtyouqxlQoujlUJP/ X-Received: by 10.42.240.19 with SMTP id ky19mr7908510icb.4.1396631908890; Fri, 04 Apr 2014 10:18:28 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.95.66 with SMTP id h60ls1116936qge.54.gmail; Fri, 04 Apr 2014 10:18:28 -0700 (PDT) X-Received: by 10.58.74.38 with SMTP id q6mr5770296vev.7.1396631908745; Fri, 04 Apr 2014 10:18:28 -0700 (PDT) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by mx.google.com with ESMTPS id os3si49619vec.24.2014.04.04.10.18.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 04 Apr 2014 10:18:28 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.169; Received: by mail-ve0-f169.google.com with SMTP id pa12so1686786veb.14 for ; Fri, 04 Apr 2014 10:18:28 -0700 (PDT) X-Received: by 10.52.241.106 with SMTP id wh10mr11824744vdc.16.1396631908521; Fri, 04 Apr 2014 10:18:28 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.12.8 with SMTP id v8csp130834vcv; Fri, 4 Apr 2014 10:18:27 -0700 (PDT) X-Received: by 10.204.96.196 with SMTP id i4mr8984875bkn.17.1396631907308; Fri, 04 Apr 2014 10:18:27 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id tm4si3502443bkb.236.2014.04.04.10.18.26 for ; Fri, 04 Apr 2014 10:18:27 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 474514BAED; Fri, 4 Apr 2014 19:18:22 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 k4Wbn8OxEZ7l; Fri, 4 Apr 2014 19:18:22 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id ACE0C4BAF1; Fri, 4 Apr 2014 19:17:52 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AB5DA4BA39 for ; Fri, 4 Apr 2014 19:17:21 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 5mpKnBM5LNxI for ; Fri, 4 Apr 2014 19:17:17 +0200 (CEST) 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 devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by theia.denx.de (Postfix) with ESMTPS id 3AE734BA57 for ; Fri, 4 Apr 2014 19:17:06 +0200 (CEST) Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id s34HH4kZ023068 for ; Fri, 4 Apr 2014 12:17:04 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s34HH42a024733 for ; Fri, 4 Apr 2014 12:17:04 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.174.1; Fri, 4 Apr 2014 12:17:04 -0500 Received: from ares-ubuntu.am.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s34HH4OS014530; Fri, 4 Apr 2014 12:17:04 -0500 Received: from a0868495 by ares-ubuntu.am.dhcp.ti.com with local (Exim 4.76) (envelope-from ) id 1WW7jj-0001VI-SV; Fri, 04 Apr 2014 13:17:03 -0400 From: Murali Karicheri To: , Date: Fri, 4 Apr 2014 13:16:47 -0400 Message-ID: <1396631815-5735-2-git-send-email-m-karicheri2@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1396631815-5735-1-git-send-email-m-karicheri2@ti.com> References: <1396631815-5735-1-git-send-email-m-karicheri2@ti.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v6 1/9] fdt: call ft_board_setup_ex() at the end of image_setup_libfdt() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: m-karicheri2@ti.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Vitaly Andrianov The keystone2 SOC requires to fix all 32 bit aliased addresses to their 36 physical format. This has to happen after all fdt nodes are added or modified. Signed-off-by: Vitaly Andrianov Signed-off-by: Murali Karicheri Acked-by: Tom Rini --- common/image-fdt.c | 5 +++++ include/fdt_support.h | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/common/image-fdt.c b/common/image-fdt.c index a54a919..5d64009 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -487,5 +487,10 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, if (!ft_verify_fdt(blob)) return -1; +#ifdef CONFIG_SOC_K2HK + if (IMAGE_OF_BOARD_SETUP) + ft_board_setup_ex(blob, gd->bd); +#endif + return 0; } diff --git a/include/fdt_support.h b/include/fdt_support.h index 9871e2f..15eba01 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -63,6 +63,13 @@ int fdt_pci_dma_ranges(void *blob, int phb_off, struct pci_controller *hose); #endif void ft_board_setup(void *blob, bd_t *bd); +/* + * The keystone2 SOC requires all 32 bit aliased addresses to be converted + * to their 36 physical format. This has to happen after all fdt nodes + * are added or modified by the image_setup_libfdt(). The ft_board_setup_ex() + * called at the end of the image_setup_libfdt() is to do that convertion. + */ +void ft_board_setup_ex(void *blob, bd_t *bd); void ft_cpu_setup(void *blob, bd_t *bd); void ft_pci_setup(void *blob, bd_t *bd);