diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-05-19 13:36:02 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-05-22 19:48:19 +0000 |
| commit | 9d49b3a08cf8c2bcaab88cb98e17e685088e4708 (patch) | |
| tree | 57e5523a8c1e9722ce960c5eaa22d3a453a755e7 /meta-fsl-extras | |
| parent | 3ee4b17d7fb5104578919867c5ea25889e275089 (diff) | |
apalis-imx6: enable Fusion10 touch display
Autoload required kernel module, and setup uboot to enable
it if found during boot.
Task-number: QTBUG-54817
Change-Id: Ie57c4212ba0bc927df7a51513d75afa2e9596715
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Diffstat (limited to 'meta-fsl-extras')
| -rw-r--r-- | meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-apalis-imx6-enable-Fusion10-display-if-found-during-.patch | 34 | ||||
| -rw-r--r-- | meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-apalis-imx6-enable-Fusion10-display-if-found-during-.patch b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-apalis-imx6-enable-Fusion10-display-if-found-during-.patch new file mode 100644 index 00000000..2fcadc0c --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-apalis-imx6-enable-Fusion10-display-if-found-during-.patch @@ -0,0 +1,34 @@ +From 5dc634b67f3b1890c5f166694ba9b81dd0a5a871 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: enable Fusion10 display if found during boot + +Test i2c bus if Fusion10 display is present during boot. +If found, enable it as the primary display in kernel args. + +Also remove console from tty1, as it overlays with Qt. +--- + include/configs/apalis_imx6.h | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h +index 4f2f689..de18b43 100644 +--- a/include/configs/apalis_imx6.h ++++ b/include/configs/apalis_imx6.h +@@ -279,9 +279,14 @@ + "|| setenv drive 2; mmc rescan; load ${interface} ${drive}:1" \ + " ${loadaddr} flash_blk.img && " \ + "source ${loadaddr}\0" \ +- "setup=setenv setupargs fec_mac=${ethaddr} " \ +- "consoleblank=0 no_console_suspend=1 console=tty1 " \ ++ "setup=run setupvideo; setenv setupargs fec_mac=${ethaddr} " \ ++ "consoleblank=0 no_console_suspend=1 " \ + "console=${console},${baudrate}n8\0 " \ ++ "setupvideo=i2c dev 0; if i2c probe 50; " \ ++ "then setenv vidargs mxc_hdmi.only_cea=1 " \ ++ "video=mxcfb0:dev=lcd,FusionF10A,if=RGB24 " \ ++ "video=mxcfb1:off video=mxcfb2:off video=mxcfb3:off " \ ++ "fbmem=32M; fi\0" \ + "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \ + "setusbupdate=usb start && setenv interface usb; setenv drive 0; " \ + "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \ diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend index ea4549e6..7d7f373c 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend +++ b/meta-fsl-extras/recipes/u-boot/u-boot-toradex_%.bbappend @@ -30,4 +30,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-Make-sdboot-default-on-all-boards.patch \ + file://0001-apalis-imx6-enable-Fusion10-display-if-found-during-.patch \ " |