Skip to contentSkip to conversation

arm: socfpga: make SPL_TEXT_BASE overridable

PATCH New Simon Goldschmidt 3 participants 9 messages Mar 15, 2019 – Mar 17, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: socfpga: make SPL_TEXT_BASE overridable

To boot from fpga on socfpga gen5, we need to set CONFIG_SPL_TEXT_BASE to 0xC0000000 (hps2fpgaslaves base address).

Since converting CONFIG_SPL_TEXT_BASE to Kconfig hasn't been successful so far, let's make this value overridable in socfpga_common.h, so that we can have different board configs override this in socfpga_common.h.

---

 include/configs/socfpga_common.h | 2 ++
 1 file changed, 2 insertions(+)
include/configs/socfpga_common.h +2 -0
index 181af9b646..191204b27b 100644
@@ -248,8 +248,10 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
  * 0xFFEz_zzzz ...... Malloc area (grows up to top)
  * 0xFFE3_FFFF ...... End of SRAM (top)
  */
+#ifndef CONFIG_SPL_TEXT_BASE
 #define CONFIG_SPL_TEXT_BASE		CONFIG_SYS_INIT_RAM_ADDR
 #define CONFIG_SPL_MAX_SIZE		CONFIG_SYS_INIT_RAM_SIZE
+#endif
 
 #if defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
 /* SPL memory allocation configuration, this is for FAT implementation */
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 arm: socfpga: make SPL_TEXT_BASE overridable

Quoted 8 lines · Simon Goldschmidt

To boot from fpga on socfpga gen5, we need to set CONFIG_SPL_TEXT_BASE to 0xC0000000 (hps2fpgaslaves base address).

Since converting CONFIG_SPL_TEXT_BASE to Kconfig hasn't been successful so far, let's make this value overridable in socfpga_common.h, so that we can have different board configs override this in socfpga_common.h.

Is this a fix for current release or new feature for next ?

Quoted 21 lines

---

 include/configs/socfpga_common.h | 2 ++
 1 file changed, 2 insertions(+)
include/configs/socfpga_common.h +2 -0
index 181af9b646..191204b27b 100644
@@ -248,8 +248,10 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
  * 0xFFEz_zzzz ...... Malloc area (grows up to top)
  * 0xFFE3_FFFF ...... End of SRAM (top)
  */
+#ifndef CONFIG_SPL_TEXT_BASE
 #define CONFIG_SPL_TEXT_BASE		CONFIG_SYS_INIT_RAM_ADDR
 #define CONFIG_SPL_MAX_SIZE		CONFIG_SYS_INIT_RAM_SIZE
+#endif
 
 #if defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
 /* SPL memory allocation configuration, this is for FAT implementation */
Signature · 2 lines
Best regards,
Marek Vasut
#2 lore raw

PATCH 1/1 arm: socfpga: make SPL_TEXT_BASE overridable

Am 15.03.2019 um 22:20 schrieb Marek Vasut:

Quoted 11 lines · Simon Goldschmidt
Quoted 8 lines

To boot from fpga on socfpga gen5, we need to set CONFIG_SPL_TEXT_BASE to 0xC0000000 (hps2fpgaslaves base address).

Since converting CONFIG_SPL_TEXT_BASE to Kconfig hasn't been successful so far, let's make this value overridable in socfpga_common.h, so that we can have different board configs override this in socfpga_common.h.

Is this a fix for current release or new feature for next ?

Yes, it's a fix for the current release. It's the only thing missing to *finally* get mainline SPL booting from FPGA (on socfpga gen5).

As written in the log, the original plan was to move CONFIG_SPL_TEXT_BASE to Kconfig completely, but that didn't work out (still), which is why we have to do it in a different way.

I could provide a new board config to boot from FPGA if you want, but that did not make much sense to me as the FPGA image would be missing...

Regards,
Simon

Quoted 24 lines
Quoted 22 lines

---

  include/configs/socfpga_common.h | 2 ++
  1 file changed, 2 insertions(+)
include/configs/socfpga_common.h +2 -0
index 181af9b646..191204b27b 100644
@@ -248,8 +248,10 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
   * 0xFFEz_zzzz ...... Malloc area (grows up to top)
   * 0xFFE3_FFFF ...... End of SRAM (top)
   */
+#ifndef CONFIG_SPL_TEXT_BASE
  #define CONFIG_SPL_TEXT_BASE		CONFIG_SYS_INIT_RAM_ADDR
  #define CONFIG_SPL_MAX_SIZE		CONFIG_SYS_INIT_RAM_SIZE
+#endif
 
  #if defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
  /* SPL memory allocation configuration, this is for FAT implementation */
#3 lore raw

PATCH 1/1 arm: socfpga: make SPL_TEXT_BASE overridable

Quoted 19 lines · Simon Goldschmidt

Am 15.03.2019 um 22:20 schrieb Marek Vasut:

Quoted 11 lines · Simon Goldschmidt
Quoted 10 lines

To boot from fpga on socfpga gen5, we need to set
CONFIG_SPL_TEXT_BASE to
0xC0000000 (hps2fpgaslaves base address).

Since converting CONFIG_SPL_TEXT_BASE to Kconfig hasn't been successful so
far, let's make this value overridable in socfpga_common.h, so that we can
have different board configs override this in socfpga_common.h.

Quoted 3 lines
Quoted 1 line

Is this a fix for current release or new feature for next ?

Yes, it's a fix for the current release. It's the only thing missing to *finally* get mainline SPL booting from FPGA (on socfpga gen5).

Quoted 6 lines

As written in the log, the original plan was to move CONFIG_SPL_TEXT_BASE to Kconfig completely, but that didn't work out (still), which is why we have to do it in a different way.

I could provide a new board config to boot from FPGA if you want, but that did not make much sense to me as the FPGA image would be missing...

Well, applied.

That said, do you plan to work on the Kconfig conversion further ? What's the problem there ?

Signature · 2 lines
Best regards,
Marek Vasut
#4 lore raw

PATCH 1/1 arm: socfpga: make SPL_TEXT_BASE overridable

Quoted 20 lines · Marek Vasut
Quoted 19 lines · Simon Goldschmidt

Am 15.03.2019 um 22:20 schrieb Marek Vasut:

Quoted 11 lines · Simon Goldschmidt
Quoted 10 lines

To boot from fpga on socfpga gen5, we need to set
CONFIG_SPL_TEXT_BASE to
0xC0000000 (hps2fpgaslaves base address).

Since converting CONFIG_SPL_TEXT_BASE to Kconfig hasn't been successful so
far, let's make this value overridable in socfpga_common.h, so that we can
have different board configs override this in socfpga_common.h.

Quoted 3 lines
Quoted 1 line

Is this a fix for current release or new feature for next ?

Yes, it's a fix for the current release. It's the only thing missing to *finally* get mainline SPL booting from FPGA (on socfpga gen5).

Quoted 8 lines
Quoted 6 lines

As written in the log, the original plan was to move CONFIG_SPL_TEXT_BASE to Kconfig completely, but that didn't work out (still), which is why we have to do it in a different way.

I could provide a new board config to boot from FPGA if you want, but that did not make much sense to me as the FPGA image would be missing...

Well, applied.

Thanks.

Quoted 3 lines

That said, do you plan to work on the Kconfig conversion further ? What's the problem there ?

I started that conversion (still in patchwork) but Tom said it produced errors
and he kind of took it further. I'm not really on track what's still missing.

But of course I would still prefer the Kconfig version instead of this #ifndef...

Regards,
Simon

Quoted 1 line
#5 lore raw

PATCH 1/1 arm: socfpga: make SPL_TEXT_BASE overridable

Quoted 47 lines · Simon Goldschmidt

On Saturday, March 16, 2019, Marek Vasut <[email protected] <mailto:[email protected]>> wrote:

