diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/Makefile index 29849b1ec1..93d9295cc6 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/Makefile @@ -8,14 +8,14 @@ #obj-$(CONFIG_TOUCHPANEL_FOCAL_FT3518) += ft3518/ -obj-$(CONFIG_TOUCHPANEL_FOCAL_FT3518) += ft3518/ +obj-y += ft3518/ obj-$(CONFIG_TOUCHPANEL_FOCAL_FT3658U) += ft3658u/ -obj-$(CONFIG_TOUCHPANEL_FOCAL_FT3658U_SPI) += ft3658u_spi/ -obj-$(CONFIG_TOUCHPANEL_FOCAL_FT3681) += ft3681/ -obj-$(CONFIG_TOUCHPANEL_FOCAL_FT8057P) += ft8057p/ -obj-$(CONFIG_TOUCHPANEL_FOCAL_FT3683G) += ft3683g/ -obj-$(CONFIG_TOUCHPANEL_FOCAL_FT3419U) += ft3419u/ +obj-y += ft3658u_spi/ +obj-y += ft3681/ +obj-y += ft8057p/ +obj-y += ft3683g/ +obj-y += ft3419u/ oplus_bsp_tp_focal_common-y += focal_common.o -obj-$(CONFIG_TOUCHPANEL_FOCAL) += oplus_bsp_tp_focal_common.o +obj-m += oplus_bsp_tp_focal_common.o #endif diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft3419u/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft3419u/Makefile index 49dc53a6a9..cd6bdebd69 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft3419u/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft3419u/Makefile @@ -7,4 +7,4 @@ oplus_bsp_tp_ft3419u-y += ft3419u_driver.o oplus_bsp_tp_ft3419u-y += ft3419u_test.o -obj-$(CONFIG_TOUCHPANEL_FOCAL_FT3419U) += oplus_bsp_tp_ft3419u.o +obj-m += oplus_bsp_tp_ft3419u.o diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft3518/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft3518/Makefile index 596b122528..9bbb604011 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft3518/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft3518/Makefile @@ -11,4 +11,4 @@ oplus_bsp_tp_ft3518-y += ft3518_driver.o oplus_bsp_tp_ft3518-y += ft3518_test.o -obj-$(CONFIG_TOUCHPANEL_FOCAL_FT3518) += oplus_bsp_tp_ft3518.o +obj-m += oplus_bsp_tp_ft3518.o diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft3658u_spi/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft3658u_spi/Makefile index 4a9a009e79..422f3d9312 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft3658u_spi/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft3658u_spi/Makefile @@ -5,4 +5,4 @@ # Each configuration option enables a list of files. oplus_bsp_tp_ft3658u_spi-y += ft3658u_driver.o oplus_bsp_tp_ft3658u_spi-y += ft3658u_test.o -obj-$(CONFIG_TOUCHPANEL_FOCAL_FT3658U_SPI) += oplus_bsp_tp_ft3658u_spi.o +obj-m += oplus_bsp_tp_ft3658u_spi.o diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft3681/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft3681/Makefile index 81634752af..f6ee3fb22c 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft3681/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft3681/Makefile @@ -7,4 +7,4 @@ oplus_bsp_tp_ft3681-y += ft3681_driver.o oplus_bsp_tp_ft3681-y += ft3681_test.o -obj-$(CONFIG_TOUCHPANEL_FOCAL_FT3681) += oplus_bsp_tp_ft3681.o +obj-m += oplus_bsp_tp_ft3681.o diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft3683g/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft3683g/Makefile index 87d1565d04..213b227fad 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft3683g/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft3683g/Makefile @@ -7,4 +7,4 @@ oplus_bsp_tp_ft3683g-y += ft3683g_driver.o oplus_bsp_tp_ft3683g-y += ft3683g_test.o -obj-$(CONFIG_TOUCHPANEL_FOCAL_FT3683G) += oplus_bsp_tp_ft3683g.o +obj-m += oplus_bsp_tp_ft3683g.o diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft8057p/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft8057p/Makefile index 219d6a172d..68d5deee00 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft8057p/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Focal/ft8057p/Makefile @@ -7,4 +7,4 @@ oplus_bsp_tp_ft8057p-y += ft8057p_driver.o oplus_bsp_tp_ft8057p-y += ft8057p_test.o -obj-$(CONFIG_TOUCHPANEL_FOCAL_FT8057P) += oplus_bsp_tp_ft8057p.o +obj-m += oplus_bsp_tp_ft8057p.o diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Goodix/GT9916/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Goodix/GT9916/Makefile index 6390bb6c0c..7bf0d341a0 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Goodix/GT9916/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Goodix/GT9916/Makefile @@ -1,4 +1,3 @@ # gt9916 touchpanel driver oplus_bsp_tp_gt9916-y += goodix_brl_core.o goodix_pen.o -obj-$(CONFIG_TOUCHPANEL_GOODIX_GT9916) += oplus_bsp_tp_gt9916.o - +obj-m += oplus_bsp_tp_gt9916.o diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Goodix/GT9966/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Goodix/GT9966/Makefile index d94fa6f066..1ea12cac90 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Goodix/GT9966/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Goodix/GT9966/Makefile @@ -1,4 +1,3 @@ # gt9966 touchpanel driver oplus_bsp_tp_gt9966-y += goodix_brl_core.o goodix_pen.o -obj-$(CONFIG_TOUCHPANEL_GOODIX_GT9966) += oplus_bsp_tp_gt9966.o - +obj-m += oplus_bsp_tp_gt9966.o diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Goodix/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Goodix/Makefile index c79e32a348..dd1ad63d58 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Goodix/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Goodix/Makefile @@ -5,10 +5,10 @@ # Each configuration option enables a list of files. obj-$(CONFIG_TOUCHPANEL_GOODIX_GT9886) += GT9886/ -obj-$(CONFIG_TOUCHPANEL_GOODIX_GT9966) += GT9966/ -obj-$(CONFIG_TOUCHPANEL_GOODIX_GT9916) += GT9916/ +obj-y += GT9966/ +obj-y += GT9916/ oplus_bsp_tp_goodix_comnon-y += gtx8_tools.o goodix_common.o -obj-$(CONFIG_TOUCHPANEL_GOODIX) += oplus_bsp_tp_goodix_comnon.o +obj-m += oplus_bsp_tp_goodix_comnon.o #endif #endif diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Makefile index 5dd3d83392..fea6d054f2 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Makefile @@ -27,19 +27,25 @@ oplus_bsp_tp_comon-y += tp_ioctl.o oplus_bsp_tp_comon-y += message_list.o oplus_bsp_tp_comon-y += touch_pen/touch_pen_core.o oplus_bsp_tp_comon-y += touch_pen/touch_pen_algo.o - -obj-$(CONFIG_TOUCHPANEL_OPLUS) += oplus_bsp_tp_comon.o - -oplus_bsp_tp_notify-y += touchpanel_notify/touchpanel_event_notify.o oplus_bsp_tp_comon-y += touchpanel_tui_support/touchpanel_tui_support.o -obj-$(CONFIG_TOUCHPANEL_NOTIFY) += oplus_bsp_tp_notify.o -obj-$(CONFIG_TOUCHPANEL_SYNAPTICS) += Synaptics/ -obj-$(CONFIG_TOUCHPANEL_FOCAL) += Focal/ -obj-$(CONFIG_TOUCHPANEL_GOODIX) += Goodix/ -obj-$(CONFIG_TOUCHPANEL_NOVA) += Novatek/ +obj-m += oplus_bsp_tp_common.o +oplus_bsp_tp_common-y := $(oplus_bsp_tp_comon-y) +ccflags-y += \ + -DCONFIG_TOUCHPANEL_OPLUS_MODULE \ + -I$(srctree)/$(src) + +KBUILD_EXTRA_SYMBOLS := $(M)/touch_custom/Module.symvers + +# oplus_bsp_tp_notify-y += touchpanel_notify/touchpanel_event_notify.o +# obj-$(CONFIG_TOUCHPANEL_NOTIFY) += oplus_bsp_tp_notify.o + +obj-y += Synaptics/ +obj-y += Focal/ +obj-y += Goodix/ +obj-y += Novatek/ obj-$(CONFIG_TOUCHPANEL_HIMAX) += Himax/ obj-$(CONFIG_TOUCHPANEL_SAMSUNG) += Samsung/ -obj-$(CONFIG_TOUCHPANEL_ILITEK) += ilitek/ +obj-y += ilitek/ obj-$(CONFIG_TOUCHPANEL_JADARD) += Jadard/ obj-$(CONFIG_TOUCHPANEL_ST) += St/ diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Novatek/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Novatek/Makefile index bcf44ff395..a065c69910 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Novatek/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Novatek/Makefile @@ -8,12 +8,12 @@ #obj-$(CONFIG_TOUCHPANEL_NOVA_NT36672_NOFLASH) += NT36672_noflash/ #obj-$(CONFIG_TOUCHPANEL_NOVA_NT36525_NOFLASH) += NT36525_noflash/ -obj-$(CONFIG_TOUCHPANEL_NOVA_NT36672C_NOFLASH) += NT36672C_noflash/ +obj-y += NT36672C_noflash/ obj-$(CONFIG_TOUCHPANEL_NOVA_NT36523_NOFLASH) += NT36523_noflash/ -obj-$(CONFIG_TOUCHPANEL_NOVA_NT36532_NOFLASH) += NT36532_noflash/ -obj-$(CONFIG_TOUCHPANEL_NOVA_NT36536_NOFLASH) += NT36536_noflash/ -obj-$(CONFIG_TOUCHPANEL_NOVA_NT36528_NOFLASH) += NT36528_noflash/ +obj-y += NT36532_noflash/ +obj-y += NT36536_noflash/ +obj-y += NT36528_noflash/ oplus_bsp_tp_novatek_common-y += novatek_common.o -obj-$(CONFIG_TOUCHPANEL_NOVA) += oplus_bsp_tp_novatek_common.o +obj-m += oplus_bsp_tp_novatek_common.o #endif diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Novatek/NT36528_noflash/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Novatek/NT36528_noflash/Makefile index fa7c97439e..82f83213e8 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Novatek/NT36528_noflash/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Novatek/NT36528_noflash/Makefile @@ -12,5 +12,5 @@ subdir-ccflags-y += -I$(srctree)/drivers/spi/mediatek/mt6763/ # Each configuration option enables a list of files. oplus_bsp_tp_nt36528_noflash-y += nvt_drivers_nt36528_noflash.o -obj-$(CONFIG_TOUCHPANEL_NOVA_NT36528_NOFLASH) += oplus_bsp_tp_nt36528_noflash.o +obj-m += oplus_bsp_tp_nt36528_noflash.o #endif diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Novatek/NT36532_noflash/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Novatek/NT36532_noflash/Makefile index 0dff4929ff..49a9ffd59e 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Novatek/NT36532_noflash/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Novatek/NT36532_noflash/Makefile @@ -12,5 +12,5 @@ subdir-ccflags-y += -I$(srctree)/drivers/spi/mediatek/mt6763/ # Each configuration option enables a list of files. oplus_bsp_tp_nt36532_noflash-y += nvt_drivers_nt36532_noflash.o -obj-$(CONFIG_TOUCHPANEL_NOVA_NT36532_NOFLASH) += oplus_bsp_tp_nt36532_noflash.o +obj-m += oplus_bsp_tp_nt36532_noflash.o #endif diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Novatek/NT36536_noflash/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Novatek/NT36536_noflash/Makefile index c9193b53fd..6495e49882 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Novatek/NT36536_noflash/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Novatek/NT36536_noflash/Makefile @@ -12,5 +12,5 @@ subdir-ccflags-y += -I$(srctree)/drivers/spi/mediatek/mt6763/ # Each configuration option enables a list of files. oplus_bsp_tp_nt36536_noflash-y += nvt_drivers_nt36536_noflash.o -obj-$(CONFIG_TOUCHPANEL_NOVA_NT36536_NOFLASH) += oplus_bsp_tp_nt36536_noflash.o +obj-m += oplus_bsp_tp_nt36536_noflash.o #endif diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Novatek/NT36672C_noflash/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Novatek/NT36672C_noflash/Makefile index 7fc4185694..4d6dffe1f4 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Novatek/NT36672C_noflash/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Novatek/NT36672C_noflash/Makefile @@ -12,5 +12,5 @@ subdir-ccflags-y += -I$(srctree)/drivers/spi/mediatek/mt6763/ # Each configuration option enables a list of files. oplus_bsp_tp_nt36672c_noflash-y += nvt_drivers_nt36672c_noflash.o -obj-$(CONFIG_TOUCHPANEL_NOVA_NT36672C_NOFLASH) += oplus_bsp_tp_nt36672c_noflash.o +obj-m += oplus_bsp_tp_nt36672c_noflash.o #endif diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Synaptics/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Synaptics/Makefile index 86304dd1c5..042035ea7f 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Synaptics/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Synaptics/Makefile @@ -5,13 +5,14 @@ # Each configuration option enables a list of files. obj-$(CONFIG_TOUCHPANEL_SYNAPTICS_S3706) += S3706/ obj-$(CONFIG_TOUCHPANEL_SYNAPTICS_TCM_ONCELL) += Syna_tcm_oncell/ -obj-$(CONFIG_TOUCHPANEL_SYNAPTICS_TCM_S3910) += Syna_tcm_S3910/ -obj-$(CONFIG_TOUCHPANEL_SYNAPTICS_TCM_S3908) += Syna_tcm_S3908/ -obj-$(CONFIG_TOUCHPANEL_SYNAPTICS_TD4377_NOFLASH) += TD4377_noflash/ +obj-y += Syna_tcm_S3910/ +obj-y += Syna_tcm_S3908/ +obj-y += TD4377_noflash/ oplus_bsp_tp_syna_comnon-y += synaptics_touch_panel_remote.o oplus_bsp_tp_syna_comnon-y += synaptics_common.o -obj-$(CONFIG_TOUCHPANEL_SYNAPTICS) += oplus_bsp_tp_syna_comnon.o +oplus_bsp_tp_syna_common-y += $(oplus_bsp_tp_syna_comnon-y) +obj-m += oplus_bsp_tp_syna_common.o #endif -obj-$(CONFIG_KUNIT_OPLUS_SYNAPTICS) += kunit_synaptics.o \ No newline at end of file +obj-$(CONFIG_KUNIT_OPLUS_SYNAPTICS) += kunit_synaptics.o diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Synaptics/Syna_tcm_S3908/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Synaptics/Syna_tcm_S3908/Makefile index 023a949e17..a5f373f0f9 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Synaptics/Syna_tcm_S3908/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Synaptics/Syna_tcm_S3908/Makefile @@ -7,4 +7,4 @@ oplus_bsp_tp_tcm_S3908-y += synaptics_tcm_S3908.o oplus_bsp_tp_tcm_S3908-y += synaptics_tcm_device_S3908.o -obj-$(CONFIG_TOUCHPANEL_SYNAPTICS_TCM_S3908) += oplus_bsp_tp_tcm_S3908.o \ No newline at end of file +obj-m += oplus_bsp_tp_tcm_S3908.o diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Synaptics/Syna_tcm_S3910/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Synaptics/Syna_tcm_S3910/Makefile index 4be41b0f2b..cd735871d5 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Synaptics/Syna_tcm_S3910/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Synaptics/Syna_tcm_S3910/Makefile @@ -7,4 +7,4 @@ oplus_bsp_tp_tcm_S3910-y += synaptics_tcm_S3910.o oplus_bsp_tp_tcm_S3910-y += synaptics_tcm_device_S3910.o -obj-$(CONFIG_TOUCHPANEL_SYNAPTICS_TCM_S3910) += oplus_bsp_tp_tcm_S3910.o \ No newline at end of file +obj-m += oplus_bsp_tp_tcm_S3910.o diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Synaptics/TD4377_noflash/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Synaptics/TD4377_noflash/Makefile index 757716a3d7..2049c30ff8 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/Synaptics/TD4377_noflash/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/Synaptics/TD4377_noflash/Makefile @@ -10,5 +10,5 @@ oplus_bsp_tp_td4377_noflash-y += synaptics_tcm_device.o oplus_bsp_tp_td4377_noflash-y += synaptics_tcm_recovery.o oplus_bsp_tp_td4377_noflash-y += synaptics_tcm_zeroflash.o -obj-$(CONFIG_TOUCHPANEL_SYNAPTICS_TD4377_NOFLASH) += oplus_bsp_tp_td4377_noflash.o +obj-m += oplus_bsp_tp_td4377_noflash.o #endif diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/ilitek/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/ilitek/Makefile index a982aeb6ce..57726ada65 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/ilitek/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/ilitek/Makefile @@ -4,9 +4,9 @@ # Each configuration option enables a list of files. obj-$(CONFIG_TOUCHPANEL_ILITEK_ILITEK9881H_V3) += ilitek9881h/ -obj-$(CONFIG_TOUCHPANEL_ILITEK_ILITEK7807S) += ilitek7807s/ +obj-y += ilitek7807s/ oplus_bsp_tp_ilitek_common-y += ilitek_common.o -obj-$(CONFIG_TOUCHPANEL_ILITEK) += oplus_bsp_tp_ilitek_common.o +obj-m += oplus_bsp_tp_ilitek_common.o #endif #endif diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/ilitek/ilitek7807s/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/ilitek/ilitek7807s/Makefile index 721dfbaae2..1028420e5f 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/ilitek/ilitek7807s/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/ilitek/ilitek7807s/Makefile @@ -10,5 +10,5 @@ oplus_bsp_tp_ilitek7807s-y += ili7807s_qcom.o \ ili7807s_mp.o \ ili7807s_fw.o \ ili7807s_node.o -obj-$(CONFIG_TOUCHPANEL_ILITEK_ILITEK7807S) += oplus_bsp_tp_ilitek7807s.o +obj-m += oplus_bsp_tp_ilitek7807s.o #endif diff --git a/oplus/kernel/touchpanel/oplus_touchscreen_v2/touch_custom/Makefile b/oplus/kernel/touchpanel/oplus_touchscreen_v2/touch_custom/Makefile index 14cb66a701..0fb9d9b210 100644 --- a/oplus/kernel/touchpanel/oplus_touchscreen_v2/touch_custom/Makefile +++ b/oplus/kernel/touchpanel/oplus_touchscreen_v2/touch_custom/Makefile @@ -1,3 +1,4 @@ oplus_bsp_tp_custom-y := touch.o -obj-$(CONFIG_TOUCHPANEL_CUSTOM) += oplus_bsp_tp_custom.o \ No newline at end of file +obj-m += oplus_bsp_tp_custom.o +ccflags-y += -I$(srctree)/$(src)/.. diff --git a/oplus/kernel/touchpanel/synaptics_hbp/Makefile b/oplus/kernel/touchpanel/synaptics_hbp/Makefile index 0df7897a9b..45e088a980 100644 --- a/oplus/kernel/touchpanel/synaptics_hbp/Makefile +++ b/oplus/kernel/touchpanel/synaptics_hbp/Makefile @@ -8,8 +8,9 @@ subdir-ccflags-$(CONFIG_OPLUS_MTK_DRM_GKI_NOTIFY) += -I$(srctree)/drivers/misc/m TCM_CORE=tcm/ -ccflags-y += -I$(srctree)/drivers/input/touchscreen/synaptics_hbp/ -ccflags-y += -I$(srctree)/drivers/input/touchscreen/synaptics_hbp/tcm/ +ccflags-y += \ + -I$(srctree)/$(src) \ + -I$(srctree)/$(src)/../oplus_touchscreen_v2 subdir-ccflags-$(CONFIG_TOUCHPANEL_MTK_PLATFORM) += -I$(srctree)/drivers/misc/mediatek/include/ subdir-ccflags-$(CONFIG_OPLUS_MTK_DRM_GKI_NOTIFY) += -I$(srctree)/drivers/misc/mediatek/include/ @@ -34,4 +35,11 @@ synaptics_tcm2-y += touchpanel_autotest/touchpanel_autotest.o synaptics_tcm2-y += touchpanel_healthinfo/touchpanel_healthinfo.o synaptics_tcm2-y += touchpanel_healthinfo/touchpanel_exception.o -obj-$(CONFIG_TOUCHSCREEN_SYNA_TCM2) += synaptics_tcm2.o +obj-m += oplus_bsp_synaptics_tcm2.o +oplus_bsp_synaptics_tcm2-y := $(synaptics_tcm2-y) +ccflags-y += \ + -DCONFIG_TOUCHPANEL_OPLUS_MODULE \ + -DBUILD_BY_BAZEL \ + -DTOUCHPANEL_STATS_TRACE_INCLUDE_PATH=$(srctree)/$(src)/touchpanel_healthinfo + +KBUILD_EXTRA_SYMBOLS := $(M)/../oplus_touchscreen_v2/touch_custom/Module.symvers diff --git a/oplus/kernel/touchpanel/synaptics_hbp/touchpanel_healthinfo/touchpanel_stats.h b/oplus/kernel/touchpanel/synaptics_hbp/touchpanel_healthinfo/touchpanel_stats.h index cdd0c0ea3d..2862df295b 100644 --- a/oplus/kernel/touchpanel/synaptics_hbp/touchpanel_healthinfo/touchpanel_stats.h +++ b/oplus/kernel/touchpanel/synaptics_hbp/touchpanel_healthinfo/touchpanel_stats.h @@ -40,8 +40,12 @@ TRACE_EVENT(stats_report, #endif /* _TRACE_TOUCH_H */ +#ifndef TOUCHPANEL_STATS_TRACE_INCLUDE_PATH +#define TOUCHPANEL_STATS_TRACE_INCLUDE_PATH ../../../vendor/oplus/kernel/touchpanel/synaptics_hbp/touchpanel_healthinfo +#endif + #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH ../../../vendor/oplus/kernel/touchpanel/synaptics_hbp/touchpanel_healthinfo +#define TRACE_INCLUDE_PATH TOUCHPANEL_STATS_TRACE_INCLUDE_PATH #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE touchpanel_stats diff --git a/oplus/kernel/tp/hbp/hbp/Makefile b/oplus/kernel/tp/hbp/hbp/Makefile index 69c57cce9c..e8ff69497f 100644 --- a/oplus/kernel/tp/hbp/hbp/Makefile +++ b/oplus/kernel/tp/hbp/hbp/Makefile @@ -13,6 +13,6 @@ oplus_hbp_core-y += hbp_exception.o CFLAGS_hbp_core.o := -I$(src) -obj-$(CONFIG_TOUCHSCREEN_HBP_CORE) += oplus_hbp_core.o +obj-m += oplus_hbp_core.o obj-y += chips/ diff --git a/oplus/kernel/tp/hbp/hbp/chips/focal/ft3683g/Makefile b/oplus/kernel/tp/hbp/hbp/chips/focal/ft3683g/Makefile index c2fa7932d6..5256f6d78f 100644 --- a/oplus/kernel/tp/hbp/hbp/chips/focal/ft3683g/Makefile +++ b/oplus/kernel/tp/hbp/hbp/chips/focal/ft3683g/Makefile @@ -1,6 +1,6 @@ # Makefile for the focaltech touchscreen drivers. oplus_ft3683g-y += fhp_core.o -obj-$(CONFIG_TOUCHSCREEN_FTS) += oplus_ft3683g.o +obj-m += oplus_ft3683g.o #obj-$(CONFIG_TOUCHSCREEN_FTS) += focaltech_flash.o #obj-$(CONFIG_TOUCHSCREEN_FTS) += fhp_input.o diff --git a/oplus/kernel/tp/hbp/hbp/chips/synaptics/s3910/Makefile b/oplus/kernel/tp/hbp/hbp/chips/synaptics/s3910/Makefile index dc1598b902..689540c6b0 100644 --- a/oplus/kernel/tp/hbp/hbp/chips/synaptics/s3910/Makefile +++ b/oplus/kernel/tp/hbp/hbp/chips/synaptics/s3910/Makefile @@ -13,4 +13,4 @@ oplus_bsp_tp_hbp_syna_s3910-y += tcm/synaptics_touchcom_func_touch.o oplus_bsp_tp_hbp_syna_s3910-y += tcm/synaptics_touchcom_func_reflash.o oplus_bsp_tp_hbp_syna_s3910-y += tcm/synaptics_touchcom_func_romboot.o -obj-$(CONFIG_TOUCHSCREEN_HBP_SYNA_S3910) += oplus_bsp_tp_hbp_syna_s3910.o +obj-m += oplus_bsp_tp_hbp_syna_s3910.o