diff options
| author | Tom Rini <trini@konsulko.com> | 2017-06-08 16:14:11 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-06-08 16:14:11 (GMT) |
| commit | 156d64fa55e9914b144c5e83f2a9e13d1223a4d3 (patch) | |
| tree | 3501aaea3a400a6b92e6f98447f3205502d86887 /drivers/video/rockchip/Makefile | |
| parent | 24796d27be0d0f403ed6ad7e3022b33e36ac08b5 (diff) | |
| parent | 6c53d680c6b57bb9617a93cd1e92c242ae0aab21 (diff) | |
| download | u-boot-fsl-qoriq-156d64fa55e9914b144c5e83f2a9e13d1223a4d3.tar.xz | |
Merge git://git.denx.de/u-boot-rockchip
Here is additional rk3368 and rk3399 support, rv1108 support,
refactoring HDMI video (brought in from Anatolij's tree to resolve
conflicts), some mkimage fixes and a few other things.
Diffstat (limited to 'drivers/video/rockchip/Makefile')
| -rw-r--r-- | drivers/video/rockchip/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/video/rockchip/Makefile b/drivers/video/rockchip/Makefile index cd54b12..872dc0f 100644 --- a/drivers/video/rockchip/Makefile +++ b/drivers/video/rockchip/Makefile @@ -7,8 +7,12 @@ ifdef CONFIG_VIDEO_ROCKCHIP obj-y += rk_vop.o +obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288_vop.o +obj-$(CONFIG_ROCKCHIP_RK3399) += rk3399_vop.o obj-$(CONFIG_DISPLAY_ROCKCHIP_EDP) += rk_edp.o obj-$(CONFIG_DISPLAY_ROCKCHIP_LVDS) += rk_lvds.o -obj-$(CONFIG_DISPLAY_ROCKCHIP_HDMI) += rk_hdmi.o +obj-hdmi-$(CONFIG_ROCKCHIP_RK3288) += rk3288_hdmi.o +obj-hdmi-$(CONFIG_ROCKCHIP_RK3399) += rk3399_hdmi.o +obj-$(CONFIG_DISPLAY_ROCKCHIP_HDMI) += rk_hdmi.o $(obj-hdmi-y) obj-$(CONFIG_DISPLAY_ROCKCHIP_MIPI) += rk_mipi.o endif |