From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 27 Nov 2025 15:31:40 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vOd24-005SI9-26 for lore@lore.pengutronix.de; Thu, 27 Nov 2025 15:31:40 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vOd24-0003ya-2k for lore@pengutronix.de; Thu, 27 Nov 2025 15:31:40 +0100 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=0XJhgaQAVD617d6wKDA6hBP04c5ca9AOPUIR8qi9C80=; b=MClfdHEMxrq+WPK6TbW0gzAPs3 Gt/SgSX9JkA6dQ8x68ZjHgPci0UZbyBY/ojIMw/FepDB5QIX4/NoraLbrNr03vlghpoaQW4tqZPAs VGjlXNV+JOdz/YbUnEjEhRfTcqBlednhgmdYe1A6tsP04MwcrRLCB6Dglj/QSF+cpjqU9Txq5ZebP NK8Yr3EyJgOaZx2ptrhGI2qwoQQzkEwVkH/km340wp5Nj4M3aO9Tzl61VQqIVNzYzZkh4bC9k9VQF E9FvAJalUX7iNTInZPZKjGxpfz2n9s0O0CBnDsW9fuSyfEhrg9MAfNCqsshYHLX5oKulgVDYTB4yB YxU1DO+w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vOd1Z-0000000Gmi0-42Ty; Thu, 27 Nov 2025 14:31:09 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vOd1X-0000000Gmg4-26b4 for barebox@lists.infradead.org; Thu, 27 Nov 2025 14:31:08 +0000 Received: from dude06.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::5c]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vOd1W-0003i7-37; Thu, 27 Nov 2025 15:31:06 +0100 From: Fabian Pflug To: barebox@lists.infradead.org Cc: Fabian Pflug Date: Thu, 27 Nov 2025 15:25:21 +0100 Message-ID: <20251127143052.3114915-2-f.pflug@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251127143052.3114915-1-f.pflug@pengutronix.de> References: <20251127105824.3560951-1-f.pflug@pengutronix.de> <20251127143052.3114915-1-f.pflug@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-20251127_063107_542988_2E0E005C X-CRM114-Status: GOOD ( 12.88 ) 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.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-3.3 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v3 1/4] block.h: renamed get_rootargs to get_root X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) Don't return the full commandline-parameter, but instead just return the root block/fs/etc. The functions downstream can add root= before. This is the first commit in a series to make root= dynamic. Signed-off-by: Fabian Pflug --- common/block.c | 10 ++++++++-- drivers/mci/mci-core.c | 4 ++-- include/block.h | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/common/block.c b/common/block.c index ca2ed37dbd..07c4d5d504 100644 --- a/common/block.c +++ b/common/block.c @@ -598,8 +598,14 @@ char *cdev_get_linux_rootarg(const struct cdev *partcdev) if (!blk) return NULL; - if (blk->ops->get_rootarg) - rootarg = blk->ops->get_rootarg(blk, partcdev); + if (blk->ops->get_root) { + char *root = NULL; + root = blk->ops->get_root(blk, partcdev); + if (root) { + rootarg = basprintf("root=%s", root); + free(root); + } + } if (!rootarg && partcdev->partuuid[0] != 0) rootarg = basprintf("root=PARTUUID=%s", partcdev->partuuid); diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c index 57825bc849..206147cb93 100644 --- a/drivers/mci/mci-core.c +++ b/drivers/mci/mci-core.c @@ -2691,7 +2691,7 @@ static char *mci_get_linux_mmcblkdev(struct block_device *blk, * skipping it. */ if (cdev_partname_equal(partcdev, cdev)) - return basprintf("root=/dev/mmcblk%dp%d", id, partnum); + return basprintf("/dev/mmcblk%dp%d", id, partnum); if (cdev->flags & DEVFS_PARTITION_FROM_TABLE) partnum++; } @@ -2703,7 +2703,7 @@ static struct block_device_ops mci_ops = { .read = mci_sd_read, .write = IS_ENABLED(CONFIG_MCI_WRITE) ? mci_sd_write : NULL, .erase = IS_ENABLED(CONFIG_MCI_ERASE) ? mci_sd_erase : NULL, - .get_rootarg = IS_ENABLED(CONFIG_MMCBLKDEV_ROOTARG) ? + .get_root = IS_ENABLED(CONFIG_MMCBLKDEV_ROOTARG) ? mci_get_linux_mmcblkdev : NULL, }; diff --git a/include/block.h b/include/block.h index fc7a0a32fb..b277f590e4 100644 --- a/include/block.h +++ b/include/block.h @@ -14,7 +14,7 @@ struct block_device_ops { int (*write)(struct block_device *, const void *buf, sector_t block, blkcnt_t num_blocks); int (*erase)(struct block_device *blk, sector_t block, blkcnt_t num_blocks); int (*flush)(struct block_device *); - char *(*get_rootarg)(struct block_device *blk, const struct cdev *partcdev); + char *(*get_root)(struct block_device *blk, const struct cdev *partcdev); }; struct chunk; -- 2.47.3