diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-30 23:00:34 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-30 23:00:34 +0200 |
| commit | d6694aff569a0838a9d0ef352128f5aa309d73ff (patch) | |
| tree | a94eeab5431dfd0ed91a510c2e7de5eebb7a78fc /drivers/block/dwc_ahsata.c | |
| parent | b5b8d85e9a50c2294b6043830cd045de1002dc5d (diff) | |
| parent | 3f4c01d9f9d38e383f004dcd06c0d5661f2a57e0 (diff) | |
| download | blackbird-obmc-uboot-d6694aff569a0838a9d0ef352128f5aa309d73ff.tar.gz blackbird-obmc-uboot-d6694aff569a0838a9d0ef352128f5aa309d73ff.zip | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/block/dwc_ahsata.c')
| -rw-r--r-- | drivers/block/dwc_ahsata.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/block/dwc_ahsata.c b/drivers/block/dwc_ahsata.c index 3569214297..15d65d77f3 100644 --- a/drivers/block/dwc_ahsata.c +++ b/drivers/block/dwc_ahsata.c @@ -17,6 +17,7 @@ #include <asm/io.h> #include <linux/bitops.h> #include <asm/arch/clock.h> +#include <asm/arch/sys_proto.h> #include "dwc_ahsata.h" struct sata_port_regs { @@ -558,6 +559,10 @@ int init_sata(int dev) u32 linkmap; struct ahci_probe_ent *probe_ent = NULL; +#if defined(CONFIG_MX6) + if (!is_cpu_type(MXC_CPU_MX6Q) && !is_cpu_type(MXC_CPU_MX6D)) + return 1; +#endif if (dev < 0 || dev > (CONFIG_SYS_SATA_MAX_DEVICE - 1)) { printf("The sata index %d is out of ranges\n\r", dev); return -1; |
