summaryrefslogtreecommitdiffstats
path: root/src/usr/pnor
diff options
context:
space:
mode:
authorStephen Cprek <smcprek@us.ibm.com>2017-03-27 17:10:06 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2017-04-10 17:37:12 -0400
commit1b1db6100e117c9c4d848a784cfe8be885ca9696 (patch)
treef4732980aa490b7496d0c59c0e044734e44431b6 /src/usr/pnor
parentc560af088949a2195a3dc86eb16daa7628daf0e9 (diff)
downloadtalos-hostboot-1b1db6100e117c9c4d848a784cfe8be885ca9696.tar.gz
talos-hostboot-1b1db6100e117c9c4d848a784cfe8be885ca9696.zip
Move certain pnor_utils.H function to pnorif.H that are used externally
Change-Id: Ic44c769f777a458d627bc306458f3e1c3c532a63 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38542 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Martin Gloff <mgloff@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: Michael Baiocchi <mbaiocch@us.ibm.com> Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/pnor')
-rw-r--r--src/usr/pnor/pnor_utils.C3
-rw-r--r--src/usr/pnor/pnor_utils.H26
2 files changed, 0 insertions, 29 deletions
diff --git a/src/usr/pnor/pnor_utils.C b/src/usr/pnor/pnor_utils.C
index fc68fef6f..5a8d39065 100644
--- a/src/usr/pnor/pnor_utils.C
+++ b/src/usr/pnor/pnor_utils.C
@@ -54,10 +54,7 @@ extern trace_desc_t* g_trac_pnor;
#include <config.h>
#include <securerom/ROM.H>
-#ifndef BOOTLOADER
-// Includes needed when hostboot uses this file
#include <pnor/pnorif.H>
-#endif
/**
* @brief calculates the checksum on data(ffs header/entry) and will return
diff --git a/src/usr/pnor/pnor_utils.H b/src/usr/pnor/pnor_utils.H
index fad0dee38..6007b3492 100644
--- a/src/usr/pnor/pnor_utils.H
+++ b/src/usr/pnor/pnor_utils.H
@@ -227,32 +227,6 @@ parseEntries (ffs_hdr* i_ffs_hdr,
bool isEnforcedSecureSection(const uint32_t i_section);
/**
- * @brief Returns string representation of a PNOR SectionId.
- * If id requested is out of range of known string array
- * - Hostboot asserts
- * - Bootloader terminates
- *
- * @param[in] i_secIdIndex PNOR section id which also represents the index
- * into the string array.
- *
- * @return const char* - String associated with Section ID
- *
-*/
-const char * SectionIdToString( uint32_t i_secIdIndex );
-
-/**
- * @brief Memcmp a vaddr to the known secureboot magic number
- *
- * @param[in] i_vaddr: vaddr of secureboot header to check for magic number
- * Note: must point to a buffer of size >= 4 bytes
- * Nullptr asserts or terminates bootloader
- *
- * @return bool - True if the magic number and starting bytes of the vaddr
- * match. False otherwise.
- */
-bool cmpSecurebootMagicNumber(const uint8_t* i_vaddr);
-
-/**
* @brief Determines if a section has a Header and that it is not a Secure Header
*
* @param[out] i_secInfo PNOR information of section
OpenPOWER on IntegriCloud