From 8d2f642444d8581ea7dda1219f2ffccc79a63dce Mon Sep 17 00:00:00 2001 From: Marty Gloff Date: Thu, 4 May 2017 11:49:53 -0500 Subject: Bootloader updates to support remapped memory - Initial pass Add support to BlToHbData structure and create new version. Put in TODOs for pending p9_sbe_hb_structures.H changes. Move selected Bootloader data out of image due to size issues. Update BlTrace tool for new location of trace data. Change-Id: Ic513a95b8f4054d467537c4623d5a7b7aa09e25e RTC:173526 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40096 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Reviewed-by: William G. Hoffa Reviewed-by: Christian R. Geddes Reviewed-by: Daniel M. Crowell --- src/kernel/terminate.C | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/kernel') diff --git a/src/kernel/terminate.C b/src/kernel/terminate.C index dd908b4e7..9b3fb7278 100644 --- a/src/kernel/terminate.C +++ b/src/kernel/terminate.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2016 */ +/* Contributors Listed Below - COPYRIGHT 2012,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -38,6 +38,7 @@ extern "C" void p8_force_attn() NO_RETURN; +#ifndef bl_terminate_C /* Instance of the TI Data Area */ HB_TI_DataArea kernel_TIDataArea; @@ -45,13 +46,10 @@ HB_TI_DataArea kernel_TIDataArea; HB_Descriptor kernel_hbDescriptor = { &kernel_TIDataArea, -#ifndef bl_terminate_C &KernelIpc::ipc_data_area, -#else - NULL, -#endif // bl_terminate_C 0 }; +#endif // bl_terminate_C -- cgit v1.2.3