Rename u-boot-xlnx and linux-xlnx to 2021.1 version

Both components now have in-development changes that are incompatible with
gatesgarth 2020.2 version.

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

2 files changed, 0 insertions, 5 deletions

diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.2.bb b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2021.1.bb
index 95c7254c..9e289a08 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.2.bb
+++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2021.1.bb
@@ -7,10 +7,6 @@ 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-bsp/recipes-kernel/linux/linux-xlnx_2020.2.bb b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2021.1.bb
index 44fa42de..314b293a 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2020.2.bb
+++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2021.1.bb
@@ -10,6 +10,5 @@ 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 \
 "