Enable kernel boot splash, env and bootscript files cleanup, upstream patches (#2065)

* Initial commit for kernel boot splash
* Add startup files to disable bootlog when system is up / down
* Update logo, remove deprecated one
* Introduce new u-boot variable bootlogo
* Adjust kernel config
* Make logo possible on Odroid XU4
- add legacy and current upstream patches
- delete xu4 environment since its not used
* Cleanup C2,C4, both tested, logo works on mainline,
- adding legacy upstream patches for c4
* Enable bootlogo by default on Odroid N2
* Enable logo on RK3399 desktop images
* Cleanup the rest of the environment files
* Add initrd hook that copy splash file to initrd.
* Missing logo bits for one boot scripts
* Enable boot logo on Pinebook A64
* Enable bootlogo on Teres
* Update config

config/boards/cubox-i.conf

@@ -4,3 +4,4 @@ BOARDFAMILY="imx6"
 BOOTCONFIG="mx6cuboxi_defconfig"
 KERNEL_TARGET="current"
 FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"

config/boards/firefly-rk3399.csc

@@ -4,3 +4,4 @@ BOARDFAMILY="rk3399"
 BOOTCONFIG="firefly-rk3399_defconfig"
 KERNEL_TARGET="legacy,current,dev"
 FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"

config/boards/kvim1.csc

@@ -4,3 +4,4 @@ BOARDFAMILY="meson-gxl"
 BOOTCONFIG="khadas-vim_defconfig"
 KERNEL_TARGET="current,dev"
 FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"

config/boards/lafrite.conf

@@ -6,3 +6,4 @@ BOOT_FDT_FILE="amlogic/meson-gxl-s805x-libretech-ac.dtb"
 KERNEL_TARGET="current,dev"
 FULL_DESKTOP="yes"
 ASOUND_STATE="asound.state.mesongx"
+BOOT_LOGO="desktop"

config/boards/lepotato.conf

@@ -6,3 +6,4 @@ KERNEL_TARGET="current,dev"
 SERIALCON="ttyAML0"
 FULL_DESKTOP="yes"
 ASOUND_STATE="asound.state.mesongx"
+BOOT_LOGO="desktop"

config/boards/nanopct4.conf

@@ -5,3 +5,4 @@ BOOTCONFIG="nanopc-t4-rk3399_defconfig"
 KERNEL_TARGET="legacy,current,dev"
 FULL_DESKTOP="yes"
 ASOUND_STATE="asound.state.rt5651"
+BOOT_LOGO="desktop"

config/boards/nanopik2-s905.conf

@@ -5,3 +5,4 @@ BOOTCONFIG="nanopi-k2_defconfig"
 KERNEL_TARGET="current,dev"
 FULL_DESKTOP="yes"
 ASOUND_STATE="asound.state.mesongx"
+BOOT_LOGO="desktop"

config/boards/nanopim4.conf

@@ -5,3 +5,4 @@ BOOTCONFIG="nanopi-m4-rk3399_defconfig"
 KERNEL_TARGET="legacy,current,dev"
 FULL_DESKTOP="yes"
 ASOUND_STATE="asound.state.rt5651"
+BOOT_LOGO="desktop"

config/boards/nanopim4v2.conf

@@ -5,3 +5,4 @@ BOOTCONFIG="nanopi-m4v2-rk3399_defconfig"
 KERNEL_TARGET="legacy,current,dev"
 FULL_DESKTOP="yes"
 ASOUND_STATE="asound.state.rt5651"
+BOOT_LOGO="desktop"

config/boards/nanopineo4.conf

@@ -4,3 +4,4 @@ BOARDFAMILY="rk3399"
 BOOTCONFIG="nanopi-neo4-rk3399_defconfig"
 KERNEL_TARGET="legacy,current,dev"
 FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"

config/boards/odroidc4.conf

@@ -7,3 +7,4 @@ FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
 ASOUND_STATE="asound.state.meson64"
 FORCE_BOOTSCRIPT_UPDATE="yes"
+BOOT_LOGO="desktop"

config/boards/odroidn2.conf

@@ -7,3 +7,4 @@ KERNEL_TARGET="legacy,current,dev"
 FULL_DESKTOP="yes"
 FORCE_BOOTSCRIPT_UPDATE="yes"
 ASOUND_STATE="asound.state.meson64"
+BOOT_LOGO="desktop"

config/boards/orangepi-rk3399.conf

@@ -4,3 +4,4 @@ BOARDFAMILY="rk3399"
 BOOTCONFIG="orangepi-rk3399_defconfig"
 KERNEL_TARGET="legacy,current,dev"
 FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"

config/boards/orangepi4.conf

@@ -5,3 +5,4 @@ BOOTCONFIG="orangepi-4-rk3399_defconfig"
 KERNEL_TARGET="legacy,current,dev"
 FULL_DESKTOP="yes"
 ASOUND_STATE="asound.state.rt5651"
+BOOT_LOGO="desktop"

config/boards/pinebook-a64.conf

@@ -6,3 +6,4 @@ DESKTOP_AUTOLOGIN="no"
 KERNEL_TARGET="current,dev"
 FULL_DESKTOP="yes"
 PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager"
+BOOT_LOGO="desktop"

config/boards/pinebook-pro.wip

@@ -6,3 +6,4 @@ BOOT_FDT_FILE="rockchip/rk3399-pinebook-pro.dtb"
 DESKTOP_AUTOLOGIN="no"
 KERNEL_TARGET="legacy,current,dev"
 FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"

config/boards/roc-rk3399-pc.csc

@@ -4,3 +4,4 @@ BOARDFAMILY="rk3399"
 BOOTCONFIG="roc-pc-rk3399_defconfig"
 KERNEL_TARGET="legacy,current,dev"
 FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"

config/boards/rockpi-4a.conf

@@ -4,3 +4,4 @@ BOARDFAMILY="rockchip64"
 BOOTCONFIG="rock-pi-4-rk3399_defconfig"
 KERNEL_TARGET="legacy,current,dev"
 FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"

config/boards/rockpi-4b.conf

@@ -4,3 +4,4 @@ BOARDFAMILY="rockchip64"
 BOOTCONFIG="rock-pi-4-rk3399_defconfig"
 KERNEL_TARGET="legacy,current,dev"
 FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"

config/boards/rockpro64.conf

@@ -4,3 +4,4 @@ BOARDFAMILY="rockchip64"
 BOOTCONFIG="rockpro64-rk3399_defconfig"
 KERNEL_TARGET="legacy,current,dev"
 FULL_DESKTOP="yes"
+BOOT_LOGO="desktop"

config/boards/teres-a64.conf

@@ -6,3 +6,4 @@ DESKTOP_AUTOLOGIN="no"
 KERNEL_TARGET="current,dev"
 FULL_DESKTOP="yes"
 PACKAGE_LIST_DESKTOP_BOARD="xfce4-power-manager"
+BOOT_LOGO="desktop"

config/bootenv/meson.txt

@@ -1,6 +1,3 @@
 verbosity=1
-logo=disabled
 console=both
 ethaddr=00:50:43:84:fb:2f
-
-

config/bootenv/pine64-default.txt

@@ -1,5 +0,0 @@
-verbosity=1
-console=both
-disp_mode=720p60
-camera_type=none
-pine64_lcd=off

config/bootenv/s5p6818-default.txt

@@ -1,2 +0,0 @@
-verbosity=1
-console=both

config/bootenv/sun50iw1-next.txt

@@ -1 +0,0 @@
-verbosity=1

config/bootenv/sun50iw2-next.txt

@@ -1,2 +0,0 @@
-verbosity=1
-console=both

config/bootenv/sun8i-default.txt

@@ -1,2 +0,0 @@
-verbosity=1
-console=both

config/bootenv/udoo-default.txt

@@ -1 +0,0 @@
-verbosity=1

config/bootscripts/boot-cubox.cmd

@@ -7,6 +7,7 @@
 setenv rootdev "/dev/mmcblk0p1"
 setenv verbosity "1"
 setenv console "display"
+setenv bootlogo "false"
 setenv rootfstype "ext4"
 setenv disp_mode "1920x1080m60"
 setenv earlycon "off"
@@ -29,6 +30,7 @@ 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=ttymxc0,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
 
 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}"
 ext2load mmc 0 ${fdt_addr} /boot/dtb/${fdt_file} || fatload mmc 0 ${fdt_addr} /dtb/${fdt_file} || ext2load mmc 0 ${fdt_addr} /dtb/${fdt_file}

config/bootscripts/boot-meson64.cmd

@@ -10,6 +10,7 @@ setenv overlay_error "false"
 setenv rootdev "/dev/mmcblk1p1"
 setenv verbosity "1"
 setenv console "both"
+setenv bootlogo "false"
 setenv rootfstype "ext4"
 setenv docker_optimizations "on"
 
@@ -27,6 +28,7 @@ if test "${console}" = "serial"; then setenv consoleargs "console=ttyAML0,115200
 
 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
 
 setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 coherent_pool=2M loglevel=${verbosity} ubootpart=${partuuid} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"
 

config/bootscripts/boot-odroid-c2.ini

@@ -89,6 +89,9 @@ setenv m_bpp "24"
 # setenv vout "dvi"
 # setenv vout "vga"
 
+# Display splash logo
+setenv bootlogo "false"
+
 # HDMI HotPlug Detection control
 # Allows you to force HDMI thinking that the cable is connected.
 # true = HDMI will believe that cable is always connected
@@ -155,8 +158,10 @@ 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
+
 # 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} net.ifnames=0 ${extraargs}"
+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}"
 
 # Mainline boot arguments
 if test -e mmc 0:1 boot/.next; then setenv bootargs "root=${rootdev} rootwait rootflags=data=writeback rw rootfstype=${rootfstype} ${condev} no_console_suspend consoleblank=0 fsck.repair=yes loglevel=${verbosity} net.ifnames=0 ${extraargs}"; fi

config/bootscripts/boot-odroid-c4.ini

@@ -90,6 +90,12 @@ setenv max_freq_a55 "1908"    # 1.908 GHz, default value
 # max cpu-cores
 setenv maxcpus "4"
 
+# Display splash logo
+setenv bootlogo "false"
+
+if test "${bootlogo}" = "true"; then setenv bootsplash "bootsplash.bootfile=bootsplash.armbian"; fi
+
+
 ### Normal HDMI Monitors
 if test "${display_autodetect}" = "true"; then hdmitx edid; fi
 if test "${hdmimode}" = "custombuilt"; then setenv cmode "modeline=${modeline}"; fi
@@ -98,8 +104,11 @@ if test "${cec}" = "true"; then setenv cec_enable "hdmitx=cec3f"; fi
 # VU7 Settings
 if test "${disable_vu7}" = "false"; then setenv hid_quirks "usbhid.quirks=0x0eef:0x0005:0x0004"; fi
 
+# load armbianEnv.txt
+if ext4load mmc ${devno}:1 0x44000000 /boot/armbianEnv.txt || fatload mmc ${devno}:1 0x44000000 armbianEnv.txt || ext4load mmc ${devno}:1 0x44000000 armbianEnv.txt; then env import -t 0x44000000 ${filesize}; fi
+
 # Boot Args
-setenv bootargs "root=${rootdev} rootwait rootflags=data=writeback rw rootfstype=${rootfstype} ${condev} ${amlogic} no_console_suspend fsck.repair=yes net.ifnames=0 elevator=noop hdmimode=${hdmimode} cvbsmode=576cvbs maxcpus=${maxcpus} voutmode=${voutmode} ${cmode} disablehpd=${disablehpd} cvbscable=${cvbscable} overscan=${overscan} ${hid_quirks} monitor_onoff=${monitor_onoff} logo=osd0,loaded ${cec_enable} sdrmode=${sdrmode}"
+setenv bootargs "root=${rootdev} rootwait rootflags=data=writeback rw rootfstype=${rootfstype} ${condev} ${amlogic} no_console_suspend fsck.repair=yes net.ifnames=0 elevator=noop hdmimode=${hdmimode} cvbsmode=576cvbs maxcpus=${maxcpus} voutmode=${voutmode} ${cmode} disablehpd=${disablehpd} cvbscable=${cvbscable} overscan=${overscan} ${hid_quirks} monitor_onoff=${monitor_onoff} logo=osd0,loaded ${cec_enable} ${bootsplash} sdrmode=${sdrmode}"
 
 # Set load addresses
 setenv dtb_loadaddr "0x1000000"

config/bootscripts/boot-odroid-n2-mainline.ini

@@ -87,12 +87,17 @@ setenv max_freq_a53 "1896"  # 1.896 GHz, default value
 # setenv maxcpus "5"
 setenv maxcpus "6"
 
+# Bootlogo
+setenv bootlogo "false"
+
 ### Normal HDMI Monitors
 if test "${display_autodetect}" = "true"; then hdmitx edid; fi
 if test "${hdmimode}" = "custombuilt"; then setenv cmode "modeline=${modeline}"; fi
+if ext4load mmc ${devno}:1 0x44000000 /boot/armbianEnv.txt || fatload mmc ${devno}:1 0x44000000 armbianEnv.txt || ext4load mmc ${devno}:1 0x44000000 armbianEnv.txt; then env import -t 0x44000000 ${filesize}; fi
 
 # Boot Args
-setenv bootargs "root=${rootdev} rootwait rootflags=data=writeback rw clk_ignore_unused rootfstype=${rootfstype} ${condev} ${amlogic} no_console_suspend fsck.repair=yes net.ifnames=0 elevator=noop hdmimode=${hdmimode} cvbsmode=576cvbs max_freq_a53=${max_freq_a53} max_freq_a73=${max_freq_a73} maxcpus=${maxcpus} voutmode=${voutmode} ${cmode} disablehpd=${disablehpd} cvbscable=${cvbscable} overscan=${overscan}"
+if test "${bootlogo}" = "true"; then setenv bootsplash "bootsplash.bootfile=bootsplash.armbian"; fi
+setenv bootargs "root=${rootdev} rootwait ${bootsplash} rootflags=data=writeback rw clk_ignore_unused rootfstype=${rootfstype} ${condev} ${amlogic} no_console_suspend fsck.repair=yes net.ifnames=0 elevator=noop hdmimode=${hdmimode} cvbsmode=576cvbs max_freq_a53=${max_freq_a53} max_freq_a73=${max_freq_a73} maxcpus=${maxcpus} voutmode=${voutmode} ${cmode} disablehpd=${disablehpd} cvbscable=${cvbscable} overscan=${overscan}"
 
 # Set load addresses
 setenv dtb_loadaddr "0x1000000"

config/bootscripts/boot-odroid-n2.ini

@@ -5,6 +5,9 @@ setenv rootfstype "ext4"
 
 ODROIDN2-UBOOT-CONFIG
 
+# Display splash logo
+setenv bootlogo "false"
+
 # Default Console Device Setting
 setenv condev "console=ttyS0,115200n8 console=tty1 loglevel=1"   # on both
 
@@ -89,10 +92,14 @@ 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 "${hdmimode}" = "custombuilt"; then setenv cmode "modeline=${modeline}"; fi
 
+# Read armbianEnv.txt
+if ext4load mmc ${devno}:1 0x44000000 /boot/armbianEnv.txt || fatload mmc ${devno}:1 0x44000000 armbianEnv.txt || ext4load mmc ${devno}:1 0x44000000 armbianEnv.txt; then env import -t 0x44000000 ${filesize}; fi
+
 # Boot Args
-setenv bootargs "root=${rootdev} rootwait rootflags=data=writeback rw rootfstype=${rootfstype} ${condev} ${amlogic} no_console_suspend fsck.repair=yes net.ifnames=0 elevator=noop hdmimode=${hdmimode} cvbsmode=576cvbs max_freq_a53=${max_freq_a53} max_freq_a73=${max_freq_a73} maxcpus=${maxcpus} voutmode=${voutmode} ${cmode} disablehpd=${disablehpd} cvbscable=${cvbscable} overscan=${overscan}"
+setenv bootargs "root=${rootdev} rootwait rootflags=data=writeback rw rootfstype=${rootfstype} ${condev} ${amlogic} no_console_suspend fsck.repair=yes net.ifnames=0 elevator=noop hdmimode=${hdmimode} cvbsmode=576cvbs max_freq_a53=${max_freq_a53} max_freq_a73=${max_freq_a73} maxcpus=${maxcpus} voutmode=${voutmode} ${cmode} disablehpd=${disablehpd} ${bootsplash} cvbscable=${cvbscable} overscan=${overscan}"
 
 # Set load addresses
 setenv dtb_loadaddr "0x1000000"

config/bootscripts/boot-odroid-xu4.ini

@@ -14,15 +14,15 @@ setenv macaddr "00:1e:06:61:7a:55"
 setenv rootdev "/dev/mmcblk0p1"
 setenv rootfstype "ext4"
 setenv console "both"
+setenv bootlogo "false"
 setenv verbosity "1"
 
 # To update boot loader on your eMMC use the nand-sata-install tool
 # run copy_uboot_sd2emmc
 
-if ext4load mmc 0:1 0x44000000 /boot/armbianEnv.txt || fatload mmc 0:1 0x44000000 armbianEnv.txt || ext4load mmc 0:1 0x44000000 armbianEnv.txt; then env import -t 0x44000000 ${filesize}; 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=ttySAC2,115200n8 ${consoleargs}"; fi
+if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi
 
 setenv bootrootfs "${consoleargs} consoleblank=0 loglevel=${verbosity} root=${rootdev} rootfstype=${rootfstype} rootwait rw"
 

config/bootscripts/boot-pine64-default.cmd

@@ -1,118 +0,0 @@
-# DO NOT EDIT THIS FILE
-#
-# Please edit /boot/armbianEnv.txt to set supported parameters
-#
-
-# default values
-
-setenv rootdev "/dev/mmcblk0p1"
-setenv verbosity "1"
-setenv console "both"
-setenv disp_mem_reserves "off"
-setenv disp_mode "720p60"
-setenv rootfstype "ext4"
-setenv camera_type "none"
-setenv pine64_lcd "off"
-
-if test -e mmc ${boot_part} ${prefix}armbianEnv.txt; then
-	load mmc ${boot_part} ${load_addr} ${prefix}armbianEnv.txt
-	env import -t ${load_addr} ${filesize}
-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=ttyS0,115200n8"; fi
-
-setenv bootargs "root=${rootdev} rootfstype=${rootfstype} rootwait ${consoleargs} no_console_suspend earlycon=uart,mmio32,0x01c28000 mac_addr=${ethaddr} consoleblank=0 loglevel=${verbosity} ${extraargs} ${extraboardargs}"
-
-# determine board type from DT compiled into u-boot binary, currently SoPine is not autodetected
-fdt get value dt_name / dt-name
-if test "${dt_name}" = "sun50iw1p1-pine64so"; then
-	setenv pine64_model "pine64so"
-elif test "${dt_name}" = "sun50iw1p1-orangepiwin"; then
-	setenv pine64_model "orangepiwin"
-elif test "${dt_name}" = "sun50iw1p1-bananapim64"; then
-	setenv pine64_model "bananapim64"
-elif test "${dt_name}" = "sun50iw1p1-olinuxino-a64"; then
-	setenv pine64_model "olinuxino-a64"
-fi
-
-load mmc ${boot_part} ${fdt_addr} ${prefix}dtb/sun50iw1p1-${pine64_model}.dtb
-load mmc ${boot_part} ${initrd_addr} ${prefix}uInitrd
-load mmc ${boot_part} ${kernel_addr} ${prefix}Image
-
-fdt addr ${fdt_addr}
-fdt resize
-
-# set display resolution from uEnv.txt or other environment file
-# default to 720p60
-if test "${disp_mode}" = "480i"; then setenv fdt_disp_mode "<0x00000000>"
-elif test "${disp_mode}" = "576i"; then setenv fdt_disp_mode "<0x00000001>"
-elif test "${disp_mode}" = "480p"; then setenv fdt_disp_mode "<0x00000002>"
-elif test "${disp_mode}" = "576p"; then setenv fdt_disp_mode "<0x00000003>"
-elif test "${disp_mode}" = "720p50"; then setenv fdt_disp_mode "<0x00000004>"
-elif test "${disp_mode}" = "720p60"; then setenv fdt_disp_mode "<0x00000005>"
-elif test "${disp_mode}" = "1080i50"; then setenv fdt_disp_mode "<0x00000006>"
-elif test "${disp_mode}" = "1080i60"; then setenv fdt_disp_mode "<0x00000007>"
-elif test "${disp_mode}" = "1080p24"; then setenv fdt_disp_mode "<0x00000008>"
-elif test "${disp_mode}" = "1080p50"; then setenv fdt_disp_mode "<0x00000009>"
-elif test "${disp_mode}" = "1080p60"; then setenv fdt_disp_mode "<0x0000000a>"
-elif test "${disp_mode}" = "2160p30"; then setenv fdt_disp_mode "<0x0000001c>"
-elif test "${disp_mode}" = "2160p25"; then setenv fdt_disp_mode "<0x0000001d>"
-elif test "${disp_mode}" = "2160p24"; then setenv fdt_disp_mode "<0x0000001e>"
-else setenv fdt_disp_mode "<0x00000005>"
-fi
-
-if test "${pine64_lcd}" = "1" || test "${pine64_lcd}" = "on"; then
-	fdt set /soc@01c00000/disp@01000000 screen0_output_type "<0x00000001>"
-	fdt set /soc@01c00000/disp@01000000 screen0_output_mode "<0x00000004>"
-	fdt set /soc@01c00000/disp@01000000 screen1_output_mode ${fdt_disp_mode}
-
-	fdt set /soc@01c00000/lcd0@01c0c000 lcd_used "<0x00000001>"
-
-	fdt set /soc@01c00000/boot_disp output_type "<0x00000001>"
-	fdt set /soc@01c00000/boot_disp output_mode "<0x00000004>"
-
-	fdt set /soc@01c00000/ctp status "okay"
-	fdt set /soc@01c00000/ctp ctp_used "<0x00000001>"
-	fdt set /soc@01c00000/ctp ctp_name "gt911_DB2"
-elif test "${pine64_model}" != "pine64-pinebook"; then
-	fdt set /soc@01c00000/disp@01000000 screen0_output_mode ${fdt_disp_mode}
-fi
-
-# DVI compatibility
-if test "${disp_dvi_compat}" = "1" || test "${disp_dvi_compat}" = "on"; then
-	fdt set /soc@01c00000/hdmi@01ee0000 hdmi_hdcp_enable "<0x00000000>"
-	fdt set /soc@01c00000/hdmi@01ee0000 hdmi_cts_compatibility "<0x00000001>"
-fi
-
-if test "${disp_mem_reserves}" = "off"; then
-	# TODO: Remove reserved memory from DT or disable devices?
-fi
-
-# default, only set status
-if test "${camera_type}" = "s5k4ec"; then
-	fdt set /soc@01c00000/vfe@0/ status "okay"
-	fdt set /soc@01c00000/vfe@0/dev@0/ status "okay"
-fi
-
-# change name, i2c address and vdd voltage
-if test "${camera_type}" = "ov5640"; then
-	fdt set /soc@01c00000/vfe@0/dev@0/ csi0_dev0_mname "ov5640"
-	fdt set /soc@01c00000/vfe@0/dev@0/ csi0_dev0_twi_addr "<0x00000078>"
-	fdt set /soc@01c00000/vfe@0/dev@0/ csi0_dev0_iovdd_vol "<0x001b7740>"
-	fdt set /soc@01c00000/vfe@0/ status "okay"
-	fdt set /soc@01c00000/vfe@0/dev@0/ status "okay"
-fi
-
-# GMAC TX/RX delay processing
-if test -n "${gmac-tx-delay}"; then
-	fdt set /soc@01c00000/eth@01c30000/ tx-delay "<0x${gmac-tx-delay}>"
-fi
-if test -n "${gmac-rx-delay}"; then
-	fdt set /soc@01c00000/eth@01c30000/ rx-delay "<0x${gmac-rx-delay}>"
-fi
-
-booti ${kernel_addr} ${initrd_addr} ${fdt_addr}
-
-# Recompile with:
-# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr

config/bootscripts/boot-rk322x.cmd

@@ -10,6 +10,7 @@ setenv overlay_error "false"
 setenv rootdev "/dev/mmcblk0p1"
 setenv verbosity "1"
 setenv console "both"
+setenv bootlogo "false"
 setenv rootfstype "ext4"
 setenv docker_optimizations "on"
 
@@ -24,6 +25,7 @@ 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
 
 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}"
 

config/bootscripts/boot-rockchip.cmd

@@ -10,6 +10,7 @@ setenv overlay_error "false"
 setenv rootdev "/dev/mmcblk0p1"
 setenv verbosity "1"
 setenv console "both"
+setenv bootlogo "false"
 setenv rootfstype "ext4"
 setenv docker_optimizations "on"
 setenv earlycon "off"
@@ -28,6 +29,7 @@ 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
 
 # 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

config/bootscripts/boot-rockchip64.cmd

@@ -9,6 +9,7 @@ setenv overlay_error "false"
 setenv rootdev "/dev/mmcblk0p1"
 setenv verbosity "1"
 setenv console "both"
+setenv bootlogo "false"
 setenv rootfstype "ext4"
 setenv docker_optimizations "on"
 setenv earlycon "off"
@@ -25,6 +26,7 @@ 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
 
 # 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

config/bootscripts/boot-s5p6818.cmd

@@ -7,6 +7,7 @@
 setenv rootdev "/dev/mmcblk2p1"
 setenv rootfstype "ext4"
 setenv verbosity "1"
+setenv bootlogo "false"
 setenv fdt_addr "0x48000000"
 setenv ramdisk_addr_r "0x49000000"
 setenv kernel_addr_r "0x4a000000"
@@ -22,7 +23,9 @@ if ext4load mmc ${devnum}:1 ${kernel_addr_r} ${prefix}/armbianEnv.txt; then
 	env import -t ${kernel_addr_r} ${filesize}
 fi
 
-setenv bootargs "console=ttySAC0,115200n8 console=tty1 root=${rootdev} rootwait rootfstype=${rootfstype} loglevel=${verbosity} usb-storage.quirks=${usbstoragequirks} ${extraargs}"
+if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi
+
+setenv bootargs "console=ttySAC0,115200n8 console=tty1 ${consoleargs}  root=${rootdev} rootwait rootfstype=${rootfstype} loglevel=${verbosity} usb-storage.quirks=${usbstoragequirks} ${extraargs}"
 
 if ext4load mmc ${devnum}:1 ${fdt_addr} ${prefix}dtb/nexell/${fdtfile} || ext4load mmc 1:1 ${fdt_addr} ${prefix}dtb/nexell/s5p6818-nanopi3-rev07.dtb; then echo "Loading DTB"; fi
 ext4load mmc ${devnum}:1 ${ramdisk_addr_r} ${prefix}uInitrd

config/bootscripts/boot-sun50i-next.cmd

@@ -10,6 +10,7 @@ setenv verbosity "1"
 setenv rootfstype "ext4"
 setenv console "both"
 setenv docker_optimizations "on"
+setenv bootlogo "false"
 
 # Print boot source
 itest.b *0x10028 == 0x00 && echo "U-boot loaded from SD"
@@ -25,6 +26,7 @@ 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
 
 # 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

config/bootscripts/boot-sunxi.cmd

@@ -12,6 +12,7 @@ setenv disp_mem_reserves "off"
 setenv disp_mode "1920x1080p60"
 setenv rootfstype "ext4"
 setenv docker_optimizations "on"
+setenv bootlogo "false"
 setenv devnum "0"
 setenv rootdev "/dev/mmcblk${devnum}p1"
 setenv earlycon "off"
@@ -36,11 +37,10 @@ if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then
 	env import -t ${load_addr} ${filesize}
 fi
 
-if test "${logo}" = "disabled"; then setenv logo "logo.nologo"; 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
 
 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}"
 

config/bootscripts/boot-udoo.cmd

@@ -10,6 +10,7 @@ setenv ramdisk_addr "0x14800000"
 setenv rootdev "/dev/mmcblk0p1"
 setenv verbosity "1"
 setenv console "both"
+setenv bootlogo "false"
 setenv disp_mode "1920x1080M60"
 setenv rootfstype "ext4"
 setenv earlycon "off"
@@ -24,6 +25,7 @@ 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
 
 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

config/kernel/linux-imx6-current.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.7.5 Kernel Configuration
+# Linux/arm 5.7.6 Kernel Configuration
 #
 
 #
@@ -3542,6 +3542,7 @@ CONFIG_WLCORE=m
 CONFIG_WLCORE_SPI=m
 CONFIG_WLCORE_SDIO=m
 CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_RTL8723DU=m
 CONFIG_RTL8723DS=m
 CONFIG_RTL8822BU=m
 CONFIG_RTL8188EU=m
@@ -6322,6 +6323,7 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+CONFIG_BOOTSPLASH=y
 # end of Console display driver support
 
 CONFIG_LOGO=y

config/kernel/linux-meson64-current.config

@@ -5723,11 +5723,7 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
 CONFIG_BOOTSPLASH=y
 # end of Console display driver support
-
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO is not set
 # end of Graphics support
 
 CONFIG_SOUND=m

config/kernel/linux-odroidxu4-current.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.4.35 Kernel Configuration
+# Linux/arm 5.4.49 Kernel Configuration
 #
 
 #
@@ -12,7 +12,6 @@ CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
-CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 
@@ -2357,6 +2356,7 @@ CONFIG_WLAN_VENDOR_TI=y
 # CONFIG_WL12XX is not set
 # CONFIG_WL18XX is not set
 # CONFIG_WLCORE is not set
+CONFIG_RTL8723DU=m
 CONFIG_RTL8723DS=m
 CONFIG_RTL8822BU=m
 CONFIG_RTL8188EU=m
@@ -3454,9 +3454,6 @@ CONFIG_MEDIA_SUPPORT=y
 #
 # Multimedia core support
 #
-
-CONFIG_STAGING_MEDIA=y
-
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
 CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
@@ -3466,6 +3463,7 @@ CONFIG_MEDIA_CEC_SUPPORT=y
 # CONFIG_MEDIA_CEC_RC is not set
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_MEDIA_CONTROLLER_DVB=y
+# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
 CONFIG_VIDEO_DEV=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_VIDEO_V4L2=y
@@ -3482,40 +3480,6 @@ CONFIG_DVB_CORE=y
 # CONFIG_DVB_MMAP is not set
 CONFIG_DVB_NET=y
 CONFIG_TTPCI_EEPROM=m
-CONFIG_FB_TFT=m
-CONFIG_FB_TFT_AGM1264K_FL=m
-CONFIG_FB_TFT_BD663474=m
-CONFIG_FB_TFT_HX8340BN=m
-CONFIG_FB_TFT_HX8347D=m
-CONFIG_FB_TFT_HX8353D=m
-CONFIG_FB_TFT_HX8357D=m
-CONFIG_FB_TFT_ILI9163=m
-CONFIG_FB_TFT_ILI9320=m
-CONFIG_FB_TFT_ILI9325=m
-CONFIG_FB_TFT_ILI9340=m
-CONFIG_FB_TFT_ILI9341=m
-CONFIG_FB_TFT_ILI9481=m
-CONFIG_FB_TFT_ILI9486=m
-CONFIG_FB_TFT_PCD8544=m
-CONFIG_FB_TFT_RA8875=m
-CONFIG_FB_TFT_S6D02A1=m
-CONFIG_FB_TFT_S6D1121=m
-# CONFIG_FB_TFT_SH1106 is not set
-CONFIG_FB_TFT_SSD1289=m
-CONFIG_FB_TFT_SSD1305=m
-CONFIG_FB_TFT_SSD1306=m
-CONFIG_FB_TFT_SSD1331=m
-CONFIG_FB_TFT_SSD1351=m
-CONFIG_FB_TFT_ST7735R=m
-CONFIG_FB_TFT_ST7789V=m
-CONFIG_FB_TFT_TINYLCD=m
-CONFIG_FB_TFT_TLS8204=m
-CONFIG_FB_TFT_UC1611=m
-CONFIG_FB_TFT_UC1701=m
-CONFIG_FB_TFT_UPD161704=m
-CONFIG_FB_TFT_WATTEROTT=m
-CONFIG_FB_TFT_HKTFT35=m
-CONFIG_FB_TFT_HKTFT32=m
 CONFIG_DVB_MAX_ADAPTERS=8
 # CONFIG_DVB_DYNAMIC_MINORS is not set
 # CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
@@ -4213,6 +4177,7 @@ CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_BACKLIGHT=m
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
 
@@ -4273,6 +4238,7 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
+CONFIG_BOOTSPLASH=y
 # end of Console display driver support
 
 CONFIG_LOGO=y
@@ -5191,6 +5157,144 @@ CONFIG_VIRTIO_INPUT=m
 
 # CONFIG_GREYBUS is not set
 CONFIG_STAGING=y
+# CONFIG_PRISM2_USB is not set
+# CONFIG_COMEDI is not set
+# CONFIG_RTLLIB is not set
+# CONFIG_RTL8723BS is not set
+# CONFIG_R8712U is not set
+# CONFIG_R8188EU is not set
+# CONFIG_VT6656 is not set
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16203 is not set
+# CONFIG_ADIS16240 is not set
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+# CONFIG_AD7816 is not set
+# CONFIG_AD7192 is not set
+# CONFIG_AD7280 is not set
+# end of Analog to digital converters
+
+#
+# Analog digital bi-direction converters
+#
+# CONFIG_ADT7316 is not set
+# end of Analog digital bi-direction converters
+
+#
+# Capacitance to digital converters
+#
+# CONFIG_AD7150 is not set
+# CONFIG_AD7746 is not set
+# end of Capacitance to digital converters
+
+#
+# Direct Digital Synthesis
+#
+# CONFIG_AD9832 is not set
+# CONFIG_AD9834 is not set
+# end of Direct Digital Synthesis
+
+#
+# Network Analyzer, Impedance Converters
+#
+# CONFIG_AD5933 is not set
+# end of Network Analyzer, Impedance Converters
+
+#
+# Active energy metering IC
+#
+# CONFIG_ADE7854 is not set
+# end of Active energy metering IC
+
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S1210 is not set
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
+#
+# Speakup console speech
+#
+# CONFIG_SPEAKUP is not set
+# end of Speakup console speech
+
+CONFIG_STAGING_MEDIA=y
+
+#
+# soc_camera sensor drivers
+#
+
+#
+# Android
+#
+# end of Android
+
+# CONFIG_STAGING_BOARD is not set
+# CONFIG_LTE_GDM724X is not set
+# CONFIG_GS_FPGABOOT is not set
+# CONFIG_UNISYSSPAR is not set
+# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
+CONFIG_FB_TFT=m
+CONFIG_FB_TFT_AGM1264K_FL=m
+CONFIG_FB_TFT_BD663474=m
+CONFIG_FB_TFT_HX8340BN=m
+CONFIG_FB_TFT_HX8347D=m
+CONFIG_FB_TFT_HX8353D=m
+CONFIG_FB_TFT_HX8357D=m
+CONFIG_FB_TFT_ILI9163=m
+CONFIG_FB_TFT_ILI9320=m
+CONFIG_FB_TFT_ILI9325=m
+CONFIG_FB_TFT_ILI9340=m
+CONFIG_FB_TFT_ILI9341=m
+CONFIG_FB_TFT_ILI9481=m
+CONFIG_FB_TFT_ILI9486=m
+CONFIG_FB_TFT_PCD8544=m
+CONFIG_FB_TFT_RA8875=m
+CONFIG_FB_TFT_S6D02A1=m
+CONFIG_FB_TFT_S6D1121=m
+# CONFIG_FB_TFT_SH1106 is not set
+CONFIG_FB_TFT_SSD1289=m
+CONFIG_FB_TFT_SSD1305=m
+CONFIG_FB_TFT_SSD1306=m
+CONFIG_FB_TFT_SSD1331=m
+CONFIG_FB_TFT_SSD1351=m
+CONFIG_FB_TFT_ST7735R=m
+CONFIG_FB_TFT_ST7789V=m
+CONFIG_FB_TFT_TINYLCD=m
+CONFIG_FB_TFT_TLS8204=m
+CONFIG_FB_TFT_UC1611=m
+CONFIG_FB_TFT_UC1701=m
+CONFIG_FB_TFT_UPD161704=m
+CONFIG_FB_TFT_WATTEROTT=m
+CONFIG_FB_TFT_HKTFT35=m
+CONFIG_FB_TFT_HKTFT32=m
+# CONFIG_WILC1000_SDIO is not set
+# CONFIG_WILC1000_SPI is not set
+# CONFIG_MOST is not set
+# CONFIG_KS7010 is not set
+# CONFIG_PI433 is not set
+
+#
+# Gasket devices
+#
+# end of Gasket devices
+
+# CONFIG_XIL_AXIS_FIFO is not set
+# CONFIG_FIELDBUS_DEV is not set
+# CONFIG_USB_WUSB_CBAF is not set
+# CONFIG_UWB is not set
+# CONFIG_EXFAT_FS is not set
 # CONFIG_GOLDFISH is not set
 CONFIG_MFD_CROS_EC=y
 CONFIG_CHROME_PLATFORMS=y

