diff options
| author | Derk Rembold <rembold@de.ibm.com> | 2015-02-24 09:33:12 +0100 |
|---|---|---|
| committer | Derk Rembold <rembold@de.ibm.com> | 2015-02-24 09:22:26 -0600 |
| commit | d5d4057fc35d4c1f5cf11349288b18c18eaee623 (patch) | |
| tree | bb2f9e8e408c8b8b4ac2c1b14a847c75e68234bf /sbe/sample | |
| parent | ebe285ef16532a08fcf9da82051bc0190ab93fd7 (diff) | |
| download | talos-sbe-d5d4057fc35d4c1f5cf11349288b18c18eaee623.tar.gz talos-sbe-d5d4057fc35d4c1f5cf11349288b18c18eaee623.zip | |
chance id missing
Change-Id: Ic9759d68ae4a4be6e93bc1fa9e2768dcd8f887a5
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15962
Reviewed-by: Derk Rembold <rembold@de.ibm.com>
Tested-by: Derk Rembold <rembold@de.ibm.com>
Diffstat (limited to 'sbe/sample')
| -rw-r--r-- | sbe/sample/Makefile | 2 | ||||
| -rw-r--r-- | sbe/sample/link.cmd | 2 | ||||
| -rw-r--r-- | sbe/sample/pk_scom.c | 1 | ||||
| -rw-r--r-- | sbe/sample/pk_scom.h | 1 | ||||
| -rw-r--r-- | sbe/sample/pk_trace_wrap.c | 1 | ||||
| -rw-r--r-- | sbe/sample/pk_trace_wrap.h | 1 | ||||
| -rw-r--r-- | sbe/sample/sample_main.C | 3 | ||||
| -rw-r--r-- | sbe/sample/topfiles.mk | 1 |
8 files changed, 7 insertions, 5 deletions
diff --git a/sbe/sample/Makefile b/sbe/sample/Makefile index d19b1bc4..f986ce8b 100644 --- a/sbe/sample/Makefile +++ b/sbe/sample/Makefile @@ -14,7 +14,7 @@ endif PK_MAKE_DIR := $(PK_SRCDIR)/$(PPE_TYPE) OBJS := $(addprefix $(OBJDIR)/, $(TOP_OBJECTS)) PKLIB := $(OBJDIR)/pk/libpk.a -#COMMONLIB := $(OBJDIR)/commonlib/libcommon.a + LIB_DIRS = -L$(OBJDIR)/pk #-L$(OBJDIR)/commonlib LINK_OBJS = $(OBJS) $(PKLIB) #$(COMMONLIB) LINK_SCRIPT = $(addprefix $(OBJDIR)/, linkscript) diff --git a/sbe/sample/link.cmd b/sbe/sample/link.cmd index 3de03e18..458de312 100644 --- a/sbe/sample/link.cmd +++ b/sbe/sample/link.cmd @@ -59,7 +59,7 @@ SECTIONS .rela . : { *(.rela*) } > sram .rwdata . : { *(.data) *(.bss) } > sram -// .iplt . : { *(.iplt) } > sram +// .iplt . : { *(.iplt) } > sram _PK_INITIAL_STACK_LIMIT = .; . = . + INITIAL_STACK_SIZE; diff --git a/sbe/sample/pk_scom.c b/sbe/sample/pk_scom.c index 9812cca3..2716b8d5 100644 --- a/sbe/sample/pk_scom.c +++ b/sbe/sample/pk_scom.c @@ -17,7 +17,6 @@ #include "pk.h" #include "pk_scom.h" - uint32_t putscom( uint32_t i_chiplet_id, uint32_t i_address, uint64_t i_data) { uint32_t l_cid=0; diff --git a/sbe/sample/pk_scom.h b/sbe/sample/pk_scom.h index 72d5fa49..52fd5893 100644 --- a/sbe/sample/pk_scom.h +++ b/sbe/sample/pk_scom.h @@ -26,6 +26,7 @@ typedef union cfam_fsi_status_reg { uint64_t igore_fields2 : 44 ; } fields; } cfam_fsi_status_reg_t; + #define PCB_ERROR_NONE 0 #define PCB_ERROR_RESOURCE_OCCUPIED 1 #define PCB_ERROR_CHIPLET_OFFLINE 2 diff --git a/sbe/sample/pk_trace_wrap.c b/sbe/sample/pk_trace_wrap.c index 0da319dc..2fc0d68f 100644 --- a/sbe/sample/pk_trace_wrap.c +++ b/sbe/sample/pk_trace_wrap.c @@ -2,6 +2,7 @@ #include "pk.h" #include "pk_trace.h" + void pk_trace_wrap(const char* str) { PK_TRACE("testsetest"); diff --git a/sbe/sample/pk_trace_wrap.h b/sbe/sample/pk_trace_wrap.h index 767cb54c..1c98fadc 100644 --- a/sbe/sample/pk_trace_wrap.h +++ b/sbe/sample/pk_trace_wrap.h @@ -1,6 +1,7 @@ #ifndef __PK_WRAP_WRAP_H__ #define __PK_WRAP_WRAP__H__ + void pk_trace_wrap(const char*); #endif // __PK_WRAP_WRAP_H__ diff --git a/sbe/sample/sample_main.C b/sbe/sample/sample_main.C index 7cc3822d..fae10355 100644 --- a/sbe/sample/sample_main.C +++ b/sbe/sample/sample_main.C @@ -18,8 +18,7 @@ extern "C" { #define KERNEL_STACK_SIZE 256 #define MAIN_THREAD_STACK_SIZE 256 -//#include <stdint.h> -//#include <istream> + uint8_t G_kernel_stack[KERNEL_STACK_SIZE]; uint8_t G_main_thread_stack[MAIN_THREAD_STACK_SIZE]; diff --git a/sbe/sample/topfiles.mk b/sbe/sample/topfiles.mk index a10a2dca..bd1f0e6d 100644 --- a/sbe/sample/topfiles.mk +++ b/sbe/sample/topfiles.mk @@ -2,4 +2,5 @@ TOP-C-SOURCES = pk_trace_wrap.c pk_scom.c TOP-CPP-SOURCES = sample_main.C TOP-S-SOURCES = + TOP_OBJECTS = $(TOP-C-SOURCES:.c=.o) $(TOP-CPP-SOURCES:.C=.o) $(TOP-S-SOURCES:.S=.o) |
