| Message ID | 20181218030818.10272-1-shawn.guo@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | poplar: save environment at a different offset | expand |
On 12/17/18 9:08 PM, Shawn Guo wrote: > From: Alex Elder <elder@linaro.org> > > Change CONFIG_ENV_OFFSET for Poplar to be 1MB further into the eMMC > than before. This puts it immediately prior to the space we are > reserving offset 0x200000-0x400000 for UEFI to save its persistent > data. Define CONFIG_ENV_SIZE as a product of env_mmc_nblks and the > sector size, like CONFIG_ENV_OFFSET is. > > Signed-off-by: Alex Elder <elder@linaro.org> > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> And acked now as well... This was done last year some time. Thanks Shawn. -Alex > --- > include/configs/poplar.h | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/include/configs/poplar.h b/include/configs/poplar.h > index 0a126002d7f9..6b93b76ab9ba 100644 > --- a/include/configs/poplar.h > +++ b/include/configs/poplar.h > @@ -44,7 +44,7 @@ > #define CONFIG_EXTRA_ENV_SETTINGS \ > "loader_mmc_blknum=0x0\0" \ > "loader_mmc_nblks=0x780\0" \ > - "env_mmc_blknum=0x780\0" \ > + "env_mmc_blknum=0xf80\0" \ > "env_mmc_nblks=0x80\0" \ > "kernel_addr_r=0x30000000\0" \ > "pxefile_addr_r=0x32000000\0" \ > @@ -57,8 +57,8 @@ > > /* Command line configuration */ > #define CONFIG_SYS_MMC_ENV_DEV 0 > -#define CONFIG_ENV_OFFSET (0x780 * 512) /* env_mmc_blknum */ > -#define CONFIG_ENV_SIZE 0x10000 /* env_mmc_nblks bytes */ > +#define CONFIG_ENV_OFFSET (0xf80 * 512) /* env_mmc_blknum bytes */ > +#define CONFIG_ENV_SIZE (0x80 * 512) /* env_mmc_nblks bytes */ > > /* Monitor Command Prompt */ > #define CONFIG_SYS_CBSIZE 512 >
Hi Tom, Can you please help apply the patch if it looks fine? Shawn On Tue, Dec 18, 2018 at 11:08:18AM +0800, Shawn Guo wrote: > From: Alex Elder <elder@linaro.org> > > Change CONFIG_ENV_OFFSET for Poplar to be 1MB further into the eMMC > than before. This puts it immediately prior to the space we are > reserving offset 0x200000-0x400000 for UEFI to save its persistent > data. Define CONFIG_ENV_SIZE as a product of env_mmc_nblks and the > sector size, like CONFIG_ENV_OFFSET is. > > Signed-off-by: Alex Elder <elder@linaro.org> > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > --- > include/configs/poplar.h | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/include/configs/poplar.h b/include/configs/poplar.h > index 0a126002d7f9..6b93b76ab9ba 100644 > --- a/include/configs/poplar.h > +++ b/include/configs/poplar.h > @@ -44,7 +44,7 @@ > #define CONFIG_EXTRA_ENV_SETTINGS \ > "loader_mmc_blknum=0x0\0" \ > "loader_mmc_nblks=0x780\0" \ > - "env_mmc_blknum=0x780\0" \ > + "env_mmc_blknum=0xf80\0" \ > "env_mmc_nblks=0x80\0" \ > "kernel_addr_r=0x30000000\0" \ > "pxefile_addr_r=0x32000000\0" \ > @@ -57,8 +57,8 @@ > > /* Command line configuration */ > #define CONFIG_SYS_MMC_ENV_DEV 0 > -#define CONFIG_ENV_OFFSET (0x780 * 512) /* env_mmc_blknum */ > -#define CONFIG_ENV_SIZE 0x10000 /* env_mmc_nblks bytes */ > +#define CONFIG_ENV_OFFSET (0xf80 * 512) /* env_mmc_blknum bytes */ > +#define CONFIG_ENV_SIZE (0x80 * 512) /* env_mmc_nblks bytes */ > > /* Monitor Command Prompt */ > #define CONFIG_SYS_CBSIZE 512 > -- > 2.18.0 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot
On Tue, Dec 18, 2018 at 11:08:18AM +0800, Shawn Guo wrote: > From: Alex Elder <elder@linaro.org> > > Change CONFIG_ENV_OFFSET for Poplar to be 1MB further into the eMMC > than before. This puts it immediately prior to the space we are > reserving offset 0x200000-0x400000 for UEFI to save its persistent > data. Define CONFIG_ENV_SIZE as a product of env_mmc_nblks and the > sector size, like CONFIG_ENV_OFFSET is. > > Signed-off-by: Alex Elder <elder@linaro.org> > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Applied to u-boot/master, thanks! -- Tom
diff --git a/include/configs/poplar.h b/include/configs/poplar.h index 0a126002d7f9..6b93b76ab9ba 100644 --- a/include/configs/poplar.h +++ b/include/configs/poplar.h @@ -44,7 +44,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "loader_mmc_blknum=0x0\0" \ "loader_mmc_nblks=0x780\0" \ - "env_mmc_blknum=0x780\0" \ + "env_mmc_blknum=0xf80\0" \ "env_mmc_nblks=0x80\0" \ "kernel_addr_r=0x30000000\0" \ "pxefile_addr_r=0x32000000\0" \ @@ -57,8 +57,8 @@ /* Command line configuration */ #define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_ENV_OFFSET (0x780 * 512) /* env_mmc_blknum */ -#define CONFIG_ENV_SIZE 0x10000 /* env_mmc_nblks bytes */ +#define CONFIG_ENV_OFFSET (0xf80 * 512) /* env_mmc_blknum bytes */ +#define CONFIG_ENV_SIZE (0x80 * 512) /* env_mmc_nblks bytes */ /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 512