| Message ID | 1427188042-18122-1-git-send-email-josh.wu@atmel.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | Andreas Bießmann |
| Headers | show |
Hi Josh, On 03/24/2015 05:07 PM, Josh Wu wrote: > Insteading in mmc's raw sectors, this patch will save the environment > in a fat file (uboot.env) in mmc card's first FAT patition by default. > > If you want to save in mmc's raw sectors, you only need to define > CONFIG_ENV_IS_IN_MMC. > > Signed-off-by: Josh Wu <josh.wu@atmel.com> Thanks for your patch. I think this one is better than v1. Acked-by: Bo Shen <voice.shen@atmel.com> > --- > > Changes in v2: > - not remove the code to save env in mmc's raw sectors. > - we can define CONFIG_ENV_IS_IN_MMC to enable raw sectors saving. > > include/configs/at91sam9n12ek.h | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h > index f02fce9..058e0e4 100644 > --- a/include/configs/at91sam9n12ek.h > +++ b/include/configs/at91sam9n12ek.h > @@ -201,11 +201,22 @@ > #else /* CONFIG_SYS_USE_MMC */ > > /* bootstrap + u-boot + env + linux in mmc */ > -#define CONFIG_ENV_IS_IN_MMC > -/* For FAT system, most cases it should be in the reserved sector */ > + > +#ifdef CONFIG_ENV_IS_IN_MMC > +/* Use raw reserved sectors to save environment */ > #define CONFIG_ENV_OFFSET 0x2000 > #define CONFIG_ENV_SIZE 0x1000 > #define CONFIG_SYS_MMC_ENV_DEV 0 > +#else > +/* Use file in FAT file to save environment */ > +#define CONFIG_ENV_IS_IN_FAT > +#define CONFIG_FAT_WRITE > +#define FAT_ENV_INTERFACE "mmc" > +#define FAT_ENV_FILE "uboot.env" > +#define FAT_ENV_DEVICE_AND_PART "0" > +#define CONFIG_ENV_SIZE 0x4000 > +#endif > + > #define CONFIG_BOOTCOMMAND \ > "setenv bootargs ${console} ${mtdparts} ${bootargs_mmc};" \ > "fatload mmc 0:1 0x21000000 dtb;" \ > Best Regards, Bo Shen
Dear Josh Wu, Josh Wu <Josh.wu@atmel.com> writes: >Insteading in mmc's raw sectors, this patch will save the environment >in a fat file (uboot.env) in mmc card's first FAT patition by default. > >If you want to save in mmc's raw sectors, you only need to define >CONFIG_ENV_IS_IN_MMC. > >Signed-off-by: Josh Wu <josh.wu@atmel.com> >Acked-by: Bo Shen <voice.shen@atmel.com> >--- > >Changes in v2: >- not remove the code to save env in mmc's raw sectors. >- we can define CONFIG_ENV_IS_IN_MMC to enable raw sectors saving. > > include/configs/at91sam9n12ek.h | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) applied to u-boot-atmel/master, thanks! Best regards, Andreas Bießmann
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index f02fce9..058e0e4 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -201,11 +201,22 @@ #else /* CONFIG_SYS_USE_MMC */ /* bootstrap + u-boot + env + linux in mmc */ -#define CONFIG_ENV_IS_IN_MMC -/* For FAT system, most cases it should be in the reserved sector */ + +#ifdef CONFIG_ENV_IS_IN_MMC +/* Use raw reserved sectors to save environment */ #define CONFIG_ENV_OFFSET 0x2000 #define CONFIG_ENV_SIZE 0x1000 #define CONFIG_SYS_MMC_ENV_DEV 0 +#else +/* Use file in FAT file to save environment */ +#define CONFIG_ENV_IS_IN_FAT +#define CONFIG_FAT_WRITE +#define FAT_ENV_INTERFACE "mmc" +#define FAT_ENV_FILE "uboot.env" +#define FAT_ENV_DEVICE_AND_PART "0" +#define CONFIG_ENV_SIZE 0x4000 +#endif + #define CONFIG_BOOTCOMMAND \ "setenv bootargs ${console} ${mtdparts} ${bootargs_mmc};" \ "fatload mmc 0:1 0x21000000 dtb;" \
Insteading in mmc's raw sectors, this patch will save the environment in a fat file (uboot.env) in mmc card's first FAT patition by default. If you want to save in mmc's raw sectors, you only need to define CONFIG_ENV_IS_IN_MMC. Signed-off-by: Josh Wu <josh.wu@atmel.com> --- Changes in v2: - not remove the code to save env in mmc's raw sectors. - we can define CONFIG_ENV_IS_IN_MMC to enable raw sectors saving. include/configs/at91sam9n12ek.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)