Merge branch 'master' of ../work into next

[u-boot] / common / cmd_ide.c

diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index d86bf370302bf7ad1a760ac2019b7e33fc99a21a..ec9a1df38e778483237fb2241d1d05d15c323017 100644 (file)
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -45,10 +45,6 @@
 #include <mpc5xxx.h>
 #endif
 
-#ifdef CONFIG_MPC512X
-#include <mpc512x.h>
-#endif
-
 #include <ide.h>
 #include <ata.h>
 
@@ -1628,6 +1624,14 @@ static void ide_led (uchar led, uchar status)
 
 #endif /* CONFIG_IDE_LED */
 
+#if defined(CONFIG_OF_IDE_FIXUP)
+int ide_device_present(int dev)
+{
+       if (dev >= CONFIG_SYS_IDE_MAXBUS)
+               return 0;
+       return (ide_dev_desc[dev].type == DEV_TYPE_UNKNOWN ? 0 : 1);
+}
+#endif
 /* ------------------------------------------------------------------------- */
 
 #ifdef CONFIG_ATAPI
@@ -2108,11 +2112,11 @@ U_BOOT_CMD(
        "ide read  addr blk# cnt\n"
        "ide write addr blk# cnt - read/write `cnt'"
        " blocks starting at block `blk#'\n"
-       "    to/from memory address `addr'\n"
+       "    to/from memory address `addr'"
 );
 
 U_BOOT_CMD(
        diskboot,       3,      1,      do_diskboot,
        "boot from IDE device",
-       "loadAddr dev:part\n"
+       "loadAddr dev:part"
 );