Patchwork [U-Boot] M28EVK: Fix build if CONFIG_CMD_NAND not selected

login
register
mail settings
Submitter Marek Vasut
Date Jan. 1, 2012, 4:28 a.m.
Message ID <1325392102-16052-1-git-send-email-marek.vasut@gmail.com>
Download mbox | patch
Permalink /patch/133753/
State Accepted
Commit c660a541828138ac4ba1ef82638df3b78e3bc65c
Delegated to: Stefano Babic
Headers show

Comments

Marek Vasut - Jan. 1, 2012, 4:28 a.m.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
---
 include/configs/m28evk.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
Marek Vasut - Jan. 10, 2012, 11:05 a.m.
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Stefano Babic <sbabic@denx.de>
> ---
>  include/configs/m28evk.h |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
> index 39c841f..dcea878 100644
> --- a/include/configs/m28evk.h
> +++ b/include/configs/m28evk.h
> @@ -140,6 +140,7 @@
>  /*
>   * NAND
>   */
> +#define	CONFIG_ENV_SIZE			(16 * 1024)
>  #ifdef	CONFIG_CMD_NAND
>  #define	CONFIG_NAND_MXS
>  #define CONFIG_APBH_DMA
> @@ -150,7 +151,6 @@
> 
>  /* Environment is in NAND */
>  #define	CONFIG_ENV_IS_IN_NAND
> -#define	CONFIG_ENV_SIZE			(16 * 1024)
>  #define	CONFIG_ENV_SIZE_REDUND		CONFIG_ENV_SIZE
>  #define	CONFIG_ENV_SECT_SIZE		(128 * 1024)
>  #define	CONFIG_ENV_RANGE		(512 * 1024)
> @@ -173,6 +173,8 @@
>  		"512k(redundant-environment),"	\
>  		"4m(kernel),"			\
>  		"-(filesystem)"
> +#else
> +#define	CONFIG_ENV_IS_NOWHERE
>  #endif
> 
>  /*

BUMP
Fabio Estevam - Jan. 10, 2012, 11:08 a.m.
Hi Marek,

On Sun, Jan 1, 2012 at 2:28 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Stefano Babic <sbabic@denx.de>
> ---
>  include/configs/m28evk.h |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
> index 39c841f..dcea878 100644
> --- a/include/configs/m28evk.h
> +++ b/include/configs/m28evk.h
> @@ -140,6 +140,7 @@
>  /*
>  * NAND
>  */
> +#define        CONFIG_ENV_SIZE                 (16 * 1024)
>  #ifdef CONFIG_CMD_NAND
>  #define        CONFIG_NAND_MXS
>  #define CONFIG_APBH_DMA
> @@ -150,7 +151,6 @@
>
>  /* Environment is in NAND */
>  #define        CONFIG_ENV_IS_IN_NAND
> -#define        CONFIG_ENV_SIZE                 (16 * 1024)
>  #define        CONFIG_ENV_SIZE_REDUND          CONFIG_ENV_SIZE
>  #define        CONFIG_ENV_SECT_SIZE            (128 * 1024)
>  #define        CONFIG_ENV_RANGE                (512 * 1024)
> @@ -173,6 +173,8 @@
>                "512k(redundant-environment),"  \
>                "4m(kernel),"                   \
>                "-(filesystem)"
> +#else
> +#define        CONFIG_ENV_IS_NOWHERE

Couldn't you use CONFIG_ENV_IS_IN_MMC instead of CONFIG_ENV_IS_NOWHERE here?

Regards,

Fabio Estevam
Marek Vasut - Jan. 10, 2012, 11:46 a.m.
> Hi Marek,
> 
> On Sun, Jan 1, 2012 at 2:28 AM, Marek Vasut <marek.vasut@gmail.com> wrote:
> > Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> > Cc: Wolfgang Denk <wd@denx.de>
> > Cc: Stefano Babic <sbabic@denx.de>
> > ---
> >  include/configs/m28evk.h |    4 +++-
> >  1 files changed, 3 insertions(+), 1 deletions(-)
> > 
> > diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
> > index 39c841f..dcea878 100644
> > --- a/include/configs/m28evk.h
> > +++ b/include/configs/m28evk.h
> > @@ -140,6 +140,7 @@
> >  /*
> >  * NAND
> >  */
> > +#define        CONFIG_ENV_SIZE                 (16 * 1024)
> >  #ifdef CONFIG_CMD_NAND
> >  #define        CONFIG_NAND_MXS
> >  #define CONFIG_APBH_DMA
> > @@ -150,7 +151,6 @@
> > 
> >  /* Environment is in NAND */
> >  #define        CONFIG_ENV_IS_IN_NAND
> > -#define        CONFIG_ENV_SIZE                 (16 * 1024)
> >  #define        CONFIG_ENV_SIZE_REDUND          CONFIG_ENV_SIZE
> >  #define        CONFIG_ENV_SECT_SIZE            (128 * 1024)
> >  #define        CONFIG_ENV_RANGE                (512 * 1024)
> > @@ -173,6 +173,8 @@
> >                "512k(redundant-environment),"  \
> >                "4m(kernel),"                   \
> >                "-(filesystem)"
> > +#else
> > +#define        CONFIG_ENV_IS_NOWHERE
> 
> Couldn't you use CONFIG_ENV_IS_IN_MMC instead of CONFIG_ENV_IS_NOWHERE
> here?

We decided to not have env elsewhere until env-in-multiple-locations patch is in 
place.

M
> 
> Regards,
> 
> Fabio Estevam
Stefano Babic - Jan. 11, 2012, 8:02 a.m.
On 01/01/2012 05:28, Marek Vasut wrote:
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Stefano Babic <sbabic@denx.de>
> ---
>  include/configs/m28evk.h |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Patch

diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index 39c841f..dcea878 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -140,6 +140,7 @@ 
 /*
  * NAND
  */
+#define	CONFIG_ENV_SIZE			(16 * 1024)
 #ifdef	CONFIG_CMD_NAND
 #define	CONFIG_NAND_MXS
 #define CONFIG_APBH_DMA
@@ -150,7 +151,6 @@ 
 
 /* Environment is in NAND */
 #define	CONFIG_ENV_IS_IN_NAND
-#define	CONFIG_ENV_SIZE			(16 * 1024)
 #define	CONFIG_ENV_SIZE_REDUND		CONFIG_ENV_SIZE
 #define	CONFIG_ENV_SECT_SIZE		(128 * 1024)
 #define	CONFIG_ENV_RANGE		(512 * 1024)
@@ -173,6 +173,8 @@ 
 		"512k(redundant-environment),"	\
 		"4m(kernel),"			\
 		"-(filesystem)"
+#else
+#define	CONFIG_ENV_IS_NOWHERE
 #endif
 
 /*