toradex: disable framebuffer console

Console cursor was still blinking on the background, which was
showing though Qt apps. Disable framebuffer console completely.
u-boot no longer need to be patched for disabling console messages.

Task-number: AUTOSUITE-711
Change-Id: I0fd2c4e2778e850ea6b8a09e49d3d7f23b39d016
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

3 files changed, 17 insertions, 50 deletions

diff --git a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
index 4850f8a8..8760ee8a 100644
--- a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
@@ -36,6 +36,9 @@ do_preconfigure_prepend () {
     # FunctionFS for qdbd
     echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
 
+    # disable all console messages from framebuffers
+    echo "CONFIG_FRAMEBUFFER_CONSOLE=n" >> ${WORKDIR}/defconfig
+
     # Enable uprobe for profiling
     echo "CONFIG_UPROBE_EVENT=y" >> ${WORKDIR}/defconfig
     echo "CONFIG_FTRACE=y"       >> ${WORKDIR}/defconfig
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch
index 083ec6d7..2e5382f9 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch
@@ -1,18 +1,18 @@
-From 0f7d6eecead2c079ac050e6d16b64f280d9feab0 Mon Sep 17 00:00:00 2001
+From 1abe757120dd19518fd09d2013f518fba46c4d06 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Mon, 15 May 2017 15:31:36 +0300
 Subject: [PATCH] Make sdboot default on all boards
 
 ... and remove console=tty1 from kernel args
 ---
- include/configs/apalis_imx6.h  | 5 +++--
- include/configs/colibri_imx6.h | 5 +++--
- include/configs/colibri_imx7.h | 4 ++--
- include/configs/colibri_vf.h   | 4 ++--
- 4 files changed, 10 insertions(+), 8 deletions(-)
+ include/configs/apalis_imx6.h  | 3 ++-
+ include/configs/colibri_imx6.h | 3 ++-
+ include/configs/colibri_imx7.h | 2 +-
+ include/configs/colibri_vf.h   | 2 +-
+ 4 files changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
-index 71dfeb56f5..b687dab91d 100644
+index 71dfeb56f5..8dcb5cc5e4 100644
 --- a/include/configs/apalis_imx6.h
 +++ b/include/configs/apalis_imx6.h
 @@ -256,7 +256,8 @@
@@ -25,17 +25,8 @@ index 71dfeb56f5..b687dab91d 100644
  		"run distro_bootcmd ; " \
  		"usb start ;" \
  		"setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
-@@ -279,7 +280,7 @@
- 		" ${loadaddr} flash_blk.img && " \
- 		"source ${loadaddr}\0" \
- 	"setup=setenv setupargs fec_mac=${ethaddr} " \
--		"consoleblank=0 no_console_suspend=1 console=tty1 " \
-+		"consoleblank=0 no_console_suspend=1 " \
- 		"console=${console},${baudrate}n8\0" \
- 	"setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
- 	"setusbupdate=usb start && setenv interface usb; setenv drive 0; " \
 diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
-index f1fd5b422e..c7d75cea2a 100644
+index f1fd5b422e..ae0f3c9bfa 100644
 --- a/include/configs/colibri_imx6.h
 +++ b/include/configs/colibri_imx6.h
 @@ -231,7 +231,8 @@
@@ -48,17 +39,8 @@ index f1fd5b422e..c7d75cea2a 100644
  		"run distro_bootcmd ; " \
  		"usb start ;" \
  		"setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \
-@@ -252,7 +253,7 @@
- 		"${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
- 		"source ${loadaddr}\0" \
- 	"setup=setenv setupargs fec_mac=${ethaddr} " \
--		"consoleblank=0 no_console_suspend=1 console=tty1 " \
-+		"consoleblank=0 no_console_suspend=1 " \
- 		"console=${console},${baudrate}n8\0" \
- 	"setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
- 	"setusbupdate=usb start && setenv interface usb; setenv drive 0; " \
 diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
-index ea04762b49..ca827a8a58 100644
+index ea04762b49..47e8bd266d 100644
 --- a/include/configs/colibri_imx7.h
 +++ b/include/configs/colibri_imx7.h
 @@ -104,7 +104,7 @@
@@ -70,17 +52,8 @@ index ea04762b49..ca827a8a58 100644
  	"setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;"
  
  #define BOOTENV_RUN_NET_USB_START ""
-@@ -138,7 +138,7 @@
- 		"fatload ${interface} 0:1 ${loadaddr} " \
- 		"${board}/flash_blk.img && source ${loadaddr}\0" \
- 	"setup=setenv setupargs " \
--		"console=tty1 console=${console}" \
-+		"console=${console}" \
- 		",${baudrate}n8 ${memargs} consoleblank=0\0" \
- 	"setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
- 	"setusbupdate=usb start && setenv interface usb && " \
 diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
-index db610d53f1..aafd4bc95e 100644
+index db610d53f1..a2c942cafe 100644
 --- a/include/configs/colibri_vf.h
 +++ b/include/configs/colibri_vf.h
 @@ -155,7 +155,7 @@
@@ -92,12 +65,3 @@ index db610d53f1..aafd4bc95e 100644
  	"setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;"
  
  #define BOOTENV_RUN_NET_USB_START ""
-@@ -190,7 +190,7 @@
- 		"fatload ${interface} 0:1 ${loadaddr} " \
- 		"${board}/flash_blk.img && source ${loadaddr}\0" \
- 	"setup=setenv setupargs " \
--		"console=tty1 console=${console}" \
-+		"console=${console}" \
- 		",${baudrate}n8 ${memargs} consoleblank=0 ${mtdparts}\0" \
- 	"setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \
- 	"setusbupdate=usb start && setenv interface usb && " \
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch
index ea94c0ca..080a8b59 100644
--- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch
+++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0002-apalis-imx6-test-for-Capacitive-Touch-Display-7-Para.patch
@@ -1,4 +1,4 @@
-From 41be67109ab0c0fd156ee8615592827624fab12e Mon Sep 17 00:00:00 2001
+From 22ded9f935249b8a3980e1a392b2598128f071d6 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Fri, 19 May 2017 12:41:38 +0300
 Subject: [PATCH] apalis-imx6: test for Capacitive Touch Display 7" Parallel
@@ -13,7 +13,7 @@ support for the atmel_mxt_ts touch controller.
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
-index b687dab91d..3351a18e4c 100644
+index 8dcb5cc5e4..59e74d41c0 100644
 --- a/include/configs/apalis_imx6.h
 +++ b/include/configs/apalis_imx6.h
 @@ -249,7 +249,7 @@
@@ -31,10 +31,10 @@ index b687dab91d..3351a18e4c 100644
  		"source ${loadaddr}\0" \
 -	"setup=setenv setupargs fec_mac=${ethaddr} " \
 +	"setup=run setupvideo; setenv setupargs fec_mac=${ethaddr} " \
- 		"consoleblank=0 no_console_suspend=1 " \
+ 		"consoleblank=0 no_console_suspend=1 console=tty1 " \
  		"console=${console},${baudrate}n8\0" \
 +	"setupvideo=i2c dev 0; if i2c probe 4A; " \
-+        "then setenv vidargs mxc_hdmi.only_cea=1 " \
++		"then setenv vidargs mxc_hdmi.only_cea=1 " \
 +		"video=mxcfb0:dev=lcd,FusionF07A,if=RGB24 " \
 +		"video=mxcfb1:off video=mxcfb2:off video=mxcfb3:off " \
 +		"fbmem=32M; fi\0" \