Build full OCC image and update build process

Change-Id: I8e6d716a48f30021b653e850c74deb7526cfe293
RTC:133001
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22155
Tested-by: FSP CI Jenkins
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>

7 files changed, 33 insertions, 64 deletions

diff --git a/src/occ_gpe0/Makefile b/src/occ_gpe0/Makefile
index 0039e1d..cdcbb10 100644
--- a/src/occ_gpe0/Makefile
+++ b/src/occ_gpe0/Makefile
@@ -5,7 +5,7 @@
 #
 # OpenPOWER OnChipController Project
 #
-# Contributors Listed Below - COPYRIGHT 2015
+# Contributors Listed Below - COPYRIGHT 2015,2016
 # [+] International Business Machines Corp.
 #
 #
@@ -100,6 +100,6 @@ clean:
 	rm -fr $(OBJDIR)
 
 #Add dependencies to header files
-ifneq ($(MAKECMDGOALS),clean)
-include $(OBJS:.o=.d) 
-endif
+#ifneq ($(MAKECMDGOALS),clean)
+#include $(OBJS:.o=.d) 
+#endif
diff --git a/src/occ_gpe0/gpe0_main.c b/src/occ_gpe0/gpe0_main.c
index 2777a70..398f137 100644
--- a/src/occ_gpe0/gpe0_main.c
+++ b/src/occ_gpe0/gpe0_main.c
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER OnChipController Project                                     */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015                             */
+/* Contributors Listed Below - COPYRIGHT 2015,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
diff --git a/src/occ_gpe0/gpe_export.h b/src/occ_gpe0/gpe_export.h
deleted file mode 100755
index 84184e7..0000000
--- a/src/occ_gpe0/gpe_export.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG                                                   */
-/* This is an automatically generated prolog.                             */
-/*                                                                        */
-/* $Source: src/occ_405/gpe/gpe_export.h $                                */
-/*                                                                        */
-/* OpenPOWER OnChipController Project                                     */
-/*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2015                        */
-/* [+] International Business Machines Corp.                              */
-/*                                                                        */
-/*                                                                        */
-/* Licensed under the Apache License, Version 2.0 (the "License");        */
-/* you may not use this file except in compliance with the License.       */
-/* You may obtain a copy of the License at                                */
-/*                                                                        */
-/*     http://www.apache.org/licenses/LICENSE-2.0                         */
-/*                                                                        */
-/* Unless required by applicable law or agreed to in writing, software    */
-/* distributed under the License is distributed on an "AS IS" BASIS,      */
-/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
-/* implied. See the License for the specific language governing           */
-/* permissions and limitations under the License.                         */
-/*                                                                        */
-/* IBM_PROLOG_END_TAG                                                     */
-
-#ifndef _GPE_EXPORT_H
-#define _GPE_EXPORT_H
-
-typedef struct {
-     union
-     {
-       struct {
-         uint32_t rc;
-         uint32_t addr;
-       };
-       uint64_t error;
-     };
-     uint64_t ffdc;
-} GpeErrorStruct;  // Same for every GPE program
-
-#endif //_GPE_EXPORT_H
diff --git a/src/occ_gpe0/gpe_util.c b/src/occ_gpe0/gpe_util.c
index 42125a9..d8f7e6d 100644
--- a/src/occ_gpe0/gpe_util.c
+++ b/src/occ_gpe0/gpe_util.c
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER OnChipController Project                                     */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015                             */
+/* Contributors Listed Below - COPYRIGHT 2015,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -27,6 +27,7 @@
 #include "ppe42_scom.h"
 #include "pss_constants.h"
 #include "gpe_util.h"
+#include "gpe_export.h"
 #define SPIPSS_P2S_ONGOING_MASK 0x8000000000000000
 
 /*
diff --git a/src/occ_gpe0/img_defs.mk b/src/occ_gpe0/img_defs.mk
index fe5ea31..f13815a 100644
--- a/src/occ_gpe0/img_defs.mk
+++ b/src/occ_gpe0/img_defs.mk
@@ -5,7 +5,7 @@
 #
 # OpenPOWER OnChipController Project
 #
-# Contributors Listed Below - COPYRIGHT 2015
+# Contributors Listed Below - COPYRIGHT 2015,2016
 # [+] International Business Machines Corp.
 #
 #
@@ -118,6 +118,14 @@ ifndef PPETRACEPP_DIR
 export PPETRACEPP_DIR = $(abspath ../ppe/tools/ppetracepp)
 endif
 
+ifndef BOOTLOADER_OBJDIR
+export BOOTLOADER_OBJDIR = $(BASE_OBJDIR)/occBootLoader
+endif
+
+ifndef IMGHDRSCRIPT
+export IMGHDRSCRIPT = $(BOOTLOADER_OBJDIR)/imageHdrScript
+endif
+
 OBJDIR = $(IMG_OBJDIR)$(SUB_OBJDIR)
 
 
diff --git a/src/occ_gpe0/link.cmd b/src/occ_gpe0/link.cmd
index a64a21a..344c060 100644
--- a/src/occ_gpe0/link.cmd
+++ b/src/occ_gpe0/link.cmd
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER OnChipController Project                                     */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015                             */
+/* Contributors Listed Below - COPYRIGHT 2015,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -36,6 +36,7 @@ OUTPUT_FORMAT(elf32-powerpc);
 // is loaded at 0xfff01000
 #define SRAM_START 0xfff01000
 #define SRAM_LENGTH 0xF000
+// Exception vectors
 #define PPE_DEBUG_PTRS_OFFSET 0x180
 
 MEMORY
@@ -51,12 +52,12 @@ EXTERN(pk_debug_ptrs);
 SECTIONS
 {
     . = SRAM_START;
-
     . = ALIGN(512);
 
     _VECTOR_START = .;
+    __START_ADDR__ = .;
 
-    .vectors  _VECTOR_START  : { *(.vectors) } > sram
+    .vectors  _VECTOR_START  : {  *(.vectors) } > sram
 
     ///////////////////////////////////////////////////////////////////////////
     // Debug Pointers Table
@@ -71,13 +72,12 @@ SECTIONS
     ////////////////////////////////
     // All non-vector code goes here
     ////////////////////////////////
-    .text       : { *(.text) } > sram
+    .text       : { *(.text) . = ALIGN(128); } > sram
 
     ////////////////////////////////
     // Read-only Data
     ////////////////////////////////
 
-    . = ALIGN(8);
     _RODATA_SECTION_BASE = .;
 
     // SDA2 constant sections .sdata2 and .sbss2 must be adjacent to each
@@ -85,20 +85,21 @@ SECTIONS
     // offsets. 
 
     _SDA2_BASE_ = .;
-   .sdata2 . : { *(.sdata2) } > sram
-   .sbss2  . : { *(.sbss2) } > sram
+   .sdata2 . : { *(.sdata2) . = ALIGN(128); } > sram
+   .sbss2  . : { *(.sbss2 ) . = ALIGN(128); } > sram
 
    // Other read-only data.  
 
-   .rodata . : { *(.rodata*) *(.got2) } > sram
+   .rodata . : { *(.rodata*) *(.got2) . = ALIGN(128); } > sram
 
-    _RODATA_SECTION_SIZE = . - _RODATA_SECTION_BASE;
+    __READ_ONLY_DATA_LEN__ = . - _RODATA_SECTION_BASE;
+    __WRITEABLE_DATA_ADDR__ = .;
+    __WRITEABLE_DATA_LEN__ = . - __WRITEABLE_DATA_ADDR__;
 
     ////////////////////////////////
     // Read-write Data
     ////////////////////////////////
 
-    . = ALIGN(8);
     _DATA_SECTION_BASE = .;
 
     // SDA sections .sdata and .sbss must be adjacent to each
@@ -106,15 +107,15 @@ SECTIONS
     // offsets. 
 
     _SDA_BASE_ = .;
-    .sdata  . : { *(.sdata)  } > sram
-    .sbss   . : { *(.sbss)   } > sram
+    .sdata  . : { *(.sdata) . = ALIGN(128); } > sram
+    .sbss   . : { *(.sbss)  . = ALIGN(128); } > sram
 
     // Other read-write data
     // It's not clear why boot.S is generating empty .glink,.iplt
 
-   .rela   . : { *(.rela*) } > sram
-   .rwdata . : { *(.data) *(.bss) } > sram
-//   .iplt . : { *(.iplt) } > sram
+   .rela   . : { *(.rela*) . = ALIGN(128); } > sram
+   .rwdata . : { *(.data) *(.bss) . = ALIGN(128); } > sram
+//   .iplt . : { *(.iplt) ALIGN(128); } > sram
 
    _PK_INITIAL_STACK_LIMIT = .;
    . = . + INITIAL_STACK_SIZE;
diff --git a/src/occ_gpe0/topfiles.mk b/src/occ_gpe0/topfiles.mk
index 58f261c..8723d2f 100644
--- a/src/occ_gpe0/topfiles.mk
+++ b/src/occ_gpe0/topfiles.mk
@@ -5,7 +5,7 @@
 #
 # OpenPOWER OnChipController Project
 #
-# Contributors Listed Below - COPYRIGHT 2015
+# Contributors Listed Below - COPYRIGHT 2015,2016
 # [+] International Business Machines Corp.
 #
 #