From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0185C433F5 for ; Tue, 14 Sep 2021 03:28:02 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3031A60E08 for ; Tue, 14 Sep 2021 03:28:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3031A60E08 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9107583AD3; Tue, 14 Sep 2021 05:28:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1631590080; bh=qHGBrrYFxbMOimBobraHGePTZPFknmrJ2Wnh3mQQbps=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=AGy8SXsb83oL//PqTnsFFpYBcySgnyy4wWENP5gbse1erepEwIxyerJ5xs3zOHGFi f4SWtVW2/iaTQ0KkvwZCc+0E3JEUr9U6/t7puJixmMidZpsyxrbOAhp7nu7rmq7emz 5KyxnOWblQzP3diUr3IjQ+KhbMMw1AboF1JSpucUQsCBY5q70yexlnyBhelFHaGZx0 uS9hJdzyfon59KYMuWrCa31IThY/L+uJEHUkPr7zZAspeeYFUPw6YdmwnH6clOWbSg oDNW1diuQ2SCr1ZUIH1TdQ8l3Lt2Nu/Hh0xzupqdIvC6x1cUtia9Stl1hV9lG3OP2s 1aCFdB4A934dA== Received: from tr.lan (ip-89-176-112-137.net.upcbroadband.cz [89.176.112.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id F1748839FA; Tue, 14 Sep 2021 05:27:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1631590079; bh=qHGBrrYFxbMOimBobraHGePTZPFknmrJ2Wnh3mQQbps=; h=From:To:Cc:Subject:Date:From; b=QfdfF+7hfbfMntxwLoRV1wXYGX3SWfsuEVcpzpsqQj7YvBqBfB9HzJnx88LbK7tZL 8od3kFY1lpsblKvPbq1LXtMh2KHwnEiTRehqoxl1kz8AlZO/gXJTchYh/OLXNMHRUq IMu4fBaFmpXdhu9Wx0LQVoY37jUGR2LsFu8BzOY93E7d8yhBPuriek2NOyvVRhLK5L kL3GxUM7AGwoIphX2grqrGIKIsRqFOZBueLGWEZ9AC+mfxHasmCTV7QhU0K2bsleIV nBLPqqFSn3YRER6iyxIkvS5oMP4ZpG/KdwqM35bHY1t4Boggj36CkCEZ9jGKtLvg4Q P2AMIH+I8i8LA== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Lukasz Majewski Subject: [PATCH] dfu: dfu_sf: Add support for multiple flashes Date: Tue, 14 Sep 2021 05:27:51 +0200 Message-Id: <20210914032751.273606-1-marex@denx.de> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Add dfu_alt_info option which allows specifying multiple SPI flashes as an alt info. The syntax is as follows: altname sf bus:cs[:speed[:mode]] Example: dfu_alt_info=qspi0 sf 0:0;qspi1 sf 0:1 Signed-off-by: Marek Vasut Cc: Lukasz Majewski --- drivers/dfu/dfu_sf.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/drivers/dfu/dfu_sf.c b/drivers/dfu/dfu_sf.c index b72493ced86..d246e1b21ff 100644 --- a/drivers/dfu/dfu_sf.c +++ b/drivers/dfu/dfu_sf.c @@ -168,22 +168,31 @@ static struct spi_flash *parse_dev(char *devstr) int dfu_fill_entity_sf(struct dfu_entity *dfu, char *devstr, char *s) { char *st; - char *devstr_bkup = strdup(devstr); - - dfu->data.sf.dev = parse_dev(devstr_bkup); - free(devstr_bkup); - if (!dfu->data.sf.dev) - return -ENODEV; dfu->dev_type = DFU_DEV_SF; dfu->max_buf_size = dfu->data.sf.dev->sector_size; st = strsep(&s, " "); if (!strcmp(st, "raw")) { + char *devstr_bkup = strdup(devstr); + dfu->data.sf.dev = parse_dev(devstr_bkup); + free(devstr_bkup); + if (!dfu->data.sf.dev) + return -ENODEV; + dfu->layout = DFU_RAW_ADDR; dfu->data.sf.start = hextoul(s, &s); s++; dfu->data.sf.size = hextoul(s, &s); + } else if (!strcmp(st, "sf")) { + st = strsep(&s, " "); + dfu->data.sf.dev = parse_dev(st); + if (!dfu->data.sf.dev) + return -ENODEV; + + dfu->layout = DFU_RAW_ADDR; + dfu->data.sf.start = 0; + dfu->data.sf.size = dfu->data.sf.dev->size; } else if (CONFIG_IS_ENABLED(DFU_SF_PART) && (!strcmp(st, "part") || !strcmp(st, "partubi"))) { char mtd_id[32]; -- 2.33.0