lk2nd/target_display_cont_splash_mdp5: drop

wonderfulShrineMaidenOfParadise · Jun 5, 2024 · b2e3a4e · b2e3a4e
1 parent 1590733
commit b2e3a4e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 194 deletions.
diff --git a/arch/arm/faults.c b/arch/arm/faults.c
@@ -24,7 +24,7 @@
 #include <arch/arm.h>
 #include <kernel/thread.h>
 
-static void dump_fault_frame(struct arm_fault_frame *frame)
+void dump_fault_frame(struct arm_fault_frame *frame)
 {
 	dprintf(CRITICAL, "r0  0x%08x r1  0x%08x r2  0x%08x r3  0x%08x\n", frame->r[0], frame->r[1], frame->r[2], frame->r[3]);
 	dprintf(CRITICAL, "r4  0x%08x r5  0x%08x r6  0x%08x r7  0x%08x\n", frame->r[4], frame->r[5], frame->r[6], frame->r[7]);

diff --git a/lk2nd/rules.mk b/lk2nd/rules.mk
@@ -37,14 +37,8 @@ ifneq ($(LK1ST_PANEL),)
 OBJS := $(filter-out target/$(TARGET)/oem_panel.o, $(OBJS))
 MODULES += lk2nd/panel
 CFLAGS += -DLK1ST_PANEL=$(LK1ST_PANEL)
-else ifeq ($(DISPLAY_USE_CONTINUOUS_SPLASH),1)
-# Filter out original display implementation
-OBJS := $(filter-out target/$(TARGET)/target_display.o target/$(TARGET)/oem_panel.o, $(OBJS))
-ifneq ($(filter $(DEFINES),DISPLAY_TYPE_MDSS=1),)
-    OBJS += $(LOCAL_DIR)/target_display_cont_splash_mdp5.o
-else
-    $(error Continuous splash display is not supported for the current target)
-endif
-endif
-
+else ifneq ($(LK2ND_DISPLAY),)
+INCLUDES += -I$(LOCAL_DIR)/include
 include $(LOCAL_DIR)/util/rules.mk
+MODULES += lk2nd/display
+endif
diff --git a/lk2nd/target_display_cont_splash_mdp5.c b/lk2nd/target_display_cont_splash_mdp5.c
diff --git a/project/lk2nd-defines.mk b/project/lk2nd-defines.mk
@@ -14,3 +14,5 @@ ANDROID_BOOT_CMDLINE := lk2nd
 # Set in platform specific makefile (might need to change ANDROID_BOOT_BASE):
 #APPSBOOTHEADER: $(OUTBOOTIMG) $(OUTODINTAR)
 #ANDROID_BOOT_BASE := 0x80000000
+
+LK2ND_DISPLAY ?= cont-splash