diff --git a/.gitmodules b/.gitmodules
index 6bda627..4f0f85e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "buildroot"]
 	path = buildroot
-	branch = 2016.05-op-build
+	branch = 2016.08-op-build
 	url = https://github.com/open-power/buildroot
diff --git a/buildroot b/buildroot
index 81b8d98..211bd05 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit 81b8d98f563e3045d80284d357df6cab4a610375
+Subproject commit 211bd050aa32bfda12da1e9495234e01d6862b3c
diff --git a/openpower/configs/barreleye_defconfig b/openpower/configs/barreleye_defconfig
index 3584373..cf95a71 100644
--- a/openpower/configs/barreleye_defconfig
+++ b/openpower/configs/barreleye_defconfig
@@ -1,50 +1,21 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_OPENPOWER_PLATFORM=y
-
+BR2_KERNEL_HEADERS_4_4=y
+BR2_BINUTILS_VERSION_2_26_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_GLIBC_VERSION_2_23=y
-
-BR2_OPENPOWER_CONFIG_NAME="barreleye"
-BR2_OPENPOWER_XML_PACKAGE="barreleye-xml"
-BR2_HOSTBOOT_CONFIG_FILE="barreleye.config"
-
-BR2_HOSTBOOT_BINARY_SBE_FILENAME="venice_sbe.img.ecc"
-BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
-BR2_HOSTBOOT_BINARY_WINK_FILENAME="p8.ref_image.hdr.bin.ecc"
-
-BR2_OCC_BIN_FILENAME="occ.bin"
-
-BR2_BARRELEYE_SYSTEM_XML_FILENAME="BARRELEYE_hb.system.xml"
-BR2_BARRELEYE_MRW_XML_FILENAME="BARRELEYE_hb.mrw.xml"
-BR2_BARRELEYE_BIOS_XML_FILENAME="BARRELEYE_bios.xml"
-
-BR2_OPENPOWER_TARGETING_BIN_FILENAME="BARRELEYE_HB.targeting.bin"
-BR2_OPENPOWER_TARGETING_ECC_FILENAME="BARRELEYE_HB.targeting.bin.ecc"
-BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
-
-BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayoutWithGoldenSide.xml"
-BR2_OPENPOWER_PNOR_FILENAME="barreleye.pnor"
-BR2_OPENPOWER_PNOR_UPDATE_FILENAME="barreleye_update.pnor"
-
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
-
-# petitboot requirements
-BR2_ENABLE_LOCALE_PURGE=y
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
+BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
+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_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
-BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
 BR2_ROOTFS_OVERLAY="../openpower/overlay"
-BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.19"
-BR2_KERNEL_HEADERS_4_4=y
-BR2_BINUTILS_VERSION_2_26_X=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.22"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
@@ -54,16 +25,36 @@
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
 BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_IPMITOOL=y
+BR2_PACKAGE_MDADM=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_SERVER is not set
 BR2_PACKAGE_ETHTOOL=y
 BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_RSYNC=y
-BR2_PACKAGE_PETITBOOT=y
-BR2_PACKAGE_PETITBOOT_MTD=y
-BR2_PACKAGE_IPMITOOL=y
-BR2_PACKAGE_MDADM=y
 BR2_TARGET_ROOTFS_CPIO_XZ=y
 BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_OPENPOWER_PLATFORM=y
+BR2_OPENPOWER_POWER8=y
+BR2_HOSTBOOT_CONFIG_FILE="barreleye.config"
+BR2_BARRELEYE_SYSTEM_XML_FILENAME="BARRELEYE_hb.system.xml"
+BR2_BARRELEYE_MRW_XML_FILENAME="BARRELEYE_hb.mrw.xml"
+BR2_BARRELEYE_BIOS_XML_FILENAME="BARRELEYE_bios.xml"
+BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayoutWithGoldenSide.xml"
+BR2_OPENPOWER_CONFIG_NAME="barreleye"
+BR2_OPENPOWER_XML_PACKAGE="barreleye-xml"
+BR2_OPENPOWER_PNOR_FILENAME="barreleye.pnor"
+BR2_OPENPOWER_PNOR_UPDATE_FILENAME="barreleye_update.pnor"
+BR2_HOSTBOOT_BINARY_SBE_FILENAME="venice_sbe.img.ecc"
+BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
+BR2_HOSTBOOT_BINARY_WINK_FILENAME="p8.ref_image.hdr.bin.ecc"
+BR2_IMA_CATALOG_FILENAME="ima_catalog.bin"
+BR2_IMA_CATALOG_ECC_FILENAME="ima_catalog.bin.ecc"
+BR2_OPENPOWER_TARGETING_BIN_FILENAME="BARRELEYE_HB.targeting.bin"
+BR2_OPENPOWER_TARGETING_ECC_FILENAME="BARRELEYE_HB.targeting.bin.ecc"
+BR2_PACKAGE_PETITBOOT=y
+BR2_PACKAGE_PETITBOOT_MTD=y
+BR2_OCC_BIN_FILENAME="occ.bin"
+BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
 BR2_PACKAGE_LOADKEYS=y
diff --git a/openpower/configs/firenze_defconfig b/openpower/configs/firenze_defconfig
index a28aaa7..094d426 100644
--- a/openpower/configs/firenze_defconfig
+++ b/openpower/configs/firenze_defconfig
@@ -1,65 +1,50 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_OPENPOWER_PLATFORM=y
-
+BR2_KERNEL_HEADERS_4_4=y
+BR2_BINUTILS_VERSION_2_26_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_GLIBC_VERSION_2_23=y
-
-# No HostBoot, OCC, or PNOR required
-BR2_PACKAGE_HOSTBOOT=n
-BR2_PACKAGE_HOSTBOOT_BINARIES=n
-
-BR2_OPENPOWER_CONFIG_NAME="openpower-firenze"
-
-BR2_PACKAGE_OCC=n
-
-BR2_PACKAGE_OPENPOWER_PNOR=n
-
-# no cappucode either
-BR2_PACKAGE_CAPP_UCODE=n
-
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
-
-BR2_PACKAGE_SKIBOOT=y
-
-# petitboot requirements
-BR2_ENABLE_LOCALE_PURGE=y
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
+BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
+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_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
-BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
 BR2_ROOTFS_OVERLAY="../openpower/overlay"
-BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firenze-firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.19"
-BR2_KERNEL_HEADERS_4_4=y
-BR2_BINUTILS_VERSION_2_26_X=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.22"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
 BR2_LINUX_KERNEL_ZIMAGE_EPAPR=y
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_RADEON=y
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
-BR2_PACKAGE_LINUX_FIRMWARE_RADEON=y
 BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_IPMITOOL=y
+BR2_PACKAGE_MDADM=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_SERVER is not set
 BR2_PACKAGE_ETHTOOL=y
 BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_RSYNC=y
+BR2_TARGET_ROOTFS_CPIO=y
+BR2_TARGET_ROOTFS_CPIO_XZ=y
+BR2_OPENPOWER_PLATFORM=y
+BR2_OPENPOWER_POWER8=y
+# BR2_PACKAGE_HOSTBOOT is not set
+# BR2_PACKAGE_HOSTBOOT_BINARIES is not set
+# BR2_PACKAGE_OPENPOWER_PNOR is not set
+BR2_OPENPOWER_CONFIG_NAME="openpower-firenze"
 BR2_PACKAGE_PETITBOOT=y
 BR2_PACKAGE_PETITBOOT_MTD=y
-BR2_PACKAGE_IPMITOOL=y
-BR2_PACKAGE_MDADM=y
-BR2_TARGET_ROOTFS_CPIO_XZ=y
-# do not include rootfs in zImage
-BR2_TARGET_ROOTFS_CPIO=y
-BR2_TARGET_ROOTFS_INITRAMFS=n
+# BR2_PACKAGE_HOST_P8_PORE_BINUTILS is not set
+# BR2_PACKAGE_OCC is not set
+# BR2_PACKAGE_CAPP_UCODE is not set
 BR2_PACKAGE_LOADKEYS=y
diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig
index a55280b..27b55cd 100644
--- a/openpower/configs/firestone_defconfig
+++ b/openpower/configs/firestone_defconfig
@@ -1,50 +1,21 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_OPENPOWER_PLATFORM=y
-
+BR2_KERNEL_HEADERS_4_4=y
+BR2_BINUTILS_VERSION_2_26_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_GLIBC_VERSION_2_23=y
-
-BR2_OPENPOWER_CONFIG_NAME="firestone"
-BR2_OPENPOWER_XML_PACKAGE="firestone-xml"
-BR2_HOSTBOOT_CONFIG_FILE="firestone.config"
-
-BR2_HOSTBOOT_BINARY_SBE_FILENAME="venice_sbe.img.ecc"
-BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
-BR2_HOSTBOOT_BINARY_WINK_FILENAME="p8.ref_image.hdr.bin.ecc"
-
-BR2_OCC_BIN_FILENAME="occ.bin"
-
-BR2_FIRESTONE_SYSTEM_XML_FILENAME="FIRESTONE_hb.system.xml"
-BR2_FIRESTONE_MRW_XML_FILENAME="FIRESTONE_hb.mrw.xml"
-BR2_FIRESTONE_BIOS_XML_FILENAME="FIRESTONE_bios.xml"
-
-BR2_OPENPOWER_TARGETING_BIN_FILENAME="FIRESTONE_HB.targeting.bin"
-BR2_OPENPOWER_TARGETING_ECC_FILENAME="FIRESTONE_HB.targeting.bin.ecc"
-BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
-
-BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayoutWithGoldenSide.xml"
-BR2_OPENPOWER_PNOR_FILENAME="firestone.pnor"
-BR2_OPENPOWER_PNOR_UPDATE_FILENAME="firestone_update.pnor"
-
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
-
-# petitboot requirements
-BR2_ENABLE_LOCALE_PURGE=y
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
+BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
+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_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
-BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
 BR2_ROOTFS_OVERLAY="../openpower/overlay"
-BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.19"
-BR2_KERNEL_HEADERS_4_4=y
-BR2_BINUTILS_VERSION_2_26_X=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.22"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
@@ -54,16 +25,36 @@
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
 BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_IPMITOOL=y
+BR2_PACKAGE_MDADM=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_SERVER is not set
 BR2_PACKAGE_ETHTOOL=y
 BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_RSYNC=y
-BR2_PACKAGE_PETITBOOT=y
-BR2_PACKAGE_PETITBOOT_MTD=y
-BR2_PACKAGE_IPMITOOL=y
-BR2_PACKAGE_MDADM=y
 BR2_TARGET_ROOTFS_CPIO_XZ=y
 BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_OPENPOWER_PLATFORM=y
+BR2_OPENPOWER_POWER8=y
+BR2_HOSTBOOT_CONFIG_FILE="firestone.config"
+BR2_FIRESTONE_SYSTEM_XML_FILENAME="FIRESTONE_hb.system.xml"
+BR2_FIRESTONE_MRW_XML_FILENAME="FIRESTONE_hb.mrw.xml"
+BR2_FIRESTONE_BIOS_XML_FILENAME="FIRESTONE_bios.xml"
+BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayoutWithGoldenSide.xml"
+BR2_OPENPOWER_CONFIG_NAME="firestone"
+BR2_OPENPOWER_XML_PACKAGE="firestone-xml"
+BR2_OPENPOWER_PNOR_FILENAME="firestone.pnor"
+BR2_OPENPOWER_PNOR_UPDATE_FILENAME="firestone_update.pnor"
+BR2_HOSTBOOT_BINARY_SBE_FILENAME="venice_sbe.img.ecc"
+BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
+BR2_HOSTBOOT_BINARY_WINK_FILENAME="p8.ref_image.hdr.bin.ecc"
+BR2_IMA_CATALOG_FILENAME="ima_catalog.bin"
+BR2_IMA_CATALOG_ECC_FILENAME="ima_catalog.bin.ecc"
+BR2_OPENPOWER_TARGETING_BIN_FILENAME="FIRESTONE_HB.targeting.bin"
+BR2_OPENPOWER_TARGETING_ECC_FILENAME="FIRESTONE_HB.targeting.bin.ecc"
+BR2_PACKAGE_PETITBOOT=y
+BR2_PACKAGE_PETITBOOT_MTD=y
+BR2_OCC_BIN_FILENAME="occ.bin"
+BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
 BR2_PACKAGE_LOADKEYS=y
diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig
index e1020a3..6b77541 100644
--- a/openpower/configs/garrison_defconfig
+++ b/openpower/configs/garrison_defconfig
@@ -1,50 +1,21 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_OPENPOWER_PLATFORM=y
-
+BR2_KERNEL_HEADERS_4_4=y
+BR2_BINUTILS_VERSION_2_26_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_GLIBC_VERSION_2_23=y
-
-BR2_OPENPOWER_CONFIG_NAME="garrison"
-BR2_OPENPOWER_XML_PACKAGE="garrison-xml"
-BR2_HOSTBOOT_CONFIG_FILE="garrison.config"
-
-BR2_HOSTBOOT_BINARY_SBE_FILENAME="naples_sbe.img.ecc"
-BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
-BR2_HOSTBOOT_BINARY_WINK_FILENAME="n1.ref_image.hdr.bin.ecc"
-
-BR2_OCC_BIN_FILENAME="occ.bin"
-
-BR2_GARRISON_SYSTEM_XML_FILENAME="GARRISON_hb.system.xml"
-BR2_GARRISON_MRW_XML_FILENAME="GARRISON_hb.mrw.xml"
-BR2_GARRISON_BIOS_XML_FILENAME="GARRISON_bios.xml"
-
-BR2_OPENPOWER_TARGETING_BIN_FILENAME="GARRISON_HB.targeting.bin"
-BR2_OPENPOWER_TARGETING_ECC_FILENAME="GARRISON_HB.targeting.bin.ecc"
-BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
-
-BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayoutWithGoldenSide.xml"
-BR2_OPENPOWER_PNOR_FILENAME="garrison.pnor"
-BR2_OPENPOWER_PNOR_UPDATE_FILENAME="garrison_update.pnor"
-
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
-
-# petitboot requirements
-BR2_ENABLE_LOCALE_PURGE=y
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
+BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
+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_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
-BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
 BR2_ROOTFS_OVERLAY="../openpower/overlay"
-BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.19"
-BR2_KERNEL_HEADERS_4_4=y
-BR2_BINUTILS_VERSION_2_26_X=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.22"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
@@ -54,16 +25,36 @@
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
 BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_IPMITOOL=y
+BR2_PACKAGE_MDADM=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_SERVER is not set
 BR2_PACKAGE_ETHTOOL=y
 BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_RSYNC=y
-BR2_PACKAGE_PETITBOOT=y
-BR2_PACKAGE_PETITBOOT_MTD=y
-BR2_PACKAGE_IPMITOOL=y
-BR2_PACKAGE_MDADM=y
 BR2_TARGET_ROOTFS_CPIO_XZ=y
 BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_OPENPOWER_PLATFORM=y
+BR2_OPENPOWER_POWER8=y
+BR2_HOSTBOOT_CONFIG_FILE="garrison.config"
+BR2_GARRISON_SYSTEM_XML_FILENAME="GARRISON_hb.system.xml"
+BR2_GARRISON_MRW_XML_FILENAME="GARRISON_hb.mrw.xml"
+BR2_GARRISON_BIOS_XML_FILENAME="GARRISON_bios.xml"
+BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayoutWithGoldenSide.xml"
+BR2_OPENPOWER_CONFIG_NAME="garrison"
+BR2_OPENPOWER_XML_PACKAGE="garrison-xml"
+BR2_OPENPOWER_PNOR_FILENAME="garrison.pnor"
+BR2_OPENPOWER_PNOR_UPDATE_FILENAME="garrison_update.pnor"
+BR2_HOSTBOOT_BINARY_SBE_FILENAME="naples_sbe.img.ecc"
+BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
+BR2_HOSTBOOT_BINARY_WINK_FILENAME="n1.ref_image.hdr.bin.ecc"
+BR2_IMA_CATALOG_FILENAME="ima_catalog.bin"
+BR2_IMA_CATALOG_ECC_FILENAME="ima_catalog.bin.ecc"
+BR2_OPENPOWER_TARGETING_BIN_FILENAME="GARRISON_HB.targeting.bin"
+BR2_OPENPOWER_TARGETING_ECC_FILENAME="GARRISON_HB.targeting.bin.ecc"
+BR2_PACKAGE_PETITBOOT=y
+BR2_PACKAGE_PETITBOOT_MTD=y
+BR2_OCC_BIN_FILENAME="occ.bin"
+BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
 BR2_PACKAGE_LOADKEYS=y
diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig
index 7cdb031..ec84ad5 100644
--- a/openpower/configs/habanero_defconfig
+++ b/openpower/configs/habanero_defconfig
@@ -1,50 +1,21 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_OPENPOWER_PLATFORM=y
-
+BR2_KERNEL_HEADERS_4_4=y
+BR2_BINUTILS_VERSION_2_26_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_GLIBC_VERSION_2_23=y
-
-BR2_OPENPOWER_CONFIG_NAME="habanero"
-BR2_OPENPOWER_XML_PACKAGE="habanero-xml"
-BR2_HOSTBOOT_CONFIG_FILE="habanero.config"
-
-BR2_HOSTBOOT_BINARY_SBE_FILENAME="venice_sbe.img.ecc"
-BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
-BR2_HOSTBOOT_BINARY_WINK_FILENAME="p8.ref_image.hdr.bin.ecc"
-
-BR2_OCC_BIN_FILENAME="occ.bin"
-
-BR2_HABANERO_SYSTEM_XML_FILENAME="HABANERO_hb.system.xml"
-BR2_HABANERO_MRW_XML_FILENAME="HABANERO_hb.mrw.xml"
-BR2_HABANERO_BIOS_XML_FILENAME="HABANERO_bios.xml"
-
-BR2_OPENPOWER_TARGETING_BIN_FILENAME="HABANERO_HB.targeting.bin"
-BR2_OPENPOWER_TARGETING_ECC_FILENAME="HABANERO_HB.targeting.bin.ecc"
-BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
-
-BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayoutWithGoldenSide.xml"
-BR2_OPENPOWER_PNOR_FILENAME="habanero.pnor"
-BR2_OPENPOWER_PNOR_UPDATE_FILENAME="habanero_update.pnor"
-
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
-
-# petitboot requirements
-BR2_ENABLE_LOCALE_PURGE=y
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
+BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
+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_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
-BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
 BR2_ROOTFS_OVERLAY="../openpower/overlay"
-BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.19"
-BR2_KERNEL_HEADERS_4_4=y
-BR2_BINUTILS_VERSION_2_26_X=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.22"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
@@ -54,16 +25,36 @@
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
 BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_IPMITOOL=y
+BR2_PACKAGE_MDADM=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_SERVER is not set
 BR2_PACKAGE_ETHTOOL=y
 BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_RSYNC=y
-BR2_PACKAGE_PETITBOOT=y
-BR2_PACKAGE_PETITBOOT_MTD=y
-BR2_PACKAGE_IPMITOOL=y
-BR2_PACKAGE_MDADM=y
 BR2_TARGET_ROOTFS_CPIO_XZ=y
 BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_OPENPOWER_PLATFORM=y
+BR2_OPENPOWER_POWER8=y
+BR2_HOSTBOOT_CONFIG_FILE="habanero.config"
+BR2_HABANERO_SYSTEM_XML_FILENAME="HABANERO_hb.system.xml"
+BR2_HABANERO_MRW_XML_FILENAME="HABANERO_hb.mrw.xml"
+BR2_HABANERO_BIOS_XML_FILENAME="HABANERO_bios.xml"
+BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayoutWithGoldenSide.xml"
+BR2_OPENPOWER_CONFIG_NAME="habanero"
+BR2_OPENPOWER_XML_PACKAGE="habanero-xml"
+BR2_OPENPOWER_PNOR_FILENAME="habanero.pnor"
+BR2_OPENPOWER_PNOR_UPDATE_FILENAME="habanero_update.pnor"
+BR2_HOSTBOOT_BINARY_SBE_FILENAME="venice_sbe.img.ecc"
+BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
+BR2_HOSTBOOT_BINARY_WINK_FILENAME="p8.ref_image.hdr.bin.ecc"
+BR2_IMA_CATALOG_FILENAME="ima_catalog.bin"
+BR2_IMA_CATALOG_ECC_FILENAME="ima_catalog.bin.ecc"
+BR2_OPENPOWER_TARGETING_BIN_FILENAME="HABANERO_HB.targeting.bin"
+BR2_OPENPOWER_TARGETING_ECC_FILENAME="HABANERO_HB.targeting.bin.ecc"
+BR2_PACKAGE_PETITBOOT=y
+BR2_PACKAGE_PETITBOOT_MTD=y
+BR2_OCC_BIN_FILENAME="occ.bin"
+BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
 BR2_PACKAGE_LOADKEYS=y
diff --git a/openpower/configs/hostboot/witherspoon.config b/openpower/configs/hostboot/witherspoon.config
new file mode 100755
index 0000000..01f9587
--- /dev/null
+++ b/openpower/configs/hostboot/witherspoon.config
@@ -0,0 +1,65 @@
+# The Serial Flash Controller is the AST2400 BMC.
+set   SFC_IS_AST2400
+unset   BMC_DOES_SFC_INIT
+unset SFC_IS_IBM_DPSS
+set   ALLOW_MICRON_PNOR
+set   ALLOW_MACRONIX_PNOR
+
+# VPD options.
+unset MVPD_READ_FROM_HW
+unset MVPD_WRITE_TO_HW
+set MVPD_READ_FROM_PNOR
+set MVPD_WRITE_TO_PNOR
+unset DJVPD_READ_FROM_HW
+unset DJVPD_WRITE_TO_HW
+set DJVPD_READ_FROM_PNOR
+set DJVPD_WRITE_TO_PNOR
+unset CVPD_READ_FROM_HW
+unset CVPD_WRITE_TO_HW
+set CVPD_READ_FROM_PNOR
+set CVPD_WRITE_TO_PNOR
+unset PVPD_READ_FROM_HW
+unset PVPD_WRITE_TO_HW
+unset PVPD_READ_FROM_PNOR
+unset PVPD_WRITE_TO_PNOR
+unset SKIP_RESTRICT_EX_UNITS
+set CDIMM_FORMAT_FOR_CVPD
+
+# gpio config
+unset GPIODD
+unset PALMETTO_VDDR
+
+# Enable SBE updates
+unset SBE_UPDATE_INDEPENDENT
+set SBE_UPDATE_SEQUENTIAL
+
+set PCIE_HOTPLUG_CONTROLLER
+
+# turn on console output
+unset CONSOLE
+unset BMC_AST2400
+
+# Enable Kingston dimm voltage workaround
+unset KINGSTON_1_35_VOLT
+
+unset DISABLE_HOSTBOOT_RUNTIME
+
+# Compile in hostboot runtime PRD
+set HBRT_PRD
+unset HTMGT
+unset START_OCC_DURING_BOOT
+
+#PNOR flags
+unset PNOR_TWO_SIDE_SUPPORT
+
+unset BMC_BT_LPC_IPMI
+
+# Enable Checktop Analysis
+unset ENABLE_CHECKSTOP_ANALYSIS
+unset IPLTIME_CHECKSTOP_ANALYSIS
+
+# Hostboot will detect hardware changes
+unset HOST_HCDB_SUPPORT
+
+# set for trace debug to console
+unset CONSOLE_OUTPUT_TRACE
diff --git a/openpower/configs/openpower_mambo_defconfig b/openpower/configs/openpower_mambo_defconfig
index 974f189..dcbab85 100644
--- a/openpower/configs/openpower_mambo_defconfig
+++ b/openpower/configs/openpower_mambo_defconfig
@@ -1,39 +1,20 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_OPENPOWER_PLATFORM=y
-
+BR2_KERNEL_HEADERS_4_4=y
+BR2_BINUTILS_VERSION_2_26_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_GLIBC_VERSION_2_23=y
-
-# No HostBoot for Mambo
-BR2_PACKAGE_HOSTBOOT=n
-BR2_PACKAGE_HOSTBOOT_BINARIES=n
-
-BR2_OPENPOWER_CONFIG_NAME="openpower-mambo"
-
-# no OCC for Mambo either
-BR2_PACKAGE_OCC=n
-
-# we don't need a PNOR layout for Mambo
-BR2_PACKAGE_OPENPOWER_PNOR=n
-
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
-
-# petitboot requirements
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
-BR2_GENERATE_LOCALE="en_US.UTF-8"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
-BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
-BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
+BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
+BR2_GENERATE_LOCALE="en_US.UTF-8"
+BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.19"
-BR2_KERNEL_HEADERS_4_4=y
-BR2_BINUTILS_VERSION_2_26_X=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.22"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
@@ -43,14 +24,21 @@
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
 BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_IPMITOOL=y
