diff options
author | Andrei Gherzan <andrei@gherzan.ro> | 2020-08-06 11:59:38 +0100 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.ro> | 2020-08-10 11:10:11 +0100 |
commit | 8258e733ea89b6ac1f65419a8baf42110b83fdbc (patch) | |
tree | 2cc84e5a711a7dede1a9bfb70480f96846bc6c5e | |
parent | 1b2c59808f5747e765212bc24810cc6f22eef67d (diff) | |
download | meta-raspberrypi-8258e733ea89b6ac1f65419a8baf42110b83fdbc.tar.gz |
Revert "u-boot: Fix booting raspberrypi CM3 module"
This reverts commit f20ccfa11db4c0d1608cf6f3e654d29c5bfc3dd3.
-rw-r--r-- | recipes-bsp/u-boot/u-boot/0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch | 51 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot_%.bbappend | 2 |
2 files changed, 0 insertions, 53 deletions
diff --git a/recipes-bsp/u-boot/u-boot/0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch b/recipes-bsp/u-boot/u-boot/0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch deleted file mode 100644 index 996ad10..0000000 --- a/recipes-bsp/u-boot/u-boot/0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | From 336d86ebd146905cf4384912f4f27699b6e37c72 Mon Sep 17 00:00:00 2001 | ||
2 | From: Simon Glass <sjg@chromium.org> | ||
3 | Date: Sun, 29 Dec 2019 21:19:17 -0700 | ||
4 | Subject: [PATCH] dm: core: Move ofdata_to_platdata() call earlier | ||
5 | |||
6 | This method is supposed to extract platform data from the device tree. It | ||
7 | should be done before the device itself is probed. Move it earlier in the | ||
8 | device_probe() function. | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | |||
12 | Signed-off-by: Simon Glass <sjg@chromium.org> | ||
13 | --- | ||
14 | drivers/core/device.c | 14 +++++++------- | ||
15 | 1 file changed, 7 insertions(+), 7 deletions(-) | ||
16 | |||
17 | diff --git a/drivers/core/device.c b/drivers/core/device.c | ||
18 | index 4e03708..291ff4c 100644 | ||
19 | --- a/drivers/core/device.c | ||
20 | +++ b/drivers/core/device.c | ||
21 | @@ -375,6 +375,13 @@ int device_probe(struct udevice *dev) | ||
22 | return 0; | ||
23 | } | ||
24 | |||
25 | + if (drv->ofdata_to_platdata && | ||
26 | + (CONFIG_IS_ENABLED(OF_PLATDATA) || dev_has_of_node(dev))) { | ||
27 | + ret = drv->ofdata_to_platdata(dev); | ||
28 | + if (ret) | ||
29 | + goto fail; | ||
30 | + } | ||
31 | + | ||
32 | seq = uclass_resolve_seq(dev); | ||
33 | if (seq < 0) { | ||
34 | ret = seq; | ||
35 | @@ -411,13 +418,6 @@ int device_probe(struct udevice *dev) | ||
36 | goto fail; | ||
37 | } | ||
38 | |||
39 | - if (drv->ofdata_to_platdata && | ||
40 | - (CONFIG_IS_ENABLED(OF_PLATDATA) || dev_has_of_node(dev))) { | ||
41 | - ret = drv->ofdata_to_platdata(dev); | ||
42 | - if (ret) | ||
43 | - goto fail; | ||
44 | - } | ||
45 | - | ||
46 | /* Only handle devices that have a valid ofnode */ | ||
47 | if (dev_of_valid(dev)) { | ||
48 | /* | ||
49 | -- | ||
50 | 2.7.4 | ||
51 | |||
diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index 9f40953..9ce6425 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend | |||
@@ -1,3 +1 @@ | |||
1 | DEPENDS_append_rpi = " u-boot-default-script" | DEPENDS_append_rpi = " u-boot-default-script" | |
2 | |||
3 | SRC_URI_append_raspberrypi-cm3 = " file://0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch" | ||