From patchwork Wed Oct 2 10:34:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 1170573 X-Patchwork-Delegate: lukma@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=samsung.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.b="WSfGwpaG"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46jsw21J9Dz9sPc for ; Wed, 2 Oct 2019 20:34:57 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id D4BCEC21E42; Wed, 2 Oct 2019 10:34: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=SPF_HELO_PASS, 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 29698C21C51; Wed, 2 Oct 2019 10:34:49 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4005BC21C51; Wed, 2 Oct 2019 10:34:47 +0000 (UTC) Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by lists.denx.de (Postfix) with ESMTPS id 5C61DC21C27 for ; Wed, 2 Oct 2019 10:34:43 +0000 (UTC) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20191002103442euoutp014747653b9a400c52abd5a10f3dfde590~JzgjNweOa3034230342euoutp01H for ; Wed, 2 Oct 2019 10:34:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20191002103442euoutp014747653b9a400c52abd5a10f3dfde590~JzgjNweOa3034230342euoutp01H DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1570012482; bh=D2qGPEF7Y6kJZD4Hnpbw3XRUoy7qiQx0j07YXrMDFdc=; h=From:To:Cc:Subject:Date:References:From; b=WSfGwpaGN9NfPDk7UEsi0xx6rWl7KAdTYHTYopaZOsRRX/J/BpJYP9zMtbMT8wmak Fas4qFNorX+AhxHQeFubTJE0ifabriCJa9Rzn2W5hc+AsY6gLQMwFWXwdzjek52soS 0ib54FGxUE8hCKZQsrYHtb6l9ME9RsbzeJPPVdX8= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20191002103442eucas1p2c524ad4cd88358dfab707d655aeaf63f~Jzgi_kGzH1943819438eucas1p2f; Wed, 2 Oct 2019 10:34:42 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 63.2C.04469.14D749D5; Wed, 2 Oct 2019 11:34:42 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20191002103441eucas1p2f2ce4a1b8c6a7bb081b43d7e5dc76c79~Jzgisoshq3214932149eucas1p2r; Wed, 2 Oct 2019 10:34:41 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20191002103441eusmtrp1d9a604f4ef7c789e2ff65536e6072801~JzgisH_ZV1998719987eusmtrp1Z; Wed, 2 Oct 2019 10:34:41 +0000 (GMT) X-AuditID: cbfec7f2-54fff70000001175-3e-5d947d41277c Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id FC.12.04117.14D749D5; Wed, 2 Oct 2019 11:34:41 +0100 (BST) Received: from AMDC2765.digital.local (unknown [106.120.51.73]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20191002103441eusmtip1734ed2b8d04fe01f0c9c1acc7a7a8783~Jzgiea2L72121121211eusmtip17; Wed, 2 Oct 2019 10:34:41 +0000 (GMT) From: Marek Szyprowski To: u-boot@lists.denx.de Date: Wed, 2 Oct 2019 12:34:37 +0200 Message-Id: <20191002103437.13318-1-m.szyprowski@samsung.com> X-Mailer: git-send-email 2.17.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrHIsWRmVeSWpSXmKPExsWy7djPc7pOtVNiDVaIWjx/d5nJYu2Ru+wW b/d2sjswe8ybdYLF4+ydHYwefVtWMQYwR3HZpKTmZJalFunbJXBlrJ/eyVSwiL/iVftXpgbG NTxdjJwcEgImEjf3bmDpYuTiEBJYwSixYfpVVgjnC6PEutefoZzPjBLd21YBORxgLatXJEDE lzNKfDiyghmuY+bSg2wgc9kEDCW63naB2SICEhK/+q8ygtjMAkES8+ZfZAYZJCzgKPF5WR5I mEVAVWLTlZtg5bwCthKT5m9jgzhPXmL1hgNg8yUE1rBJvL/WxwhxhIvEr1/OEDXCEq+Ob2GH sGUkTk/uYYGob2aUeHhuLTuE08MocblpBiNElbXE4eMXwb5hFtCUWL9LH2Kmo8TdV74QJp/E jbeCEBfzSUzaNp0ZIswr0dEmBDFDTWLW8XVwWw9euMQMYXtIHLt+kQnEFhKIldh/ey7bBEa5 WQirFjAyrmIUTy0tzk1PLTbMSy3XK07MLS7NS9dLzs/dxAiM5dP/jn/awfj1UtIhRgEORiUe 3hshk2OFWBPLiitzDzFKcDArifDa/JkUK8SbklhZlVqUH19UmpNafIhRmoNFSZy3muFBtJBA emJJanZqakFqEUyWiYNTqoGRRcLnYMQuuXm5HbdeZT3OYJHgavbatHp1c2nu/uAsdaV32UvP b5pxKSx5yo04I/bNG/SMNRZF95ac3v3m2grftU47GeacutZ4edvhRN32Jy6m3Laz+aWXqbqV 2PlPYXwQe9S0a/PW/aY/3yscesnQsiSZ9clJ+zRZg7aiyamzDgq5ftXUKnqmxFKckWioxVxU nAgAi3ty2eECAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrKLMWRmVeSWpSXmKPExsVy+t/xu7qOtVNiDXYe0bV4/u4yk8XaI3fZ Ld7u7WR3YPaYN+sEi8fZOzsYPfq2rGIMYI7SsynKLy1JVcjILy6xVYo2tDDSM7S00DMysdQz NDaPtTIyVdK3s0lJzcksSy3St0vQy1g/vZOpYBF/xav2r0wNjGt4uhg5OCQETCRWr0joYuTk EBJYyijReVcNxJYQkJE4Oa2BFcIWlvhzrYuti5ELqOYTo8SblUvZQBJsAoYSXW+7wGwRAQmJ X/1XGUFsZoEgiZXzPrKCzBcWcJT4vCwPJMwioCqx6cpNsHJeAVuJSfO3sUHMl5dYveEA8wRG ngWMDKsYRVJLi3PTc4uN9IoTc4tL89L1kvNzNzECg2jbsZ9bdjB2vQs+xCjAwajEw9sQNDlW iDWxrLgy9xCjBAezkgivzZ9JsUK8KYmVValF+fFFpTmpxYcYTYGWT2SWEk3OBwZ4Xkm8oamh uYWlobmxubGZhZI4b4fAwRghgfTEktTs1NSC1CKYPiYOTqkGRsfF+17FK21X+3Nb8/BuM6P4 iKr7UkuVRLV6G/Zf3Sm2Qb9j2yVHneK3k3rkzUTfpcgtanrZKPnIcOJqD9WH7qpdW0Vf+Jyz elivxn25OWG+lEdh3YYNTfff517knPS4zlpBLWj6H5Yr83ewxEkevSbS7Lb+f3Pji0OxdxJq dZui2yR3TeV1UWIpzkg01GIuKk4EABOgTMI4AgAA X-CMS-MailID: 20191002103441eucas1p2f2ce4a1b8c6a7bb081b43d7e5dc76c79 X-Msg-Generator: CA X-RootMTR: 20191002103441eucas1p2f2ce4a1b8c6a7bb081b43d7e5dc76c79 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20191002103441eucas1p2f2ce4a1b8c6a7bb081b43d7e5dc76c79 References: Cc: Marek Szyprowski Subject: [U-Boot] [PATCH v2] dfu: mmc: add support for in-partition offset 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" Add possibility to define a part of partition as a separate DFU entity. This allows to have more than one items on the given partition. The real use case for this option is TM2 board. It can use u-boot stored as Linux kernel on the defined partition (as RAW data) and load the real kernel from the same partition, but stored under the certain offset. Signed-off-by: Marek Szyprowski Acked-by: Lukasz Majewski --- Changelog: - fixed minor coding style issue - made it a stand alone patch, independent from the main patchset: https://patchwork.ozlabs.org/cover/994309/ --- drivers/dfu/dfu_mmc.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c index 403fd5351d..5b551f6ae1 100644 --- a/drivers/dfu/dfu_mmc.c +++ b/drivers/dfu/dfu_mmc.c @@ -352,6 +352,7 @@ int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *devstr, char *s) struct blk_desc *blk_dev = mmc_get_blk_desc(mmc); int mmcdev = second_arg; int mmcpart = third_arg; + int offset = 0; if (part_get_info(blk_dev, mmcpart, &partinfo) != 0) { pr_err("Couldn't find part #%d on mmc device #%d\n", @@ -359,9 +360,17 @@ int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *devstr, char *s) return -ENODEV; } + /* + * Check for an extra entry at dfu_alt_info env variable + * specifying the mmc HW defined partition number + */ + if (s) + if (!strcmp(strsep(&s, " "), "offset")) + offset = simple_strtoul(s, NULL, 0); + dfu->layout = DFU_RAW_ADDR; - dfu->data.mmc.lba_start = partinfo.start; - dfu->data.mmc.lba_size = partinfo.size; + dfu->data.mmc.lba_start = partinfo.start + offset; + dfu->data.mmc.lba_size = partinfo.size-offset; dfu->data.mmc.lba_blk_size = partinfo.blksz; } else if (!strcmp(entity_type, "fat")) { dfu->layout = DFU_FS_FAT;