diff --git a/.gitmodules b/.gitmodules
index 52777b0..3152edd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "buildroot"]
 	path = buildroot
-	branch = 2017.05-op-build
+	branch = 2017.08-op-build
 	url = https://github.com/open-power/buildroot
diff --git a/buildroot b/buildroot
index 8035745..319c6e1 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit 80357456735ce021b4bbad885998faa4723d69f5
+Subproject commit 319c6e1453808040f828e49e09c33c2a5bb0d958
diff --git a/openpower/configs/barreleye_defconfig b/openpower/configs/barreleye_defconfig
index 675661d..a4ef150 100644
--- a/openpower/configs/barreleye_defconfig
+++ b/openpower/configs/barreleye_defconfig
@@ -1,9 +1,6 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_25=y
-BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
@@ -12,11 +9,12 @@
 BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
 BR2_ENABLE_LOCALE_WHITELIST="C de en es fr it ja ko pt_BR ru zh_CN zh_TW"
 BR2_GENERATE_LOCALE="en_US.UTF-8 de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 pt_BR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_TW.UTF-8"
+BR2_SYSTEM_ENABLE_NLS=y
 BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.2"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/firenze_defconfig b/openpower/configs/firenze_defconfig
index 3f6f2c7..7b262a1 100644
--- a/openpower/configs/firenze_defconfig
+++ b/openpower/configs/firenze_defconfig
@@ -1,9 +1,6 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_25=y
-BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
@@ -11,11 +8,12 @@
 BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
 BR2_ENABLE_LOCALE_WHITELIST="C de en es fr it ja ko pt_BR ru zh_CN zh_TW"
 BR2_GENERATE_LOCALE="en_US.UTF-8 de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 pt_BR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_TW.UTF-8"
+BR2_SYSTEM_ENABLE_NLS=y
 BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.2"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig
index d106343..610949d 100644
--- a/openpower/configs/firestone_defconfig
+++ b/openpower/configs/firestone_defconfig
@@ -1,9 +1,6 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_25=y
-BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
@@ -12,11 +9,12 @@
 BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
 BR2_ENABLE_LOCALE_WHITELIST="C de en es fr it ja ko pt_BR ru zh_CN zh_TW"
 BR2_GENERATE_LOCALE="en_US.UTF-8 de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 pt_BR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_TW.UTF-8"
+BR2_SYSTEM_ENABLE_NLS=y
 BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.2"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig
index ea14869..1437e1f 100644
--- a/openpower/configs/garrison_defconfig
+++ b/openpower/configs/garrison_defconfig
@@ -1,9 +1,6 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_25=y
-BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
@@ -12,11 +9,12 @@
 BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
 BR2_ENABLE_LOCALE_WHITELIST="C de en es fr it ja ko pt_BR ru zh_CN zh_TW"
 BR2_GENERATE_LOCALE="en_US.UTF-8 de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 pt_BR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_TW.UTF-8"
+BR2_SYSTEM_ENABLE_NLS=y
 BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.2"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig
index 38dcdd3..ffc7f2c 100644
--- a/openpower/configs/habanero_defconfig
+++ b/openpower/configs/habanero_defconfig
@@ -1,10 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/habanero-patches"
-BR2_GLIBC_VERSION_2_25=y
-BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
@@ -13,11 +10,12 @@
 BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
 BR2_ENABLE_LOCALE_WHITELIST="C de en es fr it ja ko pt_BR ru zh_CN zh_TW"
 BR2_GENERATE_LOCALE="en_US.UTF-8 de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 pt_BR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_TW.UTF-8"
+BR2_SYSTEM_ENABLE_NLS=y
 BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.2"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/hostboot/p9dsu.config b/openpower/configs/hostboot/p9dsu.config
index 0d6268f..5b8ee8e 100644
--- a/openpower/configs/hostboot/p9dsu.config
+++ b/openpower/configs/hostboot/p9dsu.config
@@ -68,6 +68,7 @@
 
 # set for trace debug to console
 set CONSOLE_OUTPUT_TRACE
+set CONSOLE_OUTPUT_FFDCDISPLAY
 
 unset SECUREBOOT
 unset TPMDD
diff --git a/openpower/configs/hostboot/witherspoon.config b/openpower/configs/hostboot/witherspoon.config
index 8520361..0bcf28c 100755
--- a/openpower/configs/hostboot/witherspoon.config
+++ b/openpower/configs/hostboot/witherspoon.config
@@ -59,9 +59,10 @@
 
 set BMC_BT_LPC_IPMI
 
-# Disable Checktop Analysis
+# Enable Checkstop Analysis for both
+#   Runtime and IPLtime scenarios
 set ENABLE_CHECKSTOP_ANALYSIS
-unset IPLTIME_CHECKSTOP_ANALYSIS
+set IPLTIME_CHECKSTOP_ANALYSIS
 
 # Hostboot will not detect hardware changes
 unset HOST_HCDB_SUPPORT
@@ -70,3 +71,6 @@
 unset CONSOLE_OUTPUT_TRACE
 set CONSOLE_OUTPUT_FFDCDISPLAY
 
+# Terminate Hostboot when errors occur in manufacturing mode
+#   (relies on BMC to not trigger reboot)
+unset HANG_ON_MFG_SRC_TERM
diff --git a/openpower/configs/openpower_mambo_defconfig b/openpower/configs/openpower_mambo_defconfig
index 5e31807..1f30e00 100644
--- a/openpower/configs/openpower_mambo_defconfig
+++ b/openpower/configs/openpower_mambo_defconfig
@@ -1,9 +1,6 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_25=y
-BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
@@ -14,7 +11,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.2"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/openpower_p9_mambo_defconfig b/openpower/configs/openpower_p9_mambo_defconfig
index c9ff875..6e99ca8 100644
--- a/openpower/configs/openpower_p9_mambo_defconfig
+++ b/openpower/configs/openpower_p9_mambo_defconfig
@@ -1,9 +1,6 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_25=y
-BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_TARGET_GENERIC_HOSTNAME="skiroot-p9"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
@@ -14,7 +11,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.2"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/p9dsu_defconfig b/openpower/configs/p9dsu_defconfig
index 144a69c..ae33a81 100644
--- a/openpower/configs/p9dsu_defconfig
+++ b/openpower/configs/p9dsu_defconfig
@@ -1,9 +1,6 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_25=y
-BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
@@ -12,11 +9,12 @@
 BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
 BR2_ENABLE_LOCALE_WHITELIST="C de en es fr it ja ko pt_BR ru zh_CN zh_TW"
 BR2_GENERATE_LOCALE="en_US.UTF-8 de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 pt_BR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_TW.UTF-8"
+BR2_SYSTEM_ENABLE_NLS=y
 BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.2"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_p9_defconfig"
@@ -53,8 +51,6 @@
 BR2_HOSTBOOT_BINARY_SBE_FILENAME="nimbus_sbe.img.ecc"
 BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
 BR2_HOSTBOOT_BINARY_WINK_FILENAME="p9n.ref_image.hdr.bin.ecc"
-BR2_WOFDATA_FILENAME="wof_output"
-BR2_WOFDATA_BINARY_FILENAME="wofdata.bin.ecc"
 BR2_IMA_CATALOG_FILENAME="ima_catalog.bin"
 BR2_OPENPOWER_TARGETING_BIN_FILENAME="P9DSU_HB.targeting.bin"
 BR2_OPENPOWER_TARGETING_ECC_FILENAME="P9DSU_HB.targeting.bin.ecc"
diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig
index 2b6bc62..f9ea4b2 100644
--- a/openpower/configs/palmetto_defconfig
+++ b/openpower/configs/palmetto_defconfig
@@ -1,10 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/palmetto-patches"
-BR2_GLIBC_VERSION_2_25=y
-BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
@@ -16,7 +13,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.2"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/pseries_defconfig b/openpower/configs/pseries_defconfig
index 8f62d9b..ffd683e 100644
--- a/openpower/configs/pseries_defconfig
+++ b/openpower/configs/pseries_defconfig
@@ -1,9 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_24=y
 BR2_BINUTILS_VERSION_2_27_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
@@ -11,11 +9,12 @@
 BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
 BR2_ENABLE_LOCALE_WHITELIST="C de en es fr it ja ko pt_BR ru zh_CN zh_TW"
 BR2_GENERATE_LOCALE="en_US.UTF-8 de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 pt_BR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_TW.UTF-8"
+BR2_SYSTEM_ENABLE_NLS=y
 BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.2"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/pseries_skiroot_defconfig"
diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig
index f2dcfac..ba70050 100644
--- a/openpower/configs/romulus_defconfig
+++ b/openpower/configs/romulus_defconfig
@@ -1,9 +1,6 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_25=y
-BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
@@ -12,11 +9,12 @@
 BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
 BR2_ENABLE_LOCALE_WHITELIST="C de en es fr it ja ko pt_BR ru zh_CN zh_TW"
 BR2_GENERATE_LOCALE="en_US.UTF-8 de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 pt_BR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_TW.UTF-8"
+BR2_SYSTEM_ENABLE_NLS=y
 BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.2"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_p9_defconfig"
diff --git a/openpower/configs/witherspoon-sequoia_defconfig b/openpower/configs/witherspoon-sequoia_defconfig
index 38638fc..5bd19fb 100644
--- a/openpower/configs/witherspoon-sequoia_defconfig
+++ b/openpower/configs/witherspoon-sequoia_defconfig
@@ -1,10 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_25=y
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/sequoia-patches"
-BR2_BINUTILS_VERSION_2_28_X=y
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/witherspoon-patches"
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
@@ -13,11 +10,12 @@
 BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
 BR2_ENABLE_LOCALE_WHITELIST="C de en es fr it ja ko pt_BR ru zh_CN zh_TW"
 BR2_GENERATE_LOCALE="en_US.UTF-8 de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 pt_BR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_TW.UTF-8"
+BR2_SYSTEM_ENABLE_NLS=y
 BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.2"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_p9_defconfig"
@@ -43,7 +41,7 @@
 BR2_OPENPOWER_POWER9=y
 BR2_HOSTBOOT_CONFIG_FILE="witherspoon.config"
 BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="witherspoon-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="b47c7aead0c367d58582ee9a36afa3a8394ad4d0"
+BR2_OPENPOWER_MACHINE_XML_VERSION="f8aaa73b75564d6b845147afd3b2ab7c433838bc"
 BR2_OPENPOWER_MACHINE_XML_FILENAME="witherspoon.xml"
 BR2_OPENPOWER_SYSTEM_XML_FILENAME="WITHERSPOON_hb.system.xml"
 BR2_OPENPOWER_MRW_XML_FILENAME="WITHERSPOON_hb.mrw.xml"
@@ -54,8 +52,6 @@
 BR2_HOSTBOOT_BINARY_SBE_FILENAME="nimbus_sbe.img.ecc"
 BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
 BR2_HOSTBOOT_BINARY_WINK_FILENAME="p9n.ref_image.hdr.bin.ecc"
-BR2_WOFDATA_FILENAME="wof_output"
-BR2_WOFDATA_BINARY_FILENAME="wofdata.bin.ecc"
 BR2_IMA_CATALOG_FILENAME="ima_catalog.bin"
 BR2_OPENPOWER_TARGETING_BIN_FILENAME="WITHERSPOON_HB.targeting.bin"
 BR2_OPENPOWER_TARGETING_ECC_FILENAME="WITHERSPOON_HB.targeting.bin.ecc"
diff --git a/openpower/configs/witherspoon-redbud_defconfig b/openpower/configs/witherspoon_defconfig
similarity index 86%
rename from openpower/configs/witherspoon-redbud_defconfig
rename to openpower/configs/witherspoon_defconfig
index ddd61b2..88f5dff 100644
--- a/openpower/configs/witherspoon-redbud_defconfig
+++ b/openpower/configs/witherspoon_defconfig
@@ -1,10 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/redbud-patches"
-BR2_GLIBC_VERSION_2_25=y
-BR2_BINUTILS_VERSION_2_28_X=y
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/witherspoon-patches"
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
@@ -13,11 +10,12 @@
 BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
 BR2_ENABLE_LOCALE_WHITELIST="C de en es fr it ja ko pt_BR ru zh_CN zh_TW"
 BR2_GENERATE_LOCALE="en_US.UTF-8 de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 pt_BR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_TW.UTF-8"
+BR2_SYSTEM_ENABLE_NLS=y
 BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.2"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_p9_defconfig"
@@ -43,19 +41,17 @@
 BR2_OPENPOWER_POWER9=y
 BR2_HOSTBOOT_CONFIG_FILE="witherspoon.config"
 BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="witherspoon-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="b47c7aead0c367d58582ee9a36afa3a8394ad4d0"
+BR2_OPENPOWER_MACHINE_XML_VERSION="f8aaa73b75564d6b845147afd3b2ab7c433838bc"
 BR2_OPENPOWER_MACHINE_XML_FILENAME="witherspoon.xml"
 BR2_OPENPOWER_SYSTEM_XML_FILENAME="WITHERSPOON_hb.system.xml"
 BR2_OPENPOWER_MRW_XML_FILENAME="WITHERSPOON_hb.mrw.xml"
 BR2_OPENPOWER_BIOS_XML_FILENAME="WITHERSPOON_bios.xml"
 BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayout_64.xml"
 BR2_OPENPOWER_CONFIG_NAME="witherspoon"
-BR2_OPENPOWER_PNOR_FILENAME="witherspoon-redbud.pnor"
+BR2_OPENPOWER_PNOR_FILENAME="witherspoon.pnor"
 BR2_HOSTBOOT_BINARY_SBE_FILENAME="nimbus_sbe.img.ecc"
 BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
 BR2_HOSTBOOT_BINARY_WINK_FILENAME="p9n.ref_image.hdr.bin.ecc"
-BR2_WOFDATA_FILENAME="wof_output"
-BR2_WOFDATA_BINARY_FILENAME="wofdata.bin.ecc"
 BR2_IMA_CATALOG_FILENAME="ima_catalog.bin"
 BR2_OPENPOWER_TARGETING_BIN_FILENAME="WITHERSPOON_HB.targeting.bin"
 BR2_OPENPOWER_TARGETING_ECC_FILENAME="WITHERSPOON_HB.targeting.bin.ecc"
diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig
index f6a52bb..1cb4446 100644
--- a/openpower/configs/zaius_defconfig
+++ b/openpower/configs/zaius_defconfig
@@ -1,9 +1,6 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_25=y
-BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
@@ -12,11 +9,12 @@
 BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
 BR2_ENABLE_LOCALE_WHITELIST="C de en es fr it ja ko pt_BR ru zh_CN zh_TW"
 BR2_GENERATE_LOCALE="en_US.UTF-8 de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 pt_BR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_TW.UTF-8"
+BR2_SYSTEM_ENABLE_NLS=y
 BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.2"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_p9_defconfig"
@@ -42,7 +40,7 @@
 BR2_OPENPOWER_POWER9=y
 BR2_HOSTBOOT_CONFIG_FILE="zaius.config"
 BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="zaius-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="9cef48938c7f9669acb8252455f89206fccc490e"
+BR2_OPENPOWER_MACHINE_XML_VERSION="9325c75307807915197f4704ab7e6d8994e2c837"
 BR2_OPENPOWER_MACHINE_XML_FILENAME="zaius.xml"
 BR2_OPENPOWER_SYSTEM_XML_FILENAME="ZAIUS_hb.system.xml"
 BR2_OPENPOWER_MRW_XML_FILENAME="ZAIUS_hb.mrw.xml"
@@ -53,8 +51,6 @@
 BR2_HOSTBOOT_BINARY_SBE_FILENAME="nimbus_sbe.img.ecc"
 BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
 BR2_HOSTBOOT_BINARY_WINK_FILENAME="p9n.ref_image.hdr.bin.ecc"
-BR2_WOFDATA_FILENAME="wof_output"
-BR2_WOFDATA_BINARY_FILENAME="wofdata.bin.ecc"
 BR2_IMA_CATALOG_FILENAME="ima_catalog.bin"
 BR2_OPENPOWER_TARGETING_BIN_FILENAME="ZAIUS_HB.targeting.bin"
 BR2_OPENPOWER_TARGETING_ECC_FILENAME="ZAIUS_HB.targeting.bin.ecc"
diff --git a/openpower/configs/zz_defconfig b/openpower/configs/zz_defconfig
index 4781bf2..295cd9f 100644
--- a/openpower/configs/zz_defconfig
+++ b/openpower/configs/zz_defconfig
@@ -1,9 +1,6 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLIBC_VERSION_2_25=y
-BR2_BINUTILS_VERSION_2_28_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
-BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
@@ -11,11 +8,12 @@
 BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
 BR2_ENABLE_LOCALE_WHITELIST="C de en es fr it ja ko pt_BR ru zh_CN zh_TW"
 BR2_GENERATE_LOCALE="en_US.UTF-8 de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 pt_BR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_TW.UTF-8"
+BR2_SYSTEM_ENABLE_NLS=y
 BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.2"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_p9_defconfig"
diff --git a/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch b/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
index d05e4fc..0ff68d8 100644
--- a/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
+++ b/openpower/linux/0001-xhci-Use-xhci_pci_remove-for-xhci-device-shutdown.patch
@@ -10,10 +10,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
-index cefa223f9f08..2f5961b957ea 100644
+index 8071c8fdd15e..ccb0cca3a84b 100644
 --- a/drivers/usb/host/xhci-pci.c
 +++ b/drivers/usb/host/xhci-pci.c
-@@ -501,7 +501,7 @@ static struct pci_driver xhci_pci_driver = {
+@@ -500,7 +500,7 @@ static struct pci_driver xhci_pci_driver = {
  	.remove =	xhci_pci_remove,
  	/* suspend and resume implemented later */
  
diff --git a/openpower/linux/0002-Release-OpenPower-kernel.patch b/openpower/linux/0002-Release-OpenPower-kernel.patch
index c67f945..071161b 100644
--- a/openpower/linux/0002-Release-OpenPower-kernel.patch
+++ b/openpower/linux/0002-Release-OpenPower-kernel.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Joel Stanley <joel@jms.id.au>
-Date: Wed, 3 May 2017 13:25:26 +0930
+Date: Tue, 5 Sep 2017 17:14:24 +1000
 Subject: [PATCH 2/2] Release OpenPower kernel
 
 Signed-off-by: Joel Stanley <joel@jms.id.au>
@@ -9,13 +9,13 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 6da481d08441..b864af3df096 100644
+index 8aad6bc50d52..2ab5bcdfe63a 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,7 +1,7 @@
  VERSION = 4
- PATCHLEVEL = 12
- SUBLEVEL = 8
+ PATCHLEVEL = 13
+ SUBLEVEL = 2
 -EXTRAVERSION =
 +EXTRAVERSION = -openpower1
  NAME = Fearless Coyote
diff --git a/openpower/package/capp-ucode/capp-ucode.mk b/openpower/package/capp-ucode/capp-ucode.mk
index 7513fe0..f6a0147 100644
--- a/openpower/package/capp-ucode/capp-ucode.mk
+++ b/openpower/package/capp-ucode/capp-ucode.mk
@@ -3,7 +3,7 @@
 # capp-ucode.mk
 #
 ################################################################################
-CAPP_UCODE_VERSION ?= 9c73e9f51d240847fbd150815a3b9c548aae0cb8
+CAPP_UCODE_VERSION ?= p9-dd2-v1
 CAPP_UCODE_SITE ?= $(call github,open-power,capp-ucode,$(CAPP_UCODE_VERSION))
 CAPP_UCODE_LICENSE = Apache-2.0
 CAPP_UCODE_LICENSE_FILES = NOTICES
diff --git a/openpower/package/hostboot-binaries/hostboot_binaries.mk b/openpower/package/hostboot-binaries/hostboot_binaries.mk
index 0bd3760..b90edef 100644
--- a/openpower/package/hostboot-binaries/hostboot_binaries.mk
+++ b/openpower/package/hostboot-binaries/hostboot_binaries.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HOSTBOOT_BINARIES_VERSION ?= 9cad878e1615cf2b35651af6dcf7ae11eb9cdc71
+HOSTBOOT_BINARIES_VERSION ?= edd568f349e4aef883abb42451668bfcdf59e6b4
 HOSTBOOT_BINARIES_SITE ?= $(call github,open-power,hostboot-binaries,$(HOSTBOOT_BINARIES_VERSION))
 
 HOSTBOOT_BINARIES_LICENSE = Apache-2.0
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index bb15ea3..1a3719c 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= 695bd891343faf1f0ef85fe53148590e58239efd
-HOSTBOOT_VERSION_BRANCH_MASTER ?= 87ffda53f58ef4662881bcac6cdcd534115044d4
+HOSTBOOT_VERSION_BRANCH_MASTER ?= 3bd9350522b9923f078c8528d873f77caaa8fa1a
 
 HOSTBOOT_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(HOSTBOOT_VERSION_BRANCH_MASTER),$(HOSTBOOT_VERSION_BRANCH_MASTER_P8))
 HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION))
