diff options
| author | Tom Rini <trini@ti.com> | 2013-06-07 08:35:36 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-06-07 08:35:36 -0400 |
| commit | 47b8e527448c94d09fc8dbdb6601ea7a605ff955 (patch) | |
| tree | adcd698c960e2001de700b09d7b0ec0a42616aec /include | |
| parent | 38d240dcf87923d49607ce2f243a0ac1c62612ca (diff) | |
| parent | ea697ae7eb059d7467c6854ce562c31df510eb59 (diff) | |
| download | talos-obmc-uboot-47b8e527448c94d09fc8dbdb6601ea7a605ff955.tar.gz talos-obmc-uboot-47b8e527448c94d09fc8dbdb6601ea7a605ff955.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/rpi_b.h | 2 | ||||
| -rw-r--r-- | include/lcd.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/configs/rpi_b.h b/include/configs/rpi_b.h index c18b35b057..216c6cb70b 100644 --- a/include/configs/rpi_b.h +++ b/include/configs/rpi_b.h @@ -61,6 +61,7 @@ #define CONFIG_BCM2835_GPIO /* LCD */ #define CONFIG_LCD +#define CONFIG_LCD_DT_SIMPLEFB #define LCD_BPP LCD_COLOR16 /* * Prevent allocation of RAM for FB; the real FB address is queried @@ -175,6 +176,7 @@ /* Device tree support for bootm/bootz */ #define CONFIG_OF_LIBFDT +#define CONFIG_OF_BOARD_SETUP /* ATAGs support for bootm/bootz */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_CMDLINE_TAG diff --git a/include/lcd.h b/include/lcd.h index c6e7fc5216..30225edf56 100644 --- a/include/lcd.h +++ b/include/lcd.h @@ -324,6 +324,9 @@ void lcd_show_board_info(void); /* Return the size of the LCD frame buffer, and the line length */ int lcd_get_size(int *line_length); +int lcd_dt_simplefb_add_node(void *blob); +int lcd_dt_simplefb_enable_existing_node(void *blob); + /************************************************************************/ /* ** BITMAP DISPLAY SUPPORT */ /************************************************************************/ |
