diff options
| author | Ye Li <ye.li@nxp.com> | 2018-09-24 19:35:14 -0700 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2018-09-29 00:35:23 -0700 |
| commit | a461844b640488ddde954d492c74abb5e30738d1 (patch) | |
| tree | 3d49c2cb5d066a22aa516b4751745c95ef96a063 | |
| parent | a0778ac9b2bbea342062dac95ab86e52de463d70 (diff) | |
MLK-19690 mx7ulp: Fix issue in selecting BOARD_LATE_INIT configuration
The BOARD_LATE_INIT config does not have input prompt, so we can't
configure it to Y in defconfig. Modify the Kconfig in mx7ulp to select
the BOARD_LATE_INIT when the boards are used.
Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 0f3667ddd4dae02d0d309fe68df26979d9e3c432)
| -rw-r--r-- | arch/arm/mach-imx/mx7ulp/Kconfig | 5 | ||||
| -rw-r--r-- | configs/imx7ulp_evk_android_defconfig | 1 | ||||
| -rw-r--r-- | configs/mx7ulp_10x10_arm2_defconfig | 1 | ||||
| -rw-r--r-- | configs/mx7ulp_14x14_arm2_defconfig | 1 | ||||
| -rw-r--r-- | configs/mx7ulp_evk_defconfig | 1 | ||||
| -rw-r--r-- | configs/mx7ulp_evk_emmc_defconfig | 1 | ||||
| -rw-r--r-- | configs/mx7ulp_evk_m4boot_defconfig | 1 | ||||
| -rw-r--r-- | configs/mx7ulp_evk_optee_defconfig | 1 | ||||
| -rw-r--r-- | configs/mx7ulp_evk_plugin_defconfig | 1 |
9 files changed, 4 insertions, 9 deletions
diff --git a/arch/arm/mach-imx/mx7ulp/Kconfig b/arch/arm/mach-imx/mx7ulp/Kconfig index 20c32acfe6..600ce3b70c 100644 --- a/arch/arm/mach-imx/mx7ulp/Kconfig +++ b/arch/arm/mach-imx/mx7ulp/Kconfig @@ -19,14 +19,17 @@ choice config TARGET_MX7ULP_10X10_ARM2 bool "Support mx7ulp 10x10 validation board" + select BOARD_LATE_INIT select MX7ULP config TARGET_MX7ULP_14X14_ARM2 bool "Support mx7ulp 14x14 validation board" + select BOARD_LATE_INIT select MX7ULP config TARGET_MX7ULP_EVK - bool "Support mx7ulp EVK board" + bool "Support mx7ulp EVK board" + select BOARD_LATE_INIT select MX7ULP endchoice diff --git a/configs/imx7ulp_evk_android_defconfig b/configs/imx7ulp_evk_android_defconfig index fd70826a06..aab5bf9e86 100644 --- a/configs/imx7ulp_evk_android_defconfig +++ b/configs/imx7ulp_evk_android_defconfig @@ -5,7 +5,6 @@ CONFIG_TARGET_MX7ULP_EVK=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-qspi" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg,ANDROID_SUPPORT" CONFIG_EFI_PARTITION=y -CONFIG_BOARD_LATE_INIT=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/mx7ulp_10x10_arm2_defconfig b/configs/mx7ulp_10x10_arm2_defconfig index acbe675619..ff491447e8 100644 --- a/configs/mx7ulp_10x10_arm2_defconfig +++ b/configs/mx7ulp_10x10_arm2_defconfig @@ -5,7 +5,6 @@ CONFIG_SYS_TEXT_BASE=0x67800000 CONFIG_TARGET_MX7ULP_10X10_ARM2=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-10x10-arm2" CONFIG_DEFAULT_FDT_FILE="imx7ulp-10x10-arm2.dtb" -CONFIG_BOARD_LATE_INIT=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/mx7ulp_14x14_arm2_defconfig b/configs/mx7ulp_14x14_arm2_defconfig index 3838c47a54..5774f4b84f 100644 --- a/configs/mx7ulp_14x14_arm2_defconfig +++ b/configs/mx7ulp_14x14_arm2_defconfig @@ -5,7 +5,6 @@ CONFIG_SYS_TEXT_BASE=0x67800000 CONFIG_TARGET_MX7ULP_14X14_ARM2=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-14x14-arm2" CONFIG_DEFAULT_FDT_FILE="imx7ulp-14x14-arm2.dtb" -CONFIG_BOARD_LATE_INIT=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/mx7ulp_evk_defconfig b/configs/mx7ulp_evk_defconfig index a7632b1d1c..07b9c7bf1f 100644 --- a/configs/mx7ulp_evk_defconfig +++ b/configs/mx7ulp_evk_defconfig @@ -4,7 +4,6 @@ CONFIG_SYS_TEXT_BASE=0x67800000 CONFIG_TARGET_MX7ULP_EVK=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-qspi" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg" -CONFIG_BOARD_LATE_INIT=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/mx7ulp_evk_emmc_defconfig b/configs/mx7ulp_evk_emmc_defconfig index c237a73e11..3922984bed 100644 --- a/configs/mx7ulp_evk_emmc_defconfig +++ b/configs/mx7ulp_evk_emmc_defconfig @@ -4,7 +4,6 @@ CONFIG_SYS_TEXT_BASE=0x67800000 CONFIG_TARGET_MX7ULP_EVK=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-emmc" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg" -CONFIG_BOARD_LATE_INIT=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/mx7ulp_evk_m4boot_defconfig b/configs/mx7ulp_evk_m4boot_defconfig index eca6f7daac..330210e1cf 100644 --- a/configs/mx7ulp_evk_m4boot_defconfig +++ b/configs/mx7ulp_evk_m4boot_defconfig @@ -4,7 +4,6 @@ CONFIG_SYS_TEXT_BASE=0x67800000 CONFIG_TARGET_MX7ULP_EVK=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-qspi" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg" -CONFIG_BOARD_LATE_INIT=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/mx7ulp_evk_optee_defconfig b/configs/mx7ulp_evk_optee_defconfig index e8b860b97f..90c49d4c34 100644 --- a/configs/mx7ulp_evk_optee_defconfig +++ b/configs/mx7ulp_evk_optee_defconfig @@ -5,7 +5,6 @@ CONFIG_TARGET_MX7ULP_EVK=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-qspi" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg" CONFIG_IMX_OPTEE=y -CONFIG_BOARD_LATE_INIT=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/mx7ulp_evk_plugin_defconfig b/configs/mx7ulp_evk_plugin_defconfig index ad82c808e8..8ea4d88bf7 100644 --- a/configs/mx7ulp_evk_plugin_defconfig +++ b/configs/mx7ulp_evk_plugin_defconfig @@ -5,7 +5,6 @@ CONFIG_TARGET_MX7ULP_EVK=y CONFIG_USE_IMXIMG_PLUGIN=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-qspi" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg" -CONFIG_BOARD_LATE_INIT=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_GPIO=y |