Tweaks to enable version string format change

Minor updates to the amd_spi_image bbclass and bootbin version files to
support updated version strin format for Kria, SC and emb-plus

Also fix an issue with IMAGE_NAME_SUFFIX being set to ".rootfs" by
default

Signed-off-by: John Toomey <john.toomey@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

3 files changed, 18 insertions, 12 deletions

diff --git a/meta-xilinx-core/classes-recipe/amd_spi_image.bbclass b/meta-xilinx-core/classes-recipe/amd_spi_image.bbclass
index ed4c1f87..6dd18d76 100644
--- a/meta-xilinx-core/classes-recipe/amd_spi_image.bbclass
+++ b/meta-xilinx-core/classes-recipe/amd_spi_image.bbclass
@@ -5,6 +5,8 @@
 #
 
 QSPI_SIZE ?= "0x2280000"
+QSPI_VERSION ?= ""
+QSPI_IMAGE_VERSION ?= ""
 
 # Register values
 IDN_REG ?= "0x4D554241"
@@ -116,12 +118,8 @@ def generate_spi_image(d):
     qspi_data.write(imgrcry)
 
     # Version string and checksum
-    version = d.getVar("QSPI_IMAGE_VERSION")
-    date = time.strftime("%m%d%H%M")
-    machine = d.getVar("MACHINE")[:3]
-    image_name = d.getVar("QSPI_IMAGE_NAME")
-
-    qspi_version = f"{image_name}-{machine}-v{version}-{date}\x00"
+    version = d.getVar('QSPI_IMAGE_VERSION')
+    qspi_version = f"{version}\x00"
     qspi_data.seek(version_offset)
     qspi_data.write(qspi_version.encode())
 
diff --git a/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-header.bb b/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-header.bb
index 98eebc3e..f4a96f41 100644
--- a/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-header.bb
+++ b/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-header.bb
@@ -9,7 +9,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 BOOTBIN_VER_MAIN ?= ""
 
-BOOTBIN_VER_SUFFIX ?= "${@(d.getVar('XILINX_VER_BUILD') or '')[:8] if d.getVar('XILINX_VER_UPDATE') != 'release' and not d.getVar('XILINX_VER_UPDATE').startswith('update') else ''}"
 BOOTBIN_VER_FILE = "bootbin-version-header.txt"
 BOOTBIN_VER_MAX_LEN = "36"
 
@@ -17,12 +16,16 @@ BOOTBIN_MANIFEST_FILE ?= "bootbin-version-header.manifest"
 
 inherit deploy image-artifact-names
 
+IMAGE_NAME_SUFFIX = ""
+
 python do_configure() {
-    if d.getVar("BOOTBIN_VER_SUFFIX"):
-        version = version + "-" + d.getVar("BOOTBIN_VER_SUFFIX")
+
+    if not 'version' in locals():
+        version = d.getVar("MACHINE") + "-v" + d.getVar("BOOTBIN_VER_MAIN")
+    version += d.getVar("IMAGE_VERSION_SUFFIX")
 
     if len(version) > int(d.getVar("BOOTBIN_VER_MAX_LEN")):
-        bb.error("version string too long")
+        bb.fatal("version string too long")
 
     with open(d.expand("${B}/${BOOTBIN_VER_FILE}"), "w") as f:
         f.write(version.encode("utf-8").hex())
diff --git a/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-string.bb b/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-string.bb
index af30a17d..765d35e8 100644
--- a/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-string.bb
+++ b/meta-xilinx-core/recipes-bsp/bootbin/bootbin-version-string.bb
@@ -15,9 +15,14 @@ BOOTBIN_VER_FILE = "bootbin-version-string.txt"
 
 inherit deploy image-artifact-names
 
+IMAGE_NAME_SUFFIX = ""
+
 python do_configure() {
-    if d.getVar("BOOTBIN_VER_SUFFIX"):
-        version = version + "-" + d.getVar("BOOTBIN_VER_SUFFIX")
+
+    if not 'version' in locals():
+        version = d.getVar("MACHINE") + "-v" + d.getVar("BOOTBIN_VER_MAIN")
+    version += d.getVar("IMAGE_VERSION_SUFFIX")
+
     with open(d.expand("${B}/${BOOTBIN_VER_FILE}"), "w") as f:
         f.write(version)
 }