meta-xilinx: subtree update:a9025136f5..eb4ba06eb1

David Roman (1):
      picozed-zynq7.dts: add marvell,88e1510 to eth phy

Jaewon Lee (3):
      xilinx-board.inc: fixing BOARD_ARCH and BOARDVARIANT_ARCH names
      Adding BOARD and BOARD_VARIANT level hierarchy
      ultra96: Using BOARD level hiearchy for ultra96 overrides

Madhurkiran Harikrishnan (1):
      weston: Update the weston patches to comply with weston-9.0

Philip Balister (2):
      u-boot-xlnx: Fix build error by applying patch from upstream u-boot.
      linux-xlnx: Fix build with patch from upstream kernel for gcc-10.

Raju Kumar Pothuraju (1):
      linux-xlnx.inc: Update overlay config fragments

Sai Hari Chandana Kalluri (4):
      Update LICENSE_CHECKSUM for kernel-module-hdmi
      zcu102-zynqmp.conf: Fix qemuboot for zcu102-zynqmp
      Cleanup QB_MACHINE for xilinx machines
      qemu-xilinx: Fix patch puzz warning during do_patch

Varalaxmi Bingi (1):
      meta-xilinx-bsp: Move uboot-device-tree to meta-xilinx-tools layer

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

26 files changed, 125 insertions, 200 deletions

diff --git a/meta-xilinx/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass b/meta-xilinx/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass
index 62ecbdf91..1c3f2bb61 100644
--- a/meta-xilinx/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass
+++ b/meta-xilinx/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass
@@ -5,10 +5,10 @@ OVERRIDES .= ":qemuboot-xilinx"
 # Default machine targets for Xilinx QEMU (FDT Generic)
 # Allow QB_MACHINE to be overridden by a BSP config
 QB_MACHINE ?= "${QB_MACHINE_XILINX}"
-
+QB_RNG=""
 QB_MACHINE_XILINX_aarch64 = "-machine arm-generic-fdt"
-QB_MACHINE_XILINX_arm = "-machine arm-generic-fdt-7series"
-QB_MACHINE_XILINX_microblaze = "-machine microblaze-fdt-plnx"
+QB_MACHINE_XILINX_arm = "-M arm-generic-fdt-7series"
+QB_MACHINE_XILINX_microblaze = "-M microblaze-fdt-plnx"
 
 # defaults
 QB_DEFAULT_KERNEL ?= "none"
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
index ae209fd6a..700a2f805 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
@@ -5,8 +5,8 @@ MACHINEOVERRIDES =. "${@['', '${BOARD}:']['${BOARD}' != '']}"
 MACHINEOVERRIDES =. "${@['', '${BOARD}${BOARD_VARIANT}:']['${BOARD_VARIANT}' != '']}"
 
 
-SOC_BOARD_ARCH ?= "${BOARD}"
-SOC_BOARDVARIANT_ARCH ?= "${BOARD}${BOARD_VARIANT}"
+BOARD_ARCH ?= "${BOARD}"
+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')]}"
+PACKAGE_EXTRA_ARCHS_append = " ${BOARD_ARCH}"
+PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${BOARDVARIANT_ARCH}'][d.getVar('BOARDVARIANT_ARCH') != d.getVar('BOARD_ARCH')]}"
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
index 045e9422c..f31c10cf2 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf
@@ -5,6 +5,9 @@
 
 require conf/machine/include/soc-zynqmp.inc
 require conf/machine/include/machine-xilinx-default.inc
+require conf/machine/include/xilinx-board.inc
+
+BOARD = "ultra96"
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget wifi bluetooth mipi"
 
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
index 4c174d2f5..bbc068874 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
@@ -37,7 +37,6 @@ IMAGE_BOOT_FILES += " \
     boot.scr \
 "
 # This machine has a QEMU model, runqemu setup:
-QB_MACHINE = "-M arm-generic-fdt"
 QB_MEM = "-m 8G"
 QB_DEFAULT_KERNEL = "none"
 QB_NETWORK_DEVICE = ""
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/vck190-versal.conf
index c9813b70c..1ab6a1c75 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/vck190-versal.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/vck190-versal.conf
@@ -43,7 +43,6 @@ PSM_FIRMWARE_IMAGE_NAME ?= "psm-firmware-versal-mb"
 
 
 # This machine has a QEMU model, runqemu setup:
