From 35abfebd88cc177247e73a1958ac15bc913a717f Mon Sep 17 00:00:00 2001 From: "leo.liu" <1092255140@qq.com> Date: Thu, 31 Mar 2022 05:00:02 +0000 Subject: [PATCH 1/5] Signed-off-by: liu_wei01 --- model/display/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/model/display/Makefile b/model/display/Makefile index f4a808f..6b43119 100644 --- a/model/display/Makefile +++ b/model/display/Makefile @@ -19,11 +19,15 @@ obj-y += \ $(DISPLAY_ROOT_DIR)/hdf_disp.o \ $(DISPLAY_ROOT_DIR)/backlight/hdf_bl.o +ifeq ($(CONFIG_DRM)$(CONFIG_DRM_MIPI_DSI)$(CONFIG_DRM_PANEL), y) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)) +obj-y += $(DISPLAY_ROOT_DIR)/hdf_drm_panel.o +#endif +endif obj-$(CONFIG_DRIVERS_HDF_PLATFORM_PWM) += \ $(DISPLAY_ROOT_DIR)/backlight/pwm_bl.o obj-$(CONFIG_ARCH_SPRD) += \ - $(DISPLAY_ROOT_DIR)/hdf_drm_panel.o \ $(DISPLAY_ROOT_DIR)/panel/ili9881c_boe.o obj-$(CONFIG_ARCH_HI3516DV300) += \ @@ -36,6 +40,8 @@ obj-$(CONFIG_DRIVERS_HDF_LCD_ICN9700) += \ $(DISPLAY_ROOT_DIR)/panel/mipi_icn9700.o obj-$(CONFIG_DRIVERS_HDF_LCD_ST7789) += \ $(DISPLAY_ROOT_DIR)/panel/ssp_st7789.o +obj-$(CONFIG_ARCH_ROCKCHIP) += \ + $(DISPLAY_ROOT_DIR)/panel/mipi_dsi_panel_simple.o ccflags-y += -lm -lc -lgcc \ -I$(srctree)/drivers/hdf/framework/model/display/driver \ -- Gitee From 55c129847ad63563fb49a30b508b5f0a960ac41b Mon Sep 17 00:00:00 2001 From: "leo.liu" <1092255140@qq.com> Date: Thu, 31 Mar 2022 11:24:55 +0000 Subject: [PATCH 2/5] Signed-off-by: liu_wei01 --- model/display/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/display/Makefile b/model/display/Makefile index 6b43119..8120a68 100644 --- a/model/display/Makefile +++ b/model/display/Makefile @@ -19,7 +19,7 @@ obj-y += \ $(DISPLAY_ROOT_DIR)/hdf_disp.o \ $(DISPLAY_ROOT_DIR)/backlight/hdf_bl.o -ifeq ($(CONFIG_DRM)$(CONFIG_DRM_MIPI_DSI)$(CONFIG_DRM_PANEL), y) +ifneq ($(CONFIG_DRM)$(CONFIG_DRM_MIPI_DSI)$(CONFIG_DRM_PANEL), y) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)) obj-y += $(DISPLAY_ROOT_DIR)/hdf_drm_panel.o #endif -- Gitee From 80535d7e982a34f19a77c1cf16ed050521233498 Mon Sep 17 00:00:00 2001 From: "leo.liu" <1092255140@qq.com> Date: Fri, 1 Apr 2022 01:25:26 +0000 Subject: [PATCH 3/5] Signed-off-by: liu_wei01 --- model/display/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/model/display/Makefile b/model/display/Makefile index 8120a68..f41e8d1 100644 --- a/model/display/Makefile +++ b/model/display/Makefile @@ -19,11 +19,12 @@ obj-y += \ $(DISPLAY_ROOT_DIR)/hdf_disp.o \ $(DISPLAY_ROOT_DIR)/backlight/hdf_bl.o -ifneq ($(CONFIG_DRM)$(CONFIG_DRM_MIPI_DSI)$(CONFIG_DRM_PANEL), y) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)) +ifeq ($(CONFIG_ARCH_ROCKCHIP), y) obj-y += $(DISPLAY_ROOT_DIR)/hdf_drm_panel.o -#endif endif +#endif + obj-$(CONFIG_DRIVERS_HDF_PLATFORM_PWM) += \ $(DISPLAY_ROOT_DIR)/backlight/pwm_bl.o -- Gitee From 25072afe4f49a035d05591307bc483f89426cc11 Mon Sep 17 00:00:00 2001 From: "leo.liu" <1092255140@qq.com> Date: Fri, 1 Apr 2022 13:32:23 +0000 Subject: [PATCH 4/5] Signed-off-by: liu_wei01 --- model/display/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/display/Makefile b/model/display/Makefile index f41e8d1..f4123b6 100644 --- a/model/display/Makefile +++ b/model/display/Makefile @@ -42,7 +42,7 @@ obj-$(CONFIG_DRIVERS_HDF_LCD_ICN9700) += \ obj-$(CONFIG_DRIVERS_HDF_LCD_ST7789) += \ $(DISPLAY_ROOT_DIR)/panel/ssp_st7789.o obj-$(CONFIG_ARCH_ROCKCHIP) += \ - $(DISPLAY_ROOT_DIR)/panel/mipi_dsi_panel_simple.o + $(DISPLAY_ROOT_DIR)/panel/ili9881_st055g.o ccflags-y += -lm -lc -lgcc \ -I$(srctree)/drivers/hdf/framework/model/display/driver \ -- Gitee From 101b719bfc475362949c7cb9a84eea835b8fa93b Mon Sep 17 00:00:00 2001 From: wang_qr Date: Sat, 2 Apr 2022 07:41:10 +0000 Subject: [PATCH 5/5] update model/display/Makefile. --- model/display/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/display/Makefile b/model/display/Makefile index f4123b6..5681b62 100644 --- a/model/display/Makefile +++ b/model/display/Makefile @@ -42,7 +42,7 @@ obj-$(CONFIG_DRIVERS_HDF_LCD_ICN9700) += \ obj-$(CONFIG_DRIVERS_HDF_LCD_ST7789) += \ $(DISPLAY_ROOT_DIR)/panel/ssp_st7789.o obj-$(CONFIG_ARCH_ROCKCHIP) += \ - $(DISPLAY_ROOT_DIR)/panel/ili9881_st055g.o + $(DISPLAY_ROOT_DIR)/panel/ili9881_st_5p5.o ccflags-y += -lm -lc -lgcc \ -I$(srctree)/drivers/hdf/framework/model/display/driver \ -- Gitee