Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 3d409153502f25a1ea3b8b4e9940148b7871273d

Authored by Jagan Teki
Committed by Stefano Babic
1 parent ac738a4a7b
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, 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_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.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

imx6q: engicam: Use SPL_LOAD_FIT for MMC boards 

Currently SPL_LOAD_FIT is unable to boot from nand on
i.MX6QDL platform, so enable only for MMC boards.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>

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

arch/arm/mach-imx/mx6/Kconfig
Diff comments   View file @ 3d40915
... ... @@ -238,7 +238,6 @@
238 238 select DM_MMC
239 239 select DM_THERMAL
240 240 select SUPPORT_SPL
241   - select SPL_LOAD_FIT
242 241 select SPL_DM if SPL
243 242 select SPL_OF_CONTROL if SPL
244 243 select SPL_SEPARATE_BSS if SPL
board/engicam/imx6q/MAINTAINERS
Diff comments   View file @ 3d40915
... ... @@ -4,9 +4,11 @@
4 4 F: board/engicam/imx6q
5 5 F: include/configs/imx6-engicam.h
6 6 F: configs/imx6qdl_icore_mmc_defconfig
7   -F: configs/imx6qdl_icore_nand_defconfig
  7 +F: configs/imx6q_icore_nand_defconfig
  8 +F: configs/imx6dl_icore_nand_defconfig
8 9 F: configs/imx6qdl_icore_rqs_defconfig
9 10 F: configs/imx6qdl_icore_mipi_defconfig
  11 +F: configs/imx6qdl_icore_nand_defconfig
10 12 F: arch/arm/dts/imx6qdl-icore.dtsi
11 13 F: arch/arm/dts/imx6q-icore.dts
12 14 F: arch/arm/dts/imx6dl-icore.dts
configs/imx6dl_icore_nand_defconfig
Diff comments   View file @ 3d40915
  1 +CONFIG_ARM=y
  2 +CONFIG_ARCH_MX6=y
  3 +CONFIG_SYS_TEXT_BASE=0x17800000
  4 +CONFIG_SPL_GPIO_SUPPORT=y
  5 +CONFIG_SPL_LIBCOMMON_SUPPORT=y
  6 +CONFIG_SPL_LIBGENERIC_SUPPORT=y
  7 +CONFIG_TARGET_MX6Q_ENGICAM=y
  8 +CONFIG_SPL_SERIAL_SUPPORT=y
  9 +CONFIG_SPL_WATCHDOG_SUPPORT=y
  10 +# CONFIG_CMD_BMODE is not set
  11 +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore"
  12 +CONFIG_FIT=y
  13 +CONFIG_FIT_SIGNATURE=y
  14 +CONFIG_FIT_VERBOSE=y
  15 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  16 +CONFIG_BOOTDELAY=3
  17 +CONFIG_SPL=y
  18 +CONFIG_SPL_DMA_SUPPORT=y
  19 +CONFIG_HUSH_PARSER=y
  20 +CONFIG_SYS_PROMPT="icorem6qdl> "
  21 +CONFIG_CMD_MEMTEST=y
  22 +CONFIG_CMD_GPIO=y
  23 +CONFIG_CMD_I2C=y
  24 +CONFIG_CMD_MMC=y
  25 +CONFIG_CMD_MII=y
  26 +CONFIG_CMD_PING=y
  27 +CONFIG_CMD_CACHE=y
  28 +CONFIG_CMD_EXT4=y
  29 +CONFIG_CMD_EXT4_WRITE=y
  30 +CONFIG_CMD_FAT=y
  31 +CONFIG_CMD_FS_GENERIC=y
  32 +CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
  33 +CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:2m(spl),2m(uboot),1m(env),8m(kernel),1m(dtb),-(rootfs)"
  34 +CONFIG_CMD_UBI=y
  35 +CONFIG_ENV_IS_IN_NAND=y
  36 +CONFIG_SYS_I2C_MXC=y
  37 +CONFIG_NAND=y
  38 +CONFIG_NAND_MXS=y
  39 +CONFIG_PHYLIB=y
  40 +CONFIG_PHY_SMSC=y
  41 +CONFIG_FEC_MXC=y
  42 +CONFIG_PINCTRL=y
  43 +CONFIG_PINCTRL_IMX6=y
  44 +CONFIG_MXC_UART=y
  45 +CONFIG_IMX_THERMAL=y
  46 +CONFIG_VIDEO=y
  47 +CONFIG_VIDEO_IPUV3=y
