File 0003-build-fix-kernel-feature-macro-definitions... of Package intel-ipu6

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-build-fix-kernel-feature-macro-definitions.patch of Package intel-ipu6

From: "You-Sheng Yang (vicamo)" <vicamo.yang@canonical.com>
Date: Mon, 19 Sep 2022 19:11:52 +0800
Subject: build: fix kernel feature macro definitions

CONFIG_INTEL_SKL_INT3472 is always enabled as module in Ubuntu kernel >=
5.14, so it's corresponding kernel feature macros are automatically
defined in kernel autoconf.h and should therefore not be redefined
again.

For CONFIG_POWER_CTRL_LOGIC, since it's now obsoleted and disabled by
default, comment-out its feature macro definition as well.

Signed-off-by: You-Sheng Yang (vicamo) <vicamo.yang@canonical.com>
---
 Makefile | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 6286bea..b7a3ac7 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # Copyright (c) 2022 Intel Corporation.
 
 KERNELRELEASE ?= $(shell uname -r)
-KERNEL_VERSION := $(shell echo $(KERNELRELEASE) | sed 's/[^0-9.]*$[0-9.]*$.*/\1/')
+KERNEL_VERSION = $(word 1,$(subst -, ,$(KERNELRELEASE)))
 
 version_lt = $(shell \
     v1=$(1); \
@@ -60,17 +60,17 @@ mei_pse-y := drivers/misc/ivsc/mei_pse.o
 obj-m += mei_ace_debug.o
 mei_ace_debug-y := drivers/misc/ivsc/mei_ace_debug.o
 
-export CONFIG_INTEL_VSC = y
+export CONFIG_INTEL_VSC = m
+subdir-ccflags-$(CONFIG_INTEL_VSC) += \
+	-DCONFIG_INTEL_VSC_MODULE=1
 
 endif
 
 export CONFIG_VIDEO_INTEL_IPU6 = m
 export CONFIG_IPU_SINGLE_BE_SOC_DEVICE = n
-export CONFIG_INTEL_SKL_INT3472 = m
 # export CONFIG_POWER_CTRL_LOGIC = m
 ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_IPU_BRIDGE)),true)
 export CONFIG_IPU_ISYS_BRIDGE = y
-export CONFIG_IPU_BRIDGE = n
 endif
 export EXTERNAL_BUILD = 1
 obj-y += drivers/media/pci/intel/
@@ -95,20 +95,14 @@ ccflags-y += -I$(src)/backport-include/drivers/misc/mei/
 endif
 
 subdir-ccflags-y += -I$(src)/include/ \
-	-DCONFIG_VIDEO_V4L2_SUBDEV_API
+	-DCONFIG_VIDEO_V4L2_SUBDEV_API=1
 
-subdir-ccflags-$(CONFIG_INTEL_VSC) += \
-        -DCONFIG_INTEL_VSC
 subdir-ccflags-$(CONFIG_IPU_ISYS_BRIDGE) += \
-	-DCONFIG_IPU_ISYS_BRIDGE
-subdir-ccflags-$(CONFIG_IPU_BRIDGE) += \
-	-DCONFIG_IPU_BRIDGE
+	-DCONFIG_IPU_ISYS_BRIDGE=1
 subdir-ccflags-$(CONFIG_IPU_SINGLE_BE_SOC_DEVICE) += \
-	-DCONFIG_IPU_SINGLE_BE_SOC_DEVICE
-subdir-ccflags-$(CONFIG_INTEL_SKL_INT3472) += \
-	-DCONFIG_INTEL_SKL_INT3472
-subdir-ccflags-$(CONFIG_POWER_CTRL_LOGIC) += \
-	-DCONFIG_POWER_CTRL_LOGIC
+	-DCONFIG_IPU_SINGLE_BE_SOC_DEVICE=1
+# subdir-ccflags-$(CONFIG_POWER_CTRL_LOGIC) += \
+#	-DCONFIG_POWER_CTRL_LOGIC_MODULE=1
 subdir-ccflags-y += $(subdir-ccflags-m)
 
 all:

Places

File 0003-build-fix-kernel-feature-macro-definitions.patch of Package intel-ipu6

Places