diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-08-10 23:03:15 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-08-10 23:03:15 +0200 |
| commit | b9d51fbb18097975ff86d3a7b4a21a92a1b345f0 (patch) | |
| tree | 1e062ddf881089872f49fb4ea3dcfc05c439f021 /common | |
| parent | 42441b8a1a3e8b42459de60bbec6833a31cd6cd5 (diff) | |
| parent | b77f380115028ef4b6cc59fc5ba332a6e31b4326 (diff) | |
| download | blackbird-obmc-uboot-b9d51fbb18097975ff86d3a7b4a21a92a1b345f0.tar.gz blackbird-obmc-uboot-b9d51fbb18097975ff86d3a7b4a21a92a1b345f0.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_ide.c | 25 | ||||
| -rw-r--r-- | common/cmd_mmc.c | 2 |
2 files changed, 17 insertions, 10 deletions
diff --git a/common/cmd_ide.c b/common/cmd_ide.c index c0fb88dbc7..6aeca76784 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -25,6 +25,7 @@ /* * IDE support */ + #include <common.h> #include <config.h> #include <watchdog.h> @@ -45,6 +46,12 @@ #include <mpc5xxx.h> #endif +#ifdef CONFIG_ORION5X +#include <asm/arch/orion5x.h> +#elif defined CONFIG_KIRKWOOD +#include <asm/arch/kirkwood.h> +#endif + #include <ide.h> #include <ata.h> @@ -847,7 +854,7 @@ input_swap_data(int dev, ulong *sect_buf, int words) #endif /* __LITTLE_ENDIAN || CONFIG_AU1X00 */ -#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA) || defined(CONFIG_SH) +#if defined(CONFIG_IDE_SWAP_IO) static void output_data(int dev, ulong *sect_buf, int words) { @@ -891,15 +898,15 @@ output_data(int dev, ulong *sect_buf, int words) } #endif } -#else /* ! __PPC__ */ +#else /* ! CONFIG_IDE_SWAP_IO */ static void output_data(int dev, ulong *sect_buf, int words) { outsw(ATA_CURR_BASE(dev)+ATA_DATA_REG, sect_buf, words<<1); } -#endif /* __PPC__ */ +#endif /* CONFIG_IDE_SWAP_IO */ -#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA) || defined(CONFIG_SH) +#if defined(CONFIG_IDE_SWAP_IO) static void input_data(int dev, ulong *sect_buf, int words) { @@ -949,14 +956,14 @@ input_data(int dev, ulong *sect_buf, int words) } #endif } -#else /* ! __PPC__ */ +#else /* ! CONFIG_IDE_SWAP_IO */ static void input_data(int dev, ulong *sect_buf, int words) { insw(ATA_CURR_BASE(dev)+ATA_DATA_REG, sect_buf, words << 1); } -#endif /* __PPC__ */ +#endif /* CONFIG_IDE_SWAP_IO */ /* ------------------------------------------------------------------------- */ @@ -1573,7 +1580,7 @@ int ide_device_present(int dev) * ATAPI Support */ -#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA) +#if defined(CONFIG_IDE_SWAP_IO) /* since ATAPI may use commands with not 4 bytes alligned length * we have our own transfer functions, 2 bytes alligned */ static void @@ -1640,7 +1647,7 @@ input_data_shorts(int dev, ushort *sect_buf, int shorts) #endif } -#else /* ! __PPC__ */ +#else /* ! CONFIG_IDE_SWAP_IO */ static void output_data_shorts(int dev, ushort *sect_buf, int shorts) { @@ -1653,7 +1660,7 @@ input_data_shorts(int dev, ushort *sect_buf, int shorts) insw(ATA_CURR_BASE(dev)+ATA_DATA_REG, sect_buf, shorts); } -#endif /* __PPC__ */ +#endif /* CONFIG_IDE_SWAP_IO */ /* * Wait until (Status & mask) == res, or timeout (in ms) diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index a6ed6a84e8..c0b30d8b86 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -133,7 +133,7 @@ int do_mmcinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) U_BOOT_CMD( mmcinfo, 2, 0, do_mmcinfo, "display MMC info", - "<dev num>\n + "<dev num>\n" " - device number of the device to dislay info of\n" "" ); |
