mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Jan Luebbe <jlu@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] arm: omap: am33xx: store boot source info from ROM loader
Date: Fri, 19 Apr 2013 07:27:01 +0200	[thread overview]
Message-ID: <20130419052701.GH20989@pengutronix.de> (raw)
In-Reply-To: <1366204585-2626-1-git-send-email-jlu@pengutronix.de>

On Wed, Apr 17, 2013 at 03:16:25PM +0200, Jan Luebbe wrote:
> The ROM loader passes the address of a buffer to the MLO in
> register 0. Store this data so we can find the boot source later.
> 
> Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
>  
> +#ifdef CONFIG_ARCH_AM33XX
> +#include <mach/am33xx-generic.h>
> +#endif
> +
>  static void *read_image_head(const char *name)
>  {
>  	void *header = xmalloc(ARM_HEAD_SIZE);
> @@ -163,7 +167,8 @@ static void *omap4_xload_boot_usb(void){
>   */
>  static __noreturn int omap_xload(void)
>  {
> -	int (*func)(void) = NULL;
> +	int (*func)(void *) = NULL;
> +	uint32_t arg = 0;
>  
>  	switch (bootsource_get())
>  	{
> @@ -198,8 +203,11 @@ static __noreturn int omap_xload(void)
>  		while (1);
>  	}
>  
> +	if (IS_ENABLED(CONFIG_ARCH_AM33XX))
> +		arg = (uint32_t)&am33xx_bootinfo;
> +

I had to drop this one, it breaks compilation on omap based boards:

arch/arm/mach-omap/xload.c: In function 'omap_xload':
arch/arm/mach-omap/xload.c:207:20: error: 'am33xx_bootinfo' undeclared (first use in this function)
arch/arm/mach-omap/xload.c:207:20: note: each undeclared identifier is reported only once for each function it appears in
arch/arm/mach-omap/xload.c:210:2: warning: passing argument 1 of 'func' makes pointer from integer without a cast [enabled by default]
arch/arm/mach-omap/xload.c:210:2: note: expected 'void *' but argument is of type 'uint32_t'
make[1]: *** [arch/arm/mach-omap/xload.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [arch/arm/mach-omap] Error 2
make: *** Waiting for unfinished jobs....


-- 
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

      parent reply	other threads:[~2013-04-19  5:27 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-17 13:16 Jan Luebbe
2013-04-18  6:20 ` Sascha Hauer
2013-04-19  5:27 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130419052701.GH20989@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=jlu@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox