summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2016-12-02 12:26:42 -0700
committerTom Warren <twarren@nvidia.com>2017-01-03 10:34:13 -0700
commita182e69d794f0e61756fcc5de8fd05cc30c98b67 (patch)
treeaf6b224d539bee5975ccb5fbd8657d25cf37008d /arch
parent87f5f5417fc897df0b05826b408f0f4b7d2ee388 (diff)
downloadu-boot-imx-a182e69d794f0e61756fcc5de8fd05cc30c98b67.zip
u-boot-imx-a182e69d794f0e61756fcc5de8fd05cc30c98b67.tar.gz
u-boot-imx-a182e69d794f0e61756fcc5de8fd05cc30c98b67.tar.bz2
ARM: tegra: allow passing cboot DTB to the kernel
Some users may wish to pass the cboot-supplied DTB to the booted kernel rather than having U-Boot load the DTB itself. To allow this, expose the address of the cboot-supplied DTB in environment variable $fdt_addr. At least when using extlinux.conf, if the user doesn't explicitly specify which DTB to pass to the kernel, U-Boot passes the DTB referred to by this variable. Signed-off-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Warren <twarren@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/tegra186/nvtboot_board.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/tegra186/nvtboot_board.c b/arch/arm/mach-tegra/tegra186/nvtboot_board.c
index 1d78346..feb935f 100644
--- a/arch/arm/mach-tegra/tegra186/nvtboot_board.c
+++ b/arch/arm/mach-tegra/tegra186/nvtboot_board.c
@@ -11,6 +11,19 @@
extern unsigned long nvtboot_boot_x0;
+static int set_fdt_addr(void)
+{
+ int ret;
+
+ ret = setenv_hex("fdt_addr", nvtboot_boot_x0);
+ if (ret) {
+ printf("Failed to set fdt_addr to point at DTB: %d\n", ret);
+ return ret;
+ }
+
+ return 0;
+}
+
/*
* Attempt to use /chosen/nvidia,ether-mac in the nvtboot DTB to U-Boot's
* ethaddr environment variable if possible.
@@ -47,6 +60,11 @@ static int set_ethaddr_from_nvtboot(void)
int tegra_soc_board_init_late(void)
{
+ /*
+ * Ignore errors here; the value may not be used depending on
+ * extlinux.conf or boot script content.
+ */
+ set_fdt_addr();
/* Ignore errors here; not all cases care about Ethernet addresses */
set_ethaddr_from_nvtboot();