diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-04-05 12:24:20 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-05 12:24:20 +0200 |
| commit | 4db2fa7f9446d0f2fe8db3d62184b1212fe22707 (patch) | |
| tree | bc62cbfc14296551caebda626db7a90fef9ae844 /README | |
| parent | 75df0d594990875419121c6f8687472ac9f4ae7a (diff) | |
| parent | 7d3053fbf16caad4745f42f7ae3e38e9d3e964b5 (diff) | |
| download | talos-obmc-uboot-4db2fa7f9446d0f2fe8db3d62184b1212fe22707.tar.gz talos-obmc-uboot-4db2fa7f9446d0f2fe8db3d62184b1212fe22707.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Conflicts:
drivers/usb/host/ehci-pci.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'README')
| -rw-r--r-- | README | 22 |
1 files changed, 22 insertions, 0 deletions
@@ -1074,6 +1074,28 @@ The following options need to be configured: and 16bpp modes defined by CONFIG_VIDEO_SED13806_8BPP or CONFIG_VIDEO_SED13806_16BPP + CONFIG_FSL_DIU_FB + Enable the Freescale DIU video driver. Reference boards for + SOCs that have a DIU should define this macro to enable DIU + support, and should also define these other macros: + + CONFIG_SYS_DIU_ADDR + CONFIG_VIDEO + CONFIG_CMD_BMP + CONFIG_CFB_CONSOLE + CONFIG_VIDEO_SW_CURSOR + CONFIG_VGA_AS_SINGLE_DEVICE + CONFIG_VIDEO_LOGO + CONFIG_VIDEO_BMP_LOGO + + The DIU driver will look for the 'monitor' environment variable, + and if defined, enable the DIU as a console during boot. This + variable should be set to one of these values: + + '0' Output video to the DVI connector + '1' Output video to the LVDS connector + '2' Output video to the Dual-Link LVDS connector + - Keyboard Support: CONFIG_KEYBOARD |
