diff --git a/meta-xilinx/meta-xilinx-standalone/classes/esw.bbclass b/meta-xilinx/meta-xilinx-standalone/classes/esw.bbclass
index c500149..565b371 100644
--- a/meta-xilinx/meta-xilinx-standalone/classes/esw.bbclass
+++ b/meta-xilinx/meta-xilinx-standalone/classes/esw.bbclass
@@ -7,12 +7,11 @@
 # We should move to an actual SRCREV eventually
 include conf/xilinx/esw-srcrev.inc
 
-EMBEDDEDSW_SRCREV ?= "${AUTOREV}"
-SRCREV = "${EMBEDDEDSW_SRCREV}"
+SRCREV ?= "${AUTOREV}"
 PV = "${XILINX_RELEASE_VERSION}+git${SRCPV}"
-EMBEDDEDSW_REPO ?= "git://github.com/xilinx/embeddedsw.git;protocol=https"
-EMBEDDEDSW_BRANCH ?= "master"
-SRC_URI = "${EMBEDDEDSW_REPO};branch=${EMBEDDEDSW_BRANCH}"
+REPO ?= "git://github.com/xilinx/embeddedsw.git;protocol=https"
+BRANCH ?= "master"
+SRC_URI = "${REPO};branch=${BRANCH}"
 
 SRCREV_FORMAT = "src_decouple"
 
diff --git a/meta-xilinx/meta-xilinx-standalone/conf/distro/xilinx-standalone.conf b/meta-xilinx/meta-xilinx-standalone/conf/distro/xilinx-standalone.conf
index 8f53e99..4273230 100644
--- a/meta-xilinx/meta-xilinx-standalone/conf/distro/xilinx-standalone.conf
+++ b/meta-xilinx/meta-xilinx-standalone/conf/distro/xilinx-standalone.conf
@@ -3,7 +3,7 @@
 DISTRO_NAME_append = " (lto)"
 
 # By default we want to optimize for size.
-FULL_OPTIMIZATION = "-Os -pipe ${DEBUG_FLAGS}"
+FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}"
 
 # Workaround for microblaze -Os bug
 FULL_OPTIMIZATION_microblaze = "-O2 -pipe ${DEBUG_FLAGS}"
diff --git a/meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/gcc-9/additional-microblaze-multilibs.patch b/meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/gcc-9/additional-microblaze-multilibs.patch
index a32045b..3d520d0 100644
--- a/meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/gcc-9/additional-microblaze-multilibs.patch
+++ b/meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/gcc-9/additional-microblaze-multilibs.patch
@@ -56,12 +56,14 @@
 
 Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
 
-diff -ur gcc-9.2.0.orig/gcc/config/microblaze/t-microblaze gcc-9.2.0/gcc/config/microblaze/t-microblaze
---- gcc-9.2.0.orig/gcc/config/microblaze/t-microblaze	2020-02-07 09:46:48.286261214 -0800
-+++ gcc-9.2.0/gcc/config/microblaze/t-microblaze	2020-02-10 17:07:52.440598949 -0800
-@@ -1,16 +1,11 @@
+Index: gcc-9.2.0/gcc/config/microblaze/t-microblaze
+===================================================================
+--- gcc-9.2.0.orig/gcc/config/microblaze/t-microblaze
++++ gcc-9.2.0/gcc/config/microblaze/t-microblaze
+@@ -1,17 +1,11 @@
 -MULTILIB_OPTIONS = m64 mxl-barrel-shift mlittle-endian mno-xl-soft-mul mxl-multiply-high
--MULTILIB_DIRNAMES = m64 bs le m mh
+-#MULTILIB_DIRNAMES = m64 bs le m mh
+-MULTILIB_DIRNAMES = . . . . .
 -MULTILIB_EXCEPTIONS = *m64/mxl-multiply-high mxl-multiply-high
 -MULTILIB_EXCEPTIONS += *m64
 -MULTILIB_EXCEPTIONS += *m64/mxl-barrel-shift
diff --git a/meta-xilinx/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2020.1.bb b/meta-xilinx/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2020.1.bb
index 3ed9c55..652241c 100644
--- a/meta-xilinx/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2020.1.bb
+++ b/meta-xilinx/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2020.1.bb
@@ -53,8 +53,7 @@
     :
 }
 
-PMU_FIRMWARE_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-PMU_FIRMWARE_BASE_NAME[vardepsexclude] = "DATETIME"
+PMU_FIRMWARE_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
 
 do_deploy() {
     install -Dm 0644 ${B}/executable.elf ${DEPLOYDIR}/${PMU_FIRMWARE_BASE_NAME}.elf
@@ -65,4 +64,3 @@
 }
 
 addtask deploy before do_build after do_install
-
diff --git a/meta-xilinx/meta-xilinx-standalone/scripts/microblaze_dtb.py b/meta-xilinx/meta-xilinx-standalone/scripts/microblaze_dtb.py
index aba7249..1c5ed83 100644
--- a/meta-xilinx/meta-xilinx-standalone/scripts/microblaze_dtb.py
+++ b/meta-xilinx/meta-xilinx-standalone/scripts/microblaze_dtb.py
@@ -12,18 +12,21 @@
 #    if is not defined
 #
 # Otherwise 'condition' and value are evaluated by type.
+#
+# If the condition is = then any value of condition_values will set it
+# If the condition is ! then no value of condition_values will set it
 
 microblaze_tune_features = {
   'microblaze' :      (None,                     None, None),
   'bigendian':        ('xlnx,endianness',        '!', 1),
   '64-bit' :          ('xlnx,data-size',         '=', 64),
   'barrel-shift':     ('xlnx,use-barrel',        '=', 1),
-  'pattern-compare':    ('xlnx,use-pcmp-instr',    '=', 1),
+  'pattern-compare':  ('xlnx,use-pcmp-instr',    '=', 1),
   'reorder'   :       ('xlnx,use-reorder-instr', '!', 0),
   'frequency-optimized': ('xlnx,area-optimized', '=', 2),
   'multiply-low':     ('xlnx,use-hw-mul',        '=', 1),
   'multiply-high':    ('xlnx,use-hw-mul',        '=', 2),
-  'divide-high':      ('xlnx,use-div',           '=', 1),
+  'divide-hard':      ('xlnx,use-div',           '=', 1),
   'fpu-soft':         ('xlnx,use-fpu',           '!', [1,2]),
   'fpu-hard':         ('xlnx,use-fpu',           '=', 1),
   'fpu-hard-extended':('xlnx,use-fpu',           '=', 2),
@@ -73,21 +76,14 @@
             else:
                 raise TypeError('Unknown type %s' % ctype)
 
-            if cop == '!':
-                if value != val:
-                    result = True
-                else:
-                    result = False
-                continue
+            if value == val:
+                result = True
+                break
+            else:
+                result = False
 
-            if cop == '=':
-                if value == val:
-                    result = True
-                else:
-                    result = False
-                continue
-
-        if result == True:
+        if (cop == '!' and result == False) or \
+           (cop == '=' and result == True):
             TUNE_FEATURES.append(feature)
 
     return TUNE_FEATURES