diff --git a/openpower/configs/barreleye_defconfig b/openpower/configs/barreleye_defconfig
index d80ff4c..d359d38 100644
--- a/openpower/configs/barreleye_defconfig
+++ b/openpower/configs/barreleye_defconfig
@@ -38,7 +38,7 @@
 BR2_TARGET_ROOTFS_INITRAMFS=y
 BR2_OPENPOWER_PLATFORM=y
 BR2_OPENPOWER_POWER8=y
-BR2_HOSTBOOT_CONFIG_FILE="barreleye.config"
+BR2_HOSTBOOT_P8_CONFIG_FILE="barreleye.config"
 BR2_OPENPOWER_MACHINE_XML_TARGET_TYPES_OPENPOWER_XML=y
 BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="barreleye-xml"
 BR2_OPENPOWER_MACHINE_XML_VERSION="253622f22fe142ea67a0025e9bcc3044db038898"
@@ -58,7 +58,6 @@
 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
 BR2_IMA_CATALOG_DTS="POWER8"
diff --git a/openpower/configs/firenze_defconfig b/openpower/configs/firenze_defconfig
index d5d614a..85018ff 100644
--- a/openpower/configs/firenze_defconfig
+++ b/openpower/configs/firenze_defconfig
@@ -38,7 +38,7 @@
 BR2_TARGET_ROOTFS_CPIO_XZ=y
 BR2_OPENPOWER_PLATFORM=y
 BR2_OPENPOWER_POWER8=y
-# BR2_PACKAGE_HOSTBOOT is not set
+# BR2_PACKAGE_HOSTBOOT_P8 is not set
 # BR2_PACKAGE_HOSTBOOT_BINARIES is not set
 # BR2_PACKAGE_MACHINE_XML is not set
 # BR2_PACKAGE_OPENPOWER_PNOR is not set
@@ -46,7 +46,6 @@
 BR2_PACKAGE_PETITBOOT=y
 BR2_PACKAGE_PETITBOOT_MTD=y
 # 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
 # BR2_PACKAGE_IMA_CATALOG is not set
diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig
index bbd03c0..2c33407 100644
--- a/openpower/configs/firestone_defconfig
+++ b/openpower/configs/firestone_defconfig
@@ -38,7 +38,7 @@
 BR2_TARGET_ROOTFS_INITRAMFS=y
 BR2_OPENPOWER_PLATFORM=y
 BR2_OPENPOWER_POWER8=y
-BR2_HOSTBOOT_CONFIG_FILE="firestone.config"
+BR2_HOSTBOOT_P8_CONFIG_FILE="firestone.config"
 BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="firestone-xml"
 BR2_OPENPOWER_MACHINE_XML_VERSION="2494a430656504d014780000adbc2c2e7cfc54ab"
 BR2_OPENPOWER_MACHINE_XML_FILENAME="firestone.xml"
@@ -57,7 +57,6 @@
 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
 BR2_IMA_CATALOG_DTS="POWER8"
diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig
index 471200d..617a065 100644
--- a/openpower/configs/garrison_defconfig
+++ b/openpower/configs/garrison_defconfig
@@ -38,7 +38,7 @@
 BR2_TARGET_ROOTFS_INITRAMFS=y
 BR2_OPENPOWER_PLATFORM=y
 BR2_OPENPOWER_POWER8=y
-BR2_HOSTBOOT_CONFIG_FILE="garrison.config"
+BR2_HOSTBOOT_P8_CONFIG_FILE="garrison.config"
 BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="garrison-xml"
 BR2_OPENPOWER_MACHINE_XML_VERSION="19a516499e1090c20c5a3303db256529ef22c1c9"
 BR2_OPENPOWER_MACHINE_XML_FILENAME="garrison.xml"
@@ -57,7 +57,6 @@
 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
 BR2_IMA_CATALOG_DTS="POWER8"
diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig
index 1ceb7b6..eb582fc 100644
--- a/openpower/configs/habanero_defconfig
+++ b/openpower/configs/habanero_defconfig
@@ -39,7 +39,7 @@
 BR2_TARGET_ROOTFS_INITRAMFS=y
 BR2_OPENPOWER_PLATFORM=y
 BR2_OPENPOWER_POWER8=y
-BR2_HOSTBOOT_CONFIG_FILE="habanero.config"
+BR2_HOSTBOOT_P8_CONFIG_FILE="habanero.config"
 BR2_OPENPOWER_MACHINE_XML_TARGET_TYPES_OPENPOWER_XML=y
 BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="habanero-xml"
 BR2_OPENPOWER_MACHINE_XML_VERSION="6a78496c286e284719a8201148a5088030b897de"
@@ -59,7 +59,6 @@
 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
 BR2_IMA_CATALOG_DTS="POWER8"
diff --git a/openpower/configs/openpower_mambo_defconfig b/openpower/configs/openpower_mambo_defconfig
index 3494c38..9568777 100644
--- a/openpower/configs/openpower_mambo_defconfig
+++ b/openpower/configs/openpower_mambo_defconfig
@@ -36,13 +36,12 @@
 BR2_OPENPOWER_PLATFORM=y
 BR2_OPENPOWER_POWER8=y
 # BR2_PACKAGE_HOST_OPENPOWER_FFS is not set
-# BR2_PACKAGE_HOSTBOOT is not set
+# BR2_PACKAGE_HOSTBOOT_P8 is not set
 # BR2_PACKAGE_HOSTBOOT_BINARIES is not set
 # BR2_PACKAGE_MACHINE_XML is not set
 # BR2_PACKAGE_OPENPOWER_PNOR is not set
 BR2_OPENPOWER_CONFIG_NAME="openpower-mambo"
 BR2_PACKAGE_PETITBOOT=y
 # BR2_PACKAGE_HOST_P8_PORE_BINUTILS is not set
-# BR2_PACKAGE_OCC is not set
 # BR2_PACKAGE_CAPP_UCODE is not set
 # BR2_PACKAGE_IMA_CATALOG is not set
diff --git a/openpower/configs/openpower_p9_mambo_defconfig b/openpower/configs/openpower_p9_mambo_defconfig
index 7a66a67..c4e1ba3 100644
--- a/openpower/configs/openpower_p9_mambo_defconfig
+++ b/openpower/configs/openpower_p9_mambo_defconfig
@@ -42,9 +42,9 @@
 # BR2_PACKAGE_OPENPOWER_PNOR is not set
 BR2_OPENPOWER_CONFIG_NAME="openpower-mambo-p9"
 BR2_PACKAGE_PETITBOOT=y
-# BR2_PACKAGE_HOST_P8_PORE_BINUTILS is not set
-# BR2_PACKAGE_OCC is not set
+BR2_PACKAGE_PETITBOOT_MTD=y
 # BR2_PACKAGE_HCODE is not set
+# BR2_PACKAGE_OCC is not set
 # BR2_PACKAGE_CAPP_UCODE is not set
 # BR2_PACKAGE_HOST_PPE42_BINUTILS is not set
 # BR2_PACKAGE_HOST_PPE42_GCC is not set
diff --git a/openpower/configs/p9dsu_defconfig b/openpower/configs/p9dsu_defconfig
index 1576bf0..6c9c180 100644
--- a/openpower/configs/p9dsu_defconfig
+++ b/openpower/configs/p9dsu_defconfig
@@ -58,7 +58,6 @@
 BR2_OPENPOWER_TARGETING_ECC_FILENAME="P9DSU_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_IMA_CATALOG_DTS="POWER9"
diff --git a/openpower/configs/p9dsu_dev_defconfig b/openpower/configs/p9dsu_dev_defconfig
new file mode 100644
index 0000000..4efeb98
--- /dev/null
+++ b/openpower/configs/p9dsu_dev_defconfig
@@ -0,0 +1,68 @@
+BR2_powerpc64le=y
+BR2_powerpc_power8=y
+BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
+BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
+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_SYSTEM_ENABLE_NLS=y
+BR2_ROOTFS_OVERLAY="../openpower/overlay"
+BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.6"
+BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
+BR2_LINUX_KERNEL_ZIMAGE_EPAPR=y
+BR2_LINUX_KERNEL_XZ=y
+BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/busybox.fragment"
+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_LINUX_FIRMWARE_QLOGIC_2XXX=y
+BR2_PACKAGE_IPMITOOL=y
+BR2_PACKAGE_IPMITOOL_USB=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_LRZSZ=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_LATEST_VERSION=y
+BR2_HOSTBOOT_CONFIG_FILE="p9dsu.config"
+BR2_HOSTBOOT_BINARIES_LATEST_VERSION=y
+BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="p9dsu-xml"
+BR2_OPENPOWER_MACHINE_XML_VERSION="32ce616ef80f5cc3f128b3aa08fe50954a087888"
+BR2_OPENPOWER_MACHINE_XML_FILENAME="p9dsu.xml"
+BR2_OPENPOWER_SYSTEM_XML_FILENAME="P9DSU_hb.system.xml"
+BR2_OPENPOWER_MRW_XML_FILENAME="P9DSU_hb.mrw.xml"
+BR2_OPENPOWER_BIOS_XML_FILENAME="P9DSU_bios.xml"
+BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayout_64.xml"
+BR2_OPENPOWER_CONFIG_NAME="p9dsu"
+BR2_OPENPOWER_PNOR_FILENAME="p9dsu.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_IMA_CATALOG_FILENAME="ima_catalog.bin"
+BR2_OPENPOWER_TARGETING_BIN_FILENAME="P9DSU_HB.targeting.bin"
+BR2_OPENPOWER_TARGETING_ECC_FILENAME="P9DSU_HB.targeting.bin.ecc"
+BR2_PACKAGE_PETITBOOT=y
+BR2_PACKAGE_PETITBOOT_MTD=y
+BR2_HCODE_LATEST_VERSION=y
+BR2_OCC_LATEST_VERSION=y
+BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
+BR2_PACKAGE_LOADKEYS=y
+BR2_IMA_CATALOG_DTS="POWER9"
+BR2_SBE_LATEST_VERSION=y
diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig
index 9f89006..8b3a764 100644
--- a/openpower/configs/palmetto_defconfig
+++ b/openpower/configs/palmetto_defconfig
@@ -37,7 +37,7 @@
 BR2_TARGET_ROOTFS_INITRAMFS=y
 BR2_OPENPOWER_PLATFORM=y
 BR2_OPENPOWER_POWER8=y
-BR2_HOSTBOOT_CONFIG_FILE="palmetto.config"
+BR2_HOSTBOOT_P8_CONFIG_FILE="palmetto.config"
 BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="palmetto-xml"
 BR2_OPENPOWER_MACHINE_XML_VERSION="c6f563966e9fadc4fb60194c064b2310c9b916b1"
 BR2_OPENPOWER_MACHINE_XML_FILENAME="palmetto.xml"
@@ -55,7 +55,6 @@
 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
 BR2_IMA_CATALOG_DTS="POWER8"
diff --git a/openpower/configs/pseries_defconfig b/openpower/configs/pseries_defconfig
index c1557a0..e64420b 100644
--- a/openpower/configs/pseries_defconfig
+++ b/openpower/configs/pseries_defconfig
@@ -39,7 +39,7 @@
 BR2_TARGET_ROOTFS_CPIO_XZ=y
 BR2_OPENPOWER_PLATFORM=y
 BR2_OPENPOWER_POWER8=y
-# BR2_PACKAGE_HOSTBOOT is not set
+# BR2_PACKAGE_HOSTBOOT_P8 is not set
 # BR2_PACKAGE_HOSTBOOT_BINARIES is not set
 # BR2_PACKAGE_MACHINE_XML is not set
 # BR2_PACKAGE_OPENPOWER_PNOR is not set
@@ -47,7 +47,6 @@
 BR2_PACKAGE_PETITBOOT=y
 BR2_PACKAGE_PETITBOOT_MTD=y
 # 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
 # BR2_PACKAGE_IMA_CATALOG is not set
diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig
index 99ef0bc..c7c143a 100644
--- a/openpower/configs/romulus_defconfig
+++ b/openpower/configs/romulus_defconfig
@@ -57,7 +57,6 @@
 BR2_OPENPOWER_TARGETING_ECC_FILENAME="ROMULUS_HB.targeting.bin.ecc"
 BR2_PACKAGE_PETITBOOT=y
 BR2_PACKAGE_PETITBOOT_MTD=y
-BR2_OCC_BIN_FILENAME="occ.bin"
 # BR2_HCODE_INCLUDE_IONV is not set
 BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
 BR2_PACKAGE_LOADKEYS=y
diff --git a/openpower/configs/vesnin_defconfig b/openpower/configs/vesnin_defconfig
index 70e50ce..ca31c40 100644
--- a/openpower/configs/vesnin_defconfig
+++ b/openpower/configs/vesnin_defconfig
@@ -33,7 +33,7 @@
 BR2_TARGET_ROOTFS_INITRAMFS=y
 BR2_OPENPOWER_PLATFORM=y
 BR2_OPENPOWER_POWER8=y
-BR2_HOSTBOOT_CONFIG_FILE="vesnin.config"
+BR2_HOSTBOOT_P8_CONFIG_FILE="vesnin.config"
 BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="vesnin-xml"
 BR2_OPENPOWER_MACHINE_XML_VERSION="dda5b93d90b6e56fd3e94b0dfd255fa8f47409cb"
 BR2_OPENPOWER_MACHINE_XML_FILENAME="vesnin.xml"
@@ -52,7 +52,6 @@
 BR2_OPENPOWER_TARGETING_ECC_FILENAME="VESNIN_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_IMA_CATALOG_DTS="POWER8"
diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig
index 34ea100..1891051 100644
--- a/openpower/configs/witherspoon_defconfig
+++ b/openpower/configs/witherspoon_defconfig
@@ -57,7 +57,6 @@
 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_OCC_GPU_BIN_BUILD=y
 BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
 BR2_PACKAGE_LOADKEYS=y
