[U-Boot,v1,14/22] colibri_vf: set fdtfile for distroboot

Message ID	20190215222039.10005-15-marcel@ziswiler.com
State	Superseded
Delegated to:	Stefano Babic
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Marcel Ziswiler <marcel@ziswiler.com> To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:30 +0100 Message-Id: <20190215222039.10005-15-marcel@ziswiler.com> In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>, Max Krummenacher <max.krummenacher@toradex.com>, Stefan Agner <stefan.agner@toradex.com> Subject: [U-Boot] [PATCH v1 14/22] colibri_vf: set fdtfile for distroboot Precedence: list Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	colibri vybrid fixes, device tree enablement and driver model conversion \| expand [U-Boot,v1,00/22] colibri vybrid fixes, device tree enablement and driver model conversion [U-Boot,v1,01/22] add missing space in comment [U-Boot,v1,02/22] vf610: ddrmc: add missing include [U-Boot,v1,03/22] imx: bootaux: add dependency on vf610 [U-Boot,v1,04/22] configs: move CONFIG_USB_EHCI_VF to Kconfig [U-Boot,v1,05/22] configs: colibri_vf: remove obsolete mmc/sd card environment [U-Boot,v1,06/22] configs: colibri_vf: limit size of malloc() pool before relocation [U-Boot,v1,07/22] configs: move CONFIG_MXC_OCOTP to Kconfig [U-Boot,v1,08/22] ARM: dts: colibri_vf: update device trees [U-Boot,v1,09/22] configs: colibri_vf: disable obscure options [U-Boot,v1,10/22] colibri_vf: migrate pinctrl and regulators to dtb/dm [U-Boot,v1,11/22] colibri_vf: migrate fec, esdhc, nfc and usb to driver model [U-Boot,v1,12/22] config: colibri_vf: use macros from linux/sizes.h [U-Boot,v1,13/22] colibri_vf: add distroboot support [U-Boot,v1,14/22] colibri_vf: set fdtfile for distroboot [U-Boot,v1,15/22] colibri_vf: sync the board info message [U-Boot,v1,16/22] colibri_vf: enable user debug by default [U-Boot,v1,17/22] colibri_vf: disable undefined instruction events in user debug [U-Boot,v1,18/22] config: colibri_vf: enable mtd partitions via dt [U-Boot,v1,19/22] arm: vf610: add uart2 clock/pinmux support [U-Boot,v1,20/22] colibri_vf: adjust timing according to data sheet [U-Boot,v1,21/22] colibri_vf: use leveling evaluated by DDR validation tools [U-Boot,v1,22/22] colibri_vf: fix sdboot for vybrid modules

Message ID

20190215222039.10005-15-marcel@ziswiler.com

State

Superseded

Delegated to:

Stefano Babic

Headers

From: Marcel Ziswiler <marcel@ziswiler.com>
To: u-boot@lists.denx.de
Date: Fri, 15 Feb 2019 23:20:30 +0100
Message-Id: <20190215222039.10005-15-marcel@ziswiler.com>
In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com>
References: <20190215222039.10005-1-marcel@ziswiler.com>
MIME-Version: 1.0
Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>,
	Max Krummenacher <max.krummenacher@toradex.com>,
	Stefan Agner <stefan.agner@toradex.com>
Subject: [U-Boot] [PATCH v1 14/22] colibri_vf: set fdtfile for distroboot
Precedence: list
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

colibri vybrid fixes, device tree enablement and driver model conversion | expand

Commit Message

Marcel Ziswiler Feb. 15, 2019, 10:20 p.m. UTC

From: Stefan Agner <stefan.agner@toradex.com>

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 <stefan.agner@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

---

 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" \

[U-Boot,v1,14/22] colibri_vf: set fdtfile for distroboot

Commit Message

Patch