For debugging purposes of the imx-usb-loader it can be helpful to
display the version number as a commandline option.

Signed-off-by: Johannes Zink <j.z...@pengutronix.de>
---
 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 <libusb.h>
 #include <getopt.h>
 #include <linux/kernel.h>
+#include <utsrelease.h>
 
 #include "../common.h"
 #include "../compiler.h"
@@ -1526,9 +1527,17 @@ static void usage(const char *prgname)
                "-p <devpath> Specify device path: <bus>-<port>[.<port>]...\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;
-- 
2.39.2


Reply via email to