diff options
| author | Stephen Cprek <smcprek@us.ibm.com> | 2015-02-23 11:18:24 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-03-10 22:50:47 -0500 |
| commit | 788ec2a6d01df562f38352443bacd68c9cb0c633 (patch) | |
| tree | dfff993e6fe30c9d1605bffe442508bceaed71ee /src/usr/pnor | |
| parent | 2a1d6e44f9dee4b665978be5e0eb0ef47a9e0be0 (diff) | |
| download | talos-hostboot-788ec2a6d01df562f38352443bacd68c9cb0c633.tar.gz talos-hostboot-788ec2a6d01df562f38352443bacd68c9cb0c633.zip | |
Remove pnorsbe.C and move seeprom code back to SBE namespace
PNOR code no longer uses getSbeBootSeeprom() and it makes
more sense to keep this function in the sbe component
Change-Id: Ic984f1af35fcc7346242bee03c69d16796ef7c09
RTC: 123369
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15912
Tested-by: Jenkins Server
Reviewed-by: PRACHI GUPTA <pragupta@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/pnor')
| -rw-r--r-- | src/usr/pnor/makefile | 1 | ||||
| -rw-r--r-- | src/usr/pnor/pnorsbe.C | 87 |
2 files changed, 0 insertions, 88 deletions
diff --git a/src/usr/pnor/makefile b/src/usr/pnor/makefile index 2f0a4e19b..31087a4b2 100644 --- a/src/usr/pnor/makefile +++ b/src/usr/pnor/makefile @@ -32,7 +32,6 @@ OBJS += pnor_common.o OBJS += pnorvalid.o OBJS += ecc.o OBJS += sfcdd.o -OBJS += pnorsbe.o #SFC Implementations OBJS += $(if $(CONFIG_SFC_IS_IBM_DPSS),sfc_ibm.o) diff --git a/src/usr/pnor/pnorsbe.C b/src/usr/pnor/pnorsbe.C deleted file mode 100644 index 0b6117313..000000000 --- a/src/usr/pnor/pnorsbe.C +++ /dev/null @@ -1,87 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/usr/pnor/pnorsbe.C $ */ -/* */ -/* OpenPOWER HostBoot Project */ -/* */ -/* Contributors Listed Below - COPYRIGHT 2014,2015 */ -/* [+] International Business Machines Corp. */ -/* */ -/* */ -/* Licensed under the Apache License, Version 2.0 (the "License"); */ -/* you may not use this file except in compliance with the License. */ -/* You may obtain a copy of the License at */ -/* */ -/* http://www.apache.org/licenses/LICENSE-2.0 */ -/* */ -/* Unless required by applicable law or agreed to in writing, software */ -/* distributed under the License is distributed on an "AS IS" BASIS, */ -/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */ -/* implied. See the License for the specific language governing */ -/* permissions and limitations under the License. */ -/* */ -/* IBM_PROLOG_END_TAG */ -/** - * @file pnorsbe.C - * - * @brief Implements PNOR::getSbeBootSeeprom(), which Determines which - * Seeprom was used to boot the SB - */ - -#include <pnor/pnorif.H> -#include <trace/interface.H> -#include <errl/errlmanager.H> -#include <errl/errlentry.H> -#include <devicefw/userif.H> - -extern trace_desc_t* g_trac_pnor; - -namespace PNOR -{ - -//Used to read SBE Boot Side from processor -const uint64_t SBE_VITAL_REG_0x0005001C = 0x005001C; -const uint64_t SBE_BOOT_SELECT_MASK = 0x0080000000000000; - -errlHndl_t getSbeBootSeeprom(TARGETING::Target* i_target, - sbeSeepromSide_t& o_bootSide) -{ - TRACFCOMP( g_trac_pnor, ENTER_MRK"PNOR::getSbeBootSeeprom()" ); - - errlHndl_t err = NULL; - uint64_t scomData = 0x0; - - o_bootSide = SBE_SEEPROM0; - - do{ - - size_t op_size = sizeof(scomData); - err = deviceRead( i_target, - &scomData, - op_size, - DEVICE_SCOM_ADDRESS(SBE_VITAL_REG_0x0005001C) ); - if( err ) - { - TRACFCOMP( g_trac_pnor, ERR_MRK"PNOR::getSbeBootSeeprom() -Error " - "reading SBE VITAL REG (0x%.8X) from Target :" - "HUID=0x%.8X", - SBE_VITAL_REG_0x0005001C, - TARGETING::get_huid(i_target)); - break; - } - if(scomData & SBE_BOOT_SELECT_MASK) - { - o_bootSide = SBE_SEEPROM1; - } - - }while(0); - - TRACFCOMP( g_trac_pnor, - EXIT_MRK"PNOR::getSbeBootSeeprom(): o_bootSide=0x%X (reg=0x%X)", - o_bootSide, scomData ); - - return err; -} - -} // end namespace
\ No newline at end of file |
