[PATCH 5/9] drivers: video: tidss: Makefile: Add condition to compile TIDSS at SPL

[Nikhil M Jain]

To enable TIDSS driver only at SPL stage add rule to compile the TIDSS
video driver, for SPL stage only if CONFIG_SPL_VIDEO_TIDSS is
defined.

Signed-off-by: Nikhil M Jain <n-jain1 at ti.com>
Reviewed-by: Devarsh Thakkar <devarsht at ti.com>
---
 drivers/video/Makefile       | 1 +
 drivers/video/tidss/Makefile | 1 +
 2 files changed, 2 insertions(+)

diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 4e2d34e675..beec455e3d 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -72,4 +72,5 @@ obj-y += sunxi/
 ifdef CONFIG_SPL_BUILD
 obj-$(CONFIG_$(SPL_)VIDEO) += video-uclass.o vidconsole-uclass.o
 obj-$(CONFIG_$(SPL_)VIDEO) += video_bmp.o
+<<<<<<< HEAD
 endif
diff --git a/drivers/video/tidss/Makefile b/drivers/video/tidss/Makefile
index f4f8c6c470..d538d5065b 100644
--- a/drivers/video/tidss/Makefile
+++ b/drivers/video/tidss/Makefile
@@ -10,3 +10,4 @@
 
 
 obj-${CONFIG_VIDEO_TIDSS} = tidss_drv.o
+obj-${CONFIG_SPL_VIDEO_TIDSS} = tidss_drv.o
\ No newline at end of file
-- 
2.34.1