Merge pull request #3121 from shenki/kernel-5.2.11

kernel: Move to Linux v5.2.11-openpower1
diff --git a/openpower/configs/mihawk_defconfig b/openpower/configs/mihawk_defconfig
index e443dc4..a40c7c5 100644
--- a/openpower/configs/mihawk_defconfig
+++ b/openpower/configs/mihawk_defconfig
@@ -1,6 +1,5 @@
 BR2_powerpc64le=y
 BR2_powerpc_power8=y
-BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_OP_BUILD_PATH)/patches/mihawk-patches"
 BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
 BR2_GCC_VERSION_6_X=y
 BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux --disable-libsanitizer"
diff --git a/openpower/package/hostboot/Config.in b/openpower/package/hostboot/Config.in
index 445edac..d9839f0 100644
--- a/openpower/package/hostboot/Config.in
+++ b/openpower/package/hostboot/Config.in
@@ -25,7 +25,7 @@
 
 config BR2_HOSTBOOT_VERSION
 	string
-	default "01ac1b8dc22e3cba20a194fee7d741b749658223" if BR2_HOSTBOOT_LATEST_VERSION
+	default "b3047ddb16f3237934298189d2aff8828375339c" if BR2_HOSTBOOT_LATEST_VERSION
 	default BR2_HOSTBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_HOSTBOOT_CUSTOM_VERSION
 
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 7f08682..9408a07 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPENPOWER_PNOR_VERSION ?= 1bfff01c57d1186ebbfbcd9daabbace1f6092375
+OPENPOWER_PNOR_VERSION ?= bdfd0d08a7a04b1326553f570d35e778eda9db81
 OPENPOWER_PNOR_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_VERSION))
 
 OPENPOWER_PNOR_LICENSE = Apache-2.0
diff --git a/openpower/patches/mihawk-patches/occ/occ-0001-Modify-modify-amec-power-sensor-calculation.patch b/openpower/patches/mihawk-patches/occ/occ-0001-Modify-modify-amec-power-sensor-calculation.patch
deleted file mode 100644
index 7f94247..0000000
--- a/openpower/patches/mihawk-patches/occ/occ-0001-Modify-modify-amec-power-sensor-calculation.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From d614a89e71564d8d300e25fb76c5a4553fe35876 Mon Sep 17 00:00:00 2001
-From: joy_chu <joy_chu@wistron.com>
-Date: Mon, 22 Jul 2019 18:57:17 +0800
-Subject: [PATCH] Modify: modify amec power sensor calculation
-
-The offset value will be added to APSS raw value when APSS raw value is not 0.
-
-Signed-off-by: joy_chu <joy_chu@wistron.com>
----
- src/occ_405/amec/amec_sensors_power.c | 18 +++++++++++-------
- 1 file changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/src/occ_405/amec/amec_sensors_power.c b/src/occ_405/amec/amec_sensors_power.c
-index 5c0ec54..2612598 100755
---- a/src/occ_405/amec/amec_sensors_power.c
-+++ b/src/occ_405/amec/amec_sensors_power.c
-@@ -173,14 +173,18 @@ uint32_t amec_value_from_apss_adc(uint8_t i_chan)
-         // Read Raw Value in mA (divide masked channel data by 2)
-         l_raw = (G_dcom_slv_inbox_rx.adc[i_chan] & APSS_12BIT_ADC_MASK)/2;
-         // Apply offset and gain
--        if (l_offset & 0x80000000)
-+        // Add offset if Raw Value is not zero
-+	if (l_raw != 0)
-         {
--            // Negative offset
--            l_raw -= (~l_offset + 1);
--        }
--        else
--        {
--            l_raw += l_offset;
-+            if (l_offset & 0x80000000)
-+            {
-+                // Negative offset
-+                l_raw -= (~l_offset + 1);
-+	    }
-+	    else
-+            {
-+                l_raw += l_offset;
-+            }
-         }
-         //Check to see if l_raw is negative.  If so, set raw to 0
-         if (l_raw & 0x8000)
--- 
-2.7.4
-