embeddedsw: Rework the embeddedsw copy firmware recipes

fsbl, plmfw, pufw, and psmfw are reworked to provide earlier error messages,
and better handle multiconfig builds.

Also adjust MACHINE specific changes to use .* for compatibility based on the
SOC_FAMILY override.  The system doesn't always set the SOC_FAMILY as
COMPATIBLE_MACHINE, so this avoids an error of incompatible machine.

Align all of the expected firmware filenames to be <firmware>-${MACHINE}.
The user can override as necessary.

The license moves to CLOSED as we don't know the license of the software being
provided by the user or other dependencies.  It'll be up to the user to
reconcile it.

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

16 files changed, 258 insertions, 65 deletions

diff --git a/meta-xilinx-core/conf/machine/include/soc-versal.inc b/meta-xilinx-core/conf/machine/include/soc-versal.inc
index f2a033ad..40145963 100644
--- a/meta-xilinx-core/conf/machine/include/soc-versal.inc
+++ b/meta-xilinx-core/conf/machine/include/soc-versal.inc
@@ -22,14 +22,14 @@ UBOOT_ELF ?= "u-boot.elf"
 
 # Default, if multiconfig is off, call plm/psm-firmware directly, otherwise call the versal-fw multiconfig version
 # The Linux compatible plm/psm-firmware though requires meta-xilinx-tools
-PLM_DEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', '', 'plm-firmware:do_deploy', d)}"
-PLM_MCDEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', 'mc::versal-fw:plm-firmware:do_deploy', '', d)}"
-PLM_DEPLOY_DIR ?= "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', '${TOPDIR}/tmp-microblaze-versal-fw/deploy/images/${MACHINE}', '${DEPLOY_DIR_IMAGE}', d)}"
+PLM_DEPENDS ??= ""
+PLM_MCDEPENDS ??= ""
+PLM_DEPLOY_DIR ??= "${DEPLOY_DIR_IMAGE}"
+PLM_IMAGE_NAME ??= "plm-${MACHINE}"
 PLM_DEPLOY_DIR[vardepsexclude] += "TOPDIR"
-PLM_IMAGE_NAME ?= "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', 'plm-versal-mb', 'plm-${MACHINE}', d)}"
 
-PSM_DEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', '', 'psm-firmware:do_deploy', d)}"
-PSM_MCDEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', 'mc::versal-fw:psm-firmware:do_deploy', '', d)}"
-PSM_FIRMWARE_DEPLOY_DIR ?= "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', '${TOPDIR}/tmp-microblaze-versal-fw/deploy/images/${MACHINE}', '${DEPLOY_DIR_IMAGE}', d)}"
+PSM_DEPENDS ??= ""
+PSM_MCDEPENDS ??= ""
+PSM_FIRMWARE_DEPLOY_DIR ??= "${DEPLOY_DIR_IMAGE}"
+PSM_FIRMWARE_IMAGE_NAME ??= "psm-firmware-${MACHINE}"
 PSM_DEPLOY_DIR[vardepsexclude] += "TOPDIR"
-PSM_FIRMWARE_IMAGE_NAME ?= "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', 'psm-firmware-versal-mb', 'psm-firmware-${MACHINE}', d)}"
diff --git a/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc b/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc
index e32fd617..d67fa95d 100644
--- a/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc
+++ b/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc
@@ -34,18 +34,12 @@ XSERVER_EXT:zynqmp ?= "xf86-video-armsoc"
 # Default PMU ROM
 PMU_ROM ?= "${DEPLOY_DIR_IMAGE}/pmu-rom.elf"
 
-# Default, if multiconfig is off, call pmu-firmware directly, otherwise call the zynqmp-pmufw multiconfig version
-# The Linux compatible pmu-firmware though requires meta-xilinx-tools
-PMU_DEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'zynqmp-pmufw', '', 'pmu-firmware:do_deploy', d)}"
-PMU_MCDEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'zynqmp-pmufw', 'mc::zynqmp-pmufw:pmu-firmware:do_deploy', '', d)}"
-PMU_FIRMWARE_DEPLOY_DIR ?= "${@bb.utils.contains('BBMULTICONFIG', 'zynqmp-pmufw', '${TOPDIR}/tmp-microblaze-zynqmp-pmufw/deploy/images/${MACHINE}', '${DEPLOY_DIR_IMAGE}', d)}"
+
+# Default expects the user to provide a specific pmu-firwmare in the deploy
+# directory, named "pmu-firmware-${MACHINE}.elf" and "pmu-firmware-${MACHINE}.bin"
+PMU_DEPENDS ??= ""
+PMU_MCDEPENDS ??= ""
+PMU_FIRMWARE_DEPLOY_DIR ??= "${DEPLOY_DIR_IMAGE}"
+PMU_FIRMWARE_IMAGE_NAME ??= "pmu-firmware-${MACHINE}"
+
 PMU_FIRMWARE_DEPLOY_DIR[vardepsexclude] += "TOPDIR"