-QB_MACHINE = "-M arm-generic-fdt"
 QB_MEM = "-m 8G"
 QB_DEFAULT_KERNEL = "none"
 QB_NETWORK_DEVICE = ""
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 a1a894ec4..dd6966a0a 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/versal-generic.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/versal-generic.conf
@@ -5,6 +5,7 @@
 require conf/machine/include/soc-versal.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-qemu.inc
+require conf/machine/include/xilinx-board.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
@@ -47,7 +48,6 @@ PSM_FIRMWARE_IMAGE_NAME ?= "psm-firmware-versal-mb"
 HDF_MACHINE = "vc-p-a2197-00-versal"
 
 # This machine has a QEMU model, runqemu setup:
-QB_MACHINE = "-M arm-generic-fdt"
 QB_MEM = "-m 8G"
 QB_DEFAULT_KERNEL = "none"
 QB_NETWORK_DEVICE = ""
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
index baa5e12f0..e9044ba7f 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
@@ -35,7 +35,6 @@ IMAGE_BOOT_FILES += " \
 "
 
 # This machine has a QEMU model, runqemu setup:
-QB_MACHINE = "-M arm-generic-fdt"
 QB_MEM = "-m 8G"
 QB_DEFAULT_KERNEL = "none"
 QB_NETWORK_DEVICE = ""
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index dee379785..2c890cfb8 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -37,7 +37,6 @@ IMAGE_BOOT_FILES += " \
 		"
 
 # This machine has a QEMU model, runqemu setup:
-QB_MACHINE = "-machine xlnx-zcu102"
 QB_MEM = "-m 4096"
 QB_OPT_APPEND ?= "-nographic -serial mon:stdio -serial null"
 QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@"
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/zynq-generic.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/zynq-generic.conf
index 0f38e32b0..be0f701cb 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/zynq-generic.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/zynq-generic.conf
@@ -5,6 +5,7 @@
 require conf/machine/include/soc-zynq.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-qemu.inc
+require conf/machine/include/xilinx-board.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget"
 
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 7e8316f50..9c7dbe839 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
@@ -8,6 +8,7 @@ SOC_VARIANT ?= "cg"
 require conf/machine/include/soc-zynqmp.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-qemu.inc
+require conf/machine/include/xilinx-board.inc
 
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 
@@ -46,7 +47,6 @@ IMAGE_BOOT_FILES += " \
 		"
 
 # This machine has a QEMU model, runqemu setup:
-QB_MACHINE = "-machine xlnx-zcu102"
 QB_MEM = "-m 4096"
 QB_OPT_APPEND ?= "-nographic -serial mon:stdio -serial null"
 QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@"
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-bsp/device-tree/files/picozed-zynq7.dts b/meta-xilinx/meta-xilinx-bsp/recipes-bsp/device-tree/files/picozed-zynq7.dts
index 4ec64f5e2..6f9b653ab 100644
--- a/meta-xilinx/meta-xilinx-bsp/recipes-bsp/device-tree/files/picozed-zynq7.dts
+++ b/meta-xilinx/meta-xilinx-bsp/recipes-bsp/device-tree/files/picozed-zynq7.dts
@@ -34,7 +34,7 @@
 	phy-handle = <&ethernet_phy>;
 
 	ethernet_phy: ethernet-phy@0 {
-		compatible = "marvell,88e1512";
+		compatible = "marvell,88e1512", "marvell,88e1510";
 		device_type = "ethernet-phy";
 		reg = <0>;
 	};
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch b/meta-xilinx/meta-xilinx-bsp/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch
new file mode 100644
index 000000000..7091098ca
--- /dev/null
+++ b/meta-xilinx/meta-xilinx-bsp/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch
@@ -0,0 +1,28 @@
+From 8127b19aa42ccfb3faae1173a12b3eb0cebf8941 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Thu, 30 Jan 2020 09:37:15 +0000
+Subject: [PATCH] Remove redundant YYLOC global declaration
+
+Same as the upstream fix for building dtc with gcc 10.
+
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+State: upstream (e33a814e772cdc36436c8c188d8c42d019fda639)
+---
+ scripts/dtc/dtc-lexer.l | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
+index fd825ebba6..24af549977 100644
+--- a/scripts/dtc/dtc-lexer.l
++++ b/scripts/dtc/dtc-lexer.l
+@@ -38,7 +38,6 @@ LINECOMMENT	"//".*\n
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+ 
+-YYLTYPE yylloc;
+ extern bool treesource_error;
+ 
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
+-- 
+2.29.2
+
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.2.bb b/meta-xilinx/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.2.bb
index 9e289a089..95c7254c6 100644
--- a/meta-xilinx/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.2.bb
+++ b/meta-xilinx/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.2.bb
@@ -7,6 +7,10 @@ SRCREV ?= "bb4660c33aa7ea64f78b2682bf0efd56765197d6"
 include u-boot-xlnx.inc
 include u-boot-spl-zynq-init.inc
 
