From patchwork Thu Mar 27 15:59:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murali Karicheri X-Patchwork-Id: 27220 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f200.google.com (mail-we0-f200.google.com [74.125.82.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2D159202FA for ; Thu, 27 Mar 2014 16:00:51 +0000 (UTC) Received: by mail-we0-f200.google.com with SMTP id p61sf4355521wes.3 for ; Thu, 27 Mar 2014 09:00:50 -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=ZnYiAf6CqAHEi9X6od9KdCbdKogQ61nHjm/aqBPqzLkzEMisR1kcuRkI2tTmplGXDG dzSwkI6OtUW/pLyo+DV/phzTHO3ZZxxyWZLiTplBBGfbboCkq/Y8mgtbTRtu6JhmEKd3 +vLkeY/i2X/0nyluLDExq4ve/bowTgTbR2Nsq8/xj6cdwwe68F48aL0ZixbMsxX6k4hv uKtRC+shLEbK9LQkk5D6pMChKMhUMPxBawb0ETY0UnMu9R0BUHTSXUbKftWNb6xAxrbV fzDzkFPkFEiUOhgQR8peb8MHcVewh9yhHnaA2vhv7FZden//4bOL6IxHpr57H3E6Isdw mPYQ== X-Gm-Message-State: ALoCoQkFT/zgDWGTRLN/+3afJIRyfPilOJPmZiMCPrV25Y5D6XCbsnBuikCNOL+TbzmI941iTcqk X-Received: by 10.15.26.9 with SMTP id m9mr1312682eeu.3.1395936050064; Thu, 27 Mar 2014 09:00:50 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.87.33 with SMTP id q30ls1205217qgd.99.gmail; Thu, 27 Mar 2014 09:00:49 -0700 (PDT) X-Received: by 10.220.161.8 with SMTP id p8mr2125548vcx.4.1395936049854; Thu, 27 Mar 2014 09:00:49 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id sc7si650810vdc.31.2014.03.27.09.00.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 27 Mar 2014 09:00:49 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id ij19so4430630vcb.38 for ; Thu, 27 Mar 2014 09:00:49 -0700 (PDT) X-Received: by 10.220.106.84 with SMTP id w20mr2139036vco.18.1395936049762; Thu, 27 Mar 2014 09:00:49 -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.78.9 with SMTP id i9csp39634vck; Thu, 27 Mar 2014 09:00:49 -0700 (PDT) X-Received: by 10.204.97.135 with SMTP id l7mr47425bkn.187.1395936048775; Thu, 27 Mar 2014 09:00:48 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id s6si1884719bkh.88.2014.03.27.09.00.44 for ; Thu, 27 Mar 2014 09:00:48 -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 86FE74B5EC; Thu, 27 Mar 2014 17:00:28 +0100 (CET) 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 Btb6vH2HjWLA; Thu, 27 Mar 2014 17:00:28 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7AE454B623; Thu, 27 Mar 2014 16:59:38 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7EC7C4B605 for ; Thu, 27 Mar 2014 16:59:31 +0100 (CET) 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 nB8aznnQfeBy for ; Thu, 27 Mar 2014 16:59:28 +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 devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by theia.denx.de (Postfix) with ESMTPS id 1E05B4B5F1 for ; Thu, 27 Mar 2014 16:59:18 +0100 (CET) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id s2RFxGE0021297 for ; Thu, 27 Mar 2014 10:59:16 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2RFxFII019001 for ; Thu, 27 Mar 2014 10:59:15 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Thu, 27 Mar 2014 10:59:15 -0500 Received: from ares-ubuntu.am.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2RFxE1c027721; Thu, 27 Mar 2014 10:59:15 -0500 Received: from a0868495 by ares-ubuntu.am.dhcp.ti.com with local (Exim 4.76) (envelope-from ) id 1WTCi2-00030u-18; Thu, 27 Mar 2014 11:59:14 -0400 From: Murali Karicheri To: , Date: Thu, 27 Mar 2014 11:59:04 -0400 Message-ID: <1395935952-11542-2-git-send-email-m-karicheri2@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1395935952-11542-1-git-send-email-m-karicheri2@ti.com> References: <1395935952-11542-1-git-send-email-m-karicheri2@ti.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v4 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.220.179 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);