Support Plymouth (#4133)

* Add plymouth-theme-armbian package

* Adjust all bootscripts to adapt plymouth

* Auto show logo accroding to BOOT_LOGO

* Enable plymouth detail mode when bootlogo=false

* Add a new board config var - HAS_VIDEO_OUTPUT

This var is used to indicate whether device has a HW video output.
If it's set to "no", we will disable kernel bootsplash, plymouth and BUILD_DESKTOP

* Rename package to be aligned with others

* Disable kernel bootloader, but keep the code for it

* Rather keep bootlogo in the kernel for a while, otherwise kernel upgrade will turn bootup into the darkness

Co-authored-by: Igor Pečovnik <igorpecovnik@users.noreply.github.com>
Co-authored-by: Igor <igor@armbian.com>
This commit is contained in:
hzyitc
2022-09-13 21:16:30 +08:00
committed by GitHub
parent 25cdb3f446
commit 11d2ef63c3
72 changed files with 312 additions and 62 deletions

View File

@@ -2,5 +2,5 @@
BOARD_NAME="Banana Pi R2"
BOARDFAMILY="mt7623"
BOOTCONFIG="mt7623n_bpir2_defconfig"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="legacy"

View File

@@ -3,5 +3,5 @@ BOARD_NAME="Clearfog Base"
BOARDFAMILY="mvebu"
BOOTCONFIG="clearfog_defconfig"
#BOOTCONFIG_EDGE="clearfogbase_defconfig" # This had to be disabled because the clearfog is not yet ready for mainline uboot
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="legacy,current,edge"

View File

@@ -2,5 +2,5 @@
BOARD_NAME="Clearfog Pro"
BOARDFAMILY="mvebu"
BOOTCONFIG="clearfog_defconfig"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="legacy,current,edge"

View File

@@ -2,6 +2,6 @@
BOARD_NAME="Cubieboard 1"
BOARDFAMILY="sun4i"
BOOTCONFIG="Cubieboard_config"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="legacy,current,edge"
MODULES_BLACKLIST="ir_lirc_codec lirc_dev sunxi-cir"

View File

@@ -2,5 +2,5 @@
BOARD_NAME="Espressobin"
BOARDFAMILY="mvebu64"
BOOTCONFIG="mvebu_espressobin-88f3720_defconfig"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="current,edge"

View File

@@ -2,7 +2,7 @@
BOARD_NAME="FE SOM RK3399"
BOARDFAMILY="rk3399"
BOOTCONFIG="nanopc-t4-rk3399_defconfig"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="legacy,current,edge"
ASOUND_STATE="asound.state.rt5651"
BOOT_LOGO="desktop"

View File

@@ -5,6 +5,6 @@ BOOTCONFIG="helios4_defconfig"
BOOTCONFIG_NEXT="helios4_defconfig"
MODULES_LEGACY="marvell_cesa lm75"
MODULES_CURRENT="marvell_cesa lm75"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
FORCE_BOOTSCRIPT_UPDATE="yes"
KERNEL_TARGET="legacy,current,edge"

View File

@@ -1,7 +1,7 @@
# Allwinner A33 quad core 1Gb SoC
BOARD_NAME="A33 OLinuXino"
BOARDFAMILY="sun8i"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
BOOTCONFIG="A33-OLinuXino_defconfig"
OVERLAY_PREFIX="sun8i-a33"
KERNEL_TARGET="legacy,current,edge"

View File

@@ -2,5 +2,5 @@
BOARD_NAME="Macchiatobin DS"
BOARDFAMILY="mvebu64"
BOOTCONFIG="mvebu_mcbin-88f8040_defconfig"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="legacy,current,edge"

View File

@@ -1,6 +1,6 @@
# Allwinner A10 single core 1Gb SoC
BOARD_NAME="Mele A1000"
BOARDFAMILY="sun4i"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
BOOTCONFIG="Mele_A1000_defconfig"
KERNEL_TARGET="current,edge"

View File

@@ -1,6 +1,6 @@
# Allwinner A20 dual core 1Gb SoC
BOARD_NAME="MK808C"
BOARDFAMILY="sun7i"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
BOOTCONFIG="MK808C_defconfig"
KERNEL_TARGET="legacy,current,edge"

View File

@@ -7,5 +7,5 @@ MODULES_BLACKLIST="lima"
DEFAULT_OVERLAYS="usbhost0 usbhost1 uart1"
DEFAULT_CONSOLE="serial"
SERIALCON="ttyS1,ttyGS0"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="legacy,current,edge"

View File

@@ -7,5 +7,5 @@ DEFAULT_CONSOLE="serial"
MODULES="g_serial"
MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu"
SERIALCON="ttyS2:1500000,ttyGS0"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
BOOT_FDT_FILE="rockchip/rk3328-nanopi-r2-rev06.dtb"

View File

@@ -7,5 +7,5 @@ DEFAULT_CONSOLE="serial"
MODULES="g_serial"
MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu"
SERIALCON="ttyS2:1500000,ttyGS0"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
BOOT_FDT_FILE="rockchip/rk3328-nanopi-r2-rev00.dtb"

View File

@@ -5,4 +5,4 @@ BOOTCONFIG="nanopi-r4s-rk3399_defconfig"
KERNEL_TARGET="current,edge"
DEFAULT_CONSOLE="serial"
MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"

View File

@@ -7,5 +7,5 @@ MODULES_BLACKLIST="lima"
DEFAULT_OVERLAYS="usbhost2 usbhost3"
DEFAULT_CONSOLE="serial"
SERIALCON="ttyS0,ttyGS0"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="legacy,current,edge"

View File

@@ -6,6 +6,6 @@ MODULES="g_serial"
MODULES_BLACKLIST="lima"
DEFAULT_OVERLAYS="usbhost2 usbhost3"
DEFAULT_CONSOLE="serial"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
SERIALCON="ttyS0,ttyGS0"
KERNEL_TARGET="current,edge"

View File

@@ -6,6 +6,6 @@ MODULES="g_serial"
MODULES_BLACKLIST="lima"
DEFAULT_OVERLAYS="usbhost0 usbhost2 usbhost3"
DEFAULT_CONSOLE="serial"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
SERIALCON="ttyS0,ttyGS0"
KERNEL_TARGET="current,edge"

View File

@@ -7,5 +7,5 @@ MODULES_BLACKLIST="lima"
DEFAULT_OVERLAYS="usbhost1 usbhost2"
DEFAULT_CONSOLE="serial"
SERIALCON="ttyS0,ttyGS0"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="legacy,current,edge"

View File

@@ -7,5 +7,5 @@ MODULES_BLACKLIST="lima"
DEFAULT_OVERLAYS="usbhost1 usbhost2"
DEFAULT_CONSOLE="serial"
SERIALCON="ttyS0,ttyGS0"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="legacy,current,edge"

View File

@@ -7,5 +7,5 @@ MODULES_BLACKLIST="lima"
DEFAULT_OVERLAYS="usbhost1 usbhost2"
DEFAULT_CONSOLE="serial"
SERIALCON="ttyS1,ttyGS0"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="legacy,current,edge"

View File

@@ -7,5 +7,5 @@ DEFAULT_CONSOLE="serial"
MODULES="g_serial"
MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima"
SERIALCON="ttyS2:1500000,ttyGS0"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
BOOT_FDT_FILE="rockchip/rk3328-nanopi-neo3-rev02.dtb"

View File

@@ -7,5 +7,5 @@ MODULES_BLACKLIST="lima"
DEFAULT_OVERLAYS="usbhost1 usbhost2"
DEFAULT_CONSOLE="serial"
SERIALCON="ttyS0,ttyGS0"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="legacy,current,edge"

View File

@@ -7,5 +7,5 @@ MODULES_BLACKLIST="lima"
DEFAULT_OVERLAYS="usbhost1 usbhost2"
DEFAULT_CONSOLE="serial"
SERIALCON="ttyS0,ttyGS0"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="legacy,current,edge"

View File

@@ -1,6 +1,6 @@
# Allwinner A20 dual core 1Gb SoC
BOARD_NAME="SOM-A20"
BOARDFAMILY="sun7i"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
BOOTCONFIG="A20-Olimex-SOM-EVB_defconfig"
KERNEL_TARGET="current,edge"

View File

@@ -5,6 +5,6 @@ BOOTCONFIG="A20-Olimex-SOM204-EVB-eMMC_defconfig"
MODULES_CURRENT="bonding g_serial gpio-ir-tx r8723bs"
MODULES_EDGE="bonding g_serial gpio-ir-tx r8723bs "
SERIALCON="ttyS0,ttyGS0"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="current,edge"
PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager xinput-calibrator"

View File

@@ -1,6 +1,6 @@
# Allwinner A13 single core 512Mb SoM
BOARD_NAME="Olimex A13 SOM"
BOARDFAMILY="sun5i"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
BOOTCONFIG="A13-OLinuXino_defconfig"
KERNEL_TARGET="current,edge"

View File

@@ -5,7 +5,7 @@ BOOTCONFIG="orangepi_r1_defconfig"
DEFAULT_OVERLAYS="usbhost2 usbhost3"
MODULES="g_serial"
MODULES_BLACKLIST="lima sunxi_cedrus"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
DEFAULT_CONSOLE="serial"
SERIALCON="ttyS0,ttyGS0"
KERNEL_TARGET="current,edge"

View File

@@ -7,5 +7,5 @@ DEFAULT_CONSOLE="serial"
MODULES="g_serial"
MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu"
SERIALCON="ttyS2:1500000,ttyGS0"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
BOOT_FDT_FILE="rockchip/rk3328-orangepi-r1-plus-lts.dtb"

View File

@@ -7,4 +7,4 @@ DEFAULT_CONSOLE="serial"
MODULES="g_serial"
MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu"
SERIALCON="ttyS2:1500000,ttyGS0"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"

View File

@@ -6,6 +6,6 @@ MODULES_CURRENT="g_serial"
MODULES_BLACKLIST="lima sunxi_cedrus"
DEFAULT_OVERLAYS="usbhost2 usbhost3"
DEFAULT_CONSOLE="serial"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
SERIALCON="ttyS0,ttyGS0"
KERNEL_TARGET="legacy,current,edge"

View File

@@ -5,7 +5,7 @@ BOOTCONFIG="orangepi_zero2_defconfig"
MODULES_LEGACY="uwe5622_bsp_sdio sprdbt_tty sprdwl_ng"
MODULES_BLACKLIST="lima"
DEFAULT_CONSOLE="serial"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
SERIALCON="ttyS0"
KERNEL_TARGET="legacy,current,edge"
PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools"

View File

@@ -7,5 +7,5 @@ MODULES="g_serial"
MODULES_BLACKLIST="lima"
SERIALCON="ttyS0,ttyGS0"
DEFAULT_OVERLAYS="usbhost2 usbhost3"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="legacy,current,edge"

View File

@@ -5,6 +5,6 @@ BOOTCONFIG="orangepi_zero_plus2_defconfig"
MODULES_LEGACY="g_serial"
MODULES_CURRENT="g_serial"
DEFAULT_OVERLAYS="gpio-regulator-1.3v usbhost2 usbhost3"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
SERIALCON="ttyS0,ttyGS0"
KERNEL_TARGET="legacy,current,edge"

View File

@@ -3,4 +3,4 @@ BOARD_NAME="Pine Cube"
BOARDFAMILY="sun8i-v3s"
KERNEL_TARGET="current,edge"
BOOTCONFIG="pinecube_defconfig"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"

View File

@@ -5,4 +5,4 @@ BOOTCONFIG="rock-pi-e-rk3328_defconfig"
KERNEL_TARGET="legacy,current,edge"
DEFAULT_CONSOLE="serial"
MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"

View File

@@ -6,5 +6,5 @@ DEFAULT_OVERLAYS="usbhost1 usbhost2"
MODULES_BLACKLIST="lima"
DEFAULT_CONSOLE="serial"
SERIALCON="ttyS0"
BUILD_DESKTOP="no"
HAS_VIDEO_OUTPUT="no"
KERNEL_TARGET="current,edge"

View File

@@ -25,7 +25,11 @@ fi
if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "${consoleargs} console=${cons}"; fi
if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi
if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi
if test "${bootlogo}" = "true"; then
setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
else
setenv consoleargs "splash=verbose ${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}"
load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}dtb/${fdtfile}

View File

@@ -111,7 +111,11 @@ if test -e ${devtype} ${devnum} ${prefix}zImage; then
if test "${console}" = "serial"; then setenv consoleargs "console=ttyS0,115200"; fi
if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=ttyS0,115200 console=tty1"; fi
if test "${console}" = "serial"; then setenv consoleargs "console=ttyS0,115200"; fi
if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi
if test "${bootlogo}" = "true"; then
setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
else
setenv consoleargs "splash=verbose ${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}"
echo "Legacy bootargs: ${bootargs}"
@@ -128,7 +132,11 @@ else
if test "${console}" = "serial"; then setenv consoleargs "console=ttyAML0,115200"; fi
if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=ttyAML0,115200 console=tty1"; fi
if test "${console}" = "serial"; then setenv consoleargs "console=ttyAML0,115200"; fi
if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi
if test "${bootlogo}" = "true"; then
setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
else
setenv consoleargs "splash=verbose ${consoleargs}"
fi
if test "${disable_vu7}" = "false"; then setenv usbhidquirks "usbhid.quirks=0x0eef:0x0005:0x0004"; fi
setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 coherent_pool=2M loglevel=${verbosity} ubootpart=${partuuid} libata.force=noncq usb-storage.quirks=${usbstoragequirks} ${usbhidquirks} ${extraargs} ${extraboardargs}"

View File

@@ -158,7 +158,7 @@ if test -e mmc 0:1 boot/.next; then setenv condev "console=ttyAML0,115200n8"; el
###########################################
setenv verbosity "1"
if test "${bootlogo}" = "true"; then setenv bootsplash "bootsplash.bootfile=bootsplash.armbian"; fi
if test "${bootlogo}" = "true"; then setenv bootsplash "splash plymouth.ignore-serial-consoles"; fi
# Boot arguments
setenv bootargs "root=${rootdev} rootwait rootflags=data=writeback rw rootfstype=${rootfstype} ${condev} no_console_suspend consoleblank=0 hdmimode=${m} m_bpp=${m_bpp} vout=${vout} fsck.repair=yes loglevel=${verbosity} ${bootsplash} net.ifnames=0 ${extraargs}"

View File

@@ -103,7 +103,7 @@ setenv maxcpus "6"
### Normal HDMI Monitors
if test "${display_autodetect}" = "true"; then hdmitx edid; fi
if test "${bootlogo}" = "true"; then setenv bootsplash "bootsplash.bootfile=bootsplash.armbian"; fi
if test "${bootlogo}" = "true"; then setenv bootsplash "splash plymouth.ignore-serial-consoles"; fi
if test "${hdmimode}" = "custombuilt"; then setenv cmode "modeline=${modeline}"; fi
# Read armbianEnv.txt

