From patchwork Mon Mar 25 16:25:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064550 X-Patchwork-Delegate: sbabic@denx.de 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=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44Sfxs4zSvz9sQn for ; Tue, 26 Mar 2019 03:35:13 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 64362C21FE7; Mon, 25 Mar 2019 16:27:11 +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=SPF_HELO_PASS 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 E9342C21E56; Mon, 25 Mar 2019 16:26:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6847AC21F7F; Mon, 25 Mar 2019 16:26:11 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 2ED42C21F7A for ; Mon, 25 Mar 2019 16:26:08 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MKaTx-1h9q031oPv-001vhs; Mon, 25 Mar 2019 17:26:04 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:25:04 +0100 Message-Id: <20190325162512.8702-15-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:VK+cgI1V3whAnYgWJMDD67cXhJ36l+7Z17oPf//A6B8sqzlbvtZ Dzy/MsUlHlY5cv1u06tQNz04Wu49PtHkI7xPsGlVOy53RbcMufibKCQV3T1C+Io27QbWnDZ Sp4B699I8O51DWEQdJF6/ErXpF0x+tVdJyC5HncQTC7aj8q66AAhsQxvdBIKvjtYJVh5wua OFHCudnqqW7kWUpL2I72Q== X-UI-Out-Filterresults: notjunk:1; V03:K0:VS2dFQ/Rzhs=:MoWajSG2mczgHG4N95FJ0Y xFCkmT41N0d9jO22QsKB5lT+fG+yV4o52yAopEWk6sFUdLYJ8zdlZiRt6ZWAgHoef6Y1udAKV xBtbBnsOduSSp54Udag8kFG6jw533ioUpiEneEiz5beYaoMeuDZAP7cvMFFEbbtuDgw9Z95jt KUiKyWabwUof+fkLgQjIJ4xPJr6wWIG3K/0LYidXJu8dmHNe3Gzwi6Puv9IKKtWIxKtVxOCDz VwL52453Z5hjjvOHrDcCB9srlV/F5RA9WXKBfHF/VP3AQlUzzLTLIbEPdQ576O8Y/YZ+/++nA ZKH/q22UEbw1oh3mEZoU03uyNKXOjyD66TDZnvM5pV8yA+fjyyDaTAN3Zen7B4LpAFVx9mPiW j5B2a/GTWzVnTY+BSbBNcFSyKQLO3ZafBV054afOi3yByLWdtj94IlK7R28WlkEiUmesFaByy /OL3QaLriBvLlupkuSM28h2GmY818CKHRPhrU5hYw3m65QsvkqzAmNIqyCd7lB9eB8Aghiu0j WUOXNgy1GkN0QsHKcFxWw+OW8HGMIfiHSPYok7JMwYHnn1ymGqG13vLikdN97jPWateU8AFQo tKtMSWlSH7GBrJ+dk7g4JdpA7KRqtSBR9Ka6ThKKd1QIWyTtXN0GjMc1XYsajeWIPPrnHNbV1 1HOWzP4MlmQlB+i3XpQ7ZIPyMf2tjOMEoPFOf2NQsC2ivqp5+SRv73EhTs+f0DV/QwmQyx+7U g3+h9nPTywuNCNklkuSF5zxkX8qP0OgfI0lWxw== Cc: Marcel Ziswiler , Max Krummenacher , Stefan Agner Subject: [U-Boot] [PATCH v2 14/22] colibri_vf: set fdtfile for distroboot 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Stefan Agner Set fdtfile to represent the current board. This allows distribution to load the correct device tree, which in the module case often deviates from the common fallback ${soc}-${board}${boardver}.dtb... Signed-off-by: Stefan Agner Acked-by: Max Krummenacher Acked-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- Changes in v2: None include/configs/colibri_vf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 83a33ff786..0bbeeb902e 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -86,7 +86,8 @@ "ubi read ${fdt_addr_r} dtb && " \ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ -#define CONFIG_BOOTCOMMAND "run ubiboot; run distro_bootcmd;" +#define CONFIG_BOOTCOMMAND "run ubiboot; " \ + "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;" #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ @@ -108,7 +109,6 @@ "defargs=\0" \ "dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \ "fdt_board=eval-v3\0" \ - "fdt_file=${soc}-colibri-${fdt_board}.dtb\0" \ "fdt_fixup=;\0" \ "kernel_file=zImage\0" \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \