[U-Boot] [PATCH] armv7: only call save_boot_params for OMAP

Aneesh V aneesh at ti.com
Fri Sep 16 18:13:52 CEST 2011


Hi Simon,

On Friday 16 September 2011 09:02 PM, Simon Schwarz wrote:
> save_boot_params in start.S got called for all armv7 based cpus. Since the
> function relys on the OMAP specific bootloader this broke some boards
> (or to be specific added more errors to already broken ones). This patch
> wraps the call in #ifdef CONFIG_OMAP.

There is a weakly linked default function implemented in armv7/cpu.c.
So, there should not be any build break for u-boot builds.

However armv7/cpu.c is not included in an SPL build, so may cause
trouble for SPL build of non-OMAP boards. The solution for this problem
is the following:

--- a/arch/arm/cpu/armv7/Makefile
+++ b/arch/arm/cpu/armv7/Makefile
@@ -29,9 +29,9 @@ START := start.o

 ifndef CONFIG_SPL_BUILD
 COBJS  += cache_v7.o
-COBJS  += cpu.o
 endif

+COBJS  += cpu.o
 COBJS  += syslib.o

 SRCS   := $(START:.o=.S) $(COBJS:.o=.c)

Let me know if I am missing something.

best regards,
Aneesh


> 
> Signed-off-by: Simon Schwarz <simonschwarzcor at gmail.com>
> ---
>  arch/arm/cpu/armv7/start.S |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
> index db8e9d2..7cb380c 100644
> --- a/arch/arm/cpu/armv7/start.S
> +++ b/arch/arm/cpu/armv7/start.S
> @@ -134,7 +134,9 @@ IRQ_STACK_START_IN:
>   */
>  
>  reset:
> +#ifdef CONFIG_OMAP
>  	bl	save_boot_params
> +#endif
>  	/*
>  	 * set the cpu to SVC32 mode
>  	 */


More information about the U-Boot mailing list