Skip to contentSkip to conversation

M28EVK: Fix build if CONFIG_CMD_NAND not selected

PATCH New Marek Vasut 3 participants 5 messages Jan 1, 2012 – Jan 11, 2012

lore
Share & tools
lore

Marek Vasut

author
#0 lore raw

PATCH 1/1 M28EVK: Fix build if CONFIG_CMD_NAND not selected

Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Stefano Babic <[email protected]>
---
 include/configs/m28evk.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
include/configs/m28evk.h +3 -1
index 39c841f..dcea878 100644
@@ -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
 
 /*
Signature · 1 line
1.7.7.3
author
#1 lore raw

PATCH 1/1 M28EVK: Fix build if CONFIG_CMD_NAND not selected

Quoted 28 lines
Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Stefano Babic <[email protected]>
---
 include/configs/m28evk.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
include/configs/m28evk.h +1 -1
index 39c841f..dcea878 100644
@@ -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)

include/configs/m28evk.h line 180

Quoted 8 lines
include/configs/m28evk.h +2 -0
@@ -173,6 +173,8 @@
 		"512k(redundant-environment),"	\
 		"4m(kernel),"			\
 		"-(filesystem)"
+#else
+#define	CONFIG_ENV_IS_NOWHERE
 #endif
 
 /*

BUMP

#2 lore raw

PATCH 1/1 M28EVK: Fix build if CONFIG_CMD_NAND not selected

In reply to Marek Vasut

Hi Marek,

Quoted 31 lines · Marek Vasut
Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Stefano Babic <[email protected]>

---
?include/configs/m28evk.h | ? ?4 +++-
?1 files changed, 3 insertions(+), 1 deletions(-)

include/configs/m28evk.h +0 -0
index 39c841f..dcea878 100644
@@ -140,6 +140,7 @@

?/*
?* NAND
?*/
+#define ? ? ? ?CONFIG_ENV_SIZE ? ? ? ? ? ? ? ? (16 * 1024) ?#ifdef CONFIG_CMD_NAND
?#define ? ? ? ?CONFIG_NAND_MXS
?#define CONFIG_APBH_DMA

include/configs/m28evk.h +0 -0
@@ -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)

include/configs/m28evk.h +0 -0
@@ -173,6 +173,8 @@
 ? ? ? ? ? ? ? ?"512k(redundant-environment)," ?\
 ? ? ? ? ? ? ? ?"4m(kernel)," ? ? ? ? ? ? ? ? ? \

? ? ? ? ? ? ? ?"-(filesystem)"

include/configs/m28evk.h

Quoted 2 lines
include/configs/m28evk.h +2 -0
+#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

author
#3 lore raw

PATCH 1/1 M28EVK: Fix build if CONFIG_CMD_NAND not selected

Quoted 24 lines

Hi Marek,

Quoted 21 lines · Marek Vasut
Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Stefano Babic <[email protected]>
---
 include/configs/m28evk.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
include/configs/m28evk.h +1 -0
index 39c841f..dcea878 100644
@@ -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 @@
Quoted 15 lines

include/configs/m28evk.h line 177

Quoted 12 lines
include/configs/m28evk.h +2 -1
 /* 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

Quoted 4 lines

Regards,

Fabio Estevam

#4 lore raw

PATCH 1/1 M28EVK: Fix build if CONFIG_CMD_NAND not selected

In reply to Marek Vasut
Quoted 7 lines · Marek Vasut
Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Stefano Babic <[email protected]>
---
 include/configs/m28evk.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================