forked from openbmc/openbmc
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 <[email protected]> Change-Id: Iff5accc278e665d378b0776c8bdfdb7d62d4d773
- Loading branch information
1 parent
264cca3
commit 6454e37
Showing
5 changed files
with
59 additions
and
71 deletions.
There are no files selected for viewing
51 changes: 51 additions & 0 deletions
51
...pberrypi/recipes-bsp/u-boot/files/0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
From 336d86ebd146905cf4384912f4f27699b6e37c72 Mon Sep 17 00:00:00 2001 | ||
From: Simon Glass <[email protected]> | ||
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 <[email protected]> | ||
--- | ||
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 0 additions & 68 deletions
68
...ecipes-kernel/linux/files/0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch
This file was deleted.
Oops, something went wrong.
5 changes: 2 additions & 3 deletions
5
meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.bb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,13 @@ | ||
LINUX_VERSION ?= "5.4.69" | ||
LINUX_VERSION ?= "5.4.72" | ||
LINUX_RPI_BRANCH ?= "rpi-5.4.y" | ||
|
||
SRCREV_machine = "31d364af258ff9754a1a9c7d8ea532da962797bd" | ||
SRCREV_machine = "154de7bbd5844a824a635d4f9e3f773c15c6ce11" | ||
SRCREV_meta = "5d52d9eea95fa09d404053360c2351b2b91b323b" | ||
|
||
require linux-raspberrypi_5.4.inc | ||
|
||
SRC_URI += "file://0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch \ | ||
file://0002-Revert-selftests-bpf-Fix-perf_buffer-test-on-systems.patch \ | ||
file://0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch \ | ||
file://powersave.cfg \ | ||
file://android-drivers.cfg \ | ||
" |