diff options
| author | William Bryan <wilbryan@us.ibm.com> | 2016-07-26 15:02:15 -0500 |
|---|---|---|
| committer | William A. Bryan <wilbryan@us.ibm.com> | 2016-07-29 15:05:27 -0400 |
| commit | 9ad0d6f666fcd2392a5d6d3634df82264a5729eb (patch) | |
| tree | 97a99d6aa273436c55a30ce5db064f59b141b0c8 /src/occBootLoader | |
| parent | a545aa59ce8788c4bfe6fd9bb2f64413bff47189 (diff) | |
| download | talos-occ-9ad0d6f666fcd2392a5d6d3634df82264a5729eb.tar.gz talos-occ-9ad0d6f666fcd2392a5d6d3634df82264a5729eb.zip | |
Delete unused files, update PK, and use new compilers
Change-Id: I9e4951a2cebd204d1ea752c63e3f2b532ad3a2db
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27465
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Reviewed-by: Wael El-Essawy <welessa@us.ibm.com>
Diffstat (limited to 'src/occBootLoader')
| -rwxr-xr-x | src/occBootLoader/Makefile | 8 | ||||
| -rw-r--r-- | src/occBootLoader/img_defs.mk | 10 |
2 files changed, 14 insertions, 4 deletions
diff --git a/src/occBootLoader/Makefile b/src/occBootLoader/Makefile index 727b3da..c33c836 100755 --- a/src/occBootLoader/Makefile +++ b/src/occBootLoader/Makefile @@ -44,12 +44,18 @@ DEFS += $(D) # Compilation #******************************************************************************* .PHONY : all -all: $(OBJDIR) ${OBJECTS} ${imageHdrScript} +all: $(PPETOOLS_OBJDIR)/ppetracepp $(OBJDIR) ${OBJECTS} ${imageHdrScript} $(CPP) -P $(DEFS) < linkboot.cmd > $(LINK_SCRIPT) $(LD) ${OBJECTS} -T$(LINK_SCRIPT) $(LDFLAGS) -zmuldefs -Map $(EXECUTABLE).map -melf32ppc --oformat=elf32-powerpc -Bstatic -o $(EXECUTABLE).out -L$(OBJDIR) $(OBJCOPY) -I elf32-powerpc -O binary $(EXECUTABLE).out $(EXECUTABLE).bin $(OBJDUMP) -d $(EXECUTABLE).out > $(EXECUTABLE).dis +$(PPETOOLS_OBJDIR)/ppetracepp: $(PPETOOLS_OBJDIR) + g++ -m32 -O3 -w -g -I$(PPETRACEPP_DIR)/ $(PPETRACEPP_DIR)/ppetracepp.C -o $(PPETOOLS_OBJDIR)/ppetracepp + +$(PPETOOLS_OBJDIR): + mkdir -p $(PPETOOLS_OBJDIR) + $(OBJDIR)/imageHdrScript: imageHdrScript.c $(imageHdrScript_CC) -g $(LDFLAGS) -I. -I$(OCC405_INCLDIR)/ -I$(OCC405_SRCDIR)/ imageHdrScript.c -o $(OBJDIR)/imageHdrScript diff --git a/src/occBootLoader/img_defs.mk b/src/occBootLoader/img_defs.mk index dd07269..a61583f 100644 --- a/src/occBootLoader/img_defs.mk +++ b/src/occBootLoader/img_defs.mk @@ -121,20 +121,24 @@ ifndef PPETRACEPP_DIR export PPETRACEPP_DIR = $(abspath ../ppe/tools/ppetracepp) endif +ifndef PPETOOLS_OBJDIR +export PPETOOLS_OBJDIR = $(abspath ../../obj/ppetools) +endif + ifndef TRACEPP_DIR export TRACEPP_DIR = $(abspath ../tracepp) endif CC_ASM = $(GCC-TOOL-PREFIX)gcc -TCC = $(PPETRACEPP_DIR)/ppetracepp $(GCC-TOOL-PREFIX)gcc -THCC = $(TRACEPP_DIR)/tracepp $(GCC-TOOL-PREFIX)gcc +TCC = $(PPETOOLS_OBJDIR)/ppetracepp $(GCC-TOOL-PREFIX)gcc +THCC = $(TRACEPP_DIR)/tracepp $(GCC-TOOL-PREFIX)gcc CC = $(GCC-TOOL-PREFIX)gcc AS = $(GCC-TOOL-PREFIX)as AR = $(GCC-TOOL-PREFIX)ar LD = $(GCC-TOOL-PREFIX)ld OBJDUMP = $(GCC-TOOL-PREFIX)objdump OBJCOPY = $(GCC-TOOL-PREFIX)objcopy -TCPP = $(PPETRACEPP_DIR)/ppetracepp $(GCC-TOOL-PREFIX)gcc +TCPP = $(PPETOOLS_OBJDIR)/ppetracepp $(GCC-TOOL-PREFIX)gcc THASH = $(PPETRACEPP_DIR)/tracehash.pl CPP = $(GCC-TOOL-PREFIX)cpp |