diff --git a/openpower/package/hostboot/p8Patches/hostboot-0013-htmgt-Remove-unused-variable.patch b/openpower/package/hostboot/p8Patches/hostboot-0013-htmgt-Remove-unused-variable.patch
new file mode 100644
index 0000000..cc14cda
--- /dev/null
+++ b/openpower/package/hostboot/p8Patches/hostboot-0013-htmgt-Remove-unused-variable.patch
@@ -0,0 +1,35 @@
+From 64646f1205672650d9781c83a4aedaeb1664ce47 Mon Sep 17 00:00:00 2001
+From: Joel Stanley <joel.stanley@au1.ibm.com>
+Date: Mon, 21 Aug 2017 16:20:41 +0930
+Subject: [PATCH] hwpf: Remove unused variable
+
+Change-Id: Ica691bea7541fbd02d76400e94f8fbaf9a3e6517
+Signed-off-by: Joel Stanley <joel.stanley@au1.ibm.com>
+---
+ src/usr/hwpf/hwp/utility_procedures/p8_cpu_special_wakeup.C | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/usr/hwpf/hwp/utility_procedures/p8_cpu_special_wakeup.C b/src/usr/hwpf/hwp/utility_procedures/p8_cpu_special_wakeup.C
+index ee59c8066ccb..c0d6e8a1f2c2 100644
+--- a/src/usr/hwpf/hwp/utility_procedures/p8_cpu_special_wakeup.C
++++ b/src/usr/hwpf/hwp/utility_procedures/p8_cpu_special_wakeup.C
+@@ -5,7 +5,7 @@
+ /*                                                                        */
+ /* OpenPOWER HostBoot Project                                             */
+ /*                                                                        */
+-/* Contributors Listed Below - COPYRIGHT 2014                             */
++/* Contributors Listed Below - COPYRIGHT 2014,2017                        */
+ /* [+] International Business Machines Corp.                              */
+ /*                                                                        */
+ /*                                                                        */
+@@ -153,7 +153,6 @@ p8_cpu_special_wakeup(  const fapi::Target& i_ex_target,
+     uint32_t            count = 0;
+ 
+     std::vector<fapi::Target>      l_chiplets;
+-    std::vector<Target>::iterator  itr;
+ 
+     uint8_t             oha_spwkup_flag = 0;
+     uint8_t             ignore_xstop_flag = 0;
+-- 
+2.14.1
+
diff --git a/openpower/package/hostboot/p8Patches/hostboot-0014-htmgt-Remove-unused-variable.patch b/openpower/package/hostboot/p8Patches/hostboot-0014-htmgt-Remove-unused-variable.patch
new file mode 100644
index 0000000..facaaee
--- /dev/null
+++ b/openpower/package/hostboot/p8Patches/hostboot-0014-htmgt-Remove-unused-variable.patch
@@ -0,0 +1,35 @@
+From 7a6194962c4c55ac8f225de3b64cac347b9901a0 Mon Sep 17 00:00:00 2001
+From: Joel Stanley <joel.stanley@au1.ibm.com>
+Date: Mon, 21 Aug 2017 16:21:08 +0930
+Subject: [PATCH] htmgt: Remove unused variable
+
+Change-Id: I633f2faca41e40b47ed49a05bfe0724fa4b2114d
+Signed-off-by: Joel Stanley <joel.stanley@au1.ibm.com>
+---
+ src/usr/htmgt/htmgt_cfgdata.C | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/usr/htmgt/htmgt_cfgdata.C b/src/usr/htmgt/htmgt_cfgdata.C
+index 584793c69eb8..19e7b21bf23a 100644
+--- a/src/usr/htmgt/htmgt_cfgdata.C
++++ b/src/usr/htmgt/htmgt_cfgdata.C
+@@ -5,7 +5,7 @@
+ /*                                                                        */
+ /* OpenPOWER HostBoot Project                                             */
+ /*                                                                        */
+-/* Contributors Listed Below - COPYRIGHT 2014,2016                        */
++/* Contributors Listed Below - COPYRIGHT 2014,2017                        */
+ /* [+] International Business Machines Corp.                              */
+ /*                                                                        */
+ /*                                                                        */
+@@ -654,7 +654,6 @@ void getSystemConfigMessageData(const TargetHandle_t i_occ, uint8_t* o_data,
+     //If a new processor with more cores comes along,
+     //this command will have to change.
+     TargetHandleList cores;
+-    TargetHandleList::iterator coreIt;
+     getChildChiplets(cores, proc, TYPE_CORE, false);
+ 
+     uint16_t tempSensor = 0;
+-- 
+2.14.1
+
diff --git a/openpower/package/hostboot/p8Patches/hostboot-0015-hwpf-Remove-unused-variable.patch b/openpower/package/hostboot/p8Patches/hostboot-0015-hwpf-Remove-unused-variable.patch
new file mode 100644
index 0000000..9536d01
--- /dev/null
+++ b/openpower/package/hostboot/p8Patches/hostboot-0015-hwpf-Remove-unused-variable.patch
@@ -0,0 +1,35 @@
+From b08fb29b63f649bf5129c05fee8ac79779f9339c Mon Sep 17 00:00:00 2001
+From: Joel Stanley <joel.stanley@au1.ibm.com>
+Date: Mon, 21 Aug 2017 20:40:42 +0930
+Subject: [PATCH] hwpf: Remove unused variable
+
+Change-Id: I2708f34211d712af911e5ca6b8d212f22cc68133
+Signed-off-by: Joel Stanley <joel.stanley@au1.ibm.com>
+---
+ src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_build_smp_adu.C | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_build_smp_adu.C b/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_build_smp_adu.C
+index 1391cb1c8d25..b3a8cc8c7636 100644
+--- a/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_build_smp_adu.C
++++ b/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp/proc_build_smp_adu.C
+@@ -5,7 +5,7 @@
+ /*                                                                        */
+ /* OpenPOWER HostBoot Project                                             */
+ /*                                                                        */
+-/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
++/* Contributors Listed Below - COPYRIGHT 2012,2017                        */
+ /* [+] International Business Machines Corp.                              */
+ /*                                                                        */
+ /*                                                                        */
+@@ -677,7 +677,6 @@ fapi::ReturnCode proc_build_smp_quiesce_pb(
+     fapi::ReturnCode rc;
+     std::map<proc_fab_smp_node_id, proc_build_smp_node>::iterator n_iter;
+     std::map<proc_fab_smp_chip_id, proc_build_smp_chip>::iterator p_iter;
+-    std::vector<proc_build_smp_chip*>::iterator quiesce_iter;
+     // ADU status/control information
+     proc_adu_utils_fbc_op adu_ctl;
+     proc_adu_utils_fbc_op_hp_ctl adu_hp_ctl;
+-- 
+2.14.1
+
diff --git a/openpower/package/hostboot/p9Patches/hostboot-0001-Remove-support-for-P9N-Nimbus-DD1.0.patch b/openpower/package/hostboot/p9Patches/hostboot-0001-Remove-support-for-P9N-Nimbus-DD1.0.patch
new file mode 100644
index 0000000..3ed2df7
--- /dev/null
+++ b/openpower/package/hostboot/p9Patches/hostboot-0001-Remove-support-for-P9N-Nimbus-DD1.0.patch
@@ -0,0 +1,100 @@
+From 3fc13542a298284b7a45ee6fbf2152aec659c733 Mon Sep 17 00:00:00 2001
+From: Dean Sanner <dsanner@us.ibm.com>
+Date: Mon, 18 Sep 2017 13:49:09 -0500
+Subject: [PATCH] Remove support for P9N (Nimbus) DD1.0
+
+  - Will error out during IPL
+  - Gracefully handle removal of DD1.0 inits,
+    tied to hw091517b.910 HCODE image
+
+Change-Id: I7b4c53b38863a8251a8c02d7df83a3ff713f52d7
+---
+ src/include/usr/isteps/istep_reasoncodes.H  |  2 ++
+ src/usr/isteps/istep06/host_set_ipl_parms.C | 44 ++++++++++++++++++++++++++++-
+ 2 files changed, 45 insertions(+), 1 deletion(-)
+
+diff --git a/src/include/usr/isteps/istep_reasoncodes.H b/src/include/usr/isteps/istep_reasoncodes.H
+index bdf4c93..d76eceb 100644
+--- a/src/include/usr/isteps/istep_reasoncodes.H
++++ b/src/include/usr/isteps/istep_reasoncodes.H
+@@ -62,6 +62,7 @@ namespace ISTEP
+         MOD_SBE_PERFORM_UPDATE_CHECK                      = 0x1A,
+         MOD_MSS_ATTR_UPDATE = 0x1B, /* @TODO-RTC:149250-Remove */
+         MOD_SBE_GET_FFDC_HANDLER                          = 0x1C,
++        MOD_SET_IPL_PARMS                                 = 0x1D,
+     };
+ 
+     /**
+@@ -122,6 +123,7 @@ namespace ISTEP
+         RC_SBE_UPDATE_IN_MPIPL                   = ISTEP_COMP_ID | 0x32,
+         RC_NO_FFDC_RETURNED                      = ISTEP_COMP_ID | 0x33,
+         RC_RETURNED_FFDC                         = ISTEP_COMP_ID | 0x34,
++        RC_P9N_DD1_NOT_SUPPORTED                 = ISTEP_COMP_ID | 0x35,
+     };
+ 
+ };
+diff --git a/src/usr/isteps/istep06/host_set_ipl_parms.C b/src/usr/isteps/istep06/host_set_ipl_parms.C
+index 8fe9f12..c42f909 100644
+--- a/src/usr/isteps/istep06/host_set_ipl_parms.C
++++ b/src/usr/isteps/istep06/host_set_ipl_parms.C
+@@ -31,7 +31,9 @@
+ #include <initservice/isteps_trace.H>
+ #include <util/utilsemipersist.H>
+ #include <hwas/common/deconfigGard.H>
+-
++#include <arch/pvrformat.H>
++#include <sys/mmio.h>
++#include <console/consoleif.H>
+ 
+ namespace ISTEP_06
+ {
+@@ -77,6 +79,46 @@ void* host_set_ipl_parms( void *io_pArgs )
+     Util::writeSemiPersistData(l_semiData);
+ 
+ 
++    // Add a check to indicate that Nimbus DD1.0 is NOT supported
++    // and prevent a boot
++    PVR_t l_pvr( mmio_pvr_read() & 0xFFFFFFFF );
++    if( l_pvr.isNimbusDD1() )
++    {
++#ifdef CONFIG_CONSOLE
++        CONSOLE::displayf(ISTEP_COMP_NAME,
++                          "P9N (Nimbus) DD1.0 is not supported in this driver");
++        CONSOLE::displayf(ISTEP_COMP_NAME,
++                          "Please update the system's processor modules");
++#endif
++
++
++        TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
++                   "DD1.0 is NOT SUPPORTED anymore. "
++                   "Please upgrade proc modules");
++        /*@
++         * @errortype
++         * @moduleid     ISTEP::MOD_SET_IPL_PARMS
++         * @reasoncode   ISTEP::RC_P9N_DD1_NOT_SUPPORTED
++         * @userdata1    PVR of master proc
++         * @devdesc      P9N (Nimbus) DD1.x is not supported
++         *               in this firmware driver.  Please update
++         *               your module or use a different driver
++         * @custdesc     A problem occurred during the IPL
++         *               of the system.
++         */
++        uint64_t l_dummy = 0x0;
++        l_err = new ERRORLOG::ErrlEntry(
++                                        ERRORLOG::ERRL_SEV_UNRECOVERABLE,
++                                        ISTEP::MOD_SET_IPL_PARMS,
++                                        ISTEP::RC_P9N_DD1_NOT_SUPPORTED,
++                                        l_pvr.word,
++                                        l_dummy);
++        // Create IStep error log and cross ref error that occurred
++        l_stepError.addErrorDetails( l_err );
++        errlCommit( l_err, ISTEP_COMP_ID );
++    }
++
++
+     TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "host_set_ipl_parms exit" );
+ 
+     return l_stepError.getErrorHandle();
+-- 
+1.8.2.2
+
diff --git a/openpower/package/ima-catalog/ima-catalog.mk b/openpower/package/ima-catalog/ima-catalog.mk
index 5c337fc..961e235 100644
--- a/openpower/package/ima-catalog/ima-catalog.mk
+++ b/openpower/package/ima-catalog/ima-catalog.mk
@@ -3,7 +3,7 @@
 # ima-catalog.mk
 #
 ################################################################################
