From 5497a833752a7cf41a04db80d728e9097ad5f8ef Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Tue, 12 Jul 2016 17:27:46 +0200 Subject: Add support for Toradex Colibri-iMX7 Change-Id: I01b25ca05cff51671f3088b2aa64a02e56028ce9 Reviewed-by: Teemu Holappa --- .../recipes/linux/linux-toradex-fsl_git.bbappend | 39 --------------- .../recipes/linux/linux-toradex_4.%.bbappend | 6 --- .../recipes/linux/linux-toradex_git.bbappend | 39 +++++++++++++++ .../0001-Update-default-args-for-apalis-imx6.patch | 57 ---------------------- ...001-colibri-imx6-enable-sdboot-by-default.patch | 36 -------------- .../recipes/u-boot/u-boot-toradex-fsl_git.bbappend | 34 ------------- .../0001-Update-default-args-for-apalis-imx6.patch | 57 ++++++++++++++++++++++ ...001-colibri-imx6-enable-sdboot-by-default.patch | 36 ++++++++++++++ .../recipes/u-boot/u-boot-toradex_git.bbappend | 34 +++++++++++++ 9 files changed, 166 insertions(+), 172 deletions(-) delete mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend create mode 100644 meta-toradex-extras/recipes/linux/linux-toradex_git.bbappend delete mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch delete mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-imx6-enable-sdboot-by-default.patch delete mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx6-enable-sdboot-by-default.patch create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-toradex_git.bbappend (limited to 'meta-toradex-extras') diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend deleted file mode 100644 index 5352ed7..0000000 --- a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend +++ /dev/null @@ -1,39 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -# kernel image files are not needed in the image -RDEPENDS_kernel-base = "" - -config_script () { - # FunctionFS for adb - echo "CONFIG_USB_FUNCTIONFS=m" >> ${S}/.config - echo "CONFIG_USB_ACM=m" >> ${S}/.config -} - -B = "${S}" diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend index c2e2fc6..77ce484 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend +++ b/meta-toradex-extras/recipes/linux/linux-toradex_4.%.bbappend @@ -27,12 +27,6 @@ ## ############################################################################ -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" - -SRC_URI += " \ - file://0001-Enable-Fusion-7-and-10-multi-touch-controller.patch \ - " - do_configure_prepend () { # FunctionFS for adb echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_git.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex_git.bbappend new file mode 100644 index 0000000..5352ed7 --- /dev/null +++ b/meta-toradex-extras/recipes/linux/linux-toradex_git.bbappend @@ -0,0 +1,39 @@ +############################################################################ +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +# kernel image files are not needed in the image +RDEPENDS_kernel-base = "" + +config_script () { + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS=m" >> ${S}/.config + echo "CONFIG_USB_ACM=m" >> ${S}/.config +} + +B = "${S}" diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch deleted file mode 100644 index b7c7d63..0000000 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 94531a3ecaea073316b9e4c341085ce5e277bd9f Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Mon, 27 Oct 2014 14:53:25 +0200 -Subject: [PATCH] Update default args for apalis imx6 - -Boot from sd card by default, disable kernel logs from tty1, and -disable cursor blinking. ---- - include/configs/apalis_imx6.h | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - -diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h -index e7d0d20..a1d425d 100644 ---- a/include/configs/apalis_imx6.h -+++ b/include/configs/apalis_imx6.h -@@ -251,14 +251,14 @@ - "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" - - #define SD_BOOTCMD \ -- "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext3 " \ -- "rootwait\0" \ -+ "drive=2\0" \ - "sdboot=run setup; " \ -- "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ -+ "setenv bootargs ${defargs} ip=off root=/dev/mmcblk${drive}p2 " \ -+ "rw,noatime rootfstype=ext3 rootwait ${setupargs} " \ - "${vidargs}; echo Booting from SD card in 8-bit slot...; " \ -- "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ -+ "run sddtbload; load mmc ${drive}:1 ${kernel_addr_r} " \ - "${boot_file} && bootm ${kernel_addr_r} ${dtbparam}\0" \ -- "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ -+ "sddtbload=setenv dtbparam; load mmc ${drive}:1 ${fdt_addr_r} " \ - "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" - - #define USB_BOOTCMD \ -@@ -278,7 +278,8 @@ - #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb" - #endif - #define CONFIG_EXTRA_ENV_SETTINGS \ -- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ -+ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ -+ "run emmcboot ; echo ; echo emmcboot failed ; " \ - "run nfsboot ; echo ; echo nfsboot failed ; " \ - "usb start ;" \ - "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ -@@ -299,7 +300,7 @@ - "|| setenv drive 2; load ${interface} ${drive}:1 " \ - "${kernel_addr_r} flash_blk.img\0" \ - "setup=setenv setupargs fec_mac=${ethaddr} " \ -- "consoleblank=0 no_console_suspend=1 console=tty1 " \ -+ "consoleblank=0 no_console_suspend=1 vt.global_cursor_default=0 " \ - "console=${console},${baudrate}n8\0 " \ - "setupdate=run setsdupdate || run setusbupdate || run setethupdate;" \ - " source ${kernel_addr_r}\0" \ --- -1.9.1 - diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-imx6-enable-sdboot-by-default.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-imx6-enable-sdboot-by-default.patch deleted file mode 100644 index 0743128..0000000 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-imx6-enable-sdboot-by-default.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 10ebeba59e6fd25352aa44ecd85913126ec45afe Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Wed, 24 Feb 2016 15:39:52 +0200 -Subject: [PATCH] colibri imx6: enable sdboot by default - -remove console from tty1 ---- - include/configs/colibri_imx6.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h -index c545334..eb0dfa9 100644 ---- a/include/configs/colibri_imx6.h -+++ b/include/configs/colibri_imx6.h -@@ -242,7 +242,8 @@ - - #define FDT_FILE "imx6dl-colibri-eval-v3.dtb" - #define CONFIG_EXTRA_ENV_SETTINGS \ -- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ -+ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ -+ "run emmcboot ; echo ; echo emmcboot failed ; " \ - "run nfsboot ; echo ; echo nfsboot failed ; " \ - "usb start ;" \ - "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ -@@ -261,7 +262,7 @@ - "setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan; " \ - "load ${interface} ${drive}:1 ${kernel_addr_r} flash_blk.img\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;" \ - " source ${kernel_addr_r}\0" \ --- -1.9.1 - diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend deleted file mode 100644 index 45b5fd3..0000000 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += " \ - file://0001-Update-default-args-for-apalis-imx6.patch \ - file://0001-colibri-imx6-enable-sdboot-by-default.patch \ - " diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch new file mode 100644 index 0000000..b7c7d63 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch @@ -0,0 +1,57 @@ +From 94531a3ecaea073316b9e4c341085ce5e277bd9f Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Mon, 27 Oct 2014 14:53:25 +0200 +Subject: [PATCH] Update default args for apalis imx6 + +Boot from sd card by default, disable kernel logs from tty1, and +disable cursor blinking. +--- + include/configs/apalis_imx6.h | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h +index e7d0d20..a1d425d 100644 +--- a/include/configs/apalis_imx6.h ++++ b/include/configs/apalis_imx6.h +@@ -251,14 +251,14 @@ + "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + + #define SD_BOOTCMD \ +- "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext3 " \ +- "rootwait\0" \ ++ "drive=2\0" \ + "sdboot=run setup; " \ +- "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ ++ "setenv bootargs ${defargs} ip=off root=/dev/mmcblk${drive}p2 " \ ++ "rw,noatime rootfstype=ext3 rootwait ${setupargs} " \ + "${vidargs}; echo Booting from SD card in 8-bit slot...; " \ +- "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ ++ "run sddtbload; load mmc ${drive}:1 ${kernel_addr_r} " \ + "${boot_file} && bootm ${kernel_addr_r} ${dtbparam}\0" \ +- "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ ++ "sddtbload=setenv dtbparam; load mmc ${drive}:1 ${fdt_addr_r} " \ + "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + + #define USB_BOOTCMD \ +@@ -278,7 +278,8 @@ + #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb" + #endif + #define CONFIG_EXTRA_ENV_SETTINGS \ +- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ ++ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ ++ "run emmcboot ; echo ; echo emmcboot failed ; " \ + "run nfsboot ; echo ; echo nfsboot failed ; " \ + "usb start ;" \ + "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ +@@ -299,7 +300,7 @@ + "|| setenv drive 2; load ${interface} ${drive}:1 " \ + "${kernel_addr_r} flash_blk.img\0" \ + "setup=setenv setupargs fec_mac=${ethaddr} " \ +- "consoleblank=0 no_console_suspend=1 console=tty1 " \ ++ "consoleblank=0 no_console_suspend=1 vt.global_cursor_default=0 " \ + "console=${console},${baudrate}n8\0 " \ + "setupdate=run setsdupdate || run setusbupdate || run setethupdate;" \ + " source ${kernel_addr_r}\0" \ +-- +1.9.1 + diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx6-enable-sdboot-by-default.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx6-enable-sdboot-by-default.patch new file mode 100644 index 0000000..0743128 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx6-enable-sdboot-by-default.patch @@ -0,0 +1,36 @@ +From 10ebeba59e6fd25352aa44ecd85913126ec45afe Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Wed, 24 Feb 2016 15:39:52 +0200 +Subject: [PATCH] colibri imx6: enable sdboot by default + +remove console from tty1 +--- + include/configs/colibri_imx6.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h +index c545334..eb0dfa9 100644 +--- a/include/configs/colibri_imx6.h ++++ b/include/configs/colibri_imx6.h +@@ -242,7 +242,8 @@ + + #define FDT_FILE "imx6dl-colibri-eval-v3.dtb" + #define CONFIG_EXTRA_ENV_SETTINGS \ +- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ ++ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ ++ "run emmcboot ; echo ; echo emmcboot failed ; " \ + "run nfsboot ; echo ; echo nfsboot failed ; " \ + "usb start ;" \ + "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ +@@ -261,7 +262,7 @@ + "setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan; " \ + "load ${interface} ${drive}:1 ${kernel_addr_r} flash_blk.img\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;" \ + " source ${kernel_addr_r}\0" \ +-- +1.9.1 + diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex_git.bbappend b/meta-toradex-extras/recipes/u-boot/u-boot-toradex_git.bbappend new file mode 100644 index 0000000..45b5fd3 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex_git.bbappend @@ -0,0 +1,34 @@ +############################################################################ +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += " \ + file://0001-Update-default-args-for-apalis-imx6.patch \ + file://0001-colibri-imx6-enable-sdboot-by-default.patch \ + " -- cgit v1.2.3-54-g00ecf