From c24b25d1a269c4f814b634e49d81a8bb3772f0e7 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Tue, 7 May 2013 17:17:37 -0500 Subject: Reduce the footprint of builds. Change-Id: I2091409dc81716d064ac1e057573b6b2e02168ad Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4409 Tested-by: Jenkins Server Reviewed-by: ADAM R. MUHLE Reviewed-by: Daniel M. Crowell Reviewed-by: Mark W. Wenning Reviewed-by: A. Patrick Williams III --- makefile | 5 ++++- src/build/mkrules/cflags.env.mk | 4 ++++ src/build/mkrules/images.rules.mk | 4 ++-- src/build/mkrules/passes.env.mk | 5 ++++- src/usr/hwpf/makefile | 12 ++++++++---- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/makefile b/makefile index db19e0feb..c55543f9c 100644 --- a/makefile +++ b/makefile @@ -25,7 +25,10 @@ ROOTPATH = . IMAGE_PASS_BODY += $(GENDIR)/hwp_id.html CLEAN_TARGETS += $(GENDIR)/hwp_id.html -IMAGE_PASS_BODY += cscope ctags check_istep_modules +ifndef BUILD_MINIMAL +IMAGE_PASS_BODY += cscope ctags +endif +IMAGE_PASS_BODY += check_istep_modules include ./config.mk diff --git a/src/build/mkrules/cflags.env.mk b/src/build/mkrules/cflags.env.mk index 852464c68..a182d2946 100644 --- a/src/build/mkrules/cflags.env.mk +++ b/src/build/mkrules/cflags.env.mk @@ -39,6 +39,10 @@ ASMFLAGS += $(COMMONFLAGS) -mcpu=power7 CXXFLAGS += $(CFLAGS) -nostdinc++ -fno-rtti -fno-exceptions -Wall LDFLAGS += --nostdlib --sort-common $(COMMONFLAGS) +ifdef BUILD_MINIMAL +LDFLAGS += --strip-debug +endif + INCFLAGS = $(addprefix -I, $(INCDIR) ) ASMINCFLAGS = $(addprefix $(lastword -Wa,-I), $(INCDIR)) diff --git a/src/build/mkrules/images.rules.mk b/src/build/mkrules/images.rules.mk index 262c8b3d8..c067f787c 100644 --- a/src/build/mkrules/images.rules.mk +++ b/src/build/mkrules/images.rules.mk @@ -51,7 +51,7 @@ $(IMGDIR)/%.bin: $(IMGDIR)/%.elf \ --extended=0x40000 $(IMGDIR)/$*_extended.bin \ $(addprefix $(IMGDIR)/lib, $(addsuffix .so, $($*_EXTENDED_MODULES))) \ $(addprefix $(IMGDIR)/, $($*_DATA_MODULES)) \ - > $(IMGDIR)/.$*.lnkout + | bzip2 -zc > $(IMGDIR)/.$*.lnkout $(C1)$(ROOTPATH)/src/build/tools/addimgid $@ $< $(IMGDIR)/%.list $(IMGDIR)/%.syms: $(IMGDIR)/%.bin @@ -59,6 +59,6 @@ $(IMGDIR)/%.list $(IMGDIR)/%.syms: $(IMGDIR)/%.bin $(C1)(cd $(ROOTPATH); \ src/build/tools/gensyms $*.bin $*_extended.bin 0x40000000 \ > ./img/$*.syms ; \ - src/build/tools/genlist $*.bin > ./img/$*.list) + src/build/tools/genlist $*.bin | bzip2 -zc > ./img/$*.list) endif diff --git a/src/build/mkrules/passes.env.mk b/src/build/mkrules/passes.env.mk index 4d049c099..8033f124c 100644 --- a/src/build/mkrules/passes.env.mk +++ b/src/build/mkrules/passes.env.mk @@ -55,7 +55,10 @@ endif ## CODE_PASS ## Compile the $(OBJS) and build the $(LIBS). -CODE_PASS_BODY += $(OBJECTS) $(OBJECTS:.o=.list) $(LIBRARIES) $(EXTRA_PARTS) +CODE_PASS_BODY += $(OBJECTS) $(LIBRARIES) $(EXTRA_PARTS) +ifdef BUILD_OBJECT_LIST +CODE_PASS_BODY += $(OBJECTS:.o=.list) +endif CLEAN_TARGETS += $(OBJECTS) $(OBJECTS:.o=.o.hash) $(OBJECTS:.o=.dep) \ $(OBJECTS:.o=.list) $(LIBRARIES) $(EXTRA_PARTS) ifeq ($(MAKECMDGOALS),_BUILD/PASSES/CODE/BODY/ACT) diff --git a/src/usr/hwpf/makefile b/src/usr/hwpf/makefile index fce8e608d..7bb7eaf2a 100644 --- a/src/usr/hwpf/makefile +++ b/src/usr/hwpf/makefile @@ -174,7 +174,7 @@ FAPI_ATTR_TARGETS = fapiChipEcFeature.C fapiAttributePlatCheck.H \ HWP_IF_NAMES = $(notdir ${HWP_INITFILES}) HWP_IF_BASENAMES = $(basename ${HWP_IF_NAMES}) HWP_IF_BIN_TARGETS = $(addsuffix .if, ${HWP_IF_BASENAMES}) -HWP_IF_LST_TARGETS = $(addsuffix .if.list, ${HWP_IF_BASENAMES}) +HWP_IF_LST_TARGETS = $(addsuffix .if.list.bz2, ${HWP_IF_BASENAMES}) HWP_IF_ATT_TARGETS = $(addsuffix .if.attr, ${HWP_IF_BASENAMES}) HWP_IF_ALL_TARGETS = ${HWP_IF_BIN_TARGETS} ${HWP_IF_LST_TARGETS} \ ${HWP_IF_ATT_TARGETS} @@ -256,15 +256,19 @@ $(call GENTARGET, ${FAPI_ATTR_ID_TARGET} ${FAPI_ATTR_TARGETS}) : \ # The binary, list and attr files generated from Initfiles #------------------------------------------------------------------------------ define HWP_IF_RECIPE -$${GENDIR}/$(basename $(notdir $1)).if \ -$${GENDIR}/$(basename $(notdir $1)).if.list \ -$${GENDIR}/$(basename $(notdir $1)).if.attr : \ +$${GENDIR}/$(basename $(notdir $1)).if :\ $${GENDIR}/$${IF_CMP_COMPILER_TARGET} \ $${GENDIR}/$${FAPI_ATTR_ID_TARGET} \ $${HWP_IF_DEFINE_DIR} $1 $$< -init $1 -outdir $$(dir $$@) \ -attr $${GENDIR}/$${FAPI_ATTR_ID_TARGET} \ -I $${HWP_IF_DEFINE_DIR} + @bzip2 $${GENDIR}/$(basename $(notdir $1)).if.list + +$${GENDIR}/$(basename $(notdir $1)).if.list.bz2: \ + $${GENDIR}/$(basename $(notdir $1)).if +$${GENDIR}/$(basename $(notdir $1)).if.attr: \ + $${GENDIR}/$(basename $(notdir $1)).if endef $(foreach initfile,${HWP_INITFILES}, \ $(eval $(call HWP_IF_RECIPE,$(initfile)))) -- cgit v1.2.1