diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-21 11:49:49 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-21 11:49:49 -0500 |
| commit | 6905f4d3c7be46fed4859f51f0a8f9a1107c22e7 (patch) | |
| tree | dd2fb0d12e56b3d69560b26a11ee0f0130ea0a5a /common/Makefile | |
| parent | 45fe3809b9923b92f221d70eb45ae071059fd5e0 (diff) | |
| parent | 747440d0fa95f2205a8fcef49b6c7845700b6246 (diff) | |
| download | u-boot-imx-6905f4d3c7be46fed4859f51f0a8f9a1107c22e7.zip u-boot-imx-6905f4d3c7be46fed4859f51f0a8f9a1107c22e7.tar.gz u-boot-imx-6905f4d3c7be46fed4859f51f0a8f9a1107c22e7.tar.bz2 | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'common/Makefile')
| -rw-r--r-- | common/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/common/Makefile b/common/Makefile index 2a1d9f8..2492275 100644 --- a/common/Makefile +++ b/common/Makefile @@ -205,7 +205,9 @@ obj-$(CONFIG_I2C_EDID) += edid.o obj-$(CONFIG_KALLSYMS) += kallsyms.o obj-y += splash.o obj-$(CONFIG_SPLASH_SOURCE) += splash_source.o +ifndef CONFIG_DM_VIDEO obj-$(CONFIG_LCD) += lcd.o lcd_console.o +endif obj-$(CONFIG_LCD_ROTATION) += lcd_console_rotation.o obj-$(CONFIG_LCD_DT_SIMPLEFB) += lcd_simplefb.o obj-$(CONFIG_LYNXKDI) += lynxkdi.o |