From patchwork Mon May 13 09:15:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1098740 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=fail (p=quarantine dis=none) header.from=toradex.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 452ZvT06Pnz9s4V for ; Mon, 13 May 2019 19:16:52 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id ABBF9C21DFD; Mon, 13 May 2019 09:16:33 +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=RCVD_IN_MSPIKE_H2 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 7FD1DC21DFD; Mon, 13 May 2019 09:16:09 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 62520C21F13; Mon, 13 May 2019 09:16:07 +0000 (UTC) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by lists.denx.de (Postfix) with ESMTPS id 98C58C21EF7 for ; Mon, 13 May 2019 09:16:00 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id i3so7211918wml.4 for ; Mon, 13 May 2019 02:16:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=X43tMI94XFhZp3gTHYQDlUrKOhGZLMjNnS35RaL3+5k=; b=kPyPTSbiXU4ptME8Vp/d98ja39kHL9DA6lG2BO4NQ8IhWwAoZs6L6m+c2yHl282S+N OqPDZ5H6pw2O49AXtWJuJmi4xvKCTWUbAfDtC0BObQAbx5EAmpYMbXRuptTThnFvxvmU n9wBSMzKLatfH8HtpFVuqTgcn70N9y1wk75mLUQRT3f3vgJq8xRGPOKKfDnMsWA57RYd +AqtMTHo19s4UH+GQ/IsTAjITWSwtKYyQEO3HQtxp1UrSUcbRxvKGWHdIq/76gordJ4/ pmfMQ7+/VO178U1NIAv7qgulmE6Yc0Gk17oRg3T6lS/omx8zjplwu6wh9voJz6b6Hg78 Dq5g== X-Gm-Message-State: APjAAAWZsgFDov2OzF4DqXFQawYorwFgHVW1L/M6mFa0Pcq8OSaNM0L7 toEpNJ2/PsqF67t+YGM/H6k6aSN9 X-Google-Smtp-Source: APXvYqwI5oeCmCcJh5olKUrfDanVaLKJ7JNJPoxaGVEa098YTwNQZbopoDKumQQT46hMAOtFYLR61g== X-Received: by 2002:a1c:e714:: with SMTP id e20mr6144218wmh.143.1557738960105; Mon, 13 May 2019 02:16:00 -0700 (PDT) Received: from localhost ([194.105.145.90]) by smtp.gmail.com with ESMTPSA id v1sm9895452wrd.47.2019.05.13.02.15.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 May 2019 02:15:59 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Date: Mon, 13 May 2019 12:15:53 +0300 Message-Id: <20190513091555.14037-3-igor.opaniuk@toradex.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190513091555.14037-1-igor.opaniuk@toradex.com> References: <20190513091555.14037-1-igor.opaniuk@toradex.com> Cc: marcel.ziswiler@toradex.com, max.krummenacher@toradex.com, marcel@ziswiler.com Subject: [U-Boot] [PATCH 3/5] colibri_vf: use UUID for rootfs 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" Replace usage of "/dev/mmcblk*p*" with a proper UUID of rootfs partition. This fixes the issue, when MMC controllers are probed in a different order in U-boot and Linux kernel. Signed-off-by: Igor Opaniuk Acked-by: Marcel Ziswiler --- include/configs/colibri_vf.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 0d57e303a1..da9a8426ec 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -68,12 +68,19 @@ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ #define SD_BOOTCMD \ - "sdargs=root=/dev/mmcblk0p2 ro rootwait\0" \ - "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${mtdparts} " \ + "set_sdargs=setenv sdargs root=PARTUUID=${uuid} ro rootwait\0" \ + "sdboot=run setup; run sdfinduuid; run set_sdargs; " \ + "setenv bootargs ${defargs} ${sdargs} ${mtdparts} " \ "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \ - "load mmc 0:1 ${kernel_addr_r} ${kernel_file} && " \ - "load mmc 0:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \ + "load mmc ${sddev}:${sdbootpart} ${kernel_addr_r} ${kernel_file} && " \ + "load mmc ${sddev}:${sdbootpart} ${fdt_addr_r} " \ + "${soc}-colibri-${fdt_board}.dtb && " \ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "sdbootpart=1\0" \ + "sddev=0\0" \ + "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \ + "sdrootpart=2\0" + #define UBI_BOOTCMD \ "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs " \