diff --git a/openpower/configs/rainier_defconfig b/openpower/configs/rainier_defconfig
index 2e3bd3f..5789e79 100644
--- a/openpower/configs/rainier_defconfig
+++ b/openpower/configs/rainier_defconfig
@@ -25,7 +25,7 @@
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_PACKAGE_SKIBOOT=y
 BR2_SKIBOOT_CUSTOM_VERSION=y
-BR2_SKIBOOT_CUSTOM_VERSION_VALUE="aa771763adffe9f383ef40ae7d6971ee6ee368f3"
+BR2_SKIBOOT_CUSTOM_VERSION_VALUE="ad969e9b599e38c6eca39b5bd4fb7db0eea7e13d"
 BR2_SKIBOOT_CUSTOM_GIT=y
 BR2_SKIBOOT_CUSTOM_REPO_URL="git@github.ibm.com:p10/skiboot.git"
 BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/busybox.fragment"
diff --git a/openpower/package/skiboot/0001-hdata-spira-Add-p10-NMMU-base-address.patch b/openpower/package/skiboot/0001-hdata-spira-Add-p10-NMMU-base-address.patch
deleted file mode 100644
index 03dbb4b..0000000
--- a/openpower/package/skiboot/0001-hdata-spira-Add-p10-NMMU-base-address.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From ab2bc5d0efcfb5f1a1122d9c85b9ea9e53908454 Mon Sep 17 00:00:00 2001
-From: Reza Arbab <arbab@linux.ibm.com>
-Date: Fri, 21 Feb 2020 14:45:23 -0600
-Subject: [PATCH] hdata/spira: Add p10 NMMU base address
-
-Signed-off-by: Reza Arbab <arbab@linux.ibm.com>
----
- hdata/spira.c | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/hdata/spira.c b/hdata/spira.c
-index db54a02..de6386a 100644
---- a/hdata/spira.c
-+++ b/hdata/spira.c
-@@ -919,15 +919,22 @@ static void add_nx(void)
- static void add_nmmu(void)
- {
- 	struct dt_node *xscom, *nmmu;
-+	u32 scom;
- 
--	/* Nest MMU only exists on POWER9 */
-+	/* Nest MMU only exists on POWER9 or later */
- 	if (proc_gen < proc_gen_p9)
- 		return;
- 
-+	if (proc_gen == proc_gen_p9)
-+		scom = 0x5012c40;
-+	else
-+		scom = 0x2010c40;
-+
- 	dt_for_each_compatible(dt_root, xscom, "ibm,xscom") {
--		nmmu = dt_new_addr(xscom, "nmmu", 0x5012c40);
-+		nmmu = dt_new_addr(xscom, "nmmu", scom);
-+		/* XXX P10 */
- 		dt_add_property_strings(nmmu, "compatible", "ibm,power9-nest-mmu");
--		dt_add_property_cells(nmmu, "reg", 0x5012c40, 0x20);
-+		dt_add_property_cells(nmmu, "reg", scom, 0x20);
- 	}
- }
- 
--- 
-1.8.3.1
-