meta-xilinx: subtree update:874b9cee5e..569f52f275

Jaewon Lee (1):
      xilinx-board.inc: Introducing inc file to add BOARD/BOARD_VARIANT

Madhurkiran Harikrishnan (2):
      weston.ini: Do not set hard requirement for input devices
      libmali-xlnx: Update the mali userspace libraries to 2020.2

Mark Hatle (2):
      libmali-xlnx: Fix the package arch
      Various: Packages using libGL may need to be declared SOC_VARIANT_ARCH

Raju Kumar Pothuraju (1):
      versal-generic.conf:zynqmp-generic.conf: Add MACHINE_ESSENTIAL_EXTRA_RDEPENDS variable only for specific machines.

Sai Hari Chandana Kalluri (7):
      Add meta-python2 in bblayers.conf
      xrt_git.bb: Replace deprecated boost macros
      perf: Fix compilation issues Fix perf variable definition and libtraceevent with binutils. The above errors are fixed by including the following patches to the kernel tree: 	0001-libtraceevent-Fix-build-with-binutils-2.35.patch         0001-perf-bench-Share-some-global-variables-to-fix-build-.patch         0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch         0001-perf-tests-bp_account-Make-global-variable-static.patch
      opencv_3.4.3: Remove support for opencv 3.4
      Update commit id and branch for components for 2020.2 release
      update XILINX_VER_MAIN to 2020.2
      bootgen: Update commit id for 2020.2 release

Sandeep Gundlupet Raju (1):
      kernel-module-dp: Add support for Xilinx DP drivers

Vishal Sagar (1):
      kernel-module-hdmi: Update commit id and license md5sum for 2020.2

ch vamshi krishna (3):
      updating xrt commit id
      updating final XRT commit id for 2020.2
      updating XRT/Zocl commit id for 2020.2

rbramand (1):
      ] CR-1076958 Put libxrt libs softlinks in the main package

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I4c6b12024c4d07388334e29177417e34fe6dea87

3 files changed, 16 insertions, 0 deletions

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 000000000..ae209fd6a
--- /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 9bf3593d4..a1a894ec4 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 @@ UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
 
 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 7aa01986e..7e8316f50 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 @@ WKS_FILES ?= "sdimage-bootpart.wks"
 
 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"