summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-11-07 13:42:26 +0000
committerwdenk <wdenk>2003-11-07 13:42:26 +0000
commit5cf9da4821db0b6d86d8bbb74af86a0303063201 (patch)
tree7173b1bb9eb0611765921aee5312a7c4d9ac67ad /common
parentb13fb01a62708492cae4b33c4d6fa9ae127905f4 (diff)
downloadtalos-obmc-uboot-5cf9da4821db0b6d86d8bbb74af86a0303063201.tar.gz
talos-obmc-uboot-5cf9da4821db0b6d86d8bbb74af86a0303063201.zip
* Patch by Bernhard Kuhn, 28 Oct 2003:
Add low boot support for MPC5200 * Fix problem with dual PCMCIA support (NSCU) * Fix MPC5200 I2C initialization function
Diffstat (limited to 'common')
-rw-r--r--common/cmd_ide.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index 21a666644f..45f6368a76 100644
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -631,6 +631,7 @@ void ide_init (void)
#ifdef CONFIG_IDE_LED
int led = (IDE_BUS(i) == 0) ? LED_IDE1 : LED_IDE2;
#endif
+ ide_dev_desc[i].type=DEV_TYPE_UNKNOWN;
ide_dev_desc[i].if_type=IF_TYPE_IDE;
ide_dev_desc[i].dev=i;
ide_dev_desc[i].part_type=PART_TYPE_UNKNOWN;
@@ -991,11 +992,9 @@ static void ide_ident (block_dev_desc_t *dev_desc)
if (retries == 0) {
do_retry = 1;
} else {
- dev_desc->type=DEV_TYPE_UNKNOWN;
return;
}
#else
- dev_desc->type=DEV_TYPE_UNKNOWN;
return;
#endif /* CONFIG_AMIGAONEG3SE */
}
OpenPOWER on IntegriCloud