From: Thomas Chou Date: Fri, 16 Oct 2015 00:44:51 +0000 (+0800) Subject: env: export fdt_blob to the environment variable X-Git-Tag: v2016.01-rc1~160^2~1 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=545dfd101400637219b7024ce0fc02728663380e;p=oweals%2Fu-boot.git env: export fdt_blob to the environment variable Export fdt_blob to the environment variable. So that we may use it to boot Linux. Signed-off-by: Thomas Chou Acked-by: Simon Glass --- diff --git a/common/board_r.c b/common/board_r.c index f8c1baa949..0a4dfe4972 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -446,6 +446,9 @@ static int initr_env(void) env_relocate(); else set_default_env(NULL); +#ifdef CONFIG_OF_CONTROL + setenv_addr("fdtcontroladdr", gd->fdt_blob); +#endif /* Initialize from environment */ load_addr = getenv_ulong("loadaddr", 16, load_addr); diff --git a/doc/README.fdt-control b/doc/README.fdt-control index e6d5ed0bb6..29fd56a815 100644 --- a/doc/README.fdt-control +++ b/doc/README.fdt-control @@ -156,7 +156,10 @@ address of the fdt binary blob, and will override either of the options. Be aware that this environment variable is checked prior to relocation, when only the compiled-in environment is available. Therefore it is not possible to define this variable in the saved SPI/NAND flash -environment, for example (it will be ignored). +environment, for example (it will be ignored). After relocation, this +variable will be set to the address of the newly relocated fdt blob. +It is read-only and cannot be changed. It can optionally be used to +control the boot process of Linux with bootm/bootz commands. To use this, put something like this in your board header file: