diff --git a/openpower/linux/0017-powerpc-configs-Update-to-upstream-and-enable-secure.patch b/openpower/linux/0017-powerpc-configs-Update-to-upstream-and-enable-secure.patch
index 881253c..3fbe01a 100644
--- a/openpower/linux/0017-powerpc-configs-Update-to-upstream-and-enable-secure.patch
+++ b/openpower/linux/0017-powerpc-configs-Update-to-upstream-and-enable-secure.patch
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Joel Stanley <joel@jms.id.au>
 Date: Tue, 23 Jun 2020 16:22:10 +0930
-Subject: [PATCH 17/18] powerpc/configs: Update to upstream and enable
+Subject: [PATCH 17/19] powerpc/configs: Update to upstream and enable
  secureboot
 
 Pulls in the following updates from upstream:
@@ -23,11 +23,11 @@
 
 Signed-off-by: Joel Stanley <joel@jms.id.au>
 ---
- arch/powerpc/configs/skiroot_defconfig | 84 ++++++++++++++++----------
- 1 file changed, 53 insertions(+), 31 deletions(-)
+ arch/powerpc/configs/skiroot_defconfig | 83 ++++++++++++++++----------
+ 1 file changed, 53 insertions(+), 30 deletions(-)
 
 diff --git a/arch/powerpc/configs/skiroot_defconfig b/arch/powerpc/configs/skiroot_defconfig
-index 1253482a67c0..44309e12d84a 100644
+index 2e25b264f70f..44309e12d84a 100644
 --- a/arch/powerpc/configs/skiroot_defconfig
 +++ b/arch/powerpc/configs/skiroot_defconfig
 @@ -1,13 +1,9 @@
@@ -111,15 +111,7 @@
  CONFIG_DNS_RESOLVER=y
  # CONFIG_WIRELESS is not set
  CONFIG_DEVTMPFS=y
-@@ -83,7 +85,6 @@ CONFIG_EEPROM_AT24=m
- # CONFIG_OCXL is not set
- CONFIG_BLK_DEV_SD=m
- CONFIG_BLK_DEV_SR=m
--CONFIG_BLK_DEV_SR_VENDOR=y
- CONFIG_CHR_DEV_SG=m
- CONFIG_SCSI_CONSTANTS=y
- CONFIG_SCSI_SCAN_ASYNC=y
-@@ -140,7 +141,6 @@ CONFIG_TIGON3=m
+@@ -139,7 +141,6 @@ CONFIG_TIGON3=m
  CONFIG_BNX2X=m
  # CONFIG_NET_VENDOR_BROCADE is not set
  # CONFIG_NET_VENDOR_CADENCE is not set
@@ -127,7 +119,7 @@
  # CONFIG_NET_VENDOR_CAVIUM is not set
  CONFIG_CHELSIO_T1=m
  # CONFIG_NET_VENDOR_CISCO is not set
-@@ -149,7 +149,6 @@ CONFIG_CHELSIO_T1=m
+@@ -148,7 +149,6 @@ CONFIG_CHELSIO_T1=m
  # CONFIG_NET_VENDOR_DLINK is not set
  CONFIG_BE2NET=m
  # CONFIG_NET_VENDOR_EZCHIP is not set
@@ -135,7 +127,7 @@
  # CONFIG_NET_VENDOR_HUAWEI is not set
  CONFIG_E1000=m
  CONFIG_E1000E=m
-@@ -157,7 +156,6 @@ CONFIG_IGB=m
+@@ -156,7 +156,6 @@ CONFIG_IGB=m
  CONFIG_IXGB=m
  CONFIG_IXGBE=m
  CONFIG_I40E=m
@@ -143,7 +135,7 @@
  # CONFIG_NET_VENDOR_MARVELL is not set
  CONFIG_MLX4_EN=m
  # CONFIG_MLX4_CORE_GEN2 is not set
-@@ -168,12 +166,12 @@ CONFIG_MLX5_CORE_EN=y
+@@ -167,12 +166,12 @@ CONFIG_MLX5_CORE_EN=y
  # CONFIG_NET_VENDOR_MICROSEMI is not set
  CONFIG_MYRI10GE=m
  # CONFIG_NET_VENDOR_NATSEMI is not set
@@ -157,7 +149,7 @@
  CONFIG_NETXEN_NIC=m
  CONFIG_QED=m
  CONFIG_QEDE=m
-@@ -211,7 +209,6 @@ CONFIG_IPMI_DEVICE_INTERFACE=y
+@@ -210,7 +209,6 @@ CONFIG_IPMI_DEVICE_INTERFACE=y
  CONFIG_IPMI_POWERNV=y
  CONFIG_IPMI_WATCHDOG=y
  CONFIG_HW_RANDOM=y
@@ -165,7 +157,7 @@
  CONFIG_TCG_TIS_I2C_NUVOTON=y
  # CONFIG_DEVPORT is not set
  CONFIG_I2C=y
-@@ -240,7 +237,6 @@ CONFIG_HID_CYPRESS=y
+@@ -239,7 +237,6 @@ CONFIG_HID_CYPRESS=y
  CONFIG_HID_EZKEY=y
  CONFIG_HID_ITE=y
  CONFIG_HID_KENSINGTON=y
@@ -173,7 +165,7 @@
  CONFIG_HID_MICROSOFT=y
  CONFIG_HID_MONTEREY=y
  CONFIG_USB_HIDDEV=y
-@@ -277,6 +273,29 @@ CONFIG_NLS_CODEPAGE_437=y
+@@ -276,6 +273,29 @@ CONFIG_NLS_CODEPAGE_437=y
  CONFIG_NLS_ASCII=y
  CONFIG_NLS_ISO8859_1=y
  CONFIG_NLS_UTF8=y
@@ -203,7 +195,7 @@
  CONFIG_CRC16=y
  CONFIG_CRC_ITU_T=y
  CONFIG_LIBCRC32C=y
-@@ -287,17 +306,20 @@ CONFIG_LIBCRC32C=y
+@@ -286,17 +306,20 @@ CONFIG_LIBCRC32C=y
  # CONFIG_XZ_DEC_SPARC is not set
  CONFIG_PRINTK_TIME=y
  CONFIG_MAGIC_SYSRQ=y