ARCH: imx: Call sata_remove() not on imx6 duallite/solo boards
authorLudwig Zenz <lzenz@dh-electronics.com>
Tue, 2 Jul 2019 13:10:52 +0000 (15:10 +0200)
committerStefano Babic <sbabic@denx.de>
Fri, 19 Jul 2019 18:32:24 +0000 (20:32 +0200)
For a single binary approach for imx6 quad/dual/duallite/solo it
is necessary to enable CONFIG_SATA for quad/dual. On the other hand
on imx6 duallite/sole SATA is not available.
Therefore sata_remove() is skipped according to a blacklist scheme.

Adding further imx derivates is probably not recessary as they are
usually not pin-compatible and therefore a different board with its
own configuration.

Signed-off-by: Ludwig Zenz <lzenz@dh-electronics.com>
arch/arm/mach-imx/cpu.c

index 3a8cf30c0655819fed421ab29f2fd015480dda1d..6e9a17521097744abe3666c62a716cb0d4178e2c 100644 (file)
@@ -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 */