diff options
| author | Simon Glass <sjg@chromium.org> | 2016-10-17 20:12:37 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-23 18:33:35 -0400 |
| commit | ef26d6039a14c03c516c09a7835b491e671a4b0b (patch) | |
| tree | d9a6957ab0709cb6870f251d718ffb3dd5ed9afa /configs/colibri_imx7_defconfig | |
| parent | f8b19a889e0d9d21af4be6b0fd6363a5b5a546f7 (diff) | |
| download | u-boot-imx-ef26d6039a14c03c516c09a7835b491e671a4b0b.zip u-boot-imx-ef26d6039a14c03c516c09a7835b491e671a4b0b.tar.gz u-boot-imx-ef26d6039a14c03c516c09a7835b491e671a4b0b.tar.bz2 | |
Convert CONFIG_SYS_CONSOLE_IS_IN_ENV and CONFIG_CONSOLE_MUX to Kconfig
This converts the following to Kconfig:
CONFIG_SYS_CONSOLE_IS_IN_ENV
CONFIG_CONSOLE_MUX
Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: Re-order, re-migrate]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/colibri_imx7_defconfig')
| -rw-r--r-- | configs/colibri_imx7_defconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index adf47c2..341c99d 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -3,10 +3,12 @@ CONFIG_ARCH_MX7=y CONFIG_TARGET_COLIBRI_IMX7=y CONFIG_IMX_RDC=y CONFIG_IMX_BOOTAUX=y -CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri" CONFIG_VIDEO=y +CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg,MX7D" CONFIG_BOOTDELAY=1 +# CONFIG_CONSOLE_MUX is not set +CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Colibri iMX7 # " |