| Message ID | 1396434973-26354-4-git-send-email-sourav.poddar@ti.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Tom Rini |
| Headers | show |
On Wed, Apr 02, 2014 at 04:06:11PM +0530, Sourav Poddar wrote: > Add MTD partition info for qspi on dra7 evm > > Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> [snip] > +/* > + * Default to using SPI for environment, etc. > + * 0x000000 - 0x010000 : QSPI.SPL (64KiB) > + * 0x010000 - 0x020000 : QSPI.SPL.backup1 (64KiB) > + * 0x020000 - 0x030000 : QSPI.SPL.backup2 (64KiB) > + * 0x030000 - 0x040000 : QSPI.SPL.backup3 (64KiB) > + * 0x040000 - 0x140000 : QSPI.u-boot (1MiB) > + * 0x140000 - 0x150000 : QSPI.u-boot-spl-os (64KiB) This is too small, I found out when adding falcon mode support for this board. We need to bump this to 512KiB and then re-adjust what follows. > +#if defined(CONFIG_QSPI_BOOT) > +#undef CONFIG_ENV_IS_IN_MMC ... This needs adjusting too, we should only be setting CONFIG_ENV_IS_IN_MMC on !QSPI_BOOT, up in the MMC area. And related, we need to fix ti_omap5_common.h to not set CONFIG_ENV_SIZE because right now it's setting 128KiB and our redundant location never would have valid data. I'll pick this all up in a v2 and address it, along with a few other things. Thanks!
On Wed, Apr 2, 2014 at 4:06 PM, Sourav Poddar <sourav.poddar@ti.com> wrote: > Add MTD partition info for qspi on dra7 evm > > Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> > --- > include/configs/dra7xx_evm.h | 46 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 46 insertions(+) > > diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h > index 291c538..68496dc 100644 > --- a/include/configs/dra7xx_evm.h > +++ b/include/configs/dra7xx_evm.h > @@ -75,6 +75,52 @@ > #define CONFIG_SF_DEFAULT_SPEED 48000000 > #define CONFIG_DEFAULT_SPI_MODE SPI_MODE_3 > > +/* > + * Default to using SPI for environment, etc. > + * 0x000000 - 0x010000 : QSPI.SPL (64KiB) > + * 0x010000 - 0x020000 : QSPI.SPL.backup1 (64KiB) > + * 0x020000 - 0x030000 : QSPI.SPL.backup2 (64KiB) > + * 0x030000 - 0x040000 : QSPI.SPL.backup3 (64KiB) > + * 0x040000 - 0x140000 : QSPI.u-boot (1MiB) > + * 0x140000 - 0x150000 : QSPI.u-boot-spl-os (64KiB) > + * 0x150000 - 0x160000 : QSPI.u-boot-env (64KiB) > + * 0x160000 - 0x170000 : QSPI.u-boot-env.backup1 (64KiB) > + * 0x170000 - 0x970000 : QSPI.kernel (8MiB) > + * 0x970000 - 0x2000000 : USERLAND > + */ > +#if defined(CONFIG_QSPI_BOOT) > +#undef CONFIG_ENV_IS_IN_MMC > +#define CONFIG_ENV_IS_IN_SPI_FLASH > +#define CONFIG_SYS_REDUNDAND_ENVIRONMENT > +#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED > +#undef CONFIG_SPL_MAX_SIZE > +#define CONFIG_SPL_MAX_SIZE (64 << 10) /* 64 KiB */ > +#define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64 KB sectors */ > +#undef CONFIG_ENV_OFFSET > +#define CONFIG_ENV_OFFSET 0x150000 > +#undef CONFIG_ENV_OFFSET_REDUND > +#define CONFIG_ENV_OFFSET_REDUND 0x160000 > + > +#ifdef MTDIDS_DEFAULT > +#undef MTDIDS_DEFAULT > +#endif > +#define MTDIDS_DEFAULT "nor0=m25p80-flash.0" > + > +#ifdef MTDPARTS_DEFAULT > +#undef MTDPARTS_DEFAULT > +#endif > +#define MTDPARTS_DEFAULT "mtdparts=qspi.0:64k(SPL)," \ > + "64k(QSPI.SPL.backup1)," \ > + "64k(QSPI.SPL.backup2)," \ > + "64k(QSPI.SPL.backup3)," \ > + "1m(QSPI.u-boot)," \ > + "64k(QSPI.u-boot-spl-os)," \ > + "64k(QSPI.u-boot-env)," \ > + "64k(QSPI.u-boot-env.backup1)," \ > + "8m(QSPI.kernel)," \ > + "-(QSPI.rootfs)" > +#endif > + > /* SPI SPL */ > #define CONFIG_SPL_SPI_SUPPORT > #define CONFIG_SPL_SPI_LOAD Can you add log file for this qspi mtd tests on your next version patches. Good to have this as we didn't mtd partitioning on qspi yet. thanks!
On Thursday 03 April 2014 11:59 AM, Jagan Teki wrote: > On Wed, Apr 2, 2014 at 4:06 PM, Sourav Poddar<sourav.poddar@ti.com> wrote: >> Add MTD partition info for qspi on dra7 evm >> >> Signed-off-by: Sourav Poddar<sourav.poddar@ti.com> >> --- >> include/configs/dra7xx_evm.h | 46 ++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 46 insertions(+) >> >> diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h >> index 291c538..68496dc 100644 >> --- a/include/configs/dra7xx_evm.h >> +++ b/include/configs/dra7xx_evm.h >> @@ -75,6 +75,52 @@ >> #define CONFIG_SF_DEFAULT_SPEED 48000000 >> #define CONFIG_DEFAULT_SPI_MODE SPI_MODE_3 >> >> +/* >> + * Default to using SPI for environment, etc. >> + * 0x000000 - 0x010000 : QSPI.SPL (64KiB) >> + * 0x010000 - 0x020000 : QSPI.SPL.backup1 (64KiB) >> + * 0x020000 - 0x030000 : QSPI.SPL.backup2 (64KiB) >> + * 0x030000 - 0x040000 : QSPI.SPL.backup3 (64KiB) >> + * 0x040000 - 0x140000 : QSPI.u-boot (1MiB) >> + * 0x140000 - 0x150000 : QSPI.u-boot-spl-os (64KiB) >> + * 0x150000 - 0x160000 : QSPI.u-boot-env (64KiB) >> + * 0x160000 - 0x170000 : QSPI.u-boot-env.backup1 (64KiB) >> + * 0x170000 - 0x970000 : QSPI.kernel (8MiB) >> + * 0x970000 - 0x2000000 : USERLAND >> + */ >> +#if defined(CONFIG_QSPI_BOOT) >> +#undef CONFIG_ENV_IS_IN_MMC >> +#define CONFIG_ENV_IS_IN_SPI_FLASH >> +#define CONFIG_SYS_REDUNDAND_ENVIRONMENT >> +#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED >> +#undef CONFIG_SPL_MAX_SIZE >> +#define CONFIG_SPL_MAX_SIZE (64<< 10) /* 64 KiB */ >> +#define CONFIG_ENV_SECT_SIZE (64<< 10) /* 64 KB sectors */ >> +#undef CONFIG_ENV_OFFSET >> +#define CONFIG_ENV_OFFSET 0x150000 >> +#undef CONFIG_ENV_OFFSET_REDUND >> +#define CONFIG_ENV_OFFSET_REDUND 0x160000 >> + >> +#ifdef MTDIDS_DEFAULT >> +#undef MTDIDS_DEFAULT >> +#endif >> +#define MTDIDS_DEFAULT "nor0=m25p80-flash.0" >> + >> +#ifdef MTDPARTS_DEFAULT >> +#undef MTDPARTS_DEFAULT >> +#endif >> +#define MTDPARTS_DEFAULT "mtdparts=qspi.0:64k(SPL)," \ >> + "64k(QSPI.SPL.backup1)," \ >> + "64k(QSPI.SPL.backup2)," \ >> + "64k(QSPI.SPL.backup3)," \ >> + "1m(QSPI.u-boot)," \ >> + "64k(QSPI.u-boot-spl-os)," \ >> + "64k(QSPI.u-boot-env)," \ >> + "64k(QSPI.u-boot-env.backup1)," \ >> + "8m(QSPI.kernel)," \ >> + "-(QSPI.rootfs)" >> +#endif >> + >> /* SPI SPL */ >> #define CONFIG_SPL_SPI_SUPPORT >> #define CONFIG_SPL_SPI_LOAD > Can you add log file for this qspi mtd tests on your next version patches. > Good to have this as we didn't mtd partitioning on qspi yet. > > thanks! Tom is planning to send the next version with few other cleanups. Once, he does that, I will add a log file on top of that for my testing?
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 291c538..68496dc 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -75,6 +75,52 @@ #define CONFIG_SF_DEFAULT_SPEED 48000000 #define CONFIG_DEFAULT_SPI_MODE SPI_MODE_3 +/* + * Default to using SPI for environment, etc. + * 0x000000 - 0x010000 : QSPI.SPL (64KiB) + * 0x010000 - 0x020000 : QSPI.SPL.backup1 (64KiB) + * 0x020000 - 0x030000 : QSPI.SPL.backup2 (64KiB) + * 0x030000 - 0x040000 : QSPI.SPL.backup3 (64KiB) + * 0x040000 - 0x140000 : QSPI.u-boot (1MiB) + * 0x140000 - 0x150000 : QSPI.u-boot-spl-os (64KiB) + * 0x150000 - 0x160000 : QSPI.u-boot-env (64KiB) + * 0x160000 - 0x170000 : QSPI.u-boot-env.backup1 (64KiB) + * 0x170000 - 0x970000 : QSPI.kernel (8MiB) + * 0x970000 - 0x2000000 : USERLAND + */ +#if defined(CONFIG_QSPI_BOOT) +#undef CONFIG_ENV_IS_IN_MMC +#define CONFIG_ENV_IS_IN_SPI_FLASH +#define CONFIG_SYS_REDUNDAND_ENVIRONMENT +#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED +#undef CONFIG_SPL_MAX_SIZE +#define CONFIG_SPL_MAX_SIZE (64 << 10) /* 64 KiB */ +#define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64 KB sectors */ +#undef CONFIG_ENV_OFFSET +#define CONFIG_ENV_OFFSET 0x150000 +#undef CONFIG_ENV_OFFSET_REDUND +#define CONFIG_ENV_OFFSET_REDUND 0x160000 + +#ifdef MTDIDS_DEFAULT +#undef MTDIDS_DEFAULT +#endif +#define MTDIDS_DEFAULT "nor0=m25p80-flash.0" + +#ifdef MTDPARTS_DEFAULT +#undef MTDPARTS_DEFAULT +#endif +#define MTDPARTS_DEFAULT "mtdparts=qspi.0:64k(SPL)," \ + "64k(QSPI.SPL.backup1)," \ + "64k(QSPI.SPL.backup2)," \ + "64k(QSPI.SPL.backup3)," \ + "1m(QSPI.u-boot)," \ + "64k(QSPI.u-boot-spl-os)," \ + "64k(QSPI.u-boot-env)," \ + "64k(QSPI.u-boot-env.backup1)," \ + "8m(QSPI.kernel)," \ + "-(QSPI.rootfs)" +#endif + /* SPI SPL */ #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_LOAD
Add MTD partition info for qspi on dra7 evm Signed-off-by: Sourav Poddar <sourav.poddar@ti.com> --- include/configs/dra7xx_evm.h | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+)