diff options
author | Tom Rini | 2019-07-27 09:35:05 -0400 |
---|---|---|
committer | Tom Rini | 2019-07-27 09:35:05 -0400 |
commit | df9a7a195bdf0722399199bf373afc8309ae3ad7 (patch) | |
tree | 5bf1e2e3388725131640aac7d120647820ca5b48 /arch/arm/mach-imx/cpu.c | |
parent | 222701e157176a66628e4f399f52ca3307b018c9 (diff) | |
parent | 4a6f5b4f56b8bc6f36736fc0a07c5c4f9069e69b (diff) |
Merge tag 'u-boot-imx-20190719' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
u-boot-imx-20190719
- CCF for i.MX6
- nandbcb command to write SPL into NAND
- Switch to DM (i.MX28)
- Boards: Toradex, engicam, DH
- Fixes for i.MX8
- Fixes for i.MX7ULP
Travis: https://travis-ci.org/sbabic/u-boot-imx/builds/561147504
Diffstat (limited to 'arch/arm/mach-imx/cpu.c')
-rw-r--r-- | arch/arm/mach-imx/cpu.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index 3a8cf30c065..6e9a1752109 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -289,10 +289,12 @@ void arch_preboot_os(void) imx_pcie_remove(); #endif #if defined(CONFIG_SATA) - sata_remove(0); + if (!is_mx6sdl()) { + sata_remove(0); #if defined(CONFIG_MX6) - disable_sata_clock(); + disable_sata_clock(); #endif + } #endif #if defined(CONFIG_VIDEO_IPUV3) /* disable video before launching O/S */ |