armbian · igorpecovnik · Apr 11, 2026 · Apr 11, 2026 · Apr 11, 2026 · Apr 11, 2026
@@ -18,7 +18,7 @@ BOOTPATCHDIR="v2024.04/board_t95z" # This has a 000.patching_config.yaml inside,
 
 # Use extlinux and u-boot-menu extension
 declare -g SRC_EXTLINUX="yes"
-declare -g SRC_CMDLINE="loglevel=7 splash=verbose console=ttyAML0,115200" # Those boards are serial-debug only; 'root=LABEL=armbi_root' ?
+declare -g SRC_CMDLINE="loglevel=7 console=ttyAML0,115200" # Those boards are serial-debug only; 'root=LABEL=armbi_root' ?
 enable_extension "u-boot-menu"                                            # this generates the extlinux.conf
 
 # Use the blobs for not-exactly-matching SBCs which are also S912. Note: the VIM2 blobs expect DDR4 and fails with "DDR4 chl: Rank0+1 @ 1008MHz" last message.

@@ -28,7 +28,7 @@ if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}";
 if test "${bootlogo}" = "true"; then
 	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 else
-	setenv consoleargs "splash=verbose ${consoleargs}"
+	setenv consoleargs "${consoleargs}"
 fi
 
 setenv bootargs "root=${rootdev} rootfstype=${rootfstype} rootwait ${consoleargs} consoleblank=0 video=mxcfb0:dev=hdmi,${disp_mode},if=RGB24,bpp=32 coherent_pool=2M cma=256M@2G rd.dm=0 rd.luks=0 rd.lvm=0 raid=noautodetect pci=nomsi vt.global_cursor_default=0 loglevel=${verbosity} usb-storage.quirks=${usbstoragequirks} ${extraargs}"

@@ -113,7 +113,7 @@ fi
 if test "${bootlogo}" = "true" ; then
 	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 else
-	setenv consoleargs "splash=verbose ${consoleargs}"
+	setenv consoleargs "${consoleargs}"
 fi
 
 part uuid ${devtype} ${devnum}:${distro_bootpart} l_ubootpart

@@ -84,7 +84,7 @@ if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}";
 if test "${bootlogo}" = "true"; then
 	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 else
-	setenv consoleargs "splash=verbose ${consoleargs}"
+	setenv consoleargs "${consoleargs}"
 fi
 
 setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"

@@ -25,7 +25,7 @@ if test "${console}" = "serial"; then setenv consoleargs "console=ttyAML0,115200
 if test "${bootlogo}" = "true"; then
 	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 else
-	setenv consoleargs "splash=verbose ${consoleargs}"
+	setenv consoleargs "${consoleargs}"
 fi
 if test "${disable_vu7}" = "false"; then setenv usbhidquirks "usbhid.quirks=0x0eef:0x0005:0x0004"; fi
 

@@ -33,7 +33,7 @@ fi
 if test "${bootlogo}" = "true"; then
 	setenv plymouthargs "splash plymouth.ignore-serial-consoles"
 else
-	setenv plymouthargs "splash=verbose"
+	setenv plymouthargs ""
 fi
 
 setenv bootargs "${bootargs} root=${rootdev} rootfstype=${rootfstype} rw fsck.repair=yes rootwait ${consoleargs} partition_type=generic loglevel=${verbosity} ${plymouthargs} ${extraargs} ${extraboardargs}"

@@ -114,7 +114,7 @@ if test -e ${devtype} ${devnum} ${prefix}zImage; then
 	if test "${bootlogo}" = "true"; then
 		setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 	else
-		setenv consoleargs "splash=verbose ${consoleargs}"
+		setenv consoleargs "${consoleargs}"
 	fi
 
 	setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 coherent_pool=2M loglevel=${verbosity} ${amlogic} no_console_suspend fsck.repair=yes net.ifnames=0 elevator=noop hdmimode=${hdmimode} cvbsmode=576cvbs max_freq_a55=${max_freq_a55} maxcpus=${maxcpus} voutmode=${voutmode} ${cmode} disablehpd=${disablehpd} cvbscable=${cvbscable} overscan=${overscan} ${hid_quirks} monitor_onoff=${monitor_onoff} ${cec_enable} sdrmode=${sdrmode}"
@@ -135,7 +135,7 @@ else
 	if test "${bootlogo}" = "true"; then
 		setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 	else
-		setenv consoleargs "splash=verbose ${consoleargs}"
+		setenv consoleargs "${consoleargs}"
 	fi
 	if test "${disable_vu7}" = "false"; then setenv usbhidquirks "usbhid.quirks=0x0eef:0x0005:0x0004"; fi
 

@@ -101,7 +101,7 @@ fi
 if test "${bootlogo}" = "true" ; then
 	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 else
-	setenv consoleargs "splash=verbose ${consoleargs}"
+	setenv consoleargs "${consoleargs}"
 fi
 
 part uuid ${devtype} ${devnum}:${distro_bootpart} l_ubootpart