config/kernel/linux-odroidxu4-dev.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.7.4 Kernel Configuration
+# Linux/arm 5.7.6 Kernel Configuration
 #
 
 #
@@ -2317,6 +2317,7 @@ CONFIG_WLAN_VENDOR_TI=y
 # CONFIG_WL12XX is not set
 # CONFIG_WL18XX is not set
 # CONFIG_WLCORE is not set
+CONFIG_RTL8723DU=m
 CONFIG_RTL8723DS=m
 CONFIG_RTL8822BU=m
 CONFIG_RTL8188EU=m
@@ -4227,8 +4228,9 @@ CONFIG_HDMI=y
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+CONFIG_BOOTSPLASH=y
 # end of Console display driver support
 
 CONFIG_LOGO=y

config/kernel/linux-odroidxu4-legacy.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.176 Kernel Configuration
+# Linux/arm 4.14.186 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -2140,7 +2140,6 @@ CONFIG_WLAN_VENDOR_TI=y
 # CONFIG_WL12XX is not set
 # CONFIG_WL18XX is not set
 # CONFIG_WLCORE is not set
-CONFIG_RTL8723DS=m
 CONFIG_RTL8822BU=m
 CONFIG_RTL8188EU=m
 # CONFIG_RTL8821CU is not set

config/kernel/linux-sunxi-current.config

@@ -2631,6 +2631,7 @@ CONFIG_WLAN_VENDOR_TI=y
 # CONFIG_WL12XX is not set
 # CONFIG_WL18XX is not set
 # CONFIG_WLCORE is not set
+CONFIG_RTL8723DU=m
 CONFIG_RTL8723DS=m
 CONFIG_RTL8822BU=m
 CONFIG_RTL8188EU=m
@@ -4921,6 +4922,7 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
+CONFIG_BOOTSPLASH=y
 # end of Console display driver support
 
 CONFIG_LOGO=y

config/kernel/linux-sunxi64-current.config

@@ -2648,6 +2648,7 @@ CONFIG_RTW88=m
 # CONFIG_WLAN_VENDOR_RSI is not set
 # CONFIG_WLAN_VENDOR_ST is not set
 # CONFIG_WLAN_VENDOR_TI is not set
+CONFIG_RTL8723DU=m
 CONFIG_RTL8723DS=m
 CONFIG_RTL8822BU=m
 CONFIG_RTL8188EU=m
@@ -4896,6 +4897,7 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
+CONFIG_BOOTSPLASH=y
 # end of Console display driver support
 
 CONFIG_LOGO=y

config/sources/families/imx6.conf

@@ -14,7 +14,7 @@ case $BOARD in
 		BOOTBRANCH='tag:v2017.11'
 		SERIALCON=ttymxc1
 		BOOTSCRIPT="boot-udoo.cmd:boot.cmd"
-		BOOTENV_FILE='udoo-default.txt'
+		BOOTENV_FILE='udoo.txt'
 		UBOOT_USE_GCC='< 7.0'
 		
 	;;
@@ -24,7 +24,7 @@ case $BOARD in
 		BOOTSOURCE='https://github.com/SolidRun/u-boot.git'
 		BOOTBRANCH='branch:v2018.01-solidrun-imx6'		
 		BOOTSCRIPT='boot-cubox.cmd:boot.cmd'
-		BOOTENV_FILE='cubox-default.txt'
+		BOOTENV_FILE='cubox.txt'
 		UBOOT_TARGET_MAP=';emmc;SPL:SPL.emmc u-boot.img:u-boot.img.emmc
 						  ;sdhc;SPL:SPL.sdhc u-boot.img:u-boot.img.sdhc
 						  ;sdhc;SPL:SPL.sata u-boot.img:u-boot.img.sata
@@ -36,7 +36,7 @@ case $BOARD in
 
 		BOOTBRANCH="branch:v2017.03"
 		BOOTSCRIPT='boot-udoo.cmd:boot.cmd'
-		BOOTENV_FILE='cubox-default.txt'
+		BOOTENV_FILE='cubox.txt'
 
 	;;
 

config/sources/families/imx7d.conf

@@ -3,7 +3,7 @@ BOOTDIR='u-boot-sabre'
 BOOTBRANCH='branch:imx_v2018.03_4.14.98_2.0.0_ga'
 BOOTCONFIG="mx7dsabresd_defconfig"
 #BOOTSCRIPT='boot-imx7d.cmd:boot.cmd'
-BOOTENV_FILE='imx7d-default.txt'
+BOOTENV_FILE='imx7d.txt'
 ARCH=armhf
 UBOOT_TARGET_MAP=";;u-boot-dtb.imx"
 

config/sources/families/include/meson64_common.inc

@@ -1,6 +1,6 @@
 UBOOT_TARGET_MAP="u-boot-dtb.img;;u-boot.bin.sd.bin:u-boot.bin u-boot-dtb.img"
 BOOTSCRIPT="boot-meson64.cmd:boot.cmd"
-BOOTENV_FILE='meson64-next.txt'
+BOOTENV_FILE='meson.txt'
 LINUXFAMILY=meson64
 ARCH=arm64
 SERIALCON=ttyAML0

config/sources/families/include/mvebu-clearfog.inc

@@ -8,7 +8,7 @@ case $BRANCH in
 		BOOTBRANCH='branch:v2018.01-solidrun-a38x'
 		BOOTDIR='u-boot-armada'
 		BOOTPATCHDIR='u-boot-clearfog'
-        BOOTSCRIPT='boot-mvebu-next.cmd:boot.cmd'
+        BOOTSCRIPT='boot-mvebu.cmd:boot.cmd'
 
 		UBOOT_TARGET_MAP=";sdhc;u-boot-spl-sdhc.kwb:u-boot.mmc
 						  ;mmc;u-boot-spl-mmc.kwb:u-boot.emmc

config/sources/families/include/mvebu-helios4.inc

@@ -6,7 +6,7 @@ case $BRANCH in
 		BOOTBRANCH='tag:v2019.04'
 		BOOTDIR=$MAINLINE_UBOOT_DIR
 		BOOTPATCHDIR='u-boot-helios4'
-		BOOTSCRIPT='boot-mvebu-next.cmd:boot.cmd'
+		BOOTSCRIPT='boot-mvebu.cmd:boot.cmd'
 
 		UBOOT_TARGET_MAP=";sdhc;u-boot-spl.kwb:u-boot.mmc
 				  ;spi;u-boot-spl.kwb:u-boot.flash

config/sources/families/include/rockchip64_common.inc

@@ -2,7 +2,7 @@ ARCH=arm64
 KERNEL_IMAGE_TYPE=Image
 OFFSET=16
 BOOTSCRIPT='boot-rockchip64.cmd:boot.cmd'
-BOOTENV_FILE='rockchip-default.txt'
+BOOTENV_FILE='rockchip.txt'
 UBOOT_TARGET_MAP=";;idbloader.bin uboot.img trust.bin"
 BOOTDELAY=0
 OVERLAY_PREFIX='rockchip'

config/sources/families/include/sunxi64_common.inc

@@ -2,6 +2,7 @@ ARCH=arm64
 ATF_TARGET_MAP="PLAT=$ATF_PLAT DEBUG=1 bl31;;build/$ATF_PLAT/debug/bl31.bin"
 BOOTDELAY=1
 BOOTPATCHDIR='u-boot-sunxi'