diff --git a/openpower/configs/witherspoon_dev_defconfig b/openpower/configs/witherspoon_dev_defconfig
new file mode 100644
index 0000000..dbebdae
--- /dev/null
+++ b/openpower/configs/witherspoon_dev_defconfig
@@ -0,0 +1,68 @@
+BR2_powerpc64le=y
+BR2_powerpc_power8=y
+BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
+BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
+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_SYSTEM_ENABLE_NLS=y
+BR2_ROOTFS_OVERLAY="../openpower/overlay"
+BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.6"
+BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
+BR2_LINUX_KERNEL_ZIMAGE_EPAPR=y
+BR2_LINUX_KERNEL_XZ=y
+BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/busybox.fragment"
+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_IPMITOOL=y
+BR2_PACKAGE_IPMITOOL_USB=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_LRZSZ=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_LATEST_VERSION=y
+BR2_HOSTBOOT_CONFIG_FILE="witherspoon.config"
+BR2_HOSTBOOT_BINARIES_LATEST_VERSION=y
+BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="witherspoon-xml"
+BR2_OPENPOWER_MACHINE_XML_VERSION="7cd20a6ac8fe3b693ccf50a5ab86ce55ca994fdc"
+BR2_OPENPOWER_MACHINE_XML_FILENAME="witherspoon.xml"
+BR2_OPENPOWER_SYSTEM_XML_FILENAME="WITHERSPOON_hb.system.xml"
+BR2_OPENPOWER_MRW_XML_FILENAME="WITHERSPOON_hb.mrw.xml"
+BR2_OPENPOWER_BIOS_XML_FILENAME="WITHERSPOON_bios.xml"
+BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayout_64.xml"
+BR2_OPENPOWER_CONFIG_NAME="witherspoon"
+BR2_OPENPOWER_PNOR_FILENAME="witherspoon.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_IMA_CATALOG_FILENAME="ima_catalog.bin"
+BR2_OPENPOWER_TARGETING_BIN_FILENAME="WITHERSPOON_HB.targeting.bin"
+BR2_OPENPOWER_TARGETING_ECC_FILENAME="WITHERSPOON_HB.targeting.bin.ecc"
+BR2_PACKAGE_PETITBOOT=y
+BR2_PACKAGE_PETITBOOT_MTD=y
+BR2_HCODE_LATEST_VERSION=y
+BR2_OCC_GPU_BIN_BUILD=y
+BR2_OCC_LATEST_VERSION=y
+BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
+BR2_PACKAGE_LOADKEYS=y
+BR2_IMA_CATALOG_DTS="POWER9"
+BR2_SBE_LATEST_VERSION=y
diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig
index 5989872..d2e139e 100644
--- a/openpower/configs/zaius_defconfig
+++ b/openpower/configs/zaius_defconfig
@@ -57,7 +57,6 @@
 BR2_OPENPOWER_TARGETING_ECC_FILENAME="ZAIUS_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_IMA_CATALOG_DTS="POWER9"
diff --git a/openpower/configs/zz_defconfig b/openpower/configs/zz_defconfig
index 1cee3b4..e0f4d55 100644
--- a/openpower/configs/zz_defconfig
+++ b/openpower/configs/zz_defconfig
@@ -48,8 +48,6 @@
 # BR2_BUILD_PNOR_SQUASHFS is not set
 BR2_PACKAGE_PETITBOOT=y
 BR2_PACKAGE_PETITBOOT_MTD=y
-# BR2_PACKAGE_HOST_P8_PORE_BINUTILS is not set
-# BR2_PACKAGE_OCC is not set
 # BR2_PACKAGE_HCODE is not set
 # BR2_PACKAGE_CAPP_UCODE is not set
 BR2_PACKAGE_LOADKEYS=y
diff --git a/openpower/package/Config.in b/openpower/package/Config.in
index eb685db..6e3fc97 100755
--- a/openpower/package/Config.in
+++ b/openpower/package/Config.in
@@ -1,5 +1,6 @@
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/openpower-ffs/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/hostboot/Config.in"
+source "$BR2_EXTERNAL_OP_BUILD_PATH/package/hostboot-p8/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/hostboot-binaries/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/openpower-mrw/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/common-p8-xml/Config.in"
@@ -7,8 +8,9 @@
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/openpower-pnor/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/petitboot/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/p8-pore-binutils/Config.in"
-source "$BR2_EXTERNAL_OP_BUILD_PATH/package/occ/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/hcode/Config.in"
+source "$BR2_EXTERNAL_OP_BUILD_PATH/package/occ/Config.in"
+source "$BR2_EXTERNAL_OP_BUILD_PATH/package/occ-p8/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/capp-ucode/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/skiboot/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/libflash/Config.in"
diff --git a/openpower/package/common-p8-xml/Config.in b/openpower/package/common-p8-xml/Config.in
index 2c01702..560c1d6 100644
--- a/openpower/package/common-p8-xml/Config.in
+++ b/openpower/package/common-p8-xml/Config.in
@@ -1,4 +1,4 @@
 config BR2_PACKAGE_COMMON_P8_XML
         bool "Common P8 XML files"
-        default y if BR2_PACKAGE_HOSTBOOT
+        default y if BR2_PACKAGE_HOSTBOOT_P8
         select BR2_PACKAGE_OPENPOWER_MRW
diff --git a/openpower/package/hcode/Config.in b/openpower/package/hcode/Config.in
index c64e36d..8dd7451 100644
--- a/openpower/package/hcode/Config.in
+++ b/openpower/package/hcode/Config.in
@@ -5,9 +5,38 @@
         help
             Project to build the hcode firmware codebase
 
+if BR2_PACKAGE_HCODE
+
 config BR2_HCODE_INCLUDE_IONV
         bool "Enables packaging of the NVIDIA GPU image into the final hw image"
         default y
         help
             Boolean used to flag whether to include NVIDIA GPU binary
 
+choice
+	prompt "HCODE version"
+	default BR2_HCODE_OP920_VERSION
+
+config BR2_HCODE_OP920_VERSION
+	bool "Use latest HCODE stable version (OP920)"
+
+config BR2_HCODE_LATEST_VERSION
+	bool "Use latest HCODE master"
+
+config BR2_HCODE_CUSTOM_VERSION
+	bool "Custom HCODE version"
+
+endchoice
+
+config BR2_HCODE_CUSTOM_VERSION_VALUE
+	string "HCODE version"
+	depends on BR2_HCODE_CUSTOM_VERSION
+
+config BR2_HCODE_VERSION
+	string
+	default "1b068da5e7532c03b43daea4dc268e7de9cd650d" if BR2_HCODE_LATEST_VERSION
+	default "a3a060cd02c7ecab9abc660afc7f403d6aa54f7e" if BR2_HCODE_OP920_VERSION
+	default BR2_HCODE_CUSTOM_VERSION_VALUE \
+		if BR2_HCODE_CUSTOM_VERSION
+
+endif
diff --git a/openpower/package/hcode/hcode.mk b/openpower/package/hcode/hcode.mk
index 99816a3..f35a363 100644
--- a/openpower/package/hcode/hcode.mk
+++ b/openpower/package/hcode/hcode.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HCODE_VERSION ?= 1b068da5e7532c03b43daea4dc268e7de9cd650d
+HCODE_VERSION = $(call qstrip,$(BR2_HCODE_VERSION))
 HCODE_SITE = $(call github,open-power,hcode,$(HCODE_VERSION))
 
 HCODE_LICENSE = Apache-2.0
diff --git a/openpower/package/hostboot-binaries/Config.in b/openpower/package/hostboot-binaries/Config.in
index 4c3e770..74d0a8f 100644
--- a/openpower/package/hostboot-binaries/Config.in
+++ b/openpower/package/hostboot-binaries/Config.in
@@ -3,3 +3,33 @@
         default y if (BR2_OPENPOWER_PLATFORM)
         help
             Project to stage hostboot binary images
