diff options
| author | roy zang <tie-fei.zang@freescale.com> | 2007-01-04 11:10:05 +0800 |
|---|---|---|
| committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2007-01-04 11:10:05 +0800 |
| commit | a41969e09b9d886091a804c2ba5f1ab84b084dd3 (patch) | |
| tree | 96d4b03713537e6c0a696e4770c23f9d39792666 /common | |
| parent | d3bb5ec198edad4869ac5276a5899881b7bf5433 (diff) | |
| parent | 92eb729bad876725aeea908d2addba0800620840 (diff) | |
| download | u-boot-imx-a41969e09b9d886091a804c2ba5f1ab84b084dd3.zip u-boot-imx-a41969e09b9d886091a804c2ba5f1ab84b084dd3.tar.gz u-boot-imx-a41969e09b9d886091a804c2ba5f1ab84b084dd3.tar.bz2 | |
Merge branch 'master' into hpc2
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_nvedit.c | 2 | ||||
| -rw-r--r-- | common/environment.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index d3f50f8..9834ba6 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -248,7 +248,7 @@ int _do_setenv (int flag, int argc, char *argv[]) baudrate); udelay(50000); gd->baudrate = baudrate; -#ifdef CONFIG_PPC +#if defined(CONFIG_PPC) || defined(CONFIG_MCF52x2) gd->bd->bi_baudrate = baudrate; #endif diff --git a/common/environment.c b/common/environment.c index 19bdeb0..1d425a7 100644 --- a/common/environment.c +++ b/common/environment.c @@ -61,6 +61,7 @@ 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 */ |