From patchwork Thu May 17 10:55:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 915326 X-Patchwork-Delegate: yamada.m@jp.panasonic.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=socionext.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nifty.com header.i=@nifty.com header.b="CNp53bkZ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40mpBk1b2zz9s3B for ; Thu, 17 May 2018 20:56:12 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 3AADEC21EA2; Thu, 17 May 2018 10:56:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 23360C21DA6; Thu, 17 May 2018 10:56:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 101DDC21DA6; Thu, 17 May 2018 10:56:00 +0000 (UTC) Received: from conuserg-11.nifty.com (conuserg-11.nifty.com [210.131.2.78]) by lists.denx.de (Postfix) with ESMTPS id 15055C21C51 for ; Thu, 17 May 2018 10:55:59 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-11.nifty.com with ESMTP id w4HAtOH5006395; Thu, 17 May 2018 19:55:24 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com w4HAtOH5006395 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1526554525; bh=TCPY2tgu6K8pC8jXXjuQPGqBgBz47NRJhn+smIAX3Z8=; h=From:To:Cc:Subject:Date:From; b=CNp53bkZNp2lzUPZsKsuT4tnr1YdzAhvnVVazTUmnrxpq1zu1aYlA9sYwlWmtAWev y/eFK0NdwS/Jeae90a2i7oCe4LaPfS7Ubu4Xp2KM1aRiSO1ljheoOmq0m59dGR6hPm cMj2/HleRxgR0gXeLYVMCyirM4epvLtLwoYyNZp5zEYGDEWcnWvD6oILHfS4u0dwEb rLj0yLXM0ZwBAvKv8rWrryqBtZ3jsv8U9Edt5nbGyVq11/ELtG8F51g8YXLm4EeAZj xgVUDTJIMziEIYNhu8v0pJENeRVTnKmtQFeaKveU8KuRRW8ehhIcy/LjLDDx49CVmO FSmSvf/hlfQQw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Thu, 17 May 2018 19:55:20 +0900 Message-Id: <1526554520-1334-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Cc: Jassi Brar , Masami Hiramatsu , Tom Rini Subject: [U-Boot] [PATCH] ARM: uniphier: rename environment variable fdt_name to fdtname X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" For booting Linux in the generic distro mechanism, cmd/pxe.c retrieves the FDT file name from "fdtname" environment variable. Rename "fdt_name" to "fdtname" for easier migration to distro boot. Signed-off-by: Masahiro Yamada --- arch/arm/mach-uniphier/board_late_init.c | 4 ++-- include/configs/uniphier.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c index 9dff3f1..6a99572 100644 --- a/arch/arm/mach-uniphier/board_late_init.c +++ b/arch/arm/mach-uniphier/board_late_init.c @@ -38,7 +38,7 @@ static int uniphier_set_fdt_file(void) char dtb_name[256]; int buf_len = sizeof(dtb_name); - if (env_get("fdt_file")) + if (env_get("fdtfile")) return 0; /* do nothing if it is already set */ compat = fdt_stringlist_get(gd->fdt_blob, 0, "compatible", 0, NULL); @@ -56,7 +56,7 @@ static int uniphier_set_fdt_file(void) strncat(dtb_name, ".dtb", buf_len); - return env_set("fdt_file", dtb_name); + return env_set("fdtfile", dtb_name); } int board_late_init(void) diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index f710c8f..b631f79 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -168,10 +168,10 @@ "run boot_common\0" \ "tftpboot=tftpboot $kernel_addr_load $bootfile && " \ "tftpboot $ramdisk_addr_r $ramdisk_file &&" \ - "tftpboot $fdt_addr_r $fdt_file &&" \ + "tftpboot $fdt_addr_r $fdtfile &&" \ "run boot_common\0" \ "__nfsboot=tftpboot $kernel_addr_load $bootfile && " \ - "tftpboot $fdt_addr_r $fdt_file &&" \ + "tftpboot $fdt_addr_r $fdtfile &&" \ "setenv ramdisk_addr_r - &&" \ "run boot_common\0" #endif