+BR2_PACKAGE_MDADM=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_SERVER is not set
 BR2_PACKAGE_ETHTOOL=y
 BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_RSYNC=y
-BR2_PACKAGE_PETITBOOT=y
-BR2_PACKAGE_IPMITOOL=y
-BR2_PACKAGE_MDADM=y
 BR2_TARGET_ROOTFS_CPIO_XZ=y
 BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_OPENPOWER_PLATFORM=y
+BR2_OPENPOWER_POWER8=y
+# BR2_PACKAGE_HOSTBOOT is not set
+# BR2_PACKAGE_HOSTBOOT_BINARIES is not set
+# BR2_PACKAGE_OPENPOWER_PNOR is not set
+BR2_OPENPOWER_CONFIG_NAME="openpower-mambo"
+BR2_PACKAGE_PETITBOOT=y
+# BR2_PACKAGE_OCC is not set
diff --git a/openpower/configs/openpower_p9_mambo_defconfig b/openpower/configs/openpower_p9_mambo_defconfig
index 7dfbf8b..975f1b6 100644
--- a/openpower/configs/openpower_p9_mambo_defconfig
+++ b/openpower/configs/openpower_p9_mambo_defconfig
@@ -1,22 +1,20 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
 BR2_KERNEL_HEADERS_4_4=y
-BR2_GLIBC_VERSION_2_23=y
-BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_BINUTILS_VERSION_2_26_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_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
-BR2_GENERATE_LOCALE="en_US.UTF-8"
 BR2_TARGET_GENERIC_HOSTNAME="skiroot-p9"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
 BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
+BR2_GENERATE_LOCALE="en_US.UTF-8"
 BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://cdn.kernel.org/pub/linux/kernel/v4.x/testing/linux-4.7-rc3.tar.xz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://cdn.kernel.org/pub/linux/kernel/v4.x/testing/linux-4.8-rc8.tar.xz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
 BR2_LINUX_KERNEL_ZIMAGE_EPAPR=y
@@ -36,9 +34,10 @@
 BR2_TARGET_ROOTFS_CPIO_XZ=y
 BR2_TARGET_ROOTFS_INITRAMFS=y
 BR2_OPENPOWER_PLATFORM=y
+BR2_OPENPOWER_POWER9=y
 # BR2_PACKAGE_HOSTBOOT is not set
 # BR2_PACKAGE_HOSTBOOT_BINARIES is not set
 # BR2_PACKAGE_OPENPOWER_PNOR is not set
 BR2_OPENPOWER_CONFIG_NAME="openpower-mambo-p9"
 BR2_PACKAGE_PETITBOOT=y
-# BR2_PACKAGE_OCC is not set
\ No newline at end of file
+# BR2_PACKAGE_OCC is not set
diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig
index 0d465eb..62d07a2 100644
--- a/openpower/configs/palmetto_defconfig
+++ b/openpower/configs/palmetto_defconfig
@@ -1,48 +1,20 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_OPENPOWER_PLATFORM=y
-
+BR2_KERNEL_HEADERS_4_4=y
+BR2_BINUTILS_VERSION_2_26_X=y
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_GLIBC_VERSION_2_23=y
-
-BR2_OPENPOWER_CONFIG_NAME="palmetto"
-BR2_OPENPOWER_XML_PACKAGE="palmetto-xml"
-BR2_HOSTBOOT_CONFIG_FILE="palmetto.config"
-
-BR2_HOSTBOOT_BINARY_SBE_FILENAME="venice_sbe.img.ecc"
-BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
-BR2_HOSTBOOT_BINARY_WINK_FILENAME="p8.ref_image.hdr.bin.ecc"
-
-BR2_OCC_BIN_FILENAME="occ.bin"
-
-BR2_PALMETTO_SYSTEM_XML_FILENAME="PALMETTO_hb.system.xml"
-BR2_PALMETTO_MRW_XML_FILENAME="PALMETTO_hb.mrw.xml"
-BR2_PALMETTO_BIOS_XML_FILENAME="PALMETTO_bios.xml"
-
-BR2_OPENPOWER_TARGETING_BIN_FILENAME="PALMETTO_HB.targeting.bin"
-BR2_OPENPOWER_TARGETING_ECC_FILENAME="PALMETTO_HB.targeting.bin.ecc"
-BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
-
-BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayoutSingleSide.xml"
-BR2_OPENPOWER_PNOR_FILENAME="palmetto.pnor"
-
 BR2_TARGET_GENERIC_HOSTNAME="skiroot"
-# petitboot requirements
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST="C en_US"
-BR2_GENERATE_LOCALE="en_US.UTF-8"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
-BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
-BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
+BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
+BR2_GENERATE_LOCALE="en_US.UTF-8"
+BR2_ROOTFS_OVERLAY="../openpower/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.19"
-BR2_KERNEL_HEADERS_4_4=y
-BR2_BINUTILS_VERSION_2_26_X=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.22"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
@@ -52,16 +24,35 @@
 BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
 BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
 BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_IPMITOOL=y
+BR2_PACKAGE_MDADM=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_SERVER is not set
 BR2_PACKAGE_ETHTOOL=y
 BR2_PACKAGE_NETCAT=y
 BR2_PACKAGE_RSYNC=y
-BR2_PACKAGE_PETITBOOT=y
-BR2_PACKAGE_PETITBOOT_MTD=y
-BR2_PACKAGE_IPMITOOL=y
-BR2_PACKAGE_MDADM=y
 BR2_TARGET_ROOTFS_CPIO_XZ=y
 BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_OPENPOWER_PLATFORM=y
+BR2_OPENPOWER_POWER8=y
+BR2_HOSTBOOT_CONFIG_FILE="palmetto.config"
+BR2_PALMETTO_SYSTEM_XML_FILENAME="PALMETTO_hb.system.xml"
+BR2_PALMETTO_MRW_XML_FILENAME="PALMETTO_hb.mrw.xml"
+BR2_PALMETTO_BIOS_XML_FILENAME="PALMETTO_bios.xml"
+BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayoutSingleSide.xml"
+BR2_OPENPOWER_CONFIG_NAME="palmetto"
+BR2_OPENPOWER_XML_PACKAGE="palmetto-xml"
+BR2_OPENPOWER_PNOR_FILENAME="palmetto.pnor"
+BR2_HOSTBOOT_BINARY_SBE_FILENAME="venice_sbe.img.ecc"
+BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
+BR2_HOSTBOOT_BINARY_WINK_FILENAME="p8.ref_image.hdr.bin.ecc"
+BR2_IMA_CATALOG_FILENAME="ima_catalog.bin"
+BR2_IMA_CATALOG_ECC_FILENAME="ima_catalog.bin.ecc"
+BR2_OPENPOWER_TARGETING_BIN_FILENAME="PALMETTO_HB.targeting.bin"
+BR2_OPENPOWER_TARGETING_ECC_FILENAME="PALMETTO_HB.targeting.bin.ecc"
+BR2_PACKAGE_PETITBOOT=y
+BR2_PACKAGE_PETITBOOT_MTD=y
+BR2_OCC_BIN_FILENAME="occ.bin"
+BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
 BR2_PACKAGE_LOADKEYS=y
diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig
new file mode 100644
index 0000000..320f6e6
--- /dev/null
+++ b/openpower/configs/witherspoon_defconfig
@@ -0,0 +1,57 @@
+BR2_powerpc64le=y
+BR2_powerpc_power8=y
+BR2_KERNEL_HEADERS_4_4=y
+BR2_BINUTILS_VERSION_2_26_X=y
+BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
+BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_TARGET_GENERIC_HOSTNAME="skiroot"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
+BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
+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_ROOTFS_OVERLAY="../openpower/overlay"
+BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://cdn.kernel.org/pub/linux/kernel/v4.x/testing/linux-4.8-rc8.tar.xz"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/configs/linux/skiroot_defconfig"
+BR2_LINUX_KERNEL_ZIMAGE_EPAPR=y
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_BNX2X=y
+BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
+BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_IPMITOOL=y
+BR2_PACKAGE_MDADM=y
+BR2_PACKAGE_NCURSES_WCHAR=y
+BR2_PACKAGE_DROPBEAR=y
+# BR2_PACKAGE_DROPBEAR_SERVER is not set
+BR2_PACKAGE_ETHTOOL=y
+BR2_PACKAGE_NETCAT=y
+BR2_PACKAGE_RSYNC=y
+BR2_TARGET_ROOTFS_CPIO_XZ=y
+BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_OPENPOWER_PLATFORM=y
+BR2_OPENPOWER_POWER9=y
+BR2_HOSTBOOT_CONFIG_FILE="witherspoon.config"
+BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayoutWithGoldenSide.xml"
+BR2_OPENPOWER_CONFIG_NAME="witherspoon"
+BR2_OPENPOWER_XML_PACKAGE="witherspoon-xml"
+BR2_OPENPOWER_PNOR_FILENAME="witherspoon.pnor"
+BR2_OPENPOWER_PNOR_UPDATE_FILENAME="witherspoon_update.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_OPENPOWER_TARGETING_BIN_FILENAME="WITHERSPOON_HB.targeting.bin"
+BR2_OPENPOWER_TARGETING_ECC_FILENAME="WITHERSPOON_HB.targeting.bin.ecc"
+BR2_PACKAGE_PETITBOOT=y
+BR2_PACKAGE_PETITBOOT_MTD=y
+BR2_OCC_BIN_FILENAME="occ.bin"
+BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
+BR2_PACKAGE_LOADKEYS=y
+BR2_WITHERSPOON_SYSTEM_XML_FILENAME="WITHERSPOON_hb.system.xml"
+BR2_WITHERSPOON_MRW_XML_FILENAME="WITHERSPOON_hb.mrw.xml"
+BR2_WITHERSPOON_BIOS_XML_FILENAME="WITHERSPOON_bios.xml"
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 880fc4c..ea35833 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
@@ -1,4 +1,4 @@
-From c95002c46eec449318483ac12424f239b43695a0 Mon Sep 17 00:00:00 2001
+From 9115015f795489d8b40dec2996347f621f3f0369 Mon Sep 17 00:00:00 2001
 From: Thadeu Lima De Souza Cascardo <thadeul@br.ibm.com>
 Date: Tue, 25 Mar 2014 10:45:16 -0400
 Subject: [PATCH 1/9] xhci: Use xhci_pci_remove for xhci device shutdown
@@ -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 de644e56aa3b..f398ed390ff8 100644
+index 963867c2c1d5..5e6a369f635b 100644
 --- a/drivers/usb/host/xhci-pci.c
 +++ b/drivers/usb/host/xhci-pci.c