+
+if BR2_PACKAGE_HOSTBOOT_BINARIES
+
+choice
+	prompt "Hostboot-binaries version"
+	default BR2_HOSTBOOT_BINARIES_OP920_VERSION
+
+config BR2_HOSTBOOT_BINARIES_OP920_VERSION
+	bool "Use latest HOSTBOOT_BINARIES stable version (OP920)"
+
+config BR2_HOSTBOOT_BINARIES_LATEST_VERSION
+	bool "Use latest HOSTBOOT_BINARIES master"
+
+config BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION
+	bool "Custom HOSTBOOT_BINARIES version"
+
+endchoice
+
+config BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION_VALUE
+	string "HOSTBOOT_BINARIES version"
+	depends on BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION
+
+config BR2_HOSTBOOT_BINARIES_VERSION
+	string
+	default "148fbe195c171dc05a823ea05e82d1bd01bdabaa" if BR2_HOSTBOOT_BINARIES_LATEST_VERSION
+	default "49ecf5277a53fd8be2bb8b89eef6f1b0000ca742" if BR2_HOSTBOOT_BINARIES_OP920_VERSION
+	default BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION_VALUE \
+		if BR2_HOSTBOOT_BINARIES_CUSTOM_VERSION
+
+endif
diff --git a/openpower/package/hostboot-binaries/hostboot_binaries.mk b/openpower/package/hostboot-binaries/hostboot_binaries.mk
index 3fa1ecd..aefe480 100644
--- a/openpower/package/hostboot-binaries/hostboot_binaries.mk
+++ b/openpower/package/hostboot-binaries/hostboot_binaries.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 
-HOSTBOOT_BINARIES_VERSION ?= 148fbe195c171dc05a823ea05e82d1bd01bdabaa
+HOSTBOOT_BINARIES_VERSION = $(call qstrip,$(BR2_HOSTBOOT_BINARIES_VERSION))
 HOSTBOOT_BINARIES_SITE ?= $(call github,open-power,hostboot-binaries,$(HOSTBOOT_BINARIES_VERSION))
 
 HOSTBOOT_BINARIES_LICENSE = Apache-2.0
diff --git a/openpower/package/hostboot/p8Patches/hostboot-0001-Increase-uart-delay.patch b/openpower/package/hostboot-p8/0001-Increase-uart-delay.patch
similarity index 100%
rename from openpower/package/hostboot/p8Patches/hostboot-0001-Increase-uart-delay.patch
rename to openpower/package/hostboot-p8/0001-Increase-uart-delay.patch
diff --git a/openpower/package/hostboot/p8Patches/hostboot-0002-GCC-4.9-Make-compiler-use-ELFv1-ABI.patch b/openpower/package/hostboot-p8/0002-GCC-4.9-Make-compiler-use-ELFv1-ABI.patch
similarity index 100%
rename from openpower/package/hostboot/p8Patches/hostboot-0002-GCC-4.9-Make-compiler-use-ELFv1-ABI.patch
rename to openpower/package/hostboot-p8/0002-GCC-4.9-Make-compiler-use-ELFv1-ABI.patch
diff --git a/openpower/package/hostboot/p8Patches/hostboot-0003-Default-to-std-gnu-03.patch b/openpower/package/hostboot-p8/0003-Default-to-std-gnu-03.patch
similarity index 100%
rename from openpower/package/hostboot/p8Patches/hostboot-0003-Default-to-std-gnu-03.patch
rename to openpower/package/hostboot-p8/0003-Default-to-std-gnu-03.patch
diff --git a/openpower/package/hostboot/p8Patches/hostboot-0004-fix-build-error-return-statement-with-a-value-in-fun.patch b/openpower/package/hostboot-p8/0004-fix-build-error-return-statement-with-a-value-in-fun.patch
similarity index 100%
rename from openpower/package/hostboot/p8Patches/hostboot-0004-fix-build-error-return-statement-with-a-value-in-fun.patch
rename to openpower/package/hostboot-p8/0004-fix-build-error-return-statement-with-a-value-in-fun.patch
diff --git a/openpower/package/hostboot/p8Patches/hostboot-0005-error-dereferencing-type-punned-pointer-will-break-s.patch b/openpower/package/hostboot-p8/0005-error-dereferencing-type-punned-pointer-will-break-s.patch
similarity index 100%
rename from openpower/package/hostboot/p8Patches/hostboot-0005-error-dereferencing-type-punned-pointer-will-break-s.patch
rename to openpower/package/hostboot-p8/0005-error-dereferencing-type-punned-pointer-will-break-s.patch
diff --git a/openpower/package/hostboot/p8Patches/hostboot-0006-Change-cv_forcedMemPeriodic-to-uint8_t-as-bool-is-in.patch b/openpower/package/hostboot-p8/0006-Change-cv_forcedMemPeriodic-to-uint8_t-as-bool-is-in.patch
similarity index 100%
rename from openpower/package/hostboot/p8Patches/hostboot-0006-Change-cv_forcedMemPeriodic-to-uint8_t-as-bool-is-in.patch
rename to openpower/package/hostboot-p8/0006-Change-cv_forcedMemPeriodic-to-uint8_t-as-bool-is-in.patch
diff --git a/openpower/package/hostboot/p8Patches/hostboot-0007-error-the-compiler-can-assume-that-the-address-of-r-.patch b/openpower/package/hostboot-p8/0007-error-the-compiler-can-assume-that-the-address-of-r-.patch
similarity index 100%
rename from openpower/package/hostboot/p8Patches/hostboot-0007-error-the-compiler-can-assume-that-the-address-of-r-.patch
rename to openpower/package/hostboot-p8/0007-error-the-compiler-can-assume-that-the-address-of-r-.patch
diff --git a/openpower/package/hostboot/p8Patches/hostboot-0008-Fix-compiler-can-assume-address-will-never-be-NULL-e.patch b/openpower/package/hostboot-p8/0008-Fix-compiler-can-assume-address-will-never-be-NULL-e.patch
similarity index 100%
rename from openpower/package/hostboot/p8Patches/hostboot-0008-Fix-compiler-can-assume-address-will-never-be-NULL-e.patch
rename to openpower/package/hostboot-p8/0008-Fix-compiler-can-assume-address-will-never-be-NULL-e.patch
diff --git a/openpower/package/hostboot/p8Patches/hostboot-0009-error-in-C-98-l_vmVersionBuf-must-be-initialized-by-.patch b/openpower/package/hostboot-p8/0009-error-in-C-98-l_vmVersionBuf-must-be-initialized-by-.patch
similarity index 100%
rename from openpower/package/hostboot/p8Patches/hostboot-0009-error-in-C-98-l_vmVersionBuf-must-be-initialized-by-.patch
rename to openpower/package/hostboot-p8/0009-error-in-C-98-l_vmVersionBuf-must-be-initialized-by-.patch
diff --git a/openpower/package/hostboot/p8Patches/hostboot-0010-Use-std-gnu-03-for-host-g-invocations.patch b/openpower/package/hostboot-p8/0010-Use-std-gnu-03-for-host-g-invocations.patch
similarity index 100%
rename from openpower/package/hostboot/p8Patches/hostboot-0010-Use-std-gnu-03-for-host-g-invocations.patch
rename to openpower/package/hostboot-p8/0010-Use-std-gnu-03-for-host-g-invocations.patch
diff --git a/openpower/package/hostboot/p8Patches/hostboot-0012-kernel-Update-assembly-for-modern-binutils.patch b/openpower/package/hostboot-p8/0012-kernel-Update-assembly-for-modern-binutils.patch
similarity index 100%
rename from openpower/package/hostboot/p8Patches/hostboot-0012-kernel-Update-assembly-for-modern-binutils.patch
rename to openpower/package/hostboot-p8/0012-kernel-Update-assembly-for-modern-binutils.patch
diff --git a/openpower/package/hostboot-p8/Config.in b/openpower/package/hostboot-p8/Config.in
new file mode 100644
index 0000000..4dacfab
--- /dev/null
+++ b/openpower/package/hostboot-p8/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_HOSTBOOT_P8
+        bool "hostboot-p8"
+        default y if (BR2_OPENPOWER_POWER8)
+        select BR2_CPP
+        help
+            Project to build the hostboot firmware codebase
+
+if BR2_PACKAGE_HOSTBOOT_P8
+
+config BR2_HOSTBOOT_P8_CONFIG_FILE
+        string "Hostboot configuration file for compilation"
+        default default
+        help
+            String used to define hw specific make config file
+
+endif
+
diff --git a/openpower/package/hostboot-p8/hostboot-p8.mk b/openpower/package/hostboot-p8/hostboot-p8.mk
new file mode 100644
index 0000000..c50679e
--- /dev/null
+++ b/openpower/package/hostboot-p8/hostboot-p8.mk
@@ -0,0 +1,32 @@
+################################################################################
+#
+# hostboot for POWER8
+#
+################################################################################
+HOSTBOOT_P8_VERSION ?= d3025f5d7ddd0723946bb54fcb471d2bf1fd2da4
+
+HOSTBOOT_P8_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_P8_VERSION))
+
+HOSTBOOT_P8_LICENSE = Apache-2.0
+HOSTBOOT_P8_LICENSE_FILES = LICENSE
+HOSTBOOT_P8_DEPENDENCIES = host-binutils
+
+HOSTBOOT_P8_INSTALL_IMAGES = YES
+HOSTBOOT_P8_INSTALL_TARGET = NO
+
+HOSTBOOT_P8_ENV_VARS=$(TARGET_MAKE_ENV) \
+    CONFIG_FILE=$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/hostboot/$(BR2_HOSTBOOT_P8_CONFIG_FILE) \
+    OPENPOWER_BUILD=1 CROSS_PREFIX=$(TARGET_CROSS) HOST_PREFIX="" HOST_BINUTILS_DIR=$(HOST_BINUTILS_DIR) \
+    HOSTBOOT_P8_VERSION=`cat $(HOSTBOOT_P8_VERSION_FILE)` 
+
+HOSTBOOT_P8_POST_PATCH_HOOKS += HOSTBOOT_P8_APPLY_PATCHES
+
+define HOSTBOOT_P8_BUILD_CMDS
+        $(HOSTBOOT_P8_ENV_VARS) bash -c 'cd $(@D) && source ./env.bash && $(MAKE)'
+endef
+
+define HOSTBOOT_P8_INSTALL_IMAGES_CMDS
+        cd $(@D) && source ./env.bash && $(@D)/src/build/tools/hbDistribute --openpower $(STAGING_DIR)/hostboot_build_images/
+endef
+
+$(eval $(generic-package))
diff --git a/openpower/package/hostboot/p9Patches/hostboot-0007-Disable-warnings-that-crop-up-a-lot-with-GCC6.patch b/openpower/package/hostboot/0007-Disable-warnings-that-crop-up-a-lot-with-GCC6.patch
similarity index 100%
rename from openpower/package/hostboot/p9Patches/hostboot-0007-Disable-warnings-that-crop-up-a-lot-with-GCC6.patch
rename to openpower/package/hostboot/0007-Disable-warnings-that-crop-up-a-lot-with-GCC6.patch
diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in
index d864c49..d7a11eb 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -1,13 +1,43 @@
 config BR2_PACKAGE_HOSTBOOT
         bool "hostboot"