@@ -75,7 +75,7 @@ fi
 if test "${bootlogo}" = "true"; then
 	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 else
-	setenv consoleargs "splash=verbose ${consoleargs}"
+	setenv consoleargs "${consoleargs}"
 fi
 
 # MA35D1 specific: limit kernel memory if needed (for OP-TEE reserved memory)

@@ -27,7 +27,7 @@ if test "${console}" = "serial" || test "${console}" = "both"; then setenv conso
 if test "${bootlogo}" = "true"; then
     setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 else
-    setenv consoleargs "splash=verbose ${consoleargs}"
+    setenv consoleargs "${consoleargs}"
 fi
 
 setenv bootrootfs "${consoleargs} consoleblank=0 loglevel=${verbosity} root=${rootdev} rootfstype=${rootfstype} rootwait rw"

@@ -46,7 +46,7 @@ if test -n "${consoleargs}"; test $? != 0; then
 	if test "${bootlogo}" = "true"; then
 		setenv consoleargs "${consoleargs} splash plymouth.ignore-serial-consoles"
 	else
-		setenv consoleargs "${consoleargs} splash=verbose"
+		setenv consoleargs "${consoleargs}"
 	fi
 fi
 

@@ -30,7 +30,7 @@ if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}";
 if test "${bootlogo}" = "true"; then
 	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 else
-	setenv consoleargs "splash=verbose ${consoleargs}"
+	setenv consoleargs "${consoleargs}"
 fi
 
 setenv bootargs "root=${rootdev} rw rootdelay=5 rootwait rootfstype=${rootfstype} ${consoleargs} loglevel=7 apparmor=0 nousb selinux=0 ${extraargs} ${extraboardargs}"

@@ -36,7 +36,7 @@ if test "${console}" = "serial" || test "${console}" = "both"; then setenv conso
 if test "${bootlogo}" = "true"; then
 	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 else
-	setenv consoleargs "splash=verbose ${consoleargs}"
+	setenv consoleargs "${consoleargs}"
 fi
 
 # get PARTUUID of partition the boot script was loaded from

@@ -37,7 +37,7 @@ if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:1 partuuid; fi
 if test "${bootlogo}" = "true"; then
 	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 else
-	setenv consoleargs "splash=verbose ${consoleargs}"
+	setenv consoleargs "${consoleargs}"
 fi
 
 setenv bootargs "earlyprintk root=${rootdev} console=ttyS2,115200n8 console=tty1 rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"

@@ -32,7 +32,7 @@ if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}";
 if test "${bootlogo}" = "true"; then
 	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 else
-	setenv consoleargs "splash=verbose ${consoleargs}"
+	setenv consoleargs "${consoleargs}"
 fi
 
 # get PARTUUID of first partition on SD/eMMC the boot script was loaded from

@@ -31,7 +31,7 @@ if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}";
 if test "${bootlogo}" = "true"; then
 	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 else
-	setenv consoleargs "splash=verbose ${consoleargs}"
+	setenv consoleargs "${consoleargs}"
 fi
 
 # get PARTUUID of first partition on SD/eMMC the boot script was loaded from

@@ -31,7 +31,7 @@ if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}";
 if test "${bootlogo}" = "true"; then
 	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 else
-	setenv consoleargs "splash=verbose ${consoleargs}"
+	setenv consoleargs "${consoleargs}"
 fi
 
 # get PARTUUID of first partition on SD/eMMC the boot script was loaded from

@@ -32,7 +32,7 @@ if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}";
 if test "${bootlogo}" = "true"; then
 	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 else
-	setenv consoleargs "splash=verbose ${consoleargs}"
+	setenv consoleargs "${consoleargs}"
 fi
 
 # get PARTUUID of first partition on SD/eMMC the boot script was loaded from

@@ -31,7 +31,7 @@ if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}";
 if test "${bootlogo}" = "true"; then
 	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 else
-	setenv consoleargs "splash=verbose ${consoleargs}"
+	setenv consoleargs "${consoleargs}"
 fi
 
 # get PARTUUID of first partition on SD/eMMC the boot script was loaded from

@@ -31,7 +31,7 @@ if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}";
 if test "${bootlogo}" = "true"; then
 	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 else
-	setenv consoleargs "splash=verbose ${consoleargs}"
+	setenv consoleargs "${consoleargs}"
 fi
 
 # get PARTUUID of first partition on SD/eMMC the boot script was loaded from

@@ -72,7 +72,7 @@ if test "${console}" = "serial"; then setenv consoleargs "console=ttyS0,115200";
 if test "${bootlogo}" = "true"; then
 	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 else
-	setenv consoleargs "splash=verbose ${consoleargs}"
+	setenv consoleargs "${consoleargs}"
 fi
 
 # get PARTUUID of first partition on SD/eMMC it was loaded from

@@ -29,7 +29,7 @@ if test "${console}" = "serial"; then setenv consoleargs "console=ttyS0,115200";
 if test "${bootlogo}" = "true"; then
 	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 else
