From patchwork Tue Jun 7 12:03:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 69497 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp1938896qgf; Tue, 7 Jun 2016 05:03:11 -0700 (PDT) X-Received: by 10.28.141.21 with SMTP id p21mr2456402wmd.73.1465300991793; Tue, 07 Jun 2016 05:03:11 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id r68si24800999wmg.1.2016.06.07.05.03.11; Tue, 07 Jun 2016 05:03:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8ED21A751B; Tue, 7 Jun 2016 14:03:05 +0200 (CEST) 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 c-xdVE4TtUzQ; Tue, 7 Jun 2016 14:03:05 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A69FEA7527; Tue, 7 Jun 2016 14:03:01 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 10CCA4B98B for ; Tue, 7 Jun 2016 14:02:55 +0200 (CEST) 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 V4xb72AmNSVK for ; Tue, 7 Jun 2016 14:02:54 +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 conuserg-07.nifty.com (conuserg-07.nifty.com [210.131.2.74]) by theia.denx.de (Postfix) with ESMTPS id 4A03B4B94B for ; Tue, 7 Jun 2016 14:02:50 +0200 (CEST) Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id u57C2bdM019177; Tue, 7 Jun 2016 21:02:39 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com u57C2bdM019177 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1465300960; bh=pKdw68bcm70VNBgZcT/nhINeIRK2HBOSWd/zCVLa3s4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DcdF9nL6dlrGcyH9qlB8rjqrpEk6lufOQGPxm87tZR0fyapbf28+C6JTauta1fo8f FiGJNuIZOE9sYyIbBw0kIuKRL8q1YbXtSU4/EZc5fBr/qujopVjPNPNz/oQ/5NGq3v VJ194bujg2+adyfDrDjuMANZmiYMl+4vun4RlR53TBIZUnasVnbIuH3etUUGsn76ZX CH6bBhMriSNT2vo0TDApg6Tb1XDec/D2lQYKlu4FJ/3JGOsDvCN8LsDFF4O82k1rE8 y7DVQAD0fBPZvn7+6rqppEWcCo03OblHwguJ8qIZxzSUpe4B/P5KEGa8xgsJmn8Adq JwuKM9U+00klg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 7 Jun 2016 21:03:44 +0900 Message-Id: <1465301027-1650-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465301027-1650-1-git-send-email-yamada.masahiro@socionext.com> References: <1465301027-1650-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH 2/5] ARM: uniphier: do not overwrite fdt_file environment 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This code auto-detects the best-match FDT file name, but it should respect the user's choice if "fdt_file" environment is found in a saved set of environments. Signed-off-by: Masahiro Yamada --- arch/arm/mach-uniphier/board_late_init.c | 3 +++ 1 file changed, 3 insertions(+) -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c index d9eeacb..a454126 100644 --- a/arch/arm/mach-uniphier/board_late_init.c +++ b/arch/arm/mach-uniphier/board_late_init.c @@ -39,6 +39,9 @@ static int uniphier_set_fdt_file(void) int buf_len = 256; int ret; + if (getenv("fdt_file")) + return 0; /* do nothing if it is already set */ + ret = fdt_get_string(gd->fdt_blob, 0, "compatible", &compat); if (ret) return -EINVAL;