-@@ -446,7 +446,7 @@ static struct pci_driver xhci_pci_driver = {
+@@ -447,7 +447,7 @@ static struct pci_driver xhci_pci_driver = {
  	.remove =	xhci_pci_remove,
  	/* suspend and resume implemented later */
  
diff --git a/openpower/linux/0002-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch b/openpower/linux/0002-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch
index 698826d..77599ee 100644
--- a/openpower/linux/0002-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch
+++ b/openpower/linux/0002-drivers-drm-ast-Switch-SCU-to-VGA-output-on-POST.patch
@@ -1,4 +1,4 @@
-From 0b8fe718b0f8639421ebd6d7c9e38da399cb5603 Mon Sep 17 00:00:00 2001
+From cbacaf83ae6999a6b8f517b8057166f20b3c7163 Mon Sep 17 00:00:00 2001
 From: Jeremy Kerr <jk@ozlabs.org>
 Date: Wed, 2 Mar 2016 11:25:47 +0800
 Subject: [PATCH 2/9] drivers/drm/ast: Switch SCU to VGA output on POST
diff --git a/openpower/linux/0003-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch b/openpower/linux/0003-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch
index 741a57a..4ac8db9 100644
--- a/openpower/linux/0003-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch
+++ b/openpower/linux/0003-net-mlx4_core-Set-UAR-page-size-to-4KB-regardless-of.patch
@@ -1,4 +1,4 @@
-From e27139f1d1d098e7504f0e85304d05865cd2314b Mon Sep 17 00:00:00 2001
+From dec87cf338f81b8d6bf44a46c1aa699d6402a172 Mon Sep 17 00:00:00 2001
 From: Huy Nguyen <huyn@mellanox.com>
 Date: Wed, 17 Feb 2016 17:24:26 +0200
 Subject: [PATCH 3/9] net/mlx4_core: Set UAR page size to 4KB regardless of
diff --git a/openpower/linux/0004-xhci-do-not-halt-the-secondary-HCD.patch b/openpower/linux/0004-xhci-do-not-halt-the-secondary-HCD.patch
index ab4ec08..907631a 100644
--- a/openpower/linux/0004-xhci-do-not-halt-the-secondary-HCD.patch
+++ b/openpower/linux/0004-xhci-do-not-halt-the-secondary-HCD.patch
@@ -1,4 +1,4 @@
-From 59a6044c4ca2c6e9f06dccb7fcb50cabce84c6d1 Mon Sep 17 00:00:00 2001
+From 53b3e6be5203d2f484c265707f6f6547549c7cbf Mon Sep 17 00:00:00 2001
 From: Joel Stanley <joel@jms.id.au>
 Date: Tue, 19 Jul 2016 22:43:26 +0930
 Subject: [PATCH 4/9] xhci: do not halt the secondary HCD
@@ -14,7 +14,7 @@
  1 file changed, 15 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 6fe0174da226..8f48dd84ddd2 100644
+index adc169d2fd76..ec92a843325b 100644
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
 @@ -682,6 +682,21 @@ void xhci_stop(struct usb_hcd *hcd)
diff --git a/openpower/linux/0005-net-mlx5-Add-pci-shutdown-callback.patch b/openpower/linux/0005-net-mlx5-Add-pci-shutdown-callback.patch
index a2419b2..5811db6 100644
--- a/openpower/linux/0005-net-mlx5-Add-pci-shutdown-callback.patch
+++ b/openpower/linux/0005-net-mlx5-Add-pci-shutdown-callback.patch
@@ -1,4 +1,4 @@
-From 2a81a42abe8629c8ab1012e2376918665b9cab47 Mon Sep 17 00:00:00 2001
+From 2b826400b15799efbaf4022c60c0304d0f149fdf Mon Sep 17 00:00:00 2001
 From: Carol L Soto <clsoto@linux.vnet.ibm.com>
 Date: Tue, 12 Jul 2016 17:04:07 -0500
 Subject: [PATCH 5/9] net/mlx5: Add pci shutdown callback
@@ -30,7 +30,7 @@
  3 files changed, 36 insertions(+), 9 deletions(-)
 
 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
-index cbd17e25beeb..887a54c8e98b 100644
+index 90e876ecc720..984668ec8a0b 100644
 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
 +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
 @@ -2241,7 +2241,16 @@ static void mlx5e_destroy_netdev(struct mlx5_core_dev *mdev, void *vpriv)
diff --git a/openpower/linux/0006-powerpc-boot-Add-OPAL-console-to-epapr-wrappers.patch b/openpower/linux/0006-powerpc-boot-Add-OPAL-console-to-epapr-wrappers.patch
index 4069535..440f05f 100644
--- a/openpower/linux/0006-powerpc-boot-Add-OPAL-console-to-epapr-wrappers.patch
+++ b/openpower/linux/0006-powerpc-boot-Add-OPAL-console-to-epapr-wrappers.patch
@@ -1,4 +1,4 @@
-From ceebdd09bb811c2815065a5940448d0980a10e8c Mon Sep 17 00:00:00 2001
+From 9bef7237a339c2f017a3927565b7fe2a84949019 Mon Sep 17 00:00:00 2001
 From: Oliver O'Halloran <oohall@gmail.com>
 Date: Fri, 24 Jun 2016 17:28:43 +1000
 Subject: [PATCH 6/9] powerpc/boot: Add OPAL console to epapr wrappers
diff --git a/openpower/linux/0007-tty-hvc-Use-opal-irqchip-interface-if-available.patch b/openpower/linux/0007-tty-hvc-Use-opal-irqchip-interface-if-available.patch
index 5b311c3..02a6c26 100644
--- a/openpower/linux/0007-tty-hvc-Use-opal-irqchip-interface-if-available.patch
+++ b/openpower/linux/0007-tty-hvc-Use-opal-irqchip-interface-if-available.patch
@@ -1,4 +1,4 @@
-From 20035018cb2ce4ba294d6be14855b7a93ee1e46d Mon Sep 17 00:00:00 2001
+From 06ce823342d939bdb2466691afcaeea64a4de964 Mon Sep 17 00:00:00 2001
 From: Samuel Mendoza-Jonas <sam@mendozajonas.com>
 Date: Wed, 13 Jul 2016 11:15:42 +1000
 Subject: [PATCH 7/9] tty/hvc: Use opal irqchip interface if available
diff --git a/openpower/linux/0008-tty-hvc-Use-IRQF_SHARED-for-OPAL-hvc-consoles.patch b/openpower/linux/0008-tty-hvc-Use-IRQF_SHARED-for-OPAL-hvc-consoles.patch
index a870297..80e21e7 100644
--- a/openpower/linux/0008-tty-hvc-Use-IRQF_SHARED-for-OPAL-hvc-consoles.patch
+++ b/openpower/linux/0008-tty-hvc-Use-IRQF_SHARED-for-OPAL-hvc-consoles.patch
@@ -1,4 +1,4 @@
-From 09777284a4e10395db49e3f5f3e17abe857902f9 Mon Sep 17 00:00:00 2001
+From 541e65e116602fcd155d279f8e2313b0d60c9731 Mon Sep 17 00:00:00 2001
 From: Samuel Mendoza-Jonas <sam@mendozajonas.com>
 Date: Wed, 13 Jul 2016 11:15:41 +1000
 Subject: [PATCH 8/9] tty/hvc: Use IRQF_SHARED for OPAL hvc consoles
diff --git a/openpower/linux/0009-Release-4.4.19-openpower1.patch b/openpower/linux/0009-Release-4.4.22-openpower1.patch
similarity index 70%
rename from openpower/linux/0009-Release-4.4.19-openpower1.patch
rename to openpower/linux/0009-Release-4.4.22-openpower1.patch
index 87f2c25..f80ea02 100644
--- a/openpower/linux/0009-Release-4.4.19-openpower1.patch
+++ b/openpower/linux/0009-Release-4.4.22-openpower1.patch
@@ -1,7 +1,7 @@
-From dc533b7fc01092be702223dcabeb16a887be3f7c Mon Sep 17 00:00:00 2001
+From 5bea769e2f76a69153b0b830fce80e0745b5f59b Mon Sep 17 00:00:00 2001
 From: Joel Stanley <joel@jms.id.au>
 Date: Tue, 16 Aug 2016 23:00:23 +0930
-Subject: [PATCH 9/9] Release 4.4.19-openpower1
+Subject: [PATCH 9/9] Release 4.4.22-openpower1
 
 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 695c64ec160c..77dceb912679 100644
+index a6512f4eec9f..3876a2c87c56 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,7 +1,7 @@
  VERSION = 4
  PATCHLEVEL = 4
- SUBLEVEL = 19
+ SUBLEVEL = 22
 -EXTRAVERSION =
 +EXTRAVERSION = -openpower1
  NAME = Blurry Fish Butt
diff --git a/openpower/package/Config.in b/openpower/package/Config.in
index 571d4c0..cbeae17 100755
--- a/openpower/package/Config.in
+++ b/openpower/package/Config.in
@@ -16,3 +16,6 @@
 source "$BR2_EXTERNAL/package/skiboot/Config.in"
 source "$BR2_EXTERNAL/package/libflash/Config.in"
 source "$BR2_EXTERNAL/package/loadkeys/Config.in"
+source "$BR2_EXTERNAL/package/witherspoon-xml/Config.in"
+source "$BR2_EXTERNAL/package/ppe42-binutils/Config.in"
+source "$BR2_EXTERNAL/package/ppe42-gcc/Config.in"
diff --git a/openpower/package/barreleye-xml/barreleye-xml.mk b/openpower/package/barreleye-xml/barreleye-xml.mk
index 13a3365..1621a56 100755
--- a/openpower/package/barreleye-xml/barreleye-xml.mk
+++ b/openpower/package/barreleye-xml/barreleye-xml.mk
@@ -39,8 +39,10 @@
         $(MRW_HB_TOOLS)/mergexml.sh $(MRW_SCRATCH)/$(BR2_BARRELEYE_SYSTEM_XML_FILENAME) \
             $(MRW_HB_TOOLS)/attribute_types.xml \
             $(MRW_HB_TOOLS)/attribute_types_hb.xml \
+            $(MRW_HB_TOOLS)/attribute_types_openpower.xml \
             $(MRW_HB_TOOLS)/target_types_merged.xml \
             $(MRW_HB_TOOLS)/target_types_hb.xml \
+            $(MRW_HB_TOOLS)/target_types_openpower.xml \
             $(MRW_SCRATCH)/$(BR2_BARRELEYE_MRW_XML_FILENAME) > $(MRW_HB_TOOLS)/temporary_hb.hb.xml;
 
         # creating the targeting binary
diff --git a/openpower/package/capp-ucode/Config.in b/openpower/package/capp-ucode/Config.in
index 1bdbc23..d432419 100644
--- a/openpower/package/capp-ucode/Config.in
+++ b/openpower/package/capp-ucode/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_CAPP_UCODE
         bool "capp_capp"
-        default y if (BR2_OPENPOWER_PLATFORM && BR2_powerpc_power8)
+        default y if (BR2_OPENPOWER_PLATFORM)
         help
             Microcode for CAPP hardware
 
diff --git a/openpower/package/garrison-xml/garrison.mk b/openpower/package/garrison-xml/garrison.mk
index 18b109f..e7ded4b 100644
--- a/openpower/package/garrison-xml/garrison.mk
+++ b/openpower/package/garrison-xml/garrison.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GARRISON_XML_VERSION ?= ddfcd21b1e3311a2ca5a1bcbf0b13b6368ab5221
+GARRISON_XML_VERSION ?= e1e8d687a2c60f9da28f5bebf06058bf538272f2
 GARRISON_XML_SITE ?= $(call github,open-power,garrison-xml,$(GARRISON_XML_VERSION))
 
 GARRISON_XML_LICENSE = Apache-2.0
diff --git a/openpower/package/habanero-xml/habanero-xml.mk b/openpower/package/habanero-xml/habanero-xml.mk
index 307c47d..a2d65b5 100644
--- a/openpower/package/habanero-xml/habanero-xml.mk
+++ b/openpower/package/habanero-xml/habanero-xml.mk
@@ -39,8 +39,10 @@
         $(MRW_HB_TOOLS)/mergexml.sh $(MRW_SCRATCH)/$(BR2_HABANERO_SYSTEM_XML_FILENAME) \
             $(MRW_HB_TOOLS)/attribute_types.xml \
             $(MRW_HB_TOOLS)/attribute_types_hb.xml \
+            $(MRW_HB_TOOLS)/attribute_types_openpower.xml \
             $(MRW_HB_TOOLS)/target_types_merged.xml \
             $(MRW_HB_TOOLS)/target_types_hb.xml \
+            $(MRW_HB_TOOLS)/target_types_openpower.xml \
             $(MRW_SCRATCH)/$(BR2_HABANERO_MRW_XML_FILENAME) > $(MRW_HB_TOOLS)/temporary_hb.hb.xml;
 
         # creating the targeting binary
diff --git a/openpower/package/hostboot-binaries/Config.in b/openpower/package/hostboot-binaries/Config.in
index eccf3e3..4c3e770 100644
--- a/openpower/package/hostboot-binaries/Config.in
+++ b/openpower/package/hostboot-binaries/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_HOSTBOOT_BINARIES
         bool "hostboot_binaries"
-        default y if (BR2_OPENPOWER_PLATFORM && BR2_powerpc_power8)
+        default y if (BR2_OPENPOWER_PLATFORM)
         help
             Project to stage hostboot binary images
diff --git a/openpower/package/hostboot-binaries/hostboot_binaries.mk b/openpower/package/hostboot-binaries/hostboot_binaries.mk
index 766202a..7497752 100644
--- a/openpower/package/hostboot-binaries/hostboot_binaries.mk
+++ b/openpower/package/hostboot-binaries/hostboot_binaries.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HOSTBOOT_BINARIES_VERSION ?= 7f593a3545f47310132f67e0ba8f4d0c6350c9e7
+HOSTBOOT_BINARIES_VERSION ?= 61c5c1a6318cad6d20b0926403e4444defb9a60a
 HOSTBOOT_BINARIES_SITE ?= $(call github,open-power,hostboot-binaries,$(HOSTBOOT_BINARIES_VERSION))
 HOSTBOOT_BINARIES_LICENSE = Apache-2.0
 
@@ -16,6 +16,7 @@
      $(INSTALL) -D $(@D)/$(BR2_HOSTBOOT_BINARY_WINK_FILENAME) $(STAGING_DIR)/hostboot_binaries/
      $(INSTALL) -D $(@D)/$(BR2_HOSTBOOT_BINARY_SBEC_FILENAME) $(STAGING_DIR)/hostboot_binaries/
      $(INSTALL) -D $(@D)/$(BR2_HOSTBOOT_BINARY_SBE_FILENAME)  $(STAGING_DIR)/hostboot_binaries/
+     $(INSTALL) -D $(@D)/$(BR2_IMA_CATALOG_FILENAME)  $(STAGING_DIR)/hostboot_binaries/
 endef
 
 $(eval $(generic-package))
diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in
index f7f8005..d864c49 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_HOSTBOOT
         bool "hostboot"
-        default y if (BR2_OPENPOWER_PLATFORM && BR2_powerpc_power8)
+        default y if (BR2_OPENPOWER_PLATFORM)
         select BR2_CPP
         help
             Project to build the hostboot firmware codebase
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index d88282a..17eced6 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -3,8 +3,10 @@
 # hostboot
 #
 ################################################################################
+HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= 19ef62a252501bca496ca39bfa11ee1d64ba1764
+HOSTBOOT_VERSION_BRANCH_MASTER ?= 61e3ac4d305b4611afc41353b3bcdb210d05f616
 
-HOSTBOOT_VERSION ?= 5e179732b5e278ad8b62a1c238311eeaa6a9b066
+HOSTBOOT_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(HOSTBOOT_VERSION_BRANCH_MASTER),$(HOSTBOOT_VERSION_BRANCH_MASTER_P8))
 HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION))
 
 HOSTBOOT_LICENSE = Apache-2.0
