diff mbox

[U-Boot,7/8] ARM: add missing CONFIG_SKIP_LOWLEVEL_INIT for armv7

Message ID 1307828812-14825-8-git-send-email-robherring2@gmail.com
State Accepted
Commit 22193540c174bd7140bc1af0021efedd8ab9da4a
Headers show

Commit Message

Rob Herring June 11, 2011, 9:46 p.m. UTC 
From: Rob Herring <rob.herring@calxeda.com>

cpu_init_crit can be skipped, but the code is still enabled requiring a
platform to supply lowlevel_init.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---
 arch/arm/cpu/armv7/start.S |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

Comments

Albert ARIBAUD July 17, 2011, 9:26 a.m. UTC | #1 
Hi Rob,

Le 11/06/2011 23:46, Rob Herring a écrit :
> From: Rob Herring<rob.herring@calxeda.com>
>
> cpu_init_crit can be skipped, but the code is still enabled requiring a
> platform to supply lowlevel_init.
>
> Signed-off-by: Rob Herring<rob.herring@calxeda.com>
> ---

Applied to u-boot-arm/master, thanks!

Amicalement,
diff mbox

Patch

diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
index d91ae12..ec54125 100644
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -275,6 +275,7 @@  _rel_dyn_end_ofs:
 _dynsym_start_ofs:
 	.word __dynsym_start - _start
 
+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
 /*************************************************************************
  *
  * CPU_init_critical registers
@@ -311,6 +312,7 @@  cpu_init_crit:
 	bl	lowlevel_init		@ go setup pll,mux,memory
 	mov	lr, ip			@ restore link
 	mov	pc, lr			@ back to my caller
+#endif
 /*
  *************************************************************************
  *