Skip to content

Commit

Permalink
pnor: Rename the SFC-based PnorDD class to PnorSfcDD
Browse files Browse the repository at this point in the history 
Clarify which back-end implementation the driver is using.

Change-Id: I26cee706a27e26e0f218da0eb5289592202a5baf
Signed-off-by: Andrew Jeffery <andrewrj@au1.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/66119
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/67398
  • Loading branch information
@dcrowell77
Andrew Jeffery authored and dcrowell77 committed Oct 17, 2018
1 parent 4126c2c commit 30cc123
Show file tree
Hide file tree
Showing 8 changed files with 81 additions and 76 deletions.
2 changes: 1 addition & 1 deletion src/usr/pnor/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ MODULE = pnor
OBJS += pnor_utils.o
OBJS += pnorrp.o
OBJS += $(if $(CONFIG_SECUREBOOT),spnorrp.o)
OBJS += $(if $(CONFIG_PNORDD_IS_SFC),pnordd.o)
OBJS += $(if $(CONFIG_PNORDD_IS_SFC),pnor_sfcdd.o)
OBJS += $(if $(CONFIG_PNORDD_IS_BMCMBOX),ast_mboxdd.o)
OBJS += $(if $(CONFIG_PNORDD_IS_BMCMBOX),pnor_mboxdd.o)
OBJS += $(if $(CONFIG_PNORDD_IS_IPMI),pnor_ipmidd.o)
Expand Down
122 changes: 61 additions & 61 deletions src/usr/pnor/pnordd.C → src/usr/pnor/pnor_sfcdd.C
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions src/usr/pnor/pnordd.H → src/usr/pnor/pnor_sfcdd.H
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/pnor/pnordd.H $ */
/* $Source: src/usr/pnor/pnor_sfcdd.H $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2011,2017 */
/* Contributors Listed Below - COPYRIGHT 2011,2018 */
/* [+] Google Inc. */
/* [+] International Business Machines Corp. */
/* */
Expand Down Expand Up @@ -33,15 +33,15 @@
namespace PNOR { class UdPnorDDParms; }
class SfcDD;

/** @file pnordd.H
/** @file pnor_sfcdd.H
* @brief Provides the interfaces to the PNOR Device Driver
*/

/**
* @brief PNOR Device Driver Class
* Provides access to the PNOR flash via the ECCB/LPC hardware
*/
class PnorDD
class PnorSfcDD
{

public:
Expand Down Expand Up @@ -102,12 +102,12 @@ class PnorDD
* @parm i_target Processor Target connected to PNOR
* NOTE: i_target can only be used after targeting is loaded
*/
PnorDD( TARGETING::Target* i_target = NULL );
PnorSfcDD( TARGETING::Target* i_target = NULL );

/**
* @brief Destructor
*/
~PnorDD();
~PnorSfcDD();

protected:

Expand Down
3 changes: 2 additions & 1 deletion src/usr/pnor/pnorvalid.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@
#include <pnor/pnor_reasoncodes.H>
#include <lpc/lpcif.H>
#ifdef CONFIG_PNORDD_IS_SFC
#include "pnordd.H"
#include "pnor_sfcdd.H"
using PnorDD = PnorSfcDD;
#elif CONFIG_PNORDD_IS_BMCMBOX
#include "pnor_mboxdd.H"
#elif CONFIG_PNORDD_IS_IPMI
Expand Down
3 changes: 2 additions & 1 deletion src/usr/pnor/test/pnorddtest.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
#include <kernel/console.H>
#include <sys/time.h>
#ifdef CONFIG_PNORDD_IS_SFC
#include "pnordd.H"
#include "pnor_sfcdd.H"
using PnorDD = PnorSfcDD;
#elif CONFIG_PNORDD_IS_BMCMBOX
#include "pnor_mboxdd.H"
#elif CONFIG_PNORDD_IS_IPMI
Expand Down
5 changes: 3 additions & 2 deletions src/usr/pnor/test/sfc_ast2400test.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2014,2015 */
/* Contributors Listed Below - COPYRIGHT 2014,2018 */
/* [+] Google Inc. */
/* [+] International Business Machines Corp. */
/* */
Expand Down Expand Up @@ -37,7 +37,8 @@
#include <errl/errlentry.H>
#include <devicefw/userif.H>
#include <sys/time.h>
#include "../pnordd.H"
#include "../pnor_sfcdd.H"
using PnorDD = PnorSfcDD;
#include <list>
#include <targeting/common/attributes.H>
#include <lpc/lpcif.H>
Expand Down
5 changes: 3 additions & 2 deletions src/usr/pnor/test/sfc_ast2500test.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016 */
/* Contributors Listed Below - COPYRIGHT 2016,2018 */
/* [+] Google Inc. */
/* [+] International Business Machines Corp. */
/* */
Expand Down Expand Up @@ -37,7 +37,8 @@
#include <errl/errlentry.H>
#include <devicefw/userif.H>
#include <sys/time.h>
#include "../pnordd.H"
#include "../pnor_sfcdd.H"
using PnorDD = PnorSfcDD;
#include <list>
#include <targeting/common/attributes.H>
#include <lpc/lpcif.H>
Expand Down
5 changes: 3 additions & 2 deletions src/usr/pnor/test/sfc_ibmtest.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2014,2015 */
/* Contributors Listed Below - COPYRIGHT 2014,2018 */
/* [+] Google Inc. */
/* [+] International Business Machines Corp. */
/* */
Expand Down Expand Up @@ -37,7 +37,8 @@
#include <errl/errlentry.H>
#include <devicefw/userif.H>
#include <sys/time.h>
#include "../pnordd.H"
#include "../pnor_sfcdd.H"
using PnorDD = PnorSfcDD;
#include <list>
#include <targeting/common/attributes.H>
#include "../sfc_ibm.H"
Expand Down

0 comments on commit 30cc123

Please sign in to comment.