@@ -16,7 +18,24 @@
 HOSTBOOT_ENV_VARS=$(TARGET_MAKE_ENV) \
     CONFIG_FILE=$(BR2_EXTERNAL)/configs/hostboot/$(BR2_HOSTBOOT_CONFIG_FILE) \
     OPENPOWER_BUILD=1 CROSS_PREFIX=$(TARGET_CROSS) HOST_PREFIX="" HOST_BINUTILS_DIR=$(HOST_BINUTILS_DIR) \
-    HOSTBOOT_VERSION=`cat $(HOSTBOOT_VERSION_FILE)`
+    HOSTBOOT_VERSION=`cat $(HOSTBOOT_VERSION_FILE)` 
+
+define HOSTBOOT_APPLY_PATCHES
+       if [ "$(BR2_OPENPOWER_POWER9)" == "y" ]; then \
+           $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL)/package/hostboot/p9Patches \*.patch; \
+           if [ -d $(BR2_EXTERNAL)/custom/patches/hostboot/p9Patches ]; then \
+               $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL)/custom/patches/hostboot/p9Patches \*.patch; \
+           fi; \
+       fi; \
+       if [ "$(BR2_OPENPOWER_POWER8)" == "y" ]; then \
+           $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL)/package/hostboot/p8Patches \*.patch; \
+           if [ -d $(BR2_EXTERNAL)/custom/patches/hostboot/p8Patches ]; then \
+               $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL)/custom/patches/hostboot/p8Patches \*.patch; \
+           fi; \
+       fi;
+endef
+
+HOSTBOOT_POST_PATCH_HOOKS += HOSTBOOT_APPLY_PATCHES
 
 define HOSTBOOT_BUILD_CMDS
         $(HOSTBOOT_ENV_VARS) bash -c 'cd $(@D) && source ./env.bash && $(MAKE)'
