From patchwork Tue Apr 1 18:44:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murali Karicheri X-Patchwork-Id: 27565 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f72.google.com (mail-qa0-f72.google.com [209.85.216.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 84D6720553 for ; Tue, 1 Apr 2014 18:45:42 +0000 (UTC) Received: by mail-qa0-f72.google.com with SMTP id dc16sf12301030qab.3 for ; Tue, 01 Apr 2014 11:45:42 -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=lcsy8sD4Lj18av4u7u0DOmQ3SxCKx8cYF0o7FTUdIHvzTLdN+MVK8AL8pM+m4V7x8K IB3zxjpgAyeQeB9zAYubIi9KRruNr0fs3bNBzgwrpcrQp6zm6hPZwtB4XcSXBxuAjrA6 DKebEk5SnQ+M71ahCsKpu5LJup0S9z9CkpEIwC9Pqz1ers9yJ04DN2sYyqvtq5zrv8E1 kOwsQSzdyeBTtJIV1aOWhg/QxtdBu3YJLJEsiirOHbMmHpqZPr/cdgSNAwrA+TMWHIpx PwC9XW9f3YKdiNGRAPY8+kbprGs1DCcoBg4vWN/tSPIMkRdvBxTJ8y4GaGnEDDrXc8HP X55w== X-Gm-Message-State: ALoCoQkplcA22/0vve3Z5VRLshOLutfkw2KiGIMbxzd0r6iWKyiA9IdTEykyyCqPbNZc5b/gKrgE X-Received: by 10.236.93.38 with SMTP id k26mr12473800yhf.20.1396377942250; Tue, 01 Apr 2014 11:45:42 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.101.245 with SMTP id u108ls93555qge.79.gmail; Tue, 01 Apr 2014 11:45:42 -0700 (PDT) X-Received: by 10.52.25.202 with SMTP id e10mr2032535vdg.30.1396377942060; Tue, 01 Apr 2014 11:45:42 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id tv3si3863283vdc.18.2014.04.01.11.45.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 01 Apr 2014 11:45:42 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.181 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.181; Received: by mail-vc0-f181.google.com with SMTP id id10so10126826vcb.40 for ; Tue, 01 Apr 2014 11:45:42 -0700 (PDT) X-Received: by 10.52.171.68 with SMTP id as4mr25098169vdc.0.1396377941969; Tue, 01 Apr 2014 11:45:41 -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 v8csp261380vcv; Tue, 1 Apr 2014 11:45:41 -0700 (PDT) X-Received: by 10.204.244.1 with SMTP id lo1mr1808194bkb.49.1396377940924; Tue, 01 Apr 2014 11:45:40 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id s6si9605066bkh.176.2014.04.01.11.45.40 for ; Tue, 01 Apr 2014 11:45:40 -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 393F04B893; Tue, 1 Apr 2014 20:45:33 +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 evMfhuX90S5W; Tue, 1 Apr 2014 20:45:32 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 89A2B4B870; Tue, 1 Apr 2014 20:44:54 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 380334B861 for ; Tue, 1 Apr 2014 20:44:46 +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 7GTaUAvJ19y4 for ; Tue, 1 Apr 2014 20:44:43 +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 comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by theia.denx.de (Postfix) with ESMTPS id 38BB44B850 for ; Tue, 1 Apr 2014 20:44:33 +0200 (CEST) Received: from dflxv15.itg.ti.com ([128.247.5.124]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s31IiWbP007325 for ; Tue, 1 Apr 2014 13:44:32 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s31IiV3U027455 for ; Tue, 1 Apr 2014 13:44:32 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.174.1; Tue, 1 Apr 2014 13:44:31 -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 s31IiVKJ029492; Tue, 1 Apr 2014 13:44:31 -0500 Received: from a0868495 by ares-ubuntu.am.dhcp.ti.com with local (Exim 4.76) (envelope-from ) id 1WV3fj-00046Y-Ev; Tue, 01 Apr 2014 14:44:31 -0400 From: Murali Karicheri To: , Date: Tue, 1 Apr 2014 14:44:21 -0400 Message-ID: <1396377869-15724-2-git-send-email-m-karicheri2@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1396377869-15724-1-git-send-email-m-karicheri2@ti.com> References: <1396377869-15724-1-git-send-email-m-karicheri2@ti.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v5 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.181 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);