-        default y if (BR2_OPENPOWER_PLATFORM)
+        default y if (BR2_OPENPOWER_POWER9)
         select BR2_CPP
         help
             Project to build the hostboot firmware codebase
 
+if BR2_PACKAGE_HOSTBOOT
+
+choice
+	prompt "Hostboot version"
+	default BR2_HOSTBOOT_OP920_VERSION
+
+config BR2_HOSTBOOT_OP920_VERSION
+	bool "Use latest Hostboot stable version (OP920)"
+
+config BR2_HOSTBOOT_LATEST_VERSION
+	bool "Use latest Hostboot master"
+
+config BR2_HOSTBOOT_CUSTOM_VERSION
+	bool "Custom version"
+
+endchoice
+
+config BR2_HOSTBOOT_CUSTOM_VERSION_VALUE
+	string "hostboot version"
+	depends on BR2_HOSTBOOT_CUSTOM_VERSION
+
+config BR2_HOSTBOOT_VERSION
+	string
+	default "c38615a583b7f19c0ae6a5a152b575fe61ff3d2a" if BR2_HOSTBOOT_LATEST_VERSION
+	default "c78530bd29942282e2345295af1f157f0a8eefd7" if BR2_HOSTBOOT_OP920_VERSION
+	default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \
+		if BR2_HOSTBOOT_CUSTOM_VERSION
 
 config BR2_HOSTBOOT_CONFIG_FILE
         string "Hostboot configuration file for compilation"
         default default
         help
             String used to define hw specific make config file
+
+endif
+
diff --git a/openpower/package/hostboot/p9Patches/hostboot-0002-Revert-Mark-Read-Only-Partitions-as-Such.patch b/openpower/package/hostboot/hostboot-0002-Revert-Mark-Read-Only-Partitions-as-Such.patch
similarity index 100%
rename from openpower/package/hostboot/p9Patches/hostboot-0002-Revert-Mark-Read-Only-Partitions-as-Such.patch
rename to openpower/package/hostboot/hostboot-0002-Revert-Mark-Read-Only-Partitions-as-Such.patch
diff --git a/openpower/package/hostboot/p9Patches/hostboot-1020-Revert-jgr17071200-Removed-pdwn-settings.patch b/openpower/package/hostboot/hostboot-1020-Revert-jgr17071200-Removed-pdwn-settings.patch
similarity index 100%
rename from openpower/package/hostboot/p9Patches/hostboot-1020-Revert-jgr17071200-Removed-pdwn-settings.patch
rename to openpower/package/hostboot/hostboot-1020-Revert-jgr17071200-Removed-pdwn-settings.patch
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index c4b907f..1bfe016 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -1,12 +1,10 @@
 ################################################################################
 #
-# hostboot
+# hostboot for POWER9
 #
 ################################################################################
-HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= d3025f5d7ddd0723946bb54fcb471d2bf1fd2da4
-HOSTBOOT_VERSION_BRANCH_MASTER ?= c38615a583b7f19c0ae6a5a152b575fe61ff3d2a
 
-HOSTBOOT_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(HOSTBOOT_VERSION_BRANCH_MASTER),$(HOSTBOOT_VERSION_BRANCH_MASTER_P8))
+HOSTBOOT_VERSION = $(call qstrip,$(BR2_HOSTBOOT_VERSION))
 HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION))
 
 HOSTBOOT_LICENSE = Apache-2.0
@@ -21,23 +19,6 @@
     OPENPOWER_BUILD=1 CROSS_PREFIX=$(TARGET_CROSS) HOST_PREFIX="" HOST_BINUTILS_DIR=$(HOST_BINUTILS_DIR) \
     HOSTBOOT_VERSION=`cat $(HOSTBOOT_VERSION_FILE)`
 
