[U-Boot,v2,22/22] colibri_vf: fix sdboot for vybrid modules

Message ID	20190325162512.8702-23-marcel@ziswiler.com
State	Awaiting Upstream
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: Mon, 25 Mar 2019 17:25:12 +0100 Message-Id: <20190325162512.8702-23-marcel@ziswiler.com> In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>, Gerard Salvatella <gerard.salvatella@toradex.com>, Igor Opaniuk <igor.opaniuk@toradex.com>, Stefan Agner <stefan.agner@toradex.com> Subject: [U-Boot] [PATCH v2 22/22] colibri_vf: fix sdboot for vybrid modules 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,v2,00/22] colibri vybrid fixes, device tree enablement and driver model conversion [U-Boot,v2,01/22] Add missing space in comment [U-Boot,v2,02/22] vf610: ddrmc: add missing include [U-Boot,v2,03/22] imx: bootaux: add dependency on vf610 [U-Boot,v2,04/22] configs: move CONFIG_USB_EHCI_VF to Kconfig [U-Boot,v2,05/22] configs: colibri_vf: remove obsolete mmc/sd card environment [U-Boot,v2,06/22] configs: colibri_vf: limit size of malloc() pool before relocation [U-Boot,v2,07/22] configs: move CONFIG_MXC_OCOTP to Kconfig [U-Boot,v2,08/22] ARM: dts: colibri_vf: update device trees [U-Boot,v2,09/22] configs: colibri_vf: disable obscure options [U-Boot,v2,10/22] colibri_vf: migrate pinctrl and regulators to dtb/dm [U-Boot,v2,11/22] colibri_vf: migrate fec, esdhc, nfc and usb to driver model [U-Boot,v2,12/22] config: colibri_vf: use macros from linux/sizes.h [U-Boot,v2,13/22] colibri_vf: add distroboot support [U-Boot,v2,14/22] colibri_vf: set fdtfile for distroboot [U-Boot,v2,15/22] colibri_vf: sync the board info message [U-Boot,v2,16/22] colibri_vf: enable user debug by default [U-Boot,v2,17/22] colibri_vf: disable undefined instruction events in user debug [U-Boot,v2,18/22] config: colibri_vf: enable mtd partitions via dt [U-Boot,v2,19/22] arm: vf610: add uart2 clock/pinmux support [U-Boot,v2,20/22] colibri_vf: adjust timing according to data sheet [U-Boot,v2,21/22] colibri_vf: use leveling evaluated by DDR validation tools [U-Boot,v2,22/22] colibri_vf: fix sdboot for vybrid modules

Message ID

20190325162512.8702-23-marcel@ziswiler.com

State

Awaiting Upstream

Delegated to:

Stefano Babic

Headers

From: Marcel Ziswiler <marcel@ziswiler.com>
To: u-boot@lists.denx.de
Date: Mon, 25 Mar 2019 17:25:12 +0100
Message-Id: <20190325162512.8702-23-marcel@ziswiler.com>
In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com>
References: <20190325162512.8702-1-marcel@ziswiler.com>
MIME-Version: 1.0
Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>,
	Gerard Salvatella <gerard.salvatella@toradex.com>,
	Igor Opaniuk <igor.opaniuk@toradex.com>,
	Stefan Agner <stefan.agner@toradex.com>
Subject: [U-Boot] [PATCH v2 22/22] colibri_vf: fix sdboot for vybrid modules
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 March 25, 2019, 4:25 p.m. UTC

From: Gerard Salvatella <gerard.salvatella@toradex.com>

Currently, Vybrid's sdboot variable tries to load the kernel from /boot
of the root partition (typically second partition when using the sdcard
image). However, since we moved to flash the kernel in a separate UBI
volume, we no longer deploy the kernel/device tree to /boot, hence
sdboot does not work in its current state.

Load the kernel and device tree from the first (typically FAT) partition
as customary on all Toradex modules.

While at it also change from rw to ro as e.g. systemd will re-mount the
root file system rw anyway after checking it.

Signed-off-by: Gerard Salvatella <gerard.salvatella@toradex.com>
Acked-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Reviewed-by: Igor Opaniuk <igor.opaniuk@toradex.com>

---

Changes in v2:
- Added various reviewed-bys.

 include/configs/colibri_vf.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index b2f27c1977..0d57e303a1 100644
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -68,11 +68,11 @@ 
 	"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
 
 #define SD_BOOTCMD \
-	"sdargs=root=/dev/mmcblk0p2 rw rootwait\0"	\
+	"sdargs=root=/dev/mmcblk0p2 ro rootwait\0"	\
 	"sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${mtdparts} " \
 	"${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \
-	"load mmc 0:2 ${kernel_addr_r} /boot/${kernel_file} && " \
-	"load mmc 0:2 ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && " \
+	"load mmc 0:1 ${kernel_addr_r} ${kernel_file} && " \
+	"load mmc 0:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \
 	"run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
 
 #define UBI_BOOTCMD \

[U-Boot,v2,22/22] colibri_vf: fix sdboot for vybrid modules

Commit Message

Patch