diff --git a/openpower/package/hostboot/hostboot-0001-Increase-uart-delay.patch b/openpower/package/hostboot/p8Patches/hostboot-0001-Increase-uart-delay.patch
similarity index 100%
rename from openpower/package/hostboot/hostboot-0001-Increase-uart-delay.patch
rename to openpower/package/hostboot/p8Patches/hostboot-0001-Increase-uart-delay.patch
diff --git a/openpower/package/hostboot/hostboot-0002-GCC-4.9-Make-compiler-use-ELFv1-ABI.patch b/openpower/package/hostboot/p8Patches/hostboot-0002-GCC-4.9-Make-compiler-use-ELFv1-ABI.patch
similarity index 100%
rename from openpower/package/hostboot/hostboot-0002-GCC-4.9-Make-compiler-use-ELFv1-ABI.patch
rename to openpower/package/hostboot/p8Patches/hostboot-0002-GCC-4.9-Make-compiler-use-ELFv1-ABI.patch
diff --git a/openpower/package/hostboot/p9Patches/hostboot-0001-Increase-uart-delay.patch b/openpower/package/hostboot/p9Patches/hostboot-0001-Increase-uart-delay.patch
new file mode 120000
index 0000000..10137ed
--- /dev/null
+++ b/openpower/package/hostboot/p9Patches/hostboot-0001-Increase-uart-delay.patch
@@ -0,0 +1 @@
+../p8Patches/hostboot-0001-Increase-uart-delay.patch
\ No newline at end of file
diff --git a/openpower/package/hostboot/p9Patches/hostboot-0002-remove-attr-override-compile.patch b/openpower/package/hostboot/p9Patches/hostboot-0002-remove-attr-override-compile.patch
new file mode 100644
index 0000000..6ae8248
--- /dev/null
+++ b/openpower/package/hostboot/p9Patches/hostboot-0002-remove-attr-override-compile.patch
@@ -0,0 +1,42 @@
+From 53bd51536cccbef8d080a92bf4a2b16ca549af3c Mon Sep 17 00:00:00 2001
+From: Matt Ploetz <maploetz@us.ibm.com>
+Date: Tue, 6 Sep 2016 14:08:08 -0500
+Subject: [PATCH] Remove the building and distributuion of attribute override
+ tool
+
+Change-Id: Ifbe7eef4152d5c5521aa6f1e2659d30aa46fd525
+RTC:160270
+---
+ src/build/mkrules/dist.targets.mk | 2 +-
+ src/usr/targeting/makefile        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/build/mkrules/dist.targets.mk b/src/build/mkrules/dist.targets.mk
+index d201570..df08258 100644
+--- a/src/build/mkrules/dist.targets.mk
++++ b/src/build/mkrules/dist.targets.mk
+@@ -70,7 +70,7 @@ COPY_FILES = \
+     obj/genfiles/targAttrInfo.csv:vpo \
+     obj/genfiles/target_types_merged.xml:openpower \
+     obj/genfiles/fapiattrs.xml:openpower \
+-    obj/genfiles/attributeOverride:tools,openpower \
++    obj/genfiles/attributeOverride:tools \
+     src/usr/targeting/attroverride/README.attr_override:tools,openpower \
+     src/build/hwpf/prcd_compile.tcl:tools \
+     src/build/buildpnor/buildSbePart.pl:openpower \
+diff --git a/src/usr/targeting/makefile b/src/usr/targeting/makefile
+index 61dfb0a..c0c31ea 100644
+--- a/src/usr/targeting/makefile
++++ b/src/usr/targeting/makefile
+@@ -65,7 +65,7 @@ OBJS += ${HOSTBOOT_SPECIFIC_OBJS}
+ SUBDIRS += test.d
+ SUBDIRS += xmltohb.d
+ SUBDIRS += runtime.d
+-SUBDIRS += attroverride.d
++#SUBDIRS += attroverride.d
+ 
+ include ${ROOTPATH}/config.mk
+ 
+-- 
+1.8.2.2
+
diff --git a/openpower/package/hostboot/p9Patches/hostboot-0003-remove-sbfw-check-hbDistribute.patch b/openpower/package/hostboot/p9Patches/hostboot-0003-remove-sbfw-check-hbDistribute.patch
new file mode 100644
index 0000000..74be3df
--- /dev/null
+++ b/openpower/package/hostboot/p9Patches/hostboot-0003-remove-sbfw-check-hbDistribute.patch
@@ -0,0 +1,40 @@
+From 52929548d943e0387fabb70d658905120cad7cd8 Mon Sep 17 00:00:00 2001
+From: Matt Ploetz <maploetz@us.ibm.com>
+Date: Tue, 6 Sep 2016 12:49:13 -0500
+Subject: [PATCH] Add openpower conditional to sbfw directory in hbDistribute
+
+Change-Id: I5e6759526a07fcbeea3a510a9a11369546367bf9
+RTC:160442
+---
+ src/build/tools/hbDistribute | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/src/build/tools/hbDistribute b/src/build/tools/hbDistribute
+index e999b49..75d0b14 100755
+--- a/src/build/tools/hbDistribute
++++ b/src/build/tools/hbDistribute
+@@ -116,12 +116,16 @@ fi
+ echo "sbfw dir = ${SBFW_DIR}"
+ # Verify SBFW directory or default to sandbox.
+ if [ "${SBFW_DIR}" == "invalid directory" ]; then
+-    if [ -z "${SANDBOXROOT}" -o -z "${SANDBOXNAME}" ]; then
+-        echo "ERROR:SBFW - No path specified and \$SANDBOXBASE undefined."
+-        print_usage
+-        exit -1
++    if [ "${TARGET}" == "openpower_TARGET" ]; then
++        :
+     else
+-        SBFW_DIR=${SANDBOXROOT}/${SANDBOXNAME}/src/sbei/sbfw
++        if [ -z "${SANDBOXROOT}" -o -z "${SANDBOXNAME}" ]; then
++            echo "ERROR:SBFW - No path specified and \$SANDBOXBASE undefined."
++            print_usage
++            exit -1
++        else
++            SBFW_DIR=${SANDBOXROOT}/${SANDBOXNAME}/src/sbei/sbfw
++        fi
+     fi
+ fi
+ 
+-- 
+1.8.2.2
+
diff --git a/openpower/package/hostboot/p9Patches/hostboot-0004-target-pm-serverwiz1-and-2.patch b/openpower/package/hostboot/p9Patches/hostboot-0004-target-pm-serverwiz1-and-2.patch
new file mode 100644
index 0000000..0a15fc7
--- /dev/null
+++ b/openpower/package/hostboot/p9Patches/hostboot-0004-target-pm-serverwiz1-and-2.patch
@@ -0,0 +1,308 @@
+From 7afb20f3484eb118855d2033e7308cfc4a07fae3 Mon Sep 17 00:00:00 2001
+From: Norm James <njames@us.ibm.com>
+Date: Mon, 12 Sep 2016 18:47:13 -0700
+Subject: [PATCH] Add ability to read old and new Serverwiz xml outputs.
+
+The new Serverwiz format added outer tags for performance
+reasons.  It also added attribute groups for accessing
+like attributes with one API call.
+
+Change-Id: I6b6c6de8defbc5c0f0c8c7d191836e69ac7bfc98
+---
+ src/usr/targeting/common/Targets.pm | 157 +++++++++++++++++++++++++++++-------
+ 1 file changed, 126 insertions(+), 31 deletions(-)
+
+diff --git a/src/usr/targeting/common/Targets.pm b/src/usr/targeting/common/Targets.pm
+index 096db10..35f0842 100644
+--- a/src/usr/targeting/common/Targets.pm
++++ b/src/usr/targeting/common/Targets.pm
+@@ -26,6 +26,7 @@ package Targets;
+ 
+ use strict;
+ use XML::Simple;
++use XML::Parser;
+ use Data::Dumper;
+ 
+ sub new
+@@ -43,9 +44,10 @@ sub new
+         force        => 0,
+         debug        => 0,
+         version      => "",
++        xml_version  => 0,
+         errorsExist  => 0,
+         NUM_PROCS    => 0,
+-        TOP_LEVEL    => "sys-0",
++        TOP_LEVEL    => "",
+         TOPOLOGY     => undef,
+         report_log   => "",
+         vpd_num      => 0,
+@@ -87,9 +89,16 @@ sub loadXML
+     print "Loading MRW XML: $filename\n";
+     $self->{xml} =
+       XMLin($filename,forcearray => [ 'child_id', 'hidden_child_id', 'bus',
+-                                      'property' ]);
++                                      'property', 'field', 'attribute' ]);
++
++    if (defined($self->{xml}->{'enumerationTypes'}))
++    {
++          $self->{xml_version} = 1;
++    }
++
+     $self->storeEnumerations();
+-    $self->buildHierarchy($self->{TOP_LEVEL});
++    $self->storeGroups();
++    $self->buildHierarchy();
+     $self->buildAffinity();
+     $self->{report_filename}=$filename.".rpt";
+     $self->{report_filename}=~s/\.xml//g;
+@@ -230,15 +239,31 @@ sub printAttribute
+ sub storeEnumerations
+ {
+     my $self = shift;
+-
+-    foreach my $enumType (keys(%{ $self->{xml}->{enumerationType} }))
++    my $baseptr = $self->{xml}->{enumerationType};
++    if ($self->{xml_version} == 1)
++    {
++        $baseptr = $self->{xml}->{enumerationTypes}->{enumerationType};
++    }
++    foreach my $enumType (keys(%{ $baseptr }))
+     {
+         foreach my $enum (
+-            keys(%{$self->{xml}->{enumerationType}->{$enumType}->{enumerator}}))
++            keys(%{$baseptr->{$enumType}->{enumerator}}))
+         {
+             $self->{enumeration}->{$enumType}->{$enum} =
+-              $self->{xml}->{enumerationType}->{$enumType}->{enumerator}
+-              ->{$enum}->{value};
++              $baseptr->{$enumType}->{enumerator}->{$enum}->{value};
++        }
++    }
++}
++sub storeGroups
++{
++    my $self = shift;
++    foreach my $grp (keys(%{ $self->{xml}->{attributeGroups}
++        ->{attributeGroup} }))
++    {
++        foreach my $attr (@{$self->{xml}->{attributeGroups}
++            ->{attributeGroup}->{$grp}->{'attribute'}})
++        {
++            $self->{groups}->{$grp}->{$attr} = 1;
+         }
+     }
+ }
+@@ -277,13 +302,45 @@ sub buildHierarchy
+     my $self   = shift;
+     my $target = shift;
+ 
+-    my $old_path        = $self->{data}->{INSTANCE_PATH};
+-    my $target_xml      = $self->{xml}->{'targetInstance'}{$target};
++    my $instance_path = $self->{data}->{INSTANCE_PATH};
++    if (!defined $instance_path)
++    {
++        $instance_path = "";
++    }
++    my $baseptr = $self->{xml}->{'targetInstance'};
++    if ($self->{xml_version} == 1)
++    {
++        $baseptr = $self->{xml}->{'targetInstances'}->{'targetInstance'};
++    }
++    if ($target eq "")
++    {
++        ## find system target
++        foreach my $t (keys(%{$baseptr}))
++        {
++            if ($baseptr->{$t}->{attribute}->{TYPE}->{default} eq "SYS")
++            {
++                $self->{TOP_LEVEL} = $t;
++                $target = $t;
++            }
++        }
++    }
++    if ($target eq "")
++    {
++        die "Unable to find system top level target\n";
++    }
++    my $old_path        = $instance_path;
++    my $target_xml      = $baseptr->{$target};
+     my $affinity_target = $target;
+-    my $key             = $self->{data}->{INSTANCE_PATH} . "/" . $target;
++    my $key             = $instance_path . "/" . $target;
+ 
+-    my $instance_path = $self->{data}->{INSTANCE_PATH};
+-    $instance_path = "instance:" . substr($instance_path, 1);
++    if ($instance_path ne "")
++    {
++        $instance_path = "instance:" . substr($instance_path, 1);
++    }
++    else
++    {
++        $instance_path = "instance:";
++    }
+     $self->setAttribute($key, "INSTANCE_PATH", $instance_path);
+     $self->{data}->{TARGETS}->{$key}->{TARGET} = $target_xml;
+     $self->{data}->{INSTANCE_PATH} = $old_path . "/" . $target;
+@@ -321,9 +378,15 @@ sub buildHierarchy
+         }
+     }
+     ## global attributes overwrite local
+-    foreach my $prop (keys %{$self->{xml}->{globalSetting}->{$key}->{property}})
++    my $settingptr = $self->{xml}->{globalSetting};
++    if ($self->{xml_version} == 1)
+     {
+-        my $val=$self->{xml}->{globalSetting}->{$key}->{property}->
++        $settingptr = $self->{xml}->{globalSettings}->{globalSetting};
++    }
++
++    foreach my $prop (keys %{$settingptr->{$key}->{property}})
++    {
++        my $val=$settingptr->{$key}->{property}->
+                        {$prop}->{value};
+         $self->setAttribute($key, $prop, $val);
+     }
+@@ -413,8 +476,10 @@ sub buildAffinity
+             $node = -1;
+ 
+             $self->{targeting}{SYS}[0]{KEY} = $target;
+-            $self->setAttribute($target, "AFFINITY_PATH", "affinity:sys-0");
+-            $self->setAttribute($target, "PHYS_PATH",     "physical:sys-0");
++            $self->setAttribute($target, "AFFINITY_PATH",
++                                         "affinity:".$self->{TOP_LEVEL});
++            $self->setAttribute($target, "PHYS_PATH",
++                                         "physical:".$self->{TOP_LEVEL});
+             $self->setAttribute($target, "ENTITY_INSTANCE","0");
+         }
+         elsif ($type eq "NODE")
+@@ -424,13 +489,13 @@ sub buildAffinity
+             $self->{dimm_tpos} = 0;
+             $self->{membuf_inst_num}=0;
+             $node++;
+-            $node_phys = "physical:sys-0/node-$node";
+-            $node_aff  = "affinity:sys-0/node-$node";
++            $node_phys = "physical:".$self->{TOP_LEVEL}."/node-$node";
++            $node_aff  = "affinity:".$self->{TOP_LEVEL}."/node-$node";
+             $self->{targeting}{SYS}[0]{NODES}[$node]{KEY} = $target;
+             $self->setAttribute($target, "AFFINITY_PATH",
+-                "affinity:sys-0/node-$node");
++                "affinity:".$self->{TOP_LEVEL}."/node-$node");
+             $self->setAttribute($target, "PHYS_PATH",
+-                "physical:sys-0/node-$node");
++                "physical:".$self->{TOP_LEVEL}."/node-$node");
+             $self->setHuid($target, 0, $node);
+             $self->setAttribute($target, "ENTITY_INSTANCE",$node);
+         }
+@@ -439,9 +504,11 @@ sub buildAffinity
+             $tpm++;
+             $self->{targeting}{SYS}[0]{NODES}[$node]{TPMS}[$tpm]{KEY} = $target;
+             $self->setAttribute($target, "AFFINITY_PATH",
+-                                "affinity:sys-0/node-$node/tpm-$tpm");
++                                "affinity:".$self->{TOP_LEVEL}.
++                                "/node-$node/tpm-$tpm");
+             $self->setAttribute($target, "PHYS_PATH",
+-                                "physical:sys-0/node-$node/tpm-$tpm");
++                                "physical:".$self->{TOP_LEVEL}.
++                                "/node-$node/tpm-$tpm");
+             $self->setHuid($target, 0, $tpm);
+             $self->setAttribute($target, "ENTITY_INSTANCE",$tpm);
+         }
+@@ -469,8 +536,10 @@ sub buildAffinity
+             $self->setHuid($target, 0, $node);
+             my $socket = $self->getTargetParent(
+                          $self->getTargetParent($target));
+-            my $parent_affinity = "affinity:sys-0/node-$node/proc-$proc";
+-            my $parent_physical = "physical:sys-0/node-$node/proc-$proc";
++            my $parent_affinity = "affinity:".$self->{TOP_LEVEL}
++                                  ."/node-$node/proc-$proc";
++            my $parent_physical = "physical:".$self->{TOP_LEVEL}
++                                  ."/node-$node/proc-$proc";
+             $self->setAttribute($target, "AFFINITY_PATH",  $parent_affinity);
+             $self->setAttribute($target, "PHYS_PATH",      $parent_physical);
+             $self->setAttribute($target, "POSITION",       $proc);
+@@ -619,8 +688,6 @@ sub processMcs
+         $self->setFsiAttributes($membuf,"FSICM",0,$proc_path,$fsi_port,0);
+         $self->setAttribute($unit, "DMI_REFCLOCK_SWIZZLE",$fsi_port);
+         my $dmi_swizzle =
+-             $dmi_bus->{bus_attribute}->{DMI_REFCLOCK_SWIZZLE}->{default};
+-        my $dmi_swizzle =
+              $self->getBusAttribute($unit,0,"DMI_REFCLOCK_SWIZZLE");
+         if ($dmi_swizzle ne "")
+         {
+@@ -974,7 +1041,8 @@ sub isBadAttribute
+     {
+         return 1;
+     }
+-    if ($target_ptr->{ATTRIBUTES}->{$attribute}->{default} eq $badvalue)
++    if (defined $badvalue &&
++        $target_ptr->{ATTRIBUTES}->{$attribute}->{default} eq $badvalue)
+     {
+         return 1;
+     }
+@@ -1029,7 +1097,6 @@ sub getAttribute
+         printf("ERROR: getAttribute(%s,%s) | Attribute not defined\n",
+             $target, $attribute);
+ 
+-        #print Dumper($target_ptr);
+         $self->myExit(4);
+     }
+     if (ref($target_ptr->{ATTRIBUTES}->{$attribute}->{default}) eq "HASH")
+@@ -1038,6 +1105,30 @@ sub getAttribute
+     }
+     return $target_ptr->{ATTRIBUTES}->{$attribute}->{default};
+ }
++
++sub getAttributeGroup
++{
++    my $self       = shift;
++    my $target     = shift;
++    my $group      = shift;
++    my $target_ptr = $self->getTarget($target);
++    if (!defined($self->{groups}->{$group})) {
++        printf("ERROR: getAttributeGroup(%s,%s) | Group not defined\n",
++            $target, $group);
++        $self->myExit(4);
++    }
++    my %attr;
++    foreach my $attribute (keys(%{$self->{groups}->{$group}}))
++    {
++        if (defined($target_ptr->{ATTRIBUTES}->{$attribute}->{default}))
++        {
++            $attr{$attribute} = $target_ptr->{ATTRIBUTES}->{$attribute};
++        }
++    }
++    return \%attr;
++}
++
++
+ ## renames a target attribute
+ sub renameAttribute
+ {
+@@ -1141,6 +1232,8 @@ sub getBusAttribute
+     return $target_ptr->{CONNECTION}->{BUS}->[$busnum]->{bus_attribute}->{$attr}
+       ->{default};
+ }
++
++
+ ## returns a pointer to an array of children target names
+ sub getTargetChildren
+ {
+@@ -1216,7 +1309,10 @@ sub setMruid
+ 
+     my $type          = $self->getType($target);
+     my $mru_prefix_id = $self->{enumeration}->{MRU_PREFIX}->{$type};
+-    if ($mru_prefix_id eq "") { $mru_prefix_id = "0xFFFF"; }
++    if (!defined $mru_prefix_id || $mru_prefix_id eq "")
++    {
++         $mru_prefix_id = "0xFFFF";
++    }
+     if ($mru_prefix_id eq "0xFFFF") { return; }
+     my $index = 0;
+     if (defined($self->{mru_idx}->{$node}->{$type}))
+@@ -1486,4 +1582,3 @@ Prints to stdout log message is debug mode is turned on.
+ Norman James <njames@us.ibm.com>
+ 
+ =cut
+-
+-- 
+1.8.2.2
+
diff --git a/openpower/package/hostboot/p9Patches/hostboot-0005-add-nimbus-simics-xml.patch b/openpower/package/hostboot/p9Patches/hostboot-0005-add-nimbus-simics-xml.patch
new file mode 100644
index 0000000..f2f7d0b
--- /dev/null
+++ b/openpower/package/hostboot/p9Patches/hostboot-0005-add-nimbus-simics-xml.patch
@@ -0,0 +1,27 @@
+From 56e613d9e7cb2ef6cc1ab0adfae691cfcbdcf9e5 Mon Sep 17 00:00:00 2001
+From: Matt Ploetz <maploetz@us.ibm.com>
+Date: Wed, 28 Sep 2016 17:06:31 -0500
+Subject: [PATCH] Add nimbus simics xml to openPower until processMrw changes
+ are in
+
+Change-Id: Iac895ed08b7e182301e223d45ce064715e459723
+RTC:143114
+---
+ src/build/mkrules/dist.targets.mk | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/build/mkrules/dist.targets.mk b/src/build/mkrules/dist.targets.mk
+index ecd4b58..0e2434c 100644
+--- a/src/build/mkrules/dist.targets.mk
++++ b/src/build/mkrules/dist.targets.mk
+@@ -81,6 +81,7 @@ COPY_FILES = \
+     src/usr/targeting/common/xmltohb/attribute_types.xml:openpower \
+     src/usr/targeting/common/xmltohb/attribute_types_hb.xml:openpower \
+     src/usr/targeting/common/xmltohb/target_types_hb.xml:openpower \
++    src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml:openpower \
+     src/usr/targeting/common/xmltohb/xmltohb.pl:openpower \
+     src/usr/targeting/xmltohb/updatetempsxml.pl:openpower \
+     src/include/usr/vmmconst.h:openpower \
+-- 
+1.8.2.2
+
diff --git a/openpower/package/occ/Config.in b/openpower/package/occ/Config.in
index f00396d..29b5eb4 100644
--- a/openpower/package/occ/Config.in
+++ b/openpower/package/occ/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_OCC
         bool "occ"
-        default y if (BR2_OPENPOWER_PLATFORM && BR2_powerpc_power8)
+        default y if (BR2_OPENPOWER_PLATFORM)
         select BR2_CPP
         help
             Project to build OCC
diff --git a/openpower/package/occ/occ.mk b/openpower/package/occ/occ.mk
index 7b8c960..c2f4f59 100644
--- a/openpower/package/occ/occ.mk
+++ b/openpower/package/occ/occ.mk
@@ -4,25 +4,56 @@
 #
 ################################################################################
 
-OCC_VERSION ?= bb092e95266788920751389f7df189425f1ec1d6
+OCC_VERSION_BRANCH_MASTER_P8 ?= bb092e95266788920751389f7df189425f1ec1d6
+OCC_VERSION_BRANCH_MASTER ?= 30ed7685e39b12255247d0c30db8660f4e42eadb
+
+OCC_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_VERSION_BRANCH_MASTER),$(OCC_VERSION_BRANCH_MASTER_P8))
 OCC_SITE ?= $(call github,open-power,occ,$(OCC_VERSION))
 OCC_LICENSE = Apache-2.0
-OCC_DEPENDENCIES = host-binutils host-p8-pore-binutils
 
 OCC_INSTALL_IMAGES = YES
 OCC_INSTALL_TARGET = NO
 
 OCC_STAGING_DIR = $(STAGING_DIR)/occ
 
-define OCC_BUILD_CMDS
+OCC_IMAGE_BIN_PATH = $(if $(BR2_OPENPOWER_POWER9),obj/image.bin,src/image.bin)
+
+OCC_DEPENDENCIES_P8 = host-binutils host-p8-pore-binutils
+OCC_DEPENDENCIES_P9 = host-binutils host-ppe42-gcc
+OCC_DEPENDENCIES ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_DEPENDENCIES_P9),$(OCC_DEPENDENCIES_P8))
+
+define OCC_APPLY_PATCHES
+       if [ "$(BR2_OPENPOWER_POWER9)" == "y" ]; then \
+           $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL)/package/occ/p9Patches \*.patch; \
+           if [ -d $(BR2_EXTERNAL)/custom/patches/occ/p9Patches ]; then \
+               $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL)/custom/patches/occ/p9Patches \*.patch; \
+           fi; \
+       fi; \
+       if [ "$(BR2_OPENPOWER_POWER8)" == "y" ]; then \
+           $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL)/package/occ/p8Patches \*.patch; \
+           if [ -d $(BR2_EXTERNAL)/custom/patches/occ/p8Patches ]; then \
+               $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL)/custom/patches/occ/p8Patches \*.patch; \
+           fi; \
+       fi;
+endef
+
+OCC_POST_PATCH_HOOKS += OCC_APPLY_PATCHES
+
+define OCC_BUILD_CMDS_P8
         cd $(@D)/src && \
         make POREPATH=$(P8_PORE_BINUTILS_BIN)/bin/ OCC_OP_BUILD=1 CROSS_PREFIX=$(TARGET_CROSS) all && \
+        make tracehash && \
         make combineImage
 endef
+define OCC_BUILD_CMDS_P9
+        cd $(@D)/src && \
+        make PPE_TOOL_PATH=$(PPE42_GCC_BIN) OCC_OP_BUILD=1 CROSS_PREFIX=$(TARGET_CROSS) LD_LIBRARY_PATH=$(HOST_DIR)/usr/lib all 
+endef
+OCC_BUILD_CMDS ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_BUILD_CMDS_P9),$(OCC_BUILD_CMDS_P8))
 
 define OCC_INSTALL_IMAGES_CMDS
        mkdir -p $(STAGING_DIR)/occ
-       cp $(@D)/src/image.bin $(OCC_STAGING_DIR)/$(BR2_OCC_BIN_FILENAME)
+       cp $(@D)/$(OCC_IMAGE_BIN_PATH) $(OCC_STAGING_DIR)/$(BR2_OCC_BIN_FILENAME)
 endef
 
 $(eval $(generic-package))
diff --git a/openpower/package/openpower-ffs/Config.in b/openpower/package/openpower-ffs/Config.in
index 688b654..19a98f4 100644
--- a/openpower/package/openpower-ffs/Config.in
+++ b/openpower/package/openpower-ffs/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_HOST_OPENPOWER_FFS
         bool "ffs"
-        default y if (BR2_OPENPOWER_PLATFORM && BR2_powerpc_power8)
+        default y if (BR2_OPENPOWER_PLATFORM)
         help
             Utilites for building an 'ffs' image file.
diff --git a/openpower/package/openpower-pnor/Config.in b/openpower/package/openpower-pnor/Config.in
index 7719eda..922ee4d 100644
--- a/openpower/package/openpower-pnor/Config.in
+++ b/openpower/package/openpower-pnor/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_OPENPOWER_PNOR
         bool "openpower_pnor"
-        default y if (BR2_OPENPOWER_PLATFORM && BR2_powerpc_power8)
+        default y if (BR2_OPENPOWER_PLATFORM)
         select BR2_PACKAGE_HOSTBOOT
         select BR2_PACKAGE_HOSTBOOT_BINARIES
         select BR2_PACKAGE_SKIBOOT
@@ -63,7 +63,6 @@
         help
             String used to define name of sbe hostboot binary file
 
-
 config BR2_HOSTBOOT_BINARY_SBEC_FILENAME
         string "Name of sbec hostboot binary"
         help
@@ -74,6 +73,16 @@
         help
             String used to define name of winkle hostboot binary file
 
+config BR2_IMA_CATALOG_FILENAME
+        string "Name of IMA catalog binary"
+        help
+            String used to define name of IMA catalog binary file
+
+config BR2_IMA_CATALOG_ECC_FILENAME
+        string "Name of IMA catalog binary"
+        help
+            String used to define name of IMA catalog binary file, ecc protected
+
 config BR2_OPENPOWER_TARGETING_BIN_FILENAME
         string "Name of openpower binary targeting file"
         help
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 92cf53d..83eb3e5 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -8,7 +8,7 @@
 # make doesn't care for quotes in the dependencies.
 XML_PACKAGE=$(subst $\",,$(BR2_OPENPOWER_XML_PACKAGE))
 
-OPENPOWER_PNOR_VERSION ?= 8a1f000cdc71969d46be686eabce22738c78e7b9
+OPENPOWER_PNOR_VERSION ?= 77ffb0442330c079bac911a23b379977a15e65de
 OPENPOWER_PNOR_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_VERSION))
 
 OPENPOWER_PNOR_LICENSE = Apache-2.0
@@ -56,6 +56,7 @@
             -wink_binary_filename $(BR2_HOSTBOOT_BINARY_WINK_FILENAME) \
             -occ_binary_filename $(OCC_STAGING_DIR)/$(BR2_OCC_BIN_FILENAME) \
             -capp_binary_filename $(BINARIES_DIR)/$(BR2_CAPP_UCODE_BIN_FILENAME) \
+            -ima_catalog_filename $(BR2_IMA_CATALOG_FILENAME) \
             -openpower_version_filename $(OPENPOWER_PNOR_VERSION_FILE) \
             -payload $(BINARIES_DIR)/$(BR2_SKIBOOT_LID_NAME) \
             $(if ($(BR2_OPENPOWER_PNOR_XZ_ENABLED),y),-xz_compression)
@@ -73,6 +74,7 @@
             -sbec_binary_filename $(BR2_HOSTBOOT_BINARY_SBEC_FILENAME) \
             -wink_binary_filename $(BR2_HOSTBOOT_BINARY_WINK_FILENAME) \
             -occ_binary_filename $(OCC_STAGING_DIR)/$(BR2_OCC_BIN_FILENAME) \
+            -ima_catalog_filename $(BR2_IMA_CATALOG_ECC_FILENAME) \
             -targeting_binary_filename $(BR2_OPENPOWER_TARGETING_ECC_FILENAME) \
             -openpower_version_filename $(OPENPOWER_PNOR_VERSION_FILE)
 
diff --git a/openpower/package/p8-pore-binutils/Config.in b/openpower/package/p8-pore-binutils/Config.in
index 6099c31..f8d4bf0 100644
--- a/openpower/package/p8-pore-binutils/Config.in
+++ b/openpower/package/p8-pore-binutils/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_HOST_P8_PORE_BINUTILS
         bool "p8-pore-binutils"
-        default y if (BR2_OPENPOWER_PLATFORM && BR2_powerpc_power8)
+        default y if (BR2_OPENPOWER_PLATFORM)
         select BR2_CPP
         help
             Project to build the P8 PORE binutils
diff --git a/openpower/package/petitboot/petitboot.mk b/openpower/package/petitboot/petitboot.mk
index 2952cb6..aad9ab9 100644
--- a/openpower/package/petitboot/petitboot.mk
+++ b/openpower/package/petitboot/petitboot.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PETITBOOT_VERSION = v1.2.3
+PETITBOOT_VERSION = v1.3.0
 PETITBOOT_SITE ?= $(call github,open-power,petitboot,$(PETITBOOT_VERSION))
 PETITBOOT_DEPENDENCIES = ncurses udev host-bison host-flex lvm2
 PETITBOOT_LICENSE = GPLv2
@@ -44,9 +44,7 @@
 	$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/petitboot/boot.d
 	$(INSTALL) -D -m 0755 $(@D)/utils/hooks/01-create-default-dtb \
 		$(TARGET_DIR)/etc/petitboot/boot.d/
-	$(INSTALL) -D -m 0755 $(@D)/utils/hooks/30-add-offb \
-		$(TARGET_DIR)/etc/petitboot/boot.d/
-	$(INSTALL) -D -m 0755 $(@D)/utils/hooks/80-set-stdout \
+	$(INSTALL) -D -m 0755 $(@D)/utils/hooks/30-dtb_updates \
 		$(TARGET_DIR)/etc/petitboot/boot.d/
 	$(INSTALL) -D -m 0755 $(@D)/utils/hooks/90-sort-dtb \
 		$(TARGET_DIR)/etc/petitboot/boot.d/
