summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2016-05-03 14:24:33 +0800
committerYe Li <ye.li@nxp.com>2016-05-03 14:36:07 +0800
commit39ea1ae1f0d68871c070b7db3e67435069c21254 (patch)
tree60b371c48e65dc8f2d5324ba5b16d43e4695a857 /drivers
parent0a4b78f3b376aaede9d693bcf8aba359390cab27 (diff)
downloadu-boot-imx-39ea1ae1f0d68871c070b7db3e67435069c21254.zip
u-boot-imx-39ea1ae1f0d68871c070b7db3e67435069c21254.tar.gz
u-boot-imx-39ea1ae1f0d68871c070b7db3e67435069c21254.tar.bz2
MLK-12737 mx6qp/mx6dp: Fix runtime CPU type checking issue
2016 u-boot added dummy CPU types for the i.MX6QP and i.MX6DP. When doing runtime cpu type checking, we can't use CPU type of i.MX6Q and i.MX6D for them more, which is ok in 2015 u-boot. This patch adds the MXC_CPU_MX6QP and MXC_CPU_MX6DP at some places missed to do the checking. Signed-off-by: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/block/dwc_ahsata.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/dwc_ahsata.c b/drivers/block/dwc_ahsata.c
index bc072f3..f3acb82 100644
--- a/drivers/block/dwc_ahsata.c
+++ b/drivers/block/dwc_ahsata.c
@@ -563,7 +563,8 @@ int init_sata(int dev)
struct ahci_probe_ent *probe_ent = NULL;
#if defined(CONFIG_MX6)
- if (!is_cpu_type(MXC_CPU_MX6Q) && !is_cpu_type(MXC_CPU_MX6D))
+ if (!is_cpu_type(MXC_CPU_MX6Q) && !is_cpu_type(MXC_CPU_MX6D) &&
+ !is_cpu_type(MXC_CPU_MX6QP) && !is_cpu_type(MXC_CPU_MX6DP))
return 1;
#endif
if (dev < 0 || dev > (CONFIG_SYS_SATA_MAX_DEVICE - 1)) {