diff options
author | Tom Rini <trini@ti.com> | 2015-02-10 18:41:54 +0300 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2015-02-10 18:41:54 +0300 |
commit | 0dac731d1932027f4f813ec7aede35d5e30dec0e (patch) | |
tree | 522a20ea29730f0b5be03c8ced3b16a37fc165fe /common/Makefile | |
parent | 307367eaffc8638e10ba1784fc66bfe623ae79e2 (diff) | |
parent | 7bf71d1f55d31a81ade8dd0fc72f06e4672689d0 (diff) | |
download | u-boot-0dac731d1932027f4f813ec7aede35d5e30dec0e.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-video
Conflicts:
include/splash.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'common/Makefile')
-rw-r--r-- | common/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/common/Makefile b/common/Makefile index b97bb95e6d..7216a13922 100644 --- a/common/Makefile +++ b/common/Makefile @@ -200,6 +200,7 @@ obj-$(CONFIG_KALLSYMS) += kallsyms.o obj-y += splash.o obj-$(CONFIG_SPLASH_SOURCE) += splash_source.o obj-$(CONFIG_LCD) += lcd.o lcd_console.o +obj-$(CONFIG_LCD_DT_SIMPLEFB) += lcd_simplefb.o obj-$(CONFIG_LYNXKDI) += lynxkdi.o obj-$(CONFIG_MENU) += menu.o obj-$(CONFIG_MODEM_SUPPORT) += modem.o |