configs/imx6q_icore_nand_defconfig
Diff comments   View file @ 3d40915
  1 +CONFIG_ARM=y
  2 +CONFIG_ARCH_MX6=y
  3 +CONFIG_SYS_TEXT_BASE=0x17800000
  4 +CONFIG_SPL_GPIO_SUPPORT=y
  5 +CONFIG_SPL_LIBCOMMON_SUPPORT=y
  6 +CONFIG_SPL_LIBGENERIC_SUPPORT=y
  7 +CONFIG_TARGET_MX6Q_ENGICAM=y
  8 +CONFIG_SPL_SERIAL_SUPPORT=y
  9 +CONFIG_SPL_WATCHDOG_SUPPORT=y
  10 +# CONFIG_CMD_BMODE is not set
  11 +CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore"
  12 +CONFIG_FIT=y
  13 +CONFIG_FIT_SIGNATURE=y
  14 +CONFIG_FIT_VERBOSE=y
  15 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  16 +CONFIG_BOOTDELAY=3
  17 +CONFIG_SPL=y
  18 +CONFIG_SPL_DMA_SUPPORT=y
  19 +CONFIG_HUSH_PARSER=y
  20 +CONFIG_SYS_PROMPT="icorem6qdl> "
  21 +CONFIG_CMD_MEMTEST=y
  22 +CONFIG_CMD_GPIO=y
  23 +CONFIG_CMD_I2C=y
  24 +CONFIG_CMD_MMC=y
  25 +CONFIG_CMD_MII=y
  26 +CONFIG_CMD_PING=y
  27 +CONFIG_CMD_CACHE=y
  28 +CONFIG_CMD_EXT4=y
  29 +CONFIG_CMD_EXT4_WRITE=y
  30 +CONFIG_CMD_FAT=y
  31 +CONFIG_CMD_FS_GENERIC=y
  32 +CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
  33 +CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:2m(spl),2m(uboot),1m(env),8m(kernel),1m(dtb),-(rootfs)"
  34 +CONFIG_CMD_UBI=y
  35 +CONFIG_ENV_IS_IN_NAND=y
  36 +CONFIG_SYS_I2C_MXC=y
  37 +CONFIG_NAND=y
  38 +CONFIG_NAND_MXS=y
  39 +CONFIG_PHYLIB=y
  40 +CONFIG_PHY_SMSC=y
  41 +CONFIG_FEC_MXC=y
  42 +CONFIG_PINCTRL=y
  43 +CONFIG_PINCTRL_IMX6=y
  44 +CONFIG_MXC_UART=y
  45 +CONFIG_IMX_THERMAL=y
  46 +CONFIG_VIDEO=y
  47 +CONFIG_VIDEO_IPUV3=y
configs/imx6qdl_icore_mipi_defconfig
Diff comments   View file @ 3d40915
... ... @@ -18,6 +18,7 @@
18 18 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
19 19 CONFIG_BOOTDELAY=3
20 20 CONFIG_SPL=y
  21 +CONFIG_SPL_LOAD_FIT=y
21 22 CONFIG_SPL_OS_BOOT=y
22 23 CONFIG_HUSH_PARSER=y
23 24 CONFIG_SYS_PROMPT="icorem6qdl-mipi> "
configs/imx6qdl_icore_mmc_defconfig
Diff comments   View file @ 3d40915
... ... @@ -18,6 +18,7 @@
18 18 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
19 19 CONFIG_BOOTDELAY=3
20 20 CONFIG_SPL=y
  21 +CONFIG_SPL_LOAD_FIT=y
21 22 CONFIG_SPL_OS_BOOT=y
22 23 CONFIG_HUSH_PARSER=y
23 24 CONFIG_SYS_PROMPT="icorem6qdl> "
configs/imx6qdl_icore_rqs_defconfig
Diff comments   View file @ 3d40915
... ... @@ -17,6 +17,7 @@
17 17 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
18 18 CONFIG_BOOTDELAY=3
19 19 CONFIG_SPL=y
  20 +CONFIG_SPL_LOAD_FIT=y
20 21 CONFIG_SPL_OS_BOOT=y
21 22 CONFIG_HUSH_PARSER=y
22 23 CONFIG_SYS_PROMPT="icorem6qdl-rqs> "