From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dpZeL-0000VA-RP for barebox@lists.infradead.org; Wed, 06 Sep 2017 12:41:56 +0000 Date: Wed, 6 Sep 2017 14:41:23 +0200 From: Sascha Hauer Message-ID: <20170906124123.vq4zz5tssgrrx46f@pengutronix.de> References: <20170707220621.GA28540@ravnborg.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170707220621.GA28540@ravnborg.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH 1/2] at91: sync mach/barebox-arm-head.h To: Sam Ravnborg Cc: Barebox List On Sat, Jul 08, 2017 at 12:06:21AM +0200, Sam Ravnborg wrote: > From 308f9f62554feaffaf3e2a0c7203e57b6fde8abc Mon Sep 17 00:00:00 2001 > From: Sam Ravnborg > Date: Fri, 7 Jul 2017 17:53:59 +0200 > Subject: [PATCH 1/2] at91: sync mach/barebox-arm-head.h > > To prepare for multi image support synch the barebox-arm-head.h > header with the arm version. > This include the reservation of a small area for board specific use > > Signed-off-by: Sam Ravnborg > --- > arch/arm/mach-at91/include/mach/barebox-arm-head.h | 18 +++++++++++++++--- > 1 file changed, 15 insertions(+), 3 deletions(-) > Applied, thanks Sascha > diff --git a/arch/arm/mach-at91/include/mach/barebox-arm-head.h b/arch/arm/mach-at91/include/mach/barebox-arm-head.h > index d4bb96f63..e0e07500a 100644 > --- a/arch/arm/mach-at91/include/mach/barebox-arm-head.h > +++ b/arch/arm/mach-at91/include/mach/barebox-arm-head.h > @@ -7,13 +7,13 @@ > #define AT91_EXV6 ".word _barebox_bare_init_size\n" > #endif > > -static inline void barebox_arm_head(void) > +static inline void __barebox_arm_head(void) > { > __asm__ __volatile__ ( > #ifdef CONFIG_THUMB2_BAREBOX > #error Thumb2 is not supported > #else > - "b barebox_arm_reset_vector\n" > + "b 2f\n" > "1: b 1b\n" > "1: b 1b\n" > "1: b 1b\n" > @@ -27,7 +27,19 @@ static inline void barebox_arm_head(void) > * barebox can skip relocation > */ > ".word _barebox_image_size\n" /* image size to copy */ > + ".rept 8\n" > + ".word 0x55555555\n" > + ".endr\n" > + "2:\n" > + ); > +} > + > +static inline void barebox_arm_head(void) > +{ > + __barebox_arm_head(); > + __asm__ __volatile__ ( > + "b barebox_arm_reset_vector\n" > ); > } > > -#endif /* __ASM_ARM_HEAD_H */ > +#endif /* __MACH_ARM_HEAD_H */ > -- > 2.12.0 > > > _______________________________________________ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox