diff options
author | Greg Still <stillgs@us.ibm.com> | 2015-10-13 20:54:36 -0500 |
---|---|---|
committer | Martin Peschke <mpeschke@de.ibm.com> | 2015-10-21 07:20:47 -0500 |
commit | 82fc55596dd107514bc3dea1b8be3c23b653c76a (patch) | |
tree | 7375f72411c9ff16775d145ce7ea727fbde46806 /sbe | |
parent | 43aaa85b59ba06dce6e0f7063234235384e31135 (diff) | |
download | talos-sbe-82fc55596dd107514bc3dea1b8be3c23b653c76a.tar.gz talos-sbe-82fc55596dd107514bc3dea1b8be3c23b653c76a.zip |
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 <santosh.puranik@in.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Martin Peschke <mpeschke@de.ibm.com>
Diffstat (limited to 'sbe')
-rw-r--r-- | sbe/hwpf/include/README (renamed from sbe/plat/include/README) | 0 | ||||
-rw-r--r-- | sbe/hwpf/include/fapi2_hw_access.H (renamed from sbe/plat/include/fapi2_hw_access.H) | 0 | ||||
-rw-r--r-- | sbe/hwpf/include/hw_access.H (renamed from sbe/plat/include/hw_access.H) | 0 | ||||
-rw-r--r-- | sbe/hwpf/include/plat/plat_error_scope.H (renamed from sbe/plat/include/plat_error_scope.H) | 0 | ||||
-rw-r--r-- | sbe/hwpf/include/plat/plat_hw_access.H (renamed from sbe/plat/include/plat_hw_access.H) | 0 | ||||
-rw-r--r-- | sbe/hwpf/src/Makefile (renamed from sbe/plat/src/Makefile) | 0 | ||||
-rw-r--r-- | sbe/hwpf/src/fapi2sbefiles.mk (renamed from sbe/plat/src/fapi2sbefiles.mk) | 0 | ||||
-rw-r--r-- | sbe/hwpf/src/return_code.C (renamed from sbe/plat/src/return_code.C) | 0 | ||||
-rw-r--r-- | sbe/image/Makefile | 1 | ||||
-rw-r--r-- | sbe/image/img_defs.mk | 7 |
10 files changed, 6 insertions, 2 deletions
diff --git a/sbe/plat/include/README b/sbe/hwpf/include/README index 4637505d..4637505d 100644 --- a/sbe/plat/include/README +++ b/sbe/hwpf/include/README diff --git a/sbe/plat/include/fapi2_hw_access.H b/sbe/hwpf/include/fapi2_hw_access.H index fca775b1..fca775b1 100644 --- a/sbe/plat/include/fapi2_hw_access.H +++ b/sbe/hwpf/include/fapi2_hw_access.H diff --git a/sbe/plat/include/hw_access.H b/sbe/hwpf/include/hw_access.H index af688421..af688421 100644 --- a/sbe/plat/include/hw_access.H +++ b/sbe/hwpf/include/hw_access.H diff --git a/sbe/plat/include/plat_error_scope.H b/sbe/hwpf/include/plat/plat_error_scope.H index b6ac62e4..b6ac62e4 100644 --- a/sbe/plat/include/plat_error_scope.H +++ b/sbe/hwpf/include/plat/plat_error_scope.H diff --git a/sbe/plat/include/plat_hw_access.H b/sbe/hwpf/include/plat/plat_hw_access.H index 765837fd..765837fd 100644 --- a/sbe/plat/include/plat_hw_access.H +++ b/sbe/hwpf/include/plat/plat_hw_access.H diff --git a/sbe/plat/src/Makefile b/sbe/hwpf/src/Makefile index 7255042e..7255042e 100644 --- a/sbe/plat/src/Makefile +++ b/sbe/hwpf/src/Makefile diff --git a/sbe/plat/src/fapi2sbefiles.mk b/sbe/hwpf/src/fapi2sbefiles.mk index da7f3e7c..da7f3e7c 100644 --- a/sbe/plat/src/fapi2sbefiles.mk +++ b/sbe/hwpf/src/fapi2sbefiles.mk diff --git a/sbe/plat/src/return_code.C b/sbe/hwpf/src/return_code.C index 3dbd7052..3dbd7052 100644 --- a/sbe/plat/src/return_code.C +++ b/sbe/hwpf/src/return_code.C 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) |