-define HOSTBOOT_APPLY_PATCHES
-       if [ "$(BR2_OPENPOWER_POWER9)" == "y" ]; then \
-           $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL_OP_BUILD_PATH)/package/hostboot/p9Patches \*.patch; \
-           if [ -d $(BR2_EXTERNAL_OP_BUILD_PATH)/custom/patches/hostboot/p9Patches ]; then \
-               $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL_OP_BUILD_PATH)/custom/patches/hostboot/p9Patches \*.patch; \
-           fi; \
-       fi; \
-       if [ "$(BR2_OPENPOWER_POWER8)" == "y" ]; then \
-           $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL_OP_BUILD_PATH)/package/hostboot/p8Patches \*.patch; \
-           if [ -d $(BR2_EXTERNAL_OP_BUILD_PATH)/custom/patches/hostboot/p8Patches ]; then \
-               $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL_OP_BUILD_PATH)/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)'
 endef
diff --git a/openpower/package/machine-xml/Config.in b/openpower/package/machine-xml/Config.in
index 3f2163f..5fcf37a 100755
--- a/openpower/package/machine-xml/Config.in
+++ b/openpower/package/machine-xml/Config.in
@@ -1,3 +1,5 @@
+menu "Machine XML (MRW)"
+
 config BR2_PACKAGE_MACHINE_XML
         bool "machine_xml"
         default y if (BR2_OPENPOWER_PLATFORM)
@@ -61,3 +63,5 @@
         default ""
         help
             Defines the name of the BIOS XML filename to parse when generating BIOS metadata
+
+endmenu
diff --git a/openpower/package/machine-xml/machine-xml.mk b/openpower/package/machine-xml/machine-xml.mk
index e335e8b..dc05d0d 100644
--- a/openpower/package/machine-xml/machine-xml.mk
+++ b/openpower/package/machine-xml/machine-xml.mk
@@ -13,7 +13,14 @@
 
 MACHINE_XML_LICENSE = Apache-2.0
 MACHINE_XML_LICENSE_FILES = LICENSE
-MACHINE_XML_DEPENDENCIES = hostboot openpower-mrw common-p8-xml
+MACHINE_XML_DEPENDENCIES = openpower-mrw common-p8-xml
+
+ifeq ($(BR2_OPENPOWER_POWER9),y)
+MACHINE_XML_DEPENDENCIES += hostboot
+endif
+ifeq ($(BR2_OPENPOWER_POWER8),y)
+MACHINE_XML_DEPENDENCIES += hostboot-p8
+endif
 
 MACHINE_XML_INSTALL_IMAGES = YES
 MACHINE_XML_INSTALL_TARGET = YES
diff --git a/openpower/package/occ-p8/Config.in b/openpower/package/occ-p8/Config.in
new file mode 100644
index 0000000..0137e94
--- /dev/null
+++ b/openpower/package/occ-p8/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_OCC_P8
+        bool "OCC for P8"
+        default y if (BR2_OPENPOWER_PLATFORM && BR2_OPENPOWER_POWER8)
+        select BR2_CPP
+        help
+            Project to build OCC
+
+if BR2_PACKAGE_OCC_P8
+
+config BR2_OCC_P8_BIN_FILENAME
+        string "Name of OCC P8 image file"
+	default "occ.bin"
+        help
+            String used to define name of the OCC binary image file
+
+endif
diff --git a/openpower/package/occ-p8/occ-p8.mk b/openpower/package/occ-p8/occ-p8.mk
new file mode 100644
index 0000000..7f64e59
--- /dev/null
+++ b/openpower/package/occ-p8/occ-p8.mk
@@ -0,0 +1,35 @@
+################################################################################
+#
+# occ for power8
+#
+################################################################################
+
+OCC_P8_VERSION ?= 28f2cec690b7f19548ce860a8820f519e6c39a6a
+OCC_P8_SITE ?= $(call github,open-power,occ,$(OCC_P8_VERSION))
+OCC_P8_LICENSE = Apache-2.0
+
+OCC_P8_LICENSE_FILES = src/LICENSE
+
+OCC_P8_INSTALL_IMAGES = YES
+OCC_P8_INSTALL_TARGET = NO
+
+OCC_P8_STAGING_DIR = $(STAGING_DIR)/occ
+
+OCC_P8_IMAGE_BIN_PATH = src/image.bin
+OCC_P8_DEPENDENCIES = host-binutils host-p8-pore-binutils
+
+define OCC_P8_BUILD_CMDS
+        cd $(@D)/src && \
+        make POREPATH=$(P8_PORE_BINUTILS_BIN)/bin/ OCC_OP_BUILD=1 CROSS_PREFIX=$(TARGET_CROSS) all && \
+        make tracehash && \
+        make combineImage
+endef
+
+OCC_P8_BUILD_CMDS ?= $(OCC_P8_BUILD_CMDS_P8)
+
+define OCC_P8_INSTALL_IMAGES_CMDS
+       mkdir -p $(STAGING_DIR)/occ
+       cp $(@D)/$(OCC_P8_IMAGE_BIN_PATH) $(OCC_P8_STAGING_DIR)/$(BR2_OCC_P8_BIN_FILENAME)
+endef
+
+$(eval $(generic-package))
diff --git a/openpower/package/occ/Config.in b/openpower/package/occ/Config.in
index 1d77dff..aa363ee 100644
--- a/openpower/package/occ/Config.in
+++ b/openpower/package/occ/Config.in
@@ -1,18 +1,22 @@
 config BR2_PACKAGE_OCC
-        bool "occ"
-        default y if (BR2_OPENPOWER_PLATFORM)
+        bool "OCC (POWER9)"
+        default y if (BR2_OPENPOWER_PLATFORM && BR2_OPENPOWER_POWER9)
         select BR2_CPP
         help
             Project to build OCC
 
+if BR2_PACKAGE_OCC
+
 config BR2_OCC_BIN_FILENAME
-        string "Name of OCC image file"
+        string "Name of OCC P9 image file"
+	default "occ.bin"
         help
             String used to define name of the OCC binary image file
 
 config BR2_OCC_GPU_BIN_BUILD
         bool "Enables Compilation of GPU Binary Image"
         default n
+        select BR2_PACKAGE_HOSTBOOT_BINARIES
         help
             Boolean used to flag whether to compile OCC GPU binary
 
@@ -21,3 +25,31 @@
         help
             String used to define name of the OCC GPUE GPE binary image file
 
+choice
+	prompt "OCC version"
+	default BR2_OCC_OP920_VERSION
+
+config BR2_OCC_OP920_VERSION
+	bool "Use latest OCC stable version (OP920)"
+
+config BR2_OCC_LATEST_VERSION
+	bool "Use latest OCC master"
+
+config BR2_OCC_CUSTOM_VERSION
+	bool "Custom OCC version"
+
+endchoice
+
+config BR2_OCC_CUSTOM_VERSION_VALUE
+	string "OCC version"
+	depends on BR2_OCC_CUSTOM_VERSION
+
+config BR2_OCC_VERSION
+	string
+	default "cd30b100eee09956a27b69f7893349451400e5ba" if BR2_OCC_LATEST_VERSION
+	default "cd30b100eee09956a27b69f7893349451400e5ba" if BR2_OCC_OP920_VERSION
+	default BR2_OCC_CUSTOM_VERSION_VALUE \
+		if BR2_OCC_CUSTOM_VERSION
+
+endif
+
diff --git a/openpower/package/occ/occ.mk b/openpower/package/occ/occ.mk
index 83f7705..39ad15e 100644
--- a/openpower/package/occ/occ.mk
+++ b/openpower/package/occ/occ.mk
@@ -1,55 +1,29 @@
 ################################################################################
 #
