Skip to contentSkip to conversation

boot/lpc32xxcdl: switch upstream location

PATCH New Yann E. MORIN 2 participants 3 messages Dec 29, 2020 – Jan 4, 2021 Arm/LPC32XX SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 boot/lpc32xxcdl: switch upstream location

The upstream git tree has disapeared, but a ZIP file is still hosted somewhere at NXP,. The content of that zip file has been verified to be 100% identical to the tarball we hosted on s.b.o.

As this is a zip file, we can't use the generic extract commands, and must come up with our own. As such, it no longer makes sense to fix the CRLF as a post-extract hook; this is moved to the extract command.

Add a hash file while at it.

---
 boot/lpc32xxcdl/lpc32xxcdl.hash |  2 ++
 boot/lpc32xxcdl/lpc32xxcdl.mk   | 13 +++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 boot/lpc32xxcdl/lpc32xxcdl.hash
boot/lpc32xxcdl/lpc32xxcdl.hash new file +2 -0
new file mode 100644
index 0000000000..8c6b73d63f
@@ -0,0 +1,2 @@
+# Locally computed
+sha256  ded3fa936a96d3fb8188ca6214f57b5208bd49e5416bd69f38bfc810b34197bc  lpc32xx_cdl-v2.11.zip
boot/lpc32xxcdl/lpc32xxcdl.mk +7 -6
index 30afed050b..9f5cd27f50 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LPC32XXCDL_VERSION = lpc32xx_cdl_v2.11
-LPC32XXCDL_SITE = http://git.lpcware.com/lpc3xxx_cdl.git
-LPC32XXCDL_SITE_METHOD = git
+LPC32XXCDL_VERSION = 2.11
+LPC32XXCDL_SOURCE = lpc32xx_cdl-v$(LPC32XXCDL_VERSION).zip
+LPC32XXCDL_SITE = https://community.nxp.com/pwmxy87654/attachments/pwmxy87654/lpcware-archive/61/2
 
 LPC32XXCDL_INSTALL_TARGET = NO
 LPC32XXCDL_INSTALL_IMAGES = YES
@@ -45,13 +45,14 @@ LPC32XXCDL_BOARD_STARTUP_DIR = \
 # Source files are with dos newlines, which our patch infrastructure doesn't
 # handle. Work around it by converting the affected files to unix newlines
 # before patching
-define LPC32XXCDL_DOS2UNIX_FOR_PATCH
+define LPC32XXCDL_EXTRACT_CMDS
+	unzip $(LPC32XXCDL_DL_DIR)/$(LPC32XXCDL_SOURCE) -d $(@D)
+	mv $(@D)/lpc3xxx_cdl/* $(@D)
+	rmdir $(@D)/lpc3xxx_cdl/
 	sed -n 's|^[+-]\{3\} [^/]\+\([^ \t]*\)\(.*\)|$(@D)\1|p' \
 		boot/lpc32xxcdl/*.patch| sort -u | xargs $(SED) 's/\x0D$$//'
 endef
 
-LPC32XXCDL_POST_EXTRACT_HOOKS += LPC32XXCDL_DOS2UNIX_FOR_PATCH
-
 define LPC32XXCDL_BUILD_CMDS
 	$(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)
 	$(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_KICKSTART_BURNER)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 boot/lpc32xxcdl: switch upstream location

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

The upstream git tree has disapeared, but a ZIP file is still hosted somewhere at NXP,. The content of that zip file has been verified to be 100% identical to the tarball we hosted on s.b.o.

Quoted 7 lines

As this is a zip file, we can't use the generic extract commands, and must come up with our own. As such, it no longer makes sense to fix the CRLF as a post-extract hook; this is moved to the extract command.

Add a hash file while at it.

Maybe we should just get rid of it? It is not referenced by any of our defconfigs.

In the mean time,

Committed to 2020.02.x and 2020.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 boot/lpc32xxcdl: switch upstream location

Peter, All,

On 2021-01-04 17:58 +0100, Peter Korsgaard spake thusly:

Quoted 4 lines
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

The upstream git tree has disapeared, but a ZIP file is still hosted somewhere at NXP,. The content of that zip file has been verified to be 100% identical to the tarball we hosted on s.b.o.

[--SNIP--]

Quoted 2 lines

Maybe we should just get rid of it? It is not referenced by any of our defconfigs.

Might as well drop it, if the lpc32xx stuff is indeed no longer useful.

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'