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 --- conf/distro/include/apalis-imx6.conf | 3 ++- .../0001-Update-default-args-for-apalis-imx6.patch | 22 +++++++++++++--------- scripts/manifest.xml | 2 +- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index 8aa50b7..86ae4f5 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf @@ -25,10 +25,11 @@ include conf/distro/include/toradex.inc BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ ${KERNEL_IMAGETYPE}-imx6q-apalis-eval.dtb:imx6q-apalis-eval.dtb \ + ${KERNEL_IMAGETYPE}-imx6q-apalis-eval_v1_0.dtb:imx6q-apalis-eval_v1_0.dtb \ u-boot-${MACHINE}.imx:u-boot.imx \ flash_mmc-${MACHINE}.img:flash_mmc.img \ " -BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy" +BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ 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 c7f0f9b..3b791cf 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 diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 0eb2fb9..d41f32b 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -45,7 +45,7 @@ groups="notdefault,bbb"/> -- cgit v1.2.3-54-g00ecf