HW Image Build Flow: Remove obsolete image sections

These sections have never been used but were integrated into
the respective code sections of the CME, SGPE and Restore images.

Change-Id: I474206c2f7047cc4beacc33e44e17d0fb9a0a59d
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25336
Tested-by: Jenkins Server
Tested-by: PPE CI
Tested-by: Hostboot CI
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: Martin Peschke <mpeschke@de.ibm.com>

6 files changed, 9 insertions, 81 deletions

diff --git a/import/tools/imageProcs/cme_image.S b/import/tools/imageProcs/cme_image.S
index 8cf3345d..f9ca1ed7 100644
--- a/import/tools/imageProcs/cme_image.S
+++ b/import/tools/imageProcs/cme_image.S
@@ -63,17 +63,17 @@ __header_64_reserved:
         .xip_section toc,          4
         .xip_section strings
 
-        .xip_section vect,             8
-        .xip_section cme_image_header, 8
-        .xip_section hcode,            8
-        .xip_section cmn_ring,         8
-        .xip_section spec_ring,        8
+        .xip_section hcode,        8
 
         .xip_section
         .xip_section
         .xip_section
         .xip_section
         .xip_section
+        .xip_section
+        .xip_section
+        .xip_section
+        .xip_section
 
         ////////////////////////////////////////////////////////////////////
         // Other Information - 4-byte aligned; 8 entries; TOC-Indexed
diff --git a/import/tools/imageProcs/cme_image.cmd b/import/tools/imageProcs/cme_image.cmd
index 9df31c09..e4f8c747 100644
--- a/import/tools/imageProcs/cme_image.cmd
+++ b/import/tools/imageProcs/cme_image.cmd
@@ -60,24 +60,6 @@ SECTIONS
     _strings_size = . - _strings_origin;
 
     ////////////////////////////////
-    // VECT
-    ////////////////////////////////
-    . = ALIGN(8);
-    _vect_origin = .;
-    _vect_offset = . - _cme_image_origin;
-    .vect . : { *(.vect) }
-    _vect_size = . - _vect_origin;
-
-    ////////////////////////////////
-    // CME IMAGE HEADER
-    ////////////////////////////////
-    . = ALIGN(8);
-    _cme_image_header_origin = .;
-    _cme_image_header_offset = . - _cme_image_origin;
-    .cme_image_header . : { *(.cme_image_header) }
-    _cme_image_header_size = . - _cme_image_header_origin;
-
-    ////////////////////////////////
     // HCODE
     ////////////////////////////////
     . = ALIGN(8);
@@ -87,24 +69,6 @@ SECTIONS
     _hcode_size = . - _hcode_origin;
 
     ////////////////////////////////
-    // CMN RING
-    ////////////////////////////////
-    . = ALIGN(8);
-    _cmn_ring_origin = .;
-    _cmn_ring_offset = . - _cme_image_origin;
-    .cmn_ring . : { *(.cmn_ring) }
-    _cmn_ring_size = . - _cmn_ring_origin;
-
-    ////////////////////////////////
-    // SPEC RING
-    ///////////////////////////////
-    . = ALIGN(8);
-    _spec_ring_origin = .;
-    _spec_ring_offset = . - _cme_image_origin;
-    .spec_ring . : { *(.spec_ring) }
-    _spec_ring_size = . - _spec_ring_origin;
-
-    ////////////////////////////////
     // end of the image
     ////////////////////////////////
     . = ALIGN(8);
diff --git a/import/tools/imageProcs/restore_image.S b/import/tools/imageProcs/restore_image.S
index 742507c3..325d6593 100644
--- a/import/tools/imageProcs/restore_image.S
+++ b/import/tools/imageProcs/restore_image.S
@@ -65,8 +65,6 @@ __header_64_reserved:
 
         .xip_section cpmr,              8
         .xip_section self_restore,      8
-        .xip_section spr_restore,       8
-        .xip_section scom_restore,      8
 
         .xip_section
         .xip_section
@@ -74,6 +72,8 @@ __header_64_reserved:
         .xip_section
         .xip_section
         .xip_section
+        .xip_section
+        .xip_section
 
         ////////////////////////////////////////////////////////////////////
         // Other Information - 4-byte aligned; 8 entries; TOC-Indexed
diff --git a/import/tools/imageProcs/restore_image.cmd b/import/tools/imageProcs/restore_image.cmd
index 69178077..0e07a15e 100644
--- a/import/tools/imageProcs/restore_image.cmd
+++ b/import/tools/imageProcs/restore_image.cmd
@@ -79,24 +79,6 @@ SECTIONS
     _self_restore_size = . - _self_restore_origin;
 
     ////////////////////////////////
-    // SPR Restore
-    ////////////////////////////////
-    . = ALIGN(8);
-    _spr_restore_origin = .;
-    _spr_restore_offset = . - _restore_image_origin;
-    .spr_restore . : { *(.spr_restore) }
-    _spr_restore_size = . - _spr_restore_origin;
-
-    ////////////////////////////////
-    // SCOM Restore
-    ////////////////////////////////
-    . = ALIGN(8);
-    _scom_restore_origin = .;
-    _scom_restore_offset = . - _restore_image_origin;
-    .scom_restore . : { *(.scom_restore) }
-    _scom_restore_size = . - _scom_restore_origin;
-
-    ////////////////////////////////
     // end of the image
     ////////////////////////////////
     . = ALIGN(8);
diff --git a/import/tools/imageProcs/sgpe_image.S b/import/tools/imageProcs/sgpe_image.S
index 33710597..b9fd90f0 100644
--- a/import/tools/imageProcs/sgpe_image.S
+++ b/import/tools/imageProcs/sgpe_image.S
@@ -68,14 +68,14 @@ __header_64_reserved:
         .xip_section qpmr,              8
         .xip_section lvl1_bl,           8
         .xip_section lvl2_bl,           8
-        .xip_section vect,              8
-        .xip_section sgpe_image_header  8
         .xip_section hcode,             8
 
         .xip_section
         .xip_section
         .xip_section
         .xip_section
+        .xip_section
+        .xip_section
 
         ////////////////////////////////////////////////////////////////////
         // Other Information - 4-byte aligned; 8 entries; TOC-Indexed
diff --git a/import/tools/imageProcs/sgpe_image.cmd b/import/tools/imageProcs/sgpe_image.cmd
index 3fc6679d..f9c970e4 100644
--- a/import/tools/imageProcs/sgpe_image.cmd
+++ b/import/tools/imageProcs/sgpe_image.cmd
@@ -88,24 +88,6 @@ SECTIONS
     _lvl2_bl_size = . - _lvl2_bl_origin;
 
     ////////////////////////////////
-    // Vectors
-    ////////////////////////////////
-    . = ALIGN(8);
-    _vect_origin = .;
-    _vect_offset = . - _sgpe_image_origin;
-    .vect . : { *(.vect) }
-    _vect_size = . - _vect_origin;
-
-    ////////////////////////////////
-    // SGPE Image Header
-    ////////////////////////////////
-    . = ALIGN(8);
-    _sgpe_image_header_origin = .;
-    _sgpe_image_header_offset = . - _sgpe_image_origin;
-    .sgpe_image_header . : { *(.sgpe_image_header) }
-    _sgpe_image_header_size = . - _sgpe_image_header_origin;
-
-    ////////////////////////////////
     // HCODE
     ////////////////////////////////
     . = ALIGN(8);