Merge with /home/stefan/git/u-boot/u-boot-ppc4xx

[oweals/u-boot.git] / common / environment.c

diff --git a/common/environment.c b/common/environment.c
index 81471ce71cd80410d3eaa784d28fdfc4c782d88e..1d425a73097e90b12c0feab738ff7863563a4951 100644 (file)
--- a/common/environment.c
+++ b/common/environment.c
@@ -60,7 +60,9 @@
      defined(CONFIG_RRVISION)  || \
      defined(CONFIG_TRAB)      || \
      defined(CONFIG_PPCHAMELEONEVB) || \
-     defined(CONFIG_M5271EVB)) && \
+     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")))