diff options
| -rw-r--r-- | conf/machine/apalis-imx6.conf | 2 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb | 4 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-toradex-fsl_git.bb | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf index 46e7c24..372a871 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" +KERNEL_DEVICETREE = "imx6q-apalis-eval.dtb imx6q-apalis-eval_v1_0.dtb" 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 09d5493..0428952 100644 --- a/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb +++ b/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb @@ -13,8 +13,8 @@ S = "${WORKDIR}/git" SRCREV_colibri-vf = "67c3a4aee6c0af124ce779aed1be70c7a92d0916" SRCBRANCH_colibri-vf = "2014.10-toradex" -SRCREV_mx6 = "d4c752ac0eca88873e73a5a3bee6573f6d0ec92a" -SRCBRANCH_mx6 = "2014.04-toradex" +SRCREV_mx6 = "d593e1931d1a9fa00ee99dcd9b61e1c3f738ab1c" +SRCBRANCH_mx6 = "2014.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 f54821a..7d15271 100644 --- a/recipes-kernel/linux/linux-toradex-fsl_git.bb +++ b/recipes-kernel/linux/linux-toradex-fsl_git.bb @@ -14,13 +14,13 @@ LINUX_VERSION_mx6 = "3.10.17" SRCREV_colibri-vf = "3188a1756dc1a60e3f311d24c242873a1291f86b" PR_colibri-vf = "V2.3b4" -SRCREV_mx6 = "f79675e581a4abda12db31cde3ee71d44016b981" -PR_mx6 = "V2.3b4" +SRCREV_mx6 = "23b22e549ed6ede5b44a948824463daafb6745c3" +PR_mx6 = "V2.3b5" PV = "${LINUX_VERSION}+gitr${SRCREV}" S = "${WORKDIR}/git" SRCBRANCH_colibri-vf = "colibri_vf" -SRCBRANCH_mx6 = "toradex_imx_3.10.17_1.0.0_ga" +SRCBRANCH_mx6 = "toradex_imx_3.10.17_1.0.0_ga-next" SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRANCH}" # a Patch # SRC_URI_append_mx6 += "file://a.patch " |