fix psplash loading and startup

psplash/initrd/usr/lib/systemd/system/basic.target.wants/psplash-start.service

@@ -0,0 +1 @@
+../psplash-start.service

psplash/initrd/usr/lib/systemd/system/psplash-start.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Start psplash boot splash screen
+DefaultDependencies=no
+RequiresMountsFor=/run
+After=systemd-modules-load.service
+
+[Service]
+Type=notify
+ExecStart=@/usr/bin/psplash @psplash
+RemainAfterExit=yes
+
+[Install]
+WantedBy=basic.target

snapcraft.yaml

@@ -37,6 +37,15 @@ parts:
         DESTDIR=${SNAPCRAFT_PART_INSTALL} \
         ARCH="$(dpkg-architecture -t $BUILD_ARCH_TRIPLET -q DEB_HOST_ARCH)" \
         ${OPTIONAL_ARGS:-}
+      # add handling of psplash.img to u-boot config
+      cp ${SNAPCRAFT_PART_SRC}/stage/bootscr.rpi ${SNAPCRAFT_PART_BUILD}/bootscr.rpi
+      sed -i \
+          -e '/setenv kernel_bootpart/a setenv psplash_file "psplash.img"\nsetenv psplash_part "1"' \
+          -e 's/setenv ramdisk_param "${.*/setenv ramdisk_size "${filesize}"\n      setenv ramdisk_param "${ramdisk_addr_r}:${ramdisk_size}"/g' \
+          -e '/for cmd in ${try_boot}; do/i \    if test -e ${devtype} ${devnum}:${psplash_part} ${psplash_file}; then setexpr psplash_addr ${ramdisk_addr_r} + 0x${ramdisk_size}; load ${devtype} ${devnum}:${psplash_part} ${psplash_addr} ${psplash_file}; setenv psplash_size "${filesize}"; setexpr ramdisk_size 0x${ramdisk_size} + 0x${psplash_size}; setenv ramdisk_param "${ramdisk_addr_r}:${ramdisk_size}"; fi' \
+          ${SNAPCRAFT_PART_BUILD}/bootscr.rpi
+      mkimage -A arm64 -O linux -T script -C none -n "boot script" \
+              -d ${SNAPCRAFT_PART_BUILD}/bootscr.rpi ${SNAPCRAFT_PART_INSTALL}/boot-assets/boot.scr
     prime:
       - boot-assets/*
       - uboot.conf
@@ -92,8 +101,8 @@ parts:
       ARCH=$(dpkg-architecture -t "${BUILD_ARCH_TRIPLET}" -q DEB_HOST_ARCH) make
       rm -rf $SNAPCRAFT_PART_INSTALL/usr
       cp -a $TREE/initrd .
-      mkdir -p initrd/bin
-      cp psplash initrd/bin
+      mkdir -p initrd/usr/bin
+      cp psplash initrd/usr/bin
       mkdir -p $SNAPCRAFT_PART_INSTALL/boot-assets
       cd initrd && find . | cpio --quiet -o -H newc | lz4 -9 -l >> \
         "${SNAPCRAFT_PART_INSTALL}/boot-assets/psplash.img"