From 1281fc7fe024a885a7231e7c186c679ff2c7a7d3 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 12 May 2015 12:17:41 +0300 Subject: toradex: update toradex meta layer Apalis iMX6 V1.1 needs updated kernel and u-boot, so update the meta-toradex layer to latest (Colibri_T20_LinuxImageV2.3_20150320). Change-Id: Ibfb8c48ecfe1e89c937d02da3012cd66791329b5 Reviewed-by: Andy Nichols --- .../0001-Update-default-args-for-apalis-imx6.patch | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'meta-toradex-extras') 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 index c7f0f9bf..3b791cf3 100644 --- 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 @@ -1,4 +1,4 @@ -From 7872f8e770a202f41fbcf0372b27eb3669c433a1 Mon Sep 17 00:00:00 2001 +From f3525c3daff6c6956bda0bbe29f84ee5497ccf65 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 @@ -6,14 +6,14 @@ 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 ++++++++------- + 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 3fb17e2..728c5dd 100644 ---- a/include/configs/apalis-imx6.h -+++ b/include/configs/apalis-imx6.h -@@ -205,18 +205,19 @@ +diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h +index 5d32118..289d611 100644 +--- a/include/configs/apalis_imx6.h ++++ b/include/configs/apalis_imx6.h +@@ -212,14 +212,14 @@ "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" #define SD_BOOTCMD \ @@ -32,6 +32,10 @@ index 3fb17e2..728c5dd 100644 + "sddtbload=setenv dtbparam; fatload mmc ${drive}:1 ${fdt_addr_r} " \ "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + #ifndef CONFIG_APALIS_IMX6_V1_0 +@@ -229,7 +229,8 @@ + #define FDT_FILE "imx6q-apalis-eval_v1_0.dtb" + #endif #define CONFIG_EXTRA_ENV_SETTINGS \ - "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ + "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ @@ -39,7 +43,7 @@ index 3fb17e2..728c5dd 100644 "run nfsboot ; echo ; echo nfsboot failed ; " \ "usb start ;" \ "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ -@@ -229,7 +230,7 @@ +@@ -242,7 +243,7 @@ NFS_BOOTCMD \ SD_BOOTCMD \ "setup=setenv setupargs fec_mac=${ethaddr} " \ @@ -49,5 +53,5 @@ index 3fb17e2..728c5dd 100644 "setupdate=setenv drive 1; fatload mmc ${drive}:1 ${kernel_addr_r} " \ "flash_mmc.img || setenv drive 2; fatload mmc ${drive}:1 " \ -- -1.8.3.2 +1.9.1 -- cgit v1.2.3 From 06a8c81b3a0ae818b129638a1d8d4f9b327d8eb2 Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Wed, 18 Feb 2015 14:34:17 +0100 Subject: Fix Linux Kernel 3.18 build with Colibri-VF The Linux Kernel blacklists GCC 4.8.0 - 4.8.2 because of a bug. The GCC 4.8.2 provided by Poky has already been patched for this bug so it is safe to renabled building with GCC 4.8. GCC Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58854 Change-Id: If3ea442b1dfbef8991c39f8d1326643cf418b1ec Reviewed-by: Samuli Piippo --- .../0001-Allow-builds-with-GCC-4.8.patch | 27 ++++++++++++++++++++++ .../recipes/linux/linux-toradex-vf_3.18.bbappend | 26 +++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Allow-builds-with-GCC-4.8.patch create mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend (limited to 'meta-toradex-extras') diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Allow-builds-with-GCC-4.8.patch b/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Allow-builds-with-GCC-4.8.patch new file mode 100644 index 00000000..43edec3d --- /dev/null +++ b/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Allow-builds-with-GCC-4.8.patch @@ -0,0 +1,27 @@ +From 30c67656c09f49608bbadb75e365d1d3da36cc70 Mon Sep 17 00:00:00 2001 +From: Andy Nichols +Date: Wed, 18 Feb 2015 14:28:14 +0100 +Subject: [PATCH] Allow builds with GCC 4.8 + +--- + arch/arm/kernel/asm-offsets.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c +index 2d2d608..6f8e79c 100644 +--- a/arch/arm/kernel/asm-offsets.c ++++ b/arch/arm/kernel/asm-offsets.c +@@ -49,10 +49,6 @@ + #error Your compiler is too buggy; it is known to miscompile kernels. + #error Known good compilers: 3.3, 4.x + #endif +-#if GCC_VERSION >= 40800 && GCC_VERSION < 40803 +-#error Your compiler is too buggy; it is known to miscompile kernels +-#error and result in filesystem corruption and oopses. +-#endif + #endif + + int main(void) +-- +1.9.1 + diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend new file mode 100644 index 00000000..4f05386d --- /dev/null +++ b/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend @@ -0,0 +1,26 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" +SRC_URI += " \ + file://0001-Allow-builds-with-GCC-4.8.patch \ + " -- cgit v1.2.3 From bfbad49ac1d55ec3864ddff6d8c7b4b38fbaf907 Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Thu, 19 Feb 2015 11:33:54 +0100 Subject: Update Colibri-VF recpies to use latest meta-toradex (V2.3) Now uses Linux kernel 3.18 Automaically loads Toradex multi-touch screen driver Fixes Serial Console and ADB Cherry-picked from dizzy (d9a08a8a, 85f2d862) Change-Id: Ie468b441be899b1f07cb998477a36a38cfe5e494 Reviewed-by: Eirik Aavitsland --- ...le-Fusion-7-and-10-multi-touch-controller.patch | 25 ++++++++++++++++++++++ .../recipes/linux/linux-toradex-vf_3.18.bbappend | 7 ++++++ 2 files changed, 32 insertions(+) create mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch (limited to 'meta-toradex-extras') diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch b/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch new file mode 100644 index 00000000..d92ac620 --- /dev/null +++ b/meta-toradex-extras/recipes/linux/linux-toradex-vf/0001-Enable-Fusion-7-and-10-multi-touch-controller.patch @@ -0,0 +1,25 @@ +From d57edef022af184015a8ccd87fa9021024513d55 Mon Sep 17 00:00:00 2001 +From: Andy Nichols +Date: Fri, 6 Mar 2015 10:14:13 +0100 +Subject: [PATCH] Enable Fusion 7 and 10 multi-touch controller + +--- + arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi +index 1f43dbe..9194580 100644 +--- a/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi ++++ b/arch/arm/boot/dts/vf-colibri-eval-v3.dtsi +@@ -214,7 +214,7 @@ + gpios = <&gpio0 30 GPIO_ACTIVE_HIGH /* SO-DIMM 28, Pen down interrupt */ + &gpio0 23 GPIO_ACTIVE_LOW /* SO-DIMM 30, Reset interrupt */ + >; +- status = "disabled"; ++ status = "okay"; + }; + + /* M41T0M6 real time clock on carrier board */ +-- +2.3.1 + diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend index 4f05386d..479be80c 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend +++ b/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend @@ -23,4 +23,11 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-Allow-builds-with-GCC-4.8.patch \ + file://0001-Enable-Fusion-7-and-10-multi-touch-controller.patch \ " + +do_configure_prepend () { + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig + echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig +} -- cgit v1.2.3 From d899f31b7fb5c857b159b46c52ce22b3c7b701f5 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 27 May 2015 10:43:16 +0300 Subject: toradex: add support for u-boot update on colibri vf Include flash scripts to boot partition, which can update u-boot to NAND. Remove kernel and dtb files from boot partition, as they are read from second partition. u-boot env changed to boot from MMC by default and kernel messages removed from tty1. apalis flash scripts updated to latest version from toradex and to use both flash_mmc and flash_blk. Change-Id: I1a58badafa01e2023b9ae058b833eb108c097594 Reviewed-by: Eirik Aavitsland --- .../recipes/u-boot/u-boot-script-toradex.bb | 18 ++++++--- .../u-boot/u-boot-script-toradex/flash_mmc.scr | 2 - .../u-boot/u-boot-script-toradex/mx6/flash_blk.scr | 6 +++ .../u-boot/u-boot-script-toradex/mx6/flash_mmc.scr | 6 +++ .../u-boot/u-boot-script-toradex/vf/flash_blk.scr | 2 + .../u-boot/u-boot-script-toradex/vf/flash_mmc.scr | 3 ++ .../0001-colibri-vf-enable-sdboot-by-default.patch | 45 ++++++++++++++++++++++ .../recipes/u-boot/u-boot-toradex-fsl_git.bbappend | 3 ++ 8 files changed, 78 insertions(+), 7 deletions(-) delete mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/flash_mmc.scr create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch (limited to 'meta-toradex-extras') diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb index b83e6a03..92ea3bd7 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb @@ -25,16 +25,21 @@ DEPENDS = "u-boot-mkimage-native" PV = "v2.3" -SRC_URI = "file://flash_mmc.scr" +SRC_URI = " \ + file://flash_mmc.scr \ + file://flash_blk.scr \ + " inherit deploy -UPDATESCRIPT = "${WORKDIR}/flash_mmc.scr" - do_mkimage () { uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ - -n "update script" -d ${UPDATESCRIPT} \ + -n "update script" -d ${WORKDIR}/flash_mmc.scr \ flash_mmc.img + + uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ + -n "update script" -d ${WORKDIR}/flash_blk.scr \ + flash_blk.img } addtask mkimage after do_compile before do_install @@ -42,10 +47,13 @@ addtask mkimage after do_compile before do_install do_deploy () { install -d ${DEPLOYDIR} install ${S}/flash_mmc.img ${DEPLOYDIR}/flash_mmc-${MACHINE}-${PV}-${PR}.img + install ${S}/flash_blk.img ${DEPLOYDIR}/flash_blk-${MACHINE}-${PV}-${PR}.img cd ${DEPLOYDIR} rm -f flash_mmc-${MACHINE}.img ln -sf flash_mmc-${MACHINE}-${PV}-${PR}.img flash_mmc-${MACHINE}.img + rm -f flash_blk-${MACHINE}.img + ln -sf flash_blk-${MACHINE}-${PV}-${PR}.img flash_blk-${MACHINE}.img } addtask deploy after do_install before do_build @@ -55,4 +63,4 @@ do_install[noexec] = "1" do_populate_sysroot[noexec] = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(apalis-imx6)" +COMPATIBLE_MACHINE = "(apalis-imx6|colibri-vf)" diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/flash_mmc.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/flash_mmc.scr deleted file mode 100644 index 5b7dc803..00000000 --- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/flash_mmc.scr +++ /dev/null @@ -1,2 +0,0 @@ -setenv update_uboot 'fatload mmc ${drive}:1 ${loadaddr} u-boot.imx && setexpr blkcnt $filesize + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200 && mmc dev 0 && mmc write ${loadaddr} 2 ${blkcnt}' -echo 'enter "run update_uboot" to update the uboot' diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr new file mode 100644 index 00000000..ee87e854 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr @@ -0,0 +1,6 @@ +test -n ${interface} || setenv interface mmc +test -n ${drive} || setenv drive 1 + +setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' +setenv update_uboot 'fatload ${interface} ${drive}:1 ${loadaddr} u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}' +echo 'enter "run update_uboot" to update the uboot' diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr new file mode 100644 index 00000000..207c7db4 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr @@ -0,0 +1,6 @@ +#flash_mmc has been renamed to flash_blk, ensure compatibilty when updating from older versions +test -n ${interface} || setenv interface mmc +test -n ${drive} || setenv drive 1 + +fatload ${interface} ${drive}:1 ${loadaddr} flash_blk.img +source ${loadaddr} diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr new file mode 100644 index 00000000..5e313804 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr @@ -0,0 +1,2 @@ +setenv update_uboot 'fatload ${interface} 0:1 ${loadaddr} u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${loadaddr} u-boot' +echo 'enter "run update_uboot" to update the uboot' diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr new file mode 100644 index 00000000..e0770a02 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr @@ -0,0 +1,3 @@ +setenv interface mmc +fatload ${interface} 0:1 ${loadaddr} flash_blk.img +source ${loadaddr} diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch new file mode 100644 index 00000000..2e72ff60 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-vf-enable-sdboot-by-default.patch @@ -0,0 +1,45 @@ +From a388755704c3f8c4336939f3c868942d68b1e256 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Thu, 28 May 2015 09:06:54 +0300 +Subject: [PATCH] colibri vf: enable sdboot by default + +Run sdboot first, update dtb file location to /boot/ and +remove console message from tty1 +--- + include/configs/colibri_vf.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h +index feea159..b080510 100644 +--- a/include/configs/colibri_vf.h ++++ b/include/configs/colibri_vf.h +@@ -135,7 +135,7 @@ + "load mmc 0:2 ${kernel_addr_r} /boot/${kernel_file} && " \ + "run sddtbload; bootz ${kernel_addr_r} - ${dtbparam}\0" \ + "sddtbload=setenv dtbparam; load mmc 0:2 ${fdt_addr_r} " \ +- "${soc}-colibri-${fdt_board}.dtb && " \ ++ "/boot/${soc}-colibri-${fdt_board}.dtb && " \ + "setenv dtbparam ${fdt_addr_r}\0" + + #define NFS_BOOTCMD \ +@@ -160,7 +160,7 @@ + "/boot/${soc}-colibri-${fdt_board}.dtb && " \ + "setenv dtbparam ${fdt_addr_r}\0" + +-#define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot" ++#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; run nfsboot" + + #define DFU_ALT_NAND_INFO "vf-bcb part 0,1;u-boot part 0,2;ubi part 0,4" + +@@ -173,7 +173,7 @@ + "defargs=\0" \ + "console=ttyLP0\0" \ + "setup=setenv setupargs fec_mac=${ethaddr} consoleblank=0 " \ +- "console=tty1 console=${console},${baudrate}n8 ${memargs}\0" \ ++ "console=${console},${baudrate}n8 ${memargs}\0" \ + "setsdupdate=mmc rescan && set interface mmc && " \ + "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \ + "source ${loadaddr}\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 index d1675deb..1c2e5617 100644 --- 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 @@ -24,3 +24,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append_apalis-imx6 = " \ file://0001-Update-default-args-for-apalis-imx6.patch \ " +SRC_URI_append_colibri-vf = " \ + file://0001-colibri-vf-enable-sdboot-by-default.patch \ + " -- cgit v1.2.3