+# Patch required for latest gcc and 2020.2 version of u-boot-xlnx
+# This will be removed once the SRCREV above has been updated to include this change
+SRC_URI += " file://0001-Remove-redundant-YYLOC-global-declaration.patch"
+
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897"
 
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-bsp/uboot-device-tree/uboot-device-tree.bb b/meta-xilinx/meta-xilinx-bsp/recipes-bsp/uboot-device-tree/uboot-device-tree.bb
deleted file mode 100644
index 885dce8c8..000000000
--- a/meta-xilinx/meta-xilinx-bsp/recipes-bsp/uboot-device-tree/uboot-device-tree.bb
+++ /dev/null
@@ -1,78 +0,0 @@
-SUMMARY = "Xilinx BSP u-boot device trees"
-DESCRIPTION = "Xilinx BSP u-boot device trees from within layer."
-SECTION = "bsp"
-
-LICENSE = "MIT & GPLv2"
-LIC_FILES_CHKSUM = " \
-                file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \
-                file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \
-                "
-
-inherit devicetree xsctdt xsctyaml
-
-
-REPO ??= "git://github.com/xilinx/device-tree-xlnx.git;protocol=https"
-BRANCH ??= "master"
-BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}"
-SRC_URI = "${REPO};${BRANCHARG}"
-
-PROVIDES = "virtual/uboot-dtb"
-
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
-
-SRCREV ??= "bc8445833318e9320bf485ea125921eecc3dc97a"
-PV = "xilinx+git${SRCPV}"
-
-PACKAGE_ARCH ?= "${MACHINE_ARCH}"
-
-COMPATIBLE_MACHINE ?= "^$"
-COMPATIBLE_MACHINE_zynqmp = ".*"
-COMPATIBLE_MACHINE_zynq = ".*"
-COMPATIBLE_MACHINE_versal = ".*"
-
-XSCTH_BUILD_CONFIG ?= ""
-
-DT_FILES_PATH = "${XSCTH_WS}/${XSCTH_PROJ}"
-DT_INCLUDE_append = " ${WORKDIR}"
-DT_PADDING_SIZE = "0x1000"
-
-UBOOT_DTS ?= ""
-XSCTH_MISC = " -hdf_type ${HDF_EXT}"
-XSCTH_APP = "device-tree"
-YAML_DT_BOARD_FLAGS_zynqmp-generic ?= ""
-YAML_DT_BOARD_FLAGS_versal-generic ?= ""
-YAML_DT_BOARD_FLAGS_zynq-generic ?= ""
-UBOOT_DTS_NAME = "u-boot"
-DTB_FILE = "u-boot.dtb"
-
-do_configure[dirs] += "${DT_FILES_PATH}"
-SRC_URI_append = "${@" ".join(["file://%s" % f for f in (d.getVar('UBOOT_DTS') or "").split()])}"
-
-do_configure_prepend () {
-    if [ ! -z "${UBOOT_DTS}" ]; then
-        for f in ${UBOOT_DTS}; do
-            cp -rf ${WORKDIR}/${f} ${DT_FILES_PATH}/
-        done
-        return
-    fi
-}
-
-
-#Both linux dtb and uboot dtb are installing
-#system-top.dtb for uboot env recipe while do_prepare_recipe_sysroot
-#moving system-top.dts to othername.
-do_compile_prepend() {
-    import shutil
-   
-    listpath = d.getVar("DT_FILES_PATH")
-    try:
-        os.remove(os.path.join(listpath, "system.dts"))
-        shutil.move(os.path.join(listpath, "system-top.dts"), os.path.join(listpath, d.getVar("UBOOT_DTS_NAME") + ".dts"))
-    except OSError:
-        pass
-}
-
-do_deploy() {
-        install -Dm 0644 ${B}/${UBOOT_DTS_NAME}.dtb ${DEPLOYDIR}/${UBOOT_DTS_NAME}.dtb
-}
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/files/0001-Add-enable-disable-udev.patch b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/files/0001-Add-enable-disable-udev.patch
index c2c5849d6..f38862fac 100644
--- a/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/files/0001-Add-enable-disable-udev.patch
+++ b/meta-xilinx/meta-xilinx-bsp/recipes-devtools/qemu/files/0001-Add-enable-disable-udev.patch
@@ -1,21 +1,23 @@
-From a471cf4e4c73350e090eb2cd87ec959d138012e5 Mon Sep 17 00:00:00 2001
+From 96f204df74f7dde5f4c9ad6e6eefc2d46219ccd9 Mon Sep 17 00:00:00 2001
 From: Jeremy Puhlman <jpuhlman@mvista.com>
 Date: Thu, 19 Mar 2020 11:54:26 -0700
 Subject: [PATCH] Add enable/disable libudev
 
 Upstream-Status: Pending
 Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
