Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 44b9841d7898a03e73b5054f56303514a5b35db8

Authored by Nikita Kiryanov
Committed by Stefano Babic
1 parent 9cad354425
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

arm: imx: stop sata on boot 

Ideally, the Linux kernel should get the hardware in its most
untouched state. For the most part, U-Boot does not reset the various
subsystems it touches before boot, and usually Linux deals with it, but
on some boards (cm_fx6) the Linux kernel fails to detect the ssd
correctly if sata is used by U-Boot.

Power off sata on OS boot so that Linux will have a clean state to work
with.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Stefano Babic <sbabic@denx.de>

Showing 1 changed file with 6 additions and 2 deletions Side-by-side Diff

arch/arm/imx-common/cpu.c
Diff comments   View file @ 44b9841
... ... @@ -18,6 +18,7 @@
18 18 #include <asm/arch/crm_regs.h>
19 19 #include <ipu_pixfmt.h>
20 20 #include <thermal.h>
  21 +#include <sata.h>
21 22  
22 23 #ifdef CONFIG_FSL_ESDHC
23 24 #include <fsl_esdhc.h>
24 25  
25 26  
26 27  
... ... @@ -201,13 +202,16 @@
201 202 return get_periph_clk() / (ahb_podf + 1);
202 203 }
203 204  
204   -#if defined(CONFIG_VIDEO_IPUV3)
205 205 void arch_preboot_os(void)
206 206 {
  207 +#if defined(CONFIG_CMD_SATA)
  208 + sata_stop();
  209 +#endif
  210 +#if defined(CONFIG_VIDEO_IPUV3)
207 211 /* disable video before launching O/S */
208 212 ipuv3_fb_shutdown();
209   -}
210 213 #endif
  214 +}
211 215  
212 216 void set_chipselect_size(int const cs_size)
213 217 {