diff --git a/oplus/sensor/kernel/oplus_consumer_ir/Makefile b/oplus/sensor/kernel/oplus_consumer_ir/Makefile
index 3c5be8c85f..8a70ce6f34 100644
--- a/oplus/sensor/kernel/oplus_consumer_ir/Makefile
+++ b/oplus/sensor/kernel/oplus_consumer_ir/Makefile
@@ -6,11 +6,11 @@ ccflags-y += -I$(DEVICE_MODULES_PATH)/drivers/misc/mediatek/include/
 ccflags-y += -I$(DEVICE_MODULES_PATH)/drivers/misc/mediatek/pwm/pwm_v2/include/
 endif # !CONFIG_OPLUS_SENSOR_CONSUMER_IR_MTK
 
-oplus_bsp_ir_core-y := oplus_ir_core.o
-obj-$(CONFIG_OPLUS_SENSOR_CONSUMER_IR_CORE)	+= oplus_bsp_ir_core.o
+oplus_sensor_ir_core-y := oplus_ir_core.o
+obj-m	+= oplus_sensor_ir_core.o
 
-oplus_bsp_kookong_ir_spi-y := oplus_ir_spi.o
-obj-$(CONFIG_OPLUS_SENSOR_CONSUMER_IR_QC)	+= oplus_bsp_kookong_ir_spi.o
+oplus_sensor_kookong_ir_spi-y := oplus_ir_spi.o
+obj-m	+= oplus_sensor_kookong_ir_spi.o
 
 oplus_bsp_kookong_ir_pwm-y := oplus_ir_pwm.o
 obj-$(CONFIG_OPLUS_SENSOR_CONSUMER_IR_MTK)	+= oplus_bsp_kookong_ir_pwm.o
diff --git a/oplus/sensor/kernel/qcom/sensor/Makefile b/oplus/sensor/kernel/qcom/sensor/Makefile
index 23686ac601..fdbe71f7c9 100644
--- a/oplus/sensor/kernel/qcom/sensor/Makefile
+++ b/oplus/sensor/kernel/qcom/sensor/Makefile
@@ -1,6 +1,7 @@
 oplus_sensor-y := oplus_sensor_devinfo.o
 oplus_sensor-y += oplus_press_cali_info.o
 oplus_sensor-y += oplus_pad_als_info.o
-obj-$(CONFIG_OPLUS_FEATURE_SENSOR_CFG) += oplus_sensor.o
-obj-$(CONFIG_SSC_INTERACTIVE) += oplus_ssc_interact/
-obj-$(CONFIG_OPLUS_SENSOR_FB_QC) += oplus_sensor_feedback/
\ No newline at end of file
+oplus_sensor_deviceinfo-y := $(oplus_sensor-y)
+obj-m += oplus_sensor_deviceinfo.o
+obj-y += oplus_ssc_interact/
+obj-y += oplus_sensor_feedback/
diff --git a/oplus/sensor/kernel/qcom/sensor/oplus_sensor_feedback/Makefile b/oplus/sensor/kernel/qcom/sensor/oplus_sensor_feedback/Makefile
index 727e9850c9..8041c61d89 100644
--- a/oplus/sensor/kernel/qcom/sensor/oplus_sensor_feedback/Makefile
+++ b/oplus/sensor/kernel/qcom/sensor/oplus_sensor_feedback/Makefile
@@ -1,2 +1,3 @@
-oplus_bsp_sensor_feedback-y := sensor_feedback.o
-obj-$(CONFIG_OPLUS_SENSOR_FB_QC)	+= oplus_bsp_sensor_feedback.o
+oplus_sensor_feedback-y := sensor_feedback.o
+obj-m	+= oplus_sensor_feedback.o
+ccflags-y := -DCONFIG_OPLUS_SENSOR_DRM_PANEL_NOTIFY
diff --git a/oplus/sensor/kernel/qcom/sensor/oplus_ssc_interact/Makefile b/oplus/sensor/kernel/qcom/sensor/oplus_ssc_interact/Makefile
index b66f4ca6cc..3a9983d004 100644
--- a/oplus/sensor/kernel/qcom/sensor/oplus_ssc_interact/Makefile
+++ b/oplus/sensor/kernel/qcom/sensor/oplus_ssc_interact/Makefile
@@ -1,2 +1,7 @@
-ssc_interact-y	+=  oplus_ssc_interact.o
-obj-$(CONFIG_SSC_INTERACTIVE)	+=  ssc_interact.o
+oplus_sensor_interact-y	+=  oplus_ssc_interact.o
+obj-m	+=  oplus_sensor_interact.o
+ccflags-y := \
+	-DCONFIG_OPLUS_SENSOR_FB_QC \
+	-DCONFIG_OPLUS_SENSOR_DRM_PANEL_NOTIFY \
+	-DCONFIG_OPLUS_SENSOR_DRM_PANEL_ADFR_MIN_FPS \
+	-DCONFIG_OPLUS_SENSOR_USE_SCREENSHOT_INFO