diff options
author | Michal Simek <monstr@monstr.eu> | 2007-09-24 00:04:22 +0200 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2007-09-24 00:04:22 +0200 |
commit | 6b6f287a33ae8c340f97fb08ed95b6687e2baa4b (patch) | |
tree | 57d0aa201f36c6dd5a43efd23a0ee2ded95440ba /common/environment.c | |
parent | d45963854eff39d575124d859419bb4953ce2c87 (diff) | |
parent | 66dcad3a9a53e0766d90e0084123bd8529522fb0 (diff) | |
download | u-boot-imx-6b6f287a33ae8c340f97fb08ed95b6687e2baa4b.zip u-boot-imx-6b6f287a33ae8c340f97fb08ed95b6687e2baa4b.tar.gz u-boot-imx-6b6f287a33ae8c340f97fb08ed95b6687e2baa4b.tar.bz2 |
Merge ../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"))) |