-PMU_FIRMWARE_IMAGE_NAME ?= "${@bb.utils.contains('BBMULTICONFIG', 'zynqmp-pmufw', 'pmu-firmware-zynqmp-pmu', 'pmu-firmware-${MACHINE}', d)}"
-
-# Default, if multiconfig is off, the fsbl is in the regular deploydir, otherwise
-# it is located under a multiconfig specific deploydir
-FSBL_DEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'fsbl-fw', '', 'fsbl-firmware:do_deploy', d)}"
-FSBL_MCDEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'fsbl-fw', 'mc::fsbl-fw:fsbl-firmware:do_deploy', '', d)}"
-FSBL_DEPLOY_DIR ?= "${@bb.utils.contains('BBMULTICONFIG', 'fsbl-fw', '${TOPDIR}/tmp-fsbl-fw/deploy/images/${MACHINE}', '${DEPLOY_DIR_IMAGE}', d)}"
-FSBL_DEPLOY_DIR[vardepsexclude] += "TOPDIR"
-FSBL_IMAGE_NAME ?= "fsbl-${MACHINE}"
diff --git a/meta-xilinx-core/recipes-bsp/embeddedsw/fsbl.bb b/meta-xilinx-core/recipes-bsp/embeddedsw/fsbl.bb
index ae2123e7..f8679f0e 100644
--- a/meta-xilinx-core/recipes-bsp/embeddedsw/fsbl.bb
+++ b/meta-xilinx-core/recipes-bsp/embeddedsw/fsbl.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Xilinx First Stage Boot Loader"
 
-LICENSE = "MIT"
+LICENSE = "CLOSED"
 
 PROVIDES = "virtual/fsbl"
 
@@ -10,19 +10,21 @@ COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynq = "zynq"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 
+# Since we're just copying, we can run any config
+COMPATIBLE_HOST = ".*"
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-# Default would be a multiconfig (versal) build
-# For this to work, BBMULTICONFIG += "fsbl-fw" must be in the user's local.conf!
+# Default expects the user to provide the fsbl in the deploy
+# directory, named "fsbl.elf"
+# A machine, multiconfig, or local.conf should override this
 FSBL_DEPENDS ??= ""
-FSBL_MCDEPENDS ??= "mc::fsbl-fw:fsbl-firmware:do_deploy"
-
-# This must be defined to the file output by whatever is providing the fsbl-firmware
-# The following sets the default, but the BSP may select a different name
-FSBL_IMAGE_NAME ??= "fsbl"
-FSBL_DEPLOY_DIR ??= "${TOPDIR}/tmp-fsbl-fw/deploy/images/${MACHINE}"
+FSBL_MCDEPENDS ??= ""
+FSBL_DEPLOY_DIR ??= "${DEPLOY_DIR_IMAGE}"
+FSBL_DEPLOY_DIR[vardepsexclude] += "TOPDIR"
+FSBL_IMAGE_NAME ??= "fsbl-${MACHINE}"
 
-# Default is for the multilib case (without the extension .elf/.bin)
+# Default is for the multilib case (without the extension .elf)
 FSBL_FILE ??= "${FSBL_DEPLOY_DIR}/${FSBL_IMAGE_NAME}"
 FSBL_FILE[vardepsexclude] = "FSBL_DEPLOY_DIR"
 
@@ -56,3 +58,22 @@ INSANE_SKIP:${PN}-dbg = "arch"
 
 SYSROOT_DIRS += "/boot"
 FILES:${PN} = "/boot/${PN}.elf"