View File

@@ -24,7 +24,11 @@ if ext4load mmc 0:1 0x44000000 /boot/armbianEnv.txt || fatload mmc 0:1 0x4400000
if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttySAC2,115200n8 ${consoleargs}"; fi
if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi
if test "${bootlogo}" = "true"; then
setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
else
setenv consoleargs "splash=verbose ${consoleargs}"
fi
setenv bootrootfs "${consoleargs} consoleblank=0 loglevel=${verbosity} root=${rootdev} rootfstype=${rootfstype} rootwait rw"

View File

@@ -27,7 +27,11 @@ fi
if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=ttyAMA0 console=tty1"; fi
if test "${console}" = "serial"; then setenv consoleargs "console=ttyAMA0"; fi
if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi
if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi
if test "${bootlogo}" = "true"; then
setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
else
setenv consoleargs "splash=verbose ${consoleargs}"
fi
setenv bootargs "root=${rootdev} rw rootdelay=5 rootwait rootfstype=${rootfstype} ${consoleargs} loglevel=7 apparmor=0 nousb selinux=0 ${extraargs} ${extraboardargs}"
load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd

View File

@@ -34,7 +34,11 @@ if test "${logo}" = "disabled"; then setenv logo "logo.nologo"; fi
# get PARTUUID of first partition on SD/eMMC the boot script was loaded from
if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:1 partuuid; fi
if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi
if test "${bootlogo}" = "true"; then
setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
else
setenv consoleargs "splash=verbose ${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}"

