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>

diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig
index 699eb70088ca75d7783cf4db9f634e2dda197706..0b31a46cc9c2103a88821074a74f97d02541fa3f 100644 (file)
--- 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_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
 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 2d40ceb24e96db2c29319b3ea23343e0236b2bfc..9e45d63245f2225635b8b3ab93da01e7afc75a05 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*

- * Copyright 2013-2015 Toradex, Inc.
+ * Copyright 2013-2019 Toradex, Inc.

  *
  * Configuration settings for the Toradex Colibri iMX6
  */
  *
  * Configuration settings for the Toradex Colibri iMX6
  */


@@ -74,7 +74,6 @@
 
 /* Framebuffer and LCD */
 #define CONFIG_VIDEO_IPUV3
 
 /* 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
 #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN