xilinx-bootbin: Sync versal and ensure items can be defined in local.conf

Use ??= to define the default values.  This ensures a ?= (or =) can be
used in a .bbappend, or a user can define a default value in the local.conf
or machine.conf file.

Also add a default config for versal that matches zynqmp and zynq.

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

3 files changed, 17 insertions, 13 deletions

diff --git a/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-versal.inc b/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-versal.inc
index a9c58aa2..fff2c7a3 100644
--- a/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-versal.inc
+++ b/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-versal.inc
@@ -4,8 +4,12 @@ BOOTGEN_EXTRA_ARGS += "-dump bh"
 # specify BIF common attribute for FSBL
 BIF_COMMON_ATTR ?= ""
 
-# specify BIF partition attributes required for BOOT.bin
-BIF_PARTITION_ATTR ?= "base-pdi plmfw psmfw device-tree arm-trusted-firmware u-boot-xlnx"
+#specify BIF partition attributes required for BOOT.bin
+BIF_FSBL_ATTR       ??= "base-pdi plmfw psmfw"
+BIF_ATF_ATTR        ??= "arm-trusted-firmware"
+BIF_DEVICETREE_ATTR ??= "device-tree"
+BIF_SSBL_ATTR       ??= "u-boot-xlnx"
+BIF_PARTITION_ATTR  ??= "${BIF_FSBL_ATTR} ${BIF_DEVICETREE_ATTR} ${BIF_ATF_ATTR} ${BIF_SSBL_ATTR}"
 
 # specify BIF partition attributes for base-pdi
 BIF_PARTITION_ATTR[base-pdi] ?= "type=bootimage"
diff --git a/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-zynq.inc b/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-zynq.inc
index 89fa1b5b..a9428d5c 100644
--- a/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-zynq.inc
+++ b/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-zynq.inc
@@ -1,9 +1,9 @@
 #specify BIF partition attributes required for BOOT.bin
-BIF_FSBL_ATTR ?= "fsbl"
-BIF_BITSTREAM_ATTR ?= ""
-BIF_DEVICETREE_ATTR ?= "device-tree"
-BIF_SSBL_ATTR ?= "u-boot-xlnx"
-BIF_PARTITION_ATTR ?= "${BIF_FSBL_ATTR} ${BIF_BITSTREAM_ATTR} ${BIF_SSBL_ATTR} ${BIF_DEVICETREE_ATTR}"
+BIF_FSBL_ATTR       ??= "fsbl"
+BIF_BITSTREAM_ATTR  ??= ""
+BIF_DEVICETREE_ATTR ??= "device-tree"
+BIF_SSBL_ATTR       ??= "u-boot-xlnx"
+BIF_PARTITION_ATTR  ??= "${BIF_FSBL_ATTR} ${BIF_BITSTREAM_ATTR} ${BIF_SSBL_ATTR} ${BIF_DEVICETREE_ATTR}"
 
 #specify BIF partition attributes for FSBL
 #bootloader is FSBL. Location where FSBL binary is present and dependency to build FSBL
diff --git a/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-zynqmp.inc b/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-zynqmp.inc
index 91497658..ab2ee1d7 100644
--- a/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-zynqmp.inc
+++ b/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-zynqmp.inc
@@ -15,12 +15,12 @@ BIF_COMMON_ATTR ?= ""
 # This combination restricts the boot order to be:
 # FSBL & PMUFW -> Bitstream (if available) -> ATF -> Device Tree (if available) -> Second Stage Bootloader
 #
-BIF_FSBL_ATTR ?= "fsbl pmufw"
-BIF_BITSTREAM_ATTR ?= ""
-BIF_ATF_ATTR ?= "arm-trusted-firmware"
-BIF_DEVICETREE_ATTR ?= "device-tree"
-BIF_SSBL_ATTR ?= "u-boot-xlnx"
-BIF_PARTITION_ATTR ?= "${BIF_FSBL_ATTR} ${BIF_BITSTREAM_ATTR} ${BIF_ATF_ATTR} ${BIF_DEVICETREE_ATTR} ${BIF_SSBL_ATTR}"
+BIF_FSBL_ATTR       ??= "fsbl pmufw"
+BIF_BITSTREAM_ATTR  ??= ""
+BIF_ATF_ATTR        ??= "arm-trusted-firmware"
+BIF_DEVICETREE_ATTR ??= "device-tree"
+BIF_SSBL_ATTR       ??= "u-boot-xlnx"
+BIF_PARTITION_ATTR  ??= "${BIF_FSBL_ATTR} ${BIF_BITSTREAM_ATTR} ${BIF_ATF_ATTR} ${BIF_DEVICETREE_ATTR} ${BIF_SSBL_ATTR}"
 
 # specify BIF partition attributes for FSBL
 # bootloader is FSBL. Location where FSBL binary is present and dependency to build FSBL