-# occ
+# occ for POWER9
 #
 ################################################################################
 
-OCC_VERSION_BRANCH_MASTER_P8 ?= 28f2cec690b7f19548ce860a8820f519e6c39a6a
-OCC_VERSION_BRANCH_MASTER ?= cd30b100eee09956a27b69f7893349451400e5ba
+OCC_VERSION = $(call qstrip,$(BR2_OCC_VERSION))
+OCC_SITE = $(call github,open-power,occ,$(OCC_VERSION))
 
-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_LICENSE_FILES_P8 = src/LICENSE
-OCC_LICENSE_FILES_P9 = LICENSE
-OCC_LICENSE_FILES ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_LICENSE_FILES_P9),$(OCC_LICENSE_FILES_P8))
+OCC_LICENSE_FILES = LICENSE
 
 OCC_INSTALL_IMAGES = YES
 OCC_INSTALL_TARGET = NO
 
 OCC_STAGING_DIR = $(STAGING_DIR)/occ
 
-OCC_IMAGE_BIN_PATH = $(if $(BR2_OPENPOWER_POWER9),obj/image.bin,src/image.bin)
+OCC_IMAGE_BIN_PATH = obj/image.bin
 
-OCC_DEPENDENCIES_P8 = host-binutils host-p8-pore-binutils
-OCC_DEPENDENCIES_P9 = host-binutils host-ppe42-gcc hostboot-binaries
-OCC_DEPENDENCIES ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_DEPENDENCIES_P9),$(OCC_DEPENDENCIES_P8))
+OCC_DEPENDENCIES = host-binutils host-ppe42-gcc
+ifeq ($(BR2_OCC_GPU_BIN_BUILD),y)
+	OCC_DEPENDENCIES += hostboot-binaries
+endif
 
-define OCC_APPLY_PATCHES
-       if [ "$(BR2_OPENPOWER_POWER9)" == "y" ]; then \
-           $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL_OP_BUILD_PATH)/package/occ/p9Patches \*.patch; \
-           if [ -d $(BR2_EXTERNAL_OP_BUILD_PATH)/custom/patches/occ/p9Patches ]; then \
-               $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL_OP_BUILD_PATH)/custom/patches/occ/p9Patches \*.patch; \
-           fi; \
-       fi; \
-       if [ "$(BR2_OPENPOWER_POWER8)" == "y" ]; then \
-           $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL_OP_BUILD_PATH)/package/occ/p8Patches \*.patch; \
-           if [ -d $(BR2_EXTERNAL_OP_BUILD_PATH)/custom/patches/occ/p8Patches ]; then \
-               $(APPLY_PATCHES) $(@D) $(BR2_EXTERNAL_OP_BUILD_PATH)/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
+define OCC_BUILD_CMDS
 	if [ "$(BR2_OCC_GPU_BIN_BUILD)" == "y"  ]; then \
 	    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 GPE1_BIN_IMAGE_PATH=$(STAGING_DIR)/hostboot_binaries/ OPOCC_GPU_SUPPORT=1 all; \
@@ -58,7 +32,7 @@
             make PPE_TOOL_PATH=$(PPE42_GCC_BIN) OCC_OP_BUILD=1 CROSS_PREFIX=$(TARGET_CROSS) LD_LIBRARY_PATH=$(HOST_DIR)/usr/lib all; \
 	fi;
 endef
-OCC_BUILD_CMDS ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_BUILD_CMDS_P9),$(OCC_BUILD_CMDS_P8))
+OCC_BUILD_CMDS ?= $(OCC_BUILD_CMDS_P9)
 
 define OCC_INSTALL_IMAGES_CMDS
        mkdir -p $(STAGING_DIR)/occ
diff --git a/openpower/package/occ/p9Patches/0001-Use-gnu89-as-C-std.patch b/openpower/package/occ/p9Patches/0001-Use-gnu89-as-C-std.patch
deleted file mode 100644
index 2f59d83..0000000
--- a/openpower/package/occ/p9Patches/0001-Use-gnu89-as-C-std.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 52c55ef2370b22d0f9b78e5d975b3c8b2b915d34 Mon Sep 17 00:00:00 2001
-From: Stewart Smith <stewart@linux.vnet.ibm.com>
-Date: Thu, 2 Mar 2017 17:13:22 +1100
-Subject: [PATCH] Use gnu89 as C std
-
-Change-Id: I1953f9762f6e3c0f1b8005977de69802f0e11934
-Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
----
- src/occBootLoader/img_defs.mk | 2 +-
- src/occ_405/img_defs.mk       | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/occBootLoader/img_defs.mk b/src/occBootLoader/img_defs.mk
-index a53d9db115b3..907c3d5ad353 100644
---- a/src/occBootLoader/img_defs.mk
-+++ b/src/occBootLoader/img_defs.mk
-@@ -226,7 +226,7 @@ PIPE-CFLAGS = -pipe -Wa,-m405
- GCC-CFLAGS += -g -Wall -fsigned-char -msoft-float  \
- 	-m32 -mbig-endian -mcpu=405 -mmultiple -mstring \
- 	-meabi -msdata=eabi -ffreestanding -fno-common \
--	-fno-inline-functions-called-once
-+	-fno-inline-functions-called-once -std=gnu89
- 
- CFLAGS      =  -c $(GCC-CFLAGS) $(PIPE-CFLAGS) $(GCC-O-LEVEL) $(INCLUDES)
- 
-diff --git a/src/occ_405/img_defs.mk b/src/occ_405/img_defs.mk
-index abdef45963e0..9e0f1b91596a 100644
---- a/src/occ_405/img_defs.mk
-+++ b/src/occ_405/img_defs.mk
-@@ -252,7 +252,7 @@ PIPE-CFLAGS = -pipe -Wa,-m405
- GCC-CFLAGS += -g -Wall -fsigned-char -msoft-float  \
- 	-m32 -mbig-endian -mcpu=405 -mmultiple -mstring \
- 	-meabi -msdata=eabi -ffreestanding -fno-common \
--	-fno-inline-functions-called-once
-+	-fno-inline-functions-called-once -std=gnu89
- 
- CFLAGS      =  -c $(GCC-CFLAGS) $(PIPE-CFLAGS) $(GCC-O-LEVEL) $(INCLUDES)
- 
--- 
-2.9.3
-
diff --git a/openpower/package/openpower-mrw/Config.in b/openpower/package/openpower-mrw/Config.in
index 633e166..9e3b355 100644
--- a/openpower/package/openpower-mrw/Config.in
+++ b/openpower/package/openpower-mrw/Config.in
@@ -1,3 +1,3 @@
 config BR2_PACKAGE_OPENPOWER_MRW
         bool "Machine Readable Workbook (MRW) infrastructure"
-        default y if BR2_PACKAGE_HOSTBOOT
+        default y if (BR2_PACKAGE_HOSTBOOT_P8 || BR2_PACKAGE_HOSTBOOT_P9)
diff --git a/openpower/package/openpower-pnor/Config.in b/openpower/package/openpower-pnor/Config.in
index 1c43735..92adf36 100644
--- a/openpower/package/openpower-pnor/Config.in
+++ b/openpower/package/openpower-pnor/Config.in
@@ -1,11 +1,13 @@
 config BR2_PACKAGE_OPENPOWER_PNOR
         bool "openpower_pnor"
         default y if (BR2_OPENPOWER_PLATFORM)
