[U-Boot] [PATCH] nios2: use common sequence for reserve_uboot

[U-Boot] [PATCH] nios2: use common sequence for reserve_uboot

[Thomas Chou]

Use common sequence for reserve_uboot, as the result is
the same.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
---
 common/board_f.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/board_f.c b/common/board_f.c
index d88ada3..64c33b3 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -894,7 +894,7 @@ static init_fnc_t init_sequence_f[] = {
 	 *  - board info struct
 	 */
 	setup_dest_addr,
-#if defined(CONFIG_BLACKFIN) || defined(CONFIG_NIOS2)
+#if defined(CONFIG_BLACKFIN)
 	/* Blackfin u-boot monitor should be on top of the ram */
 	reserve_uboot,
 #endif
@@ -919,7 +919,7 @@ static init_fnc_t init_sequence_f[] = {
 		!defined(CONFIG_BLACKFIN) && !defined(CONFIG_M68K)
 	reserve_video,
 #endif
-#if !defined(CONFIG_BLACKFIN) && !defined(CONFIG_NIOS2)
+#if !defined(CONFIG_BLACKFIN)
 	reserve_uboot,
 #endif
 #ifndef CONFIG_SPL_BUILD
-- 
2.1.4

[U-Boot] [PATCH] nios2: use common sequence for reserve_uboot

[Marek Vasut]

On Tuesday, October 27, 2015 at 04:24:10 AM, Thomas Chou wrote:
> Use common sequence for reserve_uboot, as the result is
> the same.
> 
> Signed-off-by: Thomas Chou <thomas@wytron.com.tw>

Shouldn't we just implement relocation properly ?

Best regards,
Marek Vasut

[U-Boot] [PATCH] nios2: use common sequence for reserve_uboot

[Thomas Chou]

Hi Marek,

On 10/27/2015 05:07 PM, Marek Vasut wrote:
> On Tuesday, October 27, 2015 at 04:24:10 AM, Thomas Chou wrote:
>> Use common sequence for reserve_uboot, as the result is
>> the same.
>>
>> Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
>
> Shouldn't we just implement relocation properly ?

This patch is not quite related to relocation. It just says that nios2 
can use the same order (early or late) of init sequence about the 
reserve_uboot() call as most other archs. Only blackfin is special in this.

I did look into the relocation of nios2 a little. And realized that 
nios2 does not have the relative call instruction like ARM's "bl". It 
will be almost impossible to do relocation without support from 
compiler, eg, emulate the relative call. ><

Best regards,
Thomas

[U-Boot] [PATCH] nios2: use common sequence for reserve_uboot

[Marek Vasut]

On Tuesday, October 27, 2015 at 02:15:24 PM, Thomas Chou wrote:
> Hi Marek,

Hi,

> On 10/27/2015 05:07 PM, Marek Vasut wrote:
> > On Tuesday, October 27, 2015 at 04:24:10 AM, Thomas Chou wrote:
> >> Use common sequence for reserve_uboot, as the result is
> >> the same.
> >> 
> >> Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
> > 
> > Shouldn't we just implement relocation properly ?
> 
> This patch is not quite related to relocation. It just says that nios2
> can use the same order (early or late) of init sequence about the
> reserve_uboot() call as most other archs. Only blackfin is special in this.
> 
> I did look into the relocation of nios2 a little. And realized that
> nios2 does not have the relative call instruction like ARM's "bl". It
> will be almost impossible to do relocation without support from
> compiler, eg, emulate the relative call. ><

Ccing Albert, so he can comment on this.

Best regards,
Marek Vasut

[U-Boot] [PATCH] nios2: use common sequence for reserve_uboot

[Thomas Chou]

On 2015?10?27? 11:24, Thomas Chou wrote:
> Use common sequence for reserve_uboot, as the result is
> the same.
>
> Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
> ---
>   common/board_f.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>

Applied to u-boot-nios.

> diff --git a/common/board_f.c b/common/board_f.c
> index d88ada3..64c33b3 100644
> --- a/common/board_f.c
> +++ b/common/board_f.c
> @@ -894,7 +894,7 @@ static init_fnc_t init_sequence_f[] = {
>   	 *  - board info struct
>   	 */
>   	setup_dest_addr,
> -#if defined(CONFIG_BLACKFIN) || defined(CONFIG_NIOS2)
> +#if defined(CONFIG_BLACKFIN)
>   	/* Blackfin u-boot monitor should be on top of the ram */
>   	reserve_uboot,
>   #endif
> @@ -919,7 +919,7 @@ static init_fnc_t init_sequence_f[] = {
>   		!defined(CONFIG_BLACKFIN) && !defined(CONFIG_M68K)
>   	reserve_video,
>   #endif
> -#if !defined(CONFIG_BLACKFIN) && !defined(CONFIG_NIOS2)
> +#if !defined(CONFIG_BLACKFIN)
>   	reserve_uboot,
>   #endif
>   #ifndef CONFIG_SPL_BUILD
>