Miscellaneous support for x86 targeting builds in FSP

- Updated makefiles delivered to FSP to include NFP context mk directives
- Updated makefiles delivered to FSP to consolidate subtree directives
- Updated abstract pointer type to handle 4 byte x86 pointers
- Updated attribute resource provider to use updated abstract pointer

Change-Id: Ib924ae40c250d968e9ccbb9cffb1eb38bb747cdd
RTC: 39737
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1519
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 6 insertions, 10 deletions

diff --git a/src/build/mkrules/hbfw/makefile b/src/build/mkrules/hbfw/makefile
index f42390815..e7d1328e3 100755
--- a/src/build/mkrules/hbfw/makefile
+++ b/src/build/mkrules/hbfw/makefile
@@ -27,10 +27,6 @@
 # NOTE: Do NOT modify this file in CMVC directly!  It comes from the Hostboot
 #       repository and will be overwritten.
 
-STANDARD_SUBDIRS += \
-    img             \
-    simics
-
 # Process the fsp subtree
 
 .if(${CONTEXT:R} == "ppc")
@@ -39,17 +35,17 @@ EXPINC_SUBDIRS   += fsp
 OBJECTS_SUBDIRS  += 
 EXPLIB_SUBDIRS   += 
 EXPSHLIB_SUBDIRS += fsp
-STANDARD_SUBDIRS += fsp
+STANDARD_SUBDIRS += fsp img simics
 RUNBVT_SUBDIRS   += 
 
 .elseif(${CONTEXT} == "x86.nfp")
 
-EXPINC_SUBDIRS   += nfp
+EXPINC_SUBDIRS   += fsp
 OBJECTS_SUBDIRS  += 
-EXPLIB_SUBDIRS   += nfp
-EXPSHLIB_SUBDIRS += nfp
-STANDARD_SUBDIRS += nfp
-RUNBVT_SUBDIRS   += 
+EXPLIB_SUBDIRS   += fsp
+EXPSHLIB_SUBDIRS += fsp
+STANDARD_SUBDIRS += fsp
+RUNBVT_SUBDIRS   +=
 
 .endif