diff mbox

[U-Boot,3/6] arm: socfpga: de0-nano-soc: Enabling mtd partitioning layout

Message ID 1449825353-2568-3-git-send-email-clsee@altera.com
State Deferred
Delegated to: Marek Vasut
Headers show

Commit Message

Chin Liang See Dec. 11, 2015, 9:15 a.m. UTC 
Enabling mtd partitioning layout which indicate partition
for various boot partition

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
---
 include/configs/socfpga_de0_nano_soc.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

--
1.9.2.468.g3f0c02a

Comments

Marek Vasut Dec. 11, 2015, 2:21 p.m. UTC | #1 
On Friday, December 11, 2015 at 10:15:50 AM, Chin Liang See wrote:
> Enabling mtd partitioning layout which indicate partition
> for various boot partition
> 
> Signed-off-by: Chin Liang See <clsee@altera.com>
> Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
> Cc: Dinh Nguyen <dinh.linux@gmail.com>
> Cc: Pavel Machek <pavel@denx.de>
> Cc: Marek Vasut <marex@denx.de>
> Cc: Stefan Roese <sr@denx.de>
> ---
>  include/configs/socfpga_de0_nano_soc.h | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/include/configs/socfpga_de0_nano_soc.h
> b/include/configs/socfpga_de0_nano_soc.h index 16e146c..c42175d 100644
> --- a/include/configs/socfpga_de0_nano_soc.h
> +++ b/include/configs/socfpga_de0_nano_soc.h
> @@ -86,4 +86,16 @@
>  /* The rest of the configuration is shared */
>  #include <configs/socfpga_common.h>
> 
> +/* mtd partitioning for serial NOR flash */
> +#if defined(CONFIG_CMD_UBI) || defined(CONFIG_CMD_SF)
> +#define MTDPARTS_DEFAULT	"mtdparts=ff705000.spi:"\
> +				"256k(spl),"		\
> +				"64k(env),"		\
> +				"64k(dtb),"		\
> +				"256k(boot),"		\
> +				"16m(kernel),"		\
> +				"16m(rootfs),"		\
> +				"-(UBI)\0"
> +#endif

Does Atlas have a dedicated QSPI NOR ?

Best regards,
Marek Vasut
Dinh Nguyen Dec. 11, 2015, 3:43 p.m. UTC | #2 
On 12/11/2015 08:21 AM, Marek Vasut wrote:
> On Friday, December 11, 2015 at 10:15:50 AM, Chin Liang See wrote:
>> Enabling mtd partitioning layout which indicate partition
>> for various boot partition
>>
>> Signed-off-by: Chin Liang See <clsee@altera.com>
>> Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
>> Cc: Dinh Nguyen <dinh.linux@gmail.com>
>> Cc: Pavel Machek <pavel@denx.de>
>> Cc: Marek Vasut <marex@denx.de>
>> Cc: Stefan Roese <sr@denx.de>
>> ---
>>  include/configs/socfpga_de0_nano_soc.h | 12 ++++++++++++
>>  1 file changed, 12 insertions(+)
>>
>> diff --git a/include/configs/socfpga_de0_nano_soc.h
>> b/include/configs/socfpga_de0_nano_soc.h index 16e146c..c42175d 100644
>> --- a/include/configs/socfpga_de0_nano_soc.h
>> +++ b/include/configs/socfpga_de0_nano_soc.h
>> @@ -86,4 +86,16 @@
>>  /* The rest of the configuration is shared */
>>  #include <configs/socfpga_common.h>
>>
>> +/* mtd partitioning for serial NOR flash */
>> +#if defined(CONFIG_CMD_UBI) || defined(CONFIG_CMD_SF)
>> +#define MTDPARTS_DEFAULT	"mtdparts=ff705000.spi:"\
>> +				"256k(spl),"		\
>> +				"64k(env),"		\
>> +				"64k(dtb),"		\
>> +				"256k(boot),"		\
>> +				"16m(kernel),"		\
>> +				"16m(rootfs),"		\
>> +				"-(UBI)\0"
>> +#endif
> 
> Does Atlas have a dedicated QSPI NOR ?
> 

No, it does not.

Dinh
Marek Vasut Dec. 11, 2015, 5:36 p.m. UTC | #3 
On Friday, December 11, 2015 at 04:43:19 PM, Dinh Nguyen wrote:
> On 12/11/2015 08:21 AM, Marek Vasut wrote:
> > On Friday, December 11, 2015 at 10:15:50 AM, Chin Liang See wrote:
> >> Enabling mtd partitioning layout which indicate partition
> >> for various boot partition
> >> 
> >> Signed-off-by: Chin Liang See <clsee@altera.com>
> >> Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
> >> Cc: Dinh Nguyen <dinh.linux@gmail.com>
> >> Cc: Pavel Machek <pavel@denx.de>
> >> Cc: Marek Vasut <marex@denx.de>
> >> Cc: Stefan Roese <sr@denx.de>
> >> ---
> >> 
> >>  include/configs/socfpga_de0_nano_soc.h | 12 ++++++++++++
> >>  1 file changed, 12 insertions(+)
> >> 
> >> diff --git a/include/configs/socfpga_de0_nano_soc.h
> >> b/include/configs/socfpga_de0_nano_soc.h index 16e146c..c42175d 100644
> >> --- a/include/configs/socfpga_de0_nano_soc.h
> >> +++ b/include/configs/socfpga_de0_nano_soc.h
> >> @@ -86,4 +86,16 @@
> >> 
> >>  /* The rest of the configuration is shared */
> >>  #include <configs/socfpga_common.h>
> >> 
> >> +/* mtd partitioning for serial NOR flash */
> >> +#if defined(CONFIG_CMD_UBI) || defined(CONFIG_CMD_SF)
> >> +#define MTDPARTS_DEFAULT	"mtdparts=ff705000.spi:"\
> >> +				"256k(spl),"		\
> >> +				"64k(env),"		\
> >> +				"64k(dtb),"		\
> >> +				"256k(boot),"		\
> >> +				"16m(kernel),"		\
> >> +				"16m(rootfs),"		\
> >> +				"-(UBI)\0"
> >> +#endif
> > 
> > Does Atlas have a dedicated QSPI NOR ?
> 
> No, it does not.

Do you now understand why I have every single mainline SoCFPGA board in my
collection and why I am eagerly waiting for my first Arria 10 project ? :)

Best regards,
Marek Vasut
Chin Liang See Dec. 12, 2015, 12:01 a.m. UTC | #4 
On Fri, 2015-12-11 at 18:36 +0100, Marek Vasut wrote:
> On Friday, December 11, 2015 at 04:43:19 PM, Dinh Nguyen wrote:
> > On 12/11/2015 08:21 AM, Marek Vasut wrote:
> > > On Friday, December 11, 2015 at 10:15:50 AM, Chin Liang See
> > > wrote:
> > > > Enabling mtd partitioning layout which indicate partition
> > > > for various boot partition
> > > > 
> > > > Signed-off-by: Chin Liang See <clsee@altera.com>
> > > > Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
> > > > Cc: Dinh Nguyen <dinh.linux@gmail.com>
> > > > Cc: Pavel Machek <pavel@denx.de>
> > > > Cc: Marek Vasut <marex@denx.de>
> > > > Cc: Stefan Roese <sr@denx.de>
> > > > ---
> > > > 
> > > >  include/configs/socfpga_de0_nano_soc.h | 12 ++++++++++++
> > > >  1 file changed, 12 insertions(+)
> > > > 
> > > > diff --git a/include/configs/socfpga_de0_nano_soc.h
> > > > b/include/configs/socfpga_de0_nano_soc.h index 16e146c..c42175d
> > > > 100644
> > > > --- a/include/configs/socfpga_de0_nano_soc.h
> > > > +++ b/include/configs/socfpga_de0_nano_soc.h
> > > > @@ -86,4 +86,16 @@
> > > > 
> > > >  /* The rest of the configuration is shared */
> > > >  #include <configs/socfpga_common.h>
> > > > 
> > > > +/* mtd partitioning for serial NOR flash */
> > > > +#if defined(CONFIG_CMD_UBI) || defined(CONFIG_CMD_SF)
> > > > +#define MTDPARTS_DEFAULT	"mtdparts=ff705000.spi:"\
> > > > +				"256k(spl),"		\
> > > > +				"64k(env),"		\
> > > > +				"64k(dtb),"		\
> > > > +				"256k(boot),"		\
> > > > +				"16m(kernel),"		
> > > > \
> > > > +				"16m(rootfs),"		
> > > > \
> > > > +				"-(UBI)\0"
> > > > +#endif
> > > 
> > > Does Atlas have a dedicated QSPI NOR ?
> > 
> > No, it does not.
> 
> Do you now understand why I have every single mainline SoCFPGA board
> in my
> collection and why I am eagerly waiting for my first Arria 10 project
> ? :)
> 

