From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 15 Jun 2021 15:57:20 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lt9ZA-0008KI-2r for lore@lore.pengutronix.de; Tue, 15 Jun 2021 15:57:20 +0200 Received: from [2607:7c80:54:e::133] (helo=bombadil.infradead.org) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lt9Z8-0005e9-O0 for lore@pengutronix.de; Tue, 15 Jun 2021 15:57:19 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=O92Ry9191wqZoBQjmTGj700UumnQoGOIQBBLau3Cl0A=; b=pJe79g4P3+qKlN AchAbObUeOfNCr6RG/VoluWwjgKPdTbn/ZOItIDJV4D2zUBt+JjvMyk62c4WSpC6955eb1VqxKk12 rukNjcSz/SrPMjSXSrpP7twGAQlQqZEoXuMy9DRjvK1BdIckdIz395GmELpmyuQ/mdrE9JkDZcgvz z41KB1oyRIorpGWkKz7xtNAymXgLYL5iytPYx7MH7Dsfq4YLqFeaYf0XIhBR77oE5PcNd/Mk/DqYv 4AK13D361fBvhfTqwYsJuglsqMplM6LEKo2a7JLtOkH9CoO57l4yEey7Lor9kjVB9kVHaKMrr2njf +uzGyntcvWxHU03NIjDQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lt9Rt-000JYO-U7; Tue, 15 Jun 2021 13:49:50 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lt9Fm-000DEY-A7 for barebox@bombadil.infradead.org; Tue, 15 Jun 2021 13:37:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description; bh=k8CezaWo0qi6LC8094DmSJzreZfnYUeNXYzzOFEaqG0=; b=BS/M8SKZfa7gwxAq8400pI2qEY mSn/YXKlhwoAM0vc/DFjCp9fTFlx5o5+69CVoqU4NBjt/Va0XxoahJzcKk7yk+BZrVn6XNpz8XKn7 +FDBPsgcSMennlDIPwwIrAsevuZuGBxQjbSkXM2tPWcvRw5A6YfkbeE2o2nSKf03ygTQy6c6qHpJJ hdjLB04aziq5NPMM4C4gOCECSYfvA69oXzPpOAz3aPk5VsW3UQfNYOBCj5myT4w969c7Wag9ZZoCl 435xKRYJOmQwzcMqS9EHFizeqiSOQ3E7T9+pH9xb4EGIYoUJEC0fTmeq+ts2k1RgOiy9YvBsMm0zX ipGpx7Eg==; Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lt7Bs-007lvt-Cj for barebox@lists.infradead.org; Tue, 15 Jun 2021 11:25:18 +0000 Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lt7Bw-0003Zz-JP for barebox@lists.infradead.org; Tue, 15 Jun 2021 13:25:12 +0200 Received: from str by dude02.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1lt7Bv-00019c-Uq for barebox@lists.infradead.org; Tue, 15 Jun 2021 13:25:11 +0200 From: Steffen Trumtrar To: Barebox List Date: Tue, 15 Jun 2021 13:25:06 +0200 Message-Id: <20210615112508.5489-8-s.trumtrar@pengutronix.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210615112508.5489-1-s.trumtrar@pengutronix.de> References: <20210615112508.5489-1-s.trumtrar@pengutronix.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210615_122515_617086_E9270301 X-CRM114-Status: GOOD ( 15.95 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:7c80:54:e::133 (deferred) X-SA-Exim-Connect-IP: 2607:7c80:54:e::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=-4.3 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RDNS_NONE,SPF_HELO_NONE,SPF_NONE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v3 08/10] commands: firmwareload: allow loading firmware from dt 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) firmwareload can only load a bitstream into an FPGA without any knowledge of possible additional needs (e.g. FPGA bridges). These are defined in the fpga-region nodes in the devicetree. The fpga-region describes the layout of the FPGA and the bridges it needs en/disabled. Add an option to let firmwareload go via the oftree route and load the firmware that way. Signed-off-by: Steffen Trumtrar --- v2->v3 - remove unused arg 'o' - use xstrdup() --- commands/firmwareload.c | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/commands/firmwareload.c b/commands/firmwareload.c index b735088f6117..c2a017c45479 100644 --- a/commands/firmwareload.c +++ b/commands/firmwareload.c @@ -5,18 +5,35 @@ #include #include #include +#include static int do_firmwareload(int argc, char *argv[]) { - int ret, opt; + int opt; const char *name = NULL, *firmware; struct firmware_mgr *mgr; + char *path = NULL; + char *search_path = NULL; + char *compatible = NULL; + int oftree = 0; - while ((opt = getopt(argc, argv, "t:l")) > 0) { + while ((opt = getopt(argc, argv, "t:c:S:D:l")) > 0) { switch (opt) { case 't': name = optarg; break; + case 'c': + compatible = xstrdup(optarg); + oftree = 1; + break; + case 'S': + search_path = xstrdup(optarg); + oftree = 1; + break; + case 'D': + path = xstrdup(optarg); + oftree = 1; + break; case 'l': firmwaremgr_list_handlers(); return 0; @@ -25,11 +42,20 @@ static int do_firmwareload(int argc, char *argv[]) } } - if (!(argc - optind)) + if (!oftree && !(argc - optind)) return COMMAND_ERROR_USAGE; firmware = argv[optind]; + if (oftree) { + if (!search_path && !firmware) { + printf("Provide at least a file to load or a search path (-S)\n"); + return 1; + } + + return of_firmware_load_file(path, compatible, search_path, firmware); + } + mgr = firmwaremgr_find(name); if (!mgr) { @@ -38,14 +64,15 @@ static int do_firmwareload(int argc, char *argv[]) return 1; } - ret = firmwaremgr_load_file(mgr, firmware); - - return ret; + return firmwaremgr_load_file(mgr, firmware); } BAREBOX_CMD_HELP_START(firmwareload) BAREBOX_CMD_HELP_TEXT("Options:") BAREBOX_CMD_HELP_OPT("-t ", "define the firmware handler by name") +BAREBOX_CMD_HELP_OPT("-c ", "type of firmware device (e.g. 'fpga-region')") +BAREBOX_CMD_HELP_OPT("-D ", "load firmware to oftree path") +BAREBOX_CMD_HELP_OPT("-S ", "load firmware using this search path") BAREBOX_CMD_HELP_OPT("-l\t", "list devices capable of firmware loading") BAREBOX_CMD_HELP_END -- 2.29.2 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox