]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'next'
authorGerald Van Baren <gvb@unssw.com>
Tue, 20 Nov 2012 00:26:35 +0000 (19:26 -0500)
committerGerald Van Baren <gvb@unssw.com>
Tue, 20 Nov 2012 00:26:35 +0000 (19:26 -0500)
1  2 
README

diff --combined README
index 2dc098462dd3cdb0d151928efa0b31ce3e8d05b5,6c7784263e7ad6ce2ec913e8f8b477b2d845617a..335207b628ad5d909d9d417c2dffd373d16f011a
--- 1/README
--- 2/README
+++ b/README
@@@ -1469,11 -1469,6 +1469,11 @@@ CBFS (Coreboot Filesystem) suppor
                Normally display is black on white background; define
                CONFIG_SYS_WHITE_ON_BLACK to get it inverted.
  
 +              CONFIG_LCD_BMP_RLE8
 +
 +              Support drawing of RLE8-compressed bitmaps on the LCD.
 +
 +
  - Splash Screen Support: CONFIG_SPLASH_SCREEN
  
                If this option is set, the environment is checked for
@@@ -2602,6 -2597,17 +2602,17 @@@ FIT uImage format
   -150 common/cmd_nand.c       Incorrect FIT image format
    151 common/cmd_nand.c       FIT image format OK
  
+ - FIT image support:
+               CONFIG_FIT
+               Enable support for the FIT uImage format.
+               CONFIG_FIT_BEST_MATCH
+               When no configuration is explicitly selected, default to the
+               one whose fdt's compatibility field best matches that of
+               U-Boot itself. A match is considered "best" if it matches the
+               most specific compatibility entry of U-Boot's fdt's root node.
+               The order of entries in the configuration's fdt is ignored.
  - Standalone program support:
                CONFIG_STANDALONE_LOAD_ADDR