diff --git a/recipes-bsp/u-boot/u-boot-distro-boot/raspberrypi4-64/boot.cmd.in b/recipes-bsp/u-boot/u-boot-distro-boot/raspberrypi4-64/boot.cmd.in
deleted file mode 100644
index 1bd30253..00000000
--- a/recipes-bsp/u-boot/u-boot-distro-boot/raspberrypi4-64/boot.cmd.in
+++ /dev/null
@@ -1,43 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+ OR MIT
-#
-# Copyright 2023 MicroHobby
-#
-# TorizonCore boot script.
-
-setenv bootlimit 3
-setenv devtype mmc
-setenv devnum 0
-setenv otaroot 2
-
-if test -z "${altbootcmd}"
-then
-    env set altbootcmd 'env set rollback 1; run bootcmd'
-    env save
-fi
-
-if test "${rollback}" = "1" && test "${upgrade_available}" = "1"
-then
-    # Make sure to reset upgrade_available to avoid unnecessary wear
-    # Note this also makes rollback permanent. aktualizr will reset rollback
-    # when a new (hopefully better) update comes in.
-    env set upgrade_available 0
-    env save
-fi
-
-# save default U-Boot devicetree file to use in a rollback situation
-env set fdtfile2 "${fdtfile}"
-
-if test -n "${loadaddr}"
-then
-    ext4load ${devtype} ${devnum}:${otaroot} ${loadaddr} /boot/loader/uEnv.txt; env import -t ${loadaddr} ${filesize}
-else
-    ext4load ${devtype} ${devnum}:${otaroot} ${scriptaddr} /boot/loader/uEnv.txt; env import -t ${scriptaddr} ${filesize}
-fi
-
-if test "${debug}" = "1"
-then
-    echo "Enabling kernel debug"
-    env set tdxargs "${tdxargs} rodata=off nokaslr maxcpus=1 kgdboc=ttyAMA0,115200"
-fi
-
-run bootcmd_run
diff --git a/recipes-bsp/u-boot/u-boot-distro-boot/raspberrypi3-64/boot.cmd.in b/recipes-bsp/u-boot/u-boot-distro-boot/rpi/boot.cmd.in
similarity index 100%
rename from recipes-bsp/u-boot/u-boot-distro-boot/raspberrypi3-64/boot.cmd.in
rename to recipes-bsp/u-boot/u-boot-distro-boot/rpi/boot.cmd.in
diff --git a/recipes-bsp/u-boot/u-boot-distro-boot/raspberrypi3-64/uEnv.txt.in b/recipes-bsp/u-boot/u-boot-distro-boot/rpi/uEnv.txt.in
similarity index 100%
rename from recipes-bsp/u-boot/u-boot-distro-boot/raspberrypi3-64/uEnv.txt.in
rename to recipes-bsp/u-boot/u-boot-distro-boot/rpi/uEnv.txt.in