diff options
| author | Corey Swenson <cswenson@us.ibm.com> | 2019-01-16 08:43:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-16 08:43:12 -0700 |
| commit | 2489799d6a565ce5b5ab8b159cbf5ce4926e19eb (patch) | |
| tree | efa8124b6688d03c983b60db3263de2bea4ec2d5 | |
| parent | 66062c7c13d669faaa5a2b7a40f9174d724c155e (diff) | |
| parent | 074d74818ce94170426cc6924e2fd995862519de (diff) | |
| download | blackbird-op-build-2489799d6a565ce5b5ab8b159cbf5ce4926e19eb.tar.gz blackbird-op-build-2489799d6a565ce5b5ab8b159cbf5ce4926e19eb.zip | |
Merge pull request #2558 from cvswen/master_p8_and_vesnin_fix
op-build update for master-p8 with fix for Vesnin patch
| -rw-r--r-- | openpower/package/hostboot-p8/hostboot-p8.mk | 2 | ||||
| -rw-r--r-- | openpower/patches/vesnin-patches/hostboot-p8/hostboot-0005-Fill-empty-sensor-id-to-reserved-id-0xFF.patch | 55 |
2 files changed, 42 insertions, 15 deletions
diff --git a/openpower/package/hostboot-p8/hostboot-p8.mk b/openpower/package/hostboot-p8/hostboot-p8.mk index c1e0cc11..759e4684 100644 --- a/openpower/package/hostboot-p8/hostboot-p8.mk +++ b/openpower/package/hostboot-p8/hostboot-p8.mk @@ -3,7 +3,7 @@ # hostboot for POWER8 # ################################################################################ -HOSTBOOT_P8_VERSION ?= e9b07d61750eb47fd57e89472a68dc0ab8dfc01b +HOSTBOOT_P8_VERSION ?= c2471ac74bf8b39a2b2ae324b9d069baf444df2f HOSTBOOT_P8_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_P8_VERSION)) diff --git a/openpower/patches/vesnin-patches/hostboot-p8/hostboot-0005-Fill-empty-sensor-id-to-reserved-id-0xFF.patch b/openpower/patches/vesnin-patches/hostboot-p8/hostboot-0005-Fill-empty-sensor-id-to-reserved-id-0xFF.patch index 9fec1aa8..5b4bcc74 100644 --- a/openpower/patches/vesnin-patches/hostboot-p8/hostboot-0005-Fill-empty-sensor-id-to-reserved-id-0xFF.patch +++ b/openpower/patches/vesnin-patches/hostboot-p8/hostboot-0005-Fill-empty-sensor-id-to-reserved-id-0xFF.patch @@ -1,8 +1,9 @@ -From a1f98d850d356001d37242ccf13f94114bd6378c Mon Sep 17 00:00:00 2001 -From: Artem Senichev <a.senichev@yadro.com> -Date: Tue, 13 Mar 2018 15:44:05 +0300 -Subject: [PATCH] Fill empty sensor id to reserved id 0xFF +From f03937aa32b79e8bde0fa5ff09a0e11e4750bb6f Mon Sep 17 00:00:00 2001 +From: Corey Swenson <cswenson@us.ibm.com> +Date: Mon, 14 Jan 2019 12:46:22 -0600 +Subject: [PATCH] Vesnin patch +Change-Id: I1116c92f9176d53630a9316312656c03f2a16723 Hank Chang: This patch achieves the following goals: a. Auto set all empty sensors with reserved ID - 0xFF instead of being 0x0 in @@ -20,15 +21,23 @@ Originally created by MSI (S188) Signed-off-by: Artem Senichev <a.senichev@yadro.com> --- - src/usr/ipmi/ipmisensor.C | 5 +---- - src/usr/targeting/common/processMrw.pl | 21 ++++++++++++++++++--- - 2 files changed, 19 insertions(+), 7 deletions(-) + src/usr/ipmiext/ipmisensor.C | 6 ++---- + src/usr/targeting/common/processMrw.pl | 25 ++++++++++++++++++++----- + 2 files changed, 22 insertions(+), 9 deletions(-) -diff --git a/src/usr/ipmi/ipmisensor.C b/src/usr/ipmi/ipmisensor.C -index 4aa1c9f4b..a5bded63a 100644 ---- a/src/usr/ipmi/ipmisensor.C -+++ b/src/usr/ipmi/ipmisensor.C -@@ -216,14 +216,11 @@ namespace SENSOR +diff --git a/src/usr/ipmiext/ipmisensor.C b/src/usr/ipmiext/ipmisensor.C +index e3c6405..63a4196 100644 +--- a/src/usr/ipmiext/ipmisensor.C ++++ b/src/usr/ipmiext/ipmisensor.C +@@ -6,6 +6,7 @@ + /* OpenPOWER HostBoot Project */ + /* */ + /* Contributors Listed Below - COPYRIGHT 2014,2019 */ ++/* [+] International Business Machines Corp. */ + /* */ + /* */ + /* Licensed under the Apache License, Version 2.0 (the "License"); */ +@@ -214,14 +215,11 @@ namespace SENSOR } else { @@ -45,9 +54,18 @@ index 4aa1c9f4b..a5bded63a 100644 return l_err; diff --git a/src/usr/targeting/common/processMrw.pl b/src/usr/targeting/common/processMrw.pl -index 8bfa7bddd..45d250872 100644 +index 8bfa7bd..66783c8 100644 --- a/src/usr/targeting/common/processMrw.pl +++ b/src/usr/targeting/common/processMrw.pl +@@ -6,7 +6,7 @@ + # + # OpenPOWER HostBoot Project + # +-# Contributors Listed Below - COPYRIGHT 2015,2017 ++# Contributors Listed Below - COPYRIGHT 2015,2019 + # [+] International Business Machines Corp. + # + # @@ -239,14 +239,29 @@ sub processIpmiSensors { $sensor_name=$name."_".$name_suffix; } @@ -81,6 +99,15 @@ index 8bfa7bddd..45d250872 100644 my $str=sprintf( " %30s | %10s | 0x%02X | 0x%02X | 0x%02x |" . " %4s | %4d | %4d | %10s | %s\n", +@@ -1428,7 +1443,7 @@ Options: + exit(1); + } + +-# eliminate extra whitespace ++# eliminate extra whitespace + # Input: string to chop + sub nowhitespace + { -- -2.14.1 +1.8.2.2 |
