From af92ba299b2b87cde02bbd4f534f1a30b45552cd Mon Sep 17 00:00:00 2001 From: Ye Li Date: Mon, 11 Jun 2018 06:24:10 -0700 Subject: [PATCH] MLK-18568 imx8: disable the DM devices removing In u-boot 2018, all DM devices will be removed before jumping to kernel. It executes after the board_quiesce_devices where we turn off the power domain of the devices used in u-boot. Thus, this cause crash when removing DM devies. This patch disables the CONFIG_DM_DEVICE_REMOVE, since it is useless for imx8 and is not compatibled with current power domain implemenation. Signed-off-by: Ye Li Acked-by: Peng Fan --- configs/imx8qm_ddr4_arm2_defconfig | 1 + configs/imx8qm_lpddr4_arm2_defconfig | 1 + configs/imx8qm_lpddr4_arm2_fspi_defconfig | 1 + configs/imx8qm_mek_defconfig | 1 + configs/imx8qm_mek_fspi_defconfig | 1 + configs/imx8qxp_ddr3_arm2_defconfig | 1 + configs/imx8qxp_lpddr4_arm2_defconfig | 1 + configs/imx8qxp_lpddr4_arm2_fspi_defconfig | 1 + configs/imx8qxp_lpddr4_arm2_nand_defconfig | 3 ++- configs/imx8qxp_mek_defconfig | 1 + configs/imx8qxp_mek_fspi_defconfig | 1 + 11 files changed, 12 insertions(+), 1 deletion(-) diff --git a/configs/imx8qm_ddr4_arm2_defconfig b/configs/imx8qm_ddr4_arm2_defconfig index 82ef5d1bd1..a7f500bda3 100644 --- a/configs/imx8qm_ddr4_arm2_defconfig +++ b/configs/imx8qm_ddr4_arm2_defconfig @@ -81,3 +81,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_DM_DEVICE_REMOVE=n diff --git a/configs/imx8qm_lpddr4_arm2_defconfig b/configs/imx8qm_lpddr4_arm2_defconfig index 833aa19f0d..6d6923653c 100644 --- a/configs/imx8qm_lpddr4_arm2_defconfig +++ b/configs/imx8qm_lpddr4_arm2_defconfig @@ -81,3 +81,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_DM_DEVICE_REMOVE=n diff --git a/configs/imx8qm_lpddr4_arm2_fspi_defconfig b/configs/imx8qm_lpddr4_arm2_fspi_defconfig index 593bbc4082..abc18d55cb 100644 --- a/configs/imx8qm_lpddr4_arm2_fspi_defconfig +++ b/configs/imx8qm_lpddr4_arm2_fspi_defconfig @@ -82,3 +82,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_DM_DEVICE_REMOVE=n diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig index 71573651d8..96c789df85 100644 --- a/configs/imx8qm_mek_defconfig +++ b/configs/imx8qm_mek_defconfig @@ -82,3 +82,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_DM_DEVICE_REMOVE=n diff --git a/configs/imx8qm_mek_fspi_defconfig b/configs/imx8qm_mek_fspi_defconfig index 685b936650..64b6fe06a8 100644 --- a/configs/imx8qm_mek_fspi_defconfig +++ b/configs/imx8qm_mek_fspi_defconfig @@ -83,3 +83,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_DM_DEVICE_REMOVE=n diff --git a/configs/imx8qxp_ddr3_arm2_defconfig b/configs/imx8qxp_ddr3_arm2_defconfig index 4a630ac184..0b1b788ab3 100644 --- a/configs/imx8qxp_ddr3_arm2_defconfig +++ b/configs/imx8qxp_ddr3_arm2_defconfig @@ -81,3 +81,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_DM_DEVICE_REMOVE=n diff --git a/configs/imx8qxp_lpddr4_arm2_defconfig b/configs/imx8qxp_lpddr4_arm2_defconfig index 926521a49f..31db8b712e 100644 --- a/configs/imx8qxp_lpddr4_arm2_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_defconfig @@ -81,3 +81,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_DM_DEVICE_REMOVE=n diff --git a/configs/imx8qxp_lpddr4_arm2_fspi_defconfig b/configs/imx8qxp_lpddr4_arm2_fspi_defconfig index adec556b10..5cd5950979 100644 --- a/configs/imx8qxp_lpddr4_arm2_fspi_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_fspi_defconfig @@ -81,3 +81,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_DM_DEVICE_REMOVE=n diff --git a/configs/imx8qxp_lpddr4_arm2_nand_defconfig b/configs/imx8qxp_lpddr4_arm2_nand_defconfig index 56e649d100..e55bec9462 100644 --- a/configs/imx8qxp_lpddr4_arm2_nand_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_nand_defconfig @@ -76,4 +76,5 @@ CONFIG_IMX8_POWER_DOMAIN=y CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y -CONFIG_ENV_IS_IN_NAND=y \ No newline at end of file +CONFIG_ENV_IS_IN_NAND=y +CONFIG_DM_DEVICE_REMOVE=n diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig index 8e5a1ede93..f2689998cb 100644 --- a/configs/imx8qxp_mek_defconfig +++ b/configs/imx8qxp_mek_defconfig @@ -83,3 +83,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_DM_DEVICE_REMOVE=n diff --git a/configs/imx8qxp_mek_fspi_defconfig b/configs/imx8qxp_mek_fspi_defconfig index b74bc19dce..81181e7ed1 100644 --- a/configs/imx8qxp_mek_fspi_defconfig +++ b/configs/imx8qxp_mek_fspi_defconfig @@ -84,3 +84,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_ENV_IS_IN_SPI_FLASH=y +CONFIG_DM_DEVICE_REMOVE=n