From e89318bdd6502182eab49730da57e7f8224ac3dc Mon Sep 17 00:00:00 2001
From: Lionel VITTE <lionel.vitte@st.com>
Date: Mon, 15 Nov 2021 10:53:15 +0100
Subject: [PATCH] STM32WRAPPER4DBG: rework recipes to use only one

Change-Id: I902877afcb384a721ee7db0c2b18503827c51f68
Signed-off-by: Romuald JEANNE <romuald.jeanne@st.com>
---
 .../nativesdk-stm32wrapper4dbg_1.0.0.bb          |  6 ------
 .../stm32wrapper4dbg-native_1.0.0.bb             |  6 ------
 .../stm32wrapper4dbg/stm32wrapper4dbg_1.0.0.bb   | 16 ++++++++++++++--
 .../stm32wrapper4dbg/stm32wrapper4dbg_1.0.0.inc  | 15 ---------------
 4 files changed, 14 insertions(+), 29 deletions(-)
 delete mode 100644 recipes-devtools/stm32wrapper4dbg/nativesdk-stm32wrapper4dbg_1.0.0.bb
 delete mode 100644 recipes-devtools/stm32wrapper4dbg/stm32wrapper4dbg-native_1.0.0.bb
 delete mode 100644 recipes-devtools/stm32wrapper4dbg/stm32wrapper4dbg_1.0.0.inc

diff --git a/recipes-devtools/stm32wrapper4dbg/nativesdk-stm32wrapper4dbg_1.0.0.bb b/recipes-devtools/stm32wrapper4dbg/nativesdk-stm32wrapper4dbg_1.0.0.bb
deleted file mode 100644
index dc6e8ec..0000000
--- a/recipes-devtools/stm32wrapper4dbg/nativesdk-stm32wrapper4dbg_1.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SUMMARY = "Wrapper for FSBL to debug TF-A U-Boot and bare metal on MP1"
-LICENSE = "GPLv2+ | BSD-3-Clause"
-
-require stm32wrapper4dbg_${PV}.inc
-
-inherit nativesdk
diff --git a/recipes-devtools/stm32wrapper4dbg/stm32wrapper4dbg-native_1.0.0.bb b/recipes-devtools/stm32wrapper4dbg/stm32wrapper4dbg-native_1.0.0.bb
deleted file mode 100644
index d5c87a0..0000000
--- a/recipes-devtools/stm32wrapper4dbg/stm32wrapper4dbg-native_1.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-SUMMARY = "Wrapper for FSBL to debug TF-A U-Boot and bare metal on MP1"
-LICENSE = "GPLv2+ | BSD-3-Clause"
-
-require stm32wrapper4dbg_${PV}.inc
-
-inherit native
diff --git a/recipes-devtools/stm32wrapper4dbg/stm32wrapper4dbg_1.0.0.bb b/recipes-devtools/stm32wrapper4dbg/stm32wrapper4dbg_1.0.0.bb
index 1fa3fe0..3f1e954 100644
--- a/recipes-devtools/stm32wrapper4dbg/stm32wrapper4dbg_1.0.0.bb
+++ b/recipes-devtools/stm32wrapper4dbg/stm32wrapper4dbg_1.0.0.bb
@@ -1,4 +1,16 @@
-SUMMARY = "Wrapper for FSBL to debug TF-A U-Boot and bare metal on MP1"
+SUMMARY = "Wrapper for FSBL to debug TF-A U-Boot and bare metal on STM32MP1"
+SECTION = "devel"
 LICENSE = "GPLv2+ | BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=7c996e24cb10a869efb08b521b20242f"
 
-require stm32wrapper4dbg_${PV}.inc
+SRC_URI = "git://github.com/STMicroelectronics/stm32wrapper4dbg;protocol=https;branch=master"
+SRCREV = "3ee9fa433bd9ee5f167ec969c91e00a55bb06c4b"
+
+S = "${WORKDIR}/git"
+
+BBCLASSEXTEND += "native nativesdk"
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 0755 ${S}/stm32wrapper4dbg -t ${D}${bindir}
+}
diff --git a/recipes-devtools/stm32wrapper4dbg/stm32wrapper4dbg_1.0.0.inc b/recipes-devtools/stm32wrapper4dbg/stm32wrapper4dbg_1.0.0.inc
deleted file mode 100644
index c5a90da..0000000
--- a/recipes-devtools/stm32wrapper4dbg/stm32wrapper4dbg_1.0.0.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SUMMARY = "Wrapper for FSBL to debug TF-A U-Boot and bare metal on STM32MP1"
-LICENSE = "GPLv2+ | BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=7c996e24cb10a869efb08b521b20242f"
-
-SRC_URI = "git://github.com/STMicroelectronics/stm32wrapper4dbg;protocol=https;branch=master"
-SRCREV = "3ee9fa433bd9ee5f167ec969c91e00a55bb06c4b"
-
-S = "${WORKDIR}/git"
-
-SECTION = "devel"
-
-do_install() {
-    install -d ${D}${bindir}
-    install -m 0755 ${S}/stm32wrapper4dbg -t ${D}${bindir}
-}