arm: mach-omap2: Generate MLO file from SD boot capable targets

[u-boot] / arch / powerpc / cpu / mpc5xxx / ide.c

diff --git a/arch/powerpc/cpu/mpc5xxx/ide.c b/arch/powerpc/cpu/mpc5xxx/ide.c
index 03cd7fd4e025a803b034701df93453887565a3a2..d1f43491840ecefe570e948f5c014ed16fd86e3f 100644 (file)
--- a/arch/powerpc/cpu/mpc5xxx/ide.c
+++ b/arch/powerpc/cpu/mpc5xxx/ide.c
@@ -8,7 +8,7 @@
  */
 #include <common.h>
 
-#if defined(CONFIG_CMD_IDE)
+#if defined(CONFIG_IDE)
 #include <mpc5xxx.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -41,19 +41,11 @@ int ide_preinit (void)
        /* All sample codes do that... */
        *(vu_long *) MPC5XXX_ATA_SHARE_COUNT = 0;
 
-#if defined(CONFIG_UC101)
-       /* Configure and reset host */
-       *(vu_long *) MPC5XXX_ATA_HOST_CONFIG =
-               MPC5xxx_ATA_HOSTCONF_SMR | MPC5xxx_ATA_HOSTCONF_FR;
-       udelay (10);
-       *(vu_long *) MPC5XXX_ATA_HOST_CONFIG = 0;
-#else
        /* Configure and reset host */
        *(vu_long *) MPC5XXX_ATA_HOST_CONFIG = MPC5xxx_ATA_HOSTCONF_IORDY |
                MPC5xxx_ATA_HOSTCONF_SMR | MPC5xxx_ATA_HOSTCONF_FR;
        udelay (10);
        *(vu_long *) MPC5XXX_ATA_HOST_CONFIG = MPC5xxx_ATA_HOSTCONF_IORDY;
-#endif
 
        /* Disable prefetch on Commbus */
        psdma->PtdCntrl |= 1;