From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 26 May 2023 09:13:44 +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 1q2Rdx-00EkIh-Me for lore@lore.pengutronix.de; Fri, 26 May 2023 09:13:44 +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 1q2Rdu-0003Rq-Gx for lore@pengutronix.de; Fri, 26 May 2023 09:13:43 +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=a8KW3S698qBtSr3m8PSXF42FM/tL6zPICsnlABEwIVw=; b=Jq/J0bKMsoQ/1QbTPKLSL5MXBl 2giLZAjeqDslWkUPMHYaXvhQRihswwIIw1gXj2afeP+m6KcfzfJHeVV60BNnt0wavqZaFksazwQLh 6pK6B/ezfSIM50xbHCdFG1JuQzBK8R5X5i9uwNxH5PdpbBmE15v4fu8bqqZSU2yoV3rr7FgcXK/5k K6xFetGA3Lh1e7dtWh67LTaxs14i6woyJRlR3YiAIRPp3JuFi1JFOAeFFGWgVqET0tYkDSjSRMqxA SQNRPjcYR+Lf1k1roz95RIygMel3E6lY+Ly8rUmNYuEcYygT4ysSdNSGMWWUApivnoN7gqtni85nv Ob3yuq/g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q2Rct-001NFT-1j; Fri, 26 May 2023 07:12:39 +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 1q2Rcq-001NEa-2K for barebox@lists.infradead.org; Fri, 26 May 2023 07:12:38 +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 1q2Rcp-0003Js-E0; Fri, 26 May 2023 09:12:35 +0200 Message-ID: <1aab4d10-8e25-1415-b369-08da71f28dec@pengutronix.de> Date: Fri, 26 May 2023 09:12:32 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Content-Language: en-US, de-DE To: Ahmad Fatoum , Ahmad Fatoum , barebox@lists.infradead.org References: <20230525181320.2277320-1-ahmad@a3f.at> <02a3ba13-fad1-985c-e0f4-0185d5c349c7@pengutronix.de> From: Johannes Zink In-Reply-To: <02a3ba13-fad1-985c-e0f4-0185d5c349c7@pengutronix.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230526_001236_757793_8082D630 X-CRM114-Status: GOOD ( 24.36 ) 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=-4.9 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 master 1/4] Revert "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, On 5/26/23 08:20, Ahmad Fatoum wrote: [snip] > > Agreed. I am looking forward to a v2 that doesn't break the build. ;) > ack - just sent out a fixup. >> Do you know of a flag that is set when the files have been generated? >> Maybe we can include the file conditionally if and only if it has been generated. > > That would mean we accept that the race condition is there and that depending on > timing/parallelism, we either end up with a version or unknown... > ack >> Do you think that alternatively we can require the prepare make target as a dependency for scripts/imx? > > AFAICS, scripts/Makefile is called recursively, so it may not be feasible to depend on > top-level Makefile's prepare for a target defined within. If everything needed for > Kconfig is part of another target (e.g. config or scripts_basic), then maybe scripts > could be made to depend on prepare. A worthwhile alternative may be moving stuff not > needed for the build, like all USB loaders, into a tools/ directory, but then one > needs to take care of dependencies on files in scripts/. > I had another thought - just using the Version variables from the top level makefile is much easier and also does the trick. Johannes > Cheers, > Ahmad > >> >> Johannes >> >>> Until this is resolved, revert commit c1b50061f4b33482ae749f9d6d6c92aa5bf6b37a. >>> >>> Cc: Johannes Zink >>> Signed-off-by: Ahmad Fatoum >>> --- >>>   scripts/imx/Makefile         |  2 +- >>>   scripts/imx/imx-usb-loader.c | 22 +--------------------- >>>   2 files changed, 2 insertions(+), 22 deletions(-) >>> >>> diff --git a/scripts/imx/Makefile b/scripts/imx/Makefile >>> index b3be3886d8eb..dbfa82910a55 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` -include $(objtree)/include/generated/utsrelease.h >>> +HOSTCFLAGS_imx-usb-loader.o = `pkg-config --cflags libusb-1.0` >>>   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 676f077c2557..839288f753cc 100644 >>> --- a/scripts/imx/imx-usb-loader.c >>> +++ b/scripts/imx/imx-usb-loader.c >>> @@ -46,10 +46,6 @@ >>>   #define FT_DCD    0xee >>>   #define FT_LOAD_ONLY    0x00 >>>   -#ifndef UTS_RELEASE >>> -#define UTS_RELEASE "unknown" >>> -#endif >>> - >>>   /* >>>    * comment from libusb: >>>    * As per the USB 3.0 specs, the current maximum limit for the depth is 7. >>> @@ -1530,15 +1526,9 @@ 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); >>> -} >>> - >>>   int main(int argc, char *argv[]) >>>   { >>>       libusb_device **devs; >>> @@ -1554,20 +1544,10 @@ 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_long(argc, argv, "cvhd:i:p:s", long_options, NULL)) != -1) { >>> -        if (opt_version) { >>> -            version(argv[0]); >>> -            exit(EXIT_SUCCESS); >>> -        } >>> - >>> +    while ((opt = getopt(argc, argv, "cvhd:i:p:s")) != -1) { >>>           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 |