-        select BR2_PACKAGE_HOSTBOOT
+        select BR2_PACKAGE_HOSTBOOT if !BR2_OPENPOWER_POWER8
+        select BR2_PACKAGE_HOSTBOOT_P8 if BR2_OPENPOWER_POWER8
         select BR2_PACKAGE_HOSTBOOT_BINARIES
         select BR2_PACKAGE_SKIBOOT
         select BR2_PACKAGE_OPENPOWER_FFS
-        select BR2_PACKAGE_OCC
+        select BR2_PACKAGE_OCC if !BR2_OPENPOWER_POWER8
+        select BR2_PACKAGE_OCC_P8 if BR2_OPENPOWER_POWER8
         select BR2_PACKAGE_CAPP_UCODE
         select BR2_PACKAGE_IMA_CATALOG
         select BR2_PACKAGE_HOST_OPENPOWER_VPNOR
@@ -14,6 +16,8 @@
         help
             Utilites for building a targeting binary image
 
+menu "OpenPOWER PNOR assembly options"
+
 choice
     prompt "Secure Boot key transition type"
     default BR2_OPENPOWER_SECUREBOOT_NO_KEY_TRANSITION
@@ -157,3 +161,5 @@
 config BR2_BUILD_PNOR_SQUASHFS
         bool "Create a virtual PNOR image along with the standard image"
         default y
+
+endmenu
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 4591d6f..cdbd5aa 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -9,7 +9,7 @@
 
 OPENPOWER_PNOR_LICENSE = Apache-2.0
 OPENPOWER_PNOR_LICENSE_FILES = LICENSE
-OPENPOWER_PNOR_DEPENDENCIES = hostboot hostboot-binaries machine-xml skiboot host-openpower-ffs occ capp-ucode
+OPENPOWER_PNOR_DEPENDENCIES = hostboot-binaries machine-xml skiboot host-openpower-ffs capp-ucode
 
 ifeq ($(BR2_OPENPOWER_POWER9),y)
 OPENPOWER_PNOR_DEPENDENCIES += hcode
@@ -82,7 +82,14 @@
 
 
 # Subpackages we want to include in the version info (do not include openpower-pnor)
-OPENPOWER_VERSIONED_SUBPACKAGES = skiboot hostboot linux petitboot machine-xml occ hostboot-binaries capp-ucode
+OPENPOWER_VERSIONED_SUBPACKAGES = skiboot
+ifeq ($(BR2_PACKAGE_HOSTBOOT_P8),y)
+OPENPOWER_VERSIONED_SUBPACKAGES += hostboot-p8 occ-p8
+endif
+ifeq ($(BR2_PACKAGE_HOSTBOOT),y)
+OPENPOWER_VERSIONED_SUBPACKAGES += hostboot occ
+endif
+OPENPOWER_VERSIONED_SUBPACKAGES += linux petitboot machine-xml hostboot-binaries capp-ucode
 OPENPOWER_PNOR = openpower-pnor
 
 ifeq ($(BR2_OPENPOWER_POWER9),y)
@@ -90,6 +97,12 @@
     OPENPOWER_VERSIONED_SUBPACKAGES += sbe hcode
 endif
 
+ifeq ($(BR2_PACKAGE_OCC_P8),y)
+    OCC_BIN_FILENAME=$(BR2_OCC_P8_BIN_FILENAME)
+else
+    OCC_BIN_FILENAME=$(BR2_OCC_BIN_FILENAME)
+endif
+
 define OPENPOWER_PNOR_INSTALL_IMAGES_CMDS
         mkdir -p $(OPENPOWER_PNOR_SCRATCH_DIR)
 
@@ -106,7 +119,7 @@
             -sbe_binary_dir $(SBE_BINARY_DIR) \
             -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) \
+            -occ_binary_filename $(OCC_STAGING_DIR)/$(OCC_BIN_FILENAME) \
             -capp_binary_filename $(BINARIES_DIR)/$(BR2_CAPP_UCODE_BIN_FILENAME) \
             -ima_catalog_binary_filename $(BINARIES_DIR)/$(BR2_IMA_CATALOG_FILENAME) \
             -openpower_version_filename $(OPENPOWER_PNOR_VERSION_FILE) \
@@ -132,7 +145,7 @@
             -sbe_binary_filename $(BR2_HOSTBOOT_BINARY_SBE_FILENAME) \
             -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) \
+            -occ_binary_filename $(OCC_STAGING_DIR)/$(OCC_BIN_FILENAME) \
             -targeting_binary_filename $(BR2_OPENPOWER_TARGETING_ECC_FILENAME) \
             -wofdata_binary_filename $(OPENPOWER_PNOR_SCRATCH_DIR)/$(BR2_WOFDATA_BINARY_FILENAME) \
             -memddata_binary_filename $(OPENPOWER_PNOR_SCRATCH_DIR)/$(BR2_MEMDDATA_BINARY_FILENAME) \
diff --git a/openpower/package/p8-pore-binutils/Config.in b/openpower/package/p8-pore-binutils/Config.in
index f8d4bf0..a29397a 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)
+        default y if (BR2_OPENPOWER_POWER8)
         select BR2_CPP
         help
             Project to build the P8 PORE binutils
diff --git a/openpower/package/sbe/Config.in b/openpower/package/sbe/Config.in
index c512bbb..67a5135 100644
--- a/openpower/package/sbe/Config.in
+++ b/openpower/package/sbe/Config.in
@@ -5,3 +5,33 @@
         depends on BR2_PACKAGE_HCODE
         help
             Project to build the sbe firmware codebase
+
+if BR2_PACKAGE_SBE
+
+choice
+	prompt "SBE version"
+	default BR2_SBE_OP920_VERSION
+
+config BR2_SBE_OP920_VERSION
+	bool "Use latest SBE stable version (OP920)"
+
+config BR2_SBE_LATEST_VERSION
+	bool "Use latest SBE master"
+
+config BR2_SBE_CUSTOM_VERSION
+	bool "Custom SBE version"
+
+endchoice
+
+config BR2_SBE_CUSTOM_VERSION_VALUE
+	string "SBE version"
+	depends on BR2_SBE_CUSTOM_VERSION
+
+config BR2_SBE_VERSION
+	string
+	default "a389a5d98c2ab38292ce7451c210b3cb0293938c" if BR2_SBE_LATEST_VERSION
+	default "26a37e4d6c82743232c9e06767a223fcaf4f5555" if BR2_SBE_OP920_VERSION
+	default BR2_SBE_CUSTOM_VERSION_VALUE \
+		if BR2_SBE_CUSTOM_VERSION
+
+endif
diff --git a/openpower/package/sbe/sbe.mk b/openpower/package/sbe/sbe.mk
index 7509881..0cc1942 100644
--- a/openpower/package/sbe/sbe.mk
+++ b/openpower/package/sbe/sbe.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-SBE_VERSION ?= a389a5d98c2ab38292ce7451c210b3cb0293938c
-SBE_SITE ?= $(call github,open-power,sbe,$(SBE_VERSION))
+SBE_VERSION = $(call qstrip,$(BR2_SBE_VERSION))
+SBE_SITE = $(call github,open-power,sbe,$(SBE_VERSION))
 
 SBE_LICENSE = Apache-2.0
 SBE_DEPENDENCIES = host-ppe42-gcc hcode