diff options
Diffstat (limited to 'meta-raspberrypi/recipes-bsp')
3 files changed, 2 insertions, 56 deletions
diff --git a/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc b/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc index eca2664623..e5974e49d0 100644 --- a/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc +++ b/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc @@ -1,9 +1,9 @@ -RPIFW_DATE ?= "20220328" +RPIFW_DATE ?= "20220331" RPIFW_SRC_URI ?= "https://archive.raspberrypi.com/debian/pool/main/r/raspberrypi-firmware/raspberrypi-firmware_1.${RPIFW_DATE}.orig.tar.xz" RPIFW_S ?= "${WORKDIR}/raspberrypi-firmware-1.${RPIFW_DATE}" SRC_URI = "${RPIFW_SRC_URI}" -SRC_URI[sha256sum] = "8ab5949b9da1e2a2da18acc203946698737efe3e5d98286dcb7a8b0d0e92564e" +SRC_URI[sha256sum] = "8758f10797bd52a7373cc5b39bd46d0d9f882d501ccb9535a72a3fe8a8d329c3" PV = "${RPIFW_DATE}" diff --git a/meta-raspberrypi/recipes-bsp/u-boot/files/0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch b/meta-raspberrypi/recipes-bsp/u-boot/files/0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch deleted file mode 100644 index 996ad10740..0000000000 --- a/meta-raspberrypi/recipes-bsp/u-boot/files/0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 336d86ebd146905cf4384912f4f27699b6e37c72 Mon Sep 17 00:00:00 2001 -From: Simon Glass <sjg@chromium.org> -Date: Sun, 29 Dec 2019 21:19:17 -0700 -Subject: [PATCH] dm: core: Move ofdata_to_platdata() call earlier - -This method is supposed to extract platform data from the device tree. It -should be done before the device itself is probed. Move it earlier in the -device_probe() function. - -Upstream-Status: Backport - -Signed-off-by: Simon Glass <sjg@chromium.org> ---- - drivers/core/device.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/drivers/core/device.c b/drivers/core/device.c -index 4e03708..291ff4c 100644 ---- a/drivers/core/device.c -+++ b/drivers/core/device.c -@@ -375,6 +375,13 @@ int device_probe(struct udevice *dev) - return 0; - } - -+ if (drv->ofdata_to_platdata && -+ (CONFIG_IS_ENABLED(OF_PLATDATA) || dev_has_of_node(dev))) { -+ ret = drv->ofdata_to_platdata(dev); -+ if (ret) -+ goto fail; -+ } -+ - seq = uclass_resolve_seq(dev); - if (seq < 0) { - ret = seq; -@@ -411,13 +418,6 @@ int device_probe(struct udevice *dev) - goto fail; - } - -- if (drv->ofdata_to_platdata && -- (CONFIG_IS_ENABLED(OF_PLATDATA) || dev_has_of_node(dev))) { -- ret = drv->ofdata_to_platdata(dev); -- if (ret) -- goto fail; -- } -- - /* Only handle devices that have a valid ofnode */ - if (dev_of_valid(dev)) { - /* --- -2.7.4 - diff --git a/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend index 4587d3da91..e50acf5fb3 100644 --- a/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend @@ -6,9 +6,6 @@ SRC_URI:append:rpi = " \ SRC_URI:append:rpi = " file://0001-rpi-always-set-fdt_addr-with-firmware-provided-FDT-address.patch" -# special fix for raspberrypi-cm3 -SRC_URI:append:raspberrypi-cm3 = " file://0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch" - DEPENDS:append:rpi = " u-boot-default-script" do_install:append:rpi () { |