+BOOTENV_FILE='sunxi.txt'
 UBOOT_TARGET_MAP=';;spl/sunxi-spl.bin u-boot.itb'
 BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd'
 LINUXFAMILY=sunxi64

config/sources/families/include/sunxi_common.inc

@@ -3,7 +3,7 @@ BOOTDELAY=1
 BOOTPATCHDIR='u-boot-sunxi'
 UBOOT_TARGET_MAP=';;u-boot-sunxi-with-spl.bin'
 BOOTSCRIPT="boot-sunxi.cmd:boot.cmd"
-BOOTENV_FILE='sunxi-default.txt'
+BOOTENV_FILE='sunxi.txt'
 LINUXFAMILY=sunxi
 UBOOT_FW_ENV='0x88000,0x20000' # /etc/fw_env.config offset and env size
 ASOUND_STATE='asound.state.sunxi-next'

config/sources/families/meson-gxbb.conf

@@ -1,7 +1,6 @@
 source "${BASH_SOURCE%/*}/include/meson64_common.inc"
 if [[ $BOARD == odroidc2 ]]; then
 	UBOOT_TARGET_MAP=";;$SRC/cache/sources/odroidc2-blobs/bl1.bin.hardkernel u-boot.bin"
-	BOOTENV_FILE='odroidc2-next.txt'
 fi
 
 uboot_custom_postprocess()

config/sources/families/mt7623.conf

@@ -1,5 +1,5 @@
 BOOTSCRIPT='boot-mt7623.cmd:boot.cmd'
-BOOTENV_FILE='mt7623-default.txt'
+BOOTENV_FILE='mt7623.txt'
 UBOOT_TARGET_MAP=";;$SRC/packages/blobs/mt7623n/BPI-R2-HEAD440-0k.img $SRC/packages/blobs/mt7623n/BPI-R2-HEAD1-512b.img $SRC/packages/blobs/mt7623n/BPI-R2-preloader-2k.img $SRC/packages/blobs/mt7623n/BPI-R2-EMMC-boot0-0K-0905.img u-boot.bin"
 BOOTPATCHDIR='u-boot-mt7623'
 ARCH=arm64

config/sources/families/mvebu.conf

@@ -1,10 +1,10 @@
 ARCH=armhf
 if [[ $BOARD == helios4 ]]; then
 	source "${BASH_SOURCE%/*}/include/mvebu-helios4.inc"
-	BOOTENV_FILE='helios4-default.txt'
+	BOOTENV_FILE='helios4.txt'
 else
 	source "${BASH_SOURCE%/*}/include/mvebu-clearfog.inc"
-	BOOTENV_FILE='clearfog-default.txt'
+	BOOTENV_FILE='clearfog.txt'
 fi
 
 case $BRANCH in
@@ -23,7 +23,7 @@ case $BRANCH in
 	dev)
 		BOOTBRANCH='tag:v2019.04'
 		BOOTPATCHDIR='u-boot-mvebu-dev'
-		BOOTSCRIPT='boot-mvebu-next.cmd:boot.cmd'
+		BOOTSCRIPT='boot-mvebu.cmd:boot.cmd'
 
 		UBOOT_TARGET_MAP=";sdhc;u-boot-spl.kwb:u-boot.mmc
 				  ;spi;u-boot-spl.kwb:u-boot.flash

config/sources/families/odroidxu4.conf

@@ -1,8 +1,7 @@
 ARCH=armhf
 BOOTSOURCE='https://github.com/hardkernel/u-boot.git'
-BOOTSCRIPT='boot-odroid-xu4-default.ini:boot.ini'
+BOOTSCRIPT='boot-odroid-xu4.ini:boot.ini'
 BOOTDIR='u-boot-odroidxu'
-BOOTENV_FILE='odroidxu4-default.txt'
 BOOTBRANCH='branch:odroidxu4-v2017.05'
 UBOOT_TARGET_MAP=';;sd_fuse/bl1.bin.hardkernel sd_fuse/bl2.bin.hardkernel.720k_uboot u-boot-dtb.bin sd_fuse/tzsw.bin.hardkernel'
 UBOOT_USE_GCC='> 6.3'

config/sources/families/rk322x.conf

@@ -1,5 +1,5 @@
 BOOTSCRIPT="boot-rk322x.cmd:boot.cmd"
-BOOTENV_FILE='rk322x-default.txt'
+BOOTENV_FILE='rk322x.txt'
 OVERLAY_PREFIX='rk322x'
 UBOOT_TARGET_MAP="all u-boot.itb;;u-boot-rk322x-with-spl.bin"
 UBOOT_USE_GCC='< 9.0'

config/sources/families/rockchip.conf

@@ -1,6 +1,6 @@
 ARCH=armhf
 BOOTSCRIPT="boot-rockchip.cmd:boot.cmd"
-BOOTENV_FILE='rockchip-default.txt'
+BOOTENV_FILE='rockchip.txt'
 OVERLAY_PREFIX='rockchip'
 UBOOT_TARGET_MAP=";;$SRC/packages/blobs/rockchip/rk3288_boot.bin u-boot-rockchip-with-spl.bin"
 UBOOT_USE_GCC='< 8.0'

config/sources/families/s5p6818.conf

@@ -3,7 +3,7 @@ BOOTSOURCE='https://github.com/rafaello7/u-boot-nanopi-m3'
 BOOTBRANCH='branch:master'
 BOOTDIR='u-boot-s5p6818'
 BOOTSCRIPT='boot-s5p6818.cmd:boot.cmd'
-BOOTENV_FILE='s5p6818-default.txt'
+BOOTENV_FILE='s5p6818.txt'
 UBOOT_TARGET_MAP=";;boot.img bootemmc.img"
 ATF_COMPILE="no"
 case $BRANCH in

config/sources/families/sun50iw1.conf

@@ -1,7 +1,6 @@
 ATF_PLAT="sun50i_a64"
 source "${BASH_SOURCE%/*}/include/sunxi64_common.inc"
 OVERLAY_PREFIX='sun50i-a64'
-BOOTENV_FILE='sun50iw1-next.txt'
 [[ -z $CPUMIN ]] && CPUMIN=480000
 [[ -z $CPUMAX ]] && CPUMAX=1010000
 GOVERNOR=performance

config/sources/families/sun50iw2.conf

@@ -1,12 +1,7 @@
 ATF_PLAT="sun50i_a64"
-
 source "${BASH_SOURCE%/*}/include/sunxi64_common.inc"
-
 OVERLAY_PREFIX='sun50i-h5'
-BOOTENV_FILE='sun50iw2-next.txt'
-
 [[ -z $CPUMIN ]] && CPUMIN=480000
 [[ -z $CPUMAX ]] && CPUMAX=1368000
 GOVERNOR=ondemand
-
 ASOUND_STATE='asound.state.sun50iw2-dev'

config/sources/families/sun50iw6.conf

@@ -1,12 +1,7 @@
 ATF_PLAT="sun50i_h6";
-
 source "${BASH_SOURCE%/*}/include/sunxi64_common.inc"
-
 OVERLAY_PREFIX='sun50i-h6'
-BOOTENV_FILE='sun50iw2-next.txt'
-
 [[ -z $CPUMIN ]] && CPUMIN=480000
 [[ -z $CPUMAX ]] && CPUMAX=1810000
 GOVERNOR=ondemand
-
 ASOUND_STATE='asound.state.sun50iw2-dev'

config/sources/families/sun7i.conf

@@ -1,6 +1,5 @@
 source "${BASH_SOURCE%/*}/include/sunxi_common.inc"
 OVERLAY_PREFIX='sun7i-a20'
-
 [[ -z $CPUMIN ]] && CPUMIN=480000
 [[ -z $CPUMAX ]] && CPUMAX=1010000
 

config/templates/Dockerfile

@@ -12,7 +12,7 @@ RUN apt update && DEBIAN_FRONTEND=noninteractive apt -y upgrade && \
 	pv bc lzop zip binfmt-support build-essential ccache debootstrap ntpdate gawk gcc-arm-linux-gnueabihf \
 	qemu-user-static u-boot-tools uuid-dev zlib1g-dev unzip libusb-1.0-0-dev parted pkg-config libncurses5-dev whiptail \
 	debian-keyring debian-archive-keyring f2fs-tools libfile-fcntllock-perl rsync libssl-dev nfs-kernel-server btrfs-progs \
-	ncurses-term p7zip-full kmod dosfstools libc6-dev-armhf-cross fakeroot xxd \
+	ncurses-term p7zip-full kmod dosfstools libc6-dev-armhf-cross fakeroot xxd imagemagick \
 	curl patchutils python2 python3 liblz4-tool libpython2.7-dev linux-base swig libpython3-dev python3-dev \
 	systemd-container udev g++-8-arm-linux-gnueabihf lib32stdc++6 cpio tzdata psmisc acl \
 	libc6-i386 lib32ncurses6 lib32tinfo6 locales ncurses-base zlib1g:i386 pixz bison libbison-dev flex libfl-dev \

lib/build-all-ng.sh

@@ -59,7 +59,7 @@ unset	LINUXFAMILY LINUXCONFIG KERNELDIR KERNELSOURCE KERNELBRANCH BOOTDIR BOOTSO
 		DEB_STORAGE REPO_STORAGE REPO_CONFIG REPOSITORY_UPDATE PACKAGE_LIST_RELEASE LOCAL_MIRROR COMPILE_ATF \
 		PACKAGE_LIST_DESKTOP_BOARD PACKAGE_LIST_DESKTOP_FAMILY ATF_COMPILE ATFPATCHDIR OFFSET BOOTSOURCEDIR BOOT_USE_BLOBS \
 		BOOT_SOC DDR_BLOB MINILOADER_BLOB BL31_BLOB BOOT_RK3328_USE_AYUFAN_ATF BOOT_USE_BLOBS BOOT_RK3399_LEGACY_HYBRID \
-		BOOT_USE_MAINLINE_ATF BOOT_USE_TPL_SPL_BLOB OFFLINE_WORK IMAGE_PARTITION_TABLE
+		BOOT_USE_MAINLINE_ATF BOOT_USE_TPL_SPL_BLOB OFFLINE_WORK IMAGE_PARTITION_TABLE BOOT_LOGO
 }
 
 pack_upload ()

lib/compilation-prepare.sh

@@ -71,6 +71,28 @@ compilation_prepare()
 		process_patch_file "${SRC}/patch/misc/general-packaging-4.9.y.patch" "applying"
 	fi
 
+	#
+	# Linux splah file
+	#
+
+	if linux-version compare "${version}" ge 5.4; then
+
+		display_alert "Adding" "Kernel splash file" "info"
+		process_patch_file "${SRC}/patch/misc/0001-bootsplash.patch" "applying"
+		process_patch_file "${SRC}/patch/misc/0002-bootsplash.patch" "applying"
+		process_patch_file "${SRC}/patch/misc/0003-bootsplash.patch" "applying"
+		process_patch_file "${SRC}/patch/misc/0004-bootsplash.patch" "applying"
+		process_patch_file "${SRC}/patch/misc/0005-bootsplash.patch" "applying"
+		process_patch_file "${SRC}/patch/misc/0006-bootsplash.patch" "applying"
+		process_patch_file "${SRC}/patch/misc/0007-bootsplash.patch" "applying"
+		process_patch_file "${SRC}/patch/misc/0008-bootsplash.patch" "applying"
+		process_patch_file "${SRC}/patch/misc/0009-bootsplash.patch" "applying"
+		process_patch_file "${SRC}/patch/misc/0010-bootsplash.patch" "applying"
+		process_patch_file "${SRC}/patch/misc/0011-bootsplash.patch" "applying"
+		process_patch_file "${SRC}/patch/misc/0012-bootsplash.patch" "applying"
+
+	fi
+
 	#
 	# mac80211 wireless driver injection features from Kali Linux
 	#

lib/distributions.sh

@@ -298,7 +298,6 @@ install_common()
 
 	# copy boot splash images
 	cp "${SRC}"/packages/blobs/splash/armbian-u-boot.bmp "${SDCARD}"/boot/boot.bmp
-	cp "${SRC}"/packages/blobs/splash/armbian-desktop.png "${SDCARD}"/boot/boot-desktop.png
 
 	# execute $LINUXFAMILY-specific tweaks
 	[[ $(type -t family_tweaks) == function ]] && family_tweaks
@@ -427,6 +426,8 @@ install_common()
 	# nsswitch settings for sane DNS behavior: remove resolve, assure libnss-myhostname support
 	sed "s/hosts\:.*/hosts:          files mymachines dns myhostname/g" -i "${SDCARD}"/etc/nsswitch.conf
 
+	[[ $BOOT_LOGO == yes || $BOOT_LOGO == desktop && $BUILD_DESKTOP == yes ]] && boot_logo
+
 }
 
 

lib/general.sh

@@ -481,6 +481,125 @@ fingerprint_image()
 }
 
 
