[U-Boot,v5,07/18] socfpga: boot0 hook: adjust to unified boot0 semantics

Message ID 1507645279-25188-8-git-send-email-philipp.tomsich@theobroma-systems.com
State Accepted
Delegated to: Philipp Tomsich
Headers show
Series
  • rockchip: back-to-bootrom: replace assembly-implementation with C-code
Related show

Commit Message

Philipp Tomsich Oct. 10, 2017, 2:21 p.m.
With the updated boot0 semantics (i.e. giving the boot0-hook control
over when and where the vector table is emitted), the boot0-hook for
the socfpga needs to be adjusted.

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
---

Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None

 arch/arm/mach-socfpga/include/mach/boot0.h | 3 +++
 1 file changed, 3 insertions(+)

Comments

Philipp Tomsich Nov. 6, 2017, 5:26 p.m. | #1
Marek & Tien Fong,

could either of you have a look at the below change (in the context of
https://patchwork.ozlabs.org/patch/823872/, which is also contained in 
the same series) and give me an ok on this, so I can merge this series
early in the upcoming merge window?

Thanks,
Philipp.

> On 10 Oct 2017, at 16:21, Philipp Tomsich <philipp.tomsich@theobroma-systems.com> wrote:
> 
> With the updated boot0 semantics (i.e. giving the boot0-hook control
> over when and where the vector table is emitted), the boot0-hook for
> the socfpga needs to be adjusted.
> 
> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ---
> 
> Changes in v5: None
> Changes in v4: None
> Changes in v3: None
> Changes in v2: None
> 
> arch/arm/mach-socfpga/include/mach/boot0.h | 3 +++
> 1 file changed, 3 insertions(+)
> 
> diff --git a/arch/arm/mach-socfpga/include/mach/boot0.h b/arch/arm/mach-socfpga/include/mach/boot0.h
> index 22d9e7f..d6b9435 100644
> --- a/arch/arm/mach-socfpga/include/mach/boot0.h
> +++ b/arch/arm/mach-socfpga/include/mach/boot0.h
> @@ -7,6 +7,9 @@
> #ifndef __BOOT0_H
> #define __BOOT0_H
> 
> +_start:
> +	ARM_VECTORS
> +
> #ifdef CONFIG_SPL_BUILD
> 	.balignl 64,0xf33db33f;
> 
> -- 
> 2.1.4
>
Marek Vasut Nov. 6, 2017, 5:54 p.m. | #2
On 11/06/2017 06:26 PM, Dr. Philipp Tomsich wrote:
> Marek & Tien Fong,
> 
> could either of you have a look at the below change (in the context of
> https://patchwork.ozlabs.org/patch/823872/, which is also contained in 
> the same series) and give me an ok on this, so I can merge this series
> early in the upcoming merge window?

Please stop top-posting.

Does it still generate that structure at offset 0x40 in u-boot*sfp on
SoCFPGA ? If so, fine by me.

> Thanks,
> Philipp.
> 
>> On 10 Oct 2017, at 16:21, Philipp Tomsich <philipp.tomsich@theobroma-systems.com> wrote:
>>
>> With the updated boot0 semantics (i.e. giving the boot0-hook control
>> over when and where the vector table is emitted), the boot0-hook for
>> the socfpga needs to be adjusted.
>>
>> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
>> ---
>>
>> Changes in v5: None
>> Changes in v4: None
>> Changes in v3: None
>> Changes in v2: None
>>
>> arch/arm/mach-socfpga/include/mach/boot0.h | 3 +++
>> 1 file changed, 3 insertions(+)
>>
>> diff --git a/arch/arm/mach-socfpga/include/mach/boot0.h b/arch/arm/mach-socfpga/include/mach/boot0.h
>> index 22d9e7f..d6b9435 100644
>> --- a/arch/arm/mach-socfpga/include/mach/boot0.h
>> +++ b/arch/arm/mach-socfpga/include/mach/boot0.h
>> @@ -7,6 +7,9 @@
>> #ifndef __BOOT0_H
>> #define __BOOT0_H
>>
>> +_start:
>> +	ARM_VECTORS
>> +
>> #ifdef CONFIG_SPL_BUILD
>> 	.balignl 64,0xf33db33f;
>>
>> -- 
>> 2.1.4
>>
> 
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
>
Philipp Tomsich Nov. 6, 2017, 5:55 p.m. | #3
> On 6 Nov 2017, at 18:54, Marek Vasut <marek.vasut@gmail.com> wrote:
> 
> On 11/06/2017 06:26 PM, Dr. Philipp Tomsich wrote:
>> Marek & Tien Fong,
>> 
>> could either of you have a look at the below change (in the context of
>> https://patchwork.ozlabs.org/patch/823872/, which is also contained in 
>> the same series) and give me an ok on this, so I can merge this series
>> early in the upcoming merge window?
> 
> Please stop top-posting.
> 
> Does it still generate that structure at offset 0x40 in u-boot*sfp on
> SoCFPGA ? If so, fine by me.

Yes it does.
And the binary still looks the same around the magic offset.

