summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-05-17 23:11:21 +0200
committerWolfgang Denk <wd@denx.de>2010-05-17 23:11:21 +0200
commit1a1e6bf12b3155f47d2661793ceee3daded0d937 (patch)
tree9e1b80ccd824be1c6884a0af31a76c79bf4c7c54 /drivers
parenta2a0a7171303de5d8ce099344efde2e29ee36eb0 (diff)
parentbcb6c2bb84705bfd73eed5c9a31e9ff24833ee8c (diff)
downloadu-boot-imx-1a1e6bf12b3155f47d2661793ceee3daded0d937.zip
u-boot-imx-1a1e6bf12b3155f47d2661793ceee3daded0d937.tar.gz
u-boot-imx-1a1e6bf12b3155f47d2661793ceee3daded0d937.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'drivers')
-rw-r--r--drivers/block/fsl_sata.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/block/fsl_sata.c b/drivers/block/fsl_sata.c
index 8878560..4b97a0e 100644
--- a/drivers/block/fsl_sata.c
+++ b/drivers/block/fsl_sata.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Freescale Semiconductor, Inc.
+ * Copyright (C) 2008,2010 Freescale Semiconductor, Inc.
* Dave Liu <daveliu@freescale.com>
*
* This program is free software; you can redistribute it and/or
@@ -22,6 +22,7 @@
#include <command.h>
#include <asm/io.h>
#include <asm/processor.h>
+#include <asm/fsl_serdes.h>
#include <malloc.h>
#include <libata.h>
#include <fis.h>
@@ -129,6 +130,17 @@ int init_sata(int dev)
return -1;
}
+#ifdef CONFIG_MPC85xx
+ if ((dev == 0) && (!is_serdes_configured(SATA1))) {
+ printf("SATA%d [dev = %d] is not enabled\n", dev+1, dev);
+ return -1;
+ }
+ if ((dev == 1) && (!is_serdes_configured(SATA2))) {
+ printf("SATA%d [dev = %d] is not enabled\n", dev+1, dev);
+ return -1;
+ }
+#endif
+
/* Allocate SATA device driver struct */
sata = (fsl_sata_t *)malloc(sizeof(fsl_sata_t));
if (!sata) {