+
+def check_fsbl_variables(d):
+    # If both are blank, the user MUST pass in the path to the firmware!
+    if not d.getVar('FSBL_DEPENDS') and not d.getVar('FSBL_MCDEPENDS'):
+        # Don't cache this, as the items on disk can change!
+        d.setVar('BB_DONT_CACHE', '1')
+
+        if not os.path.exists(d.getVar('FSBL_FILE') + ".elf"):
+            raise bb.parse.SkipRecipe("The expect file %s.elf is not available.\nSet FSBL_FILE to the path with a precompiled FSBL binary. See the meta-xilinx-core README for more information." % d.getVar('FSBL_FILE'))
+        else:
+            # We found the file, so be sure to track it
+            d.setVar('SRC_URI', 'file://${FSBL_FILE}.elf')
+            d.setVarFlag('do_install', 'file-checksums', '${FSBL_FILE}.elf:True')
+            d.setVarFlag('do_deploy', 'file-checksums', '${FSBL_FILE}.elf:True')
+
+python() {
+    # Need to allow bbappends to change the check
+    check_fsbl_variables(d)
+}
diff --git a/meta-xilinx-core/recipes-bsp/embeddedsw/plmfw.bb b/meta-xilinx-core/recipes-bsp/embeddedsw/plmfw.bb
index 6a2a5172..0306ef46 100644
--- a/meta-xilinx-core/recipes-bsp/embeddedsw/plmfw.bb
+++ b/meta-xilinx-core/recipes-bsp/embeddedsw/plmfw.bb
@@ -1,26 +1,28 @@
 DESCRIPTION = "Platform Loader and Manager"
 SUMMARY = "Platform Loader and Manager for Versal devices"
 
-LICENSE = "MIT"
+LICENSE = "CLOSED"
 
 PROVIDES = "virtual/plm"
 
 INHERIT_DEFAULT_DEPENDS = "1"
 
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal = "versal"
+COMPATIBLE_MACHINE:versal = ".*"
+
+# Since we're just copying, we can run any config
+COMPATIBLE_HOST = ".*"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-# Default would be a multiconfig (versal) build
-# For this to work, BBMULTICONFIG += "versal-fw" must be in the user's local.conf!
+# Default expects the user to provide the plm-firmware in the deploy
+# directory, named "plm-${MACHINE}.elf" and "plm-${MACHINE}.bin"
+# A machine, multiconfig, or local.conf should override this
 PLM_DEPENDS ??= ""
-PLM_MCDEPENDS ??= "mc::versal-fw:plm-firmware:do_deploy"
-
-# This must be defined to the file output by whatever is providing the plm-firmware
-# The following sets the default, but the BSP may select a different name
-PLM_IMAGE_NAME ??= "plm-versal-mb"
-PLM_DEPLOY_DIR ??= "${TOPDIR}/tmp-microblaze-versal-fw/deploy/images/${MACHINE}"
+PLM_MCDEPENDS ??= ""
+PLM_DEPLOY_DIR ??= "${DEPLOY_DIR_IMAGE}"
+PLM_DEPLOY_DIR[vardepsexclude] += "TOPDIR"
+PLM_IMAGE_NAME ??= "plm-${MACHINE}"
 
 # Default is for the multilib case (without the extension .elf/.bin)
 PLM_FILE ??= "${PLM_DEPLOY_DIR}/${PLM_IMAGE_NAME}"
@@ -57,3 +59,31 @@ INSANE_SKIP:${PN}-dbg = "arch"
 
 SYSROOT_DIRS += "/boot"
 FILES:${PN} = "/boot/${PN}.elf"
+
+def check_plm_vars(d):
+    # If both are blank, the user MUST pass in the path to the firmware!
+    if not d.getVar('PLM_DEPENDS') and not d.getVar('PLM_MCDEPENDS'):
+        # Don't cache this, as the items on disk can change!
+        d.setVar('BB_DONT_CACHE', '1')
+
+        msg = ""
+        fail = False
+        if not os.path.exists(d.getVar('PLM_FILE') + ".elf"):
+            msg = msg + "The expected file %s.elf is not available.  " % d.getVar('PLM_FILE')
+            fail = True
+        if not os.path.exists(d.getVar('PLM_FILE') + ".bin"):
+            msg = msg + "The expected file %s.bin is not available.  " % d.getVar('PLM_FILE')
+            fail = True
+        if fail:
+            raise bb.parse.SkipRecipe("%s\nSee the meta-xilinx-core README." % msg)
+        else:
+            # We found the file, so be sure to track it
+            d.setVar('SRC_URI', 'file://${PLM_FILE}.elf file://${PLM_FILE}.bin')
+            d.setVarFlag('do_install', 'file-checksums', '${PLM_FILE}.elf:True')
+            d.setVarFlag('do_deploy', 'file-checksums', '${PLM_FILE}.elf:True ${PLM_FILE}.bin:True')
+
+python() {
+    # Need to allow bbappends to change the check
+    check_plm_vars(d)
+}
+
diff --git a/meta-xilinx-core/recipes-bsp/embeddedsw/pmufw.bb b/meta-xilinx-core/recipes-bsp/embeddedsw/pmufw.bb
index ea0eb5a6..b3f9664e 100644
--- a/meta-xilinx-core/recipes-bsp/embeddedsw/pmufw.bb
+++ b/meta-xilinx-core/recipes-bsp/embeddedsw/pmufw.bb
@@ -1,25 +1,27 @@
 DESCRIPTION = "PMU Firmware"
 
