summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-fsl-arm/recipes-kernel/linux/linux-imx.inc2
-rw-r--r--meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb1
-rw-r--r--meta-fsl-arm/recipes-kernel/linux/linux-imx_3.0.35.bb1
-rw-r--r--meta-fsl-arm/recipes-kernel/linux/linux-imx_3.10.9.bb1
4 files changed, 4 insertions, 1 deletions
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx.inc b/meta-fsl-arm/recipes-kernel/linux/linux-imx.inc
index 73af4aa3e..7b1ffeebd 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx.inc
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx.inc
@@ -13,7 +13,7 @@ inherit kernel
13LOCALVERSION ?= "+yocto" 13LOCALVERSION ?= "+yocto"
14SCMVERSION ?= "y" 14SCMVERSION ?= "y"
15 15
16SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git \ 16SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git;branch=${SRCBRANCH} \
17 file://defconfig \ 17 file://defconfig \
18" 18"
19 19
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb
index 4941e8947..434c21e08 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb
@@ -10,6 +10,7 @@ COMPATIBLE_MACHINE = "(mx28|mx5)"
10# Revision of imx_2.6.35_maintain branch 10# Revision of imx_2.6.35_maintain branch
11SRCREV = "903363ed80a113f2d1e3e96e508ecf128d9af323" 11SRCREV = "903363ed80a113f2d1e3e96e508ecf128d9af323"
12LOCALVERSION = "-maintain+yocto" 12LOCALVERSION = "-maintain+yocto"
13SRCBRANCH = "imx_2.6.35_maintain"
13 14
14SRC_URI += "file://NFS-Fix-nfsroot-support.patch \ 15SRC_URI += "file://NFS-Fix-nfsroot-support.patch \
15 file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \ 16 file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.0.35.bb b/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.0.35.bb
index cb71e5633..72506f2d6 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.0.35.bb
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.0.35.bb
@@ -10,6 +10,7 @@ COMPATIBLE_MACHINE = "(mx6)"
10# Revision of 4.1.0 branch 10# Revision of 4.1.0 branch
11SRCREV = "bdde708ebfde4a8c1d3829578d3f6481a343533a" 11SRCREV = "bdde708ebfde4a8c1d3829578d3f6481a343533a"
12LOCALVERSION = "-4.1.0+yocto" 12LOCALVERSION = "-4.1.0+yocto"
13SRCBRANCH = "imx_3.0.35_4.1.0"
13 14
14# Patches need for Yocto and not applied by Freescale when doing 4.1.0 branch 15# Patches need for Yocto and not applied by Freescale when doing 4.1.0 branch
15SRC_URI += "file://drm-vivante-Add-00-sufix-in-returned-bus-Id.patch \ 16SRC_URI += "file://drm-vivante-Add-00-sufix-in-returned-bus-Id.patch \
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.10.9.bb b/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.10.9.bb
index c7322ff11..316751e06 100644
--- a/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.10.9.bb
+++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx_3.10.9.bb
@@ -11,5 +11,6 @@ DEFAULT_PREFERENCE = "-1"
11# 3.10.9-1.0.0 rc1 commit 11# 3.10.9-1.0.0 rc1 commit
12SRCREV = "dbf364b3d0123e5328ae28455c57e588635232c7" 12SRCREV = "dbf364b3d0123e5328ae28455c57e588635232c7"
13LOCALVERSION = "-1.0.0_alpha" 13LOCALVERSION = "-1.0.0_alpha"
14SRCBRANCH = "imx_3.10.9_1.0.0_alpha"
14 15
15COMPATIBLE_MACHINE = "(mx6)" 16COMPATIBLE_MACHINE = "(mx6)"