diff options
| author | William Bryan <wilbryan@us.ibm.com> | 2016-10-20 13:53:03 -0500 |
|---|---|---|
| committer | William A. Bryan <wilbryan@us.ibm.com> | 2016-10-24 11:25:55 -0400 |
| commit | a4e04571d60b58c0c778c870bc215bf467085fb6 (patch) | |
| tree | cff81d38b342965bcfb90b509cd1591a194bfdf2 /src/occBootLoader | |
| parent | f5f808eb2918e96bcdf324bd2dd90853bf9b5f3c (diff) | |
| download | talos-occ-a4e04571d60b58c0c778c870bc215bf467085fb6.tar.gz talos-occ-a4e04571d60b58c0c778c870bc215bf467085fb6.zip | |
Changes for GCC 4.9 and OP
Change-Id: I95ddff4b290fcf3eab617a674afc489698c78a1e
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/31563
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Diffstat (limited to 'src/occBootLoader')
| -rwxr-xr-x | src/occBootLoader/bootMain.c | 1 | ||||
| -rw-r--r-- | src/occBootLoader/img_defs.mk | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/occBootLoader/bootMain.c b/src/occBootLoader/bootMain.c index 89ea20a..15d12fa 100755 --- a/src/occBootLoader/bootMain.c +++ b/src/occBootLoader/bootMain.c @@ -84,7 +84,6 @@ void main() uint32_t l_rc = 0; uint32_t l_gpe0_start_addr = 0; uint32_t l_gpe1_start_addr = 0; - uint32_t l_gpe_size = 0; uint8_t* l_gpe0_src_ptr = 0; uint8_t* l_gpe1_src_ptr = 0; diff --git a/src/occBootLoader/img_defs.mk b/src/occBootLoader/img_defs.mk index 7b33b90..b32ef79 100644 --- a/src/occBootLoader/img_defs.mk +++ b/src/occBootLoader/img_defs.mk @@ -114,8 +114,12 @@ export OCC405_INCLDIR = $(OCC405_SRCDIR)/incl endif ifndef GCC-TOOL-PREFIX +ifdef CROSS_PREFIX +GCC-TOOL-PREFIX = $(CROSS_PREFIX) +else GCC-TOOL-PREFIX = $(CTEPATH)/tools/ppcgcc/prod/bin/powerpc-linux- endif +endif ifndef PPETRACEPP_DIR export PPETRACEPP_DIR = $(abspath ../ppe/tools/ppetracepp) @@ -126,12 +130,12 @@ export PPETOOLS_OBJDIR = $(abspath ../../obj/ppetools) endif ifndef TRACEPP_DIR -export TRACEPP_DIR = $(abspath ../tracepp) +export TRACEPP_DIR = $(abspath ../tools/tracepp) endif CC_ASM = $(GCC-TOOL-PREFIX)gcc TCC = $(PPETOOLS_OBJDIR)/ppetracepp $(GCC-TOOL-PREFIX)gcc -THCC = $(TRACEPP_DIR)/tracepp $(GCC-TOOL-PREFIX)gcc +THCC = $(PPETOOLS_OBJDIR)/tracepp $(GCC-TOOL-PREFIX)gcc CC = $(GCC-TOOL-PREFIX)gcc AS = $(GCC-TOOL-PREFIX)as AR = $(GCC-TOOL-PREFIX)ar |
