U-boot splash for radxa-zero-3e

6 files changed, 69 insertions, 14 deletions

diff --git a/meta-unit-graphics/dynamic-layers/raspberrypi/recipes-bsp/u-boot/files/0001-tweak-rpi-environment.patch b/meta-unit-graphics/dynamic-layers/raspberrypi/recipes-bsp/u-boot/files/0001-tweak-rpi-default-environment.patch
index 97b07ac..5124150 100644
--- a/meta-unit-graphics/dynamic-layers/raspberrypi/recipes-bsp/u-boot/files/0001-tweak-rpi-environment.patch
+++ b/meta-unit-graphics/dynamic-layers/raspberrypi/recipes-bsp/u-boot/files/0001-tweak-rpi-default-environment.patch
@@ -1,7 +1,7 @@
-From b4b7380aab0ae3ff590e9627c59fbf5b07f47ef6 Mon Sep 17 00:00:00 2001
+From 62e3683cddbafdc496bf38b0497a3729f3cc4add Mon Sep 17 00:00:00 2001
 From: unitexe <unitexe70@gmail.com>
-Date: Sun, 8 Feb 2026 11:27:08 -0600
-Subject: [PATCH] tweak rpi environment
+Date: Sun, 19 Apr 2026 19:51:47 -0500
+Subject: [PATCH] tweak rpi default environment
 
 - Restrict boot targets to SD card
 - Add custom splash support
@@ -13,7 +13,7 @@ Upstream-Status: Inappropriate [embedded-specific]
  1 file changed, 16 insertions(+), 3 deletions(-)
 
 diff --git a/board/raspberrypi/rpi/rpi.env b/board/raspberrypi/rpi/rpi.env
-index 9ac9d6768ca..b93b731406a 100644
+index 9ac9d6768ca..20809c5b60e 100644
 --- a/board/raspberrypi/rpi/rpi.env
 +++ b/board/raspberrypi/rpi/rpi.env
 @@ -6,8 +6,8 @@ dhcpuboot=usb start; dhcp u-boot.uimg; bootm
@@ -43,7 +43,7 @@ index 9ac9d6768ca..b93b731406a 100644
 + * alignment is necessary since image size is the same size as the
 + * target LCD.
 + */
-+splashfile=yocto_project_logo_white_800x480_24bpp.bmp.gz
++splashfile=splashfile.bmp.gz
 +splashimage=0x05800000
 +splashsource=mmc_fs
 -- 
