Skip to content

Commit

Permalink
meta-raspberrypi: subtree update:6f85611576..09a3c11696
Browse files Browse the repository at this point in the history
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
geissonator committed Oct 30, 2020
1 parent 264cca3 commit 6454e37
Show file tree
Hide file tree
Showing 5 changed files with 59 additions and 71 deletions.
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

3 changes: 3 additions & 0 deletions meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand Down
3 changes: 3 additions & 0 deletions meta-raspberrypi/recipes-graphics/userland/userland_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ SRC_URI = "\
file://0020-openmaxil-add-pkg-config-file.patch \
file://0021-cmake-Disable-format-overflow-warning-as-error.patch \
"

SRC_URI_remove_toolchain-clang = "file://0021-cmake-Disable-format-overflow-warning-as-error.patch"

S = "${WORKDIR}/git"

inherit cmake pkgconfig
Expand Down

This file was deleted.

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 \
"

0 comments on commit 6454e37

Please sign in to comment.