Hcode: Create centralized memory map headers

findings and todos:

zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz

redundant cpmr linker
not sure which one is in use

cme/link.cmd
cme/linkcpmr.cmd
cme/stop_cme/link_cpmr.cmd

sgpe/stop_gpe/link.cmd
sgpe/stop_gpe/linkqpmr.cmd

zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz

redundant asm of cpmr and qpmr headers:
not sure which one is in use
file names are inconsistant and confusing

cme/p9_cpmr_header.S
cme/stop_cme/p9_cme_cpmr.S
cme/stop_cme/p9_cme_header.S

sgpe/p9_sgpe_qpmr.S
sgpe/stop_gpe/p9_sgpe_qpmr.S
sgpe/stop_gpe/p9_sgpe_image_header.S

zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz

redundant edit programs
not sure which ones are still useful
contents are overlapping and out updated
(i.e. cme one still try to edit build date/ver)

cme/p9_cpmr_img_edit.C
cme/stop_cme/p9_cme_img_edit.c
cme/stop_cme/p9_cme_edit.mk

sgpe/p9_sgpe_img_edit.c
sgpe/stop_gpe/p9_sgpe_img_edit.c
sgpe/stop_gpe/p9_sgpe_edit.mk

zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz

previous local makefiles
not sure if still useful
optional to keep or delete

cme/Makefile
cme/img_defs.mk

sgpe/Makefile
sgpe/img_defs.mk

sgpe/stop_gpe/Makefile
sgpe/stop_gpe/img_defs.mk

sgpe/boot/Makefile
sgpe/boot/img_defs.mk

zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz

Change-Id: I8f71356cf4f510061d359571009e04fdfe3430d6
Original-Change-Id: I94fbd28fc3e3c125e43232ea556a4e70b293db6d
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36253
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: AMIT KUMAR <akumar3@us.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_sgpe_stop.h b/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_sgpe_stop.h
index 39309a22..c9f109a4 100644
--- a/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_sgpe_stop.h
+++ b/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_sgpe_stop.h
@@ -55,8 +55,9 @@ extern "C" {
 #include "ipc_async_cmd.h"
 #include "ipc_messages.h"
 
-#include "p9_stop_common.h"
+#include "p9_hcode_image_defines.H"
 #include "p9_pm_hcd_flags.h"
+#include "p9_stop_common.h"
 
 #if HW386311_DD1_PBIE_RW_PTR_STOP11_FIX || FUSED_CORE_MODE_SCAN_FIX
 #define EXTRACT_RING_BITS(mask, ring, save) save = (ring) & (mask);
diff --git a/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_sgpe_stop_entry.c b/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_sgpe_stop_entry.c
index 9cf1567c..c7d1672b 100644
--- a/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_sgpe_stop_entry.c
+++ b/import/chips/p9/procedures/ppe_closed/sgpe/stop_gpe/p9_sgpe_stop_entry.c
@@ -25,7 +25,6 @@
 
 #include "p9_sgpe_stop.h"
 #include "p9_sgpe_stop_enter_marks.h"
-#include "p9_hcode_image_defines.H"
 
 extern SgpeStopRecord                           G_sgpe_stop_record;
 
@@ -567,7 +566,7 @@ p9_sgpe_stop_entry()
         }
 
         // disable cme trace array
-        sgpeHeader_t* pSgpeImgHdr = (sgpeHeader_t*)(SGPE_IMAGE_SRAM_BASE + SGPE_HEADER_IMAGE_OFFSET);
+        sgpeHeader_t* pSgpeImgHdr = (sgpeHeader_t*)(OCC_SRAM_SGPE_HEADER_ADDR);
 
         if (pSgpeImgHdr->g_sgpe_reserve_flags & BIT32(4))
         {