-IMA_CATALOG_VERSION ?= e3bb899021f3f0f493ee69c0b2f9a65e8836c51e
+IMA_CATALOG_VERSION ?= f9da5d6feb3c407cd24c88d61b73d7d01b2d1400
 IMA_CATALOG_SITE ?= $(call github,open-power,ima-catalog,$(IMA_CATALOG_VERSION))
 IMA_CATALOG_LICENSE = Apache-2.0
 IMA_CATALOG_DEPENDENCIES = host-dtc host-xz
diff --git a/openpower/package/libflash/libflash.mk b/openpower/package/libflash/libflash.mk
index a409b46..c1c1a15 100644
--- a/openpower/package/libflash/libflash.mk
+++ b/openpower/package/libflash/libflash.mk
@@ -30,7 +30,8 @@
 endef
 
 define HOST_LIBFLASH_BUILD_CMDS
-    $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/external/pflash
+    $(HOST_MAKE_ENV) SKIBOOT_VERSION=$(LIBFLASH_VERSION) \
+	    $(MAKE) -C $(@D)/external/pflash
 endef
 
 define LIBFLASH_INSTALL_STAGING_CMDS
diff --git a/openpower/package/occ/occ.mk b/openpower/package/occ/occ.mk
index b6c52ab..65fd28a 100644
--- a/openpower/package/occ/occ.mk
+++ b/openpower/package/occ/occ.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 OCC_VERSION_BRANCH_MASTER_P8 ?= 28f2cec690b7f19548ce860a8820f519e6c39a6a
-OCC_VERSION_BRANCH_MASTER ?= 3b72373a3bfd5716902b48515f96faac683ef8dd
+OCC_VERSION_BRANCH_MASTER ?= 6f77ee7bfbcc7e36fe55ee2891c4372bd5a0143a
 
 OCC_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_VERSION_BRANCH_MASTER),$(OCC_VERSION_BRANCH_MASTER_P8))
 OCC_SITE ?= $(call github,open-power,occ,$(OCC_VERSION))
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 3939f58..aea361d 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPENPOWER_PNOR_VERSION ?= 554b2efe2299575bd48f1e46e54a4e05fcf96753
+OPENPOWER_PNOR_VERSION ?= 21d66daff697f8c13fb067340ca621e9208ab1ea
 OPENPOWER_PNOR_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_VERSION))
 
 OPENPOWER_PNOR_LICENSE = Apache-2.0