View File

@@ -29,7 +29,11 @@ if test "${console}" = "ttyS2,115200n8"; then setenv console "both"; fi
if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttyS2,115200n8 ${consoleargs}"; fi
if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi
if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi
if test "${bootlogo}" = "true"; then
setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
else
setenv consoleargs "splash=verbose ${consoleargs}"
fi
# get PARTUUID of first partition on SD/eMMC the boot script was loaded from
if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:1 partuuid; fi

View File

@@ -26,7 +26,11 @@ if test "${logo}" = "disabled"; then setenv logo "logo.nologo"; fi
if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttyS2,1500000 ${consoleargs}"; fi
if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi
if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi
if test "${bootlogo}" = "true"; then
setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
else
setenv consoleargs "splash=verbose ${consoleargs}"
fi
# get PARTUUID of first partition on SD/eMMC the boot script was loaded from
if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:1 partuuid; fi

View File

@@ -23,7 +23,11 @@ if ext4load mmc ${devnum}:1 ${kernel_addr_r} ${prefix}/armbianEnv.txt; then
env import -t ${kernel_addr_r} ${filesize}
fi
if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi
if test "${bootlogo}" = "true"; then
setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
else
setenv consoleargs "splash=verbose ${consoleargs}"
fi
setenv bootargs "console=ttySAC0,115200n8 console=tty1 ${consoleargs} root=${rootdev} rootwait rootfstype=${rootfstype} loglevel=${verbosity} usb-storage.quirks=${usbstoragequirks} ${extraargs}"

View File

@@ -27,7 +27,11 @@ fi
if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=ttyS0,115200 console=tty1"; fi
if test "${console}" = "serial"; then setenv consoleargs "console=ttyS0,115200"; fi
if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi
if test "${bootlogo}" = "true"; then
setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
else
setenv consoleargs "splash=verbose ${consoleargs}"
fi
# get PARTUUID of first partition on SD/eMMC it was loaded from
# mmc 0 is always mapped to device u-boot (2016.09+) was loaded from

View File

@@ -26,7 +26,11 @@ fi
if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=ttyS0,115200 console=tty1"; fi
if test "${console}" = "serial"; then setenv consoleargs "console=ttyS0,115200"; fi
if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi
if test "${bootlogo}" = "true"; then
setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
else
setenv consoleargs "splash=verbose ${consoleargs}"
fi
# get PARTUUID of first partition on SD/eMMC it was loaded from
# mmc 0 is always mapped to device u-boot (2016.09+) was loaded from

View File

@@ -40,7 +40,11 @@ fi
if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=ttyS0,115200 console=tty1"; fi
if test "${console}" = "serial"; then setenv consoleargs "console=ttyS0,115200"; fi
if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi
if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi
if test "${bootlogo}" = "true"; then
setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
else
setenv consoleargs "splash=verbose ${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}"

View File

@@ -25,7 +25,11 @@ fi
if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=ttymxc1,115200 console=tty1"; fi
if test "${console}" = "serial"; then setenv consoleargs "console=ttymxc1,115200"; fi
if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi
if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi
if test "${bootlogo}" = "true"; then
setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
else
setenv consoleargs "splash=verbose ${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}"
run findfdt

View File

@@ -31,20 +31,22 @@ case $BRANCH in
KERNELBRANCH="branch:linux-5.10.y"
KERNELPATCHDIR='meson-'$BRANCH
;;
;;
current)
KERNELBRANCH="branch:linux-5.15.y"
KERNELPATCHDIR='meson-'$BRANCH
;;
;;
edge)
KERNELBRANCH="branch:linux-5.18.y"
KERNELPATCHDIR='meson-'$BRANCH
;;
;;
esac
write_uboot_platform()

View File