Regards,
Philipp.

>> Thanks,
>> Philipp.
>> 
>>> On 10 Oct 2017, at 16:21, Philipp Tomsich <philipp.tomsich@theobroma-systems.com> wrote:
>>> 
>>> With the updated boot0 semantics (i.e. giving the boot0-hook control
>>> over when and where the vector table is emitted), the boot0-hook for
>>> the socfpga needs to be adjusted.
>>> 
>>> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
>>> ---
>>> 
>>> Changes in v5: None
>>> Changes in v4: None
>>> Changes in v3: None
>>> Changes in v2: None
>>> 
>>> arch/arm/mach-socfpga/include/mach/boot0.h | 3 +++
>>> 1 file changed, 3 insertions(+)
>>> 
>>> diff --git a/arch/arm/mach-socfpga/include/mach/boot0.h b/arch/arm/mach-socfpga/include/mach/boot0.h
>>> index 22d9e7f..d6b9435 100644
>>> --- a/arch/arm/mach-socfpga/include/mach/boot0.h
>>> +++ b/arch/arm/mach-socfpga/include/mach/boot0.h
>>> @@ -7,6 +7,9 @@
>>> #ifndef __BOOT0_H
>>> #define __BOOT0_H
>>> 
>>> +_start:
>>> +	ARM_VECTORS
>>> +
>>> #ifdef CONFIG_SPL_BUILD
>>> 	.balignl 64,0xf33db33f;
>>> 
>>> -- 
>>> 2.1.4
>>> 
>> 
>> _______________________________________________
>> U-Boot mailing list
>> U-Boot@lists.denx.de
>> https://lists.denx.de/listinfo/u-boot
>> 
> 
> 
> -- 
> Best regards,
> Marek Vasut
Marek Vasut Nov. 6, 2017, 5:57 p.m. | #4
On 11/06/2017 06:55 PM, Dr. Philipp Tomsich wrote:
> 
>> On 6 Nov 2017, at 18:54, Marek Vasut <marek.vasut@gmail.com> wrote:
>>
>> On 11/06/2017 06:26 PM, Dr. Philipp Tomsich wrote:
>>> Marek & Tien Fong,
>>>
>>> could either of you have a look at the below change (in the context of
>>> https://patchwork.ozlabs.org/patch/823872/, which is also contained in 
>>> the same series) and give me an ok on this, so I can merge this series
>>> early in the upcoming merge window?
>>
>> Please stop top-posting.
>>
>> Does it still generate that structure at offset 0x40 in u-boot*sfp on
>> SoCFPGA ? If so, fine by me.
> 
> Yes it does.
> And the binary still looks the same around the magic offset.

OK, fine by me then.
Chee, Tien Fong Nov. 7, 2017, 4:46 a.m. | #5
On Isn, 2017-11-06 at 18:57 +0100, Marek Vasut wrote:
> On 11/06/2017 06:55 PM, Dr. Philipp Tomsich wrote:

> > 

> > 

> > > 

> > > On 6 Nov 2017, at 18:54, Marek Vasut <marek.vasut@gmail.com>

> > > wrote:

> > > 

> > > On 11/06/2017 06:26 PM, Dr. Philipp Tomsich wrote:

> > > > 

> > > > Marek & Tien Fong,

> > > > 

> > > > could either of you have a look at the below change (in the

> > > > context of

> > > > https://patchwork.ozlabs.org/patch/823872/, which is also

> > > > contained inĀ 

> > > > the same series) and give me an ok on this, so I can merge this

> > > > series

> > > > early in the upcoming merge window?

> > > Please stop top-posting.

> > > 

> > > Does it still generate that structure at offset 0x40 in u-

> > > boot*sfp on

> > > SoCFPGA ? If so, fine by me.

> > Yes it does.

> > And the binary still looks the same around the magic offset.

> OK, fine by me then.

> 

Fine by me too.
Philipp Tomsich Nov. 7, 2017, 2:18 p.m. | #6
> With the updated boot0 semantics (i.e. giving the boot0-hook control
> over when and where the vector table is emitted), the boot0-hook for
> the socfpga needs to be adjusted.
> 
> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ---
> 
> Changes in v5: None
> Changes in v4: None
> Changes in v3: None
> Changes in v2: None
> 
>  arch/arm/mach-socfpga/include/mach/boot0.h | 3 +++
>  1 file changed, 3 insertions(+)
> 

Applied to u-boot-rockchip/next, thanks!

Patch

diff --git a/arch/arm/mach-socfpga/include/mach/boot0.h b/arch/arm/mach-socfpga/include/mach/boot0.h
index 22d9e7f..d6b9435 100644
--- a/arch/arm/mach-socfpga/include/mach/boot0.h
+++ b/arch/arm/mach-socfpga/include/mach/boot0.h
@@ -7,6 +7,9 @@ 
 #ifndef __BOOT0_H
 #define __BOOT0_H
 
+_start:
+	ARM_VECTORS
+
 #ifdef CONFIG_SPL_BUILD
 	.balignl 64,0xf33db33f;