diff --git a/Makefile b/Makefile index 707ce2c2d67a..3fdadb733a2e 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,15 @@ include $(srctree)/techpack/video/config/konavid.conf LINUXINCLUDE += -include $(srctree)/techpack/video/config/konavidconf.h endif +# auto-detect subdirs +ifeq ($(CONFIG_ARCH_HOLI), y) +include $(srctree)/techpack/video/config/holivid.conf +endif + +ifeq ($(CONFIG_ARCH_HOLI), y) +LINUXINCLUDE += -include $(srctree)/techpack/video/config/holividconf.h +endif + # auto-detect subdirs ifeq ($(CONFIG_ARCH_LITO), y) include $(srctree)/techpack/video/config/litovid.conf diff --git a/config/holivid.conf b/config/holivid.conf new file mode 100644 index 000000000000..65eae99c590b --- /dev/null +++ b/config/holivid.conf @@ -0,0 +1,5 @@ +ifeq ($(CONFIG_QGKI),y) +export CONFIG_MSM_VIDC_V4L2=y +else +export CONFIG_MSM_VIDC_V4L2=m +endif diff --git a/config/holividconf.h b/config/holividconf.h new file mode 100644 index 000000000000..594a99490792 --- /dev/null +++ b/config/holividconf.h @@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2020, The Linux Foundation. All rights reserved. + */ + +#define CONFIG_MSM_VIDC_V4L2 1