@@ -117,13 +117,13 @@ compilation_prepare()
fi
#
# Linux splash file
# Linux splash file (legacy)
#
# disable it.
# todo: cleanup logo generation code and bring in plymouth
# since plymouth introduction, boot scripts are not supporting this method anymore.
# In order to enable it, you need to use this: setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"
if linux-version compare "${version}" ge 5.15 && [ $SKIP_BOOTSPLASH != yes ]; then
if linux-version compare "${version}" ge 5.15 && [ "${SKIP_BOOTSPLASH}" != yes ]; then
display_alert "Adding" "Kernel splash file" "info"

View File

@@ -773,6 +773,62 @@ compile_armbian-config()
compile_plymouth-theme-armbian()
{
local tmp_dir work_dir
tmp_dir=$(mktemp -d)
chmod 700 ${tmp_dir}
trap "ret=\$?; rm -rf \"${tmp_dir}\" ; exit \$ret" 0 1 2 3 15
plymouth_theme_armbian_dir=armbian-plymouth-theme_${REVISION}_all
display_alert "Building deb" "armbian-plymouth-theme" "info"
mkdir -p "${tmp_dir}/${plymouth_theme_armbian_dir}"/{DEBIAN,usr/share/plymouth/themes/armbian}
# set up control file
cat <<-END > "${tmp_dir}/${plymouth_theme_armbian_dir}"/DEBIAN/control
Package: armbian-plymouth-theme
Version: $REVISION
Architecture: all
Maintainer: $MAINTAINER <$MAINTAINERMAIL>
Depends: plymouth, plymouth-themes
Section: universe/x11
Priority: optional
Description: boot animation, logger and I/O multiplexer - armbian theme
END
cp "${SRC}"/packages/plymouth-theme-armbian/debian/{postinst,prerm,postrm} \
"${tmp_dir}/${plymouth_theme_armbian_dir}"/DEBIAN/
chmod 755 "${tmp_dir}/${plymouth_theme_armbian_dir}"/DEBIAN/{postinst,prerm,postrm}
convert -resize 256x256 \
"${SRC}"/packages/plymouth-theme-armbian/armbian-logo.png \
"${tmp_dir}/${plymouth_theme_armbian_dir}"/usr/share/plymouth/themes/armbian/bgrt-fallback.png
# convert -resize 52x52 \
# "${SRC}"/packages/plymouth-theme-armbian/spinner.gif \
# "${tmp_dir}/${plymouth_theme_armbian_dir}"/usr/share/plymouth/themes/armbian/animation-%04d.png
convert -resize 52x52 \
"${SRC}"/packages/plymouth-theme-armbian/spinner.gif \
"${tmp_dir}/${plymouth_theme_armbian_dir}"/usr/share/plymouth/themes/armbian/throbber-%04d.png
cp "${SRC}"/packages/plymouth-theme-armbian/watermark.png \
"${tmp_dir}/${plymouth_theme_armbian_dir}"/usr/share/plymouth/themes/armbian/
cp "${SRC}"/packages/plymouth-theme-armbian/{bullet,capslock,entry,keyboard,keymap-render,lock}.png \
"${tmp_dir}/${plymouth_theme_armbian_dir}"/usr/share/plymouth/themes/armbian/
cp "${SRC}"/packages/plymouth-theme-armbian/armbian.plymouth \
"${tmp_dir}/${plymouth_theme_armbian_dir}"/usr/share/plymouth/themes/armbian/
fakeroot dpkg-deb -b -Z${DEB_COMPRESS} "${tmp_dir}/${plymouth_theme_armbian_dir}" >/dev/null
rsync --remove-source-files -rq "${tmp_dir}/${plymouth_theme_armbian_dir}.deb" "${DEB_STORAGE}/"
rm -rf "${tmp_dir}"
}
compile_xilinx_bootgen()
{

View File

@@ -159,6 +159,7 @@ ATF_COMPILE=yes
[[ -z $WIREGUARD ]] && WIREGUARD="yes"
[[ -z $EXTRAWIFI ]] && EXTRAWIFI="yes"
[[ -z $SKIP_BOOTSPLASH ]] && SKIP_BOOTSPLASH="no"
[[ -z $PLYMOUTH ]] && PLYMOUTH="yes"
[[ -z $AUFS ]] && AUFS="yes"
[[ -z $IMAGE_PARTITION_TABLE ]] && IMAGE_PARTITION_TABLE="msdos"
[[ -z $EXTRA_BSP_NAME ]] && EXTRA_BSP_NAME=""
@@ -179,6 +180,12 @@ fi
# load architecture defaults
source "${SRC}/config/sources/${ARCH}.conf"
if [[ "$HAS_VIDEO_OUTPUT" == "no" ]]; then
SKIP_BOOTSPLASH="yes"
PLYMOUTH="no"
[[ $BUILD_DESKTOP != "no" ]] && exit_with_error "HAS_VIDEO_OUTPUT is set to no. So we shouldn't build desktop environment"
fi
## Extensions: at this point we've sourced all the config files that will be used,
## and (hopefully) not yet invoked any extension methods. So this is the perfect
## place to initialize the extension manager. It will create functions

View File

@@ -396,6 +396,15 @@ POST_INSTALL_KERNEL_DEBS
fi
fi
# install plymouth-theme-armbian
if [[ $PLYMOUTH == yes ]]; then
if [[ "${REPOSITORY_INSTALL}" != *plymouth-theme-armbian* ]]; then
install_deb_chroot "${DEB_STORAGE}/armbian-plymouth-theme_${REVISION}_all.deb"
else
install_deb_chroot "armbian-plymouth-theme" "remote"
fi
fi
# install kernel sources
if [[ -f ${DEB_STORAGE}/${CHOSEN_KSRC}_${REVISION}_all.deb && $INSTALL_KSRC == yes ]]; then
install_deb_chroot "${DEB_STORAGE}/${CHOSEN_KSRC}_${REVISION}_all.deb"
@@ -592,6 +601,18 @@ FAMILY_TWEAKS
# build logo in any case
boot_logo
# Show logo
if [[ $PLYMOUTH == yes ]]; then
if [[ $BOOT_LOGO == yes || $BOOT_LOGO == desktop && $BUILD_DESKTOP == yes ]]; then
[[ -f "${SDCARD}"/boot/armbianEnv.txt ]] && grep -q '^bootlogo' "${SDCARD}"/boot/armbianEnv.txt \
&& sed -i 's/^bootlogo.*/bootlogo=true/' "${SDCARD}"/boot/armbianEnv.txt \
|| echo 'bootlogo=true' >> "${SDCARD}"/boot/armbianEnv.txt
[[ -f "${SDCARD}"/boot/boot.ini ]] \
&& sed -i 's/^setenv bootlogo.*/setenv bootlogo "true"/' "${SDCARD}"/boot/boot.ini
fi
fi
# disable MOTD for first boot - we want as clean 1st run as possible
chmod -x "${SDCARD}"/etc/update-motd.d/*

View File

@@ -56,6 +56,7 @@ cleaning()
find "${DEB_STORAGE}" -name "${CHOSEN_UBOOT}_*.deb" -delete
find "${DEB_STORAGE}" \( -name "${CHOSEN_KERNEL}_*.deb" -o \
-name "armbian-*.deb" -o \
-name "plymouth-theme-armbian_*.deb" -o \
-name "${CHOSEN_KERNEL/image/dtb}_*.deb" -o \
-name "${CHOSEN_KERNEL/image/headers}_*.deb" -o \
-name "${CHOSEN_KERNEL/image/source}_*.deb" -o \

View File

@@ -322,9 +322,9 @@ if [[ $KERNEL_ONLY != yes && -z $RELEASE ]]; then
fi
# don't show desktop option if we choose minimal build
[[ $BUILD_MINIMAL == yes ]] && BUILD_DESKTOP=no
if [[ $KERNEL_ONLY != yes && -z $BUILD_DESKTOP ]]; then
if [[ $HAS_VIDEO_OUTPUT == no || $BUILD_MINIMAL == yes ]]; then
BUILD_DESKTOP=no
elif [[ $KERNEL_ONLY != yes && -z $BUILD_DESKTOP ]]; then
# read distribution support status which is written to the armbian-release file
set_distribution_status
@@ -504,6 +504,13 @@ if [[ ! -f ${DEB_STORAGE}/armbian-zsh_${REVISION}_all.deb ]]; then
fi
# Compile plymouth-theme-armbian if packed .deb does not exist or use the one from repository
if [[ ! -f ${DEB_STORAGE}/plymouth-theme-armbian_${REVISION}_all.deb ]]; then
[[ "${REPOSITORY_INSTALL}" != *plymouth-theme-armbian* ]] && compile_plymouth-theme-armbian
fi
# Compile armbian-firmware if packed .deb does not exist or use the one from repository
if ! ls "${DEB_STORAGE}/armbian-firmware_${REVISION}_all.deb" 1> /dev/null 2>&1 || ! ls "${DEB_STORAGE}/armbian-firmware-full_${REVISION}_all.deb" 1> /dev/null 2>&1; then

View File

@@ -0,0 +1,3 @@
if which plymouth >/dev/null 2>&1; then
FRAMEBUFFER=y
fi

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

View File

@@ -0,0 +1,64 @@
[Plymouth Theme]
Name=Armbian
Description=Armbian logo
ModuleName=two-step
[two-step]
Font=DejaVu Sans 15
TitleFont=DejaVu Sans Mono Bold 30
ImageDir=/usr/share/plymouth/themes/armbian
DialogHorizontalAlignment=.5
DialogVerticalAlignment=.7
TitleHorizontalAlignment=.5
TitleVerticalAlignment=.382
HorizontalAlignment=.5
VerticalAlignment=.7
WatermarkHorizontalAlignment=.5
WatermarkVerticalAlignment=.89
Transition=none
TransitionDuration=0.0
BackgroundStartColor=0x000000
BackgroundEndColor=0x000000
ProgressBarBackgroundColor=0x606060
ProgressBarForegroundColor=0xffffff
DialogClearsFirmwareBackground=false
MessageBelowAnimation=true
[boot-up]
UseEndAnimation=false
UseFirmwareBackground=true
[shutdown]
UseEndAnimation=false
UseFirmwareBackground=true
[reboot]
UseEndAnimation=false
UseFirmwareBackground=true
[updates]
SuppressMessages=true
ProgressBarShowPercentComplete=true
UseProgressBar=true
Title=Installing Updates...
_Title=Installing Updates...
SubTitle=Do not turn off your computer
_SubTitle=Do not turn off your computer
[system-upgrade]
SuppressMessages=true
ProgressBarShowPercentComplete=true
UseProgressBar=true
Title=Upgrading System...
_Title=Upgrading System...
SubTitle=Do not turn off your computer
_SubTitle=Do not turn off your computer
[firmware-upgrade]
SuppressMessages=true
ProgressBarShowPercentComplete=true
UseProgressBar=true
Title=Upgrading Firmware...
_Title=Upgrading Firmware...
SubTitle=Do not turn off your computer
_SubTitle=Do not turn off your computer

Binary file not shown.

After

Width:  |  Height:  |  Size: 616 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 960 B

View File

@@ -0,0 +1,17 @@
#!/bin/sh -e
if [ "x$1" = xconfigure ]; then
if which plymouth-set-default-theme >/dev/null 2>&1; then
# For Debian
plymouth-set-default-theme armbian
else
# For Ubuntu
update-alternatives \
--install /usr/share/plymouth/themes/default.plymouth default.plymouth \
/usr/share/plymouth/themes/armbian/armbian.plymouth 150
fi
if which update-initramfs >/dev/null 2>&1; then
update-initramfs -u
fi
fi

View File

@@ -0,0 +1,7 @@
#!/bin/sh -e
if [ "x$1" = xremove ]; then
if which update-initramfs >/dev/null 2>&1; then
update-initramfs -u
fi
fi

View File

@@ -0,0 +1,13 @@
#!/bin/sh -e
if [ "x$1" = xremove ]; then
if which plymouth-set-default-theme >/dev/null 2>&1; then
# For Debian
plymouth-set-default-theme -r
else
# For Ubuntu
update-alternatives \
--remove default.plymouth \
/usr/share/plymouth/themes/armbian/armbian.plymouth
fi
fi

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 946 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB