From 0b1f68007a0a8a975912c126bce25589e7a729f3 Mon Sep 17 00:00:00 2001 From: Ye Li Date: Thu, 8 Aug 2019 19:51:44 -0700 Subject: [PATCH] MLK-22417 imx8qxp_mek: Fix build break in fspi defconfig When CI_UDC DM driver is enabled in SPL, it must enable EHCI host. Then when building SPL DM USB host, the usb_hub.c requires to enable SPL ENV. The imx8qxp fspi config save ENV in MMC due to fspi can't write when running with M4. But MMC driver is not enabled in fspi SPL, so the build was broken. Fix the issue by adding CONFIG_SPL_ENV_IS_NOWHERE to all defconfig with SPL ENV is enabled. Signed-off-by: Ye Li --- configs/imx8dx_17x17_val_defconfig | 1 + configs/imx8dxl_phantom_mek_defconfig | 1 + configs/imx8dxl_phantom_mek_fspi_defconfig | 1 + 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_17x17_val_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 | 1 + configs/imx8qxp_mek_defconfig | 1 + configs/imx8qxp_mek_fspi_defconfig | 1 + 15 files changed, 15 insertions(+) diff --git a/configs/imx8dx_17x17_val_defconfig b/configs/imx8dx_17x17_val_defconfig index 80d3075fd4..8b609fc7c0 100644 --- a/configs/imx8dx_17x17_val_defconfig +++ b/configs/imx8dx_17x17_val_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL_DOS_PARTITION=n CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_SPL_ENV_IS_NOWHERE=y CONFIG_USE_TINY_PRINTF=y CONFIG_SPL=y CONFIG_PANIC_HANG=y diff --git a/configs/imx8dxl_phantom_mek_defconfig b/configs/imx8dxl_phantom_mek_defconfig index 20d55c2b86..24ca4f6d1b 100644 --- a/configs/imx8dxl_phantom_mek_defconfig +++ b/configs/imx8dxl_phantom_mek_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL_DOS_PARTITION=n CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_SPL_ENV_IS_NOWHERE=y CONFIG_USE_TINY_PRINTF=y CONFIG_SPL=y CONFIG_PANIC_HANG=y diff --git a/configs/imx8dxl_phantom_mek_fspi_defconfig b/configs/imx8dxl_phantom_mek_fspi_defconfig index c7312dadad..cc13a3ece6 100644 --- a/configs/imx8dxl_phantom_mek_fspi_defconfig +++ b/configs/imx8dxl_phantom_mek_fspi_defconfig @@ -15,6 +15,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_NOR_SUPPORT=y +CONFIG_SPL_ENV_IS_NOWHERE=y CONFIG_USE_TINY_PRINTF=y CONFIG_SPL=y CONFIG_PANIC_HANG=y diff --git a/configs/imx8qm_ddr4_arm2_defconfig b/configs/imx8qm_ddr4_arm2_defconfig index 480985a272..f66dc11ab5 100644 --- a/configs/imx8qm_ddr4_arm2_defconfig +++ b/configs/imx8qm_ddr4_arm2_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL_DOS_PARTITION=n CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_SPL_ENV_IS_NOWHERE=y CONFIG_USE_TINY_PRINTF=y CONFIG_SPL=y CONFIG_PANIC_HANG=y diff --git a/configs/imx8qm_lpddr4_arm2_defconfig b/configs/imx8qm_lpddr4_arm2_defconfig index ffd969c9a9..f6e1c449ad 100644 --- a/configs/imx8qm_lpddr4_arm2_defconfig +++ b/configs/imx8qm_lpddr4_arm2_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL_DOS_PARTITION=n CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_SPL_ENV_IS_NOWHERE=y CONFIG_USE_TINY_PRINTF=y CONFIG_SPL=y CONFIG_PANIC_HANG=y diff --git a/configs/imx8qm_lpddr4_arm2_fspi_defconfig b/configs/imx8qm_lpddr4_arm2_fspi_defconfig index c977649fe1..7ae5257400 100644 --- a/configs/imx8qm_lpddr4_arm2_fspi_defconfig +++ b/configs/imx8qm_lpddr4_arm2_fspi_defconfig @@ -14,6 +14,7 @@ CONFIG_SPL_DOS_PARTITION=n CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_SPL_ENV_IS_NOWHERE=y CONFIG_USE_TINY_PRINTF=y CONFIG_SPL=y CONFIG_PANIC_HANG=y diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig index 4db1737098..b761156683 100644 --- a/configs/imx8qm_mek_defconfig +++ b/configs/imx8qm_mek_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL_DOS_PARTITION=n CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_SPL_ENV_IS_NOWHERE=y CONFIG_USE_TINY_PRINTF=y CONFIG_SPL=y CONFIG_PANIC_HANG=y diff --git a/configs/imx8qm_mek_fspi_defconfig b/configs/imx8qm_mek_fspi_defconfig index a9a084feba..2b2208456c 100644 --- a/configs/imx8qm_mek_fspi_defconfig +++ b/configs/imx8qm_mek_fspi_defconfig @@ -15,6 +15,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_NOR_SUPPORT=y +CONFIG_SPL_ENV_IS_NOWHERE=y CONFIG_USE_TINY_PRINTF=y CONFIG_SPL=y CONFIG_PANIC_HANG=y diff --git a/configs/imx8qxp_17x17_val_defconfig b/configs/imx8qxp_17x17_val_defconfig index 2481c71990..a26836791c 100644 --- a/configs/imx8qxp_17x17_val_defconfig +++ b/configs/imx8qxp_17x17_val_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL_DOS_PARTITION=n CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_SPL_ENV_IS_NOWHERE=y CONFIG_USE_TINY_PRINTF=y CONFIG_SPL=y CONFIG_PANIC_HANG=y diff --git a/configs/imx8qxp_ddr3_arm2_defconfig b/configs/imx8qxp_ddr3_arm2_defconfig index cf906dc89f..34958e4bd6 100644 --- a/configs/imx8qxp_ddr3_arm2_defconfig +++ b/configs/imx8qxp_ddr3_arm2_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL_DOS_PARTITION=n CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_SPL_ENV_IS_NOWHERE=y CONFIG_USE_TINY_PRINTF=y CONFIG_SPL=y CONFIG_PANIC_HANG=y diff --git a/configs/imx8qxp_lpddr4_arm2_defconfig b/configs/imx8qxp_lpddr4_arm2_defconfig index 7c7baf9a01..c56bae2079 100644 --- a/configs/imx8qxp_lpddr4_arm2_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL_DOS_PARTITION=n CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_SPL_ENV_IS_NOWHERE=y CONFIG_USE_TINY_PRINTF=y CONFIG_SPL=y CONFIG_PANIC_HANG=y diff --git a/configs/imx8qxp_lpddr4_arm2_fspi_defconfig b/configs/imx8qxp_lpddr4_arm2_fspi_defconfig index dcbcca5721..4b758810cd 100644 --- a/configs/imx8qxp_lpddr4_arm2_fspi_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_fspi_defconfig @@ -14,6 +14,7 @@ CONFIG_SPL_DOS_PARTITION=n CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_SPL_ENV_IS_NOWHERE=y CONFIG_USE_TINY_PRINTF=y CONFIG_SPL=y CONFIG_PANIC_HANG=y diff --git a/configs/imx8qxp_lpddr4_arm2_nand_defconfig b/configs/imx8qxp_lpddr4_arm2_nand_defconfig index 5750f40e4e..980ed443fc 100644 --- a/configs/imx8qxp_lpddr4_arm2_nand_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_nand_defconfig @@ -9,6 +9,7 @@ CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_SPL_ENV_IS_NOWHERE=y CONFIG_USE_TINY_PRINTF=y CONFIG_SPL=y CONFIG_PANIC_HANG=y diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig index 7492de9e56..619eda9dc7 100644 --- a/configs/imx8qxp_mek_defconfig +++ b/configs/imx8qxp_mek_defconfig @@ -12,6 +12,7 @@ CONFIG_SPL_DOS_PARTITION=n CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_SPL_ENV_IS_NOWHERE=y CONFIG_USE_TINY_PRINTF=y CONFIG_SPL=y CONFIG_PANIC_HANG=y diff --git a/configs/imx8qxp_mek_fspi_defconfig b/configs/imx8qxp_mek_fspi_defconfig index 0da7aa94f3..890a28310c 100644 --- a/configs/imx8qxp_mek_fspi_defconfig +++ b/configs/imx8qxp_mek_fspi_defconfig @@ -15,6 +15,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_DRIVERS_MISC_SUPPORT=y CONFIG_SPL_NOR_SUPPORT=y +CONFIG_SPL_ENV_IS_NOWHERE=y CONFIG_USE_TINY_PRINTF=y CONFIG_SPL=y CONFIG_PANIC_HANG=y -- 2.17.1