We can always arrange a board for you. Let me work out the arrangement
then.

Thanks
Chin Liang

> Best regards,
> Marek Vasut
Pavel Machek Dec. 12, 2015, 9:10 p.m. UTC | #5 
On Fri 2015-12-11 17:15:50, Chin Liang See wrote:
> Enabling mtd partitioning layout which indicate partition
> for various boot partition
> 
> Signed-off-by: Chin Liang See <clsee@altera.com>
> Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
> Cc: Dinh Nguyen <dinh.linux@gmail.com>
> Cc: Pavel Machek <pavel@denx.de>
> Cc: Marek Vasut <marex@denx.de>
> Cc: Stefan Roese <sr@denx.de>
> ---
>  include/configs/socfpga_de0_nano_soc.h | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h
> index 16e146c..c42175d 100644
> --- a/include/configs/socfpga_de0_nano_soc.h
> +++ b/include/configs/socfpga_de0_nano_soc.h
> @@ -86,4 +86,16 @@
>  /* The rest of the configuration is shared */
>  #include <configs/socfpga_common.h>
> 
> +/* mtd partitioning for serial NOR flash */
> +#if defined(CONFIG_CMD_UBI) || defined(CONFIG_CMD_SF)
> +#define MTDPARTS_DEFAULT	"mtdparts=ff705000.spi:"\
> +				"256k(spl),"		\
> +				"64k(env),"		\
> +				"64k(dtb),"		\
> +				"256k(boot),"		\
> +				"16m(kernel),"		\
> +				"16m(rootfs),"		\
> +				"-(UBI)\0"
> +#endif
> +
>  #endif	/* __CONFIG_TERASIC_DE0_H__ */

Ok, three copies of the same table. Should it go to socfpga common?
You could at least do

MTDPARTS_DEFAULT_SOCDK

and then use

#define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_SOCDK

in the socfpga_de0_nano_soc.h, so we don't have 3 copies of the same
table.
									Pavel
