diff options
author | Patrick Williams <iawillia@us.ibm.com> | 2013-02-27 18:58:30 -0600 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-03-01 14:30:16 -0600 |
commit | b3d259d970c91fb8ac3b931e5409dd8cecca699f (patch) | |
tree | 156802817d5d014f4affd01eaa1a5332c0491054 /src/usr/hwpf | |
parent | c51452c00b0e2bf2510d63e6863e3cd9802ee711 (diff) | |
download | blackbird-hostboot-b3d259d970c91fb8ac3b931e5409dd8cecca699f.tar.gz blackbird-hostboot-b3d259d970c91fb8ac3b931e5409dd8cecca699f.zip |
Refactoring of the build system.
- Remove unused files for generating LIDs.
- Reduce the overall verbosity of the build.
- Separate 'config.mk' into a number of smaller, topic-centric
files and comment better.
- Generalize the 'passes' concept and added an IMAGES pass.
- Deprecate most "magic" make variables like EXTRAFOO.
- Overall performance improvements.
I've tried to reduce the impact of these changes on component-level
makefiles. There will be follow-up commit(s) to improve those and
decrease the verbosity of some component-owned commands.
Change-Id: I6d319f5338eb3946f56b281c3cdd5f341a016fcc
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/3368
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: ADAM R. MUHLE <armuhle@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/hwpf')
-rw-r--r-- | src/usr/hwpf/fapi/makefile | 4 | ||||
-rw-r--r-- | src/usr/hwpf/hwp/build_winkle_images/makefile | 3 | ||||
-rw-r--r-- | src/usr/hwpf/makefile | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/usr/hwpf/fapi/makefile b/src/usr/hwpf/fapi/makefile index 0a76de05f..a6b5a3348 100644 --- a/src/usr/hwpf/fapi/makefile +++ b/src/usr/hwpf/fapi/makefile @@ -5,7 +5,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2011,2012 +# COPYRIGHT International Business Machines Corp. 2011,2013 # # p1 # @@ -27,7 +27,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/plat EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp -CUSTOMFLAGS += -D_NO_SPY_ACCESS=1 +CFLAGS += -D_NO_SPY_ACCESS=1 OBJS = fapiReturnCode.o \ fapiReturnCodeDataRef.o \ diff --git a/src/usr/hwpf/hwp/build_winkle_images/makefile b/src/usr/hwpf/hwp/build_winkle_images/makefile index 2b87c1a5b..f84e83f91 100644 --- a/src/usr/hwpf/hwp/build_winkle_images/makefile +++ b/src/usr/hwpf/hwp/build_winkle_images/makefile @@ -44,7 +44,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/mvpd_accessors EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/build_winkle_images/p8_set_pore_bar -CUSTOMFLAGS+= -D __FAPI +CFLAGS += -D __FAPI ## NOTE: add new object files when you add a new HWP @@ -59,7 +59,6 @@ OBJS = build_winkle_images.o \ p8_pmc_deconfig_setup.o \ p8_poreslw_init.o \ p8_set_pore_bar.o \ - p8_slw_build.o \ p8_xip_customize.o \ p8_ring_identification.o \ p8_slw_build.o \ diff --git a/src/usr/hwpf/makefile b/src/usr/hwpf/makefile index e489de90e..9c1211562 100644 --- a/src/usr/hwpf/makefile +++ b/src/usr/hwpf/makefile @@ -228,7 +228,7 @@ $(call GENTARGET, ${FAPI_ERROR_TARGETS}) : \ #------------------------------------------------------------------------------ # The PLAT HWP RC and FFDC parser file generated from Error XML files #------------------------------------------------------------------------------ -$(call GENTARGET, ${PLAT_HWP_ERR_PARSER}) : \ +$(call GENPLUGINTARGET, ${PLAT_HWP_ERR_PARSER}) : \ plat/fapiPlatCreateHwpErrParser.pl ${HWP_ERROR_XML_FILES} $< $(dir $@) ${HWP_ERROR_XML_FILES} @@ -258,7 +258,7 @@ $(foreach initfile,${HWP_INITFILES}, \ $(eval $(call HWP_IF_RECIPE,$(initfile)))) ${EXTRA_PARTS}: ${IMGDIR}/% : ${GENDIR}/% - cp -f $^ $@ + cp -f $< $@ #------------------------------------------------------------------------------ # The FAPI Initfile attribute service |