From 1874cddeb99a78fb8d1c484f82260bac14c182a7 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler <marcel.ziswiler@toradex.com> Date: Fri, 8 Feb 2019 18:42:06 +0100 Subject: [PATCH] colibri_imx6: move console in env from header file to defconfig Move console in env from header file to defconfig. While at it also update copyright year. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> --- configs/colibri_imx6_defconfig | 1 + include/configs/colibri_imx6.h | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index 699eb70088..0b31a46cc9 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -14,6 +14,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6DL" CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set +CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_MISC_INIT_R=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 2d40ceb24e..9e45d63245 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright 2013-2015 Toradex, Inc. + * Copyright 2013-2019 Toradex, Inc. * * Configuration settings for the Toradex Colibri iMX6 */ @@ -74,7 +74,6 @@ /* Framebuffer and LCD */ #define CONFIG_VIDEO_IPUV3 -#define CONFIG_SYS_CONSOLE_IS_IN_ENV #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN -- 2.39.5