Marek Vasut Dec. 12, 2015, 9:45 p.m. UTC | #6 
On Saturday, December 12, 2015 at 10:10:00 PM, Pavel Machek wrote:
> On Fri 2015-12-11 17:15:50, Chin Liang See wrote:
> > Enabling mtd partitioning layout which indicate partition
> > for various boot partition
> > 
> > Signed-off-by: Chin Liang See <clsee@altera.com>
> > Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
> > Cc: Dinh Nguyen <dinh.linux@gmail.com>
> > Cc: Pavel Machek <pavel@denx.de>
> > Cc: Marek Vasut <marex@denx.de>
> > Cc: Stefan Roese <sr@denx.de>
> > ---
> > 
> >  include/configs/socfpga_de0_nano_soc.h | 12 ++++++++++++
> >  1 file changed, 12 insertions(+)
> > 
> > diff --git a/include/configs/socfpga_de0_nano_soc.h
> > b/include/configs/socfpga_de0_nano_soc.h index 16e146c..c42175d 100644
> > --- a/include/configs/socfpga_de0_nano_soc.h
> > +++ b/include/configs/socfpga_de0_nano_soc.h
> > @@ -86,4 +86,16 @@
> > 
> >  /* The rest of the configuration is shared */
> >  #include <configs/socfpga_common.h>
> > 
> > +/* mtd partitioning for serial NOR flash */
> > +#if defined(CONFIG_CMD_UBI) || defined(CONFIG_CMD_SF)
> > +#define MTDPARTS_DEFAULT	"mtdparts=ff705000.spi:"\
> > +				"256k(spl),"		\
> > +				"64k(env),"		\
> > +				"64k(dtb),"		\
> > +				"256k(boot),"		\
> > +				"16m(kernel),"		\
> > +				"16m(rootfs),"		\
> > +				"-(UBI)\0"
> > +#endif
> > +
> > 
> >  #endif	/* __CONFIG_TERASIC_DE0_H__ */
> 
> Ok, three copies of the same table. Should it go to socfpga common?
> You could at least do
> 
> MTDPARTS_DEFAULT_SOCDK
> 
> and then use
> 
> #define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_SOCDK
> 
> in the socfpga_de0_nano_soc.h, so we don't have 3 copies of the same
> table.

I'd rather suggest to do something like

#ifndef MTDPARTS_DEFAULT
#define ...
#endif

in socfpga_common.h . Even better would obviously be if we could just scrap
this altogether and parse the MTD layout from OF. I dunno if we can do that
nowadays, but that'd be great.

Best regards,
Marek Vasut
Chin Liang See Dec. 13, 2015, 12:01 a.m. UTC | #7 
On Sat, 2015-12-12 at 22:45 +0100, Marek Vasut wrote:
> On Saturday, December 12, 2015 at 10:10:00 PM, Pavel Machek wrote:
> > On Fri 2015-12-11 17:15:50, Chin Liang See wrote:
> > > Enabling mtd partitioning layout which indicate partition
> > > for various boot partition
> > > 
> > > Signed-off-by: Chin Liang See <clsee@altera.com>
> > > Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
> > > Cc: Dinh Nguyen <dinh.linux@gmail.com>
> > > Cc: Pavel Machek <pavel@denx.de>
> > > Cc: Marek Vasut <marex@denx.de>
> > > Cc: Stefan Roese <sr@denx.de>
> > > ---
> > > 
> > >  include/configs/socfpga_de0_nano_soc.h | 12 ++++++++++++
> > >  1 file changed, 12 insertions(+)
> > > 
> > > diff --git a/include/configs/socfpga_de0_nano_soc.h
> > > b/include/configs/socfpga_de0_nano_soc.h index 16e146c..c42175d
> > > 100644
> > > --- a/include/configs/socfpga_de0_nano_soc.h
> > > +++ b/include/configs/socfpga_de0_nano_soc.h
> > > @@ -86,4 +86,16 @@
> > > 
> > >  /* The rest of the configuration is shared */
> > >  #include <configs/socfpga_common.h>
> > > 
> > > +/* mtd partitioning for serial NOR flash */
> > > +#if defined(CONFIG_CMD_UBI) || defined(CONFIG_CMD_SF)
> > > +#define MTDPARTS_DEFAULT	"mtdparts=ff705000.spi:"\
> > > +				"256k(spl),"		\
> > > +				"64k(env),"		\
> > > +				"64k(dtb),"		\
> > > +				"256k(boot),"		\
> > > +				"16m(kernel),"		\
> > > +				"16m(rootfs),"		\
> > > +				"-(UBI)\0"
> > > +#endif
> > > +
> > > 
> > >  #endif	/* __CONFIG_TERASIC_DE0_H__ */
> > 
> > Ok, three copies of the same table. Should it go to socfpga common?
> > You could at least do
> > 
> > MTDPARTS_DEFAULT_SOCDK
> > 
> > and then use
> > 
> > #define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_SOCDK
> > 
> > in the socfpga_de0_nano_soc.h, so we don't have 3 copies of the
> > same
> > table.
> 
> I'd rather suggest to do something like
> 
> #ifndef MTDPARTS_DEFAULT
> #define ...
> #endif
> 
> in socfpga_common.h . Even better would obviously be if we could just
> scrap
> this altogether and parse the MTD layout from OF. I dunno if we can
> do that
> nowadays, but that'd be great.
> 

