U-boot splash for radxa-zero-3e

18 files changed, 87 insertions, 18 deletions

diff --git a/meta-unit-core/dynamic-layers/rockchip/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-unit-core/dynamic-layers/rockchip/recipes-bsp/u-boot/u-boot_%.bbappend
new file mode 100644
index 0000000..9f62287
--- /dev/null
+++ b/meta-unit-core/dynamic-layers/rockchip/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -0,0 +1,4 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+
+SRC_URI:append = " file://increase_sys_bootm_len.cfg"
diff --git a/meta-unit-core/dynamic-layers/rockchip/recipes-core/images/core-image-unit.bbappend b/meta-unit-core/dynamic-layers/rockchip/recipes-core/images/core-image-unit.bbappend
index 7c0581c..40b5b97 100644
--- a/meta-unit-core/dynamic-layers/rockchip/recipes-core/images/core-image-unit.bbappend
+++ b/meta-unit-core/dynamic-layers/rockchip/recipes-core/images/core-image-unit.bbappend
@@ -1 +1,2 @@
-IMAGE_FEATURES:append = " observability"
+IMAGE_FEATURES:append:radxa-zero-3e = " observability"
+IMAGE_FEATURES:append:radxa-zero-3e = " boot-splash"
diff --git a/meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-unit/images/core-image-unit.bbappend b/meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-unit/images/core-image-unit.bbappend
index 9776077..78c2f01 100644
--- a/meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-unit/images/core-image-unit.bbappend
+++ b/meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-unit/images/core-image-unit.bbappend
@@ -5,6 +5,7 @@ IMAGE_FEATURES:append = " hwcodecs"
 
 IMAGE_INSTALL:append = " packagegroup-unit-kiosk"
 IMAGE_INSTALL:append = " ${@bb.utils.contains('IMAGE_FEATURES', 'splash', 'packagegroup-unit-splash', '', d)}"
+
 IMAGE_INSTALL:append = " ${@bb.utils.contains('IMAGE_FEATURES', 'boot-splash', 'packagegroup-unit-boot-splash', '', d)}"
 
-IMAGE_BOOT_FILES:append = " ${@bb.utils.contains('IMAGE_FEATURES', 'boot-splash', 'yocto_project_logo_white_800x480_24bpp.bmp.gz', '', d)}"
+IMAGE_BOOT_FILES:append = " ${@bb.utils.contains('IMAGE_FEATURES', 'boot-splash', 'splashfile.bmp.gz', '', d)}"
diff --git a/meta-unit-graphics/conf/layer.conf b/meta-unit-graphics/conf/layer.conf
index 04a6a62..5275daf 100644
--- a/meta-unit-graphics/conf/layer.conf
+++ b/meta-unit-graphics/conf/layer.conf
@@ -15,6 +15,8 @@ BBFILES_DYNAMIC += " \
     flutter-layer:${LAYERDIR}/dynamic-layers/flutter-layer/recipes-*/*/*.bbappend \
     raspberrypi:${LAYERDIR}/dynamic-layers/raspberrypi/recipes-*/*/*.bb \
     raspberrypi:${LAYERDIR}/dynamic-layers/raspberrypi/recipes-*/*/*.bbappend \
+    rockchip:${LAYERDIR}/dynamic-layers/rockchip/recipes-*/*/*.bb \
+    rockchip:${LAYERDIR}/dynamic-layers/rockchip/recipes-*/*/*.bbappend \
 "
 
 UNIT_GRAPHICS_LAYERDIR = "${LAYERDIR}"
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/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"
diff --git a/meta-unit-graphics/recipes-bsp/u-boot-splash/files/yocto_project_logo_blue_1024x600_24bpp.bmp.gz b/meta-unit-graphics/recipes-bsp/u-boot-splash/files/yocto_project_logo_blue_1024x600_24bpp.bmp.gz
new file mode 100644
index 0000000..96ad799
--- /dev/null
+++ b/meta-unit-graphics/recipes-bsp/u-boot-splash/files/yocto_project_logo_blue_1024x600_24bpp.bmp.gz
diff --git a/meta-unit-graphics/recipes-bsp/u-boot-splash/files/yocto_project_logo_blue_800x480_24bpp.bmp.gz b/meta-unit-graphics/recipes-bsp/u-boot-splash/files/yocto_project_logo_blue_800x480_24bpp.bmp.gz
new file mode 100644
index 0000000..2c9beae
--- /dev/null
+++ b/meta-unit-graphics/recipes-bsp/u-boot-splash/files/yocto_project_logo_blue_800x480_24bpp.bmp.gz
diff --git a/meta-unit-graphics/recipes-bsp/u-boot-splash/files/yocto_project_logo_white_800x480_24bpp.bmp.gz b/meta-unit-graphics/recipes-bsp/u-boot-splash/files/yocto_project_logo_white_800x480_24bpp.bmp.gz
deleted file mode 100644
index d603f12..0000000
--- a/meta-unit-graphics/recipes-bsp/u-boot-splash/files/yocto_project_logo_white_800x480_24bpp.bmp.gz
+++ /dev/null
diff --git a/meta-unit-graphics/recipes-bsp/u-boot-splash/u-boot-splash.bb b/meta-unit-graphics/recipes-bsp/u-boot-splash/u-boot-splash.bb
index 7e5b318..46f0da8 100644
--- a/meta-unit-graphics/recipes-bsp/u-boot-splash/u-boot-splash.bb
+++ b/meta-unit-graphics/recipes-bsp/u-boot-splash/u-boot-splash.bb
@@ -4,15 +4,18 @@ LIC_FILES_CHKSUM = "file://${UNIT_GRAPHICS_LAYERDIR}/LICENSE;md5=a77c12e0c0e8a14
 
 inherit deploy
 
+BOOT_SPLASH_FILE ??= "yocto_project_logo_blue_800x480_24bpp.bmp.gz"
+
 SRC_URI = "\
-    file://yocto_project_logo_white_800x480_24bpp.bmp.gz;unpack=0 \
+    file://yocto_project_logo_blue_800x480_24bpp.bmp.gz;unpack=0 \
+    file://yocto_project_logo_blue_1024x600_24bpp.bmp.gz;unpack=0 \
 "
 
 S = "${UNPACKDIR}"
 
 do_deploy() {
     install -d ${DEPLOY_DIR_IMAGE}
-    install -m 0644 ${S}/yocto_project_logo_white_800x480_24bpp.bmp.gz ${DEPLOY_DIR_IMAGE}/yocto_project_logo_white_800x480_24bpp.bmp.gz
+    install -m 0644 ${S}/${BOOT_SPLASH_FILE} ${DEPLOY_DIR_IMAGE}/splashfile.bmp.gz
 }
 
 addtask deploy before do_build after do_compile
diff --git a/meta-unit-graphics/dynamic-layers/raspberrypi/recipes-bsp/u-boot/files/splash.cfg b/meta-unit-graphics/recipes-bsp/u-boot/files/splash.cfg
index 6420088..997ebd1 100644
--- a/meta-unit-graphics/dynamic-layers/raspberrypi/recipes-bsp/u-boot/files/splash.cfg
+++ b/meta-unit-graphics/recipes-bsp/u-boot/files/splash.cfg
@@ -3,6 +3,7 @@ CONFIG_BMP=y
 CONFIG_BMP_24BPP=y
 CONFIG_HIDE_LOGO_VERSION=y
 CONFIG_SPLASH_SCREEN=y
+CONFIG_SPLASH_SCREEN_ALIGN=y
 CONFIG_SPLASH_SOURCE=y
 CONFIG_VIDEO_BMP_GZIP=y
 CONFIG_VIDEO_LOGO_MAX_SIZE=0x120000
diff --git a/meta-unit-graphics/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-unit-graphics/recipes-bsp/u-boot/u-boot_%.bbappend
new file mode 100644
index 0000000..8802adb
--- /dev/null
+++ b/meta-unit-graphics/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -0,0 +1 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
diff --git a/meta-unit-kas/images/poky/radxa-zero-3e/core-image-base/wrynose.yml b/meta-unit-kas/images/poky/radxa-zero-3e/core-image-base/wrynose.yml
index ee427a2..aa226bf 100644
--- a/meta-unit-kas/images/poky/radxa-zero-3e/core-image-base/wrynose.yml
+++ b/meta-unit-kas/images/poky/radxa-zero-3e/core-image-base/wrynose.yml
@@ -16,7 +16,6 @@ header:
     - meta-unit-kas/include/layers/meta-rockchip/remote.yml
     - meta-unit-kas/include/layers/meta-rockchip/main.yml
     - meta-unit-kas/include/layers/meta-rockchip/radxa-zero-3e.yml
-    - meta-unit-kas/include/layers/meta-rockchip/conf.yml
     - meta-unit-kas/include/features/ssh.yml
     - meta-unit-kas/include/features/systemd.yml
 
diff --git a/meta-unit-kas/images/unit-poky/radxa-zero-3e/core-image-unit/wrynose.yml b/meta-unit-kas/images/unit-poky/radxa-zero-3e/core-image-unit/wrynose.yml
index f992ab0..c4829f0 100644
--- a/meta-unit-kas/images/unit-poky/radxa-zero-3e/core-image-unit/wrynose.yml
+++ b/meta-unit-kas/images/unit-poky/radxa-zero-3e/core-image-unit/wrynose.yml
@@ -36,6 +36,7 @@ repos:
     layers:
       meta-unit-core:
       meta-unit-distro:
+      meta-unit-graphics:
       meta-unit-profiling:
       meta-unit-users:
       meta-unit-virtualization:
diff --git a/meta-unit-kas/include/layers/meta-rockchip/conf.yml b/meta-unit-kas/include/layers/meta-rockchip/conf.yml
deleted file mode 100644
index ffc3d76..0000000
--- a/meta-unit-kas/include/layers/meta-rockchip/conf.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-header:
-  version: 20
-
-local_conf_header:
-  meta-rockchip: |
-    SERIAL_CONSOLES = "115200;ttyS2"
-    WIC_COMPRESSION_EXTENSION = ".xz"