On 3/16/19 9:23 AM, Simon Goldschmidt wrote:
> Am 15.03.2019 um 22:20 schrieb Marek Vasut:
>> On 3/15/19 8:44 PM, Simon Goldschmidt wrote:
>>> To boot from fpga on socfpga gen5, we need to set
>>> CONFIG_SPL_TEXT_BASE to
>>> 0xC0000000 (hps2fpgaslaves base address).
>>>
>>> Since converting CONFIG_SPL_TEXT_BASE to Kconfig hasn't been >>> successful so
>>> far, let's make this value overridable in socfpga_common.h, so that >>> we can
>>> have different board configs override this in socfpga_common.h. >>>
>>> Signed-off-by: Simon Goldschmidt <[email protected] <mailto:[email protected]>>
>>
>> Is this a fix for current release or new feature for next ? >
> Yes, it's a fix for the current release. It's the only thing missing to
> *finally* get mainline SPL booting from FPGA (on socfpga gen5). >
> As written in the log, the original plan was to move
> CONFIG_SPL_TEXT_BASE to Kconfig completely, but that didn't work out > (still), which is why we have to do it in a different way. >
> I could provide a new board config to boot from FPGA if you want, but > that did not make much sense to me as the FPGA image would be missing...

Well, applied.

Thanks.
Â

That said, do you plan to work on the Kconfig conversion further ? What's the problem there ?

Quoted 7 lines

I started that conversion (still in patchwork) but Tom said it produced errors
and he kind of took it further. I'm not really on track what's still missing.

But of course I would still prefer the Kconfig version instead of this #ifndef...

Always :)

Signature · 2 lines
Best regards,
Marek Vasut
#6 lore raw

PATCH 1/1 arm: socfpga: make SPL_TEXT_BASE overridable

Quoted 53 lines · Marek Vasut
Quoted 52 lines · Simon Goldschmidt

On Saturday, March 16, 2019, Marek Vasut <[email protected] <mailto:[email protected]>> wrote:

On 3/16/19 9:23 AM, Simon Goldschmidt wrote:
> Am 15.03.2019 um 22:20 schrieb Marek Vasut:
>> On 3/15/19 8:44 PM, Simon Goldschmidt wrote:
>>> To boot from fpga on socfpga gen5, we need to set
>>> CONFIG_SPL_TEXT_BASE to
>>> 0xC0000000 (hps2fpgaslaves base address).
>>>
>>> Since converting CONFIG_SPL_TEXT_BASE to Kconfig hasn't been >>> successful so
>>> far, let's make this value overridable in socfpga_common.h, so that >>> we can
>>> have different board configs override this in socfpga_common.h. >>>
>>> Signed-off-by: Simon Goldschmidt <[email protected] <mailto:[email protected]>>
>>
>> Is this a fix for current release or new feature for next ? >
> Yes, it's a fix for the current release. It's the only thing missing to
> *finally* get mainline SPL booting from FPGA (on socfpga gen5). >
> As written in the log, the original plan was to move
> CONFIG_SPL_TEXT_BASE to Kconfig completely, but that didn't work out > (still), which is why we have to do it in a different way. >
> I could provide a new board config to boot from FPGA if you want, but > that did not make much sense to me as the FPGA image would be missing...

Well, applied.

Thanks.

That said, do you plan to work on the Kconfig conversion further ? What's the problem there ?

I started that conversion (still in patchwork) but Tom said it produced errors
and he kind of took it further. I'm not really on track what's still missing.

Quoted 5 lines
Quoted 2 lines

But of course I would still prefer the Kconfig version instead of this #ifndef...

Always :)

What's the status here, Tom? Anything I can do? Should I try again now with my original approach of just using moveconfig.py?

Regards,
Simon

#7 lore raw

PATCH 1/1 arm: socfpga: make SPL_TEXT_BASE overridable

Quoted 55 lines · Simon Goldschmidt
Quoted 52 lines · Marek Vasut
Quoted 51 lines · Simon Goldschmidt

On Saturday, March 16, 2019, Marek Vasut <[email protected] <mailto:[email protected]>> wrote:

On 3/16/19 9:23 AM, Simon Goldschmidt wrote:
> Am 15.03.2019 um 22:20 schrieb Marek Vasut:
>> On 3/15/19 8:44 PM, Simon Goldschmidt wrote:
>>> To boot from fpga on socfpga gen5, we need to set
>>> CONFIG_SPL_TEXT_BASE to
>>> 0xC0000000 (hps2fpgaslaves base address).
>>>
>>> Since converting CONFIG_SPL_TEXT_BASE to Kconfig hasn't been >>> successful so
>>> far, let's make this value overridable in socfpga_common.h, so that >>> we can
>>> have different board configs override this in socfpga_common.h. >>>
>>> Signed-off-by: Simon Goldschmidt <[email protected] <mailto:[email protected]>>
>>
>> Is this a fix for current release or new feature for next ? >
> Yes, it's a fix for the current release. It's the only thing missing to
> *finally* get mainline SPL booting from FPGA (on socfpga gen5). >
> As written in the log, the original plan was to move
> CONFIG_SPL_TEXT_BASE to Kconfig completely, but that didn't work out > (still), which is why we have to do it in a different way. >
> I could provide a new board config to boot from FPGA if you want, but > that did not make much sense to me as the FPGA image would be missing...

Well, applied.

Thanks.

That said, do you plan to work on the Kconfig conversion further ? What's the problem there ?

I started that conversion (still in patchwork) but Tom said it produced errors
and he kind of took it further. I'm not really on track what's still missing.

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

But of course I would still prefer the Kconfig version instead of this #ifndef...

Always :)

What's the status here, Tom? Anything I can do? Should I try again now with my original approach of just using moveconfig.py?

My last try and migrating in turn ran into a reminder that I need to first redo the keystone stuff to not use CONFIG_SPL_TEXT_BASE the way it does in other cases and just use the value directly. Let me see if I can get that done..

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190317/c13f134b/attachment.sig>
#8 lore raw

PATCH 1/1 arm: socfpga: make SPL_TEXT_BASE overridable

Quoted 62 lines · Tom Rini
Quoted 61 lines · Simon Goldschmidt
Quoted 57 lines · Marek Vasut
Quoted 46 lines · Simon Goldschmidt

On Saturday, March 16, 2019, Marek Vasut <[email protected] <mailto:[email protected]>> wrote:

On 3/16/19 9:23 AM, Simon Goldschmidt wrote:
> Am 15.03.2019 um 22:20 schrieb Marek Vasut:
>> On 3/15/19 8:44 PM, Simon Goldschmidt wrote:
>>> To boot from fpga on socfpga gen5, we need to set
>>> CONFIG_SPL_TEXT_BASE to
>>> 0xC0000000 (hps2fpgaslaves base address).
>>>
>>> Since converting CONFIG_SPL_TEXT_BASE to Kconfig hasn't been >>> successful so
>>> far, let's make this value overridable in socfpga_common.h, so that >>> we can
>>> have different board configs override this in socfpga_common.h. >>>
>>> Signed-off-by: Simon Goldschmidt <[email protected] <mailto:[email protected]>>
>>
>> Is this a fix for current release or new feature for next ? >
> Yes, it's a fix for the current release. It's the only thing missing to
> *finally* get mainline SPL booting from FPGA (on socfpga gen5). >
> As written in the log, the original plan was to move
> CONFIG_SPL_TEXT_BASE to Kconfig completely, but that didn't work out > (still), which is why we have to do it in a different way. >
> I could provide a new board config to boot from FPGA if you want, but > that did not make much sense to me as the FPGA image would be missing...

Well, applied.

Thanks.

That said, do you plan to work on the Kconfig conversion further ? What's the problem there ?

Quoted 7 lines

I started that conversion (still in patchwork) but Tom said it produced errors
and he kind of took it further. I'm not really on track what's still missing.

But of course I would still prefer the Kconfig version instead of this #ifndef...

Always :)

Quoted 7 lines
Quoted 2 lines

What's the status here, Tom? Anything I can do? Should I try again now with my original approach of just using moveconfig.py?

My last try and migrating in turn ran into a reminder that I need to first redo the keystone stuff to not use CONFIG_SPL_TEXT_BASE the way it does in other cases and just use the value directly. Let me see if I can get that done..

It may have finally dawned on me that the OMAP2PLUS symbol CONFIG_ISW_ENTRY_ADDR should also be exposed to Keystone and used there to store the "SPL_TEXT_BASE" type address in the case where we don't actually enable SPL on these platforms. Testing that now, and then I can test migrating CONFIG_SPL_TEXT_BASE on top of that.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190317/4c7f8116/attachment.sig>