Fix warnings. convbdf needed to be updated for the changed font struct because it generates sysfont.c.

Change-Id: Id5aea6b6c73438242a80ae6849ee5e29ab8659dc

2 files changed, 4 insertions, 1 deletions

diff --git a/firmware/firmware.make b/firmware/firmware.make
index 94747613ba..570087bf45 100644
--- a/firmware/firmware.make
+++ b/firmware/firmware.make
@@ -38,7 +38,7 @@ $(FIRMLIB): $(FIRMLIB_OBJ)
         $(SILENT)$(shell rm -f $@)
         $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
 
-$(BUILDDIR)/sysfont.h: $(SYSFONT) $(TOOLS)
+$(BUILDDIR)/sysfont.h: $(SYSFONT) $(TOOLS) $(BUILDDIR)/firmware/common/config.o
         $(call PRINTS,CONVBDF $(subst $(ROOTDIR)/,,$<))$(TOOLSDIR)/convbdf -l $(MAXCHAR) -h -o $@ $<
 
 $(BUILDDIR)/sysfont.o: $(SYSFONT) $(BUILDDIR)/sysfont.h
diff --git a/tools/convbdf.c b/tools/convbdf.c
index 4cc7ec9983..c508bbf2e8 100644
--- a/tools/convbdf.c
+++ b/tools/convbdf.c
@@ -1211,6 +1211,8 @@ int gen_c_source(struct font* pf, char *path)
     char obuf[256];
     char hdr1[] = {
         "/* Generated by convbdf on %s. */\n"
+        "#include <stdbool.h>\n"
+        "#include \"config.h\"\n"
         "#include \"font.h\"\n"
         "#ifdef HAVE_LCD_BITMAP\n"
         "\n"
@@ -1418,6 +1420,7 @@ int gen_c_source(struct font* pf, char *path)
             "  0,  /* ^ position */\n"
             "  0,  /* ^ end */\n"
             "  0,  /* ^ size  */\n"
+            " false, /* disabled */\n"
             "  {{0,0,0,0,0},0,0,0,0,0},   /* cache  */\n"
             "  0,  /*   */\n"
             "  0,  /*   */\n"