From patchwork Tue Dec 1 20:31:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1409053 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=avF480yS; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CltzX4LDCz9sSs for ; Wed, 2 Dec 2020 07:31:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C4C9A87662; Tue, 1 Dec 2020 20:31:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bcSiZ4DYLuYv; Tue, 1 Dec 2020 20:31:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 59FBA87620; Tue, 1 Dec 2020 20:31:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4EEAD1BF47F for ; Tue, 1 Dec 2020 20:31:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4AD2587FE5 for ; Tue, 1 Dec 2020 20:31:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wp743ho43PMe for ; Tue, 1 Dec 2020 20:31:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by whitealder.osuosl.org (Postfix) with ESMTPS id E5A3F87E64 for ; Tue, 1 Dec 2020 20:31:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1606854663; bh=8K5MjaoYgqnOHJSd7QQn+HZq2YYtK90V79WO1Aw1Oig=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=avF480ySeYMHoR8qeDG3H/cjDUFEzoIO+cl9qAoAh5LuwRchvf71Uf4PSNMdirfn6 oCCiX5vktHRvfvsf5yZEdd29xAcs9NRw5KvWttkyEAKHgFQevJQsJCifrl0D0WRFky 7apWHkAlV8c0bakr1ldVGHK7Y957C9H8jh3mVTxw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.208.120]) by mail.gmx.com (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N7zFj-1k6F8u14Wh-0150sS; Tue, 01 Dec 2020 21:31:03 +0100 From: Peter Seiderer To: buildroot@busybox.net Date: Tue, 1 Dec 2020 21:31:02 +0100 Message-Id: <20201201203102.29535-1-ps.report@gmx.net> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:Eemrs45G3BYvuCcdLXE0Z6F1Ec7mTFfh7chJQ3pWTJxrWKICoVK 40eONDL4DUdi1kMSI5eVOc2HjL0aOCAQKpswdt7bXYp7I8ku6ckT2BQf8nq+OVy4/oroy8F PCVxw47D2KvJhTqiYPVlspm+XFCGhQHlCQcLTpD0NfEVclDT9mkaeJrjqQaU0rulhS2zxD+ x6BrfaVPpOOob4fsHI4GA== X-UI-Out-Filterresults: notjunk:1;V03:K0:DharVJJnovE=:i3oq4qt0jZQMrOVLxeJvll ts70YU88CwxhVp0191lpYX+QZeJKQfiU//UyXfoxJhcwwxUF/ZsrnUYoxHss5h3DYWu/sn94P fkAJaatR/DcePjs2TXziQfO59grcRJNErDl7EMGIViH10p0D6qb0UoPX/OkKEiiTnbRYokeW0 X0sTsRqOzoS6EVEjsE4Db4WemP+37HxGiXzlB1ppA8M8OC/H7wy9Snvd5SM6Z8fCdtj9lW421 um8m+pZ/l8DmF9CyaYNGaFMUR7kcSRWezLKkI0h2S6bXn0VtNbmUNTS/50ScwgJc35wz9O1Zy Oi80JgkMS9FUGlKaPKaJdqTbGOg4e12jpl00YKsWsC93zn0q1HXCh3eNc4xQUekKET4tqZFt9 xaMOw03NaidNLOmaL4+zXml6sVkUfQBH5HGDVqJtrwZqa0HLW3jzkeI5VIgD3nncNreAE+AmJ uQoHFmQW3DtH9B9JpGb/Kr6TawtGPdPz8kwFwIuHziwQX0kqtdRA+yPdYviJb/RNITQkTkIsV IQhqbYwgGEKRTwCPNNLxylhEf9g89nL5+V73AiZsT+R4XHdznzp4J7d3VbmaUiH/LaY811kiy kkrRZ0GSDQcwYRDI4TUn0OTzKqgK9pxItkzAVdum9ynSIdH8Qv7OlN0MxMDJo4SEzYi5whKSu MQoLT5smtelkxbAl5MGaryiBKJi0pJragV/Y+J2GwFWF4uMaINqaIQcs1zGwPYSnVgOIzgDFF x0WHuJ6wq8wmTaZzcwbAxNl4JYFoN7tViPl60Oku14um7jTBQe7eon7QXay7r3sGzatO5qBcN yOS/z8GIEROIvyIlTgI7LDsw52yX3xT35DAqGq7Xl/Es8qXCVl8pQ048rvfrAkrH4BAQBRCe9 B6g2yz1eu+xnRXvxRiGg== Subject: [Buildroot] [PATCH/next v1] package/mfgtools: bump version to uuu_1.4.43 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - remove dependency on BR2_arm - update Config.in.host help text (mention NXP, mention uuu) - change upstream URL to https://github.com/NXPmicro/mfgtools (as https://github.com/codeauroraforum/mfgtools redirects to it) - remove legacy patch 0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch - remove legacy readme.txt - update licence and LICENSE hash - remove legacy README.txt license hash - use upload tar.gz archive - add new dependencies: host-pkgconf host-bzip2 host-libzip Signed-off-by: Peter Seiderer --- Notes: - @Gary Bisson: as it seems a complete rewrite of the tool (compared to the old mfgtoolcli) and you provided an fix for the old one lately: does it make sense to update/overwrite the mfgtools package or should I provide the uuu tool as a new package (any naming suggestions)? --- ...onflicting-declaration-of-__time64_t.patch | 27 -------- package/mfgtools/Config.in.host | 8 +-- package/mfgtools/mfgtools.hash | 5 +- package/mfgtools/mfgtools.mk | 32 ++------- package/mfgtools/readme.txt | 69 ------------------- 5 files changed, 12 insertions(+), 129 deletions(-) delete mode 100644 package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch delete mode 100644 package/mfgtools/readme.txt diff --git a/package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch b/package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch deleted file mode 100644 index 7d0d3974a2..0000000000 --- a/package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 1af7bc09451e0b779f7bfb0dcc58ffb3abe9c584 Mon Sep 17 00:00:00 2001 -From: Gary Bisson -Date: Tue, 11 Feb 2020 15:30:12 +0100 -Subject: [PATCH] lnx_def.h: fix conflicting declaration of __time64_t - -Signed-off-by: Gary Bisson ---- - MfgToolLib/lnx_def.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/MfgToolLib/lnx_def.h b/MfgToolLib/lnx_def.h -index c6869dd..a38bb99 100644 ---- a/MfgToolLib/lnx_def.h -+++ b/MfgToolLib/lnx_def.h -@@ -124,7 +124,9 @@ typedef unsigned long * ULONG_PTR; - typedef char * LPOLESTR; - typedef void * HDEVINFO; - typedef unsigned long long ULONGLONG; -+#ifndef __time64_t - typedef long long __time64_t; -+#endif - typedef long long __int64; - typedef unsigned long DWORD_PTR; - typedef unsigned int UINT; --- -2.25.0 - diff --git a/package/mfgtools/Config.in.host b/package/mfgtools/Config.in.host index 6f2f3a3268..6cb968aa2f 100644 --- a/package/mfgtools/Config.in.host +++ b/package/mfgtools/Config.in.host @@ -1,10 +1,10 @@ config BR2_PACKAGE_HOST_MFGTOOLS bool "host mfgtools" - depends on BR2_arm help - This package contains the Freescale manufacturing tool. + This package contains the Freescale/NXP I.MX Chip image + deploy tool (uuu), an evolution of MFGTools (aka MFGTools v3). It is designed to program firmware to i.MX boards during production. The communication is done over USB using the - Freescale UTP protocol. + Freescale/NXP UTP protocol. - https://github.com/codeauroraforum/mfgtools + https://github.com/NXPmicro/mfgtools diff --git a/package/mfgtools/mfgtools.hash b/package/mfgtools/mfgtools.hash index 0b215f5295..f073e7e512 100644 --- a/package/mfgtools/mfgtools.hash +++ b/package/mfgtools/mfgtools.hash @@ -1,4 +1,3 @@ # locally computed -sha256 055d71227d18883d6e8bc9e854c076015f9a7749820a94272e19071bf0b25c89 mfgtools-0.02.tar.gz -sha256 2655559a6bb1179eae514f5c7166f4ede4f2453efa9cf4dc3c045cab5d57dede LICENSE -sha256 0963b6e5086bf454265b0f57821a02b681d1211e40ad74c310231cb4d94815c9 README.txt +sha256 f31148c3ed42e5dde48d92a295fe716fd82f770ff5da51a900e55cbafe65b124 uuu_source-1.4.43.tar.gz +sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE diff --git a/package/mfgtools/mfgtools.mk b/package/mfgtools/mfgtools.mk index 48ce5dda28..63e7a1f5c0 100644 --- a/package/mfgtools/mfgtools.mk +++ b/package/mfgtools/mfgtools.mk @@ -4,31 +4,11 @@ # ################################################################################ -MFGTOOLS_VERSION = 0.02 -MFGTOOLS_SITE = $(call github,codeauroraforum,mfgtools,v$(MFGTOOLS_VERSION)) -MFGTOOLS_SUBDIR = MfgToolLib -MFGTOOLS_LICENSE = BSD-3-Clause or CPOL -MFGTOOLS_LICENSE_FILES = LICENSE README.txt -HOST_MFGTOOLS_DEPENDENCIES = host-libusb - -HOST_MFGTOOLS_CFLAGS = \ - $(HOST_CFLAGS) $(HOST_LDFLAGS) -std=c++11 -lpthread \ - -L$(@D)/MfgToolLib -lMfgToolLib -I$(@D)/MfgToolLib \ - -lusb-1.0 -I$(HOST_DIR)/include/libusb-1.0 \ - -fpermissive -Wno-write-strings - -define HOST_MFGTOOLS_CLI_BUILD - $(HOST_CONFIGURE_OPTS) $(MAKE) CC="$(HOSTCXX)" \ - CFLAGS="$(HOST_MFGTOOLS_CFLAGS)" -C $(@D)/TestPrgm -endef - -HOST_MFGTOOLS_POST_BUILD_HOOKS += HOST_MFGTOOLS_CLI_BUILD - -define HOST_MFGTOOLS_INSTALL_CMDS - $(INSTALL) -D -m 755 $(@D)/MfgToolLib/libMfgToolLib.so \ - $(HOST_DIR)/lib/libMfgToolLib.so - $(INSTALL) -D -m 755 $(@D)/TestPrgm/mfgtoolcli \ - $(HOST_DIR)/bin/mfgtoolcli -endef +MFGTOOLS_VERSION = 1.4.43 +MFGTOOLS_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(MFGTOOLS_VERSION) +MFGTOOLS_SOURCE = uuu_source-$(MFGTOOLS_VERSION).tar.gz +MFGTOOLS_LICENSE = BSD-3-Clause +MFGTOOLS_LICENSE_FILES = LICENSE +HOST_MFGTOOLS_DEPENDENCIES = host-pkgconf host-bzip2 host-libusb host-libzip $(eval $(host-cmake-package)) diff --git a/package/mfgtools/readme.txt b/package/mfgtools/readme.txt deleted file mode 100644 index 320e6ec493..0000000000 --- a/package/mfgtools/readme.txt +++ /dev/null @@ -1,69 +0,0 @@ -MfgTools Howto -============== - -1. Build your mfgtool image - -Make sure to enable the following Buildroot options: - -BR2_PACKAGE_FREESCALE_IMX=y -BR2_PACKAGE_IMX_UUC=y -BR2_TARGET_ROOTFS_CPIO=y -BR2_TARGET_ROOTFS_CPIO_GZIP=y -BR2_TARGET_ROOTFS_CPIO_UIMAGE=y - -Also modify your kernel configuration to have: - -CONFIG_USB_GADGET=y -CONFIG_USB_MASS_STORAGE=y -CONFIG_FSL_UTP=y -CONFIG_MMC_BLOCK_MINORS=16 - -2. Go into the output and create the necessary folders - -$ cd output -$ mkdir -p "Profiles/Linux/OS Firmware/firmware" - -3. Create your XML update script named ucl2.xml - -You can find a sample XML at: - -$ wget https://storage.googleapis.com/boundarydevices.com/ucl2.xml \ - -O Profiles/Linux/OS\ Firmware/ucl2.xml - -4. Copy the U-Boot, Kernel and initramfs images to the appropriate -folder - -$ cp images/u-boot.imx images/zImage images/imx6q-sabrelite.dtb \ - images/rootfs.cpio.uboot Profiles/Linux/OS\ Firmware/firmware/ - -5. Copy the prebuilt binaries to be flashed - -Depending on your ucl2.xml file, the sample doesn't flash anything. - -6. Run the MfgTools client: - -$ ./host/bin/mfgtoolcli -l mmc -s uboot_defconfig=imx \ - -s dtbname=imx6q-sabrelite.dtb -s initramfs=rootfs.cpio.uboot \ - -s mmc=1 -p 1 - -For more information about the tools options, please read the -"Manufacturing Tool V2 Quick Start Guide.docx" documentation contained -in every mfgtools package from NXP website[1]. - -Note: All the above commands require your Linux host user to have -permissions to access the USB devices. Please make sure to have udev -rules that allow the user to communicate with the BootROM IDs -(Freescale USB recovery) as well as the one used for the UTP Linux -image (0x066F:0x37FF). Using 'sudo' in front of the mfgtoolcli -command would also grant you the necessary permission but it is *not* -recommended. - -Also, if your U-Boot environment doesn't include mfgtools bootargs, -make sure to set the following: - -setenv bootargs "console=${console},${baudrate} g_mass_storage.stall=0 \ - g_mass_storage.removable=1 g_mass_storage.idVendor=0x066F \ - g_mass_storage.idProduct=0x37FF g_mass_storage.iSerialNumber=\"\" \ - g_mass_storage.file=/fat" - -[1] http://www.nxp.com/products/software-and-tools/software-development-tools/i.mx-software-and-tools/i.mx-6-series-software-and-development-tool-resources:IMX6_SW