1 files changed, 9 insertions, 4 deletions

diff --git a/meta-xilinx-standalone/conf/layer.conf b/meta-xilinx-standalone/conf/layer.conf
index 84d83673..ef4a919e 100644
--- a/meta-xilinx-standalone/conf/layer.conf
+++ b/meta-xilinx-standalone/conf/layer.conf
@@ -17,7 +17,12 @@ LAYERRECOMMENDS_xilinx-standalone = "xilinx-microblaze"
 
 LAYERSERIES_COMPAT_xilinx-standalone = "scarthgap"
 
-PREFERRED_VERSION_plm-firmware ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}%"
-PREFERRED_VERSION_psm-firmware ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}%"
-PREFERRED_VERSION_pmu-firmware ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}%"
-PREFERRED_VERSION_fsbl-firmware ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}%"
+# What version of ESW and related should we default to?
+# Note, there is no 'esw' recipe, but we're going to use this for all
+# of the related items in this layer.
+PREFERRED_VERSION_esw ??= "${@(d.getVar('XILINX_RELEASE_VERSION') or 'undefined').replace('v', '')}"
+
+PREFERRED_VERSION_plm-firmware  ??= "${PREFERRED_VERSION_esw}%"
+PREFERRED_VERSION_psm-firmware  ??= "${PREFERRED_VERSION_esw}%"
+PREFERRED_VERSION_pmu-firmware  ??= "${PREFERRED_VERSION_esw}%"
+PREFERRED_VERSION_fsbl-firmware ??= "${PREFERRED_VERSION_esw}%"