Yah this sound good. Let me do that by having them definied into
socfpga_common.h

Thanks
Chin Liang

> Best regards,
> Marek Vasut
Chin Liang See Dec. 13, 2015, 12:04 a.m. UTC | #8 
On Sat, 2015-12-12 at 22:10 +0100, Pavel Machek wrote:
> On Fri 2015-12-11 17:15:50, Chin Liang See wrote:
> > Enabling mtd partitioning layout which indicate partition
> > for various boot partition
> > 
> > Signed-off-by: Chin Liang See <clsee@altera.com>
> > Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
> > Cc: Dinh Nguyen <dinh.linux@gmail.com>
> > Cc: Pavel Machek <pavel@denx.de>
> > Cc: Marek Vasut <marex@denx.de>
> > Cc: Stefan Roese <sr@denx.de>
> > ---
> >  include/configs/socfpga_de0_nano_soc.h | 12 ++++++++++++
> >  1 file changed, 12 insertions(+)
> > 
> > diff --git a/include/configs/socfpga_de0_nano_soc.h
> > b/include/configs/socfpga_de0_nano_soc.h
> > index 16e146c..c42175d 100644
> > --- a/include/configs/socfpga_de0_nano_soc.h
> > +++ b/include/configs/socfpga_de0_nano_soc.h
> > @@ -86,4 +86,16 @@
> >  /* The rest of the configuration is shared */
> >  #include <configs/socfpga_common.h>
> > 
> > +/* mtd partitioning for serial NOR flash */
> > +#if defined(CONFIG_CMD_UBI) || defined(CONFIG_CMD_SF)
> > +#define MTDPARTS_DEFAULT	"mtdparts=ff705000.spi:"\
> > +				"256k(spl),"		\
> > +				"64k(env),"		\
> > +				"64k(dtb),"		\
> > +				"256k(boot),"		\
> > +				"16m(kernel),"		\
> > +				"16m(rootfs),"		\
> > +				"-(UBI)\0"
> > +#endif
> > +
> >  #endif	/* __CONFIG_TERASIC_DE0_H__ */
> 
> Ok, three copies of the same table. Should it go to socfpga common?
> You could at least do
> 
> MTDPARTS_DEFAULT_SOCDK
> 
> and then use
> 
> #define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_SOCDK
> 
> in the socfpga_de0_nano_soc.h, so we don't have 3 copies of the same
> table.
> 

Yup, let me do that by putting them into socfpga_common.h

Thanks
Chin Liang

> 									
> Pavel
>
diff mbox

Patch

diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h
index 16e146c..c42175d 100644
--- a/include/configs/socfpga_de0_nano_soc.h
+++ b/include/configs/socfpga_de0_nano_soc.h
@@ -86,4 +86,16 @@ 
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>

+/* mtd partitioning for serial NOR flash */
+#if defined(CONFIG_CMD_UBI) || defined(CONFIG_CMD_SF)
+#define MTDPARTS_DEFAULT	"mtdparts=ff705000.spi:"\
+				"256k(spl),"		\
+				"64k(env),"		\
+				"64k(dtb),"		\
+				"256k(boot),"		\
+				"16m(kernel),"		\
+				"16m(rootfs),"		\
+				"-(UBI)\0"
+#endif
+
 #endif	/* __CONFIG_TERASIC_DE0_H__ */