diff --git a/meta-xilinx/meta-xilinx-bsp/conf/bblayers.conf.sample b/meta-xilinx/meta-xilinx-bsp/conf/bblayers.conf.sample
index e960dbd..07f7565 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/bblayers.conf.sample
+++ b/meta-xilinx/meta-xilinx-bsp/conf/bblayers.conf.sample
@@ -27,6 +27,7 @@
     ##OEROOT##/../meta-virtualization \
     ##OEROOT##/../meta-openamp \
     ##OEROOT##/../meta-jupyter \
+    ##OEROOT##/../meta-python2 \
 "
 
 BBLAYERS_NON_REMOVABLE ?= " \
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/layer.conf b/meta-xilinx/meta-xilinx-bsp/conf/layer.conf
index e69e7d1..e680b51 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/layer.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/layer.conf
@@ -15,4 +15,4 @@
 
 BB_DANGLINGAPPENDS_WARNONLY ?= "1"
 
-XILINX_RELEASE_VERSION = "v2020.1"
+XILINX_RELEASE_VERSION = "v2020.2"
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/local.conf.sample b/meta-xilinx/meta-xilinx-bsp/conf/local.conf.sample
index f10cd38..9e7870c 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/local.conf.sample
+++ b/meta-xilinx/meta-xilinx-bsp/conf/local.conf.sample
@@ -201,13 +201,13 @@
 #file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
 #file://.* file:///some/local/dir/sstate/PATH"
 
-XILINX_VER_MAIN = "2020.1"
+XILINX_VER_MAIN = "2020.2"
 
 # Uncomment below lines to provide path for custom xsct trim
 # This is required for building Versal based devices, please fetch the
 # xsct-trim from Xilinx lounge area
 #
-#EXTERNAL_XSCT_TARBALL = "/proj/yocto/xsct-trim/2020.1_xsct_daily_latest"
+#EXTERNAL_XSCT_TARBALL = "/proj/yocto/xsct-trim/2020.2_xsct_daily_latest"
 #VALIDATE_XSCT_CHECKSUM = '0'
 
 # XILINX_VIVADO_DESIGN_SUIT should point to the Vivado installation directly if you are using xilinx-mcs recipe in meta-xilinx-tools
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
new file mode 100644
index 0000000..ae209fd
--- /dev/null
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
@@ -0,0 +1,12 @@
+BOARD ??= ""
+BOARD_VARIANT ??= ""
+
+MACHINEOVERRIDES =. "${@['', '${BOARD}:']['${BOARD}' != '']}"
+MACHINEOVERRIDES =. "${@['', '${BOARD}${BOARD_VARIANT}:']['${BOARD_VARIANT}' != '']}"
+
+
+SOC_BOARD_ARCH ?= "${BOARD}"
+SOC_BOARDVARIANT_ARCH ?= "${BOARD}${BOARD_VARIANT}"
+
+PACKAGE_EXTRA_ARCHS_append = " ${SOC_BOARD_ARCH}"
+PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${SOC_BOARDVARIANT_ARCH}'][d.getVar('SOC_BOARDVARIANT_ARCH') != d.getVar('SOC_BOARD_ARCH')]}"
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/versal-generic.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/versal-generic.conf
index 9bf3593..a1a894e 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/versal-generic.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/versal-generic.conf
@@ -14,6 +14,8 @@
 
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
 
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
+
 # Default SD image build onfiguration, use qemu-sd to pad
 IMAGE_CLASSES += "image-types-xilinx-qemu"
 IMAGE_FSTYPES += "wic.qemu-sd"
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
index 7aa0198..7e8316f 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
@@ -23,6 +23,8 @@
 
 SERIAL_CONSOLES ?= "115200;ttyPS0"
 
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
+
 # We need a generic one that works with QEMU...
 HDF_MACHINE = "zcu102-zynqmp"
 KERNEL_DEVICETREE = "xilinx/zynqmp-zcu102-rev1.0.dtb"