-	setenv consoleargs "splash=verbose ${consoleargs}"
+	setenv consoleargs "${consoleargs}"
 fi
 
 # get PARTUUID of first partition on SD/eMMC it was loaded from

@@ -83,7 +83,7 @@ if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}";
 if test "${bootlogo}" = "true"; then
 	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 else
-	setenv consoleargs "splash=verbose ${consoleargs}"
+	setenv consoleargs "${consoleargs}"
 fi
 
 setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} hdmi.audio=EDID:0 disp.screen0_output_mode=${disp_mode} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} ubootsource=${devtype} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"

@@ -28,7 +28,7 @@ if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}";
 if test "${bootlogo}" = "true"; then
 	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 else
-	setenv consoleargs "splash=verbose ${consoleargs}"
+	setenv consoleargs "${consoleargs}"
 fi
 
 setenv bootargs "root=${rootdev} rootfstype=${rootfstype} rootwait ${consoleargs} video=mxcfb0:dev=hdmi,${disp_mode},if=RGB24,bpp=32 rd.dm=0 rd.luks=0 rd.lvm=0 raid=noautodetect pci=nomsi ahci_imx.hotplug=1 vt.global_cursor_default=0 loglevel=${verbosity} usb-storage.quirks=${usbstoragequirks} ${extraargs}"

@@ -28,7 +28,7 @@ if test "${earlycon}" = "on"; then setenv consoleargs "earlycon=uart8250,mmio32,
 if test "${bootlogo}" = "true"; then
 	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
 else
-	setenv consoleargs "splash=verbose ${consoleargs}"
+	setenv consoleargs "${consoleargs}"
 fi
 
 # get PARTUUID of first partition on SD/eMMC the boot script was loaded from

@@ -112,9 +112,15 @@ configure_grub() {
 	[[ -n "$SERIALCON" ]] &&
 		GRUB_CMDLINE_LINUX_DEFAULT+=" console=${SERIALCON}"
 
-	[[ "$BOOT_LOGO" == "yes" || "$BOOT_LOGO" == "desktop" && "$BUILD_DESKTOP" == "yes" ]] &&
-		GRUB_CMDLINE_LINUX_DEFAULT+=" quiet splash plymouth.ignore-serial-consoles i915.force_probe=* loglevel=3" ||
-		GRUB_CMDLINE_LINUX_DEFAULT+=" splash=verbose i915.force_probe=*"
+	# Kernel cmdline. Always pass the graphical-Plymouth flags
+	# regardless of whether this image is being built as CLI or
+	# desktop — same reasoning as in extensions/grub.sh: users
+	# add a desktop later via armbian-config and we can't
+	# regenerate grub.cfg from there. Plymouth handles the
+	# "no theme installed" / "no DRM" cases gracefully.
+	# (No i915.force_probe here — that's an x86 Intel-graphics
+	# driver knob and is meaningless on riscv64.)
+	GRUB_CMDLINE_LINUX_DEFAULT+=" quiet splash plymouth.ignore-serial-consoles loglevel=3"
 
 	# Enable Armbian Wallpaper on GRUB
 	if [[ "${VENDOR}" == Armbian ]]; then

@@ -265,9 +265,23 @@ configure_grub() {
 	[[ -n "$SERIALCON" ]] &&
 		GRUB_CMDLINE_LINUX_DEFAULT+=" console=${SERIALCON}"
 
-	[[ "$BOOT_LOGO" == "yes" || "$BOOT_LOGO" == "desktop" && "$BUILD_DESKTOP" == "yes" ]] &&
-		GRUB_CMDLINE_LINUX_DEFAULT+=" quiet splash plymouth.ignore-serial-consoles i915.force_probe=* loglevel=3" ||
-		GRUB_CMDLINE_LINUX_DEFAULT+=" splash=verbose i915.force_probe=*"
+	# Kernel cmdline. We always pass the graphical-Plymouth flags
+	# (quiet splash plymouth.ignore-serial-consoles) on UEFI x86,
+	# regardless of whether this image is being built as CLI or
+	# desktop. Two reasons:
+	#   1. Users routinely add a desktop later via armbian-config
+	#      and we don't want that to require regenerating grub.cfg.
+	#      The .cfg is baked once at image-build time and stays
+	#      put across desktop installs.
+	#   2. Plymouth handles the "no theme installed" / "no DRM"
+	#      cases gracefully — the flags are harmless on a CLI
+	#      install. They are NOT harmless when wrong: the previous
+	#      'splash=verbose' value was rejected by the kernel
+	#      ("Unknown kernel command line parameters splash=verbose"
+	#      in dmesg) AND interpreted by Plymouth as "render the
+	#      verbose/text theme", so a desktop installed later still
+	#      booted to a black/text screen.
+	GRUB_CMDLINE_LINUX_DEFAULT+=" quiet splash plymouth.ignore-serial-consoles i915.force_probe=* loglevel=3"
 
 	# Enable Armbian Wallpaper on GRUB
 	if [[ "${VENDOR}" == Armbian ]]; then