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 74bfd62..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>
 
 /*
@@ -46,13 +51,18 @@
  * a seperate section.  Note that ENV_CRC is only defined when building
  * U-Boot itself.
  */
-#if (defined(CONFIG_FADS)      || \
+#if (defined(CONFIG_CMI)       || \
+     defined(CONFIG_FADS)      || \
      defined(CONFIG_HYMOD)     || \
      defined(CONFIG_ICU862)    || \
      defined(CONFIG_R360MPI)   || \
      defined(CONFIG_TQM8xxL)   || \
      defined(CONFIG_RRVISION)  || \
-     defined(CONFIG_TRAB)   )  && \
+     defined(CONFIG_TRAB)      || \
+     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")))
@@ -128,6 +138,9 @@ env_t environment __PPCENV__ = {
 #ifdef CONFIG_ETH2ADDR
        "eth2addr="     MK_STR(CONFIG_ETH2ADDR)         "\0"
 #endif
+#ifdef CONFIG_ETH3ADDR
+       "eth3addr="     MK_STR(CONFIG_ETH3ADDR)         "\0"
+#endif
 #ifdef CONFIG_ETHPRIME
        "ethprime="     CONFIG_ETHPRIME                 "\0"
 #endif
@@ -164,10 +177,13 @@ env_t environment __PPCENV__ = {
 #ifdef CONFIG_CLOCKS_IN_MHZ
        "clocks_in_mhz=" "1"                            "\0"
 #endif
+#if defined(CONFIG_PCI_BOOTDELAY) && (CONFIG_PCI_BOOTDELAY > 0)
+       "pcidelay="     MK_STR(CONFIG_PCI_BOOTDELAY)    "\0"
+#endif
 #ifdef  CONFIG_EXTRA_ENV_SETTINGS
        CONFIG_EXTRA_ENV_SETTINGS
 #endif
-       "\0"            /* Term. env_t.data with 2 NULLs */
+       "\0"            /* Term. env_t.data with 2 NULs */
        }
 };
 #ifdef CFG_ENV_ADDR_REDUND