@ -150,23 +150,25 @@ static int mvsata_ide_initialize_port(struct mvsata_port_registers *port)
int ide_preinit ( void )
int ide_preinit ( void )
{
{
int ret = MVSATA_STATUS_TIMEOUT ;
int status ;
int status ;
/* Enable ATA port 0 (could be SATA port 0 or 1) if declared */
/* Enable ATA port 0 (could be SATA port 0 or 1) if declared */
# if defined(CONFIG_SYS_ATA_IDE0_OFFSET)
# if defined(CONFIG_SYS_ATA_IDE0_OFFSET)
status = mvsata_ide_initialize_port (
status = mvsata_ide_initialize_port (
( struct mvsata_port_registers * )
( struct mvsata_port_registers * )
( CONFIG_SYS_ATA_BASE_ADDR + CONFIG_SYS_ATA_IDE0_OFFSET ) ) ;
( CONFIG_SYS_ATA_BASE_ADDR + CONFIG_SYS_ATA_IDE0_OFFSET ) ) ;
if ( status )
if ( status = = MVSATA_STATUS_OK )
return status ;
ret = MVSATA_STATUS_OK ;
# endif
# endif
/* Enable ATA port 1 (could be SATA port 0 or 1) if declared */
/* Enable ATA port 1 (could be SATA port 0 or 1) if declared */
# if defined(CONFIG_SYS_ATA_IDE1_OFFSET)
# if defined(CONFIG_SYS_ATA_IDE1_OFFSET)
status = mvsata_ide_initialize_port (
status = mvsata_ide_initialize_port (
( struct mvsata_port_registers * )
( struct mvsata_port_registers * )
( CONFIG_SYS_ATA_BASE_ADDR + CONFIG_SYS_ATA_IDE1_OFFSET ) ) ;
( CONFIG_SYS_ATA_BASE_ADDR + CONFIG_SYS_ATA_IDE1_OFFSET ) ) ;
if ( status )
if ( status = = MVSATA_STATUS_OK )
return status ;
ret = MVSATA_STATUS_OK ;
# endif
# endif
/* return success if all ports initializations succeeded */
/* Return success if at least one port initialization succeeded */
return MVSATA_STATUS_OK ;
return ret ;
}
}