From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 05 May 2023 10:28:18 +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 1puqnb-005gmy-NX for lore@lore.pengutronix.de; Fri, 05 May 2023 10:28:18 +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 1puqnZ-00009q-QF for lore@pengutronix.de; Fri, 05 May 2023 10:28:18 +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: Content-Type:In-Reply-To:From:References:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=WcV87g61P5fiU6E3JP2RDH5/PRXrgICq6vheB+ZIs/s=; b=yaJhjYGCDe7vxcax12QK2bJxTj MgPq4G1EcS8IWLl9ztAsTtmnQGIJRtegaMrTKQI/WPARXlR4oDNOipYYFPIkmAR27itW/VrPao8Kp z30DoSDV+E4fK0e+gasFPCXecJgscRjIEkgQ4WQwt7eBzycca33zaMKDWd7PK2UyQUSahOro4W3d+ ok526Z7upJqpe+aUTODvdOQksk55j8fgiJmOKHUdi9fLsnaYjRYrNt46sdACRsaDFPVkuAuXEm9a5 +iR/hfkTBnluhpeJfSjwO3T2qLs7mb90UrjAT8BjepkOPT5fdbDherXRcGGQFuMXKykMgL/AF9TIr ao0hwaXA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1puqmP-00A1Pv-1v; Fri, 05 May 2023 08:27:05 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1puqmC-00A1Ov-1g for barebox@lists.infradead.org; Fri, 05 May 2023 08:26:54 +0000 Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=[127.0.0.1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1puqmB-0008Ve-1v for barebox@lists.infradead.org; Fri, 05 May 2023 10:26:51 +0200 Message-ID: Date: Fri, 5 May 2023 10:26:50 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Content-Language: en-US, de-DE To: barebox@lists.infradead.org References: <20230505075308.1015157-1-j.zink@pengutronix.de> <20230505075308.1015157-4-j.zink@pengutronix.de> <68c294c2-e2e2-b305-acf8-5ecd14b82991@pengutronix.de> From: Johannes Zink In-Reply-To: <68c294c2-e2e2-b305-acf8-5ecd14b82991@pengutronix.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230505_012652_603286_256876AA X-CRM114-Status: GOOD ( 26.91 ) 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=-7.0 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH v1 3/3] imx-usb-loader: add commandline option for displaying version number 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) Hi Ahmad, thanks for reviewing this series. On 5/5/23 10:02, Ahmad Fatoum wrote: > On 05.05.23 09:53, Johannes Zink wrote: >> For debugging purposes of the imx-usb-loader it can be helpful to >> display the version number as a commandline option. > > This breaks builds outside of Kbuild, which is the only way to build a > (currently non-functional) imx-usb-loader for Windows. See > > https://lore.barebox.org/barebox/20230411093844.1297004-1-a.fatoum@pengutronix.de/ > I see, I was not aware that there are users of an out-of-Kbuild build. > What you may be able to do instead is -include $(objtree)/include/generated/utsrelease.h > > and then have an > > #ifndef UTS_RELEASE > #define UTS_RELEASE "external" // or something > #endif > > at the start of the file? > sounds good to me, gonna add this to v2. Out of interest: does the outside-of-kBuild use a custom makefile? Otherwise -include would probably complain that the file is unknown... > (Not sure how long GCC has had support for __has_include) I'd prefer not to use __has_include, as this might not be supported with redmondish toolchains, introducing an issue to fix another does not seem too appealing to me ;-) Johannes > > Cheers, > Ahmad > >> >> Signed-off-by: Johannes Zink >> --- >> scripts/imx/Makefile | 2 +- >> scripts/imx/imx-usb-loader.c | 21 ++++++++++++++++++++- >> 2 files changed, 21 insertions(+), 2 deletions(-) >> >> diff --git a/scripts/imx/Makefile b/scripts/imx/Makefile >> index dbfa82910a55..43584427d27d 100644 >> --- a/scripts/imx/Makefile >> +++ b/scripts/imx/Makefile >> @@ -3,7 +3,7 @@ >> hostprogs-always-$(CONFIG_ARCH_IMX_IMXIMAGE) += imx-image >> hostprogs-always-$(CONFIG_ARCH_IMX_USBLOADER) += imx-usb-loader >> >> -HOSTCFLAGS_imx-usb-loader.o = `pkg-config --cflags libusb-1.0` >> +HOSTCFLAGS_imx-usb-loader.o = `pkg-config --cflags libusb-1.0` -I$(objtree)/include/generated >> HOSTLDLIBS_imx-usb-loader = `pkg-config --libs libusb-1.0` >> >> imx-usb-loader-target-userccflags += `$(CROSS_PKG_CONFIG) --cflags libusb-1.0` >> diff --git a/scripts/imx/imx-usb-loader.c b/scripts/imx/imx-usb-loader.c >> index e49c0bea6ca4..d4f876bb1c99 100644 >> --- a/scripts/imx/imx-usb-loader.c >> +++ b/scripts/imx/imx-usb-loader.c >> @@ -32,6 +32,7 @@ >> #include >> #include >> #include >> +#include >> >> #include "../common.h" >> #include "../compiler.h" >> @@ -1526,9 +1527,17 @@ static void usage(const char *prgname) >> "-p Specify device path: -[.]...\n" >> "-s skip DCD included in image\n" >> "-v verbose (give multiple times to increase)\n" >> + "--version display version number\n" >> "-h this help\n", prgname); >> } >> >> +static void version(const char *prgname) >> +{ >> + fprintf(stderr, "%s %s\n", >> + prgname, UTS_RELEASE); >> + exit(EXIT_SUCCESS); >> +} >> + >> int main(int argc, char *argv[]) >> { >> libusb_device **devs; >> @@ -1544,10 +1553,20 @@ int main(int argc, char *argv[]) >> char *initfile = NULL; >> char *devpath = NULL; >> char *devtype = NULL; >> + int opt_version = 0; >> + struct option long_options[] = { >> + {"version", no_argument, &opt_version, 1}, >> + { } >> + }; >> >> w.do_dcd_once = 1; >> >> - while ((opt = getopt(argc, argv, "cvhd:i:p:s")) != -1) { >> + while ((opt = getopt_long(argc, argv, "cvhd:i:p:s", long_options, NULL)) != -1) { >> + if (opt_version) { >> + version(argv[0]); >> + exit(EXIT_SUCCESS); >> + } >> + >> switch (opt) { >> case 'c': >> verify = 1; > -- Pengutronix e.K. | Johannes Zink | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686| Fax: +49-5121-206917-5555 |