diff --git a/openpower/configs/barreleye_defconfig b/openpower/configs/barreleye_defconfig
index 3584373..dc76d9e 100644
--- a/openpower/configs/barreleye_defconfig
+++ b/openpower/configs/barreleye_defconfig
@@ -1,6 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
 BR2_OPENPOWER_PLATFORM=y
+BR2_OPENPOWER_POWER8=y
 
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
diff --git a/openpower/configs/firenze_defconfig b/openpower/configs/firenze_defconfig
index a28aaa7..6f8466d 100644
--- a/openpower/configs/firenze_defconfig
+++ b/openpower/configs/firenze_defconfig
@@ -1,6 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
 BR2_OPENPOWER_PLATFORM=y
+BR2_OPENPOWER_POWER8=y
 
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig
index a55280b..708e768 100644
--- a/openpower/configs/firestone_defconfig
+++ b/openpower/configs/firestone_defconfig
@@ -1,6 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
 BR2_OPENPOWER_PLATFORM=y
+BR2_OPENPOWER_POWER8=y
 
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig
index e1020a3..a3e5b2a 100644
--- a/openpower/configs/garrison_defconfig
+++ b/openpower/configs/garrison_defconfig
@@ -1,6 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
 BR2_OPENPOWER_PLATFORM=y
+BR2_OPENPOWER_POWER8=y
 
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig
index 7cdb031..df03e5f 100644
--- a/openpower/configs/habanero_defconfig
+++ b/openpower/configs/habanero_defconfig
@@ -1,6 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
 BR2_OPENPOWER_PLATFORM=y
+BR2_OPENPOWER_POWER8=y
 
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
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..071a31b 100644
--- a/openpower/configs/openpower_mambo_defconfig
+++ b/openpower/configs/openpower_mambo_defconfig
@@ -1,6 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
 BR2_OPENPOWER_PLATFORM=y
+BR2_OPENPOWER_POWER8=y
 
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
diff --git a/openpower/configs/openpower_p9_mambo_defconfig b/openpower/configs/openpower_p9_mambo_defconfig
index 7dfbf8b..5a12266 100644
--- a/openpower/configs/openpower_p9_mambo_defconfig
+++ b/openpower/configs/openpower_p9_mambo_defconfig
@@ -35,10 +35,11 @@
 BR2_PACKAGE_RSYNC=y
 BR2_TARGET_ROOTFS_CPIO_XZ=y
 BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_OPENPOWER_POWER9=y
 BR2_OPENPOWER_PLATFORM=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..8b75186 100644
--- a/openpower/configs/palmetto_defconfig
+++ b/openpower/configs/palmetto_defconfig
@@ -1,6 +1,7 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
 BR2_OPENPOWER_PLATFORM=y
+BR2_OPENPOWER_POWER8=y
 
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig
new file mode 100644
index 0000000..bb4fcc0
--- /dev/null
+++ b/openpower/configs/witherspoon_defconfig
@@ -0,0 +1,70 @@
+BR2_powerpc64le=y
+BR2_powerpc_power8=y
+BR2_OPENPOWER_PLATFORM=y
+BR2_OPENPOWER_POWER9=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="witherspoon"
+BR2_OPENPOWER_XML_PACKAGE="witherspoon-xml"
+BR2_HOSTBOOT_CONFIG_FILE="witherspoon.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_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"
+
+BR2_OPENPOWER_TARGETING_BIN_FILENAME="WITHERSPOON_HB.targeting.bin"
+BR2_OPENPOWER_TARGETING_ECC_FILENAME="WITHERSPOON_HB.targeting.bin.ecc"
+BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
+
+BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayoutWithGoldenSide.xml"
+BR2_OPENPOWER_PNOR_FILENAME="witherspoon.pnor"
+BR2_OPENPOWER_PNOR_UPDATE_FILENAME="witherspoon_update.pnor"
+
+BR2_TARGET_GENERIC_HOSTNAME="skiroot"
+
+# petitboot requirements
+BR2_ENABLE_LOCALE_PURGE=y
+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.18"
+BR2_KERNEL_HEADERS_4_4=y
+BR2_BINUTILS_VERSION_2_26_X=y
+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_BNX2X=y
+BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4=y
+BR2_PACKAGE_I2C_TOOLS=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_PACKAGE_LOADKEYS=y
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/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/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 8e6f9d3..0dcd7a5 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -3,8 +3,10 @@
 # hostboot
 #
 ################################################################################
+HOSTBOOT_VERSION_BRANCH_MASTER_P8 = 3707a3c6562bb54f43099f15836b79ea13659aa7
+HOSTBOOT_VERSION_BRANCH_MASTER = f5d53757fabb36a84abb75c2f97b66a7429f134b
 
-HOSTBOOT_VERSION ?= 3707a3c6562bb54f43099f15836b79ea13659aa7
+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..362121f
--- /dev/null
+++ b/openpower/package/hostboot/p9Patches/hostboot-0002-remove-attr-override-compile.patch
@@ -0,0 +1,26 @@
+From d71055295a21e7fe9105bdfe0085006462ab568c Mon Sep 17 00:00:00 2001
+From: Matt Ploetz <maploetz@us.ibm.com>
+Date: Tue, 9 Aug 2016 10:08:15 -0500
+Subject: [PATCH] Remove attribute override compile
+
+Change-Id: Ia3f4cda97ff1ec80619bf8b5144144903b2b24f5
+---
+ src/usr/targeting/makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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-unsed-var-attn-rt.patch b/openpower/package/hostboot/p9Patches/hostboot-0003-remove-unsed-var-attn-rt.patch
new file mode 100644
index 0000000..0ae93ed
--- /dev/null
+++ b/openpower/package/hostboot/p9Patches/hostboot-0003-remove-unsed-var-attn-rt.patch
@@ -0,0 +1,26 @@
+From 8e9ebe09e1656fab860bb0d5bf1da2f6aad9378d Mon Sep 17 00:00:00 2001
+From: Matt Ploetz <maploetz@us.ibm.com>
+Date: Tue, 9 Aug 2016 10:21:39 -0500
+Subject: [PATCH] Remove unused var
+
+Change-Id: I563e862d078cb99ac0083b58b80608acfd431597
+---
+ src/usr/diag/attn/runtime/attn_rt.C | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/usr/diag/attn/runtime/attn_rt.C b/src/usr/diag/attn/runtime/attn_rt.C
+index 62860d9..0675174 100644
+--- a/src/usr/diag/attn/runtime/attn_rt.C
++++ b/src/usr/diag/attn/runtime/attn_rt.C
+@@ -105,7 +105,7 @@ namespace ATTN_RT
+         int rc = 0;
+         errlHndl_t err = NULL;
+         AttentionList attentions;
+-        MemOps & memOps = getMemOps();
++        //MemOps & memOps = getMemOps();
+ 
+ 
+         do
+-- 
+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/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..de52b7d 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
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/skiboot/Config.in b/openpower/package/skiboot/Config.in
index 446805f..cb19c76 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
 
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