u-boot/0003-rpi-Use-firmware-provided-device-tr.patch
Matthias Brugger 3f5ae570bf Accepting request 795564 from hardware👢staging
- Drop downstream zynqmp generic patches since zynqmp virt config
  superseed it:
Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2020.04
* Patches dropped:
  0005-zynqmp-Add-generic-target.patch
  0006-tools-zynqmpbif-Add-support-for-loa.patch
  0007-boo-1123170-Remove-ubifs-support-fr.patch
  0008-zynqmp-generic-fix-compilation.patch
  0009-boo-1144161-Remove-nand-mtd-spi-dfu.patch
  0010-Kconfig-add-btrfs-to-distro-boot.patch
  0011-configs-Re-sync-with-CONFIG_DISTRO_.patch
  0012-configs-am335x_evm-disable-BTRFS.patch
  0013-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch
  0014-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch
  0015-uboot-fs-btrfs-Fix-LZO-false-decomp.patch
* Patches added:
  0005-tools-zynqmpbif-Add-support-for-loa.patch
  0006-boo-1123170-Remove-ubifs-support-fr.patch
  0007-boo-1144161-Remove-nand-mtd-spi-dfu.patch
  0008-Kconfig-add-btrfs-to-distro-boot.patch
  0009-configs-Re-sync-with-CONFIG_DISTRO_.patch
  0010-configs-am335x_evm-disable-BTRFS.patch
  0011-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch
  0012-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch
  0013-uboot-fs-btrfs-Fix-LZO-false-decomp.patch
- Follow upstream commits f7c6ee7f and be1b6c32 to unify 
  zynq/zynqmp configs:
  * Update zynq configs to use generic config + device tree for
    u-boot-avnetultra96rev1 and u-boot-xilinxzynqmpzcu102rev10
  * Use upstream u-boot-xilinxzynqmpvirt instead of downstream
    u-boot-xilinxzynqmpgeneric
- Switch to http URLs, ftp is obsolete
- Update to v2020.04:
  * Platfrom fixes: Amlogic, Atmel, fsl, iMX, Marvell, Mediatek,
    rockchip, RPi, samsung, socfpga, sunxi, Tegra, TI
  * EFI fixes
  * I2C fixes
  * GPIO fixes
  * MMC fixes
  * SPI fixes
  * USB fixes
  * Filesystem fixes
Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2020.04
* Patches dropped:
  0010-ARM-tegra-Add-NVIDIA-Jetson-Nano-De.patch
  0011-net-Add-support-for-Broadcom-GENETv.patch
  0012-rpi4-Update-memory-map-to-accommoda.patch
  0013-rpi4-Enable-GENET-Ethernet-controll.patch
  0014-Kconfig-add-btrfs-to-distro-boot.patch
  0015-configs-Re-sync-with-CONFIG_DISTRO_.patch
  0016-configs-am335x_evm-disable-BTRFS.patch
  0017-net-phy-Fix-overlong-PHY-timeout.patch
  0018-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch
  0019-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch
  0020-uboot-fs-btrfs-Fix-LZO-false-decomp.patch
* Patches added:
  0010-Kconfig-add-btrfs-to-distro-boot.patch
  0011-configs-Re-sync-with-CONFIG_DISTRO_.patch
  0012-configs-am335x_evm-disable-BTRFS.patch
  0013-net-bcmgenet-Don-t-set-ID_MODE_DIS-.patch
  0014-uboot-fs-btrfs-Use-LZO_LEN-to-repla.patch
  0015-uboot-fs-btrfs-Fix-LZO-false-decomp.patch

OBS-URL: https://build.opensuse.org/request/show/795564
OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=96
2020-04-20 09:32:05 +00:00

95 lines
3.2 KiB
Diff

From 224598332df1ec7783e5abdecb72482c7715f81e 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 cecc16cbfc..17a10f1ccc 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 762a72a574..96236ab82f 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 5ca31648f9..2f7c233e93 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 51d5a717d5..a7e134fc48 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 dbbc818e14..1b88bb9255 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"