diff --git a/recipes-bsp/rpi-eeprom/files/0001-Fix-rpi-eeprom-update-when-using-busybox-find.patch b/recipes-bsp/rpi-eeprom/files/0001-Fix-rpi-eeprom-update-when-using-busybox-find.patch deleted file mode 100644 index b85be195b..000000000 --- a/recipes-bsp/rpi-eeprom/files/0001-Fix-rpi-eeprom-update-when-using-busybox-find.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 55ca589ab9e6e719c1e1f9fc72997d1643d28fe3 Mon Sep 17 00:00:00 2001 -From: Allan Xavier -Date: Thu, 12 Jan 2023 12:08:55 +0000 -Subject: [PATCH] Fix rpi-eeprom-update when using busybox find - -The busybox implementation of find does not detect recursive nested -symlinks, this results in it finding multiple instances of of_node -matching -samefile, the result of which then fails the -e path test. - -The of_node symlink we're tyring to find should match the path -/sys/bus/nvmem/devices/*/of_node so just limit the find depth to 3 as -there's no point searching deeper than that. - -Signed-off-by: Allan Xavier - -Upstream-Status: Backport [https://github.com/raspberrypi/rpi-eeprom/commit/55ca589ab9e6e719c1e1f9fc72997d1643d28fe3] ---- - rpi-eeprom-update | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rpi-eeprom-update b/rpi-eeprom-update -index 79eb3bf..cb25316 100755 ---- a/rpi-eeprom-update -+++ b/rpi-eeprom-update -@@ -126,7 +126,7 @@ getBootloaderConfig() { - - if [ -f "${blconfig_alias}" ]; then - local blconfig_ofnode_path="/sys/firmware/devicetree/base"$(strings "${blconfig_alias}")"" -- local blconfig_ofnode_link=$(find -L /sys/bus/nvmem -samefile "${blconfig_ofnode_path}" 2>/dev/null) -+ local blconfig_ofnode_link=$(find -L /sys/bus/nvmem -maxdepth 3 -samefile "${blconfig_ofnode_path}" 2>/dev/null) - - if [ -e "${blconfig_ofnode_link}" ]; then - blconfig_nvmem_path=$(dirname "${blconfig_ofnode_link}") --- -2.34.1 - diff --git a/recipes-bsp/rpi-eeprom/rpi-eeprom_git.bb b/recipes-bsp/rpi-eeprom/rpi-eeprom_git.bb index bf0d430ff..1f98f303e 100644 --- a/recipes-bsp/rpi-eeprom/rpi-eeprom_git.bb +++ b/recipes-bsp/rpi-eeprom/rpi-eeprom_git.bb @@ -6,11 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f546ed4f47e9d4c1fe954ecc9d3ef4f3" SRC_URI = " \ git://github.com/raspberrypi/rpi-eeprom.git;protocol=https;branch=master \ - file://0001-Fix-rpi-eeprom-update-when-using-busybox-find.patch \ " -SRCREV = "6e79e995bbc75c5fdd5305bd7fe029758cfade2f" -PV = "v2022.12.07-138a1" +SRCREV = "f13b5789f56f65112e2b8aa58be43ebfcbedfe1d" +PV = "v2023.10.18-2712" S = "${WORKDIR}/git" @@ -35,16 +34,15 @@ do_install() { install -m 0755 ${S}/rpi-eeprom-digest ${D}${bindir} # copy firmware files - install -d ${D}${base_libdir}/firmware/raspberrypi/bootloader/critical - install -d ${D}${base_libdir}/firmware/raspberrypi/bootloader/stable - install -d ${D}${base_libdir}/firmware/raspberrypi/bootloader/beta + install -d ${D}${base_libdir}/firmware/raspberrypi/bootloader/default + install -d ${D}${base_libdir}/firmware/raspberrypi/bootloader/latest - install -m 644 ${S}/firmware/critical/* ${D}${base_libdir}/firmware/raspberrypi/bootloader/critical - install -m 644 ${S}/firmware/stable/* ${D}${base_libdir}/firmware/raspberrypi/bootloader/stable - install -m 644 ${S}/firmware/beta/* ${D}${base_libdir}/firmware/raspberrypi/bootloader/beta + install -m 644 ${S}/firmware-2711/default/* ${D}${base_libdir}/firmware/raspberrypi/bootloader/default + install -m 644 ${S}/firmware-2711/latest/* ${D}${base_libdir}/firmware/raspberrypi/bootloader/latest - ln -s critical ${D}${base_libdir}/firmware/raspberrypi/bootloader/default - ln -s stable ${D}${base_libdir}/firmware/raspberrypi/bootloader/latest + ln -s default ${D}${base_libdir}/firmware/raspberrypi/bootloader/critical + ln -s latest ${D}${base_libdir}/firmware/raspberrypi/bootloader/stable + ln -s latest ${D}${base_libdir}/firmware/raspberrypi/bootloader/beta # copy default config install -d ${D}${sysconfdir}/default