forked from pool/u-boot
Guillaume GARDET
bbcbfca128
OBS-URL: https://build.opensuse.org/request/show/923181 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=153
95 lines
3.1 KiB
Diff
95 lines
3.1 KiB
Diff
From 0156cd76f4468bb145508b9f90fa6afe0e279edb 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 | 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 d17e102052..e5cd7d4913 100644
|
|
--- a/configs/rpi_0_w_defconfig
|
|
+++ b/configs/rpi_0_w_defconfig
|
|
@@ -17,7 +17,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_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 8b8affb777..8bda6e6aa9 100644
|
|
--- a/configs/rpi_2_defconfig
|
|
+++ b/configs/rpi_2_defconfig
|
|
@@ -17,7 +17,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_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 b867b7fa7b..370495c9e4 100644
|
|
--- a/configs/rpi_3_32b_defconfig
|
|
+++ b/configs/rpi_3_32b_defconfig
|
|
@@ -18,7 +18,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_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 3cebd657da..bb0a7ebcd5 100644
|
|
--- a/configs/rpi_3_defconfig
|
|
+++ b/configs/rpi_3_defconfig
|
|
@@ -18,7 +18,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_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 af2189b8fe..f6517eb52a 100644
|
|
--- a/configs/rpi_defconfig
|
|
+++ b/configs/rpi_defconfig
|
|
@@ -17,7 +17,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_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|