Add a flattened device tree (fdt) command (1 of 2)

[platform/kernel/u-boot.git] / common / environment.c

diff --git a/common/environment.c b/common/environment.c
index 61a8d24..1d425a7 100644 (file)
--- a/common/environment.c
+++ b/common/environment.c
@@ -21,7 +21,12 @@
  * MA 02111-1307 USA
  */
 
+#ifndef __ASSEMBLY__
+#define        __ASSEMBLY__                    /* Dirty trick to get only #defines     */
+#endif
+#define        __ASM_STUB_PROCESSOR_H__        /* don't include asm/processor.         */
 #include <config.h>
+#undef __ASSEMBLY__
 #include <environment.h>
 
 /*
@@ -54,7 +59,10 @@
      defined(CONFIG_TQM8xxL)   || \
      defined(CONFIG_RRVISION)  || \
      defined(CONFIG_TRAB)      || \
-     defined(CONFIG_PPCHAMELEONEVB) )  && \
+     defined(CONFIG_PPCHAMELEONEVB) || \
+     defined(CONFIG_M5271EVB)  || \
+     defined(CONFIG_IDMR)      || \
+     defined(CONFIG_NAND_U_BOOT))      && \
      defined(ENV_CRC) /* Environment embedded in U-Boot .ppcenv section */
 /* XXX - This only works with GNU C */
 #  define __PPCENV__ __attribute__ ((section(".ppcenv")))