add SETUP pass to FSP build process

This is needed because there is an auto-generated .H file needed in the
EXPLIB pass that is dependent attributeenums.H, which is another
auto-generated file needed in that pass as well.

Change-Id: I957655f25bf593df2d8bfc31aab520265535ac33
Backport: release-fips830
CMVC-prereq: 954557
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/16471
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 13 insertions, 5 deletions

diff --git a/src/build/mkrules/hbfw/fsp/makefile b/src/build/mkrules/hbfw/fsp/makefile
index 9ef89b25c..501f9dade 100755
--- a/src/build/mkrules/hbfw/fsp/makefile
+++ b/src/build/mkrules/hbfw/fsp/makefile
@@ -5,7 +5,9 @@
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2012,2014
+# Contributors Listed Below - COPYRIGHT 2012,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.
@@ -32,6 +34,7 @@
 
 .if(${CONTEXT:R} == "ppc")
 
+SETUP_SUBDIRS    += targeting
 EXPINC_SUBDIRS   += targeting hwas pnor plugins
 OBJECTS_SUBDIRS  += plugins
 EXPLIB_SUBDIRS   += plugins
@@ -49,6 +52,7 @@ INCLUDES = hbdescriptor.H \
 # this file is in src/hbfw/fsp in cmvc
 .include "makefile.nfp"
 
+SETUP_SUBDIRS    += targeting
 EXPINC_SUBDIRS   += plugins
 OBJECTS_SUBDIRS  += plugins
 EXPLIB_SUBDIRS   += plugins
diff --git a/src/build/mkrules/hbfw/makefile b/src/build/mkrules/hbfw/makefile
index 2c2a745bd..b77424273 100755
--- a/src/build/mkrules/hbfw/makefile
+++ b/src/build/mkrules/hbfw/makefile
@@ -5,7 +5,9 @@
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2012,2014
+# Contributors Listed Below - COPYRIGHT 2012,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.
@@ -31,6 +33,7 @@
 
 .if(${CONTEXT:R} == "ppc")
 
+SETUP_SUBDIRS    += fsp
 EXPINC_SUBDIRS   += fsp
 OBJECTS_SUBDIRS  +=
 EXPLIB_SUBDIRS   += fsp
@@ -40,6 +43,7 @@ RUNBVT_SUBDIRS   +=
 
 .elseif(${CONTEXT} == "x86.nfp")
 
+SETUP_SUBDIRS    += fsp
 EXPINC_SUBDIRS   += fsp
 OBJECTS_SUBDIRS  +=
 EXPLIB_SUBDIRS   += fsp
@@ -59,10 +63,10 @@ TARFILES = fsp.tar simics.tar
 
 VPATH += fsp/hwas/common:
 
-_SUBDIR/BUILD/EXPINC/fsp: expand_tars_fsp.tar
-_SUBDIR/BUILD/EXPINC/simics: expand_tars_simics.tar
+_SUBDIR/BUILD/SETUP/fsp: expand_tars_fsp.tar
+_SUBDIR/BUILD/SETUP/simics: expand_tars_simics.tar
 
-EXPINC_TARGETS += expand_tars
+SETUP_TARGETS += expand_tars
 EXPLIB_TARGETS += epub_check
 
 expand_tars: ${TARFILES:S/^/expand_tars_/g}