From 3718e26ce48c9546c1a39e35d0a092e4b4c1a7ee Mon Sep 17 00:00:00 2001 From: Ye Li Date: Wed, 20 Dec 2017 03:42:55 -0600 Subject: MLK-17262 video: Fix build break when CONFIG_VIDEO_IMX_HDP_LOAD is not selected Met build errors below when CONFIG_VIDEO_IMX_HDP_LOAD is not selected. Because the u-boot make script checks the "$(obj-y) $(obj-m) $(obj-) $(subdir-m) $(lib-target)" for built-in target. aarch64-poky-linux-ld.bfd: cannot find drivers/video/imx/built-in.o: No such file or directory scripts/Makefile.build:359: recipe for target 'drivers/video/built-in.o' failed Signed-off-by: Ye Li Reviewed-by: Peng Fan (cherry picked from commit 8c81dfb83f59ceb358f91564b9d48052d3df97cb) --- drivers/video/imx/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/video/imx/Makefile b/drivers/video/imx/Makefile index 1d688c701f..0ec6e0ea68 100644 --- a/drivers/video/imx/Makefile +++ b/drivers/video/imx/Makefile @@ -1,7 +1,8 @@ -ifdef CONFIG_VIDEO_IMX_HDP_LOAD +# +# Copyright 2017 NXP +# +# SPDX-License-Identifier: GPL-2.0+ +# UBOOTINCLUDE += -I$(srctree)/drivers/video/imx/hdp -obj-y += hdpload.o -obj-y += hdp/ - -endif +obj-$(CONFIG_VIDEO_IMX_HDP_LOAD) += hdpload.o hdp/ -- cgit v1.2.3