e2bbdb9b35
*WARNING* Remove linked packages (u-boot-*) in hardware:boot *before* accepting this request! All issues from SR#714191 should have been considered here. - Fail on errors building RK3288 SD card images (tinker-rk3288 previously) - Add libretech-cc and libretech-ac OBS-URL: https://build.opensuse.org/request/show/717646 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=48
95 lines
3.2 KiB
Diff
95 lines
3.2 KiB
Diff
From d37361752684802eb2e180d0a382428f63b9e97e Mon Sep 17 00:00:00 2001
|
|
From: Alexander Graf <agraf@suse.de>
|
|
Date: Wed, 21 Feb 2018 17:41:13 +0100
|
|
Subject: [PATCH] rpi: Use firmware provided device tree
|
|
|
|
Currently the firmware generates a device tree for us that we could
|
|
just use to adjust ourselves. We then on boot throw that away and
|
|
use our own built-in device tree to configure device access.
|
|
|
|
This is bad for a multitude of reasons. For starters, it breaks
|
|
overlay support in config.txt, confusing users. Much worse however
|
|
is that we are stuck with individual U-Boot builds per board.
|
|
The firmware can easily give us the right DT depending on the
|
|
target board and revision though.
|
|
|
|
So let's use the firmware provided device tree instead. That way
|
|
U-Boot as well as payloads loaded by it can automatically adapt
|
|
to variants of RPi hardware.
|
|
|
|
Signed-off-by: Alexander Graf <agraf@suse.de>
|
|
Signed-off-by: Guillaume Gardet <guillaume.gardet@free.fr>
|
|
---
|
|
configs/rpi_0_w_defconfig | 2 +-
|
|
configs/rpi_2_defconfig | 2 +-
|
|
configs/rpi_3_32b_defconfig | 2 +-
|
|
configs/rpi_3_defconfig | 2 +-
|
|
configs/rpi_defconfig | 2 +-
|
|
5 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
|
|
index 1ab35f1b25..d26010efac 100644
|
|
--- a/configs/rpi_0_w_defconfig
|
|
+++ b/configs/rpi_0_w_defconfig
|
|
@@ -14,7 +14,7 @@ CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_FS_UUID=y
|
|
-CONFIG_OF_EMBED=y
|
|
+CONFIG_OF_BOARD=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-zero-w"
|
|
CONFIG_ENV_FAT_INTERFACE="mmc"
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
|
|
index 53aa554cc7..2b6bbf1b4b 100644
|
|
--- a/configs/rpi_2_defconfig
|
|
+++ b/configs/rpi_2_defconfig
|
|
@@ -14,7 +14,7 @@ CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_FS_UUID=y
|
|
-CONFIG_OF_EMBED=y
|
|
+CONFIG_OF_BOARD=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b"
|
|
CONFIG_ENV_FAT_INTERFACE="mmc"
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
|
|
index c33ea58438..c3fe878aa3 100644
|
|
--- a/configs/rpi_3_32b_defconfig
|
|
+++ b/configs/rpi_3_32b_defconfig
|
|
@@ -15,7 +15,7 @@ CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_FS_UUID=y
|
|
-CONFIG_OF_EMBED=y
|
|
+CONFIG_OF_BOARD=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b"
|
|
CONFIG_ENV_FAT_INTERFACE="mmc"
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
|
|
index 98573bb89a..6895228bdb 100644
|
|
--- a/configs/rpi_3_defconfig
|
|
+++ b/configs/rpi_3_defconfig
|
|
@@ -15,7 +15,7 @@ CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_FS_UUID=y
|
|
-CONFIG_OF_EMBED=y
|
|
+CONFIG_OF_BOARD=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b"
|
|
CONFIG_ENV_FAT_INTERFACE="mmc"
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
|
|
index bd15c98697..477a1bf789 100644
|
|
--- a/configs/rpi_defconfig
|
|
+++ b/configs/rpi_defconfig
|
|
@@ -14,7 +14,7 @@ CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_FS_UUID=y
|
|
-CONFIG_OF_EMBED=y
|
|
+CONFIG_OF_BOARD=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-b"
|
|
CONFIG_ENV_FAT_INTERFACE="mmc"
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|