From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-ee0-f42.google.com ([74.125.83.42]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U31sK-0008PK-DS for barebox@lists.infradead.org; Wed, 06 Feb 2013 10:05:09 +0000 Received: by mail-ee0-f42.google.com with SMTP id b47so591300eek.1 for ; Wed, 06 Feb 2013 02:05:06 -0800 (PST) Date: Wed, 6 Feb 2013 11:05:49 +0100 From: Alexander Aring Message-ID: <20130206100548.GA18648@x61s.8.8.8.8> References: <20130205175927.GD19322@game.jcrosoft.org> <1360087380-5700-1-git-send-email-plagnioj@jcrosoft.com> <1360087380-5700-3-git-send-email-plagnioj@jcrosoft.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1360087380-5700-3-git-send-email-plagnioj@jcrosoft.com> 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-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH 3/3] sama5d3: detect boot mode To: Jean-Christophe PLAGNIOL-VILLARD Cc: barebox@lists.infradead.org Hi, On Tue, Feb 05, 2013 at 07:03:00PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote: > and dynamised where we are stored > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD > --- > arch/arm/boards/sama5d3xek/init.c | 24 ++++++++++++++++-------- > 1 file changed, 16 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/boards/sama5d3xek/init.c b/arch/arm/boards/sama5d3xek/init.c > index 110a83f..165aaac 100644 > --- a/arch/arm/boards/sama5d3xek/init.c > +++ b/arch/arm/boards/sama5d3xek/init.c > @@ -36,6 +36,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -381,14 +382,21 @@ static int at91sama5d3xek_devices_init(void) > > armlinux_set_bootparams((void *)(SAMA5_DDRCS + 0x100)); > > - devfs_add_partition("nand0", 0x00000, SZ_256K, DEVFS_PARTITION_FIXED, "at91bootstrap_raw"); > - dev_add_bb_dev("at91bootstrap_raw", "at91bootstrap"); > - devfs_add_partition("nand0", SZ_256K, SZ_256K + SZ_128K, DEVFS_PARTITION_FIXED, "self_raw"); > - dev_add_bb_dev("self_raw", "self0"); > - devfs_add_partition("nand0", SZ_512K + SZ_256K, SZ_256K, DEVFS_PARTITION_FIXED, "env_raw"); > - dev_add_bb_dev("env_raw", "env0"); > - devfs_add_partition("nand0", SZ_1M, SZ_256K, DEVFS_PARTITION_FIXED, "env_raw1"); > - dev_add_bb_dev("env_raw1", "env1"); > + if (at91_boot_media_at25() && IS_ENABLED(CONFIG_DRIVER_SPI_ATMEL)) { I don't know, but is it better to use (at91_boot_media_at25() && at91_boot_from_spi()) instead of checking if SPI driver is enabled at compile time? Regards Alex > + devfs_add_partition("m25p0", 0x00000, SZ_64K, DEVFS_PARTITION_FIXED, "at91bootstrap_raw"); > + devfs_add_partition("m25p0", SZ_64K, SZ_256K + SZ_128K, DEVFS_PARTITION_FIXED, "self_raw"); > + devfs_add_partition("m25p0", SZ_64K + SZ_256K + SZ_128K, SZ_256K, DEVFS_PARTITION_FIXED, "env_raw"); > + devfs_add_partition("m25p0", SZ_64K + SZ_512K + SZ_128K, SZ_256K, DEVFS_PARTITION_FIXED, "env_raw1"); > + } else { > + devfs_add_partition("nand0", 0x00000, SZ_256K, DEVFS_PARTITION_FIXED, "at91bootstrap_raw"); > + dev_add_bb_dev("at91bootstrap_raw", "at91bootstrap"); > + devfs_add_partition("nand0", SZ_256K, SZ_256K + SZ_128K, DEVFS_PARTITION_FIXED, "self_raw"); > + dev_add_bb_dev("self_raw", "self0"); > + devfs_add_partition("nand0", SZ_512K + SZ_256K, SZ_256K, DEVFS_PARTITION_FIXED, "env_raw"); > + dev_add_bb_dev("env_raw", "env0"); > + devfs_add_partition("nand0", SZ_1M, SZ_256K, DEVFS_PARTITION_FIXED, "env_raw1"); > + dev_add_bb_dev("env_raw1", "env1"); > + } > > return 0; > } > -- > 1.7.10.4 > > > _______________________________________________ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox