From: Sascha Hauer <s.hauer@pengutronix.de>
To: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/1] omap: xload: switch to generic bootstrap
Date: Mon, 30 Sep 2013 10:06:02 +0200 [thread overview]
Message-ID: <20130930080602.GX30088@pengutronix.de> (raw)
In-Reply-To: <1380271641-23174-1-git-send-email-plagnioj@jcrosoft.com>
On Fri, Sep 27, 2013 at 10:47:21AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> diff --git a/arch/arm/mach-omap/xload.c b/arch/arm/mach-omap/xload.c
> dissimilarity index 76%
> index 3cce3f2..74a5f00 100644
> --- a/arch/arm/mach-omap/xload.c
> +++ b/arch/arm/mach-omap/xload.c
How is this patch generated? It's strange that this file is completely removed
and added again.
> +/*
> + * Replaces the default shell in xload configuration
> + */
> +static __noreturn int omap_xload(void)
> +{
> + int (*func)(void) = NULL;
> +
> + switch (bootsource_get()) {
> + case BOOTSOURCE_MMC:
> + printf("booting from MMC\n");
> + func = bootstrap_read_disk("disk0.0", "fat");
> + break;
> + case BOOTSOURCE_USB:
> + if (IS_ENABLED(CONFIG_FS_OMAP4_USBBOOT)) {
> + printf("booting from USB\n");
> + func = bootstrap_read_disk("omap4_usbboot", "omap4_usbbootfs");
> + break;
> + } else {
> + printf("booting from USB not enabled\n");
> + }
> + case BOOTSOURCE_NAND:
> + printf("booting from NAND\n");
> + func = bootstrap_read_devfs("nand0", true, SZ_128K, SZ_256K, SZ_1M);
> + break;
> + case BOOTSOURCE_SPI:
> + printf("booting from SPI\n");
> + func = bootstrap_read_devfs("m25p0", false, SZ_128K, SZ_256K, SZ_1M);
> + break;
> + default:
> + printf("unknown boot source. Fall back to nand\n");
> + func = bootstrap_read_devfs("nand0", true, SZ_128K, SZ_256K, SZ_1M);
> + break;
> + }
> +
> + bootstrap_boot(func, false);
This won't work anymore since the omap barebox function now takes an
argument which is currently not supported by the bootstrap code.
Sascha
--
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
prev parent reply other threads:[~2013-09-30 8:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-27 8:47 Jean-Christophe PLAGNIOL-VILLARD
2013-09-30 8:06 ` 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=20130930080602.GX30088@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=plagnioj@jcrosoft.com \
/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