diff options
| author | Sumit Kumar <sumit_kumar@in.ibm.com> | 2017-07-05 05:37:12 -0500 |
|---|---|---|
| committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2018-01-23 19:48:04 -0500 |
| commit | 9b03db45c424d6edc5698fa74830dc1d432fdfe8 (patch) | |
| tree | ff608bac2d069988faadcaf2266870dc623825a0 /src/tools | |
| parent | 60bbd1a8b644665590dcbe5b79c0ac7e0ece9f9a (diff) | |
| download | talos-sbe-9b03db45c424d6edc5698fa74830dc1d432fdfe8.tar.gz talos-sbe-9b03db45c424d6edc5698fa74830dc1d432fdfe8.zip | |
Moving DD specific ring coord from TOR to XIP (step 1)
Step 1 - Ensuring backwards compatibility in TOR and XIP APIs to
avoid co-req issue.
- Updated TOR and XIP APIs, xip_tool and ipl_build to handle both
types of DD coordination.
Key_Cronus_Test=XIP_REGRESS
HW-Image-Prereq=51511
- 51511 changes the .rings section DD level packaging. This commit
(42751) prepares the TOR API and associated codes to handle the
new .rings layout while also making the TOR API backwards
compatible to the existing .rings section.
Change-Id: I7d254340808ca9270fc1c96414102794fcffeabe
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42751
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: Cronus HW CI <cronushw-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: Sumit Kumar <sumit_kumar@in.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43258
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/image/Makefile | 7 | ||||
| -rw-r--r-- | src/tools/iplbuild/Makefile | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/tools/image/Makefile b/src/tools/image/Makefile index 11a7ba30..1385d20b 100644 --- a/src/tools/image/Makefile +++ b/src/tools/image/Makefile @@ -5,7 +5,7 @@ # # OpenPOWER sbe Project # -# Contributors Listed Below - COPYRIGHT 2015,2017 +# Contributors Listed Below - COPYRIGHT 2015,2018 # [+] International Business Machines Corp. # # @@ -65,10 +65,13 @@ utilities: $(IMG_DIR)/sbe_default_tool CXXFLAGS+=-DFAPI2_NO_FFDC +$(BASE_OBJDIR)/tools/image/%.o: $(IMAGEPROCS_P9_SRCDIR)/%.c + $(CXX) $(INCLUDES) $(CXXFLAGS) -c -o $@ $< + $(BASE_OBJDIR)/tools/image/%.o: %.c $(CXX) $(INCLUDES) $(CXXFLAGS) -c -o $@ $< -$(IMG_DIR)/sbe_default_tool: $(P9_XIP_BINDIR)/p9_xip_image.o $(BASE_OBJDIR)/tools/image/sbe_default_tool.o +$(IMG_DIR)/sbe_default_tool: $(P9_XIP_BINDIR)/p9_xip_image.o $(BASE_OBJDIR)/tools/image/sbe_default_tool.o $(BASE_OBJDIR)/tools/image/p9_dd_container.o $(CXX) $(CXXFLAGS) ${INCLUDES} -o $@ $^ clean: diff --git a/src/tools/iplbuild/Makefile b/src/tools/iplbuild/Makefile index 40581605..d96ffaff 100644 --- a/src/tools/iplbuild/Makefile +++ b/src/tools/iplbuild/Makefile @@ -5,7 +5,7 @@ # # OpenPOWER sbe Project # -# Contributors Listed Below - COPYRIGHT 2015,2017 +# Contributors Listed Below - COPYRIGHT 2015,2018 # [+] International Business Machines Corp. # # @@ -55,6 +55,7 @@ OBJS = $(P9_XIP_BINDIR)/p9_xip_image.o \ $(BASE_OBJDIR)/tools/iplbuild/cen_ringId.o \ $(BASE_OBJDIR)/tools/iplbuild/p9_tor.o \ $(BASE_OBJDIR)/tools/iplbuild/p9_ipl_build.o \ + $(BASE_OBJDIR)/tools/iplbuild/p9_dd_container.o \ all:objdir utilities @@ -66,7 +67,10 @@ utilities: $(IMG_DIR)/p9_ipl_build CXXFLAGS =-DFAPI2_NO_FFDC $(P9_XIP_BINDIR)/%.o: %.c - $(CXX) $(INCLUDES) $(CXXFLAGS) -c -o $@ $< + $(CXX) $(INCLUDES) $(CXXFLAGS) -c -o $@ $< + +$(BASE_OBJDIR)/tools/iplbuild/%.o: $(IMAGEPROCS_P9_SRCDIR)/%.c + $(CXX) $(INCLUDES) $(CXXFLAGS) -c -o $@ $< $(BASE_OBJDIR)/tools/iplbuild/%.o: %.C $(CXX) $(INCLUDES) $(CXXFLAGS) -c -o $@ $< |
