imx6ul: engicam: Drop isiot-mmc defconfig
Subsystems (3)
PATCH 1/3 imx6ul: engicam: Drop isiot-mmc defconfig
Engicam Is.IoT has eMMC and NAND cpu modules where MMC is common for both, so remove explicit mmc defconfig.
--- arch/arm/dts/Makefile | 1 - arch/arm/dts/imx6ul-isiot-mmc.dts | 50 ------------------------------------- board/engicam/imx6ul/MAINTAINERS | 1 - configs/imx6ul_isiot_emmc_defconfig | 2 ++ configs/imx6ul_isiot_mmc_defconfig | 44 -------------------------------- 5 files changed, 2 insertions(+), 96 deletions(-) delete mode 100644 arch/arm/dts/imx6ul-isiot-mmc.dts delete mode 100644 configs/imx6ul_isiot_mmc_defconfig
arch/arm/dts/Makefile +0 -1
@@ -396,7 +396,6 @@ dtb-$(CONFIG_MX6) += imx6ull-14x14-evk.dtb \ imx6sx-sdb.dtb \ imx6ul-geam-kit.dtb \ imx6ul-isiot-emmc.dtb \ - imx6ul-isiot-mmc.dtb \ imx6ul-isiot-nand.dtb \ imx6ul-opos6uldev.dtb
arch/arm/dts/imx6ul-isiot-mmc.dts deleted +0 -50
50 lines not on this page · raw message
board/engicam/imx6ul/MAINTAINERS +0 -1
@@ -10,6 +10,5 @@ F: configs/imx6ul_isiot_mmc_defconfig F: configs/imx6ul_isiot_nand_defconfig F: arch/arm/dts/imx6ul-geam-kit.dts F: arch/arm/dts/imx6ul-isiot.dtsi -F: arch/arm/dts/imx6ul-isiot-mmc.dts F: arch/arm/dts/imx6ul-isiot-emmc.dts F: arch/arm/dts/imx6ul-isiot-nand.dts
configs/imx6ul_isiot_emmc_defconfig +2 -0
@@ -23,6 +23,7 @@ CONFIG_SYS_PROMPT="isiotmx6ul> " CONFIG_CRC32_VERIFY=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_GPIO=y +CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y
@@ -33,6 +34,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_SYS_I2C_MXC=y CONFIG_PHYLIB=y CONFIG_PHY_SMSC=y CONFIG_FEC_MXC=y
configs/imx6ul_isiot_mmc_defconfig deleted +0 -44
44 lines not on this page · raw message
Signature · 1 line
2.14.2
PATCH 2/3 imx6: engicam: Drop SPL_EXT_SUPPORT
i.MX6 boards still using raw MMC write for SPL and u-boot-dtb.img along with Falcon mode configurations, so drop filesystem based write through SPL_EXT_SUPPORT.
--- configs/imx6qdl_icore_mipi_defconfig | 1 - configs/imx6qdl_icore_mmc_defconfig | 1 - configs/imx6qdl_icore_rqs_defconfig | 1 - configs/imx6ul_geam_mmc_defconfig | 1 - configs/imx6ul_isiot_emmc_defconfig | 1 - 5 files changed, 5 deletions(-)
configs/imx6qdl_icore_mipi_defconfig +0 -1
@@ -18,7 +18,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SPL=y -CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="icorem6qdl-mipi> "
configs/imx6qdl_icore_mmc_defconfig +0 -1
@@ -18,7 +18,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SPL=y -CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="icorem6qdl> "
configs/imx6qdl_icore_rqs_defconfig +0 -1
@@ -17,7 +17,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SPL=y -CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="icorem6qdl-rqs> "
configs/imx6ul_geam_mmc_defconfig +0 -1
@@ -17,7 +17,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SPL=y -CONFIG_SPL_EXT_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="geam6ul> " CONFIG_CRC32_VERIFY=y
configs/imx6ul_isiot_emmc_defconfig +0 -1
@@ -17,7 +17,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SPL=y -CONFIG_SPL_EXT_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="isiotmx6ul> " CONFIG_CRC32_VERIFY=y
Signature · 1 line
2.14.2
PATCH 2/3 imx6: engicam: Drop SPL_EXT_SUPPORT
Hi Jagan,
Quoted 6 lines · Jagan Teki
i.MX6 boards still using raw MMC write for SPL and u-boot-dtb.img along with Falcon mode configurations, so drop filesystem based write through
SPL_EXT_SUPPORT.Signed-off-by Jagan Teki <[email protected]>---
This is a fix, I pick it up (the whole series) for release.
Best regards,
Stefano
Quoted 68 lines
configs/imx6qdl_icore_mipi_defconfig | 1 - configs/imx6qdl_icore_mmc_defconfig | 1 - configs/imx6qdl_icore_rqs_defconfig | 1 - configs/imx6ul_geam_mmc_defconfig | 1 - configs/imx6ul_isiot_emmc_defconfig | 1 - 5 files changed, 5 deletions(-)configs/imx6qdl_icore_mipi_defconfig +0
-1@@ -18,7 +18,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SPL=y -CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="icorem6qdl-mipi> "configs/imx6qdl_icore_mmc_defconfig +0
-1@@ -18,7 +18,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SPL=y -CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="icorem6qdl> "configs/imx6qdl_icore_rqs_defconfig +0
-1@@ -17,7 +17,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SPL=y -CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="icorem6qdl-rqs> "configs/imx6ul_geam_mmc_defconfig +0
-1@@ -17,7 +17,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SPL=y -CONFIG_SPL_EXT_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="geam6ul> " CONFIG_CRC32_VERIFY=yconfigs/imx6ul_isiot_emmc_defconfig +0
-1@@ -17,7 +17,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SPL=y -CONFIG_SPL_EXT_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="isiotmx6ul> " CONFIG_CRC32_VERIFY=y
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 2/3 imx6: engicam: Drop SPL_EXT_SUPPORT
Quoted 11 lines · Stefano Babic
Hi Jagan,
Quoted 6 lines · Jagan Teki
i.MX6 boards still using raw MMC write for SPL and u-boot-dtb.img along with Falcon mode configurations, so drop filesystem based write through
SPL_EXT_SUPPORT.Signed-off-by Jagan Teki <[email protected]>---
This is a fix, I pick it up (the whole series) for release.
Yes, All these 3 patches seems to be fixes please pick them.
PATCH 3/3 imx6q: engicam: Use SPL_LOAD_FIT for MMC boards
In reply to Jagan TekiCurrently SPL_LOAD_FIT is unable to boot from nand on i.MX6QDL platform, so enable only for MMC boards.
--- arch/arm/mach-imx/mx6/Kconfig | 1 - board/engicam/imx6q/MAINTAINERS | 3 ++- configs/imx6dl_icore_nand_defconfig | 47 ++++++++++++++++++++++++++++++++++++ configs/imx6q_icore_nand_defconfig | 47 ++++++++++++++++++++++++++++++++++++ configs/imx6qdl_icore_mipi_defconfig | 1 + configs/imx6qdl_icore_mmc_defconfig | 1 + configs/imx6qdl_icore_rqs_defconfig | 1 + 7 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 configs/imx6dl_icore_nand_defconfig create mode 100644 configs/imx6q_icore_nand_defconfig
arch/arm/mach-imx/mx6/Kconfig +0 -1
@@ -238,7 +238,6 @@ config TARGET_MX6Q_ENGICAM select DM_MMC select DM_THERMAL select SUPPORT_SPL - select SPL_LOAD_FIT select SPL_DM if SPL select SPL_OF_CONTROL if SPL select SPL_SEPARATE_BSS if SPL
board/engicam/imx6q/MAINTAINERS +2 -1
@@ -4,7 +4,8 @@ S: Maintained F: board/engicam/imx6q F: include/configs/imx6-engicam.h F: configs/imx6qdl_icore_mmc_defconfig -F: configs/imx6qdl_icore_nand_defconfig +F: configs/imx6q_icore_nand_defconfig +F: configs/imx6dl_icore_nand_defconfig F: configs/imx6qdl_icore_rqs_defconfig F: arch/arm/dts/imx6qdl-icore.dtsi F: arch/arm/dts/imx6q-icore.dts
configs/imx6dl_icore_nand_defconfig new file +47 -0
47 lines not on this page · raw message
configs/imx6q_icore_nand_defconfig new file +47 -0
47 lines not on this page · raw message
configs/imx6qdl_icore_mipi_defconfig +1 -0
@@ -18,6 +18,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SPL=y +CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="icorem6qdl-mipi> "
configs/imx6qdl_icore_mmc_defconfig +1 -0
@@ -18,6 +18,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SPL=y +CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="icorem6qdl> "
configs/imx6qdl_icore_rqs_defconfig +1 -0
@@ -17,6 +17,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SPL=y +CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="icorem6qdl-rqs> "
Signature · 1 line
2.14.2