summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Derksen <v2cibmd@us.ibm.com>2016-06-14 10:06:58 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2016-06-16 11:58:23 -0400
commit458cee5a424846dd531a0de1ac34b187d3cc7098 (patch)
tree91b77dee86789b3960e65822153658eea42f0a1c
parentf1f9811d2170593e60032b1b18ff7f9cafaccf2d (diff)
downloadtalos-hostboot-458cee5a424846dd531a0de1ac34b187d3cc7098.tar.gz
talos-hostboot-458cee5a424846dd531a0de1ac34b187d3cc7098.zip
Rename PALMETTO_VDDR to be more OpenPOWER generic.
Change-Id: I93640fe9a39d6a93111a278b4318b7fa352535c4 RTC: 152294 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25792 Tested-by: Jenkins Server Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
-rw-r--r--src/usr/isteps/HBconfig4
-rw-r--r--src/usr/isteps/istep13/hbVddrMsg.C7
-rw-r--r--src/usr/isteps/istep13/makefile2
-rw-r--r--src/usr/isteps/istep13/openpower_vddr.C (renamed from src/usr/isteps/istep13/palmetto_vddr.C)14
-rw-r--r--src/usr/isteps/istep13/platform_vddr.H8
5 files changed, 7 insertions, 28 deletions
diff --git a/src/usr/isteps/HBconfig b/src/usr/isteps/HBconfig
index 5fb85e79b..81025fa4d 100644
--- a/src/usr/isteps/HBconfig
+++ b/src/usr/isteps/HBconfig
@@ -14,10 +14,10 @@ config START_OCC_DURING_BOOT
help
Activates all the OCCs during IPL
-config PALMETTO_VDDR
+config OPENPOWER_MEM_VOLT
default n
help
- Enable the Hostboot DRAM VDDR function for Palmetto
+ Enable Hostboot post-poweron memory voltage control for OpenPOWER systems
config PCA95X_8BIT
default n
diff --git a/src/usr/isteps/istep13/hbVddrMsg.C b/src/usr/isteps/istep13/hbVddrMsg.C
index 94b4aee32..d9918f3dd 100644
--- a/src/usr/isteps/istep13/hbVddrMsg.C
+++ b/src/usr/isteps/istep13/hbVddrMsg.C
@@ -740,13 +740,6 @@ void HBVddrMsg::createErrLog(errlHndl_t& io_err,
}
// External interfaces
-
-errlHndl_t platform_enable_vspd()
-{
- // noop on FSP based system
- return NULL;
-}
-
errlHndl_t platform_enable_vddr()
{
errlHndl_t l_err = NULL;
diff --git a/src/usr/isteps/istep13/makefile b/src/usr/isteps/istep13/makefile
index 10ba64908..62552f99e 100644
--- a/src/usr/isteps/istep13/makefile
+++ b/src/usr/isteps/istep13/makefile
@@ -73,7 +73,7 @@ OBJS += port.o
-OBJS += $(if $(CONFIG_PALMETTO_VDDR),palmetto_vddr.o,hbVddrMsg.o)
+OBJS += $(if $(CONFIG_OPENPOWER_VDDR),openpower_vddr.o,hbVddrMsg.o)
include ${ROOTPATH}/procedure.rules.mk
diff --git a/src/usr/isteps/istep13/palmetto_vddr.C b/src/usr/isteps/istep13/openpower_vddr.C
index 44d8e0200..2ee7800da 100644
--- a/src/usr/isteps/istep13/palmetto_vddr.C
+++ b/src/usr/isteps/istep13/openpower_vddr.C
@@ -1,7 +1,7 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
-/* $Source: src/usr/isteps/istep13/palmetto_vddr.C $ */
+/* $Source: src/usr/isteps/istep13/openpower_vddr.C $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
@@ -209,7 +209,7 @@ static errlHndl_t pca95xGpioSetBit(TARGETING::Target * i_target,
size_t dataLen = sizeof(data);
// Might want to make this an attribute;
- // However, This is already a palmetto only object
+ // However, This is already an OpenPOWER only object
uint64_t deviceType = GPIO::PCA95X_GPIO;
err = DeviceFW::deviceOp
@@ -348,14 +348,6 @@ static errlHndl_t disableVddrViaGpioPinStrategy(Target *centaur)
}
// External interfaces
-
-errlHndl_t platform_enable_vspd()
-{
- // GPIO pin not implemented on palmetto
- // VSPD voltage hardwired.
- return NULL;
-}
-
errlHndl_t platform_enable_vddr()
{
return for_each_vddr_domain_with_functional_memory(
@@ -370,7 +362,7 @@ errlHndl_t platform_disable_vddr()
errlHndl_t platform_adjust_vddr_post_dram_init()
{
- // Not supported on palmetto
+ // Not supported on OpenPOWER
return NULL;
}
diff --git a/src/usr/isteps/istep13/platform_vddr.H b/src/usr/isteps/istep13/platform_vddr.H
index da1dbc4d2..81520bb9a 100644
--- a/src/usr/isteps/istep13/platform_vddr.H
+++ b/src/usr/isteps/istep13/platform_vddr.H
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2014,2015 */
+/* Contributors Listed Below - COPYRIGHT 2014,2016 */
/* [+] Google Inc. */
/* [+] International Business Machines Corp. */
/* */
@@ -31,12 +31,6 @@
#include <usr/errl/errlentry.H>
/**
- * @brief Enable vspd on DIMMS
- * @return NULL | error handle on error
- */
-errlHndl_t platform_enable_vspd();
-
-/**
* @brief Enable vddr on DIMMS
* @return NULL | error handle on error
*/
OpenPOWER on IntegriCloud