Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit acbb4457ab95bc4d71380f12b78017db79748d58

Authored by Fabio Estevam
Committed by Stefano Babic
1 parent bf0c2245a2
Exists in master and in 54 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-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, 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_v2014.04_3.14.28_1.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, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, 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, v2017.01-smarct4x

mx6qsabresd: Fix booting the kernel from SDHC3 

Since commit de7d02aeb (mx6qsabresd: add usdhc2 and usdhc4 support)
SDHC3 device node is no longer 0, which breaks loading a uImage from SDHC3.

Fix it by adapting the default environment to use CONFIG_SYS_MMC_ENV_DEV as the
correct mmc node for loading the kernel from.

While at it, go back to using SDHC3 as the default mmc, since we have Yocto
images that generate an SD card containing U-boot,kernel and rootfs, so it is
more convenient to keep using SDHC3 as it was originally.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

include/configs/mx6qsabre_common.h
Diff comments   View file @ acbb445
... ... @@ -90,7 +90,7 @@
90 90 "console=" CONFIG_CONSOLE_DEV "\0" \
91 91 "fdt_high=0xffffffff\0" \
92 92 "initrd_high=0xffffffff\0" \
93   - "mmcdev=0\0" \" \
  93 + "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \" \
94 94 "mmcpart=1\0" \
95 95 "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
96 96 "mmcargs=setenv bootargs console=${console},${baudrate} " \
include/configs/mx6qsabresd.h
Diff comments   View file @ acbb445
... ... @@ -28,7 +28,7 @@
28 28  
29 29 #define CONFIG_SYS_FSL_USDHC_NUM 3
30 30 #if defined(CONFIG_ENV_IS_IN_MMC)
31   -#define CONFIG_SYS_MMC_ENV_DEV 2 /* eMMC/uSDHC4 */
  31 +#define CONFIG_SYS_MMC_ENV_DEV 1 /* SDHC3 */
32 32 #define CONFIG_SYS_MMC_ENV_PART 1 /* Boot partition 1 */
33 33 #endif
34 34