All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marcel Ziswiler <marcel@ziswiler.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v1 22/22] colibri_vf: fix sdboot for vybrid modules
Date: Fri, 15 Feb 2019 23:20:38 +0100	[thread overview]
Message-ID: <20190215222039.10005-23-marcel@ziswiler.com> (raw)
In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com>

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>

---

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

  parent reply	other threads:[~2019-02-15 22:20 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-15 22:20 [U-Boot] [PATCH v1 00/22] colibri vybrid fixes, device tree enablement and driver model conversion Marcel Ziswiler
2019-02-15 22:20 ` [U-Boot] [PATCH v1 01/22] add missing space in comment Marcel Ziswiler
2019-03-07  5:29   ` Igor Opaniuk
2019-02-15 22:20 ` [U-Boot] [PATCH v1 02/22] vf610: ddrmc: add missing include Marcel Ziswiler
2019-03-11 13:27   ` Igor Opaniuk
2019-02-15 22:20 ` [U-Boot] [PATCH v1 03/22] imx: bootaux: add dependency on vf610 Marcel Ziswiler
2019-03-07  5:31   ` Igor Opaniuk
2019-02-15 22:20 ` [U-Boot] [PATCH v1 04/22] configs: move CONFIG_USB_EHCI_VF to Kconfig Marcel Ziswiler
2019-03-07  5:39   ` Igor Opaniuk
2019-02-15 22:20 ` [U-Boot] [PATCH v1 05/22] configs: colibri_vf: remove obsolete mmc/sd card environment Marcel Ziswiler
2019-03-11 13:43   ` Igor Opaniuk
2019-02-15 22:20 ` [U-Boot] [PATCH v1 06/22] configs: colibri_vf: limit size of malloc() pool before relocation Marcel Ziswiler
2019-03-07  5:37   ` Igor Opaniuk
2019-02-15 22:20 ` [U-Boot] [PATCH v1 07/22] configs: move CONFIG_MXC_OCOTP to Kconfig Marcel Ziswiler
2019-02-17 22:38   ` Lukasz Majewski
2019-02-15 22:20 ` [U-Boot] [PATCH v1 08/22] ARM: dts: colibri_vf: update device trees Marcel Ziswiler
2019-02-15 22:20 ` [U-Boot] [PATCH v1 09/22] configs: colibri_vf: disable obscure options Marcel Ziswiler
2019-02-15 22:20 ` [U-Boot] [PATCH v1 10/22] colibri_vf: migrate pinctrl and regulators to dtb/dm Marcel Ziswiler
2019-02-15 22:20 ` [U-Boot] [PATCH v1 11/22] colibri_vf: migrate fec, esdhc, nfc and usb to driver model Marcel Ziswiler
2019-02-15 22:20 ` [U-Boot] [PATCH v1 12/22] config: colibri_vf: use macros from linux/sizes.h Marcel Ziswiler
2019-03-06 16:48   ` Igor Opaniuk
2019-02-15 22:20 ` [U-Boot] [PATCH v1 13/22] colibri_vf: add distroboot support Marcel Ziswiler
2019-02-15 22:20 ` [U-Boot] [PATCH v1 14/22] colibri_vf: set fdtfile for distroboot Marcel Ziswiler
2019-02-15 22:20 ` [U-Boot] [PATCH v1 15/22] colibri_vf: sync the board info message Marcel Ziswiler
2019-03-06 16:53   ` Igor Opaniuk
2019-02-15 22:20 ` [U-Boot] [PATCH v1 16/22] colibri_vf: enable user debug by default Marcel Ziswiler
2019-03-11 13:46   ` Igor Opaniuk
2019-02-15 22:20 ` [U-Boot] [PATCH v1 17/22] colibri_vf: disable undefined instruction events in user debug Marcel Ziswiler
2019-03-11 13:51   ` Igor Opaniuk
2019-02-15 22:20 ` [U-Boot] [PATCH v1 18/22] config: colibri_vf: enable mtd partitions via dt Marcel Ziswiler
2019-03-11 14:01   ` Igor Opaniuk
2019-03-24 21:33     ` Marcel Ziswiler
2019-02-15 22:20 ` [U-Boot] [PATCH v1 19/22] arm: vf610: add uart2 clock/pinmux support Marcel Ziswiler
2019-02-15 22:20 ` [U-Boot] [PATCH v1 20/22] colibri_vf: adjust timing according to data sheet Marcel Ziswiler
2019-02-15 22:20 ` [U-Boot] [PATCH v1 21/22] colibri_vf: use leveling evaluated by DDR validation tools Marcel Ziswiler
2019-02-15 22:20 ` Marcel Ziswiler [this message]
2019-03-06 15:30   ` [U-Boot] [PATCH v1 22/22] colibri_vf: fix sdboot for vybrid modules Igor Opaniuk
2019-02-17 22:40 ` [U-Boot] [PATCH v1 00/22] colibri vybrid fixes, device tree enablement and driver model conversion Lukasz Majewski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190215222039.10005-23-marcel@ziswiler.com \
    --to=marcel@ziswiler.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.