-LICENSE = "MIT"
+LICENSE = "CLOSED"
 
 PROVIDES = "virtual/pmu-firmware"
 
 INHERIT_DEFAULT_DEPENDS = "1"
 
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:zynqmp = ".*"
+
+# Since we're just copying, we can run any config
+COMPATIBLE_HOST = ".*"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-# Default would be a multiconfig (zynqmp-pmufw) build
-# For this to work, BBMULTICONFIG += "zynqmp-pmufw" must be in the user's local.conf!
+# Default expects the user to provide the pmu-firmware in the deploy
+# directory, named "pmu-firmware-${MACHINE}.elf" and "pmu-firmware-${MACHINE}.bin"
+# A machine, multiconfig, or local.conf should override this
 PMU_DEPENDS ??= ""
-PMU_MCDEPENDS ??= "mc::zynqmp-pmufw:pmu-firmware:do_deploy"
-
-# This must be defined to the file output by whatever is providing the pmu-firmware
-# The following sets the default, but the BSP may select a different name
-PMU_FIRMWARE_IMAGE_NAME ??= "pmu-firmware-zynqmp-pmu"
-PMU_FIRMWARE_DEPLOY_DIR ??= "${TOPDIR}/tmp-microblaze-zynqmp-pmufw/deploy/images/${MACHINE}"
+PMU_MCDEPENDS ??= ""
+PMU_FIRMWARE_DEPLOY_DIR ??= "${DEPLOY_DIR_IMAGE}"
+PMU_FIRMWARE_DEPLOY_DIR[vardepsexclude] += "TOPDIR"
+PMU_FIRMWARE_IMAGE_NAME ??= "pmu-firmware-${MACHINE}"
 
 # Default is for the multilib case (without the extension .elf/.bin)
 PMU_FILE ??= "${PMU_FIRMWARE_DEPLOY_DIR}/${PMU_FIRMWARE_IMAGE_NAME}"
@@ -55,3 +57,31 @@ INSANE_SKIP:${PN}-dbg = "arch"
 
 SYSROOT_DIRS += "/boot"
 FILES:${PN} = "/boot/${PN}.elf"
+
+def check_pmu_vars(d):
+    # If both are blank, the user MUST pass in the path to the firmware!
+    if not d.getVar('PMU_FIRMWARE_DEPENDS') and not d.getVar('PMU_FIRMWARE_MCDEPENDS'):
+        # Don't cache this, as the items on disk can change!
+        d.setVar('BB_DONT_CACHE', '1')
+
+        msg = ""
+        fail = False
+        if not os.path.exists(d.getVar('PMU_FILE') + ".elf"):
+            msg = msg + "The expected file %s.elf is not available.  " % d.getVar('PMU_FILE')
+            fail = True
+        if not os.path.exists(d.getVar('PMU_FILE') + ".bin"):
+            msg = msg + "The expected file %s.bin is not available.  " % d.getVar('PMU_FILE')
+            fail = True
+        if fail:
+            raise bb.parse.SkipRecipe("%s  See the meta-xilinx-core README." % msg)
+        else:
+            # We found the file, so be sure to track it
+            d.setVar('SRC_URI', 'file://${PMU_FILE}.elf file://${PMU_FILE}.bin')
+            d.setVarFlag('do_install', 'file-checksums', '${PMU_FILE}.elf:True')
+            d.setVarFlag('do_deploy', 'file-checksums', '${PMU_FILE}.elf:True ${PMU_FILE}.bin:True')
+
+
+python() {
+    # Need to allow bbappends to change the check
+    check_pmu_vars(d)
+}
diff --git a/meta-xilinx-core/recipes-bsp/embeddedsw/psmfw.bb b/meta-xilinx-core/recipes-bsp/embeddedsw/psmfw.bb
index 89a9e93f..46124591 100644
--- a/meta-xilinx-core/recipes-bsp/embeddedsw/psmfw.bb
+++ b/meta-xilinx-core/recipes-bsp/embeddedsw/psmfw.bb
@@ -1,26 +1,28 @@
 DESCRIPTION = "PSM Firmware"
 SUMMARY = "PSM firmware for versal devices"
 
