From e43b2038ebe7157d62bd270890f9dd81abaace3b Mon Sep 17 00:00:00 2001
From: Benjamin Fair <benjaminfair@google.com>
Date: Mon, 16 Sep 2019 11:32:43 -0700
Subject: meta-nuvoton: images: fixup bingo and bootblock recipes

Add version information and descriptions to the two recipe files.

(From meta-nuvoton rev: b5087ace68e81084e16075e76659ca5a6f553994)

Change-Id: I52db4fc4193999b01a4a17e78d9060ef93eab944
Signed-off-by: Benjamin Fair <benjaminfair@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 .../recipes-bsp/images/npcm7xx-bingo-native.bb     | 20 -----------------
 .../recipes-bsp/images/npcm7xx-bingo-native_git.bb | 25 ++++++++++++++++++++++
 .../recipes-bsp/images/npcm7xx-bootblock.bb        | 19 ----------------
 .../images/npcm7xx-bootblock_10.09.05.bb           | 22 +++++++++++++++++++
 4 files changed, 47 insertions(+), 39 deletions(-)
 delete mode 100644 meta-nuvoton/recipes-bsp/images/npcm7xx-bingo-native.bb
 create mode 100644 meta-nuvoton/recipes-bsp/images/npcm7xx-bingo-native_git.bb
 delete mode 100644 meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock.bb
 create mode 100644 meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock_10.09.05.bb

diff --git a/meta-nuvoton/recipes-bsp/images/npcm7xx-bingo-native.bb b/meta-nuvoton/recipes-bsp/images/npcm7xx-bingo-native.bb
deleted file mode 100644
index 1ce19433c..000000000
--- a/meta-nuvoton/recipes-bsp/images/npcm7xx-bingo-native.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-SRC_URI += "git://github.com/Nuvoton-Israel/bingo"
-SRC_URI += "file://BootBlockAndHeader_EB.xml"
-SRC_URI += "file://UbootHeader_EB.xml"
-SRC_URI += "file://mergedBootBlockAndUboot.xml"
-
-SRCREV = "4f102ff7851da9fd11965857edd1b3046c187b7a"
-
-S = "${WORKDIR}/git"
-
-do_install () {
-
-	install -d "${D}${bindir}"
-	install deliverables/linux/Release/bingo ${D}${bindir}
-	install ${WORKDIR}/*.xml ${D}${bindir}
-}
-
-inherit native
diff --git a/meta-nuvoton/recipes-bsp/images/npcm7xx-bingo-native_git.bb b/meta-nuvoton/recipes-bsp/images/npcm7xx-bingo-native_git.bb
new file mode 100644
index 000000000..5ab1fc942
--- /dev/null
+++ b/meta-nuvoton/recipes-bsp/images/npcm7xx-bingo-native_git.bb
@@ -0,0 +1,25 @@
+SUMMARY = "XML-based binary image generator"
+DESCRIPTION = "XML-based binary image generator"
+HOMEPAGE = "https://github.com/Nuvoton-Israel/bingo"
+PR = "r1"
+PV = "0.1+git${SRCPV}"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+SRC_URI += "git://github.com/Nuvoton-Israel/bingo"
+SRC_URI += "file://BootBlockAndHeader_EB.xml"
+SRC_URI += "file://UbootHeader_EB.xml"
+SRC_URI += "file://mergedBootBlockAndUboot.xml"
+
+SRCREV = "4f102ff7851da9fd11965857edd1b3046c187b7a"
+
+S = "${WORKDIR}/git"
+
+do_install () {
+
+	install -d "${D}${bindir}"
+	install deliverables/linux/Release/bingo ${D}${bindir}
+	install ${WORKDIR}/*.xml ${D}${bindir}
+}
+
+inherit native
diff --git a/meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock.bb b/meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock.bb
deleted file mode 100644
index 85b80708d..000000000
--- a/meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-LICENSE = "CLOSED"
-LIC_FILES_CHKSUM = ""
-
-SRCREV = "10.09.05"
-FILENAME = "Poleg_bootblock.bin"
-
-SRC_URI = "git://github.com/Nuvoton-Israel/npcm7xx-bootblock;protocol=git"
-SRC_URI[md5sum] = "cf8daa5f4636ed1ff952618e435af028"
-
-S = "${WORKDIR}/git"
-
-inherit deploy
-
-do_deploy () {
-	install -d ${DEPLOYDIR}
-	install -m 644 ${FILENAME} ${DEPLOYDIR}/
-}
-
-addtask deploy before do_build after do_compile
diff --git a/meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock_10.09.05.bb b/meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock_10.09.05.bb
new file mode 100644
index 000000000..7c847f2ed
--- /dev/null
+++ b/meta-nuvoton/recipes-bsp/images/npcm7xx-bootblock_10.09.05.bb
@@ -0,0 +1,22 @@
+SUMMARY = "Primary bootloader for NPCM7XX (Poleg) devices"
+DESCRIPTION = "Primary bootloader for NPCM7XX (Poleg) devices"
+HOMEPAGE = "https://github.com/Nuvoton-Israel/npcm7xx-bootblock"
+LICENSE = "CLOSED"
+LIC_FILES_CHKSUM = ""
+
+SRCREV = "${PV}"
+FILENAME = "Poleg_bootblock.bin"
+
+SRC_URI = "git://github.com/Nuvoton-Israel/npcm7xx-bootblock;protocol=git"
+SRC_URI[md5sum] = "cf8daa5f4636ed1ff952618e435af028"
+
+S = "${WORKDIR}/git"
+
+inherit deploy
+
+do_deploy () {
+	install -d ${DEPLOYDIR}
+	install -m 644 ${FILENAME} ${DEPLOYDIR}/
+}
+
+addtask deploy before do_build after do_compile
-- 
cgit v1.2.3