diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2007-09-24 14:43:43 -0500 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2007-09-24 14:43:43 -0500 |
| commit | 8ffc774993725a0646aa8d1995d968c95aee9e3c (patch) | |
| tree | ee69b8872cf8c295a48244280c82d98e191111ab /common/environment.c | |
| parent | d7fee32b7e61fe11c64e371cde79faa4768e8350 (diff) | |
| parent | 66dcad3a9a53e0766d90e0084123bd8529522fb0 (diff) | |
| download | u-boot-imx-8ffc774993725a0646aa8d1995d968c95aee9e3c.zip u-boot-imx-8ffc774993725a0646aa8d1995d968c95aee9e3c.tar.gz u-boot-imx-8ffc774993725a0646aa8d1995d968c95aee9e3c.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'common/environment.c')
| -rw-r--r-- | common/environment.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/common/environment.c b/common/environment.c index 1d425a7..24257f7 100644 --- a/common/environment.c +++ b/common/environment.c @@ -51,18 +51,7 @@ * a seperate section. Note that ENV_CRC is only defined when building * U-Boot itself. */ -#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_PPCHAMELEONEVB) || \ - defined(CONFIG_M5271EVB) || \ - defined(CONFIG_IDMR) || \ - defined(CONFIG_NAND_U_BOOT)) && \ +#if (defined(CFG_USE_PPCENV) || 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"))) |