soc-zynq/soc-zynqmp: Set default locations for fsbl firwmare

Match the behavior of the pmu, psm, and plm firmwares.  Set the default
deployment directory, filename, and dependencies for the soc-zynq and
soc-zynqmp systems.  FSBL is only present on thse two systems.

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

2 files changed, 13 insertions, 0 deletions

diff --git a/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc b/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc
index 0111cbd9..f970ffa3 100644
--- a/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc
+++ b/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc
@@ -22,3 +22,10 @@ KERNEL_EXTRA_ARGS_zynq += "UIMAGE_LOADADDR=0x8000"
 WIC_DEPENDS ?= "virtual/kernel virtual/bootloader virtual/boot-bin"
 
 UBOOT_ELF ?= "u-boot.elf"
+
+# 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_IMAGE_NAME ?= "fsbl"
diff --git a/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc b/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc
index 633c95ee..47d9f81b 100644
--- a/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc
+++ b/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc
@@ -37,3 +37,9 @@ PMU_MCDEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'zynqmp-pmufw', 'mc::zyn
 PMU_FIRMWARE_DEPLOY_DIR ?= "${@bb.utils.contains('BBMULTICONFIG', 'zynqmp-pmufw', '${TOPDIR}/tmp-microblaze-zynqmp-pmufw/deploy/images/${MACHINE}', '${DEPLOY_DIR_IMAGE}', d)}"
 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_IMAGE_NAME ?= "fsbl"