[U-Boot] [PATCH] 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 --- common/autoboot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/autoboot.c b/common/autoboot.c index c11fb31..223e062 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)
On 28 January 2016 at 09:34, Stefan Roese sr@denx.de wrote:
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
common/autoboot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
On Fri, Jan 29, 2016 at 8:18 AM, Simon Glass sjg@chromium.org wrote:
On 28 January 2016 at 09:34, Stefan Roese sr@denx.de wrote:
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
common/autoboot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
applied to u-boot-x86/master, thanks!
On Fri, Jan 29, 2016 at 12:34 AM, Stefan Roese sr@denx.de wrote:
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
common/autoboot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
On 29.01.2016 09:24, Bin Meng wrote:
On Fri, Jan 29, 2016 at 12:34 AM, Stefan Roese sr@denx.de wrote:
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
common/autoboot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
Thanks Bin. Will you pick up the BOOTDELAY patch, once this patch arrives in mainline? Or will you include this into your x86 branch as well?
Thanks, Stefan
Hi Stefan,
On Fri, Jan 29, 2016 at 4:26 PM, Stefan Roese sr@denx.de wrote:
On 29.01.2016 09:24, Bin Meng wrote:
On Fri, Jan 29, 2016 at 12:34 AM, Stefan Roese sr@denx.de wrote:
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
common/autoboot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
Thanks Bin. Will you pick up the BOOTDELAY patch, once this patch arrives in mainline? Or will you include this into your x86 branch as well?
I will take this to the x86 branch. Do you plan to submit your new baytrail board patches for this release?
Regards, Bin
On 29.01.2016 09:27, Bin Meng wrote:
Hi Stefan,
On Fri, Jan 29, 2016 at 4:26 PM, Stefan Roese sr@denx.de wrote:
On 29.01.2016 09:24, Bin Meng wrote:
On Fri, Jan 29, 2016 at 12:34 AM, Stefan Roese sr@denx.de wrote:
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
common/autoboot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
Thanks Bin. Will you pick up the BOOTDELAY patch, once this patch arrives in mainline? Or will you include this into your x86 branch as well?
I will take this to the x86 branch.
Thanks.
Do you plan to submit your new baytrail board patches for this release?
Not sure yet. I'm still waiting for a confirmation that my DDR memory down parameters are "correct". It seems to be working, but I would like to get an ack from the board manufacturer here. So it might still be a few days until these board patches hit the mailing list.
Thanks, Stefan
participants (3)
-
Bin Meng -
Simon Glass -
Stefan Roese