From mboxrd@z Thu Jan 1 00:00:00 1970 From: Albert ARIBAUD Date: Sun, 19 Feb 2012 10:07:15 +0100 Subject: [U-Boot] [PATCH v6 1/7] arm, davinci: Add lowlevel_init for SoCs other than DM644X In-Reply-To: <1328179482-4344-2-git-send-email-christian.riesch@omicron.at> References: <1328179482-4344-1-git-send-email-christian.riesch@omicron.at> <1328179482-4344-2-git-send-email-christian.riesch@omicron.at> Message-ID: <4F40BBC3.8050103@aribaud.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Christian, Le 02/02/2012 11:44, Christian Riesch a ?crit : > The low level initialization code in > arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S was written for > DM644X SoCs only. This patch makes the lowlevel_init function in this > file a dummy function for SoCs other than DM644X. > > Signed-off-by: Christian Riesch > Cc: Tom Rini > Cc: Sergey Kubushyn > Acked-by: Heiko Schocher > Tested-by: Heiko Schocher > --- > arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S b/arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S > index 7a169b1..5b39484 100644 > --- a/arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S > +++ b/arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S > @@ -49,6 +49,7 @@ > > .globl lowlevel_init > lowlevel_init: > +#ifdef CONFIG_SOC_DM644X > > /*-------------------------------------------------------* > * Mask all IRQs by setting all bits in the EINT default * > @@ -707,3 +708,6 @@ DDR2_START_ADDR: > .word 0x80000000 > DUMMY_VAL: > .word 0xa55aa55a > +#else /* CONFIG_SOC_DM644X */ > + mov pc, lr > +#endif Nitpicking here, but: I don't link the "mov pc, lr" added in #else while it already exists in the #if part. Can we have a cleaner pair of #if/#else/#endif sections, one for code, ending right *before* the 'mov pc,lr' and one for the literals that follow it? Amicalement, -- Albert.