From 51d6b308083b73d07d7d98ef9778bb9df8c99e22 Mon Sep 17 00:00:00 2001
From: Ricardo Salveti <ricardo@foundries.io>
Date: Mon, 27 May 2024 23:15:59 -0300
Subject: [PATCH] qdl: update to the latest upstream

Update to the latest upstream repository, which is now at
https://github.com/linux-msm/qdl.git.

Relevant changes from latest upstream:
- USBDEVFS interface replaced with libusb
- Add ramdump support
- New utility 'ks' which uses sahara to load images from host to a
  device (relevant for Qualcomm Cloud AI 100).

Drop 0001-Makefile-Use-pkg-config-for-libxml2-detection.patch as these
changes are now available upstream.

Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
---
 ...Use-pkg-config-for-libxml2-detection.patch | 35 -------------------
 recipes-devtools/qdl/qdl_git.bb               | 14 ++++----
 2 files changed, 6 insertions(+), 43 deletions(-)
 delete mode 100644 recipes-devtools/qdl/files/0001-Makefile-Use-pkg-config-for-libxml2-detection.patch

diff --git a/recipes-devtools/qdl/files/0001-Makefile-Use-pkg-config-for-libxml2-detection.patch b/recipes-devtools/qdl/files/0001-Makefile-Use-pkg-config-for-libxml2-detection.patch
deleted file mode 100644
index 2aca18118..000000000
--- a/recipes-devtools/qdl/files/0001-Makefile-Use-pkg-config-for-libxml2-detection.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d0ecd95e8935a9fe3e94921d10bfb153f5e0ce52 Mon Sep 17 00:00:00 2001
-From: Nicolas Dechesne <nicolas.dechesne@linaro.org>
-Date: Wed, 28 Aug 2019 17:54:50 +0200
-Subject: [PATCH] Makefile: Use pkg-config for libxml2 detection.
-
-xml2-config does not work. Use pkgconfig to set CPPFLAGS and LIBS.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -1,14 +1,14 @@
- OUT := qdl
- 
--CFLAGS := -O2 -Wall -g `xml2-config --cflags`
--LDFLAGS := `xml2-config --libs` -ludev
--prefix := /usr/local
-+CFLAGS += -O2 -Wall -g `pkg-config --cflags libxml-2.0`
-+LDFLAGS += `pkg-config --libs libxml-2.0` -ludev
-+prefix ?= /usr/local
- 
- SRCS := firehose.c qdl.c sahara.c util.c patch.c program.c ufs.c
- OBJS := $(SRCS:.c=.o)
- 
- $(OUT): $(OBJS)
--	$(CC) -o $@ $^ $(LDFLAGS)
-+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
- 
- clean:
- 	rm -f $(OUT) $(OBJS)
diff --git a/recipes-devtools/qdl/qdl_git.bb b/recipes-devtools/qdl/qdl_git.bb
index b053388f9..320911c60 100644
--- a/recipes-devtools/qdl/qdl_git.bb
+++ b/recipes-devtools/qdl/qdl_git.bb
@@ -1,20 +1,18 @@
 SUMMARY = "QDL flasing tool"
-HOMEPAGE = "https://github.com/andersson/qdl.git"
+HOMEPAGE = "https://github.com/linux-msm/qdl.git"
 SECTION = "devel"
 
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://qdl.c;beginline=1;endline=31;md5=1c7d712d897368d3d3c161e5493efc6a"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=da6bfde9cb5bc5120a51775381f6edf1"
 
-DEPENDS = "libxml2"
-DEPENDS:append:class-target = " udev "
+DEPENDS = "libxml2 libusb1"
 
 inherit pkgconfig
 
-SRCREV = "760b3dffb03d2b7dfb82c6eac652a092f51c572d"
-SRC_URI = "git://github.com/andersson/${BPN}.git;branch=master;protocol=https \
-           file://0001-Makefile-Use-pkg-config-for-libxml2-detection.patch"
+SRCREV = "aeb70e0645d6583b34b99c3025ebd2b8475d322b"
+SRC_URI = "git://github.com/linux-msm/${BPN}.git;branch=master;protocol=https"
 
-PV = "0.0+${SRCPV}"
+PV = "0.0+${SRCREV}"
 
 S = "${WORKDIR}/git"