From 8338d8832750db58231d37b730a30216f77d5202 Mon Sep 17 00:00:00 2001
From: Prachi Gupta <pragupta@us.ibm.com>
Date: Mon, 16 Nov 2015 16:22:32 -0600
Subject: Compiling DQ/DQS compression tool in hostboot

Change-Id: I177a021b7c9d938d69291521830a91600b33a69f
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/22072
Tested-by: Jenkins Server
Tested-by: Jenkins OP Build CI
Tested-by: Jenkins OP HW
Tested-by: FSP CI Jenkins
Reviewed-by: STEPHEN M. CPREK <smcprek@us.ibm.com>
Reviewed-by: Elizabeth Liner <eliner@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
---
 src/usr/hwpf/hwp/makefile                          |  1 +
 .../hwp/mvpd_accessors/compressionTool/makefile    |  8 +++---
 src/usr/hwpf/hwp/mvpd_accessors/makefile           | 29 ++++++++++++++++++++++
 3 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 src/usr/hwpf/hwp/mvpd_accessors/makefile

(limited to 'src/usr')

diff --git a/src/usr/hwpf/hwp/makefile b/src/usr/hwpf/hwp/makefile
index 9a78c0d9a..823faac1c 100644
--- a/src/usr/hwpf/hwp/makefile
+++ b/src/usr/hwpf/hwp/makefile
@@ -57,6 +57,7 @@ SUBDIRS	+= pstates.d
 SUBDIRS	+= proc_hwreconfig.d
 SUBDIRS	+= runtime.d
 SUBDIRS	+= secure_boot.d
+SUBDIRS	+= mvpd_accessors.d
 
 
 include ${ROOTPATH}/config.mk
diff --git a/src/usr/hwpf/hwp/mvpd_accessors/compressionTool/makefile b/src/usr/hwpf/hwp/mvpd_accessors/compressionTool/makefile
index ad4f49996..fa6b04766 100644
--- a/src/usr/hwpf/hwp/mvpd_accessors/compressionTool/makefile
+++ b/src/usr/hwpf/hwp/mvpd_accessors/compressionTool/makefile
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2014
+# Contributors Listed Below - COPYRIGHT 2014,2015
 # [+] International Business Machines Corp.
 #
 #
@@ -24,9 +24,9 @@
 # IBM_PROLOG_END_TAG
 ROOTPATH = ../../../../../..
 
-OUT_FILE += $(ROOTPATH)/obj/modules/compression/compression
+OUT_FILE += $(GENDIR)/compression
 
-GEN_PASS_BODY += compression
+GEN_PASS_BODY += $(OUT_FILE)
 CLEAN_TARGETS += $(OUT_FILE) compression.o
 
 INC_DIRS += $(ROOTPATH)/src/include/usr/ecmddatabuffer
@@ -41,7 +41,7 @@ HCFLAGS += -Di386=1
 
 include $(ROOTPATH)/config.mk
 
-compression: ecmdDataBufferBase.C DQCompressionLib.C EncodeDQMapping.C
+$(OUT_FILE): ecmdDataBufferBase.C DQCompressionLib.C EncodeDQMapping.C
 	$(C2) "    CC         $(notdir $@)"
 	$(C1)$(CCACHE) $(HOST_PREFIX)g++ -O3 -g $^ -o $(OUT_FILE)\
 			$(foreach dir,$(INC_DIRS), -I $(dir)) $(HCFLAGS)
diff --git a/src/usr/hwpf/hwp/mvpd_accessors/makefile b/src/usr/hwpf/hwp/mvpd_accessors/makefile
new file mode 100644
index 000000000..34bb8da52
--- /dev/null
+++ b/src/usr/hwpf/hwp/mvpd_accessors/makefile
@@ -0,0 +1,29 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: src/usr/hwpf/hwp/mvpd_accessors/makefile $
+#
+# OpenPOWER HostBoot Project
+#
+# Contributors Listed Below - COPYRIGHT 2015
+# [+] International Business Machines Corp.
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# IBM_PROLOG_END_TAG
+ROOTPATH = ../../../../..
+
+SUBDIRS += compressionTool.d
+
+include ${ROOTPATH}/config.mk
-- 
cgit v1.2.1