Merge pull request #76 from Intel-BMC/update1-0.86

Update

1 files changed, 0 insertions, 25 deletions

diff --git a/meta-xilinx/meta-xilinx-pynq/recipes-devtool/python/python3-pynq/0001-Fix-3.6-ism-in-Xlnk-class.patch b/meta-xilinx/meta-xilinx-pynq/recipes-devtool/python/python3-pynq/0001-Fix-3.6-ism-in-Xlnk-class.patch
deleted file mode 100644
index d947a3a61..000000000
--- a/meta-xilinx/meta-xilinx-pynq/recipes-devtool/python/python3-pynq/0001-Fix-3.6-ism-in-Xlnk-class.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 940acab94a60708a9a9092579af52c1195f23fae Mon Sep 17 00:00:00 2001
-From: Peter Ogden <ogden@xilinx.com>
-Date: Tue, 3 Mar 2020 06:21:03 -0500
-Subject: [PATCH 1/3] Fix 3.6-ism in Xlnk class
-
----
- pynq/xlnk.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pynq/xlnk.py b/pynq/xlnk.py
-index c07f1e5..a25e0e3 100644
---- a/pynq/xlnk.py
-+++ b/pynq/xlnk.py
-@@ -423,7 +423,7 @@ class Xlnk:
-             for l in f.readlines():
-                 m = re.match('CmaTotal:[\\s]+([0-9]+) kB', l)
-                 if m:
--                    return int(m[1]) * 1024
-+                    return int(m.group(1)) * 1024
-         return 0
- 
-     def flush(self, bo, offset, vaddr, nbytes):
--- 
-2.7.4
-