| Message ID | 1351933887-11852-1-git-send-email-marex@denx.de |
|---|---|
| State | Changes Requested |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
Hi Marek, On Sat, 3 Nov 2012 10:11:27 +0100, Marek Vasut <marex@denx.de> wrote: > These boards couldn't save their environment because they couldn't malloc() > the whole size of the sector. > > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Linus Walleij <linus.walleij@linaro.org> > --- > include/configs/integrator-common.h | 3 ++- > include/configs/versatile.h | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) > > V2: Align with current code > > diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h > index 564b418..51227e7 100644 > --- a/include/configs/integrator-common.h > +++ b/include/configs/integrator-common.h > @@ -37,7 +37,8 @@ > #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) > #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ > #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size*/ > -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) /* Size of malloc() pool */ > +/* Size of malloc() pool */ > +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SECT_SIZE + 128*1024) > > #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ > #define CONFIG_SETUP_MEMORY_TAGS > diff --git a/include/configs/versatile.h b/include/configs/versatile.h > index a65c676..2484881 100644 > --- a/include/configs/versatile.h > +++ b/include/configs/versatile.h > @@ -71,7 +71,7 @@ > * Size of malloc() pool > */ > #define CONFIG_ENV_SIZE 8192 > -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) > +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SECT_SIZE + 128 * 1024) > > /* > * Hardware drivers This does not build properly on current ARM ToT: board.c:395:19: error: 'CONFIG_ENV_SECT_SIZE' undeclared (first use in this function) All 4 of integratorap_cm720t integratorap_cm920t integratorap_cm926ejs integratorap_cm946es fail. Amicalement,
Dear Albert ARIBAUD, > Hi Marek, > > On Sat, 3 Nov 2012 10:11:27 +0100, Marek Vasut <marex@denx.de> wrote: > > These boards couldn't save their environment because they couldn't > > malloc() the whole size of the sector. > > > > Signed-off-by: Marek Vasut <marex@denx.de> > > Cc: Linus Walleij <linus.walleij@linaro.org> > > --- > > > > include/configs/integrator-common.h | 3 ++- > > include/configs/versatile.h | 2 +- > > 2 files changed, 3 insertions(+), 2 deletions(-) > > > > V2: Align with current code > > > > diff --git a/include/configs/integrator-common.h > > b/include/configs/integrator-common.h index 564b418..51227e7 100644 > > --- a/include/configs/integrator-common.h > > +++ b/include/configs/integrator-common.h > > @@ -37,7 +37,8 @@ > > > > #define > > CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) > > #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define > > CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size*/ > > > > -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) /* Size of > > malloc() pool */ +/* Size of malloc() pool */ > > +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SECT_SIZE + 128*1024) > > > > #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ > > #define CONFIG_SETUP_MEMORY_TAGS > > > > diff --git a/include/configs/versatile.h b/include/configs/versatile.h > > index a65c676..2484881 100644 > > --- a/include/configs/versatile.h > > +++ b/include/configs/versatile.h > > @@ -71,7 +71,7 @@ > > > > * Size of malloc() pool > > */ > > > > #define CONFIG_ENV_SIZE 8192 > > > > -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) > > +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SECT_SIZE + 128 * 1024) > > > > /* > > > > * Hardware drivers > > This does not build properly on current ARM ToT: > > board.c:395:19: error: 'CONFIG_ENV_SECT_SIZE' undeclared (first use in > this function) > > All 4 of integratorap_cm720t integratorap_cm920t integratorap_cm926ejs > integratorap_cm946es fail. Yea well, the original patch is like one year old now ... I guess these things happen. Best regards, Marek Vasut
diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index 564b418..51227e7 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -37,7 +37,8 @@ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size*/ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) /* Size of malloc() pool */ +/* Size of malloc() pool */ +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SECT_SIZE + 128*1024) #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/configs/versatile.h b/include/configs/versatile.h index a65c676..2484881 100644 --- a/include/configs/versatile.h +++ b/include/configs/versatile.h @@ -71,7 +71,7 @@ * Size of malloc() pool */ #define CONFIG_ENV_SIZE 8192 -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SECT_SIZE + 128 * 1024) /* * Hardware drivers
These boards couldn't save their environment because they couldn't malloc() the whole size of the sector. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Linus Walleij <linus.walleij@linaro.org> --- include/configs/integrator-common.h | 3 ++- include/configs/versatile.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) V2: Align with current code