diff --git a/openpower/package/ppe42-binutils/Config.in b/openpower/package/ppe42-binutils/Config.in
new file mode 100644
index 0000000..824e557
--- /dev/null
+++ b/openpower/package/ppe42-binutils/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HOST_PPE42_BINUTILS
+        bool "ppe42-binutils"
+        default y if (BR2_OPENPOWER_PLATFORM && BR2_OPENPOWER_POWER9)
+        select BR2_CPP
+        help
+            Project to build the PPE42 PORE binutils
diff --git a/openpower/package/ppe42-binutils/ppe42-binutils.mk b/openpower/package/ppe42-binutils/ppe42-binutils.mk
new file mode 100644
index 0000000..3a9c125
--- /dev/null
+++ b/openpower/package/ppe42-binutils/ppe42-binutils.mk
@@ -0,0 +1,32 @@
+################################################################################
+#
+# ppe42-binutils
+#
+################################################################################
+
+PPE42_BINUTILS_VERSION ?= 5b161fc30519a965f16e7e73c3410a388140cba1
+PPE42_BINUTILS_SITE ?= $(call github,open-power,ppe42-binutils,$(PPE42_BINUTILS_VERSION))
+PPE42_BINUTILS_LICENSE = GPLv3+
+
+PPE42_BINUTILS_DEPENDENCIES = host-binutils
+
+PPE42_BINUTILS_DIR = $(STAGING_DIR)/ppe42-binutils
+PPE42_BINUTILS_BIN = $(STAGING_DIR)/ppe42-binutils/linux
+
+define HOST_PPE42_BINUTILS_BUILD_CMDS
+        cd $(@D) && \
+        ./configure --prefix=$(PPE42_BINUTILS_DIR) \
+                    --exec-prefix=$(PPE42_BINUTILS_BIN) \
+					--target=powerpc-eabi \
+					--enable-shared \
+					--enable-64-bit-bfd \
+					&& \
+        make configure-host && \
+        make LDFLAGS=-all-static CFLAGS=-Wno-error=unused-value
+endef
+
+define HOST_PPE42_BINUTILS_INSTALL_CMDS
+        bash -c 'cd $(@D) && make install'
+endef
+
+$(eval $(host-generic-package))
diff --git a/openpower/package/ppe42-gcc/Config.in b/openpower/package/ppe42-gcc/Config.in
new file mode 100644
index 0000000..d66418d
--- /dev/null
+++ b/openpower/package/ppe42-gcc/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HOST_PPE42_GCC
+        bool "ppe42-gcc"
+        default y if (BR2_OPENPOWER_PLATFORM && BR2_OPENPOWER_POWER9)
+        select BR2_CPP
+        help
+            Project to build the PPE42 gcc
diff --git a/openpower/package/ppe42-gcc/ppe42-gcc.mk b/openpower/package/ppe42-gcc/ppe42-gcc.mk
new file mode 100644
index 0000000..cf8ac73
--- /dev/null
+++ b/openpower/package/ppe42-gcc/ppe42-gcc.mk
@@ -0,0 +1,36 @@
+################################################################################
+#
+# ppe42-gcc
+#
+################################################################################
+
+PPE42_GCC_VERSION ?= 246277a8513f622a65f97cb59e3079fc8834a913
+PPE42_GCC_SITE ?= $(call github,open-power,ppe42-gcc,$(PPE42_GCC_VERSION))
+PPE42_GCC_LICENSE = GPLv3+
+
+PPE42_GCC_DEPENDENCIES = ppe42-binutils
+
+PPE42_GCC_DIR = $(STAGING_DIR)/ppe42-binutils
+PPE42_GCC_BIN = $(STAGING_DIR)/ppe42-binutils/linux
+
+define HOST_PPE42_GCC_BUILD_CMDS
+        cd $(@D) && \
+        ./configure --prefix=$(PPE42_GCC_DIR) \
+                    --exec-prefix=$(PPE42_GCC_BIN) \
+					--target=powerpc-eabi \
+					--without-headers \
+					--with-newlib \
+					--with-gnu-as \
+					--with-gnu-ld \
+					--with-gmp=$(HOST_DIR)/usr \
+					--with-mpfr=$(HOST_DIR)/usr \
+					&& \
+        make configure-host && \
+        make all-gcc
+endef
+
+define HOST_PPE42_GCC_INSTALL_CMDS
+        bash -c 'cd $(@D) && make install-gcc'
+endef
+
+$(eval $(host-generic-package))
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index 446805f..0f77dd9 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -3,9 +3,9 @@
 config BR2_PACKAGE_SKIBOOT
 	bool "skiboot"
 	depends on BR2_powerpc64 || BR2_powerpc64le
-        default y if (BR2_OPENPOWER_PLATFORM && BR2_powerpc_power8)
+        default y if (BR2_OPENPOWER_PLATFORM)
 	help
-	  Build skiboot POWER8 firmware
+	  Build skiboot POWER firmware
 
 if BR2_PACKAGE_SKIBOOT
 
@@ -31,7 +31,7 @@
 
 config BR2_SKIBOOT_VERSION
 	string
-	default "skiboot-5.3.2" if BR2_SKIBOOT_LATEST_VERSION
+	default "skiboot-5.3.6" if BR2_SKIBOOT_LATEST_VERSION
 	default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_SKIBOOT_CUSTOM_VERSION
 
diff --git a/openpower/package/witherspoon-xml/Config.in b/openpower/package/witherspoon-xml/Config.in
new file mode 100755
index 0000000..3e4333c
--- /dev/null
+++ b/openpower/package/witherspoon-xml/Config.in
@@ -0,0 +1,23 @@
+config BR2_PACKAGE_WITHERSPOON_XML
+        bool "witherspoon_xml"
+        default y if (BR2_OPENPOWER_CONFIG_NAME = "witherspoon")
+        help
+            Utilites for building xml and the targeting binary image
+
+config BR2_WITHERSPOON_SYSTEM_XML_FILENAME
+        string "Witherspoon targeting system xml filename"
+        default ""
+        help
+            Defines the name of the system XML filename to be used when creating targeting binary image
+
+config BR2_WITHERSPOON_MRW_XML_FILENAME
+        string "Witherspoon targeting mrw xml filename"
+        default ""
+        help
+            Defines the name of the mrw XML filename to be used when creating targeting binary image
+
+config BR2_WITHERSPOON_BIOS_XML_FILENAME
+        string "Witherspoon BIOS metadata XML filename"
+        default ""
+        help
+            Defines the name of the BIOS XML filename to parse when generating BIOS metadata
diff --git a/openpower/package/witherspoon-xml/witherspoon.mk b/openpower/package/witherspoon-xml/witherspoon.mk
new file mode 100644
index 0000000..1d53545
--- /dev/null
+++ b/openpower/package/witherspoon-xml/witherspoon.mk
@@ -0,0 +1,79 @@
+################################################################################
+#
+# witherspoon_xml
+#
+################################################################################
+
+WITHERSPOON_XML_VERSION ?= 166b3135edbc7299aaa991a42f6eb0fc40d784e6
+WITHERSPOON_XML_SITE ?= $(call github,open-power,witherspoon-xml,$(WITHERSPOON_XML_VERSION))
+
+WITHERSPOON_XML_LICENSE = Apache-2.0
+WITHERSPOON_XML_DEPENDENCIES = hostboot-install-images openpower-mrw-install-images common-p8-xml-install-images
+
+WITHERSPOON_XML_INSTALL_IMAGES = YES
+WITHERSPOON_XML_INSTALL_TARGET = YES
+
+MRW_SCRATCH=$(STAGING_DIR)/openpower_mrw_scratch
+MRW_HB_TOOLS=$(STAGING_DIR)/hostboot_build_images
+
+# Defines for BIOS metadata creation
+BIOS_SCHEMA_FILE = $(MRW_HB_TOOLS)/bios.xsd
+WITHERSPOON_BIOS_XML_CONFIG_FILE = $(MRW_SCRATCH)/$(BR2_WITHERSPOON_BIOS_XML_FILENAME)
+BIOS_XML_METADATA_FILE = \
+    $(MRW_HB_TOOLS)/$(BR2_OPENPOWER_CONFIG_NAME)_bios_metadata.xml
+PETITBOOT_XSLT_FILE = $(MRW_HB_TOOLS)/bios_metadata_petitboot.xslt
+PETITBOOT_BIOS_XML_METADATA_FILE = \
+    $(MRW_HB_TOOLS)/$(BR2_OPENPOWER_CONFIG_NAME)_bios_metadata_petitboot.xml
+PETITBOOT_BIOS_XML_METADATA_INITRAMFS_FILE = \
+    $(TARGET_DIR)/usr/share/bios_metadata.xml
+
+define WITHERSPOON_XML_BUILD_CMDS
+        # copy the witherspoon xml where the common lives
+        bash -c 'mkdir -p $(MRW_SCRATCH) && cp -r $(@D)/* $(MRW_SCRATCH)'
+
+        # generate the system mrw xml
+        #perl -I $(MRW_HB_TOOLS) \
+        $(MRW_HB_TOOLS)/processMrw.pl -x $(MRW_SCRATCH)/witherspoon.xml
+        
+        # copy local simics_NIMBUS xml until processMrw changes are in
+        # RTC: 143114
+        cp $(MRW_HB_TOOLS)/simics_NIMBUS.system.xml $(MRW_SCRATCH)/$(BR2_WITHERSPOON_SYSTEM_XML_FILENAME)
+
+        # merge in any system specific attributes, hostboot attributes
+        $(MRW_HB_TOOLS)/mergexml.sh $(MRW_SCRATCH)/$(BR2_WITHERSPOON_SYSTEM_XML_FILENAME) \
+            $(MRW_HB_TOOLS)/attribute_types.xml \
+            $(MRW_HB_TOOLS)/attribute_types_hb.xml \
+            $(MRW_HB_TOOLS)/target_types_merged.xml \
+            $(MRW_HB_TOOLS)/target_types_hb.xml \
+            $(MRW_SCRATCH)/$(BR2_WITHERSPOON_MRW_XML_FILENAME) > $(MRW_HB_TOOLS)/temporary_hb.hb.xml;
+
+        # creating the targeting binary
+        $(MRW_HB_TOOLS)/xmltohb.pl  \
+            --hb-xml-file=$(MRW_HB_TOOLS)/temporary_hb.hb.xml \
+            --fapi-attributes-xml-file=$(MRW_HB_TOOLS)/fapiattrs.xml \
+            --src-output-dir=none \
+            --img-output-dir=$(MRW_HB_TOOLS)/ \
+            --vmm-consts-file=$(MRW_HB_TOOLS)/vmmconst.h --noshort-enums \
+            --bios-xml-file=$(WITHERSPOON_BIOS_XML_CONFIG_FILE) \
+            --bios-schema-file=$(BIOS_SCHEMA_FILE) \
+            --bios-output-file=$(BIOS_XML_METADATA_FILE)
+
+        # Transform BIOS XML into Petitboot specific BIOS XML via the schema
+        xsltproc -o \
+            $(PETITBOOT_BIOS_XML_METADATA_FILE) \
+            $(PETITBOOT_XSLT_FILE) \
+            $(BIOS_XML_METADATA_FILE)
+endef
+
+define WITHERSPOON_XML_INSTALL_IMAGES_CMDS
+        mv $(MRW_HB_TOOLS)/targeting.bin $(MRW_HB_TOOLS)/$(BR2_OPENPOWER_TARGETING_BIN_FILENAME)
+endef
+
+define WITHERSPOON_XML_INSTALL_TARGET_CMDS
+        # Install Petitboot specific BIOS XML into initramfs's usr/share/ dir
+        $(INSTALL) -D -m 0644 \
+            $(PETITBOOT_BIOS_XML_METADATA_FILE) \
+            $(PETITBOOT_BIOS_XML_METADATA_INITRAMFS_FILE)
+endef
+
+$(eval $(generic-package))
diff --git a/openpower/platform/Config.in b/openpower/platform/Config.in
index 206b343..3232cd0 100644
--- a/openpower/platform/Config.in
+++ b/openpower/platform/Config.in
@@ -1,4 +1,14 @@
 config BR2_OPENPOWER_PLATFORM
-    bool "Enable the OpenPower Platform"
+    bool "Enables only one openPower platform"
+    default n
+    depends on ((BR2_OPENPOWER_POWER8 || BR2_OPENPOWER_POWER9) && !(BR2_OPENPOWER_POWER8 && BR2_OPENPOWER_POWER9))
+
+config BR2_OPENPOWER_POWER8
+    bool "Enables the OpenPower p8 platform"
+    default n
+    depends on BR2_powerpc64 || BR2_powerpc64le
+
+config BR2_OPENPOWER_POWER9
+    bool "Enables the OpenPower p9 platform"
     default n
     depends on BR2_powerpc64 || BR2_powerpc64le
diff --git a/openpower/scripts/firenze-firmware-whitelist b/openpower/scripts/firenze-firmware-whitelist
index ea2d6be..e8fc660 100755
--- a/openpower/scripts/firenze-firmware-whitelist
+++ b/openpower/scripts/firenze-firmware-whitelist
@@ -9,16 +9,11 @@
                 'cxgb4'
                 'cxgb3'
                 'e100'
-                'radeon/CAICOS_me.bin'
                 'radeon/CEDAR_rlc.bin'
-                'radeon/CAICOS_mc.bin'
-                'radeon/CAICOS_pfp.bin'
                 'radeon/CEDAR_pfp.bin'
-                'radeon/CAICOS_smc.bin'
                 'radeon/CEDAR_smc.bin'
                 'radeon/CEDAR_me.bin'
-                'radeon/CYPRESS_uvd.bin'
-                'radeon/BTC_rlc.bin')
+                'radeon/CYPRESS_uvd.bin')
 
 if [ -z "${TARGET_DIR}" ] ; then
         echo "TARGET_DIR not defined, setting to $1"