+#--------------------------------------------------------------------------------------------------------------------------------
+# Create kernel boot logo from packages/blobs/splash/logo.png and packages/blobs/splash/spinner.gif (animated)
+# and place to the file /lib/firmware/bootsplash
+#--------------------------------------------------------------------------------------------------------------------------------
+function boot_logo ()
+{
+display_alert "Building kernel splash logo" "$RELEASE" "info"
+
+	LOGO=${SRC}/packages/blobs/splash/logo.png
+	LOGO_WIDTH=$(identify $LOGO | cut -d " " -f 3 | cut -d x -f 1)
+	LOGO_HEIGHT=$(identify $LOGO | cut -d " " -f 3 | cut -d x -f 2)
+	THROBBER=${SRC}/packages/blobs/splash/spinner.gif
+	THROBBER_WIDTH=$(identify $THROBBER | head -1 | cut -d " " -f 3 | cut -d x -f 1)
+	THROBBER_HEIGHT=$(identify $THROBBER | head -1 | cut -d " " -f 3 | cut -d x -f 2)
+	convert -alpha remove -background "#000000"	$LOGO "${SDCARD}"/tmp/logo.rgb
+	convert -alpha remove -background "#000000" $THROBBER "${SDCARD}"/tmp/throbber%02d.rgb
+	${SRC}/packages/blobs/splash/bootsplash-packer \
+	--bg_red 0x00 \
+	--bg_green 0x00 \
+	--bg_blue 0x00 \
+	--frame_ms 48 \
+	--picture \
+	--pic_width $LOGO_WIDTH \
+	--pic_height $LOGO_HEIGHT \
+	--pic_position 0 \
+	--blob "${SDCARD}"/tmp/logo.rgb \
+	--picture \
+	--pic_width $THROBBER_WIDTH \
+	--pic_height $THROBBER_HEIGHT \
+	--pic_position 0x05 \
+	--pic_position_offset 200 \
+	--pic_anim_type 1 \
+	--pic_anim_loop 0 \
+	--blob "${SDCARD}"/tmp/throbber00.rgb \
+	--blob "${SDCARD}"/tmp/throbber01.rgb \
+	--blob "${SDCARD}"/tmp/throbber02.rgb \
+	--blob "${SDCARD}"/tmp/throbber03.rgb \
+	--blob "${SDCARD}"/tmp/throbber04.rgb \
+	--blob "${SDCARD}"/tmp/throbber05.rgb \
+	--blob "${SDCARD}"/tmp/throbber06.rgb \
+	--blob "${SDCARD}"/tmp/throbber07.rgb \
+	--blob "${SDCARD}"/tmp/throbber08.rgb \
+	--blob "${SDCARD}"/tmp/throbber09.rgb \
+	--blob "${SDCARD}"/tmp/throbber10.rgb \
+	--blob "${SDCARD}"/tmp/throbber11.rgb \
+	--blob "${SDCARD}"/tmp/throbber12.rgb \
+	--blob "${SDCARD}"/tmp/throbber13.rgb \
+	--blob "${SDCARD}"/tmp/throbber14.rgb \
+	--blob "${SDCARD}"/tmp/throbber15.rgb \
+	--blob "${SDCARD}"/tmp/throbber16.rgb \
+	--blob "${SDCARD}"/tmp/throbber17.rgb \
+	--blob "${SDCARD}"/tmp/throbber18.rgb \
+	--blob "${SDCARD}"/tmp/throbber19.rgb \
+	--blob "${SDCARD}"/tmp/throbber20.rgb \
+	--blob "${SDCARD}"/tmp/throbber21.rgb \
+	--blob "${SDCARD}"/tmp/throbber22.rgb \
+	--blob "${SDCARD}"/tmp/throbber23.rgb \
+	--blob "${SDCARD}"/tmp/throbber24.rgb \
+	--blob "${SDCARD}"/tmp/throbber25.rgb \
+	--blob "${SDCARD}"/tmp/throbber26.rgb \
+	--blob "${SDCARD}"/tmp/throbber27.rgb \
+	--blob "${SDCARD}"/tmp/throbber28.rgb \
+	--blob "${SDCARD}"/tmp/throbber29.rgb \
+	--blob "${SDCARD}"/tmp/throbber30.rgb \
+	--blob "${SDCARD}"/tmp/throbber31.rgb \
+	--blob "${SDCARD}"/tmp/throbber32.rgb \
+	--blob "${SDCARD}"/tmp/throbber33.rgb \
+	--blob "${SDCARD}"/tmp/throbber34.rgb \
+	--blob "${SDCARD}"/tmp/throbber35.rgb \
+	--blob "${SDCARD}"/tmp/throbber36.rgb \
+	--blob "${SDCARD}"/tmp/throbber37.rgb \
+	--blob "${SDCARD}"/tmp/throbber38.rgb \
+	--blob "${SDCARD}"/tmp/throbber39.rgb \
+	--blob "${SDCARD}"/tmp/throbber40.rgb \
+	--blob "${SDCARD}"/tmp/throbber41.rgb \
+	--blob "${SDCARD}"/tmp/throbber42.rgb \
+	--blob "${SDCARD}"/tmp/throbber43.rgb \
+	--blob "${SDCARD}"/tmp/throbber44.rgb \
+	--blob "${SDCARD}"/tmp/throbber45.rgb \
+	--blob "${SDCARD}"/tmp/throbber46.rgb \
+	--blob "${SDCARD}"/tmp/throbber47.rgb \
+	--blob "${SDCARD}"/tmp/throbber48.rgb \
+	--blob "${SDCARD}"/tmp/throbber49.rgb \
+	--blob "${SDCARD}"/tmp/throbber50.rgb \
+	--blob "${SDCARD}"/tmp/throbber51.rgb \
+	--blob "${SDCARD}"/tmp/throbber52.rgb \
+	--blob "${SDCARD}"/tmp/throbber53.rgb \
+	--blob "${SDCARD}"/tmp/throbber54.rgb \
+	--blob "${SDCARD}"/tmp/throbber55.rgb \
+	--blob "${SDCARD}"/tmp/throbber56.rgb \
+	--blob "${SDCARD}"/tmp/throbber57.rgb \
+	--blob "${SDCARD}"/tmp/throbber58.rgb \
+	--blob "${SDCARD}"/tmp/throbber59.rgb \
+	--blob "${SDCARD}"/tmp/throbber60.rgb \
+	--blob "${SDCARD}"/tmp/throbber61.rgb \
+	--blob "${SDCARD}"/tmp/throbber62.rgb \
+	--blob "${SDCARD}"/tmp/throbber63.rgb \
+	--blob "${SDCARD}"/tmp/throbber64.rgb \
+	--blob "${SDCARD}"/tmp/throbber65.rgb \
+	--blob "${SDCARD}"/tmp/throbber66.rgb \
+	--blob "${SDCARD}"/tmp/throbber67.rgb \
+	--blob "${SDCARD}"/tmp/throbber68.rgb \
+	--blob "${SDCARD}"/tmp/throbber69.rgb \
+	--blob "${SDCARD}"/tmp/throbber70.rgb \
+	--blob "${SDCARD}"/tmp/throbber71.rgb \
+	--blob "${SDCARD}"/tmp/throbber72.rgb \
+	--blob "${SDCARD}"/tmp/throbber73.rgb \
+	--blob "${SDCARD}"/tmp/throbber74.rgb \
+	"${SDCARD}"/lib/firmware/bootsplash.armbian >/dev/null 2>&1
+	[[ -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
+
+	# enable additional services
+	chroot "${SDCARD}" /bin/bash -c "systemctl --no-reload enable bootsplash-ask-password-console.path >/dev/null 2>&1"
+	chroot "${SDCARD}" /bin/bash -c "systemctl --no-reload enable bootsplash-hide-when-booted.service >/dev/null 2>&1"
+	chroot "${SDCARD}" /bin/bash -c "systemctl --no-reload enable bootsplash-show-on-shutdown.service >/dev/null 2>&1"
+}
+
 
 
 function distro_menu ()
@@ -856,7 +975,7 @@ prepare_host()
 	local hostdeps="wget ca-certificates device-tree-compiler pv bc lzop zip binfmt-support build-essential ccache debootstrap ntpdate \
 	gawk gcc-arm-linux-gnueabihf qemu-user-static u-boot-tools uuid-dev zlib1g-dev unzip libusb-1.0-0-dev fakeroot \
 	parted pkg-config libncurses5-dev whiptail debian-keyring debian-archive-keyring f2fs-tools libfile-fcntllock-perl rsync libssl-dev \
-	nfs-kernel-server btrfs-progs ncurses-term p7zip-full kmod dosfstools libc6-dev-armhf-cross \
+	nfs-kernel-server btrfs-progs ncurses-term p7zip-full kmod dosfstools libc6-dev-armhf-cross imagemagick \
 	curl patchutils liblz4-tool libpython2.7-dev linux-base swig aptly acl python3-dev python3-distutils \
 	locales ncurses-base pixz dialog systemd-container udev lib32stdc++6 libc6-i386 lib32ncurses5 lib32tinfo5 \
 	bison libbison-dev flex libfl-dev cryptsetup gpg gnupg1 cpio aria2 pigz dirmngr python3-distutils"
@@ -1089,7 +1208,7 @@ download_and_verify()
 
 	local remotedir=$1
 	local filename=$2
-	local localdir="${SRC}"/cache/${remotedir//_}
+	local localdir=$SRC/cache/${remotedir//_}
 	local dirname=${filename//.tar.xz}
 
         if [[ $DOWNLOAD_MIRROR == china ]]; then

packages/bsp/common/etc/initramfs-tools/hooks/bootsplash.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+# Copy splash file to initrd
+#
+mkdir -p "${DESTDIR}"/lib/firmware
+splashfile=/lib/firmware/bootsplash.armbian
+
+if [ -f "${splashfile}" ]; then
+	cp "${splashfile}" "${DESTDIR}"/lib/firmware
+fi
+
+exit 0

packages/bsp/common/lib/systemd/system/bootsplash-ask-password-console.path

@@ -0,0 +1,17 @@
+[Unit]
+Description=Dispatch Password Requests to Console Directory Watch when bootsplash is active
+DefaultDependencies=no
+Conflicts=shutdown.target
+Conflicts=systemd-ask-password-console.path
+Conflicts=systemd-ask-password-console.service
+After=plymouth-start.service
+Before=paths.target shutdown.target cryptsetup.target
+ConditionPathExists=!/run/plymouth/pid
+ConditionPathExists=/sys/devices/platform/bootsplash.0/enabled
+
+[Path]
+DirectoryNotEmpty=/run/systemd/ask-password
+MakeDirectory=yes
+
+[Install]
+WantedBy=sysinit.target

packages/bsp/common/lib/systemd/system/bootsplash-ask-password-console.service

@@ -0,0 +1,16 @@
+[Unit]
+Description=Dispatch Password Requests to Console when bootsplash is active
+DefaultDependencies=no
+Conflicts=shutdown.target
+Conflicts=systemd-ask-password-console.path
+Conflicts=systemd-ask-password-console.service
+After=plymouth-start.service systemd-vconsole-setup.service
+Before=shutdown.target
+ConditionPathExists=!/run/plymouth/pid
+ConditionPathExists=/sys/devices/platform/bootsplash.0/enabled
+
+[Service]
+ExecStartPre=-/bin/sh -c '/bin/cat /sys/devices/platform/bootsplash.0/enabled > /run/systemd/ask-password/bootsplash-state ; exec /bin/echo off > /sys/devices/platform/bootsplash.0/enabled'
+ExecStart=/usr/bin/systemd-tty-ask-password-agent --query --console
+ExecStartPost=-/bin/sh -c 'exec /bin/cat /run/systemd/ask-password/bootsplash-state > /sys/devices/platform/bootsplash.0/enabled ; /bin/rm /run/systemd/ask-password/bootsplash-state'
+Type=oneshot

packages/bsp/common/lib/systemd/system/bootsplash-hide-when-booted.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=Hide bootsplash after starting the system
+After=graphical.target
+DefaultDependencies=no
+ConditionPathExists=/sys/devices/platform/bootsplash.0/enabled
+
+[Service]
+ExecStartPre=/bin/sh -c 'exec /bin/sleep 15'
+ExecStart=/bin/sh -c 'exec /bin/echo off > /sys/devices/platform/bootsplash.0/enabled'
+Restart=no
+Type=oneshot
+
+[Install]
+WantedBy=graphical.target

packages/bsp/common/lib/systemd/system/bootsplash-show-on-shutdown.service

@@ -0,0 +1,19 @@
+[Unit]
+Description=Show bootsplash on system halt, power off, reboot, or kexec
+Before=systemd-halt.service
+Before=systemd-kexec.service
+Before=systemd-poweroff.service
+Before=systemd-reboot.service
+DefaultDependencies=no
+ConditionPathExists=/sys/devices/platform/bootsplash.0/enabled
+
+[Service]
+ExecStart=/bin/sh -c 'exec /bin/echo on > /sys/devices/platform/bootsplash.0/enabled'
+Restart=no
+Type=oneshot
+
+[Install]
+WantedBy=halt.target
+WantedBy=kexec.target
+WantedBy=poweroff.target
+WantedBy=reboot.target

patch/kernel/meson64-current/0087-WIP-arm64-dts-meson-khadas-vim3-change-LED-behaviour.patch

@@ -24,7 +24,7 @@ index 6022805d2032..6d0163f56b0d 100644
 @@ -40,14 +40,14 @@
  		compatible = "gpio-leds";
  
- 		white {
+ 		led-white {
 -			label = "vim3:white:sys";
 -			gpios = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_LOW>;
 -			linux,default-trigger = "heartbeat";
@@ -33,7 +33,7 @@ index 6022805d2032..6d0163f56b0d 100644
 +			linux,default-trigger = "default-on";
  		};
  
- 		red {
+ 		led-red {
  			label = "vim3:red";
 -			gpios = <&gpio_expander 5 GPIO_ACTIVE_LOW>;
 +			gpios = <&gpio_expander 5 GPIO_ACTIVE_HIGH>;