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 /include/configs/sunxi-common.h | |
| parent | f8b19a889e0d9d21af4be6b0fd6363a5b5a546f7 (diff) | |
| download | u-boot-ef26d6039a14c03c516c09a7835b491e671a4b0b.tar.gz | |
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 'include/configs/sunxi-common.h')
| -rw-r--r-- | include/configs/sunxi-common.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 634a4c756e..8e10d840f3 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -296,7 +296,6 @@ extern int soft_i2c_gpio_scl; #define VIDEO_LINE_LEN (pGD->plnSizeX) /* allow both serial and cfb console. */ -#define CONFIG_CONSOLE_MUX /* stop x86 thinking in cfbconsole from trying to init a pc keyboard */ #define CONFIG_VGA_AS_SINGLE_DEVICE @@ -350,7 +349,6 @@ extern int soft_i2c_gpio_scl; #endif #ifdef CONFIG_USB_KEYBOARD -#define CONFIG_CONSOLE_MUX #define CONFIG_PREBOOT #define CONFIG_SYS_STDIO_DEREGISTER #define CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE @@ -364,7 +362,6 @@ extern int soft_i2c_gpio_scl; #endif #define CONFIG_MISC_INIT_R -#define CONFIG_SYS_CONSOLE_IS_IN_ENV #ifndef CONFIG_SPL_BUILD #include <config_distro_defaults.h> |