diff --git a/meta-xilinx/meta-xilinx-standalone/classes/esw.bbclass b/meta-xilinx/meta-xilinx-standalone/classes/esw.bbclass
index 565b371..1f7e35f 100644
--- a/meta-xilinx/meta-xilinx-standalone/classes/esw.bbclass
+++ b/meta-xilinx/meta-xilinx-standalone/classes/esw.bbclass
@@ -15,8 +15,8 @@
 
 SRCREV_FORMAT = "src_decouple"
 
-S = "${WORKDIR}/git/"
-B = "${WORKDIR}/build/"
+S = "${WORKDIR}/git"
+B = "${WORKDIR}/build"
 OECMAKE_SOURCEPATH = "${S}/${ESW_COMPONENT_SRC}"
 
 SPECFILE_PATH_arm = "${S}/scripts/specs/arm/Xilinx.spec"
diff --git a/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.1.0.bbappend b/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.%.bbappend
similarity index 90%
rename from meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.1.0.bbappend
rename to meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.%.bbappend
index b224502..646d0e9 100644
--- a/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.1.0.bbappend
+++ b/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.%.bbappend
@@ -9,5 +9,4 @@
 	--enable-newlib-io-long-long \
 	--enable-newlib-io-float \
 	--enable-newlib-io-long-double \
-	--disable-newlib-supplied-syscalls \
 "
diff --git a/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_3.1.0.bbappend b/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_3.%.bbappend
similarity index 93%
rename from meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_3.1.0.bbappend
rename to meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_3.%.bbappend
index 536a23a..90522cf 100644
--- a/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_3.1.0.bbappend
+++ b/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_3.%.bbappend
@@ -6,7 +6,6 @@
 	--enable-newlib-io-long-long \
 	--enable-newlib-io-float \
 	--enable-newlib-io-long-double \
-	--disable-newlib-supplied-syscalls \
 "
 
 # Avoid trimmping CCARGS from CC by newlib configure
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-10/additional-microblaze-multilibs.patch
similarity index 100%
rename from meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/gcc-9/additional-microblaze-multilibs.patch
rename to meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/gcc-10/additional-microblaze-multilibs.patch
diff --git a/meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_9.%.bbappend b/meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend
similarity index 95%
rename from meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_9.%.bbappend
rename to meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend
index 6a4a8c5..e187670 100644
--- a/meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_9.%.bbappend
+++ b/meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend
@@ -1,7 +1,7 @@
 COMPATIBLE_HOST = "${HOST_SYS}"
 
 # Add MicroBlaze Patches (only when using MicroBlaze)
-FILESEXTRAPATHS_append_microblaze_xilinx-standalone := ":${THISDIR}/gcc-9"
+FILESEXTRAPATHS_append_microblaze_xilinx-standalone := ":${THISDIR}/gcc-10"
 SRC_URI_append_microblaze_xilinx-standalone = " \
         file://additional-microblaze-multilibs.patch \
 "
diff --git a/meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend b/meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend
index e80b0b7..17529a0 100644
--- a/meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend
+++ b/meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend
@@ -13,6 +13,9 @@
 			ln -s $each $(basename $each)
 		done
 	)
+
+	# Apparently we can end up with an empty /lib occasionally
+        find ${D}/lib -type d | sort -r | xargs rmdir || :
 }
 
 FIXUP_FUNCTION = ""
diff --git a/meta-xilinx/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware/fix-zynqmp-assert.patch b/meta-xilinx/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware/fix-zynqmp-assert.patch
new file mode 100644
index 0000000..87e1b11
--- /dev/null
+++ b/meta-xilinx/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware/fix-zynqmp-assert.patch
@@ -0,0 +1,68 @@
+diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_reset.c b/lib/sw_apps/zynqmp_pmufw/src/pm_reset.c
+index 297c6c2ddc..bc295cf013 100644
+--- a/lib/sw_apps/zynqmp_pmufw/src/pm_reset.c
++++ b/lib/sw_apps/zynqmp_pmufw/src/pm_reset.c
+@@ -52,7 +52,7 @@
+  * @pulse	Function performing reset pulse operation
+  */
+ typedef struct PmResetOps {
+-	void (*const assert)(const PmReset* const rst, const u32 action);
++	void (*const resetAssert)(const PmReset* const rst, const u32 action);
+ 	u32 (*const getStatus)(const PmReset* const s);
+ 	u32 (*const pulse)(const PmReset* const rst);
+ } PmResetOps;
+@@ -415,37 +415,37 @@ static u32 PmResetPulsePl(const PmReset* const rst)
+ }
+ 
+ static const PmResetOps pmResetOpsGeneric = {
+-	.assert = PmResetAssertGen,
++	.resetAssert = PmResetAssertGen,
+ 	.getStatus = PmResetGetStatusGen,
+ 	.pulse = PmResetPulseGen,
+ };
+ 
+ static const PmResetOps pmResetOpsGpo = {
+-	.assert = PmResetAssertGpo,
++	.resetAssert = PmResetAssertGpo,
+ 	.getStatus = PmResetGetStatusGpo,
+ 	.pulse = PmResetPulseGpo,
+ };
+ 
+ static const PmResetOps pmResetOpsRom = {
+-	.assert = PmResetAssertRom,
++	.resetAssert = PmResetAssertRom,
+ 	.getStatus = PmResetGetStatusRom,
+ 	.pulse = PmResetPulseRom,
+ };
+ 
+ static const PmResetOps pmResetOpsNoAssert = {
+-	.assert = NULL,
++	.resetAssert = NULL,
+ 	.getStatus = PmResetGetStatusRom,
+ 	.pulse = PmResetPulseRom,
+ };
+ 
+ static const PmResetOps pmResetOpsPl = {
+-	.assert = PmResetAssertPl,
++	.resetAssert = PmResetAssertPl,
+ 	.getStatus = PmResetGetStatusPl,
+ 	.pulse = PmResetPulsePl,
+ };
+ 
+ static const PmResetOps pmResetOpsGpioBankIO = {
+-	.assert = NULL,
++	.resetAssert = NULL,
+ 	.getStatus = PmResetGetStatusGpioBankIOs,
+ 	.pulse = PmResetPulseGpioBankIOs,
+ };
+@@ -1901,8 +1901,8 @@ s32 PmResetDoAssert(const PmReset *reset, u32 action)
+ 	switch (action) {
+ 	case PM_RESET_ACTION_RELEASE:
+ 	case PM_RESET_ACTION_ASSERT:
+-		if (NULL != reset->ops->assert) {
+-			reset->ops->assert(reset, action);
++		if (NULL != reset->ops->resetAssert) {
++			reset->ops->resetAssert(reset, action);
+ 		} else {
+ 			status = XST_INVALID_PARAM;
+ 		}
diff --git a/meta-xilinx/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2020.2.bb b/meta-xilinx/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2020.2.bb
index 652241c..330e020 100644
--- a/meta-xilinx/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2020.2.bb
+++ b/meta-xilinx/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2020.2.bb
@@ -6,7 +6,8 @@
 SRCREV = "e8db5fb118229fdc621e0ec7848641a23bf60998"
 PV = "${XILINX_RELEASE_VERSION}+git${SRCPV}"
 
-SRC_URI = "git://github.com/Xilinx/embeddedsw.git;protocol=https;nobranch=1"
+SRC_URI = "git://github.com/Xilinx/embeddedsw.git;protocol=https;nobranch=1 \
+	   file://fix-zynqmp-assert.patch;pnum=5"
 
 COMPATIBLE_HOST = "microblaze.*-elf"
 COMPATIBLE_MACHINE = "microblaze-pmu"