From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 15 Aug 2022 13:55:13 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oNYgZ-006Nw9-CD for lore@lore.pengutronix.de; Mon, 15 Aug 2022 13:55:13 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oNYgZ-0002IB-Ge for lore@pengutronix.de; Mon, 15 Aug 2022 13:55:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=H97r/eh7qeaTtqf/lPDfDYYYaeHJw7vDv0OpoWfCg3c=; b=cOXF4ys772LQ0ymT7CIy6CJlrC dnvhwkMh+EI5v9wCthsGvUK3z8fRjrN9rE6FgZn+a+fbZKDct8YxmNm/NFEsK76g3bNPp8FzysVBb z++h+1lmOYwCkGGLmv9u5qfZmLTK5EUXGq9MroRxipoq2MW1jPI+6GvRzZtCcG9MCLaqRm2F88Vfq LgaFnzEotSfszKrrQFNNr0anwskw22SnafDxch03es0pN4b0Rz5W59Of6zj1DkBhidgQbNVQYSqCI 3zx9iH4ez8HT7nTM+AN/bxhphrH84BaR0vXLh77Tu+4OoszkgJyXgDQ+Gm8DIWMZncfFW4J+ndwfs 9tY+Kzbw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oNYf3-00FhkP-1n; Mon, 15 Aug 2022 11:53:37 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oNYaE-00Fe30-E7 for barebox@lists.infradead.org; Mon, 15 Aug 2022 11:48:40 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oNYaD-0001cD-3s; Mon, 15 Aug 2022 13:48:37 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oNYaA-003uPr-3y; Mon, 15 Aug 2022 13:48:36 +0200 Received: from afa by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oNYaB-009Ybw-Ja; Mon, 15 Aug 2022 13:48:35 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Mon, 15 Aug 2022 13:48:35 +0200 Message-Id: <20220815114835.2277946-2-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220815114835.2277946-1-a.fatoum@pengutronix.de> References: <20220815114835.2277946-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220815_044838_578288_86BD200E X-CRM114-Status: GOOD ( 11.05 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-3.7 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 2/2] common: bootm: reuse cdev_get_linux_rootarg() X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) CONFIG_MMCBLKDEV_ROOTARG=y so far had no effect on the root= option generated by $global.bootm.root_dev. Have the bootm code reuse cdev_get_linux_rootarg(), so it behaves the same as with boot from file system. Signed-off-by: Ahmad Fatoum --- common/bootm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/bootm.c b/common/bootm.c index c0f7bca6ce86..2f02c156e56f 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -710,9 +710,8 @@ int bootm_boot(struct bootm_data *bootm_data) const char *root_dev_name = devpath_to_name(bootm_data->root_dev); const struct cdev *root_cdev = cdev_by_name(root_dev_name); - if (root_cdev && root_cdev->uuid[0] != 0) { - rootarg = basprintf("root=PARTUUID=%s", root_cdev->uuid); - } else { + rootarg = cdev_get_linux_rootarg(root_cdev); + if (!rootarg) { rootarg = ERR_PTR(-EINVAL); if (!root_cdev) -- 2.30.2