From patchwork Wed May 29 10:00:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1107051 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="W32AIHWr"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45DR782z3Xz9s4V for ; Wed, 29 May 2019 20:01:08 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 1B9CCC21DCA; Wed, 29 May 2019 10:01:04 +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=FREEMAIL_FROM, T_DKIM_INVALID 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 4E9E9C21C38; Wed, 29 May 2019 10:00:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4A19EC21BE5; Wed, 29 May 2019 10:00:48 +0000 (UTC) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by lists.denx.de (Postfix) with ESMTPS id 0238CC21C27 for ; Wed, 29 May 2019 10:00:48 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id e19so3962807wme.1 for ; Wed, 29 May 2019 03:00:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Ix8gp0nu3/hUQktCixeXPXXsAZccM0UPqJm7fsztXeU=; b=W32AIHWrME2kLXw5gn2TwSctiGJSt3twCELu84SwLHaN+yPr9VbiIZ7FxIQKvwsfT+ Q6c/tLs0e8keGKlcOeGX6StleWjojJxba4iPbg9i2zKGAQ4SWX8fHRgoZquLS4mZesxY /pg33J0N0QbRSk+uecbY6tqQDfyyD7jcsisNgBCcfQvLxIAxFDK8ayqBnRIVR8fyByDZ CZKGhYaCvVzh8W5OgrRrF1zUl/dU7geU5hnr4F7QrIWDtA0yd8u9wJHtXiUEH6yvjwh9 Ox3y4uGU/osLx1lFe/aMFH8hlgXPxlSXE1iQtwdHiQjpo4+Djlh4ywjgNb94C9529iba cAWg== 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; bh=Ix8gp0nu3/hUQktCixeXPXXsAZccM0UPqJm7fsztXeU=; b=FiippXWI/lHaHxTzu7R9tqqdrSHe2nH1hsAcZKyGAdcy6up9knAUUu+lHDSCorIwjB TAeO1GZ4X6nsbds8IRI7pAOYuL6t7Pxp/8RWsyIzBLAS7MBoBMRE0/xeEw8QaOKvV8hB mcdg+t/nzK8VytYGeBSZm6z1rW8sIPUvIR9CQs1revp+jmZJL0+m4UcT5oqZ10PvNAYk xO05PTyT/MD1RnFtq5OL56g7sfIfHcD2sKBOGYb21oypHXJCvbkD7ndjUrL63jhhNH3i HMWTm1Vx4Ii5NdUFsq71fU1GLsHdjG2d1FPs0K/vFfBD3oQfulUKRBh3iwiLkE+2m56A Oj8g== X-Gm-Message-State: APjAAAX5zXYZuzwlIOz2lbbg/fwPMhxO0aoS9imz8Q+YgZ0GaWlTUNJh WD7n+VW5fHIFB/oX7frz+Kpklcoy X-Google-Smtp-Source: APXvYqz/+haApILvt0ec14wrguBkP1CvirZIM38IvvxAmsyy2wsr/Fr4Omso4mp5kJuvmbc2d+P+XA== X-Received: by 2002:a1c:b68a:: with SMTP id g132mr5942520wmf.66.1559124046045; Wed, 29 May 2019 03:00:46 -0700 (PDT) Received: from localhost ([194.105.145.90]) by smtp.gmail.com with ESMTPSA id c11sm11453019wrs.97.2019.05.29.03.00.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 29 May 2019 03:00:45 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Date: Wed, 29 May 2019 13:00:39 +0300 Message-Id: <20190529100043.14802-1-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 Cc: marcel.ziswiler@toradex.com, max.krummenacher@toradex.com, marcel@ziswiler.com Subject: [U-Boot] [PATCH v2 1/5] colibri_imx7: 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" From: Igor Opaniuk 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. Acked-by: Marcel Ziswiler Signed-off-by: Igor Opaniuk --- include/configs/colibri_imx7.h | 47 ++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 5a4b9801cb..8bc75aba59 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -51,14 +51,22 @@ #define CONFIG_SERVERIP 192.168.10.1 #define EMMC_BOOTCMD \ - "emmcargs=ip=off root=/dev/mmcblk0p2 ro rootfstype=ext4 rootwait\0" \ - "emmcboot=run setup; " \ + "set_emmcargs=setenv emmcargs ip=off root=PARTUUID=${uuid} ro " \ + "rootfstype=ext4 rootwait\0" \ + "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \ "setenv bootargs ${defargs} ${emmcargs} ${setupargs} " \ "${vidargs}; echo Booting from internal eMMC chip...; " \ "run m4boot && " \ - "load mmc 0:1 ${fdt_addr_r} ${soc}-colibri-emmc-${fdt_board}.dtb && " \ - "load mmc 0:1 ${kernel_addr_r} ${boot_file} && " \ - "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" + "load mmc ${emmcdev}:${emmcbootpart} ${fdt_addr_r} " \ + "${soc}-colibri-emmc-${fdt_board}.dtb && " \ + "load mmc ${emmcdev}:${emmcbootpart} ${kernel_addr_r} " \ + "${boot_file} && run fdt_fixup && " \ + "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "emmcbootpart=1\0" \ + "emmcdev=0\0" \ + "emmcfinduuid=part uuid mmc ${emmcdev}:${emmcrootpart} uuid\0" \ + "emmcrootpart=2\0" + #define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ @@ -69,24 +77,25 @@ "ramdisk_addr_r=0x82100000\0" #if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND) -#define SD_BOOTCMD \ - "sdargs=root=/dev/mmcblk0p2 ro rootwait\0" \ - "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \ - "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \ - "run m4boot && " \ - "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 SD_BOOTDEV 0 #elif defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC) +#define SD_BOOTDEV 1 +#endif + #define SD_BOOTCMD \ - "sdargs=root=/dev/mmcblk1p2 ro rootwait\0" \ - "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} " \ + "set_sdargs=setenv sdargs root=PARTUUID=${uuid} ro rootwait\0" \ + "sdboot=run setup; run sdfinduuid; run set_sdargs; " \ + "setenv bootargs ${defargs} ${sdargs} " \ "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \ "run m4boot && " \ - "load mmc 1:1 ${kernel_addr_r} ${kernel_file} && " \ - "load mmc 1:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \ - "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" -#endif + "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=" __stringify(SD_BOOTDEV) "\0" \ + "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \ + "sdrootpart=2\0" #define NFS_BOOTCMD \ From patchwork Wed May 29 10:00:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1107050 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nBEuPQbd"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45DR6w4rXDz9sBr for ; Wed, 29 May 2019 20:00:56 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 61297C21DB5; Wed, 29 May 2019 10:00:51 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID 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 CAB69C21C2C; Wed, 29 May 2019 10:00:49 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2439EC21C2C; Wed, 29 May 2019 10:00:48 +0000 (UTC) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by lists.denx.de (Postfix) with ESMTPS id C50EFC21BE5 for ; Wed, 29 May 2019 10:00:47 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id l2so1268262wrb.9 for ; Wed, 29 May 2019 03:00:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QSr9pIm1+9f7vX6ZH3YEwavl7gERvN+czjT+dYFLIeg=; b=nBEuPQbdLFtm7l0fpfh6/bzPs74eRLW5w2VYUcWpQrmzaPnuUbJbvJ8QOZ77OfK5IL dcGuKG86H5jz1ACJCWUu2sWLC3Eq2vgXBQA+KuKpCnDUpPdCusIbFGrqXMa+s8khkX00 F2VMoZR0KkDon+uT4KsiVEi+hWa/tEp9sWCd2tADNH7jjaFaJ6JIP4DEjzPUpHtZVSMv ozW5Vw6Uxjfs4frNLU2Y3NwqtJ54HeCp6PcvU1pLEJEPrEbAn20ZusQRIK7y1BpM9Q/n mXCa/cjyTnuZzCcf4wWNXDy8s/JqG0mRGHTCvjMdgSvbjr02ZmcWPRWi2DOhvpdDUc/R QPEw== 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=QSr9pIm1+9f7vX6ZH3YEwavl7gERvN+czjT+dYFLIeg=; b=IQu2jAiI3GdYPur64ti4EILmYPnL0t2JpOOugLh8KLLpwq8IJw0I8cMBb9uoDkO1JA su3oVhJM1TAPb/CyEBAfV30O1kgDzIWS86Ux5Y+Z4j2m8bhvbcHvCi8X4RBU4M17/XeQ MWJ+ZC4nMnXl9ak7lIwqUCi3Sr6R8mHFZe9bkBEmaSMwBCWlf7o2Wl2LKROp1TWC2NkE PFmBTwnOBsVs/euFXZnZ9t4np0O1unF4Kjd/R+bZe8Dj17TOqKizDNsmqJvbCOFkUkMi rtD+3C/B7g+3ZAT0pnupKj/ivvP4K6w2cNKP3qJxZRNOw0858l/ABaC2OLy8gg90SFFr xpUQ== X-Gm-Message-State: APjAAAWYnJ7bdQV2iTUFhurMnevoU5Y18RjoKe3GdWI8GzbA00PQUPNJ ogw+cup+9ms8jPwM9NDoJ8/UPJzU X-Google-Smtp-Source: APXvYqzPaW6YJ+GQex1ibtULnCZzWc2afZ9I0EmuZDahz9L67cQ8jSFvg7TjFdeIgWJRpNaxlpHjZw== X-Received: by 2002:a5d:4311:: with SMTP id h17mr3891421wrq.9.1559124047199; Wed, 29 May 2019 03:00:47 -0700 (PDT) Received: from localhost ([194.105.145.90]) by smtp.gmail.com with ESMTPSA id j7sm15785515wrt.31.2019.05.29.03.00.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 29 May 2019 03:00:46 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Date: Wed, 29 May 2019 13:00:40 +0300 Message-Id: <20190529100043.14802-2-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190529100043.14802-1-igor.opaniuk@gmail.com> References: <20190529100043.14802-1-igor.opaniuk@gmail.com> Cc: marcel.ziswiler@toradex.com, max.krummenacher@toradex.com, marcel@ziswiler.com Subject: [U-Boot] [PATCH v2 2/5] colibri-imx6ull: 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" From: Igor Opaniuk 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. Acked-by: Marcel Ziswiler Signed-off-by: Igor Opaniuk --- include/configs/colibri-imx6ull.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 7cf550cf9e..2ba0ce5b79 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -66,12 +66,17 @@ "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} " \ + "set_sdargs=setenv sdargs root=PARTUUID=${uuid} ro rootwait\0" \ + "sdboot=run setup; run sdfinduuid; run set_sdargs; " \ + "setenv bootargs ${defargs} ${sdargs} " \ "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \ - "load mmc 0:1 ${kernel_addr_r} ${kernel_file} && " \ - "load mmc 0:1 ${fdt_addr_r} " FDT_FILE " && " \ + "load mmc ${sddev}:${sdbootpart} ${kernel_addr_r} ${kernel_file} && " \ + "load mmc ${sddev}:${sdbootpart} ${fdt_addr_r} " FDT_FILE " && " \ "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 rw rootfstype=ubifs " \ From patchwork Wed May 29 10:00:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1107052 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LfH1+ajE"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45DR7z4L0Tz9s4V for ; Wed, 29 May 2019 20:01:51 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 46714C21C93; Wed, 29 May 2019 10:01:18 +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=FREEMAIL_FROM, T_DKIM_INVALID 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 C6349C21E0F; Wed, 29 May 2019 10:00:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E701CC21C38; Wed, 29 May 2019 10:00:49 +0000 (UTC) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by lists.denx.de (Postfix) with ESMTPS id 9D2ECC21BE5 for ; Wed, 29 May 2019 10:00:49 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id v22so1148996wml.1 for ; Wed, 29 May 2019 03:00:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yUIadkpf72XVFz9g/zSoGXzUfqhCDVwQQBD0ZxTPILc=; b=LfH1+ajENh9q5vBjQd0JjgEAxqI5kZy+6XGOLAIJBYtsHMEIHf7+3iZ/EZT6ukdoIj +1KU1N4Zv5EkgH4ImkMqOxJ3FLR9o5arXaxTHry9Ut+1ThdJ23xNFSKGWheZCLzryr0z BPMoqAuyKoZ/N0YXJ4jYOqaN3+kp4emaKnJwuQ5tWaVGZr0NdQQQAVKnlDde7+MkT3cl 4CXWohT0YIzDUABXEtt+2VLDQUiMl3TKyVxET9H/nTsxiXadOstkDyii0KD5RVQcSl0y IcbZTk2JOMV8eC1HPd1g3PHWOziSaXmR58atwMAtdtwQonevGx+AoZE+bIIphKVLz8GS Mq6Q== 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=yUIadkpf72XVFz9g/zSoGXzUfqhCDVwQQBD0ZxTPILc=; b=Io1CYNQQZt7CYVw7c/r8/luLB3my30sIS9mbvVHVxHplB4GQhtXARpkrwVGuKbkgM/ dcLCt8Y5LAUUJ8Y4QM0KRW9AnQaE512KdWwQD148EYYFQPvbH/o+5vFY9E151FNFXkZ8 Fqh7MW29GxKcbzjebJzpPBD36fr8NWRizouKQN6Byse/cQvuuZD/m/Mf+vasnHHZ7Z3b ArVEpKSAYksLHFGZPwkjt3hVMkfLxWDnjqA5hMMPBrl7XaDxzRVTdrqEZeixC4H7V2od 0vBPRpPL2XuaRlZ2oqMmiswQsz4CZDQacMoOkydAdfk37zGWnr1PlRRxAEP5nLdbIHIP NeOQ== X-Gm-Message-State: APjAAAXRoYTvPHf5Rwd1Q6cnl/RwfL5U9zTNj/KTqxZvybSbQpFg1GkZ QfY6hzE66Sg5sIl60bMnEeyosGI9 X-Google-Smtp-Source: APXvYqylUk4ZOIWpsojWtq2Alb6Y7LLJfkcZpcaEr724arXLNF5Pz15uEys2f9huBMpFvcjWCq1siQ== X-Received: by 2002:a1c:c907:: with SMTP id f7mr6381655wmb.142.1559124048507; Wed, 29 May 2019 03:00:48 -0700 (PDT) Received: from localhost ([194.105.145.90]) by smtp.gmail.com with ESMTPSA id l14sm15781059wrt.57.2019.05.29.03.00.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 29 May 2019 03:00:47 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Date: Wed, 29 May 2019 13:00:41 +0300 Message-Id: <20190529100043.14802-3-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190529100043.14802-1-igor.opaniuk@gmail.com> References: <20190529100043.14802-1-igor.opaniuk@gmail.com> Cc: marcel.ziswiler@toradex.com, max.krummenacher@toradex.com, marcel@ziswiler.com Subject: [U-Boot] [PATCH v2 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" From: Igor Opaniuk 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. Acked-by: Marcel Ziswiler Signed-off-by: Igor Opaniuk --- 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 " \ From patchwork Wed May 29 10:00:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1107054 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Kdr00kNG"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45DR99371jz9s4V for ; Wed, 29 May 2019 20:02:53 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id EBCB2C21D83; Wed, 29 May 2019 10:01:43 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID 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 D917DC21E30; Wed, 29 May 2019 10:01:04 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5B6EAC21DDC; Wed, 29 May 2019 10:00:53 +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 8B6DEC21D74 for ; Wed, 29 May 2019 10:00:50 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id i3so1198872wml.4 for ; Wed, 29 May 2019 03:00:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=v6Pg5GE5PUp0ldc/9fHW9HnqP0DToFMSUtTzsB04rls=; b=Kdr00kNG8mgPpRiwokBy2L+2OKQkeZ2PimkdIYeQ2Zs55p/UfK43hEdOLozV7v/Pkd 5MTaDSmceT5aUj93HKB5lLeEttt2yZFrm9hxbyxHQunlT7j/6DDTmlzOzdIeyfuxYhpm W6U4FwLPjkxBS2QhKyWK5+DFdAYum7s9GT7KlZPS9l5ryiARQxw0c+5oiiugydKGEsuh WAbbTMHlP70eYLR7lBxfLn+rNWTrE3ZII1rBnJrhhc0aB/9ShQpRJQe5jCuD3sUTPfDz eObxMnFttFXnM0tWDF1ZEMQnNzW8idDivYUzO+1lvXxFtPDiKYPSNe7MJU2rQL9sHc1l u5Xg== 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=v6Pg5GE5PUp0ldc/9fHW9HnqP0DToFMSUtTzsB04rls=; b=PhfSzlpHvYwTvudYHhGW+/aPGeZdvAfTDR/SJ8ldqVP9dXhIduYQTF3zanzzzHonzU 5vawNwJrJIHhVFOqgB2tRX0zDd8ldceoKWxkUk94Iro1ChW5aXp61LdvX76/oLY5ZJOi 6eTrC0e0Sj3TqtkRyQxLAKIWlOkLAiC1eYLerSOb+jJKLkLVZUbmvRIK3FXZWDAced+1 W6Dwc3KuhMYLDrnsuMSe6lFsMygkGPFB21JQYGJ/ICuwZomBp42qHpBVCCdUPBe6/zz8 i25PhQSz0CNlVoDBbcWItuGUBqVCLycN5f/mxcxsJL6olRYlKs4uSbKLi//ntzYReVMH 1mcw== X-Gm-Message-State: APjAAAU7BCSFSNc095P/t9rJNJJEc/SAW/GZNwgmIzCrGvbOGaqDrDWx aVMdGcuOj/LTT1azrKisQ863sJeo X-Google-Smtp-Source: APXvYqwKgHi0TH6nAS7YtrPR+kJoMtb3jN2rI+w81Axq8sWZjGOM641bige8mpEbkWeSFkNrC6fAiw== X-Received: by 2002:a05:600c:230a:: with SMTP id 10mr6553611wmo.13.1559124049986; Wed, 29 May 2019 03:00:49 -0700 (PDT) Received: from localhost ([194.105.145.90]) by smtp.gmail.com with ESMTPSA id f21sm750206wmb.2.2019.05.29.03.00.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 29 May 2019 03:00:49 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Date: Wed, 29 May 2019 13:00:42 +0300 Message-Id: <20190529100043.14802-4-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190529100043.14802-1-igor.opaniuk@gmail.com> References: <20190529100043.14802-1-igor.opaniuk@gmail.com> Cc: marcel.ziswiler@toradex.com, max.krummenacher@toradex.com, marcel@ziswiler.com Subject: [U-Boot] [PATCH v2 4/5] apalis_imx6: 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" From: Igor Opaniuk 1. 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. 2. Fix legacy USB command (both sdboot and usbboot can be used now). Acked-by: Marcel Ziswiler Signed-off-by: Igor Opaniuk --- include/configs/apalis_imx6.h | 64 +++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 21 deletions(-) diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 96169f55f0..4f0f7b5129 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -125,16 +125,21 @@ "imx6q-apalis-cam-eval.dtb fat 0 1" #define EMMC_BOOTCMD \ - "emmcargs=ip=off root=/dev/mmcblk0p2 rw,noatime rootfstype=ext4 " \ - "rootwait\0" \ - "emmcboot=run setup; " \ + "set_emmcargs emmcargs ip=off root=PARTUUID=${uuid} ro,noatime " \ + "rootfstype=ext4 rootwait\0" \ + "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \ "setenv bootargs ${defargs} ${emmcargs} ${setupargs} " \ "${vidargs}; echo Booting from internal eMMC chip...; " \ - "run emmcdtbload; load mmc 0:1 ${kernel_addr_r} " \ - "${boot_file} && run fdt_fixup && " \ + "run emmcdtbload; load mmc ${emmcdev}:${emmcbootpart} " \ + "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \ "bootz ${kernel_addr_r} ${dtbparam}\0" \ - "emmcdtbload=setenv dtbparam; load mmc 0:1 ${fdt_addr_r} " \ - "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + "emmcbootpart=1\0" \ + "emmcdev=0\0" \ + "emmcdtbload=setenv dtbparam; load mmc ${emmcdev}:${emmcbootpart} " \ + "${fdt_addr_r} ${fdt_file} && " \ + "setenv dtbparam \" - ${fdt_addr_r}\" && true\0" \ + "emmcfinduuid=part uuid mmc ${mmcdev}:${emmcrootpart} uuid\0" \ + "emmcrootpart=2\0" #define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x20000000\0" \ @@ -147,7 +152,7 @@ "scriptaddr=0x17000000\0" #define NFS_BOOTCMD \ - "nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \ + "nfsargs=ip=:::::eth0:on root=/dev/nfs ro\0" \ "nfsboot=run setup; " \ "setenv bootargs ${defargs} ${nfsargs} ${setupargs} " \ "${vidargs}; echo Booting via DHCP/TFTP/NFS...; " \ @@ -157,27 +162,43 @@ "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" #define SD_BOOTCMD \ - "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext4 " \ - "rootwait\0" \ - "sdboot=run setup; " \ + "set_sdargs=setenv sdargs ip=off root=PARTUUID=${uuid} ro,noatime " \ + "rootfstype=ext4 rootwait\0" \ + "sdboot=run setup; run sdfinduuid; run set_sdargs; " \ "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ "${vidargs}; echo Booting from SD card; " \ - "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ - "${boot_file} && run fdt_fixup && " \ + "run sddtbload; load mmc ${sddev}:${sdbootpart} " \ + "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \ "bootz ${kernel_addr_r} ${dtbparam}\0" \ - "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ - "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + "sdbootpart=1\0" \ + "sddev=1\0" \ + "sddtbload=setenv dtbparam; load mmc ${sddev}:${sdbootpart} " \ + "${fdt_addr_r} " \ + "${fdt_file} && setenv dtbparam \" - " \ + "${fdt_addr_r}\" && true\0" \ + "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \ + "sdrootpart=2\0" + #define USB_BOOTCMD \ - "usbargs=ip=off root=/dev/sda2 rw,noatime rootfstype=ext4 " \ - "rootwait\0" \ - "usbboot=run setup; setenv bootargs ${defargs} ${setupargs} " \ + "set_usbargs=setenv usbargs ip=off root=PARTUUID=${uuid} ro,noatime " \ + "rootfstype=ext4 rootwait\0" \ + "usbboot=run setup; usb start; run usbfinduuid; run set_usbargs; " \ + "setenv bootargs ${defargs} ${setupargs} " \ "${usbargs} ${vidargs}; echo Booting from USB stick...; " \ - "usb start && run usbdtbload; load usb 0:1 ${kernel_addr_r} " \ + "run usbdtbload; load usb " \ + "${usbdev}:${usbbootpart} ${kernel_addr_r} " \ "${boot_file} && run fdt_fixup && " \ "bootz ${kernel_addr_r} ${dtbparam}\0" \ - "usbdtbload=setenv dtbparam; load usb 0:1 ${fdt_addr_r} " \ - "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + "usbbootpart=1\0" \ + "usbdev=0\0" \ + "usbdtbload=setenv dtbparam; load usb ${usbdev}:${usbbootpart} "\ + "${fdt_addr_r} " \ + "${fdt_file} && setenv dtbparam \" - " \ + "${fdt_addr_r}\" && true\0" \ + "usbfinduuid=part uuid usb ${usbdev}:${usbrootpart} uuid\0" \ + "usbrootpart=2\0" + #ifndef CONFIG_TDX_APALIS_IMX6_V1_0 #define FDT_FILE "imx6q-apalis-eval.dtb" @@ -201,6 +222,7 @@ MEM_LAYOUT_ENV_SETTINGS \ NFS_BOOTCMD \ SD_BOOTCMD \ + USB_BOOTCMD \ "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \ "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \ "flash_eth.img && source ${loadaddr}\0" \ From patchwork Wed May 29 10:00:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1107053 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rZojUqlU"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45DR8V0tH3z9sBb for ; Wed, 29 May 2019 20:02:18 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id D6673C21CB6; Wed, 29 May 2019 10:01:30 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID 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 66B33C21E29; Wed, 29 May 2019 10:01:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C9E8DC21E12; Wed, 29 May 2019 10:00:55 +0000 (UTC) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by lists.denx.de (Postfix) with ESMTPS id CFCD6C21C27 for ; Wed, 29 May 2019 10:00:51 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id m3so1299796wrv.2 for ; Wed, 29 May 2019 03:00:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NimhlJMBsxlw0vkXiSGhHS/slLulXXEMzq7rmRKZM/Q=; b=rZojUqlU8gCqOzCrz67MSMIggiOIJk+YyQ64jzIhHPxUGH8VQ6ogCLWWn/+KzYYY2L FJKbT2I0/fnEXGaPv0YZ5mc+CMm1BrltGPbIXtmFWKs0l5cMNvHnKLV56/uBLzo8m+3U AF9Ym33CdGGw1Q9dfDbtDOzh/ah9sDioWnBQvn2loMaqSZ6GT+2eLj2qOfU0dr+b1d5m 1hrWa56xa+NiWFVhJEont+XDkeC86VnXSL439L/BKfQN4ebycamGg3mrdfQ69aD5D7ng V/cU6pu8GbEV+LojcN4IKw0BzK2t9I3ULD8+cZWFzTtsm3uS39HB2s3whmZA+NJnpacW 1PCA== 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=NimhlJMBsxlw0vkXiSGhHS/slLulXXEMzq7rmRKZM/Q=; b=Jc/4jvjSxd26MiUvmbgL30X6aVpt7bf7V1rrD4nAeXUyzuAgbsRQNhlQM1uXfw08Oe AopN//6oTHlMKmYXVyhYdVUYZxFXIRp+AyseceKvNwKX/OCW6LDYUYam0tTdmk2Vx//W h9Mmo2rfklDB/1vo2gnv/q9rpZMx2rC8NBiLupiq7Plm4/Tre7xXi+ksl9iXLTLGrUV8 biyZ5CYfedUsxUr/dcCWQRh6jXFPRF3d9P+1S7Et/CY9FrXLzAyYnVToGiDrCJNuLume XJ6oLx8hhsGwOa+M3SPS2yQTI7+EcpRrl46yqfGxQqltxhqaStkiivIqAbMqcvn6Fcqx xglw== X-Gm-Message-State: APjAAAWW2H/k2K9NBgQoOFCxNXmO8aEFFta22maCOvSfZflx9KJ8zO/6 eyGfOK3M/lDdCRry29FIYvaVSpcS X-Google-Smtp-Source: APXvYqy+LSMVqEuFdx3LnRTFRwyfbByv9OfQ5/kdXtgHFzZI5tgTkdg0nbIOw/Nd9VQVpQwem4HqfA== X-Received: by 2002:adf:fd0f:: with SMTP id e15mr19047537wrr.104.1559124051233; Wed, 29 May 2019 03:00:51 -0700 (PDT) Received: from localhost ([194.105.145.90]) by smtp.gmail.com with ESMTPSA id a139sm8377426wmd.18.2019.05.29.03.00.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 29 May 2019 03:00:50 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Date: Wed, 29 May 2019 13:00:43 +0300 Message-Id: <20190529100043.14802-5-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190529100043.14802-1-igor.opaniuk@gmail.com> References: <20190529100043.14802-1-igor.opaniuk@gmail.com> Cc: marcel.ziswiler@toradex.com, max.krummenacher@toradex.com, marcel@ziswiler.com Subject: [U-Boot] [PATCH v2 5/5] apalis-tk1: 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" From: Igor Opaniuk 1. 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. 2. Fix legacy USB command (both sdboot and usbboot can be used now). Acked-by: Marcel Ziswiler Signed-off-by: Igor Opaniuk --- include/configs/apalis-tk1.h | 62 ++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 21 deletions(-) diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index 1d296ba51a..a026df8f50 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -51,15 +51,22 @@ "tegra124-apalis-eval.dtb fat 0 1 mmcpart 0" #define EMMC_BOOTCMD \ - "emmcargs=ip=off root=/dev/mmcblk0p2 rw rootfstype=ext3 rootwait\0" \ - "emmcboot=run setup; setenv bootargs ${defargs} ${emmcargs} " \ - "${setupargs} ${vidargs}; echo Booting from internal eMMC " \ - "chip...; run emmcdtbload; load mmc 0:1 ${kernel_addr_r} " \ + "set_emmcargs=setenv emmcargs ip=off root=PARTUUID=${uuid} " \ + "ro rootfstype=ext4 rootwait\0" \ + "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \ + "setenv bootargs ${defargs} ${emmcargs} " \ + "${setupargs} ${vidargs}; echo Booting from internal eMMC; " \ + "run emmcdtbload; " \ + "load mmc ${emmcdev}:${emmcbootpart} ${kernel_addr_r} " \ "${boot_file} && run fdt_fixup && " \ "bootm ${kernel_addr_r} - ${dtbparam}\0" \ - "emmcdtbload=setenv dtbparam; load mmc 0:1 ${fdt_addr_r} " \ - "${soc}-apalis-${fdt_board}.dtb && " \ - "setenv dtbparam ${fdt_addr_r}\0" + "emmcbootpart=1\0" \ + "emmcdev=0\0" \ + "emmcdtbload=setenv dtbparam; load mmc ${emmcdev}:${emmcbootpart} " \ + "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb && " \ + "setenv dtbparam ${fdt_addr_r}\0" \ + "emmcfinduuid=part uuid mmc ${mmcdev}:${emmcrootpart} uuid\0" \ + "emmcrootpart=2\0" #define NFS_BOOTCMD \ "nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \ @@ -72,26 +79,38 @@ "&& setenv dtbparam ${fdt_addr_r}\0" #define SD_BOOTCMD \ - "sdargs=ip=off root=/dev/mmcblk1p2 rw rootfstype=ext4 rootwait\0" \ - "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ + "set_sdargs=setenv sdargs ip=off root=PARTUUID=${uuid} ro " \ + "rootfstype=ext4 rootwait\0" \ + "sdboot=run setup; run sdfinduuid; run set_sdargs; " \ + "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ "${vidargs}; echo Booting from SD card in 8bit slot...; " \ - "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ - "${boot_file} && run fdt_fixup && " \ + "run sddtbload; load mmc ${sddev}:${sdbootpart} " \ + "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \ "bootm ${kernel_addr_r} - ${dtbparam}\0" \ - "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ - "${soc}-apalis-${fdt_board}.dtb " \ - "&& setenv dtbparam ${fdt_addr_r}\0" + "sdbootpart=1\0" \ + "sddev=1\0" \ + "sddtbload=setenv dtbparam; load mmc ${sddev}:${sdbootpart} " \ + "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb " \ + "&& setenv dtbparam ${fdt_addr_r}\0" \ + "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \ + "sdrootpart=2\0" #define USB_BOOTCMD \ - "usbargs=ip=off root=/dev/sda2 rw rootfstype=ext4 rootwait\0" \ - "usbboot=run setup; setenv bootargs ${defargs} ${setupargs} " \ + "set_usbargs=setenv usbargs ip=off root=PARTUUID=${uuid} ro " \ + "rootfstype=ext4 rootwait\0" \ + "usbboot=run setup; usb start; run usbfinduuid; run set_usbargs; " \ + "setenv bootargs ${defargs} ${setupargs} " \ "${usbargs} ${vidargs}; echo Booting from USB stick...; " \ - "usb start && run usbdtbload; load usb 0:1 ${kernel_addr_r} " \ - "${boot_file} && run fdt_fixup && " \ + "run usbdtbload; load usb ${usbdev}:${usbbootpart} " \ + "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \ "bootm ${kernel_addr_r} - ${dtbparam}\0" \ - "usbdtbload=setenv dtbparam; load usb 0:1 ${fdt_addr_r} " \ - "${soc}-apalis-${fdt_board}.dtb " \ - "&& setenv dtbparam ${fdt_addr_r}\0" + "usbbootpart=1\0" \ + "usbdev=0\0" \ + "usbdtbload=setenv dtbparam; load usb ${usbdev}:${usbbootpart} " \ + "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb " \ + "&& setenv dtbparam ${fdt_addr_r}\0" \ + "usbfinduuid=part uuid usb ${usbdev}:${usbrootpart} uuid\0" \ + "usbrootpart=2\0" #define BOARD_EXTRA_ENV_SETTINGS \ "boot_file=uImage\0" \ @@ -104,6 +123,7 @@ "fdt_fixup=;\0" \ NFS_BOOTCMD \ SD_BOOTCMD \ + USB_BOOTCMD \ "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \ "00:14:2d:00:00:00; fi; pci enum && tftpboot ${loadaddr} " \ "flash_eth.img && source ${loadaddr}\0" \