Merge pull request #711 from shenki/bnx2x
firmware-whitelist: Whitelist explict bnx2x firmware
diff --git a/openpower/configs/barreleye_defconfig b/openpower/configs/barreleye_defconfig
index 1d76ffe..2361c34 100644
--- a/openpower/configs/barreleye_defconfig
+++ b/openpower/configs/barreleye_defconfig
@@ -15,7 +15,7 @@
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.24"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.27"
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"
diff --git a/openpower/configs/firenze_defconfig b/openpower/configs/firenze_defconfig
index 5024b40..7e2a850 100644
--- a/openpower/configs/firenze_defconfig
+++ b/openpower/configs/firenze_defconfig
@@ -15,7 +15,7 @@
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.24"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.27"
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"
diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig
index 78fbdaa..97ebbc5 100644
--- a/openpower/configs/firestone_defconfig
+++ b/openpower/configs/firestone_defconfig
@@ -15,7 +15,7 @@
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.24"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.27"
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"
diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig
index ae894eb..ce5695c 100644
--- a/openpower/configs/garrison_defconfig
+++ b/openpower/configs/garrison_defconfig
@@ -15,7 +15,7 @@
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.24"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.27"
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"
diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig
index 4ebb591..639183a 100644
--- a/openpower/configs/habanero_defconfig
+++ b/openpower/configs/habanero_defconfig
@@ -15,7 +15,7 @@
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.24"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.27"
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"
diff --git a/openpower/configs/hostboot/witherspoon.config b/openpower/configs/hostboot/witherspoon.config
index 01f9587..91e3ba5 100755
--- a/openpower/configs/hostboot/witherspoon.config
+++ b/openpower/configs/hostboot/witherspoon.config
@@ -36,8 +36,8 @@
set PCIE_HOTPLUG_CONTROLLER
# turn on console output
-unset CONSOLE
-unset BMC_AST2400
+set CONSOLE
+set BMC_AST2500
# Enable Kingston dimm voltage workaround
unset KINGSTON_1_35_VOLT
diff --git a/openpower/configs/openpower_mambo_defconfig b/openpower/configs/openpower_mambo_defconfig
index 1dc5b14..c9f9dbe 100644
--- a/openpower/configs/openpower_mambo_defconfig
+++ b/openpower/configs/openpower_mambo_defconfig
@@ -14,7 +14,7 @@
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.24"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.27"
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"
diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig
index 1764787..173d50c 100644
--- a/openpower/configs/palmetto_defconfig
+++ b/openpower/configs/palmetto_defconfig
@@ -14,7 +14,7 @@
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.24"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.27"
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"
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 fba7aea..c95b263 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 4e3853e7c718ebcb2ef4118f2082078f6ee01f7c Mon Sep 17 00:00:00 2001
+From af96227bff765957837f3075ec478418e3dd4fd2 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
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 c39a6a0..6af7e83 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 467166476e10cf9428be4be1a58597eeeeb60810 Mon Sep 17 00:00:00 2001
+From b5ec8892da4b21b58495fce0164016b4b12fb85a 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 575c88d..dca5939 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 eeaa35188dc3a1b59d44ad1f8596160074a765f7 Mon Sep 17 00:00:00 2001
+From 8f4e6ea8812cfc7dfbdfaaf6f9ad264664856b78 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 443286b..a343235 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 984ed87aa4eb894c46ffd6af4174fdf432763bcd Mon Sep 17 00:00:00 2001
+From b815d81e10ca51aa91e6ca2b771afe9d0351669c 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
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 bd6ff96..770b059 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 fc4dab6aa83c38b2d2bc69c965da1128a6eccd28 Mon Sep 17 00:00:00 2001
+From f00bd9648a50f06e77c04a36c4506e36ea0a27e0 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
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 226f70d..7200a24 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 2357f5b53bbaf6a41c40001dccac19143810b4da Mon Sep 17 00:00:00 2001
+From cabcd837a5fd9c508014c909fd118caa441de4fa 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 5366678..9f28758 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 fbcbae65d9d7159fc2057f5df2363bbbee6ef26f Mon Sep 17 00:00:00 2001
+From 23126f5146ee4c38b5b0e0c4b7c1d83b238a6a79 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 0cf9d38..8ec0e8f 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 d9b5f57b4dc56d34c9dc00904b2a33a99be338d0 Mon Sep 17 00:00:00 2001
+From 0fa346c28542289c83318f6c44e31324ed10b7da 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.24-openpower1.patch b/openpower/linux/0009-Release-4.4.27-openpower1.patch
similarity index 70%
rename from openpower/linux/0009-Release-4.4.24-openpower1.patch
rename to openpower/linux/0009-Release-4.4.27-openpower1.patch
index 8452fd3..80b39d5 100644
--- a/openpower/linux/0009-Release-4.4.24-openpower1.patch
+++ b/openpower/linux/0009-Release-4.4.27-openpower1.patch
@@ -1,7 +1,7 @@
-From 66f15d99fc5d6bb115b4b4e4088031d5a8a8bffe Mon Sep 17 00:00:00 2001
+From 227c8220f732948abda6d1af1e5050e0c148cf45 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.24-openpower1
+Subject: [PATCH 9/9] Release 4.4.27-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 cdbc185c3539..29d768f12699 100644
+index b6ee4ce561f8..1a3f055fb912 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 4
PATCHLEVEL = 4
- SUBLEVEL = 24
+ SUBLEVEL = 27
-EXTRAVERSION =
+EXTRAVERSION = -openpower1
NAME = Blurry Fish Butt
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index a294e43..ea37a1e 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -3,8 +3,8 @@
# hostboot
#
################################################################################
-HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= 5669e5b488698fee0fc93ea0a311807123726f65
-HOSTBOOT_VERSION_BRANCH_MASTER ?= 6ac254a49dc82a8c3007adb0d47c9feea75672b0
+HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= 9381df281b054e05bac4fb87346d876de34bd598
+HOSTBOOT_VERSION_BRANCH_MASTER ?= 82533df4b535112204b62bdc3940aa81a057b896
HOSTBOOT_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(HOSTBOOT_VERSION_BRANCH_MASTER),$(HOSTBOOT_VERSION_BRANCH_MASTER_P8))
HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION))
diff --git a/openpower/package/hostboot/p9Patches/hostboot-0003-ast-2400-include-uartif.patch b/openpower/package/hostboot/p9Patches/hostboot-0003-ast-2400-include-uartif.patch
new file mode 100644
index 0000000..e1d6f08
--- /dev/null
+++ b/openpower/package/hostboot/p9Patches/hostboot-0003-ast-2400-include-uartif.patch
@@ -0,0 +1,46 @@
+From 6e503c6585192b77a73a387da31d1a6935efe1bc Mon Sep 17 00:00:00 2001
+From: Matt Ploetz <maploetz@us.ibm.com>
+Date: Wed, 26 Oct 2016 16:58:37 -0500
+Subject: [PATCH] Add uartif include to ast2400
+
+Change-Id: Ica065fb2dd4402c0fa71466055bcccb573d48101
+---
+ src/HBconfig | 7 ++++++-
+ src/usr/console/ast2400.C | 1 +
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/HBconfig b/src/HBconfig
+index 08ab160..5abb512 100644
+--- a/src/HBconfig
++++ b/src/HBconfig
+@@ -9,9 +9,14 @@ config P9_VPO_COMPILE
+ help
+ Compile and build image for VPO environment
+
+-config BMC_AST2400
++config BMC_AST2500
+ default n
+ help
++ Compile hostboot support for AST2500 based BMC
++
++config BMC_AST2400
++ default y if (BMC_AST2500)
++ help
+ Compile hostboot support for AST2400 based BMC
+
+ config P9_SYSTEM
+diff --git a/src/usr/console/ast2400.C b/src/usr/console/ast2400.C
+index 5e8c0bc..43ec9ef 100644
+--- a/src/usr/console/ast2400.C
++++ b/src/usr/console/ast2400.C
+@@ -30,6 +30,7 @@
+ #include <kernel/console.H>
+ #include <devicefw/driverif.H>
+ #include <initservice/bootconfigif.H>
++#include <console/uartif.H>
+
+ namespace CONSOLE
+ {
+--
+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
deleted file mode 100644
index 74be3df..0000000
--- a/openpower/package/hostboot/p9Patches/hostboot-0003-remove-sbfw-check-hbDistribute.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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-0005-add-nimbus-simics-xml.patch b/openpower/package/hostboot/p9Patches/hostboot-0005-add-nimbus-simics-xml.patch
deleted file mode 100644
index f2f7d0b..0000000
--- a/openpower/package/hostboot/p9Patches/hostboot-0005-add-nimbus-simics-xml.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/occ.mk b/openpower/package/occ/occ.mk
index 61d0d27..c6c455b 100644
--- a/openpower/package/occ/occ.mk
+++ b/openpower/package/occ/occ.mk
@@ -5,7 +5,7 @@
################################################################################
OCC_VERSION_BRANCH_MASTER_P8 ?= bb092e95266788920751389f7df189425f1ec1d6
-OCC_VERSION_BRANCH_MASTER ?= 64fcfd7e3f3899e761d21eda204b53114d494aaa
+OCC_VERSION_BRANCH_MASTER ?= a4e04571d60b58c0c778c870bc215bf467085fb6
OCC_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_VERSION_BRANCH_MASTER),$(OCC_VERSION_BRANCH_MASTER_P8))
OCC_SITE ?= $(call github,open-power,occ,$(OCC_VERSION))