package/kernel-module-imx-gpu-viv: bear the kernel options munging

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Gary Bisson <bisson.gary@gmail.com>
Cc: Refik Tuzakli <tuzakli.refik@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/linux/linux.mk b/linux/linux.mk
index 6e2006836ea87b62257cb5cdba670131cffa7509..ad2efd948a711743bbe1e1f61524f25395bc2848 100644 (file)
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -359,8 +359,6 @@ define LINUX_KCONFIG_FIXUP_CMDS
                $(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS))
        $(if $(BR2_LINUX_KERNEL_APPENDED_DTB),
                $(call KCONFIG_ENABLE_OPT,CONFIG_ARM_APPENDED_DTB))
-       $(if $(BR2_PACKAGE_KERNEL_MODULE_IMX_GPU_VIV),
-               $(call KCONFIG_DISABLE_OPT,CONFIG_MXC_GPU_VIV))
        $(if $(LINUX_KERNEL_CUSTOM_LOGO_PATH),
                $(call KCONFIG_ENABLE_OPT,CONFIG_FB)
                $(call KCONFIG_ENABLE_OPT,CONFIG_LOGO)

diff --git a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk
index e087ccaa12a00b38e7a5a7b3ddb827ad89c90ff0..a037858cfc31aad474060cbb57600e2a2270fa1d 100644 (file)
--- a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk
+++ b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk
@@ -16,5 +16,9 @@ KERNEL_MODULE_IMX_GPU_VIV_MODULE_MAKE_OPTS = \
 
 KERNEL_MODULE_IMX_GPU_VIV_MODULE_SUBDIRS = kernel-module-imx-gpu-viv-src
 
+define KERNEL_MODULE_IMX_GPU_VIV_MODULE_LINUX_CONFIG_FIXUPS
+       $(call KCONFIG_DISABLE_OPT,CONFIG_MXC_GPU_VIV)
+endef
+
 $(eval $(kernel-module))
 $(eval $(generic-package))