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 | |
| parent | d45963854eff39d575124d859419bb4953ce2c87 (diff) | |
| parent | 66dcad3a9a53e0766d90e0084123bd8529522fb0 (diff) | |
| download | talos-obmc-uboot-6b6f287a33ae8c340f97fb08ed95b6687e2baa4b.tar.gz talos-obmc-uboot-6b6f287a33ae8c340f97fb08ed95b6687e2baa4b.zip | |
Merge ../u-boot
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_nand.c | 6 | ||||
| -rw-r--r-- | common/environment.c | 13 |
2 files changed, 6 insertions, 13 deletions
diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 254a7755fc..1fdd7a67f6 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -161,7 +161,11 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) ulong addr, off, size; char *cmd, *s; nand_info_t *nand; +#ifdef CFG_NAND_QUIET + int quiet = CFG_NAND_QUIET; +#else int quiet = 0; +#endif const char *quiet_str = getenv("quiet"); /* at least two arguments please */ @@ -452,7 +456,7 @@ U_BOOT_CMD(nand, 5, 1, do_nand, "info - show available NAND devices\n" "nand device [dev] - show or set current device\n" "nand read[.jffs2] - addr off|partition size\n" - "nand write[.jffs2] - addr off|partiton size - read/write `size' bytes starting\n" + "nand write[.jffs2] - addr off|partition size - read/write `size' bytes starting\n" " at offset `off' to/from memory address `addr'\n" "nand erase [clean] [off size] - erase `size' bytes from\n" " offset `off' (entire device if not specified)\n" diff --git a/common/environment.c b/common/environment.c index 1d425a7309..24257f7c52 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"))) |
