HW Image Build Flow: Cleanups

Various changes that should be pushed to respective commits:
- no attributes => no .fixed section for CME image
- no attributes => no .fixed section for HW image
- no bootloaders and kernel for HW image => no TOC entries
- no bootloaders for CME image => no TOC entries
- no bootloaders for Restore image => no TOC entries
- moved ADD_IMAGE_INCDIR call from build flows to BUILD_IMAGE
- removed some extra white space

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

6 files changed, 2 insertions, 29 deletions

diff --git a/import/tools/imageProcs/cme_image.S b/import/tools/imageProcs/cme_image.S
index 0a671cec..761214c3 100644
--- a/import/tools/imageProcs/cme_image.S
+++ b/import/tools/imageProcs/cme_image.S
@@ -50,8 +50,6 @@ __header_64_reserved:
         .quad 0, 0, 0
 
         .xip_toc magic, P9_XIP_UINT64, __magic
-        .xip_toc L1_LoaderAddr, P9_XIP_UINT64, __L1_LoaderAddr
-        .xip_toc L2_LoaderAddr, P9_XIP_UINT64, __L2_LoaderAddr
         .xip_toc kernelAddr, P9_XIP_UINT64, __kernelAddr
         .xip_toc link_address, P9_XIP_UINT64, __link_address
 
@@ -60,8 +58,8 @@ __header_64_reserved:
         ////////////////////////////////////////////////////////////////////
 
         .xip_section header
-        .xip_section fixed,        8
-        .xip_section fixed_toc,    8
+        .xip_section
+        .xip_section
         .xip_section toc,          4
         .xip_section strings
 
@@ -127,8 +125,6 @@ __header_string_reserved:
 
     .endm
 
-    .section .fixed, "a", @progbits
-    .section .fixed_toc, "a", @progbits
     .section .toc, "a", @progbits
     .section .strings, "aS", @progbits
 
diff --git a/import/tools/imageProcs/cme_image.cmd b/import/tools/imageProcs/cme_image.cmd
index 2ff05150..9df31c09 100644
--- a/import/tools/imageProcs/cme_image.cmd
+++ b/import/tools/imageProcs/cme_image.cmd
@@ -42,24 +42,6 @@ SECTIONS
     _header_size = . - _header_origin;
 
     ////////////////////////////////
-    // FIXED
-    ////////////////////////////////
-    . = ALIGN(512);
-    _fixed_origin = .;
-    _fixed_offset = . - _cme_image_origin;
-    .fixed . : { *(.fixed) }
-    _fixed_size = . - _fixed_origin;
-
-    ////////////////////////////////
-    // FIXED_TOC
-    ////////////////////////////////
-    . = ALIGN(8);
-    _fixed_toc_origin = .;
-    _fixed_toc_offset = . - _cme_image_origin;
-    .fixed_toc . : { *(.fixed_toc) }
-    _fixed_toc_size = . - _fixed_toc_origin;
-
-    ////////////////////////////////
     // TOC
     ////////////////////////////////
     . = ALIGN(4);
diff --git a/import/tools/imageProcs/cme_image.mk b/import/tools/imageProcs/cme_image.mk
index f6a96bdd..66150868 100644
--- a/import/tools/imageProcs/cme_image.mk
+++ b/import/tools/imageProcs/cme_image.mk
@@ -23,7 +23,6 @@
 #
 # IBM_PROLOG_END_TAG
 IMAGE=cme_image
-$(call ADD_IMAGE_INCDIR,$(IMAGE),$(ROOTPATH)/chips/p9/xip)
 $(call APPEND_EMPTY_SECTION,vect,1024)
 $(call APPEND_EMPTY_SECTION,cme_image_header,1024)
 $(call APPEND_EMPTY_SECTION,hcode,1024)
diff --git a/import/tools/imageProcs/restore_image.S b/import/tools/imageProcs/restore_image.S
index 9ab82c7c..efa029b8 100644
--- a/import/tools/imageProcs/restore_image.S
+++ b/import/tools/imageProcs/restore_image.S
@@ -50,8 +50,6 @@ __header_64_reserved:
         .quad 0, 0, 0
 
         .xip_toc magic, P9_XIP_UINT64, __magic
-        .xip_toc L1_LoaderAddr, P9_XIP_UINT64, __L1_LoaderAddr
-        .xip_toc L2_LoaderAddr, P9_XIP_UINT64, __L2_LoaderAddr
         .xip_toc kernelAddr, P9_XIP_UINT64, __kernelAddr
         .xip_toc link_address, P9_XIP_UINT64, __link_address
 
diff --git a/import/tools/imageProcs/restore_image.mk b/import/tools/imageProcs/restore_image.mk
index cdb6b934..ebee547d 100644
--- a/import/tools/imageProcs/restore_image.mk
+++ b/import/tools/imageProcs/restore_image.mk
@@ -23,7 +23,6 @@
 #
 # IBM_PROLOG_END_TAG
 IMAGE=restore_image
-$(call ADD_IMAGE_INCDIR,$(IMAGE),$(ROOTPATH)/chips/p9/xip)
 #$(call XIP_TOOL,append,.cpmr,$(ROOTPATH)/chips/p9/procedures/ppe_closed/cme/stop_cme/obj/stop_cme/cpmr_header.bin)
 $(call XIP_TOOL,append,.self_restore,$(ROOTPATH)/chips/p9/procedures/utils/stopreg/selfRest.bin)
 $(call BUILD_IMAGE)
diff --git a/import/tools/imageProcs/sgpe_image.mk b/import/tools/imageProcs/sgpe_image.mk
index 1a0a0e85..5c757f06 100644
--- a/import/tools/imageProcs/sgpe_image.mk
+++ b/import/tools/imageProcs/sgpe_image.mk
@@ -23,7 +23,6 @@
 #
 # IBM_PROLOG_END_TAG
 IMAGE=sgpe_image
-$(call ADD_IMAGE_INCDIR,$(IMAGE),$(ROOTPATH)/chips/p9/xip)
 $(call APPEND_EMPTY_SECTION,qpmr,1024)
 $(call APPEND_EMPTY_SECTION,lvl1_bl,1024)
 $(call APPEND_EMPTY_SECTION,lvl2_bl,1024)