diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-10-30 23:41:26 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-10-30 23:41:27 +0300 |
commit | 6454e3733c050bf4ec43aae71b2dd22c8ca1b9b0 (patch) | |
tree | 7cfb2a8a0dbdcc7feafd7fbe1b2df2fd388a9696 /meta-raspberrypi/recipes-bsp | |
parent | 264cca34a30d8a2f6b440f757ee094cf6b04fbcc (diff) | |
download | openbmc-6454e3733c050bf4ec43aae71b2dd22c8ca1b9b0.tar.xz |
meta-raspberrypi: subtree update:6f85611576..09a3c11696
Eino Juhani Oltedal (1):
linux-raspberrypi: bump to Linux version 5.4.72
Khem Raj (2):
linux-raspberrypi: Fix build regression from last update
userland: Apply format-overflow warning patch for gcc alone
Marek Belisko (1):
u-boot: Fix booting raspberrypi CM3 module
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Iff5accc278e665d378b0776c8bdfdb7d62d4d773
Diffstat (limited to 'meta-raspberrypi/recipes-bsp')
-rw-r--r-- | meta-raspberrypi/recipes-bsp/u-boot/files/0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch | 51 | ||||
-rw-r--r-- | meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend | 3 |
2 files changed, 54 insertions, 0 deletions
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 new file mode 100644 index 0000000000..996ad10740 --- /dev/null +++ b/meta-raspberrypi/recipes-bsp/u-boot/files/0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch @@ -0,0 +1,51 @@ +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 7f38adb2df..cdfe5bb8ba 100644 --- a/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend @@ -4,6 +4,9 @@ SRC_URI_append_rpi = " \ file://fw_env.config \ " +# 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 () { |