autoboot.c: Fill env vars in process_fdt_options() only if TEXT_BASE is set

PATCH New Stefan Roese 3 participants 7 messages Jan 28, 2016 – Jan 29, 2016

Share & tools

Stefan Roese

author

2016-01-28 16:34 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

Cc Simon Glass <[email protected]>

Cc Bin Meng <[email protected]>

Cc Tom Rini <[email protected]>

---
 common/autoboot.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

common/autoboot.c +2 -2

index c11fb31..223e062 100644
@@ -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)

Signature · 1 line

2.7.0

Simon Glass

2016-01-29 00:18 UTC #1 lore raw

PATCH 1/1 autoboot.c: Fill env vars in process_fdt_options() only if TEXT_BASE is set

Quoted 8 lines · Stefan Roese

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.

Quoted 7 lines

Signed-off-by Stefan Roese <[email protected]>
Cc Simon Glass <[email protected]>
Cc Bin Meng <[email protected]>
Cc Tom Rini <[email protected]>
---
 common/autoboot.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by Simon Glass <[email protected]>

Bin Meng

2016-01-29 08:43 UTC #2 lore raw

PATCH 1/1 autoboot.c: Fill env vars in process_fdt_options() only if TEXT_BASE is set

Quoted 18 lines · Simon Glass

Quoted 8 lines · Stefan Roese
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.
Quoted 7 lines
Signed-off-by Stefan Roese <[email protected]>
Cc Simon Glass <[email protected]>
Cc Bin Meng <[email protected]>
Cc Tom Rini <[email protected]>
---
 common/autoboot.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Quoted 1 line

Reviewed-by Simon Glass <[email protected]>

applied to u-boot-x86/master, thanks!

Bin Meng

2016-01-29 08:24 UTC #3 lore raw

PATCH 1/1 autoboot.c: Fill env vars in process_fdt_options() only if TEXT_BASE is set

In reply to Stefan Roese

Quoted 7 lines · Stefan Roese

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.

Quoted 8 lines

Signed-off-by Stefan Roese <[email protected]>
Cc Simon Glass <[email protected]>
Cc Bin Meng <[email protected]>
Cc Tom Rini <[email protected]>
---
 common/autoboot.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by Bin Meng <[email protected]>

Stefan Roese

author

2016-01-29 08:26 UTC #4 lore raw

PATCH 1/1 autoboot.c: Fill env vars in process_fdt_options() only if TEXT_BASE is set

Quoted 17 lines · Bin Meng

Quoted 7 lines · Stefan Roese
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.
Quoted 8 lines
Signed-off-by Stefan Roese <[email protected]>
Cc Simon Glass <[email protected]>
Cc Bin Meng <[email protected]>
Cc Tom Rini <[email protected]>
---
  common/autoboot.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

Quoted 1 line

Reviewed-by Bin Meng <[email protected]>

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

Bin Meng

2016-01-29 08:27 UTC #5 lore raw

PATCH 1/1 autoboot.c: Fill env vars in process_fdt_options() only if TEXT_BASE is set

Hi Stefan,

Quoted 20 lines · Stefan Roese

Quoted 19 lines · Bin Meng
Quoted 16 lines · Stefan Roese
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 <[email protected]>
Cc Simon Glass <[email protected]>
Cc Bin Meng <[email protected]>
Cc Tom Rini <[email protected]>
---
  common/autoboot.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

Quoted 7 lines

Quoted 1 line
Reviewed-by Bin Meng <[email protected]>
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

Stefan Roese

author

2016-01-29 08:31 UTC #6 lore raw

PATCH 1/1 autoboot.c: Fill env vars in process_fdt_options() only if TEXT_BASE is set

Quoted 26 lines · Bin Meng

Hi Stefan,
Quoted 23 lines · Stefan Roese
Quoted 20 lines · Bin Meng
Quoted 8 lines · Stefan Roese
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.
Quoted 8 lines
Signed-off-by Stefan Roese <[email protected]>
Cc Simon Glass <[email protected]>
Cc Bin Meng <[email protected]>
Cc Tom Rini <[email protected]>
---
   common/autoboot.c | 4 ++--
   1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by Bin Meng <[email protected]>

Quoted 6 lines

Quoted 4 lines
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.

Quoted 2 lines

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