-LICENSE = "MIT"
+LICENSE = "CLOSED"
 
 PROVIDES = "virtual/psm-firmware"
 
 INHERIT_DEFAULT_DEPENDS = "1"
 
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:versal = "versal"
+COMPATIBLE_MACHINE:versal = ".*"
+
+# Since we're just copying, we can run any config
+COMPATIBLE_HOST = ".*"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-# Default would be a multiconfig (versal) build
-# For this to work, BBMULTICONFIG += "versal-fw" must be in the user's local.conf!
+# Default expects the user to provide the psm-firmware in the deploy
+# directory, named "psm-firmware-${MACHINE}.elf" and "psm-firmware-${MACHINE}.bin"
+# A machine, multiconfig, or local.conf should override this
 PSM_DEPENDS ??= ""
-PSM_MCDEPENDS ??= "mc::versal-fw:psm-firmware:do_deploy"
-
-# This must be defined to the file output by whatever is providing the psm-firmware
-# The following sets the default, but the BSP may select a different name
-PSM_FIRMWARE_IMAGE_NAME ??= "psm-firmware-versal-mb"
-PSM_FIRMWARE_DEPLOY_DIR ??= "${TOPDIR}/tmp-microblaze-versal-fw/deploy/images/${MACHINE}"
+PSM_MCDEPENDS ??= ""
+PSM_DEPLOY_DIR ??= "${DEPLOY_DIR_IMAGE}"
+PSM_FIRMWARE_DEPLOY_DIR[vardepsexclude] += "TOPDIR"
+PSM_FIRMWARE_IMAGE_NAME ??= "psm-firmware-${MACHINE}"
 
 # Default is for the multilib case (without the extension .elf/.bin)
 PSM_FILE ??= "${PSM_FIRMWARE_DEPLOY_DIR}/${PSM_FIRMWARE_IMAGE_NAME}"
@@ -57,3 +59,32 @@ INSANE_SKIP:${PN}-dbg = "arch"
 
 SYSROOT_DIRS += "/boot"
 FILES:${PN} = "/boot/${PN}.elf"
+
+def check_psm_vars(d):
+    # If both are blank, the user MUST pass in the path to the firmware!
+    if not d.getVar('PSM_DEPENDS') and not d.getVar('PSM_MCDEPENDS'):
+        # Don't cache this, as the items on disk can change!
+        d.setVar('BB_DONT_CACHE', '1')
+
+        msg = ""
+        fail = False
+        if not os.path.exists(d.getVar('PSM_FILE') + ".elf"):
+            msg = msg + "The expected file %s.elf is not available.  " % d.getVar('PSM_FILE')
+            fail = True
+        if not os.path.exists(d.getVar('PSM_FILE') + ".bin"):
+            msg = msg + "The expected file %s.bin is not available.  " % d.getVar('PSM_FILE')
+            fail = True
+
+        if fail:
+            raise bb.parse.SkipRecipe("%s\nSee the meta-xilinx-core README." % msg)
+        else:
+            # We found the file, so be sure to track it
+            d.setVar('SRC_URI', 'file://${PSM_FILE}.elf file://${PSM_FILE}.bin')
+            d.setVarFlag('do_install', 'file-checksums', '${PSM_FILE}.elf:True')
+            d.setVarFlag('do_deploy', 'file-checksums', '${PSM_FILE}.elf:True ${PSM_FILE}.bin:True')
+
+python() {
+    # Need to allow bbappends to change the check
+    check_psm_vars(d)
+}
+
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-fw-cfg.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-fw-cfg.inc
new file mode 100644
index 00000000..5499befd
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-fw-cfg.inc
@@ -0,0 +1,7 @@
+# Default fsbl configuration, using fsbl-fw multiconfig
+#
+# This requires MULTICONFIG += "fsbl-fw" to be added to local.conf
+FSBL_DEPENDS ?= ""
+FSBL_MCDEPENDS ?= "mc::fsbl-fw:fsbl-firmware:do_deploy"
+FSBL_DEPLOY_DIR ?= "${TOPDIR}/tmp-fsbl-fw/deploy/images/${MACHINE}"
+FSBL_IMAGE_NAME ?= "fsbl"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl.bbappend b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl.bbappend
new file mode 100644
index 00000000..5b02e3de
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl.bbappend
@@ -0,0 +1,9 @@
+# Include the fsbl-fw setting, if it's enabled
+FSBL_INC = "${@bb.utils.contains('BBMULTICONFIG', 'fsbl-fw', 'fsbl-fw-cfg.inc', '', d)}"
+require ${FSBL_INC}
+
+def check_fsbl_variables(d):
+    if not d.getVar('FSBL_DEPENDS') and not d.getVar('FSBL_MCDEPENDS') and not (d.getVar('BBMULTICONFIG') and 'fsbl-fw' in d.getVar('BBMULTICONFIG').split()):
+        if not os.path.exists(d.getVar('FSBL_FILE') + ".elf"):
+            d.setVar('BB_DONT_CACHE', '1')
+            raise bb.parse.SkipRecipe("The expect file %s.elf is not available.\nEither specify FSBL_FILE, or you may need to enable BBMULTICONFIG += 'fsbl-fw' to generate it." % d.getVar('FSBL_FILE'))
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
index 355a55ed..44e428ff 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
@@ -65,7 +65,7 @@ do_install() {
 PACKAGES = ""
 
 # This is the default in most BSPs.  A MACHINE.conf can override this!
-PLM_IMAGE_NAME ??= "plm-versal-mb"
+PLM_IMAGE_NAME ??= "plm-${MACHINE}"
 
 inherit image-artifact-names
 
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plmfw.bbappend b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plmfw.bbappend
new file mode 100644
index 00000000..d63529ff
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plmfw.bbappend
@@ -0,0 +1,17 @@
+# Include the versal-fw setting, if it's enabled
+PLMFW_INC = "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', 'versal-fw-cfg.inc', '', d)}"
+require ${PLMFW_INC}
+
+def check_plm_vars(d):
+    if not d.getVar('PLM_DEPENDS') and not d.getVar('PLM_MCDEPENDS') and not (d.getVar('BBMULTICONFIG') and 'versal-fw' in d.getVar('BBMULTICONFIG').split()):
+        msg = ""
+        fail = False
+        if not os.path.exists(d.getVar('PLM_FILE') + ".elf"):
+            msg = msg + "The expected file %s.elf is not available.  " % d.getVar('PLM_FILE')
+            fail = True
+        if not os.path.exists(d.getVar('PLM_FILE') + ".bin"):
+            msg = msg + "The expected file %s.bin is not available.  " % d.getVar('PLM_FILE')
+            fail = True
+        if fail:
+            d.setVar('BB_DONT_CACHE', '1')
+            raise bb.parse.SkipRecipe("%s\nEither specify PLM_FILE, or you may need to enable BBMULTICONFIG += 'versal-fw' to generate it." % msg)
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc
index 22352fab..b789af5d 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc
@@ -64,7 +64,7 @@ do_install() {
 PACKAGES = ""
 
 # This is the default in most BSPs.  A MACHINE.conf can override this!
-PMU_FIRMWARE_IMAGE_NAME ??= "pmu-firmware-zynqmp-pmu"
+PMU_FIRMWARE_IMAGE_NAME ??= "pmu-firmware-${MACHINE}"
 
 inherit image-artifact-names
 
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmufw.bbappend b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmufw.bbappend
new file mode 100644
index 00000000..947408a1
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmufw.bbappend
@@ -0,0 +1,17 @@
+# Include the zynqmp-pmufw setting, if it's enabled
+PMUFW_INC = "${@bb.utils.contains('BBMULTICONFIG', 'zynqmp-pmufw', 'zynqmp-pmufw-cfg.inc', '', d)}"
+require ${PMUFW_INC}
+
+def check_pmu_vars(d):
+    if not d.getVar('PMU_DEPENDS') and not d.getVar('PMU_MCDEPENDS') and not (d.getVar('BBMULTICONFIG') and 'zynqmp-pmufw' in d.getVar('BBMULTICONFIG').split()):
+        msg = ""
+        fail = False
+        if not os.path.exists(d.getVar('PMU_FILE') + ".elf"):
+            msg = msg + "The expected file %s.elf is not available.  " % d.getVar('PMU_FILE')
+            fail = True
+        if not os.path.exists(d.getVar('PMU_FILE') + ".bin"):
+            msg = msg + "The expected file %s.bin is not available.  " % d.getVar('PMU_FILE')
+            fail = True
+        if fail:
+            d.setVar('BB_DONT_CACHE', '1')
+            raise bb.parse.SkipRecipe("%s\nEither specify PMU_FILE, or you may need to enable BBMULTICONFIG += 'zynqmp-pmufw' to generate it." % msg)
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
index 2bdae284..a7acfbb7 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
@@ -65,7 +65,7 @@ do_install() {
 PACKAGES = ""
 
 # This is the default in most BSPs.  A MACHINE.conf can override this!
-PSM_FIRMWARE_IMAGE_NAME ??= "psm-firmware-versal-mb"
+PSM_FIRMWARE_IMAGE_NAME ??= "psm-firmware-${MACHINE}"
 
 inherit image-artifact-names
 
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psmfw.bbappend b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psmfw.bbappend
new file mode 100644
index 00000000..8944152d
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psmfw.bbappend
@@ -0,0 +1,17 @@
+# Include the versal-fw setting, if it's enabled
+PSMFW_INC = "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', 'versal-fw-cfg.inc', '', d)}"
+require ${PSMFW_INC}
+
+def check_psm_vars(d):
+    if not d.getVar('PSM_DEPENDS') and not d.getVar('PSM_MCDEPENDS') and not (d.getVar('BBMULTICONFIG') and 'versal-fw' in d.getVar('BBMULTICONFIG').split()):
+        msg = ""
+        fail = False
+        if not os.path.exists(d.getVar('PSM_FILE') + ".elf"):
+            msg = msg + "The expected file %s.elf is not available.  " % d.getVar('PSM_FILE')
+            fail = True
+        if not os.path.exists(d.getVar('PSM_FILE') + ".bin"):
+            msg = msg + "The expected file %s.bin is not available.  " % d.getVar('PSM_FILE')
+            fail = True
+        if fail:
+            d.setVar('BB_DONT_CACHE', '1')
+            raise bb.parse.SkipRecipe("%s\nEither specify PSM_FILE, or you may need to enable BBMULTICONFIG += 'versal-fw' to generate it." % msg)
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/versal-fw-cfg.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/versal-fw-cfg.inc
new file mode 100644
index 00000000..bae740e2
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/versal-fw-cfg.inc
@@ -0,0 +1,13 @@
+# Default fsbl configuration, using fsbl-fw multiconfig
+#
+# This requires MULTICONFIG += "versal-fw" to be added to local.conf
+PSM_DEPENDS ?= ""
+PSM_MCDEPENDS ?= "mc::versal-fw:psm-firmware:do_deploy"
+PSM_FIRMWARE_IMAGE_NAME ?= "psm-firmware-${MACHINE}"
+PSM_FIRMWARE_DEPLOY_DIR ?= "${TOPDIR}/tmp-microblaze-versal-fw/deploy/images/${MACHINE}"
+
+PLM_DEPENDS ?= ""
+PLM_MCDEPENDS ?= "mc::versal-fw:plm-firmware:do_deploy"
+PLM_IMAGE_NAME ?= "plm-${MACHINE}"
+PLM_DEPLOY_DIR ?= "${TOPDIR}/tmp-microblaze-versal-fw/deploy/images/${MACHINE}"
+
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/zynqmp-pmufw-cfg.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/zynqmp-pmufw-cfg.inc
new file mode 100644
index 00000000..982c4425
--- /dev/null
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/zynqmp-pmufw-cfg.inc
@@ -0,0 +1,7 @@
+# Default fsbl configuration, using fsbl-fw multiconfig
+#
+# This requires MULTICONFIG += "zynqmp-pmufw" to be added to local.conf
+PMU_DEPENDS ?= ""
+PMU_MCDEPENDS ?= "mc::zynqmp-pmufw:pmu-firmware:do_deploy"
+PMU_FIRMWARE_DEPLOY_DIR ?= "${TOPDIR}/tmp-microblaze-zynqmp-pmufw/deploy/images/${MACHINE}"
+PMU_FIRMWARE_IMAGE_NAME ?= "pmu-firmware-${MACHINE}"