90 lines
3.0 KiB
Diff
90 lines
3.0 KiB
Diff
From 868ea4a7299092d598239efeeb2e5713f752bc7e Mon Sep 17 00:00:00 2001
|
|
From: Guillaume Gardet <guillaume.gardet@arm.com>
|
|
Date: Fri, 18 Sep 2020 15:27:37 +0200
|
|
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 | 1 +
|
|
configs/rpi_2_defconfig | 1 +
|
|
configs/rpi_3_32b_defconfig | 1 +
|
|
configs/rpi_3_defconfig | 1 +
|
|
configs/rpi_defconfig | 1 +
|
|
5 files changed, 5 insertions(+)
|
|
|
|
diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
|
|
index 98f8904c918..7d5c427c38e 100644
|
|
--- a/configs/rpi_0_w_defconfig
|
|
+++ b/configs/rpi_0_w_defconfig
|
|
@@ -24,6 +24,7 @@ CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_FS_UUID=y
|
|
+CONFIG_OF_BOARD=y
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
|
|
index 1b8676e1d10..2d351e838c9 100644
|
|
--- a/configs/rpi_2_defconfig
|
|
+++ b/configs/rpi_2_defconfig
|
|
@@ -25,6 +25,7 @@ CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_FS_UUID=y
|
|
+CONFIG_OF_BOARD=y
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
|
|
index abc10a79ada..d89106167d6 100644
|
|
--- a/configs/rpi_3_32b_defconfig
|
|
+++ b/configs/rpi_3_32b_defconfig
|
|
@@ -24,6 +24,7 @@ CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_FS_UUID=y
|
|
+CONFIG_OF_BOARD=y
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
|
|
index 9853c448809..c583132368f 100644
|
|
--- a/configs/rpi_3_defconfig
|
|
+++ b/configs/rpi_3_defconfig
|
|
@@ -23,6 +23,7 @@ CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_FS_UUID=y
|
|
+CONFIG_OF_BOARD=y
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
|
|
index 060a8809506..376637eaaff 100644
|
|
--- a/configs/rpi_defconfig
|
|
+++ b/configs/rpi_defconfig
|
|
@@ -24,6 +24,7 @@ CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_FS_UUID=y
|
|
+CONFIG_OF_BOARD=y
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|