Remove graphics from radxa-zero-3e

5 files changed, 17 insertions, 23 deletions

diff --git a/meta-unit-core/dynamic-layers/rockchip/recipes-core/images/core-image-unit-initramfs.bbappend b/meta-unit-core/dynamic-layers/rockchip/recipes-core/images/core-image-unit-initramfs.bbappend
deleted file mode 100644
index 44afe60..0000000
--- a/meta-unit-core/dynamic-layers/rockchip/recipes-core/images/core-image-unit-initramfs.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
-PACKAGE_INSTALL:append:radxa-zero-3e = " \
-    initramfs-graphics-modules \
-    kernel-module-rockchipdrm \
-    kernel-module-dw-mipi-dsi \
-    kernel-module-dw-hdmi \
-    kernel-module-dw-hdmi-qp \
-    kernel-module-dw-hdmi-cec \
-    kernel-module-analogix-dp \
-    kernel-module-drm-display-helper \
-    kernel-module-drm-dma-helper \
-    kernel-module-drm-dp-aux-bus \
-    kernel-module-cec \
-    kernel-module-panfrost \
-    kernel-module-gpu-sched \
-"
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 40b5b97..e15bb89 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,2 +1 @@
 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-initramfs.bbappend b/meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-unit/images/core-image-unit-initramfs.bbappend
index 7fa4593..ecb622d 100644
--- a/meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-unit/images/core-image-unit-initramfs.bbappend
+++ b/meta-unit-core/dynamic-layers/unit-graphics-layer/recipes-unit/images/core-image-unit-initramfs.bbappend
@@ -1,2 +1,18 @@
 INITRAMFS_SCRIPTS:append = " initramfs-module-plymouth"
 INITRAMFS_SCRIPTS:append:beaglebone-yocto = " initramfs-module-plymouthsettle"
+
+PACKAGE_INSTALL:append:radxa-zero-3e = " \
+    initramfs-graphics-modules \
+    kernel-module-rockchipdrm \
+    kernel-module-dw-mipi-dsi \
+    kernel-module-dw-hdmi \
+    kernel-module-dw-hdmi-qp \
+    kernel-module-dw-hdmi-cec \
+    kernel-module-analogix-dp \
+    kernel-module-drm-display-helper \
+    kernel-module-drm-dma-helper \
+    kernel-module-drm-dp-aux-bus \
+    kernel-module-cec \
+    kernel-module-panfrost \
+    kernel-module-gpu-sched \
+"
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..98afc4b 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
@@ -2,6 +2,7 @@ inherit fix-kiosk-home-dir-ownership
 inherit mask-tty1-getty
 
 IMAGE_FEATURES:append = " hwcodecs"
+IMAGE_FEATURES:append:radxa-zero-3e = " boot-splash"
 
 IMAGE_INSTALL:append = " packagegroup-unit-kiosk"
 IMAGE_INSTALL:append = " ${@bb.utils.contains('IMAGE_FEATURES', 'splash', 'packagegroup-unit-splash', '', d)}"
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 5dcba21..867c7a7 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
@@ -17,8 +17,6 @@ header:
     - meta-unit-kas/include/layers/meta-openembedded/remote.yml
     - meta-unit-kas/include/layers/meta-virtualization/wrynose.yml
     - meta-unit-kas/include/layers/meta-virtualization/remote.yml
-    - meta-unit-kas/include/layers/meta-flutter/remote.yml
-    - meta-unit-kas/include/layers/meta-flutter/wrynose.yml
     - meta-unit-kas/include/layers/meta-unit-core/core-image-unit.yml
     - meta-unit-kas/include/layers/meta-unit-distro/unit-poky.yml
 
@@ -28,10 +26,6 @@ repos:
       meta-arm-toolchain:
       meta-arm:
       meta-arm-bsp:
-  meta-flutter:
-    layers:
-      .:
-      meta-flutter-apps:
   meta-openembedded:
     layers:
       meta-filesystems:
@@ -42,7 +36,6 @@ repos:
     layers:
       meta-unit-core:
       meta-unit-distro:
-      meta-unit-graphics:
       meta-unit-profiling:
       meta-unit-users:
       meta-unit-virtualization: