forked from pool/u-boot
Guillaume GARDET
31045129c4
- Conditionalize pine64plus ATF support on uboot_atf_pine64 - u-boot-board.spec.in: Update license - Add poplar - Update to 2018.05 - Update to 2018.05-rc3 - Include u-boot.spec in autogeneration logic - Add support for .bif generation in mkimage - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches added: 0006-tools-zynqmpimage-Add-partition-rea.patch 0007-tools-zynqmpimage-Move-defines-to-h.patch 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch 0009-tools-zynqmpimage-Add-bif-support.patch 0010-tools-zynqmpbif-Add-support-for-loa.patch - Add generic ZynqMP support - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches added: 0005-zynqmp-Add-generic-target.patch - Update to 2018.05-rc2 - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches dropped: 0004-rpi3-Enable-lan78xx-driver.patch 0005-rpi-Add-identifier-for-the-new-RPi3.patch 0006-efi_loader-Fix-network-DP-with-DM_E.patch 0007-mkimage-do-not-fail-if-there-is-no-.patch 0008-rpi-Allow-to-boot-without-serial.patch 0009-mmc-use-core-clock-frequency-in-bcm.patch 0010-Temp-workaround-for-Chromebook-snow.patch * Patches added: 0004-Temp-workaround-for-Chromebook-snow.patch - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches added: 0010-Temp-workaround-for-Chromebook-snow.patch - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches dropped: 0009-rpi-Allow-to-boot-without-serial.patch 0010-mmc-use-core-clock-frequency-in-bcm.patch * Patches added: 0008-rpi-Allow-to-boot-without-serial.patch 0009-mmc-use-core-clock-frequency-in-bcm.patch - Update to 2018.05-rc1 - Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 * Patches dropped: 0003-Revert-rockchip-mkimage-remove-plac.patch 0004-rpi-Use-firmware-provided-device-tr.patch 0005-rpi3-Enable-lan78xx-driver.patch 0006-net-Only-access-network-devices-aft.patch 0007-rpi-Add-identifier-for-the-new-RPi3.patch 0008-efi_loader-Fix-network-DP-with-DM_E.patch * Patches added: 0003-rpi-Use-firmware-provided-device-tr.patch 0004-rpi3-Enable-lan78xx-driver.patch 0005-rpi-Add-identifier-for-the-new-RPi3.patch 0006-efi_loader-Fix-network-DP-with-DM_E.patch 0007-mkimage-do-not-fail-if-there-is-no-.patch OBS-URL: https://build.opensuse.org/request/show/607419 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=16
108 lines
3.6 KiB
Diff
108 lines
3.6 KiB
Diff
From 9f72e6e9b9a69eaec7e1ea2e70c63ad04ce755ba 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>
|
|
---
|
|
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 +-
|
|
include/configs/rpi.h | 2 +-
|
|
6 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig
|
|
index fcc2ae68c9..48b656cdb2 100644
|
|
--- a/configs/rpi_0_w_defconfig
|
|
+++ b/configs/rpi_0_w_defconfig
|
|
@@ -12,7 +12,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
-CONFIG_OF_EMBED=y
|
|
+CONFIG_OF_BOARD=y
|
|
CONFIG_ENV_FAT_INTERFACE="mmc"
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
|
|
index 204af74239..ed60fd96d8 100644
|
|
--- a/configs/rpi_2_defconfig
|
|
+++ b/configs/rpi_2_defconfig
|
|
@@ -12,7 +12,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
-CONFIG_OF_EMBED=y
|
|
+CONFIG_OF_BOARD=y
|
|
CONFIG_ENV_FAT_INTERFACE="mmc"
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
|
|
index 9e142cae63..465e97b662 100644
|
|
--- a/configs/rpi_3_32b_defconfig
|
|
+++ b/configs/rpi_3_32b_defconfig
|
|
@@ -13,7 +13,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
-CONFIG_OF_EMBED=y
|
|
+CONFIG_OF_BOARD=y
|
|
CONFIG_ENV_FAT_INTERFACE="mmc"
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
|
|
index f46e504497..cbae3d198b 100644
|
|
--- a/configs/rpi_3_defconfig
|
|
+++ b/configs/rpi_3_defconfig
|
|
@@ -13,7 +13,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
-CONFIG_OF_EMBED=y
|
|
+CONFIG_OF_BOARD=y
|
|
CONFIG_ENV_FAT_INTERFACE="mmc"
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
|
|
index 82c90d40e1..916b6df5a6 100644
|
|
--- a/configs/rpi_defconfig
|
|
+++ b/configs/rpi_defconfig
|
|
@@ -12,7 +12,7 @@ CONFIG_SYS_PROMPT="U-Boot> "
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
-CONFIG_OF_EMBED=y
|
|
+CONFIG_OF_BOARD=y
|
|
CONFIG_ENV_FAT_INTERFACE="mmc"
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
diff --git a/include/configs/rpi.h b/include/configs/rpi.h
|
|
index 69a22e1700..8b21453d78 100644
|
|
--- a/include/configs/rpi.h
|
|
+++ b/include/configs/rpi.h
|
|
@@ -123,7 +123,7 @@
|
|
#define ENV_MEM_LAYOUT_SETTINGS \
|
|
"fdt_high=ffffffff\0" \
|
|
"initrd_high=ffffffff\0" \
|
|
- "fdt_addr_r=0x00000100\0" \
|
|
+ "fdt_addr_r=0x01f00000\0" \
|
|
"pxefile_addr_r=0x00100000\0" \
|
|
"kernel_addr_r=0x01000000\0" \
|
|
"scriptaddr=0x02000000\0" \
|