diff options
| author | Evan Wilson <evan@oliodevices.com> | 2015-10-01 11:40:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ip-172-31-25-77.us-west-1.compute.internal> | 2015-04-16 10:08:13 +0000 |
| commit | 502eb3d94951ca0d8fd85721aabc3d2cfefed130 (patch) | |
| tree | 178cd6da5ff94b232f000baf5c635ed18856fce7 | |
| parent | a6c42a0433bc33766124a5cc670952b9aa82b8a7 (diff) | |
| parent | d4f625c38e33e09b6f16f5fa54ba60c7302bdc49 (diff) | |
| download | olio-linux-3.10-502eb3d94951ca0d8fd85721aabc3d2cfefed130.tar.xz olio-linux-3.10-502eb3d94951ca0d8fd85721aabc3d2cfefed130.zip | |
Merge "Adding boot logo" into android-3.10-bringup
| -rw-r--r-- | arch/arm/configs/omap3_h1_defconfig | 3 | ||||
| -rw-r--r-- | drivers/video/omap2/omapfb/omapfb-main.c | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/configs/omap3_h1_defconfig b/arch/arm/configs/omap3_h1_defconfig index 8a80eaf9278..49c06ba4cec 100644 --- a/arch/arm/configs/omap3_h1_defconfig +++ b/arch/arm/configs/omap3_h1_defconfig @@ -1815,7 +1815,8 @@ CONFIG_PANEL_ILI_9342=y # CONFIG_EXYNOS_VIDEO is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set # CONFIG_ADF is not set -# CONFIG_LOGO is not set +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_FB_SSD1307 is not set CONFIG_SOUND=y # CONFIG_SOUND_OSS_CORE is not set diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index 18a9429d686..13733c8bb1b 100644 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c @@ -2653,6 +2653,15 @@ static int omapfb_probe(struct platform_device *pdev) goto cleanup; } +#ifdef CONFIG_LOGO + for (i = 0; i < fbdev->num_fbs; i++) { + struct fb_info *fbi = fbdev->fbs[i]; + if (fbi && fb_prepare_logo(fbi, 0)) { + fb_show_logo(fbi, 0); + } +} +#endif + return 0; cleanup: |