aboot: Use lk2nd's own menu

msm8916-mainline · Aug 30, 2023 · 89aa777 · 89aa777
1 parent a089418
commit 89aa777
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
@@ -102,6 +102,9 @@
 #if WITH_LK2ND_DEVICE
 #include <lk2nd/device.h>
 #endif
+#if WITH_LK2ND_DISPLAY_MENU
+#include <lk2nd/menu.h>
+#endif
 
 extern  bool target_use_signed_kernel(void);
 extern void platform_uninit(void);
@@ -5715,6 +5718,10 @@ void aboot_init(const struct app_descriptor *app)
 #if FBCON_DISPLAY_MSG
 	display_fastboot_menu();
 #endif
+
+#if WITH_LK2ND_DISPLAY_MENU
+	lk2nd_fastboot_menu();
+#endif
 }
 
 uint32_t get_page_size(void)

diff --git a/lk2nd/project/base.mk b/lk2nd/project/base.mk
@@ -29,8 +29,10 @@ LK2ND_SMP_OPTIONAL := 1
 
 ifeq ($(ENABLE_DISPLAY), 1)
 ifneq ($(LK2ND_DISPLAY),)
-MODULES += lk2nd/display
-ENABLE_FBCON_DISPLAY_MSG := 1
+MODULES += \
+	   lk2nd/display \
+	   lk2nd/display/menu
+ENABLE_FBCON_DISPLAY_MSG := 0
 else
 ENABLE_DISPLAY := 0
 $(info NOTE: Display support is disabled without display/panel selection)