6a7ce76d4e
- Fix firefly-rk3288 and tinker-rk3288 by using TPL instead of SPL (SPL too big) - Fix mx6qsabrelite build - Update to v2020.01: * Now requires python 3.5+ (2.x support dropped) * Add Orange Pi Zero Plus 2 support * Platfrom fixes: atmel, fsl, imx, Marvell, RPi, rockchip, sunxi, TI * EFI fixes * I2C fixes * MMC fixes * SPI fixes * USB fixes - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2020.01 * Patches dropped: 0009-libfdt-fdt_address_cells-and-fdt_si.patch 0010-libfdt-return-correct-value-if-size.patch 0011-libfdt-Allow-size-cells-of-0.patch 0012-dm-Fix-default-address-cells-return.patch 0013-arm-arm11-allow-unaligned-memory-ac.patch 0014-fdt-fix-bcm283x-dm-pre-reloc-defini.patch 0015-arm-dts-bcm283x-Rename-U-Boot-file.patch 0016-drivers-bcm283x-Set-pre-location-fl.patch 0017-pinctrl-bcm283x-Add-compatible-for-.patch 0018-rpi-push-fw_dtb_pointer-in-the-.dat.patch 0019-ARM-bcm283x-Move-BCM283x_BASE-to-a-.patch 0020-ARM-bcm283x-Set-rpi_bcm283x_base-at.patch 0021-ARM-bcm283x-Set-memory-map-at-run-t.patch 0022-ARM-defconfig-add-unified-config-fo.patch 0023-boo-1144161-Remove-nand-mtd-spi-dfu.patch 0024-rpi-fix-dram-bank-initialization.patch 0025-rpi-Enable-DRAM-bank-initialization.patch 0026-ARM-defconfig-Fix-32bit-config-for-.patch * Patches added: 0009-boo-1144161-Remove-nand-mtd-spi-dfu.patch OBS-URL: https://build.opensuse.org/request/show/767934 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=76
95 lines
3.2 KiB
Diff
95 lines
3.2 KiB
Diff
From 741743044fdc2008ea45ac7f271daa567c4dd9f0 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 75c6c9c447..6e7fe71bbf 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_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 4e8204ef88..b5b7a08698 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_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 d50953287c..4b9f61b2b2 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_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 c0c0955131..ce7813fb1f 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_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 2f4c7da6dc..063ec9f196 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_DEFAULT_DEVICE_TREE="bcm2835-rpi-b"
|
|
CONFIG_ENV_FAT_INTERFACE="mmc"
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|