diff options
| author | Stefan Roese <sr@denx.de> | 2016-01-28 17:34:40 +0100 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2016-02-05 12:47:20 +0800 |
| commit | 9f73690cebfd57ff713098da8604738dbaa688ce (patch) | |
| tree | ece1a304bb61d44062de694058cf548688c805ac /common | |
| parent | 94985cc9d3d7ed991ca8b2627d5894df5ea68f49 (diff) | |
| download | u-boot-9f73690cebfd57ff713098da8604738dbaa688ce.tar.gz u-boot-9f73690cebfd57ff713098da8604738dbaa688ce.tar.bz2 u-boot-9f73690cebfd57ff713098da8604738dbaa688ce.zip | |
autoboot.c: Fill env vars in process_fdt_options() only if TEXT_BASE is set
The x86 build target "efi-x86" has no TEXT_BASE configured. And with the
introduction of CONFIG_BOOTDELAY for x86, this function is now called
for this board as well. Resulting in compile errors for this target.
Without TEXT_BASE it makes no sense to fill these values. So lets only
configure the env variable if TEXT_BASE is defined.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/autoboot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/autoboot.c b/common/autoboot.c index c11fb31236..223e062740 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -287,7 +287,7 @@ static int abortboot(int bootdelay) static void process_fdt_options(const void *blob) { -#if defined(CONFIG_OF_CONTROL) +#if defined(CONFIG_OF_CONTROL) && defined(CONFIG_SYS_TEXT_BASE) ulong addr; /* Add an env variable to point to a kernel payload, if available */ @@ -299,7 +299,7 @@ static void process_fdt_options(const void *blob) addr = fdtdec_get_config_int(gd->fdt_blob, "rootdisk-offset", 0); if (addr) setenv_addr("rootaddr", (void *)(CONFIG_SYS_TEXT_BASE + addr)); -#endif /* CONFIG_OF_CONTROL */ +#endif /* CONFIG_OF_CONTROL && CONFIG_SYS_TEXT_BASE */ } const char *bootdelay_process(void) |