diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/sbe/sbe_update.C | 53 | ||||
| -rw-r--r-- | src/usr/sbe/sbe_update.H | 4 |
2 files changed, 30 insertions, 27 deletions
diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C index 8d045a85b..71471217f 100644 --- a/src/usr/sbe/sbe_update.C +++ b/src/usr/sbe/sbe_update.C @@ -932,8 +932,6 @@ namespace SBE TRACFCOMP( g_trac_sbe, INFO_MRK"ringOvd():Valid overrides, applying them"); - // Hard coded value, pass in 2KB max - uint32_t RING_OVD_SIZE = 0x800; FAPI_INVOKE_HWP(l_err,p9_xip_section_append, (void *)l_pnorRingOvd.vaddr, RING_OVD_SIZE, @@ -1049,31 +1047,6 @@ namespace SBE // Check for no error and use of input cores if ( (NULL == err) && (procIOMask == coreMask)) { - // Check if we have a valid ring override section and - // append it in if so - uint32_t l_ovdImgSize = static_cast<uint32_t>(i_maxImgSize); - err = ringOvd(io_imgPtr,l_ovdImgSize); - if(err) - { - TRACFCOMP( g_trac_sbe, - ERR_MRK"procCustomizeSbeImg(): " - "Error in call to ringOvd!"); - break; - } - // If it's larger then the original size then we added some - // overrides - if(l_ovdImgSize > tmpImgSize) - { - // We added an override so adjust tmpImgSize - TRACFCOMP( g_trac_sbe, - INFO_MRK"procCustomizeSbeImg(): We added some " - "ring overrides, initial image size:%u " - "new image size:%u", - tmpImgSize, l_ovdImgSize); - - tmpImgSize = l_ovdImgSize; - } - // Procedure was successful procedure_success = true; @@ -1934,6 +1907,32 @@ namespace SBE break; } + /*******************************************/ + /* Append RINGOVD Image from PNOR to SBE */ + /*******************************************/ + // Check if we have a valid ring override section and + // append it in if so + uint32_t l_ovdImgSize = + static_cast<uint32_t>(sbeHbblImgSize+RING_OVD_SIZE); + err = ringOvd(sbeHbblImgPtr,l_ovdImgSize); + if(err) + { + TRACFCOMP( g_trac_sbe, + ERR_MRK"procCustomizeSbeImg(): " + "Error in call to ringOvd!"); + break; + } + + //If it's larger than the original size then we added some overrides + if(l_ovdImgSize > sbeHbblImgSize) + { + TRACFCOMP( g_trac_sbe, + INFO_MRK"procCustomizeSbeImg(): We added some " + "ring overrides, initial image size:%u " + "new image size:%u", + sbeHbblImgSize, l_ovdImgSize); + } + /*******************************************/ /* Customize SBE/HBBL Image and */ diff --git a/src/usr/sbe/sbe_update.H b/src/usr/sbe/sbe_update.H index d4ed02717..7257fb062 100644 --- a/src/usr/sbe/sbe_update.H +++ b/src/usr/sbe/sbe_update.H @@ -85,6 +85,10 @@ namespace SBE // (PERV_SB_CS_SCOM 0x00050008 or PERV_SB_CS_FSI 0x2808) const uint64_t SBE_BOOT_SELECT_MASK = 0x0000400000000000; + // Hard coded value, pass in 2KB max + const uint32_t RING_OVD_SIZE = 0x800; + + // PNOR SBE and SBEC Partition constants const uint32_t MAX_SBE_ENTRIES = 9; const uint32_t SBETOC_EYECATCH = 0x53424500; //'SBE\0' |
