diff options
author | Dan Crowell <dcrowell@us.ibm.com> | 2017-04-14 11:10:44 -0500 |
---|---|---|
committer | Matthew A. Ploetz <maploetz@us.ibm.com> | 2017-04-26 17:59:20 -0400 |
commit | be9ac6a00db5d6f6aa48a19340fefb3a8a33cd3c (patch) | |
tree | e60fb01bf415365359ff2e87e2f34cbce5d361a5 /src/include | |
parent | 198d144f57d4c7042f04eb3b4c9658d42ab6278d (diff) | |
download | blackbird-hostboot-be9ac6a00db5d6f6aa48a19340fefb3a8a33cd3c.tar.gz blackbird-hostboot-be9ac6a00db5d6f6aa48a19340fefb3a8a33cd3c.zip |
Remove devtree code
OPAL is now HDAT-based, removing all references to the
Hostboot-generated devtree.
Change-Id: I9fc8773f7135d4e0d4799e4cc7c6e3b6ea1da14d
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39293
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Matthew A. Ploetz <maploetz@us.ibm.com>
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/sys/misc.h | 5 | ||||
-rw-r--r-- | src/include/usr/devtree/devtree_reasoncodes.H | 45 | ||||
-rw-r--r-- | src/include/usr/devtree/devtreeif.H | 58 | ||||
-rw-r--r-- | src/include/usr/i2c/eepromif.H | 4 | ||||
-rw-r--r-- | src/include/usr/i2c/i2cif.H | 2 | ||||
-rw-r--r-- | src/include/usr/isteps/istep21list.H | 1 |
6 files changed, 5 insertions, 110 deletions
diff --git a/src/include/sys/misc.h b/src/include/sys/misc.h index f63de4686..8100805be 100644 --- a/src/include/sys/misc.h +++ b/src/include/sys/misc.h @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2016 */ +/* Contributors Listed Below - COPYRIGHT 2011,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -107,8 +107,7 @@ extern "C" * @param[in] i_payload_base The base address (target HRMOR) of the payload. * @param[in] i_payload_entry The offset from base address of the payload * entry-point. - * @param[in] i_payload_data Data pointer fo the payload. For standalone - * Saphire this is the devtree + * @param[in] i_payload_data Data pointer fo the payload. * @param[in[ i_masterHBInstance Hostboot instance number. for multinode */ extern "C" void shutdown(uint64_t i_status, diff --git a/src/include/usr/devtree/devtree_reasoncodes.H b/src/include/usr/devtree/devtree_reasoncodes.H deleted file mode 100644 index 7705a08fc..000000000 --- a/src/include/usr/devtree/devtree_reasoncodes.H +++ /dev/null @@ -1,45 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/include/usr/devtree/devtree_reasoncodes.H $ */ -/* */ -/* OpenPOWER HostBoot Project */ -/* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ -/* */ -/* 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 */ -#ifndef __DEVTREE_REASONCODES_H -#define __DEVTREE_REASONCODES_H - -#include <hbotcompid.H> - -namespace DEVTREE -{ - enum DevtreeModuleId - { - MOD_DEVTREE_INVALID = 0x00, /**< Zero is invalid module id */ - MOD_DEVTREE_BLD_MEM = 0x01, - MOD_BLD_VPD_IMAGE = 0x02, - }; - - enum DevtreeReasonCode - { - RC_ATTR_MEMSIZE_GET_FAIL = DEVTREE_COMP_ID | 0x01, - RC_ATTR_MEMBASE_GET_FAIL = DEVTREE_COMP_ID | 0x02, - RC_INSUFFICIENT_SPACE_FOR_RT_VPD = DEVTREE_COMP_ID | 0x03, - }; -}; - -#endif diff --git a/src/include/usr/devtree/devtreeif.H b/src/include/usr/devtree/devtreeif.H deleted file mode 100644 index 63c8f5f34..000000000 --- a/src/include/usr/devtree/devtreeif.H +++ /dev/null @@ -1,58 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/include/usr/devtree/devtreeif.H $ */ -/* */ -/* OpenPOWER HostBoot Project */ -/* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ -/* */ -/* 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 */ -#ifndef __DEVTREE_IF_H -#define __DEVTREE_IF_H - -#include <errl/errlentry.H> - - -namespace DEVTREE -{ - - /** - * @brief Build flattened dev tree for Sapphire - * - * @param[in] i_dtAddr - Address to load devtree. 0 will use a default - * data area appropriate for non-HDAT Sapphire. - * @param[in] i_dtSize - Allowable size for the devtree. - * @param[in] i_smallTree - Build a small devtree appropriate for inside - * the HDAT area. - * - * @return errlHndl_t NULL on success - */ - errlHndl_t build_flatdevtree( uint64_t i_dtAddr = 0, size_t i_dtSize = 0, - bool i_smallTree = false); - - /** - * @brief Get the address of the flattened dev tree for Sapphire - * - * @return uint64_t - Address if valid, else NULL - */ - uint64_t get_flatdevtree_phys_addr( void ); - - - - -}; // end namespace DEVTREE - -#endif diff --git a/src/include/usr/i2c/eepromif.H b/src/include/usr/i2c/eepromif.H index 6371e6da5..36558cbfe 100644 --- a/src/include/usr/i2c/eepromif.H +++ b/src/include/usr/i2c/eepromif.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2016 */ +/* Contributors Listed Below - COPYRIGHT 2013,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -56,7 +56,7 @@ bool eepromPresence ( TARGETING::Target * i_target ); /** * @brief Define a set of information about all EEPROMs in the - * system (primarily used to populate the devtree) + * system (primarily used to populate HDAT) */ struct EepromInfo_t { diff --git a/src/include/usr/i2c/i2cif.H b/src/include/usr/i2c/i2cif.H index 607fb58a1..0cbc94a65 100644 --- a/src/include/usr/i2c/i2cif.H +++ b/src/include/usr/i2c/i2cif.H @@ -155,7 +155,7 @@ void i2cSetAccessMode( i2cSetAccessModeType i_setModeType ); /** * @brief Define a set of information about the I2C masters - * (primarily used to populate the devtree) + * (primarily used to populate the HDAT) */ struct MasterInfo_t { diff --git a/src/include/usr/isteps/istep21list.H b/src/include/usr/isteps/istep21list.H index f2be3178e..61b0d49e4 100644 --- a/src/include/usr/isteps/istep21list.H +++ b/src/include/usr/isteps/istep21list.H @@ -120,7 +120,6 @@ namespace INITSERVICE const DepModInfo g_istep21Dependancies = { { DEP_LIB(libistep21.so), - DEP_LIB(libdevtree.so), DEP_LIB(libruntime.so), DEP_LIB(libp9_cpuWkup.so), DEP_LIB(libpm.so), |