diff mbox

[U-Boot] env_onenand: set ONENAND_MAX_ENV_SIZE to CONFIG_ENV_SIZE

Message ID 1339622675-13243-1-git-send-email-0intro@gmail.com
State Accepted
Commit 034afbcc167651f1322c50a58cac278e2256f4b8
Headers show

Commit Message

David du Colombier June 13, 2012, 9:24 p.m. UTC
This fix prevents env_import() CRC to fail when CONFIG_ENV_SIZE
is not equal to 4096 bytes
It also prevents mtd->read and mtd->write to be incomplete when
the environment is larger than 4096 bytes.

Signed-off-by: David du Colombier <0intro@gmail.com>
---
 common/env_onenand.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

David du Colombier Aug. 4, 2012, 4:35 p.m. UTC | #1
> This fix prevents env_import() CRC to fail when CONFIG_ENV_SIZE
> is not equal to 4096 bytes
> It also prevents mtd->read and mtd->write to be incomplete when
> the environment is larger than 4096 bytes.
> 
> Signed-off-by: David du Colombier <0intro@gmail.com>
> ---
>  common/env_onenand.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/common/env_onenand.c b/common/env_onenand.c
> index 7197ab6..da35071 100644
> --- a/common/env_onenand.c
> +++ b/common/env_onenand.c
> @@ -39,7 +39,7 @@
>  
>  char *env_name_spec = "OneNAND";
>  
> -#define ONENAND_MAX_ENV_SIZE	4096
> +#define ONENAND_MAX_ENV_SIZE	CONFIG_ENV_SIZE
>  #define ONENAND_ENV_SIZE(mtd)	(ONENAND_MAX_ENV_SIZE -
> ENV_HEADER_SIZE) 
>  DECLARE_GLOBAL_DATA_PTR;

Could you please take a look? It fixes environment
saving and restoring on IGEPv2.

Thanks.
Ɓukasz Majewski Aug. 6, 2012, 9:07 a.m. UTC | #2
Dear David du Colombier,

> > This fix prevents env_import() CRC to fail when CONFIG_ENV_SIZE
> > is not equal to 4096 bytes
> > It also prevents mtd->read and mtd->write to be incomplete when
> > the environment is larger than 4096 bytes.
> > 
> > Signed-off-by: David du Colombier <0intro@gmail.com>
> > ---
> >  common/env_onenand.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/common/env_onenand.c b/common/env_onenand.c
> > index 7197ab6..da35071 100644
> > --- a/common/env_onenand.c
> > +++ b/common/env_onenand.c
> > @@ -39,7 +39,7 @@
> >  
> >  char *env_name_spec = "OneNAND";
> >  
> > -#define ONENAND_MAX_ENV_SIZE	4096
> > +#define ONENAND_MAX_ENV_SIZE	CONFIG_ENV_SIZE
> >  #define ONENAND_ENV_SIZE(mtd)	(ONENAND_MAX_ENV_SIZE -
> > ENV_HEADER_SIZE) 
> >  DECLARE_GLOBAL_DATA_PTR;
> 
> Could you please take a look? It fixes environment
> saving and restoring on IGEPv2.
> 
> Thanks.
> 

Tested-by: Lukasz Majewski <l.majewski@samsung.com>

Test HW: S5PC110 GONI

Applied to u-boot-onenand repository,
diff mbox

Patch

diff --git a/common/env_onenand.c b/common/env_onenand.c
index 7197ab6..da35071 100644
--- a/common/env_onenand.c
+++ b/common/env_onenand.c
@@ -39,7 +39,7 @@ 
 
 char *env_name_spec = "OneNAND";
 
-#define ONENAND_MAX_ENV_SIZE	4096
+#define ONENAND_MAX_ENV_SIZE	CONFIG_ENV_SIZE
 #define ONENAND_ENV_SIZE(mtd)	(ONENAND_MAX_ENV_SIZE - ENV_HEADER_SIZE)
 
 DECLARE_GLOBAL_DATA_PTR;