summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sbe/image/Makefile13
-rw-r--r--sbe/image/img_defs.mk4
2 files changed, 16 insertions, 1 deletions
diff --git a/sbe/image/Makefile b/sbe/image/Makefile
index a895c1b8..13e142bc 100644
--- a/sbe/image/Makefile
+++ b/sbe/image/Makefile
@@ -75,6 +75,8 @@ LIB_DIRS += -L$(OBJDIR)/perv
PERVLIB := $(OBJDIR)/perv/libperv.a
LLIBS += -lperv
+SBE_TOOLS := $(TOOLS_IMAGE_DIR)/sbe_xip_tool $(TOOLS_IMAGE_DIR)/sbe_default_tool
+
LINK_OBJS = $(OBJS) $(SBEFWLIB) $(PKLIB) $(FAPI2LIB) $(CACHELIB) $(CORELIB) $(HWPLIB) $(P2PLIB) $(PERVLIB)
# Define the objects
@@ -116,7 +118,7 @@ $(LINK_SCRIPT_SBE): linksbe.cmd
$(CPP) -E -x c++ -P $(DEFS) linksbe.cmd -o $(LINK_SCRIPT_SBE)
-all: $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin $(OBJDIR)/$(IMAGE_SBE_NAME).bin
+all: $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin $(OBJDIR)/$(IMAGE_SBE_NAME).bin $(SBE_TOOLS) normalize $(OBJDIR)/fixed.bin
#Create an obj directory if needed
@@ -197,6 +199,15 @@ $(P2PLIB):
$(MAKE) -I $(IMAGE_SRCDIR) -C $(P2P_SRCDIR) -f Makefile
endif
+$(SBE_TOOLS):
+ $(MAKE) -C $(TOOLS_IMAGE_DIR) -f Makefile
+
+normalize: $(SBE_TOOLS) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin
+ $(TOOLS_IMAGE_DIR)/sbe_xip_tool $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin normalize
+
+$(OBJDIR)/fixed.bin: $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out
+ /afs/bb/proj/cte/tools/ppetools/prod/powerpc-eabi/bin/objcopy -O binary --only-section=.fixed $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out $(OBJDIR)/fixed.bin
+
# collect all of the trace hash files for this image into a single trexStringFile
.PHONY : tracehash
tracehash:
diff --git a/sbe/image/img_defs.mk b/sbe/image/img_defs.mk
index 554960e4..0ce1d2e6 100644
--- a/sbe/image/img_defs.mk
+++ b/sbe/image/img_defs.mk
@@ -74,6 +74,10 @@ ifndef TOOLS_ATTR_DIR
export TOOLS_ATTR_DIR = $(abspath ../../tools/scripts)
endif
+ifndef TOOLS_IMAGE_DIR
+export TOOLS_IMAGE_DIR = $(abspath ../../tools/image)
+endif
+
ifndef P2P_SRCDIR
export P2P_SRCDIR = $(abspath ../../tools/PowerPCtoPPE)
endif
OpenPOWER on IntegriCloud