From c7452991562b5491c12a3bd89131368518c2c000 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 7 Nov 2021 22:59:39 -0500 Subject: [PATCH] Convert CONFIG_SYS_CONSOLE_IS_IN_ENV to Kconfig This converts the following to Kconfig: CONFIG_SYS_CONSOLE_IS_IN_ENV Signed-off-by: Tom Rini --- README | 4 ---- configs/ci20_mmc_defconfig | 1 + include/configs/ci20.h | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/README b/README index c919855c86..791ad071ae 100644 --- a/README +++ b/README @@ -978,10 +978,6 @@ The following options need to be configured: whether the enumeration has succeded at high speed or full speed. - CONFIG_SYS_CONSOLE_IS_IN_ENV - Define this if you want stdin, stdout &/or stderr to - be set to usbtty. - If you have a USB-IF assigned VendorID then you may wish to define your own vendor specific values either in BoardName.h or directly in usbd_vendor_info.h. If you don't define diff --git a/configs/ci20_mmc_defconfig b/configs/ci20_mmc_defconfig index aa2d08705d..3c455208f5 100644 --- a/configs/ci20_mmc_defconfig +++ b/configs/ci20_mmc_defconfig @@ -19,6 +19,7 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS4,115200 rw rootwait root=/dev/mmcblk0p1" CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="ext4load mmc 0:1 0x88000000 /boot/uImage; bootm 0x88000000" +CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_DISPLAY_CPUINFO=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_MISC_INIT_R=y diff --git a/include/configs/ci20.h b/include/configs/ci20.h index cefc815721..0a7043a80c 100644 --- a/include/configs/ci20.h +++ b/include/configs/ci20.h @@ -24,7 +24,6 @@ /* NS16550-ish UARTs */ #define CONFIG_SYS_NS16550_CLK 48000000 -#define CONFIG_SYS_CONSOLE_IS_IN_ENV /* Ethernet: davicom DM9000 */ #define CONFIG_DRIVER_DM9000 1 -- 2.39.5