diff --git a/meta-unit-graphics/dynamic-layers/raspberrypi/recipes-bsp/u-boot/files/splash.cfg b/meta-unit-graphics/dynamic-layers/raspberrypi/recipes-bsp/u-boot/files/splash.cfg
deleted file mode 100644
index 6420088..0000000
--- a/meta-unit-graphics/dynamic-layers/raspberrypi/recipes-bsp/u-boot/files/splash.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-CONFIG_CMD_BMP=y
-CONFIG_BMP=y
-CONFIG_BMP_24BPP=y
-CONFIG_HIDE_LOGO_VERSION=y
-CONFIG_SPLASH_SCREEN=y
-CONFIG_SPLASH_SOURCE=y
-CONFIG_VIDEO_BMP_GZIP=y
-CONFIG_VIDEO_LOGO_MAX_SIZE=0x120000
diff --git a/meta-unit-graphics/dynamic-layers/raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-unit-graphics/dynamic-layers/raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend
index 0cb8d8b..c910222 100644
--- a/meta-unit-graphics/dynamic-layers/raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/meta-unit-graphics/dynamic-layers/raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -1,4 +1,5 @@
+FILESEXTRAPATHS:prepend := "${UNIT_GRAPHICS_LAYERDIR}/recipes-bsp/u-boot/files:"
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 SRC_URI:append = " file://splash.cfg"
-SRC_URI:append = " file://0001-tweak-rpi-environment.patch"
+SRC_URI:append = " file://0001-tweak-rpi-default-environment.patch"
diff --git a/meta-unit-graphics/dynamic-layers/rockchip/recipes-bsp/u-boot-splash/u-boot-splash.bbappend b/meta-unit-graphics/dynamic-layers/rockchip/recipes-bsp/u-boot-splash/u-boot-splash.bbappend
new file mode 100644
index 0000000..d531e0e
--- /dev/null
+++ b/meta-unit-graphics/dynamic-layers/rockchip/recipes-bsp/u-boot-splash/u-boot-splash.bbappend
@@ -0,0 +1 @@
+BOOT_SPLASH_FILE ??= "yocto_project_logo_blue_1024x600_24bpp.bmp.gz"
diff --git a/meta-unit-graphics/dynamic-layers/rockchip/recipes-bsp/u-boot/files/0001-tweak-rk3568-default-environment.patch b/meta-unit-graphics/dynamic-layers/rockchip/recipes-bsp/u-boot/files/0001-tweak-rk3568-default-environment.patch
new file mode 100644
index 0000000..332be66
--- /dev/null
+++ b/meta-unit-graphics/dynamic-layers/rockchip/recipes-bsp/u-boot/files/0001-tweak-rk3568-default-environment.patch
@@ -0,0 +1,50 @@
+From 04786d495ec2a284c35978c083c469d0b877a45e Mon Sep 17 00:00:00 2001
+From: unitexe <unitexe70@gmail.com>
+Date: Sun, 19 Apr 2026 18:53:47 -0500
+Subject: [PATCH] tweak rk3568 default environment
+
+- Restrict boot targets to SD card
+- Add custom splash support
+- Disable stdout & stderr vidconsole so it doesn't write over splash
+
+Upstream-Status: Inappropriate [embedded-specific]
+---
+ include/configs/evb_rk3568.h      | 8 ++++++--
+ include/configs/rockchip-common.h | 2 +-
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/include/configs/evb_rk3568.h b/include/configs/evb_rk3568.h
+index 9070160cf58..aebf24844fc 100644
+--- a/include/configs/evb_rk3568.h
++++ b/include/configs/evb_rk3568.h
+@@ -7,8 +7,12 @@
+ #define __EVB_RK3568_H
+ 
+ #define ROCKCHIP_DEVICE_SETTINGS \
+-			"stdout=serial,vidconsole\0" \
+-			"stderr=serial,vidconsole\0"
++			"stdout=serial\0" \
++			"stderr=serial\0" \
++			"splashfile=splashfile=splashfile.bmp.gz\0" \
++			"splashimage=0x12280000\0" \
++			"splashsource=mmc_fs\0" \
++			"splashpos=m,m\0"
+ 
+ #include <configs/rk3568_common.h>
+ 
+diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
+index d5550a46575..2cac5d15c68 100644
+--- a/include/configs/rockchip-common.h
++++ b/include/configs/rockchip-common.h
+@@ -14,7 +14,7 @@
+ #ifndef CONFIG_XPL_BUILD
+ 
+ #ifndef BOOT_TARGETS
+-#define BOOT_TARGETS	"mmc1 mmc0 nvme scsi usb pxe dhcp spi"
++#define BOOT_TARGETS	"mmc1 mmc0"
+ #endif
+ 
+ #ifdef CONFIG_ARM64
+-- 
+2.43.0
+
diff --git a/meta-unit-graphics/dynamic-layers/rockchip/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-unit-graphics/dynamic-layers/rockchip/recipes-bsp/u-boot/u-boot_%.bbappend
new file mode 100644
index 0000000..22a3457
--- /dev/null
+++ b/meta-unit-graphics/dynamic-layers/rockchip/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -0,0 +1,11 @@
+FILESEXTRAPATHS:prepend := "${UNIT_GRAPHICS_LAYERDIR}/recipes-bsp/u-boot/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+SRC_URI:append = " file://splash.cfg"
+SRC_URI:append = " file://0001-tweak-rk3568-default-environment.patch"
+
+# On screen console not wanted
+UBOOT_EXTLINUX_CONSOLE:remove = "console=tty1"
+
+# Without this plymouth will not show
+UBOOT_EXTLINUX_KERNEL_ARGS:append = " splash"