From 299aa675369abe4f1eae062bd4f468a006449033 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 10 Aug 2015 12:02:34 +0300 Subject: toradex: move to V2.4 branch V2.4 is based on dizzy branch. Change-Id: Ibcc2501f1c53d2b24bbde417ecd17f5e31e9e8ed Reviewed-by: aavit --- ...-iMX6-set-1280x720-16-for-HDMI-by-default.patch | 32 ------------------ .../recipes/linux/linux-toradex-fsl_git.bbappend | 6 ---- .../recipes/linux/linux-toradex-vf_3.18.bbappend | 33 ------------------- .../recipes/linux/linux-toradex-vf_4.%.bbappend | 33 +++++++++++++++++++ .../0001-Update-default-args-for-apalis-imx6.patch | 30 ++++++++--------- .../0001-colibri-vf-enable-sdboot-by-default.patch | 38 ++++++++-------------- 6 files changed, 62 insertions(+), 110 deletions(-) delete mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-fsl/0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch delete mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend create mode 100644 meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend (limited to 'meta-toradex-extras') diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl/0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch b/meta-toradex-extras/recipes/linux/linux-toradex-fsl/0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch deleted file mode 100644 index 719a38d..0000000 --- a/meta-toradex-extras/recipes/linux/linux-toradex-fsl/0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7515eb259a380578540323be5d4913245e81c454 Mon Sep 17 00:00:00 2001 -From: Andy Nichols -Date: Mon, 13 Apr 2015 12:54:17 +0200 -Subject: [PATCH] Colibri-iMX6: set 1280x720@16 for HDMI by default - ---- - arch/arm/boot/dts/imx6qdl-colibri.dtsi | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi -index e638266..dd8b21fc5 100644 ---- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi -+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi -@@ -70,12 +70,11 @@ - compatible = "fsl,mxc_sdc_fb"; - disp_dev = "hdmi"; - interface_pix_fmt = "RGB24"; -- mode_str ="1920x1080M@60"; --/* default_bpp = <16>;*/ -- default_bpp = <24>; -+ mode_str ="1280x729M@60"; -+ default_bpp = <16>; - int_clk = <0>; - late_init = <0>; -- status = "disabled"; -+ status = "okay"; - }; - - mxcfb2: fb@1 { --- -2.3.5 - diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend index 10997ee..d8d2812 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend +++ b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend @@ -26,12 +26,6 @@ SRC_URI += "\ file://ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch \ " -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" - -SRC_URI += " \ - file://0001-Colibri-iMX6-set-1280x720-16-for-HDMI-by-default.patch \ - " - # kernel image files are not needed in the image RDEPENDS_kernel-base = "" 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 deleted file mode 100644 index 76bf87d..0000000 --- a/meta-toradex-extras/recipes/linux/linux-toradex-vf_3.18.bbappend +++ /dev/null @@ -1,33 +0,0 @@ -############################################################################# -## -## 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-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 -} diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend new file mode 100644 index 0000000..76bf87d --- /dev/null +++ b/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend @@ -0,0 +1,33 @@ +############################################################################# +## +## 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-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 +} 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 60c5171..174f3b0 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 7538ad166d0fb1999f32f2d80969184484c2ba07 Mon Sep 17 00:00:00 2001 +From 1d5baa56ff177d7858727d1c4428096781e3817c 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 @@ -10,30 +10,30 @@ disable cursor blinking. 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h -index 5d32118..289d611 100644 +index 162be2e..f659384 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h -@@ -212,14 +212,14 @@ +@@ -246,14 +246,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; " \ + "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 8bit slot...; " \ -- "run sddtbload; fatload mmc 1:1 ${kernel_addr_r} " \ -+ "run sddtbload; fatload mmc ${drive}:1 ${kernel_addr_r} " \ +- "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; fatload mmc 1:1 ${fdt_addr_r} " \ -+ "sddtbload=setenv dtbparam; fatload mmc ${drive}:1 ${fdt_addr_r} " \ +- "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" - #ifndef CONFIG_APALIS_IMX6_V1_0 -@@ -229,7 +229,8 @@ + #define USB_BOOTCMD \ +@@ -273,7 +273,8 @@ #define FDT_FILE "imx6q-apalis-eval_v1_0.dtb" #endif #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -43,15 +43,15 @@ index 5d32118..289d611 100644 "run nfsboot ; echo ; echo nfsboot failed ; " \ "usb start ;" \ "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ -@@ -242,7 +243,7 @@ - NFS_BOOTCMD \ - SD_BOOTCMD \ +@@ -292,7 +293,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=setenv drive 1; fatload mmc ${drive}:1 ${kernel_addr_r} " \ - "flash_mmc.img || setenv drive 2; fatload mmc ${drive}:1 " \ + "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-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 index 2e72ff6..bae71d5 100644 --- 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 @@ -1,45 +1,35 @@ -From a388755704c3f8c4336939f3c868942d68b1e256 Mon Sep 17 00:00:00 2001 +From 878f506e43f40c2667e9e5ae82741d32fc653cac 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 +Run sdboot first and remove console message from tty1 --- - include/configs/colibri_vf.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + include/configs/colibri_vf.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h -index feea159..b080510 100644 +index 06caabd..fb9fe41 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" +@@ -174,7 +174,7 @@ + "ubifsload ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && " \ + "bootz ${kernel_addr_r} - ${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 @@ +@@ -187,7 +187,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 && " \ + "setup=setenv setupargs " \ +- "console=tty1 console=${console}" \ ++ "console=${console}" \ + ",${baudrate}n8 ${memargs} consoleblank=0\0" \ + "setsdupdate=mmc rescan && setenv interface mmc && " \ "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \ - "source ${loadaddr}\0" \ -- 1.9.1 -- cgit v1.2.3-54-g00ecf