Skip to contentSkip to conversation

arm: Remove unused !CONFIG_SPL_BUILD code in board_init_f()

PATCH New Tom Rini 4 participants 6 messages Nov 27, 2013 – Feb 13, 2014 Arm (32-bit)

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 arm: Remove unused !CONFIG_SPL_BUILD code in board_init_f()

Some code in board_init_f that dates back to the initial relocation support had if/else for PRELOADER (which became SPL_BUILD) about setting the stack pointer. But, board.c is never built for CONFIG_SPL_BUILD now, so this really makes no sense. Drop this section.

Cc Albert ARIBAUD <[email protected]>
---
 arch/arm/lib/board.c |    5 -----
 1 file changed, 5 deletions(-)
arch/arm/lib/board.c +0 -5
index 34f50b0..3c519a8 100644
@@ -377,7 +377,6 @@ void board_init_f(ulong bootflag)
 
 	debug("Reserving %ldk for U-Boot at: %08lx\n", gd->mon_len >> 10, addr);
 
-#ifndef CONFIG_SPL_BUILD
 	/*
 	 * reserve memory for malloc() arena
 	 */
@@ -431,10 +430,6 @@ void board_init_f(ulong bootflag)
 
 	/* 8-byte alignment for ABI compliance */
 	addr_sp &= ~0x07;
-#else
-	addr_sp += 128;	/* leave 32 words for abort-stack   */
-	gd->irq_sp = addr_sp;
-#endif
 	interrupt_init();
 
 	debug("New Stack Pointer is: %08lx\n", addr_sp);
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 arm: Remove unused !CONFIG_SPL_BUILD code in board_init_f()

Hello Tom, Albert.
(I'm CCing Simon)

Quoted 7 lines

Some code in board_init_f that dates back to the initial relocation support had if/else for PRELOADER (which became SPL_BUILD) about setting the stack pointer. But, board.c is never built for CONFIG_SPL_BUILD now, so this really makes no sense. Drop this section.

Cc Albert ARIBAUD <[email protected]>

Do you have any idea when ARM architecture can completely switch to the generic board?

If the generic board has the same behavior as arch/arm/lib/board.c, how about deleting arch/arm/lib/board.c rather than maintaining it.

Best Regards
Masahiro Yamada

#2 lore raw

PATCH 1/1 arm: Remove unused !CONFIG_SPL_BUILD code in board_init_f()

Hi,

Quoted 8 lines · Masahiro Yamada

Hello Tom, Albert.
(I'm CCing Simon)

Quoted 5 lines

Some code in board_init_f that dates back to the initial relocation support had if/else for PRELOADER (which became SPL_BUILD) about setting the stack pointer. But, board.c is never built for CONFIG_SPL_BUILD now, so this really makes no sense. Drop this section.

Quoted 9 lines
Quoted 2 lines
Cc Albert ARIBAUD <[email protected]>

Do you have any idea when ARM architecture can completely switch to the generic board?

If the generic board has the same behavior as arch/arm/lib/board.c, how about deleting arch/arm/lib/board.c rather than maintaining it.

We need to test a few more board types I think. Perhaps in the interim we could print a warning message that the old board.c is going away in 6 months?

Regards,
Simon

Quoted 6 lines

Best Regards
Masahiro Yamada

#3 lore raw

PATCH 1/1 arm: Remove unused !CONFIG_SPL_BUILD code in board_init_f()

Hello Simon.

Quoted 10 lines
Quoted 6 lines

Do you have any idea when ARM architecture can completely switch to the generic board?

If the generic board has the same behavior as arch/arm/lib/board.c, how about deleting arch/arm/lib/board.c rather than maintaining it.

We need to test a few more board types I think. Perhaps in the interim we could print a warning message that the old board.c is going away in 6 months?

Sounds good to me.

Best Regards
Masahiro Yamada

author
#4 lore raw

PATCH 1/1 arm: Remove unused !CONFIG_SPL_BUILD code in board_init_f()

In reply to Masahiro Yamada
Quoted 8 lines · Masahiro Yamada

Hello Tom, Albert.
(I'm CCing Simon)

Quoted 5 lines

Some code in board_init_f that dates back to the initial relocation support had if/else for PRELOADER (which became SPL_BUILD) about setting the stack pointer. But, board.c is never built for CONFIG_SPL_BUILD now, so this really makes no sense. Drop this section.

Quoted 8 lines
Quoted 2 lines
Cc Albert ARIBAUD <[email protected]>

Do you have any idea when ARM architecture can completely switch to the generic board?

If the generic board has the same behavior as arch/arm/lib/board.c, how about deleting arch/arm/lib/board.c rather than maintaining it.

I don't see a problem with doing it sometime in 2014. I did a test on am335x a while back and it all seemed to be just fine.

What I would like to see around then, and isn't trivial but should be doable, is making ARM's relocate_code take 3 args like everyone else does. It feels like it's just a matter of shifting a few lines of crt0.S's code into relocate.S and dealing with args being passed in.

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

PATCH 1/1 arm: Remove unused !CONFIG_SPL_BUILD code in board_init_f()

In reply to Tom Rini

Hi Tom,

Quoted 10 lines · Tom Rini

Some code in board_init_f that dates back to the initial relocation support had if/else for PRELOADER (which became SPL_BUILD) about setting the stack pointer. But, board.c is never built for CONFIG_SPL_BUILD now, so this really makes no sense. Drop this section.

Cc Albert ARIBAUD <[email protected]>
---
 arch/arm/lib/board.c |    5 -----
 1 file changed, 5 deletions(-)

This does not seem to apply cleanly, probably due to aarch64 rework. Can you please post a rebased v2?

Amicalement,

Signature · 1 line
Albert.