Merge kernel-font branch

diff --cc ChangeLog
index 9097153e2ef6853b8eaa0db992d03a76928336fb,40984c187a7b70ae23cdc1e345fe8e9185334546..21a922447efe3bed5894d83f17e9e010b39e5a0e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,3 +1,59 @@@
++2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
++
++      Fix parallel builds.
++
++      * conf/common.rmk (font/font.c_DEPENDENCIES): New variable (makes
++      font.c depend on ascii.h).
++
++2010-01-12  Carles Pina i Estany  <carles@pina.cat>
++
++      * Makefile.in (DUSE_ASCII_FAILBACK): New macro.
++
++2010-01-11  Carles Pina i Estany  <carles@pina.cat>
++
++      * font/font.c (GENERATE_ASCII): Change the name to USE_ASCII_FAILBACK.
++      By default: disabled.
++      * Makefile.in (ascii.h): Remove the non-needed grub/bin2h size
++      parameter.
++
++2010-01-10  Carles Pina i Estany  <carles@pina.cat>
++
++      * font/font.c: Update copyright years.
++      * util/grub-mkfont.c (write_font_ascii_bitmap): Change comment format.
++
++2010-01-10  Carles Pina i Estany  <carles@pina.cat>
++
++      * font/font.c: Include `ascii.h'.
++      (ASCII_BITMAP_SIZE): New macro.
++      (ascii_font_glyph): Define.
++      (ascii_glyph_lookup): New function.
++      (grub_font_get_string_width): Change comment. If glyph not found, use
++      ascii_glyph_lookup.
++      (grub_font_get_glyph_with_fallback): If glyph not available returns
++      ascii_glyph_lookup.
++      * util/grub-mkfont.c (file_formats): New enum.
++      (options): Add `ascii-bitmaps' new option.
++      (usage): Add `asii-bitmaps' new option.
++      (write_font_ascii_bitmap): New function.
++      (write_font): Rename to ...
++      (write_font_p2): ... this. Remove print_glyphs call.
++      (main): Use file_format. Implement code for ranges if ascii-bitmaps is
++      used. Call print_glyphs.
++      * Makefile.in (pkgdata_DATA): Add `ascii.h'.
++
++2010-01-14  Robert Millan  <rmh.grub@aybabtu.com>
++
++      * conf/common.rmk (bin_UTILITIES): Add `grub-bin2h'.
++      (grub_bin2h_SOURCES): New variable.
++      * util/bin2h.c: New file.
++
 +2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * include/multiboot.h: Resynced with spec.
 +      * include/multiboot2.h: Likewise.
 +      * loader/i386/multiboot_mbi.c (grub_fill_multiboot_mmap): Handle
 +      GRUB_MACHINE_MEMORY_ACPI_RECLAIMABLE and GRUB_MACHINE_MEMORY_NVS.
 +
  2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
  
        * include/grub/term.h (grub_term_register_input,