cbfstool: Fill memory allocated in create_cbfs_file() with 0xff

[coreboot.git] / util / cbfstool / Makefile.inc

diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc
index 806088a83d1fbf10588b610338a7035666a16bcb..782ce375b378672e93202510fac51e7b3df96f5a 100644 (file)
--- a/util/cbfstool/Makefile.inc
+++ b/util/cbfstool/Makefile.inc
@@ -2,34 +2,56 @@
 ifdef POST_EVALUATION
 
 cbfsobj :=
-# commands
-cbfsobj += create.o
-cbfsobj += bootblock.o
-cbfsobj += delete.o
-cbfsobj += extract.o 
-cbfsobj += add.o 
-cbfsobj += print.o
-cbfsobj += resize.o
-# main tool
+cbfsobj += common.o
+cbfsobj += compress.o
+cbfsobj += minilzma.o
+cbfsobj += LZMAEncoder.o
+cbfsobj += LZInWindow.o
+cbfsobj += RangeCoderBit.o
+cbfsobj += StreamUtils.o
+cbfsobj += OutBuffer.o
+cbfsobj += Alloc.o
+cbfsobj += CRC.o
+cbfsobj += cbfs-mkstage.o
+cbfsobj += cbfs-mkpayload.o
 cbfsobj += cbfstool.o
-cbfsobj += util.o
-cbfsobj += fs.o
 
-cbfsinc := cbfstool.h cbfs.h
+CBFSTOOLFLAGS=-DCOMPACT -g
 
 $(obj)/util/cbfstool:
-       $(Q)mkdir -p $@
-       $(Q)mkdir -p $@/tools/lzma
+       mkdir -p $@
 
 $(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/%.c
-       $(Q)printf "    HOSTCC     $(subst $(obj)/,,$(@))\n"
-       $(Q)$(HOSTCC) $(HOSTCFLAGS) -c -o $@ $<
+       printf "    HOSTCC     $(subst $(obj)/,,$(@))\n"
+       $(HOSTCC) $(CBFSTOOLFLAGS) $(HOSTCFLAGS) -c -o $@ $<
 
-$(obj)/util/cbfstool/cbfstool: $(obj)/util/cbfstool $(obj)/util/cbfstool/tools/cbfs-mkpayload $(obj)/util/cbfstool/tools/cbfs-mkstage $(addprefix $(obj)/util/cbfstool/,$(cbfsobj))
-       $(Q)printf "    HOSTCC     $(subst $(obj)/,,$(@)) (link)\n"
-       $(Q)$(HOSTCC) -o $@ $(addprefix $(obj)/util/cbfstool/,$(cbfsobj))
+$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/%.cc
+       printf "    HOSTCXX    $(subst $(obj)/,,$(@))\n"
+       $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
 
-endif
+$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/LZMA/%.cpp
+       printf "    HOSTCXX    $(subst $(obj)/,,$(@))\n"
+       $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
+
+$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/LZ/%.cpp
+       printf "    HOSTCXX    $(subst $(obj)/,,$(@))\n"
+       $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
+
+$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Compress/RangeCoder/%.cpp
+       printf "    HOSTCXX    $(subst $(obj)/,,$(@))\n"
+       $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
+
+$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/7zip/Common/%.cpp
+       printf "    HOSTCXX    $(subst $(obj)/,,$(@))\n"
+       $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
 
-include $(top)/util/cbfstool/tools/Makefile.inc
+$(obj)/util/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/Common/%.cpp
+       printf "    HOSTCXX    $(subst $(obj)/,,$(@))\n"
+       $(HOSTCXX) $(CBFSTOOLFLAGS) $(HOSTCXXFLAGS) -c -o $@ $<
+
+$(obj)/util/cbfstool/cbfstool: $(obj)/util/cbfstool $(addprefix $(obj)/util/cbfstool/,$(cbfsobj))
+       printf "    HOSTCXX    $(subst $(obj)/,,$(@)) (link)\n"
+       $(HOSTCXX) $(CBFSTOOLFLAGS) -o $@ $(addprefix $(obj)/util/cbfstool/,$(cbfsobj))
+
+endif