diff --git a/openpower/package/sbe/sbe.mk b/openpower/package/sbe/sbe.mk
index 4343741..891d992 100644
--- a/openpower/package/sbe/sbe.mk
+++ b/openpower/package/sbe/sbe.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SBE_VERSION ?= 4a621260c91e04eae8c44894d32a6aeda53c5c54
+SBE_VERSION ?= ff713dfd14ecf97b050a737cc5da2d6f01db493f
 SBE_SITE ?= $(call github,open-power,sbe,$(SBE_VERSION))
 
 SBE_LICENSE = Apache-2.0
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index 2147498..c5da4a2 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -31,7 +31,7 @@
 
 config BR2_SKIBOOT_VERSION
 	string
-	default "v5.7-92-g0818df625e35" if BR2_SKIBOOT_LATEST_VERSION
+	default "v5.8-109-g4b22457e7837" if BR2_SKIBOOT_LATEST_VERSION
 	default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_SKIBOOT_CUSTOM_VERSION
 
diff --git a/openpower/patches/redbud-patches/skiboot/0001-NOT-FOR-UPSTREAM-Add-support-for-Redbud.patch b/openpower/patches/redbud-patches/skiboot/0001-NOT-FOR-UPSTREAM-Add-support-for-Redbud.patch
deleted file mode 100644
index 25897fb..0000000
--- a/openpower/patches/redbud-patches/skiboot/0001-NOT-FOR-UPSTREAM-Add-support-for-Redbud.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From 399620b8282f89728ab94fd0c273882063bf32b1 Mon Sep 17 00:00:00 2001
-From: Alistair Popple <alistair@popple.id.au>
-Date: Thu, 22 Jun 2017 13:26:01 +1000
-Subject: [PATCH] NOT FOR UPSTREAM: Add support for Redbud
-
-Add support for Redbud. This is mutually exclusive with support for Sequoia so
-anything built with this patch will not work on Sequoia.
-
-Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
----
- platforms/astbmc/Makefile.inc                |  2 +-
- platforms/astbmc/{witherspoon.c => redbud.c} | 68 +++++++---------------------
- 2 files changed, 18 insertions(+), 52 deletions(-)
- rename platforms/astbmc/{witherspoon.c => redbud.c} (91%)
-
-diff --git a/platforms/astbmc/Makefile.inc b/platforms/astbmc/Makefile.inc
-index 49292c10601c..797a03c323ad 100644
---- a/platforms/astbmc/Makefile.inc
-+++ b/platforms/astbmc/Makefile.inc
-@@ -4,7 +4,7 @@ ASTBMC_OBJS = pnor.o common.o slots.o \
- 	      palmetto.o habanero.o firestone.o \
- 	      p8dtu.o p8dnu.o \
- 	      garrison.o barreleye.o \
--	      witherspoon.o zaius.o romulus.o p9dsu.o
-+	      redbud.o zaius.o romulus.o p9dsu.o
- 
- ASTBMC = $(PLATDIR)/astbmc/built-in.o
- $(ASTBMC): $(ASTBMC_OBJS:%=$(PLATDIR)/astbmc/%)
-diff --git a/platforms/astbmc/witherspoon.c b/platforms/astbmc/redbud.c
-similarity index 91%
-rename from platforms/astbmc/witherspoon.c
-rename to platforms/astbmc/redbud.c
-index 6a773061db74..90373f66961f 100644
---- a/platforms/astbmc/witherspoon.c
-+++ b/platforms/astbmc/redbud.c
-@@ -51,7 +51,7 @@ static const struct slot_table_entry witherspoon_gpu1[] = {
- static const struct slot_table_entry witherspoon_gpu2[] = {
- 	{
- 		.etype = st_pluggable_slot,
--		.location = ST_LOC_DEVFN(0xc0,0),
-+		.location = ST_LOC_DEVFN(0x60,0),
- 		.name = "GPU2",
- 	},
- 	{ .etype = st_end },
-@@ -60,26 +60,8 @@ static const struct slot_table_entry witherspoon_gpu2[] = {
- static const struct slot_table_entry witherspoon_gpu3[] = {
- 	{
- 		.etype = st_pluggable_slot,
--		.location = ST_LOC_DEVFN(0x60,0),
--		.name = "GPU3",
--	},
--	{ .etype = st_end },
--};
--
--static const struct slot_table_entry witherspoon_gpu4[] = {
--	{
--		.etype = st_pluggable_slot,
- 		.location = ST_LOC_DEVFN(0x80,0),
--		.name = "GPU4",
--	},
--	{ .etype = st_end },
--};
--
--static const struct slot_table_entry witherspoon_gpu5[] = {
--	{
--		.etype = st_pluggable_slot,
--		.location = ST_LOC_DEVFN(0xa0,0),
--		.name = "GPU5",
-+		.name = "GPU3",
- 	},
- 	{ .etype = st_end },
- };
-@@ -97,12 +79,6 @@ static const struct slot_table_entry witherspoon_plx0_down[] = {
- 		.children = witherspoon_gpu1,
- 		.name = "GPU1 down",
- 	},
--	{
--		.etype = st_builtin_dev,
--		.location = ST_LOC_DEVFN(0x4c,0),
--		.children = witherspoon_gpu2,
--		.name = "GPU2 down",
--	},
- 	{ .etype = st_end },
- };
- 
-@@ -110,20 +86,14 @@ static const struct slot_table_entry witherspoon_plx1_down[] = {
- 	{
- 		.etype = st_builtin_dev,
- 		.location = ST_LOC_DEVFN(0x44,0),
--		.children = witherspoon_gpu3,
--		.name = "GPU3 down",
-+		.children = witherspoon_gpu2,
-+		.name = "GPU2 down",
- 	},
- 	{
- 		.etype = st_builtin_dev,
- 		.location = ST_LOC_DEVFN(0x45,0),
--		.children = witherspoon_gpu4,
--		.name = "GPU4 down",
--	},
--	{
--		.etype = st_builtin_dev,
--		.location = ST_LOC_DEVFN(0x4d,0),
--		.children = witherspoon_gpu5,
--		.name = "GPU5 down",
-+		.children = witherspoon_gpu3,
-+		.name = "GPU3 down",
- 	},
- 	{ .etype = st_end },
- };
-@@ -175,11 +145,6 @@ static const struct slot_table_entry witherspoon_npu0_slots[] = {
- 		.location = ST_LOC_NPU_GROUP(1),
- 		.name = "GPU1",
- 	},
--	{
--		.etype = st_npu_slot,
--		.location = ST_LOC_NPU_GROUP(2),
--		.name = "GPU2",
--	},
- 	{ .etype = st_end },
- };
- 
-@@ -187,17 +152,12 @@ static const struct slot_table_entry witherspoon_npu8_slots[] = {
- 	{
- 		.etype = st_npu_slot,
- 		.location = ST_LOC_NPU_GROUP(0),
--		.name = "GPU3",
-+		.name = "GPU2",
- 	},
- 	{
- 		.etype = st_npu_slot,
- 		.location = ST_LOC_NPU_GROUP(1),
--		.name = "GPU4",
--	},
--	{
--		.etype = st_npu_slot,
--		.location = ST_LOC_NPU_GROUP(2),
--		.name = "GPU5",
-+		.name = "GPU3",
- 	},
- 	{ .etype = st_end },
- };
-@@ -290,10 +250,10 @@ static void dt_create_npu2(void)
- 
- 		create_link(npu, 0, 0);
- 		create_link(npu, 0, 1);
--		create_link(npu, 1, 2);
-+		create_link(npu, 0, 2);
- 		create_link(npu, 1, 3);
--		create_link(npu, 2, 4);
--		create_link(npu, 2, 5);
-+		create_link(npu, 1, 4);
-+		create_link(npu, 1, 5);
- 	}
- }
- 
-@@ -304,6 +264,12 @@ static bool witherspoon_probe(void)
- 	if (!dt_node_is_compatible(dt_root, "ibm,witherspoon"))
- 		return false;
- 
-+	prerror("********************************************************************************\n");
-+	prerror("*     README: THIS BUILD IS ONLY FOR SYSTEMS SUPPORTING A MAXIMUM OF 4 GPUS    *\n");
-+	prerror("*                                                                              *\n");
-+	prerror("*       !!! THIS BUILD WILL NOT WORK ON SYSTEMS WHICH SUPPORT 6 GPUS !!!       *\n");
-+	prerror("********************************************************************************\n");
-+
- 	/* Lot of common early inits here */
- 	astbmc_early_init();
- 
--- 
-2.9.4
-
diff --git a/openpower/patches/sequoia-patches/machine-xml/0001-Temporarily-Change-PLL-BUCKET-settings.patch b/openpower/patches/sequoia-patches/machine-xml/0001-Temporarily-Change-PLL-BUCKET-settings.patch
deleted file mode 100644
index 63867ce..0000000
--- a/openpower/patches/sequoia-patches/machine-xml/0001-Temporarily-Change-PLL-BUCKET-settings.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From fc91388ea139d6233484e1fefc606165861f517a Mon Sep 17 00:00:00 2001
-From: Bill Hoffa <wghoffa@us.ibm.com>
-Date: Tue, 8 Aug 2017 15:15:01 -0500
-Subject: [PATCH] Temporarily Change PLL BUCKET settings
-
----
- witherspoon.xml | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/witherspoon.xml b/witherspoon.xml
-index 103e865..1319c79 100644
---- a/witherspoon.xml
-+++ b/witherspoon.xml
-@@ -18641,19 +18641,19 @@
- 	</attribute>
- 	<attribute>
- 		<id>OB0_PLL_BUCKET</id>
--		<default>1</default>
-+		<default>0x02</default>
- 	</attribute>
- 	<attribute>
- 		<id>OB1_PLL_BUCKET</id>
--		<default>1</default>
-+		<default>0x02</default>
- 	</attribute>
- 	<attribute>
- 		<id>OB2_PLL_BUCKET</id>
--		<default>1</default>
-+		<default>0x02</default>
- 	</attribute>
- 	<attribute>
- 		<id>OB3_PLL_BUCKET</id>
--		<default>1</default>
-+		<default>0x02</default>
- 	</attribute>
- 	<attribute>
- 		<id>OBUS_RATIO_VALUE</id>
--- 
-1.8.2.2
-
diff --git a/openpower/patches/redbud-patches/machine-xml/0001-Temporarily-Change-PLL-BUCKET-settings.patch b/openpower/patches/witherspoon-patches/machine-xml/0001-Temporarily-Change-PLL-BUCKET-settings.patch
similarity index 100%
rename from openpower/patches/redbud-patches/machine-xml/0001-Temporarily-Change-PLL-BUCKET-settings.patch
rename to openpower/patches/witherspoon-patches/machine-xml/0001-Temporarily-Change-PLL-BUCKET-settings.patch
diff --git a/openpower/scripts/release-notes b/openpower/scripts/release-notes
index a0f322f..33974d5 100755
--- a/openpower/scripts/release-notes
+++ b/openpower/scripts/release-notes
@@ -74,6 +74,23 @@
 
 my $witherspoon_insanity;
 
+# If both witherspoon and witherspoon-sequoia exist we've switched back
+# to a single witherspoon platform and the -sequoia platform is just to
+# keep Jenkins happy - ignore it.
+if ("witherspoon" ~~ @begin_platforms
+	&& "witherspoon-sequoia" ~~ @begin_platforms) {
+	my $index = 0;
+	$index++ until @begin_platforms[$index] eq "witherspoon-sequoia";
+	splice(@begin_platforms, $index, 1);
+}
+
+if ("witherspoon" ~~ @end_platforms
+	&& "witherspoon-sequoia" ~~ @end_platforms) {
+	my $index = 0;
+	$index++ until @end_platforms[$index] eq "witherspoon-sequoia";
+	splice(@end_platforms, $index, 1);
+}
+
 if (($platform && $platform eq 'witherspoon')
     && -f "$end_worktree/openpower/configs/witherspoon-sequoia_defconfig") {
     @begin_platforms = ('witherspoon');