base_ppe_header.S cleanup

- removed unused macros and common macros now defined in p9_xip_image.h
- removed some obsolete image space code
- removed unused entry_point parameter of xip_header macro
- coding style changes to be consistent with similar files in ekb
- changed build_host string to 40 characters as defined in p9_xip_image.h

Change-Id: Ide5b895c542dcfc484baeac71dadaf1529ec6685
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29883
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Martin Peschke <mpeschke@de.ibm.com>

1 files changed, 34 insertions, 97 deletions

diff --git a/src/build/utils/base_ppe_header.S b/src/build/utils/base_ppe_header.S
index 7e5bc1ca..d1e2c474 100644
--- a/src/build/utils/base_ppe_header.S
+++ b/src/build/utils/base_ppe_header.S
@@ -22,71 +22,11 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-//-----------------------------------------------------------------------------
-// *! (C) Copyright International Business Machines Corp. 2014
-// *! All Rights Reserved -- Property of IBM
-// *! *** IBM Confidential ***
-//-----------------------------------------------------------------------------
-
-/// \file base_ppe_header.S
-/// \brief code to create header, toc, strings, fixed and fixed_toc sections
-///
-/// function P9XipHeader creates header section, function .proc_sbe_fixed
-/// creates fixed, fixed_toc sections
+
 #include "p9_xip_image.h"
 #include "proc_sbe_fixed.H"
 
-
-#define IMAGE_SPACE_UNDEFINED 0xffff
-#define IMAGE_SPACE_OCI       0x8000
-#define IMAGE_SPACE_PNOR      0x800b
-#define IMAGE_SPACE_OTPROM    0x0001
-#define IMAGE_SPACE_SEEPROM   0x800c
-#define IMAGE_SPACE_BASE      0x0008
-
-
-
-    .macro    ..checku, x:req, bits:req, err="Unsigned value too large"
-
-    .if    (((\bits) <= 0) || ((\bits) > 63))
-    .error    "The number of bits must be in the range 0 < bits < 64"
-    .endif
-
-    .iflt    (\x)
-    .error  "An unsigned value is required here"
-        .endif
-
-    .ifgt    ((\x) - (0xffffffffffffffff >> (64 - (\bits))))
-    .error    "\err"
-    .endif
-
-    .endm
-
-    .macro  ..check_u16, u16
-    ..checku (\u16), 16, "Unsigned immediate is larger than 16 bits"
-    .endm
-
-
-    .macro  ..set_default_space, s
-    ..check_u16 (\s)
-    .set    _PGAS_DEFAULT_SPACE, (\s)
-    .endm
-
-    .macro    ..check_default_space
-    .if    (_PGAS_DEFAULT_SPACE == IMAGE_SPACE_UNDEFINED)
-    .error    "The PGAS default address space has not been defined"
-    .endif
-    .endm
-
-
-    .macro    .quada, offset:req
-    ..check_default_space
-    .long   _PGAS_DEFAULT_SPACE
-    .long    (\offset)
-    .endm
-
-
-    .macro    P9XipHeader, magic, link_address, entry_point, image_size
+    .macro    P9XipHeader, magic, link_address, image_size
 
     .section .header, "a", @progbits
 
@@ -96,23 +36,23 @@
     //////////////////////////////////////////////////////////////////////
 
 __magic:
-    .quad    (\magic)
+        .quad (\magic)
 __L1_LoaderAddr:
-    .quad    0
+        .quad 0
 __L2_LoaderAddr:
-    .quad    0
+        .quad 0
 __kernelAddr:
-    .quad   0
+        .quad 0
 __link_address:
-    .quada    (\link_address)
+        .quad (\link_address)
 __header_64_reserved:
-    .quad    0, 0, 0
+        .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
+        .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
 
         //////////////////////////////////////////////////////////////////////
         // Section Table - Not TOC-Indexed
@@ -123,6 +63,7 @@ __header_64_reserved:
         .xip_section fixed_toc,            8
         .xip_section toc,                  4
         .xip_section strings
+
         .xip_section loader_text,          4
         .xip_section loader_data,          8, empty=1
         .xip_section text,                 4
@@ -140,17 +81,17 @@ __header_64_reserved:
         //////////////////////////////////////////////////////////////////////
 
 __image_size:
-    .long    (\image_size)
+        .long (\image_size)
 __build_date:
-    .long    0
+        .long 0
 __build_time:
-    .long    0
+        .long 0
 __header_32_reserved:
-    .long    0, 0, 0, 0, 0
+        .long 0, 0, 0, 0, 0
 
-    .xip_toc image_size, P9_XIP_UINT32, __image_size
-    .xip_toc build_date, P9_XIP_UINT32, __build_date
-    .xip_toc build_time, P9_XIP_UINT32, __build_time
+        .xip_toc image_size, P9_XIP_UINT32, __image_size
+        .xip_toc build_date, P9_XIP_UINT32, __build_date
+        .xip_toc build_time, P9_XIP_UINT32, __build_time
 
 
         //////////////////////////////////////////////////////////////////////
@@ -158,37 +99,34 @@ __header_32_reserved:
         //////////////////////////////////////////////////////////////////////
 
 __header_version:
-    .byte    P9_XIP_HEADER_VERSION
+        .byte P9_XIP_HEADER_VERSION
 __toc_normalized:
-    .byte    0
+        .byte 0
 __toc_sorted:
-    .byte    0
+        .byte 0
 __header_8_reserved:
-    .byte    0, 0, 0, 0, 0
-
-    .xip_toc header_version, P9_XIP_UINT8, __header_version
-    .xip_toc toc_normalized, P9_XIP_UINT8, __toc_normalized
-    .xip_toc toc_sorted, P9_XIP_UINT8, __toc_sorted
+        .byte 0, 0, 0, 0, 0
 
+        .xip_toc header_version, P9_XIP_UINT8, __header_version
+        .xip_toc toc_normalized, P9_XIP_UINT8, __toc_normalized
+        .xip_toc toc_sorted, P9_XIP_UINT8, __toc_sorted
 
         //////////////////////////////////////////////////////////////////////
         // Strings; 64 characters allocated; TOC-Indexed
         //////////////////////////////////////////////////////////////////////
 
 __build_user:
-    .asciz    "unknown        "         # 16 Characters allocated
+        .asciz "unknown        "                         # 16 Characters
 __build_host:
-    .asciz    "unknown                " # 24 characters allocated
+        .asciz "unknown                                " # 40 characters
 __header_string_reserved:
-    .space    24, 0
-
-    .xip_toc build_user, P9_XIP_STRING, __build_user
-    .xip_toc build_host, P9_XIP_STRING, __build_host
+        .space    8, 0
 
+        .xip_toc build_user, P9_XIP_STRING, __build_user
+        .xip_toc build_host, P9_XIP_STRING, __build_host
 
     .endm
 
-
     .section .fixed, "a", @progbits
     .section .fixed_toc, "a", @progbits
     .section .loader_data, "a", @progbits
@@ -198,8 +136,7 @@ __header_string_reserved:
     .section .strings, "aS", @progbits
     .section .base, "a", @progbits
 
-    ..set_default_space IMAGE_SPACE_SEEPROM
-    P9XipHeader P9_XIP_MAGIC_SEEPROM, 0x80000000, 0x00000000, _sbe_image_size
+    P9XipHeader P9_XIP_MAGIC_SEEPROM, 0x80000000, _sbe_image_size
 
     // Create the .fixed section
     .proc_sbe_fixed_system