+
+%% original patch: 0001-Add-enable-disable-udev.patch
 ---
  configure | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/configure b/configure
-index cac271c..bd116eb 100755
+index c9a4e73..75f9773 100755
 --- a/configure
 +++ b/configure
-@@ -1539,6 +1539,10 @@ for opt do
+@@ -1606,6 +1606,10 @@ for opt do
    ;;
-   --disable-plugins) plugins="no"
+   --gdb=*) gdb_bin="$optarg"
    ;;
 +  --enable-libudev) libudev="yes"
 +  ;;
@@ -25,5 +27,5 @@ index cac271c..bd116eb 100755
        echo "ERROR: unknown option $opt"
        echo "Try '$0 --help' for more information"
 -- 
-1.8.3.1
+2.7.4
 
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/files/0001-gl-renderer.c-Use-gr-egl_config-to-create-pbuffer-su.patch b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/files/0001-gl-renderer.c-Use-gr-egl_config-to-create-pbuffer-su.patch
deleted file mode 100644
index d7d411f63..000000000
--- a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/files/0001-gl-renderer.c-Use-gr-egl_config-to-create-pbuffer-su.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 7cc76d50bddd6ff1eb5fb19712415f385f5d3f49 Mon Sep 17 00:00:00 2001
-From: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
-Date: Mon, 3 Feb 2020 14:26:21 -0800
-Subject: [PATCH] gl-renderer.c: Use gr->egl_config to create pbuffer surface
-
-The original implementation always chose first egl config for pbuffer
-surface type, however the returned configs are implementation specific
-and egl config may not always match between ctx and surface. Hence,
-use gr->egl_config which already has the matching config but ensure that
-windows and pbuffer bit are set for the surface type.
-
-Signed-off-by: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
-Upstream-status: Pending
----
- libweston/renderer-gl/gl-renderer.c | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c
-index 54f8b1c..f50c959 100644
---- a/libweston/renderer-gl/gl-renderer.c
-+++ b/libweston/renderer-gl/gl-renderer.c
-@@ -3567,7 +3567,7 @@ gl_renderer_setup_egl_extensions(struct weston_compositor *ec)
- }
- 
- static const EGLint gl_renderer_opaque_attribs[] = {
--	EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-+	EGL_SURFACE_TYPE, EGL_WINDOW_BIT | EGL_PBUFFER_BIT,
- 	EGL_RED_SIZE, 1,
- 	EGL_GREEN_SIZE, 1,
- 	EGL_BLUE_SIZE, 1,
-@@ -3577,7 +3577,7 @@ static const EGLint gl_renderer_opaque_attribs[] = {
- };
- 
- static const EGLint gl_renderer_alpha_attribs[] = {
--	EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-+	EGL_SURFACE_TYPE, EGL_WINDOW_BIT | EGL_PBUFFER_BIT,
- 	EGL_RED_SIZE, 1,
- 	EGL_GREEN_SIZE, 1,
- 	EGL_BLUE_SIZE, 1,
-@@ -3682,15 +3682,7 @@ static int
- gl_renderer_create_pbuffer_surface(struct gl_renderer *gr) {
- 	EGLConfig pbuffer_config;
- 
--	static const EGLint pbuffer_config_attribs[] = {
--		EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
--		EGL_RED_SIZE, 1,
--		EGL_GREEN_SIZE, 1,
--		EGL_BLUE_SIZE, 1,
--		EGL_ALPHA_SIZE, 0,
--		EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
--		EGL_NONE
--	};
-+	EGLint surface_type;
- 
- 	static const EGLint pbuffer_attribs[] = {
- 		EGL_WIDTH, 10,
-@@ -3698,13 +3690,21 @@ gl_renderer_create_pbuffer_surface(struct gl_renderer *gr) {
- 		EGL_NONE
- 	};
- 
--	if (egl_choose_config(gr, pbuffer_config_attribs, NULL, 0, &pbuffer_config) < 0) {
--		weston_log("failed to choose EGL config for PbufferSurface\n");
-+	if(!eglGetConfigAttrib(gr->egl_display, gr->egl_config, EGL_SURFACE_TYPE, &surface_type)) {
-+		weston_log("failed to get surface type for PbufferSurface\n");
-+		return -1;
-+	}
-+
-+	if (!((surface_type & EGL_WINDOW_BIT) && (surface_type & EGL_PBUFFER_BIT)) &&
-+	    !gr->has_configless_context) {
-+		weston_log("attempted to use a different EGL config for an "
-+			   "output but EGL_KHR_no_config_context or "
-+			   "EGL_MESA_configless_context is not supported\n");
- 		return -1;
- 	}
- 
- 	gr->dummy_surface = eglCreatePbufferSurface(gr->egl_display,
--						    pbuffer_config,
-+						    gr->egl_config,
- 						    pbuffer_attribs);
- 
- 	if (gr->dummy_surface == EGL_NO_SURFACE) {
--- 
-2.7.4
-
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch
index e8e8a1f00..33d33b0f5 100644
--- a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch
+++ b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch
@@ -1,6 +1,6 @@
-From 77afc64239199f75041ec344f8f886ee20bba0f8 Mon Sep 17 00:00:00 2001
+From 3fbb596e53524e78703b76c4fdc33cd6ac62f777 Mon Sep 17 00:00:00 2001
 From: Madhurkiran Harikrishnan <madhurkiran.harikrishnan@xilinx.com>
-Date: Tue, 11 Feb 2020 19:07:45 -0800
+Date: Fri, 11 Dec 2020 16:21:38 -0800
 Subject: [PATCH] libweston: Remove substitute format for ARGB8888
 
 Xilinx DP gfx layer does not support XRGB8888. Hence, remove the same
@@ -13,17 +13,17 @@ Upstream-Status : Inappropriate [Xilinx specific]
  1 file changed, 1 deletion(-)
 
 diff --git a/libweston/pixel-formats.c b/libweston/pixel-formats.c
-index b96f3b2..e2a7715 100644
+index 79dc709..ec2d3b7 100644
 --- a/libweston/pixel-formats.c
 +++ b/libweston/pixel-formats.c
-@@ -165,7 +165,6 @@ static const struct pixel_format_info pixel_format_table[] = {
- 	},
+@@ -193,7 +193,6 @@ static const struct pixel_format_info pixel_format_table[] = {
  	{
  		DRM_FORMAT(ARGB8888),
+ 		BITS_RGBA_FIXED(8, 8, 8, 8),
 -		.opaque_substitute = DRM_FORMAT_XRGB8888,
  		.depth = 32,
  		.bpp = 32,
  		GL_FORMAT(GL_BGRA_EXT),
 -- 
-2.7.4
+2.17.1
 
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/weston_%.bbappend b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/weston_%.bbappend
index a13b627a4..d1912a814 100644
--- a/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/weston_%.bbappend
+++ b/meta-xilinx/meta-xilinx-bsp/recipes-graphics/weston/weston_%.bbappend
@@ -1,5 +1,3 @@
 FILESEXTRAPATHS_prepend_zynqmp := "${THISDIR}/files:"
 
-SRC_URI_append_zynqmp = " file://0001-gl-renderer.c-Use-gr-egl_config-to-create-pbuffer-su.patch \
-                          file://0001-libweston-Remove-substitute-format-for-ARGB8888.patch \
-			"
+SRC_URI_append_zynqmp = " file://0001-libweston-Remove-substitute-format-for-ARGB8888.patch"
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-kernel/hdmi/kernel-module-hdmi_git.bb b/meta-xilinx/meta-xilinx-bsp/recipes-kernel/hdmi/kernel-module-hdmi_git.bb
index 6a88ac51d..b26ecd948 100644
--- a/meta-xilinx/meta-xilinx-bsp/recipes-kernel/hdmi/kernel-module-hdmi_git.bb
+++ b/meta-xilinx/meta-xilinx-bsp/recipes-kernel/hdmi/kernel-module-hdmi_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "Xilinx HDMI Linux Kernel module"
 DESCRIPTION = "Out-of-tree HDMI kernel modules provider for MPSoC EG/EV devices"
 SECTION = "kernel/modules"
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=498a38cdcb922b9e987bbbb46e8a9ee5"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=570506b747d768e7802376f932dff926"
 
 XLNX_HDMI_VERSION = "5.4.0"
 PV = "${XLNX_HDMI_VERSION}"
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
index a1e4cb0ba..eb64045a8 100644
--- a/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
+++ b/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
@@ -1,14 +1,14 @@
 # TIInit_11.8.32.bts is required for bluetooth support but this particular
 # version is not available in the linux-firmware repository.
 #
-SRC_URI_append_ultra96-zynqmp = "\
+SRC_URI_append_ultra96 = "\
 	https://git.ti.com/ti-bt/service-packs/blobs/raw/c290f8af9e388f37e509ecb111a1b64572b7c225/initscripts/TIInit_11.8.32.bts;name=TIInit_11.8.32 \
 	"
 
 SRC_URI[TIInit_11.8.32.md5sum] = "b1e142773e8ef0537b93895ebe2fcae3"
 SRC_URI[TIInit_11.8.32.sha256sum] = "962322c05857ad6b1fb81467bdfc59c125e04a6a8eaabf7f24b742ddd68c3bfa"
 
-do_install_append_ultra96-zynqmp() {
+do_install_append_ultra96() {
 	cp ${WORKDIR}/TIInit_11.8.32.bts ${D}${nonarch_base_libdir}/firmware/ti-connectivity/
 	( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . )
 	rm -f ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_7*
@@ -17,12 +17,13 @@ do_install_append_ultra96-zynqmp() {
 
 INSANE_SKIP_${PN} += "installed-vs-shipped"
 
-PACKAGES_remove_ultra96-zynqmp = "${PN}-wl12xx"
+PACKAGES_remove_ultra96 = "${PN}-wl12xx"
 
-FILES_${PN}-wl18xx_ultra96-zynqmp = " \
+FILES_${PN}-wl18xx_ultra96 = " \
 	${nonarch_base_libdir}/firmware/wl18* \
 	${nonarch_base_libdir}/firmware/TI* \
 	${nonarch_base_libdir}/firmware/ti-connectivity/wl18* \
 	${nonarch_base_libdir}/firmware/ti-connectivity/TI* \
 	"
 
+PACKAGE_ARCH_ultra96 = "${BOARD_ARCH}"
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc
index 6b4264f54..a98fc8018 100644
--- a/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc
+++ b/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc
@@ -56,10 +56,10 @@ KERNEL_FEATURES_append_kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-feat
 
 KERNEL_FEATURES_append_zynqmp = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)}"
 
-KERNEL_FEATURES_append_zynqmp = "${@' features/xilinx/overlay/overlay_of.scc' if d.getVar('FPGA_MNGR_RECONFIG_ENABLE') == '1' else ''}"
+KERNEL_FEATURES_append_zynqmp = "${@' features/xilinx/overlay_of/overlay_of.scc' if d.getVar('FPGA_MNGR_RECONFIG_ENABLE') == '1' else ''}"
 
 KERNEL_FEATURES_append_versal = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)} features/xilinx/hdmi-module/hdmi-module.scc"
 
-KERNEL_FEATURES_append_ultra96-zynqmp = " bsp/xilinx/ultra96-zynqmp/mipi-config-ultra96.scc"
+KERNEL_FEATURES_append_ultra96 = " bsp/xilinx/ultra96-zynqmp/mipi-config-ultra96.scc"
 
 KERNEL_FEATURES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', ' features/ocicontainer/ocicontainer.scc', '', d)}"
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/0001-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/0001-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch
new file mode 100644
index 000000000..d5b96c2d1
--- /dev/null
+++ b/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/0001-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch
@@ -0,0 +1,51 @@
+From e33a814e772cdc36436c8c188d8c42d019fda639 Mon Sep 17 00:00:00 2001
+From: Dirk Mueller <dmueller@suse.com>
+Date: Tue, 14 Jan 2020 18:53:41 +0100
+Subject: [PATCH] scripts/dtc: Remove redundant YYLOC global declaration
+
+gcc 10 will default to -fno-common, which causes this error at link
+time:
+
+  (.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here
+
+This is because both dtc-lexer as well as dtc-parser define the same
+global symbol yyloc. Before with -fcommon those were merged into one
+defintion. The proper solution would be to to mark this as "extern",
+however that leads to:
+
+  dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls]
+   26 | extern YYLTYPE yylloc;
+      |                ^~~~~~
+In file included from dtc-lexer.l:24:
+dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here
+  127 | extern YYLTYPE yylloc;
+      |                ^~~~~~
+cc1: all warnings being treated as errors
+
+which means the declaration is completely redundant and can just be
+dropped.
+
+Signed-off-by: Dirk Mueller <dmueller@suse.com>
+Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
+[robh: cherry-pick from upstream]
+Cc: stable@vger.kernel.org
+Signed-off-by: Rob Herring <robh@kernel.org>
+---
+ scripts/dtc/dtc-lexer.l | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
+index 5c6c3fd557d7..b3b7270300de 100644
+--- a/scripts/dtc/dtc-lexer.l
++++ b/scripts/dtc/dtc-lexer.l
+@@ -23,7 +23,6 @@ LINECOMMENT	"//".*\n
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+ 
+-YYLTYPE yylloc;
+ extern bool treesource_error;
+ 
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
+-- 
+2.29.2
+
diff --git a/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2020.2.bb b/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2020.2.bb
index 314b293ab..44fa42de1 100644
--- a/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2020.2.bb
+++ b/meta-xilinx/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2020.2.bb
@@ -10,5 +10,6 @@ SRC_URI_append = " \
        file://0001-perf-tests-bp_account-Make-global-variable-static.patch \
        file://0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch \
        file://0001-libtraceevent-Fix-build-with-binutils-2.35.patch \
+       file://0001-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch \
 "
 
diff --git a/meta-xilinx/meta-xilinx-pynq/classes/xilinx-pynq.bbclass b/meta-xilinx/meta-xilinx-pynq/classes/xilinx-pynq.bbclass
index 645d1da21..a183a78e5 100644
--- a/meta-xilinx/meta-xilinx-pynq/classes/xilinx-pynq.bbclass
+++ b/meta-xilinx/meta-xilinx-pynq/classes/xilinx-pynq.bbclass
@@ -14,7 +14,7 @@ INSANE_SKIP_${PN} += "staticdev dev-so"
 inherit python3-dir
 
 # Used for setup.py on PYNQ
-BOARD_NAME_ultra96-zynqmp = "Ultra96"
+BOARD_NAME_ultra96 = "Ultra96"
 BOARD_NAME_zcu104-zynqmp = "ZCU104"
 
 do_compile_prepend() {
diff --git a/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb b/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb
index 6a69ea210..c20ac5d64 100644
--- a/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb
+++ b/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb
@@ -22,7 +22,7 @@ RDEPENDS_${PN}-notebooks += "\
 "
 
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_ultra96-zynqmp = "ultra96-zynqmp"
+COMPATIBLE_MACHINE_ultra96 = "${MACHINE}"
 
 S = "${WORKDIR}/git"
 
@@ -55,3 +55,4 @@ do_install () {
     cp -r ${S}/notebooks/* ${JUPYTER_NOTEBOOKS}/bnn_examples/
 }
 
+PACKAGE_ARCH_ultra96 = "${BOARD_ARCH}"
diff --git a/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb b/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb
index 1cddb6021..d1aabb7d2 100644
--- a/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb
+++ b/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb
@@ -15,7 +15,7 @@ SRC_URI = "git://github.com/Xilinx/PYNQ-HelloWorld.git;protocol=https \
 "
 
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_ultra96-zynqmp = "ultra96-zynqmp"
+COMPATIBLE_MACHINE_ultra96 = "${MACHINE}"
 
 SRC_URI[md5sum] = "ac1bfe94a18301b26ae5110ea26ca596"
 SRC_URI[sha256sum] = "f522c54c9418d1b1fdb6098cd7139439d47b041900000812c51200482d423460"
@@ -37,3 +37,4 @@ do_install() {
 
 }
 
+PACKAGE_ARCH_ultra96 = "${BOARD_ARCH}"