summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.oss.09@gmail.com>2015-09-04 14:54:19 +0200
committerMax Krummenacher <max.oss.09@gmail.com>2015-10-12 15:36:39 +0200
commit68a44339f3e48cbdf29fa89bfd60c0ffa7b1bac4 (patch)
tree15cd95e83300da3215191dd8a8ff604d3a8dfc47
parentb477b7f3caf413009affda5531d81bc0445ea567 (diff)
Apalis iMX6: cleanup filename for V1.0 HW
Follow the rename imx6q-apalis-eval_v1_0.dtb to imx6q-apalis_v1_0-eval.dtb in the kernel. The v1_0 denotes the Apalis module version, not the evaluation board version.
-rw-r--r--conf/machine/apalis-imx6.conf2
-rw-r--r--recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb4
-rw-r--r--recipes-kernel/linux/linux-toradex-fsl_git.bb2
3 files changed, 4 insertions, 4 deletions
diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf
index 08eaa02..80ca71a 100644
--- a/conf/machine/apalis-imx6.conf
+++ b/conf/machine/apalis-imx6.conf
@@ -12,7 +12,7 @@ SOC_FAMILY = "mx6:mx6q"
PREFERRED_PROVIDER_u-boot = "u-boot-toradex-fsl"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-fsl"
PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-fsl"
-KERNEL_DEVICETREE = "imx6q-apalis-eval.dtb imx6q-apalis-eval_v1_0.dtb"
+KERNEL_DEVICETREE = "imx6q-apalis-eval.dtb imx6q-apalis_v1_0-eval.dtb"
KERNEL_IMAGETYPE = "uImage"
PREFERRED_VERSION_xserver-xorg_mx6 = "99:1.14%"
diff --git a/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb b/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
index af9430f..5604ffe 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
@@ -10,8 +10,8 @@ PR = "r0"
S = "${WORKDIR}/git"
-SRCREV_mx6 = "06ee8db6422e02337242e43b8573359443db59ea"
-SRCBRANCH_mx6 = "2015.04-toradex"
+SRCREV_mx6 = "95868835ab8181591446bc3f24a15bf6fbdfd1f5"
+SRCBRANCH_mx6 = "2015.04-toradex-next"
SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=${SRCBRANCH}"
#FILESPATHPKG =. "git:"
diff --git a/recipes-kernel/linux/linux-toradex-fsl_git.bb b/recipes-kernel/linux/linux-toradex-fsl_git.bb
index 48dc5c5..cb4f518 100644
--- a/recipes-kernel/linux/linux-toradex-fsl_git.bb
+++ b/recipes-kernel/linux/linux-toradex-fsl_git.bb
@@ -11,7 +11,7 @@ DEPENDS += "lzop-native "
LINUX_VERSION_mx6 = "3.14.28"
-SRCREV_mx6 = "01055e28e5af1d5e309c9eeea19cf012f324dbe8"
+SRCREV_mx6 = "6ef4eef1eb726929d913580b9b24d4f57904dc80"
PR_mx6 = "V2.5b1"
PV = "${LINUX_VERSION}+gitr${SRCREV}"