Commit: f02afb9aeb70e2272c387a263dd5d29fd57e013b - bootable-newinstaller (git)

bootable/newinstaller

Commit MetaInfo

• Revision: f02afb9aeb70e2272c387a263dd5d29fd57e013b (tree)
• Time: 2020-06-08 09:49:55
• Author: Mauro Rossi <issor.oruam@gmai...>
• Commiter: Chih-Wei Huang

Log Message

add new Debug options for troubleshooting

Change Summary

• modified: boot/isolinux/isolinux.cfg
• modified: install/grub2/efi/boot/android.cfg
• modified: install/scripts/1-install

Incremental Difference

--- a/boot/isolinux/isolinux.cfg
+++ b/boot/isolinux/isolinux.cfg
@@ -21,6 +21,36 @@ label debug
 	kernel /kernel
 	append initrd=/initrd.img CMDLINE DEBUG=2 SRC= DATA=
 
+label debug_gbm
+	menu label Live CD - Debug mode gralloc.gbm
+	kernel /kernel
+	append initrd=/initrd.img CMDLINE DEBUG=2 SRC= DATA= GRALLOC=gbm
+
+label debug_drmfb-composer
+	menu label Live CD - Debug mode drmfb-composer gralloc.gbm
+	kernel /kernel
+	append initrd=/initrd.img CMDLINE DEBUG=2 SRC= DATA= HWC=drmfb GRALLOC=gbm
+
+label debug_hwc_gbm
+	menu label Live CD - Debug mode hwcomposer.drm gralloc.gbm
+	kernel /kernel
+	append initrd=/initrd.img CMDLINE DEBUG=2 SRC= DATA= HWC=drm GRALLOC=gbm
+
+label debug_minigbm
+	menu label Live CD - Debug mode gralloc.minigbm
+	kernel /kernel
+	append initrd=/initrd.img CMDLINE DEBUG=2 SRC= DATA= GRALLOC=minigbm
+
+label debug_hwc_minigbm
+	menu label Live CD - Debug mode hwcomposer.drm_minigbm gralloc.minigbm
+	kernel /kernel
+	append initrd=/initrd.img CMDLINE DEBUG=2 SRC= DATA= HWC=drm_minigbm GRALLOC=minigbm
+
+label debug_intel
+	menu label Live CD - Debug mode hwcomposer.intel gralloc.intel
+	kernel /kernel
+	append initrd=/initrd.img CMDLINE DEBUG=2 SRC= DATA= HWC=intel GRALLOC=intel
+
 label install
 	menu label ^Installation - Install OS_TITLE to harddisk
 	kernel /kernel

--- a/install/grub2/efi/boot/android.cfg
+++ b/install/grub2/efi/boot/android.cfg
@@ -84,7 +84,13 @@ export android bootefi grub kdir live src
 
 # Create main menu
 add_entry "$live" quiet
-add_entry "$debug_mode" DEBUG=2
+add_entry "$live - Debug" DEBUG=2
+add_entry "$live - Debug gralloc.gbm" DEBUG=2 GRALLOC=gbm
+add_entry "$live - Debug drmfb-composer" DEBUG=2 HWC=drmfb GRALLOC=gbm
+add_entry "$live - Debug hwcomposer.drm" DEBUG=2 HWC=drm GRALLOC=gbm
+add_entry "$live - Debug gralloc.minigbm" DEBUG=2 GRALLOC=minigbm
+add_entry "$live - Debug hwcomposer.drm_minigbm" DEBUG=2 HWC=drm_minigbm GRALLOC=minigbm
+add_entry "$live - Debug hwcomposer.intel" DEBUG=2 HWC=intel GRALLOC=intel
 if [ -s ($android)$kdir/install.img ]; then
 	add_entry "Installation" INSTALL=1
 fi

--- a/install/scripts/1-install
+++ b/install/scripts/1-install
@@ -256,6 +256,12 @@ create_menulst()
 
 	create_entry "$OS_TITLE $VER" quiet $cmdline
 	create_entry "$OS_TITLE $VER (Debug mode)" $cmdline DEBUG=2
+	create_entry "$OS_TITLE $VER (Debug mode) gralloc.gbm" $cmdline DEBUG=2 GRALLOC=gbm
+	create_entry "$OS_TITLE $VER (Debug mode) drmfb-composer gralloc.gbm" $cmdline DEBUG=2 HWC=drmfb GRALLOC=gbm
+	create_entry "$OS_TITLE $VER (Debug mode) hwcomposer.drm gralloc.gbm" $cmdline DEBUG=2 HWC=drm GRALLOC=gbm
+	create_entry "$OS_TITLE $VER (Debug mode) gralloc.minigbm" DEBUG=2 GRALLOC=minigbm
+	create_entry "$OS_TITLE $VER (Debug mode) hwcomposer.drm_minigbm gralloc.minigbm" DEBUG=2 HWC=drm_minigbm GRALLOC=minigbm
+	create_entry "$OS_TITLE $VER (Debug mode) hwcomposer.intel gralloc.intel" DEBUG=2 HWC=intel GRALLOC=intel
 	create_entry "$OS_TITLE $VER (Debug nomodeset)" nomodeset $cmdline DEBUG=2
 	create_entry "$OS_TITLE $VER (Debug video=LVDS-1:d)" video=LVDS-1:d $cmdline DEBUG=2
 }