19 files changed, 91 insertions, 67 deletions

diff --git a/meta-xilinx-bsp/conf/machine/ac701-microblazeel.conf b/meta-xilinx-bsp/conf/machine/ac701-microblazeel.conf
index 88a0d7bb..27cb3939 100644
--- a/meta-xilinx-bsp/conf/machine/ac701-microblazeel.conf
+++ b/meta-xilinx-bsp/conf/machine/ac701-microblazeel.conf
@@ -10,13 +10,6 @@ MACHINEOVERRIDES =. "${@['', 'ac701-microblazeel:']['ac701-microblazeel' !='${MA
 # defined before calling the required inclusion file else pre-expansion value
 # defined in microblazeel-generic.conf will be set.
 
-# Yocto AC701 FS-Boot variables
-YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0"
-YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0"
-YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "MIG_7SERIES_0"
-YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0"
-XSCTH_PROC:pn-fs-boot ?= "microblaze_0"
-
 # Yocto AC701 device-tree variables
 YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0"
 YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "MIG_7SERIES_0"
@@ -25,6 +18,21 @@ DTC_FLAGS:pn-device-tree ?= ""
 XSCTH_PROC:pn-device-tree ?= "microblaze_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD ac701-full}"
 
+# Yocto FS-Boot variables
+YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0"
+YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0"
+YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "MIG_7SERIES_0"
+YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0"
+XSCTH_PROC:pn-fs-boot ?= "microblaze_0"
+
+# Yocto KERNEL Variables
+UBOOT_ENTRYPOINT  ?= "0x80000000"
+UBOOT_LOADADDRESS ?= "0x80000000"
+
+# ac701-microblazeel Serial Console
+SERIAL_CONSOLES ?= "115200;ttyUL0"
+YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
+
 # Set DDR Base address for u-boot-xlnx-scr variables
 DDR_BASEADDR ?= "0x80000000"
 SKIP_APPEND_BASEADDR ?= "0"
@@ -39,4 +47,4 @@ HDF_MACHINE = "ac701-microblazeel"
 
 #### No additional settings should be after the Postamble
 #### Postamble
-PACKAGE_EXTRA_ARCHS:append = "${@['', 'ac701_microblazeel']['ac701-microblazeel' != '${MACHINE}']}"
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' ac701_microblazeel']['ac701-microblazeel' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
index f24d0356..f3236f07 100644
--- a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
+++ b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
@@ -15,7 +15,7 @@ YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0"
 YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "MIG_7SERIES_0"
 DT_PADDING_SIZE:pn-device-tree ?= "0x1000"
 DTC_FLAGS:pn-device-tree ?= ""
-XSCTH_PROC:microblaze:pn-device-tree ?= "microblaze_0"
+XSCTH_PROC:pn-device-tree ?= "microblaze_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD kc705-full}"
 
 # Yocto FS-Boot variables
@@ -29,14 +29,14 @@ XSCTH_PROC:pn-fs-boot ?= "microblaze_0"
 UBOOT_ENTRYPOINT  ?= "0x80000000"
 UBOOT_LOADADDRESS ?= "0x80000000"
 
-# Set DDR Base address for u-boot-xlnx-scr variables
-DDR_BASEADDR ?= "0x80000000"
-SKIP_APPEND_BASEADDR ?= "0"
-
 # kc705-microblazeel Serial Console
 SERIAL_CONSOLES ?= "115200;ttyUL0"
 YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
 
+# Set DDR Base address for u-boot-xlnx-scr variables
+DDR_BASEADDR ?= "0x80000000"
+SKIP_APPEND_BASEADDR ?= "0"
+
 # Required generic machine inclusion
 require conf/machine/microblaze-generic.conf
 
@@ -47,4 +47,4 @@ HDF_MACHINE = "kc705-microblazeel"
 
 #### No additional settings should be after the Postamble
 #### Postamble
-PACKAGE_EXTRA_ARCHS:append = "${@['', 'kc705_microblazeel']['kc705-microblazeel' != '${MACHINE}']}"
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' kc705_microblazeel']['kc705-microblazeel' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/kcu105-microblazeel.conf b/meta-xilinx-bsp/conf/machine/kcu105-microblazeel.conf
index 3edf190e..a866f87c 100644
--- a/meta-xilinx-bsp/conf/machine/kcu105-microblazeel.conf
+++ b/meta-xilinx-bsp/conf/machine/kcu105-microblazeel.conf
@@ -10,13 +10,6 @@ MACHINEOVERRIDES =. "${@['', 'kcu105-microblazeel:']['kcu105-microblazeel' !='${
 # defined before calling the required inclusion file else pre-expansion value
 # defined in microblazeel-generic.conf will be set.
 
-# Yocto KCU105 FS-Boot variables
-YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0"
-YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0"
-YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "DDR4_0"
-YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0"
-XSCTH_PROC:pn-fs-boot ?= "microblaze_0"
-
 # Yocto KCU105 device-tree variables
 YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0"
 YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "DDR4_0"
@@ -25,6 +18,21 @@ DTC_FLAGS:pn-device-tree ?= ""
 XSCTH_PROC:pn-device-tree ?= "microblaze_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD kcu105}"
 
+# Yocto FS-Boot variables
+YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0"
+YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0"
+YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "DDR4_0"
+YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0"
+XSCTH_PROC:pn-fs-boot ?= "microblaze_0"
+
+# Yocto KERNEL Variables
+UBOOT_ENTRYPOINT  ?= "0x80000000"
+UBOOT_LOADADDRESS ?= "0x80000000"
+
+# kcu105-microblazeel Serial Console
+SERIAL_CONSOLES ?= "115200;ttyUL0"
+YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
+
 # Set DDR Base address for u-boot-xlnx-scr variables
 DDR_BASEADDR ?= "0x80000000"
 SKIP_APPEND_BASEADDR ?= "0"
@@ -39,4 +47,4 @@ HDF_MACHINE = "kcu105-microblazeel"
 
 #### No additional settings should be after the Postamble
 #### Postamble
-PACKAGE_EXTRA_ARCHS:append = "${@['', 'kcu105_microblazeel']['kcu105-microblazeel' != '${MACHINE}']}"
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' kcu105_microblazeel']['kcu105-microblazeel' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
index 1b3e8123..ed049268 100644
--- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
@@ -2,10 +2,6 @@
 #@NAME: vck190-versal
 #@DESCRIPTION: Machine configuration for the VCK190 evaluation board.
 
-# Compatibility with old BOARD value.
-# TODO - Remove these once removed from petalinux bsp
-MACHINEOVERRIDES =. "vck190:"
-
 #### Preamble
 MACHINEOVERRIDES =. "${@['', 'vck190-versal:']['vck190-versal' !='${MACHINE}']}"
 #### Regular settings follow
@@ -46,4 +42,4 @@ HDF_MACHINE = "vck190-versal"
 
 #### No additional settings should be after the Postamble
 #### Postamble
-PACKAGE_EXTRA_ARCHS:append = "${@['', 'vck190_versal']['vck190-versal' != '${MACHINE}']}"
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' vck190_versal']['vck190-versal' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/vcu118-microblazeel.conf b/meta-xilinx-bsp/conf/machine/vcu118-microblazeel.conf
index ada52ceb..bfd60336 100644
--- a/meta-xilinx-bsp/conf/machine/vcu118-microblazeel.conf
+++ b/meta-xilinx-bsp/conf/machine/vcu118-microblazeel.conf
@@ -10,13 +10,6 @@ MACHINEOVERRIDES =. "${@['', 'vcu118-microblazeel:']['vcu118-microblazeel' !='${
 # defined before calling the required inclusion file else pre-expansion value
 # defined in microblazeel-generic.conf will be set.
 
-# Yocto VCU118 FS-Boot variables
-YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0"
-YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0"
-YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "DDR4_0"
-YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0"
-XSCTH_PROC:pn-fs-boot ?= "microblaze_0"
-
 # Yocto VCU118 device-tree variables
 YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0"
 YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "DDR4_0"
@@ -25,10 +18,21 @@ DTC_FLAGS:pn-device-tree ?= ""
 XSCTH_PROC:pn-device-tree ?= "microblaze_0"
 YAML_DT_BOARD_FLAGS ?= "{BOARD vcu118-rev2.0}"
 
+# Yocto FS-Boot variables
+YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0"
+YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0"
+YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "DDR4_0"
+YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0"
+XSCTH_PROC:pn-fs-boot ?= "microblaze_0"
+
 # Yocto KERNEL Variables
 UBOOT_ENTRYPOINT  ?= "0x80000000"
 UBOOT_LOADADDRESS ?= "0x80000000"
 
+# vcu118-microblazeel Serial Console
+SERIAL_CONSOLES ?= "115200;ttyUL0"
+YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
+
 # Set DDR Base address for u-boot-xlnx-scr variables
 DDR_BASEADDR ?= "0x80000000"
 SKIP_APPEND_BASEADDR ?= "0"
@@ -43,4 +47,4 @@ HDF_MACHINE = "vcu118-microblazeel"
 
 #### No additional settings should be after the Postamble
 #### Postamble
-PACKAGE_EXTRA_ARCHS:append = "${@['', 'vcu118_microblazeel']['vcu118-microblazeel' != '${MACHINE}']}"
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' vcu118_microblazeel']['vcu118-microblazeel' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/vek280-versal.conf b/meta-xilinx-bsp/conf/machine/vek280-versal.conf
index b533b833..625cbca1 100644
--- a/meta-xilinx-bsp/conf/machine/vek280-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vek280-versal.conf
@@ -12,12 +12,20 @@ MACHINEOVERRIDES =. "${@['', 'vek280-versal:']['vek280-versal' !='${MACHINE}']}"
 
 # Yocto device-tree variables
 YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "CIPS_0_pspmc_0_psv_sbsauart_0"
-YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vek280-reva}"
+YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vek280-revb}"
+
+# Yocto arm-trusted-firmware(TF-A) variables
+ATF_CONSOLE ?= "pl011"
+TFA_BL33_LOAD ?= "0x8000000"
 
 # Yocto PLM variables
 YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0"
 YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0"
 
+# Yocto KERNEL Variables
+UBOOT_ENTRYPOINT  ?= "0x200000"
+UBOOT_LOADADDRESS ?= "0x200000"
+
 # vek280-versal Serial Console
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
 YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
@@ -30,6 +38,16 @@ require conf/machine/versal-ai-edge-generic.conf
 # from local.conf.
 HDF_MACHINE = "vek280-versal"
 
+# VEK280 board has 12GB memory only but default versal-generic has QB_MEM set to
+# 8G, Hence we need set 12G in QB_MEM.
+QB_MEM = "-m 12G"
+
+QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/board-versal-ps-vek280.dtb"
+QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"
+
+# Yocto MACHINE_FEATURES Variable
+MACHINE_FEATURES += "vdu"
+
 #### No additional settings should be after the Postamble
 #### Postamble
-PACKAGE_EXTRA_ARCHS:append = "${@['', 'vek280_versal']['vek280-versal' != '${MACHINE}']}"
\ No newline at end of file
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' vek280_versal']['vek280-versal' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
index 941f0aba..0f474f78 100644
--- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
@@ -2,10 +2,6 @@
 #@NAME: vmk180-versal
 #@DESCRIPTION: Machine configuration for the VMK180 evaluation board.
 
-# Compatibility with old BOARD value.
-# TODO - Remove these once removed from petalinux bsp
-MACHINEOVERRIDES =. "vmk180:"
-
 #### Preamble
 MACHINEOVERRIDES =. "${@['', 'vmk180-versal:']['vmk180-versal' !='${MACHINE}']}"
 #### Regular settings follow
@@ -46,4 +42,4 @@ HDF_MACHINE = "vmk180-versal"
 
 #### No additional settings should be after the Postamble
 #### Postamble
-PACKAGE_EXTRA_ARCHS:append = "${@['', 'vmk180_versal']['vmk180-versal' != '${MACHINE}']}"
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' vmk180_versal']['vmk180-versal' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/vpk120-versal.conf b/meta-xilinx-bsp/conf/machine/vpk120-versal.conf
index 30818313..e200d42d 100644
--- a/meta-xilinx-bsp/conf/machine/vpk120-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vpk120-versal.conf
@@ -26,7 +26,7 @@ YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauar
 UBOOT_ENTRYPOINT  ?= "0x200000"
 UBOOT_LOADADDRESS ?= "0x200000"
 
-# vpk120-versal Serial Console 
+# vpk120-versal Serial Console
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
 YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
 
@@ -45,4 +45,4 @@ QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"
 
 #### No additional settings should be after the Postamble
 #### Postamble
-PACKAGE_EXTRA_ARCHS:append = "${@['', 'vpk120_versal']['vpk120-versal' != '${MACHINE}']}"
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' vpk120_versal']['vpk120-versal' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/vpk180-versal.conf b/meta-xilinx-bsp/conf/machine/vpk180-versal.conf
index dd2dc111..92630e97 100644
--- a/meta-xilinx-bsp/conf/machine/vpk180-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vpk180-versal.conf
@@ -26,7 +26,7 @@ YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "versal_cips_0_pspmc_0_psv_sbsauar
 UBOOT_ENTRYPOINT  ?= "0x200000"
 UBOOT_LOADADDRESS ?= "0x200000"
 
-# vpk180-versal Serial Console 
+# vpk180-versal Serial Console
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
 YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
 
@@ -45,4 +45,4 @@ QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"
 
 #### No additional settings should be after the Postamble
 #### Postamble
-PACKAGE_EXTRA_ARCHS:append = "${@['', 'vpk180_versal']['vpk180-versal' != '${MACHINE}']}"
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' vpk180_versal']['vpk180-versal' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
index dc6f55b1..1db0616f 100644
--- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
@@ -41,4 +41,4 @@ HDF_MACHINE = "zc702-zynq7"
 
 #### No additional settings should be after the Postamble
 #### Postamble
-PACKAGE_EXTRA_ARCHS:append = "${@['', 'zc702_zynq7']['zc702-zynq7' != '${MACHINE}']}"
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' zc702_zynq7']['zc702-zynq7' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
index e6b7ce57..7e0525d1 100644
--- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
@@ -23,7 +23,7 @@ YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "ps7_uart_1"
 UBOOT_ENTRYPOINT  ?= "0x200000"
 UBOOT_LOADADDRESS ?= "0x200000"
 
-# zc702-zynq7 Serial Console
+# zc706-zynq7 Serial Console
 SERIAL_CONSOLES ?= "115200;ttyPS0"
 YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
 
@@ -41,4 +41,4 @@ HDF_MACHINE = "zc706-zynq7"
 
 #### No additional settings should be after the Postamble
 #### Postamble
-PACKAGE_EXTRA_ARCHS:append = "${@['', 'zc706_zynq7']['zc706-zynq7' != '${MACHINE}']}"
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' zc706_zynq7']['zc706-zynq7' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index c434067d..acd2544a 100644
--- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -2,10 +2,6 @@
 #@NAME: zcu102-zynqmp
 #@DESCRIPTION: Machine configuration for the ZCU102 evaluation board.
 
-# Compatibility with old BOARD value.
-# TODO - Remove these once removed from petalinux bsp
-MACHINEOVERRIDES =. "zcu102:"
-
 #### Preamble
 MACHINEOVERRIDES =. "${@['', 'zcu102-zynqmp:']['zcu102-zynqmp' !='${MACHINE}']}"
 #### Regular settings follow
@@ -55,4 +51,4 @@ HDF_MACHINE = "zcu102-zynqmp"
 
 #### No additional settings should be after the Postamble
 #### Postamble
-PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu102_zynqmp']['zcu102-zynqmp' != '${MACHINE}']}"
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' zcu102_zynqmp']['zcu102-zynqmp' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
index 710078eb..b4c11f3a 100644
--- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
@@ -49,9 +49,10 @@ HDF_MACHINE = "zcu104-zynqmp"
 # the xsa. User can enable explicitly if required from local.conf.
 # KERNEL_DEVICETREE = "xilinx/zynqmp-zcu104-revC.dtb"
 
+# Yocto IMAGE_FEATURES Variable
 MACHINE_HWCODECS = "libomxil-xlnx"
 IMAGE_FEATURES += "hwcodecs"
 
 #### No additional settings should be after the Postamble
 #### Postamble
-PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu104_zynqmp']['zcu104-zynqmp' != '${MACHINE}']}"
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' zcu104_zynqmp']['zcu104-zynqmp' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
index 23a936d8..ff273134 100644
--- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
@@ -2,10 +2,6 @@
 #@NAME: zcu106-zynqmp
 #@DESCRIPTION: Machine configuration for the ZCU106 evaluation board.
 
-# Compatibility with old BOARD value.
-# TODO - Remove these once removed from petalinux bsp
-MACHINEOVERRIDES =. "zcu106:"
-
 #### Preamble
 MACHINEOVERRIDES =. "${@['', 'zcu106-zynqmp:']['zcu106-zynqmp' !='${MACHINE}']}"
 #### Regular settings follow
@@ -53,9 +49,10 @@ HDF_MACHINE = "zcu106-zynqmp"
 # the xsa. User can enable explicitly if required from local.conf.
 # KERNEL_DEVICETREE = "xilinx/zynqmp-zcu106-revA.dtb"
 
+# Yocto IMAGE_FEATURES Variable
 MACHINE_HWCODECS = "libomxil-xlnx"
 IMAGE_FEATURES += "hwcodecs"
 
 #### No additional settings should be after the Postamble
 #### Postamble
-PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu106_zynqmp']['zcu106-zynqmp' != '${MACHINE}']}"
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' zcu106_zynqmp']['zcu106-zynqmp' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
index 5868449f..77da93ca 100644
--- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
@@ -2,10 +2,6 @@
 #@NAME: zcu111-zynqmp
 #@DESCRIPTION: Machine configuration for the ZCU111 evaluation board.
 
-# Compatibility with old BOARD value.
-# TODO - Remove these once removed from petalinux bsp
-MACHINEOVERRIDES =. "zcu111:"
-
 #### Preamble
 MACHINEOVERRIDES =. "${@['', 'zcu111-zynqmp:']['zcu111-zynqmp' !='${MACHINE}']}"
 #### Regular settings follow
@@ -55,4 +51,4 @@ HDF_MACHINE = "zcu111-zynqmp"
 
 #### No additional settings should be after the Postamble
 #### Postamble
-PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu111_zynqmp']['zcu111-zynqmp' != '${MACHINE}']}"
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' zcu111_zynqmp']['zcu111-zynqmp' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
index 71c94038..18aa3eee 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
@@ -1,3 +1,5 @@
+XILINX_DEPRECATED[zcu1275-zynqmp] = "${@'zcu1275-zynqmp is not supported in 2023.2' if d.getVar("XILINX_RELEASE_VERSION") == 'v2023.2' else ''}"
+
 #@TYPE: Machine
 #@NAME: zcu1275-zynqmp
 #@DESCRIPTION: Machine configuration for the ZCU1275 evaluation board.
diff --git a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
index 812a283f..6fba3619 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
@@ -1,3 +1,5 @@
+XILINX_DEPRECATED[zcu1285-zynqmp] = "${@'zcu1285-zynqmp is not supported in 2023.2' if d.getVar("XILINX_RELEASE_VERSION") == 'v2023.2' else ''}"
+
 #@TYPE: Machine
 #@NAME: zcu1285-zynqmp
 #@DESCRIPTION: Machine configuration for the ZCU1285 evaluation board.
diff --git a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
index 273606e2..7bb2c9db 100644
--- a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
@@ -47,4 +47,4 @@ HDF_MACHINE = "zcu208-zynqmp"
 
 #### No additional settings should be after the Postamble
 #### Postamble
-PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu208_zynqmp']['zcu208-zynqmp' != '${MACHINE}']}"
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' zcu208_zynqmp']['zcu208-zynqmp' != '${MACHINE}']}"
diff --git a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
index 80a15358..f4e1619d 100644
--- a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
@@ -47,4 +47,4 @@ HDF_MACHINE = "zcu216-zynqmp"
 
 #### No additional settings should be after the Postamble
 #### Postamble
-PACKAGE_EXTRA_ARCHS:append = "${@['', 'zcu216_zynqmp']['zcu216-zynqmp' != '${MACHINE}']}"
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' zcu216_zynqmp']['zcu216-zynqmp' != '${MACHINE}']}"