[U-Boot] [PATCH] rockchip: rk3399: set fdtfile

Signed-off-by: Mark Kettenis kettenis@openbsd.org --- include/configs/rk3399_common.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index d700bf2549..9a5de3a7e3 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -59,6 +59,7 @@ #include <config_distro_bootcmd.h> #define CONFIG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ + "fdtfile=rockchip/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ "partitions=" PARTS_DEFAULT \ BOOTENV

Signed-off-by: Mark Kettenis kettenis@openbsd.org
include/configs/rk3399_common.h | 1 + 1 file changed, 1 insertion(+)
Acked-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com

On 17.03.2018, at 09:48, Mark Kettenis kettenis@openbsd.org wrote:
Signed-off-by: Mark Kettenis kettenis@openbsd.org Acked-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com
include/configs/rk3399_common.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index d700bf2549..9a5de3a7e3 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -59,6 +59,7 @@ #include <config_distro_bootcmd.h> #define CONFIG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \
- "fdtfile=rockchip/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ "partitions=" PARTS_DEFAULT \ BOOTENV
This assumes that the devicetree files in U-Boot and the OS are the same. As it’s our goal to keep Linux devicetrees in sync with U-Boot this patch should be fine in the long-term. But at the moment this only applies for rk3399-firefly (on Linux).
Mark, where would one find the devicetrees included in OpenBSD? I looked in sys/arch/amd64 but couldn’t find any.
Anyhow, I’m fine with that change.
Tested-by: Klaus Goger klaus.goger@theobroma-systems.com
— Klaus

On Mon, Mar 19, 2018 at 08:17:49AM +0100, klaus.goger@theobroma-systems.com wrote:
On 17.03.2018, at 09:48, Mark Kettenis kettenis@openbsd.org wrote:
Signed-off-by: Mark Kettenis kettenis@openbsd.org Acked-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com
include/configs/rk3399_common.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index d700bf2549..9a5de3a7e3 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -59,6 +59,7 @@ #include <config_distro_bootcmd.h> #define CONFIG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \
- "fdtfile=rockchip/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ "partitions=" PARTS_DEFAULT \ BOOTENV
This assumes that the devicetree files in U-Boot and the OS are the same. As it???s our goal to keep Linux devicetrees in sync with U-Boot this patch should be fine in the long-term. But at the moment this only applies for rk3399-firefly (on Linux).
Mark, where would one find the devicetrees included in OpenBSD? I looked in sys/arch/amd64 but couldn???t find any.
The ideal case is the firmware (U-Boot, EDK2 etc) supplies a device tree and resides on it's own storage. Then we could have single install images that work everywhere without having to distribute board specific U-Boot and dtb files.
As most arm systems aren't ideal there are ports/packages that build device trees from the linux source and package up those provided as part of raspberrypi-firmware.
https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/sysutils/dtb/ https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/sysutils/raspberrypi-firmwar...
Then there are some U-Boot targets with builtin device trees.
https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/sysutils/u-boot/ https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/sysutils/u-boot-pinebook/
The parts of the tree that build install images with U-Boot/dtbs:
https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/distrib/armv7/ https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/distrib/arm64/
Anyhow, I???m fine with that change.
Tested-by: Klaus Goger klaus.goger@theobroma-systems.com
??? Klaus
U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot

From: klaus.goger@theobroma-systems.com Date: Mon, 19 Mar 2018 08:17:49 +0100
On 17.03.2018, at 09:48, Mark Kettenis kettenis@openbsd.org wrote:
Signed-off-by: Mark Kettenis kettenis@openbsd.org Acked-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com
include/configs/rk3399_common.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index d700bf2549..9a5de3a7e3 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -59,6 +59,7 @@ #include <config_distro_bootcmd.h> #define CONFIG_EXTRA_ENV_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \
- "fdtfile=rockchip/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ "partitions=" PARTS_DEFAULT \ BOOTENV
This assumes that the devicetree files in U-Boot and the OS are the same. As it's our goal to keep Linux devicetrees in sync with U-Boot this patch should be fine in the long-term. But at the moment this only applies for rk3399-firefly (on Linux).
Hi Klaus,
As far as I understand things loading the "final" device tree passed to the OS (or EFI bootloader) from disk is more or less a generic "distro" boot feature. The device trees don't really need to be the same. As long as the final device tree has the right hooks for U-Boot to pass along things like Ethernet MAC addresses and framebuffer setup things should just work. This feature allows the device tree to be updated without recompiling U-Boot to include a new device tree.
I use this feature quite extensively on other boards to use the latest Linux mainline kernel device trees that often include additional devices or important fixes. I suppose on Linux systems GRUB has support for loading a new device tree. But in that case any changes made by U-Boot will be lost.
Mark, where would one find the devicetrees included in OpenBSD? I looked in sys/arch/amd64 but couldn'tfind any.
As Jonathan already indicated, we use the Linux device trees on OpenBSD.
Anyhow, I'm fine with that change.
Great!
Tested-by: Klaus Goger klaus.goger@theobroma-systems.com
Thanks!

Signed-off-by: Mark Kettenis kettenis@openbsd.org Acked-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com Tested-by: Klaus Goger klaus.goger@theobroma-systems.com
include/configs/rk3399_common.h | 1 + 1 file changed, 1 insertion(+)
Reviewed-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com

Signed-off-by: Mark Kettenis kettenis@openbsd.org Acked-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com Tested-by: Klaus Goger klaus.goger@theobroma-systems.com Reviewed-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com
include/configs/rk3399_common.h | 1 + 1 file changed, 1 insertion(+)
Applied to u-boot-rockchip, thanks!
participants (5)
-
Jonathan Gray
-
klaus.goger@theobroma-systems.com
-
Mark Kettenis
-
Mark Kettenis
-
Philipp Tomsich