Skip to contentSkip to conversation

package/mfgtools: bump version to uuu_1.4.43

PATCH New Peter Seiderer 2 participants 3 messages Dec 1, 2020 – Dec 7, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/mfgtools: bump version to uuu_1.4.43

- 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

---
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
package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch deleted +0 -27
deleted file mode 100644
index 7d0d3974a2..0000000000
@@ -1,27 +0,0 @@
-From 1af7bc09451e0b779f7bfb0dcc58ffb3abe9c584 Mon Sep 17 00:00:00 2001
-From: Gary Bisson <[email protected]>
-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 <[email protected]>
----
- 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
-
package/mfgtools/Config.in.host +4 -4
index 6f2f3a3268..6cb968aa2f 100644
@@ -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
package/mfgtools/mfgtools.hash +2 -3
index 0b215f5295..f073e7e512 100644
@@ -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
package/mfgtools/mfgtools.mk +6 -26
index 48ce5dda28..63e7a1f5c0 100644
@@ -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))
package/mfgtools/readme.txt deleted +0 -69

69 lines not on this page · raw message

Signature · 1 line
2.29.2
#1 lore raw

PATCH 1/1 package/mfgtools: bump version to uuu_1.4.43

Hi Peter,

First, sorry for the delay, it's been a crazy week.

Quoted 11 lines · Peter Seiderer

- 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

Quoted 8 lines

---
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)?

Yes actually there's been a lot of discussion about that one already:
- First I did a patch similar as yours that was rejected not to remove the legacy mfgtools package [1]. The naming suggested was "imx-uuu"
- Then Jorg did offer some patches to add "imx-uuu" [2]
-> not sure why this one is marked as superseded?
-> all I remember is that the second patch of that series wasn't accepted as we agreed in [1] that mfgtools should stay as legacy as long as it builds basically.

So adding Jorg to this thread to figure out which is the best imx-uuu package. My only remark on Jorg package is that the Kconfig comment talks about UTP whereas UTP was for mfgtools (first of its name) whereas UUU only uses SDP to load binaries into RAM and then fastboot to flash.

Regards,
Gary

[1] http://patchwork.ozlabs.org/project/buildroot/patch/20190608105337.19879-1-bisson.gary at gmail.com/
[2] http://patchwork.ozlabs.org/project/buildroot/patch/20200109191020.1282319-1-joerg.krause at embedded.rocks/

#2 lore raw

PATCH 1/1 package/mfgtools: bump version to uuu_1.4.43

Hello Gary, J?rg,

Quoted 25 lines · Gary Bisson

Hi Peter,

First, sorry for the delay, it's been a crazy week.

Quoted 11 lines · Peter Seiderer

- 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

Quoted 8 lines

---
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)?

Quoted 8 lines

Yes actually there's been a lot of discussion about that one already:
- First I did a patch similar as yours that was rejected not to remove the legacy mfgtools package [1]. The naming suggested was "imx-uuu"
- Then Jorg did offer some patches to add "imx-uuu" [2]
-> not sure why this one is marked as superseded?
-> all I remember is that the second patch of that series wasn't accepted as we agreed in [1] that mfgtools should stay as legacy as long as it builds basically.

Sorry for missing the previous patches/discussion (and inventing the the same/similar patch set again ;-))...

Package name imx-uuu seems reasonable (despite the name of the git repository)...

Quoted 5 lines

So adding Jorg to this thread to figure out which is the best imx-uuu package. My only remark on Jorg package is that the Kconfig comment talks about UTP whereas UTP was for mfgtools (first of its name) whereas UUU only uses SDP to load binaries into RAM and then fastboot to flash.

Will try to re-spin a new patch set based on yours/J?rg work...

Regards,
Peter

Quoted 6 lines

Regards,
Gary

[1] http://patchwork.ozlabs.org/project/buildroot/patch/20190608105337.19879-1-bisson.gary at gmail.com/
[2] http://patchwork.ozlabs.org/project/buildroot/patch/20200109191020.1282319-1-joerg.krause at embedded.rocks/