From 82fc55596dd107514bc3dea1b8be3c23b653c76a Mon Sep 17 00:00:00 2001 From: Greg Still Date: Tue, 13 Oct 2015 20:54:36 -0500 Subject: Rearrange PPE FAPI2 directory structure to be more in-line with HWPF - Move files into new structure - Delete old, obsolete files and directories - Pre-import mirror of HWPF into importtemp - No additional function Change-Id: Iadad6eb05349f807acea362ec77d7f58273878b5 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/21150 Tested-by: Jenkins Server Reviewed-by: Santosh S. Puranik Reviewed-by: Sachin Gupta Reviewed-by: Martin Peschke --- sbe/image/Makefile | 1 + sbe/image/img_defs.mk | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'sbe/image') diff --git a/sbe/image/Makefile b/sbe/image/Makefile index 7417264d..01cbfa81 100644 --- a/sbe/image/Makefile +++ b/sbe/image/Makefile @@ -136,6 +136,7 @@ $(LINK_SCRIPT_SEEPROM): linkseeprom.cmd $(OBJDIR)/$(IMAGE_SBE_NAME).bin $(OBJDIR)/$(IMAGE_SBE_NAME).dis: $(OBJDIR)/$(IMAGE_SBE_NAME).out $(OBJCOPY) -O binary $< $(OBJDIR)/$(IMAGE_SBE_NAME).bin --pad-to 0x`/usr/bin/nm $(OBJDIR)/$(IMAGE_SBE_NAME).out | grep "A _sbe_end" | cut -d " " -f 1` $(OBJDUMP) -S $< > $(OBJDIR)/$(IMAGE_SBE_NAME).dis + $(NM) $< > $(OBJDIR)/$(IMAGE_SBE_NAME).syms # create a linked ELF executable $(OBJDIR)/$(IMAGE_SBE_NAME).out: buildInfo $(OBJDIR)/base_sbe_fixed.o $(LINK_OBJS) $(LINK_SCRIPT_SBE) diff --git a/sbe/image/img_defs.mk b/sbe/image/img_defs.mk index ec78b367..df06530a 100644 --- a/sbe/image/img_defs.mk +++ b/sbe/image/img_defs.mk @@ -104,12 +104,12 @@ export PPETRACEPP_DIR = $(abspath ../../tools/ppetracepp) endif ifndef PLAT_FAPI2_DIR -export PLAT_FAPI2_DIR = $(abspath ../plat) +export PLAT_FAPI2_DIR = $(abspath ../hwpf) endif ifndef PPE_FAPI2_DIR -export PPE_FAPI2_DIR = $(abspath ../../hwpf/plat) +export PPE_FAPI2_DIR = $(abspath ../../hwpf) endif ifndef BASE_FAPI2_DIR @@ -208,8 +208,11 @@ export LD_LIBRARY_PATH = /afs/awd.austin.ibm.com/proj/p3/cte/tools/gcc405lin/vol INCLUDES += $(IMG_INCLUDES) INCLUDES += -I$(IMAGE_SRCDIR)/../../../include INCLUDES += -I$(HWPLIB_SRCDIR) +INCLUDES += -I$(PLAT_FAPI2_DIR)/include/plat INCLUDES += -I$(PLAT_FAPI2_DIR)/include +INCLUDES += -I$(PPE_FAPI2_DIR)/include/plat INCLUDES += -I$(PPE_FAPI2_DIR)/include +INCLUDES += -I$(BASE_FAPI2_DIR)/include/plat INCLUDES += -I$(BASE_FAPI2_DIR)/include INCLUDES += -I$(PK_SRCDIR)/../include INCLUDES += -I$(PK_SRCDIR)/$(PPE_TYPE) -- cgit v1.2.1