summaryrefslogtreecommitdiffstats
path: root/recipes-kernel
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2015-02-06 12:23:19 -0200
committerOtavio Salvador <otavio@ossystems.com.br>2015-02-09 11:05:34 -0200
commitfc726518f2fdf74cb00f8efe3d183e89269b33a4 (patch)
treeda8a0d2be59dba8b78632eb35bb76dfd5a8a8d31 /recipes-kernel
parentd74ca2fa54c3e8ad07998c237d3da2e485227f15 (diff)
downloadmeta-fsl-arm-fc726518f2fdf74cb00f8efe3d183e89269b33a4.tar.gz
linux-fslc.inc: Avoid duplication on assignments
The linux-imx.inc already handles the base settings, this drops the assignments which were duplicate in linux-fslc.inc file. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/linux/linux-fslc.inc11
-rw-r--r--recipes-kernel/linux/linux-imx.inc3
2 files changed, 4 insertions, 10 deletions
diff --git a/recipes-kernel/linux/linux-fslc.inc b/recipes-kernel/linux/linux-fslc.inc
index dc560b9..416956e 100644
--- a/recipes-kernel/linux/linux-fslc.inc
+++ b/recipes-kernel/linux/linux-fslc.inc
@@ -1,17 +1,10 @@
1# Copyright (C) 2012-2014 O.S. Systems Software LTDA. 1# Copyright (C) 2012-2015 O.S. Systems Software LTDA.
2# Released under the MIT license (see COPYING.MIT for the terms) 2# Released under the MIT license (see COPYING.MIT for the terms)
3 3
4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
6DEPENDS += "lzop-native bc-native"
7PROVIDES = "virtual/kernel linux-mainline"
8
9inherit kernel
10
11require recipes-kernel/linux/linux-imx.inc 4require recipes-kernel/linux/linux-imx.inc
12require recipes-kernel/linux/linux-dtb.inc 5require recipes-kernel/linux/linux-dtb.inc
13 6
14SRCBRANCH ?= "" 7DEPENDS += "lzop-native bc-native"
15 8
16SRC_URI = "git://github.com/Freescale/linux-mainline.git;branch=${SRCBRANCH} \ 9SRC_URI = "git://github.com/Freescale/linux-mainline.git;branch=${SRCBRANCH} \
17 file://defconfig" 10 file://defconfig"
diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc
index 1f12cb8..d790227 100644
--- a/recipes-kernel/linux/linux-imx.inc
+++ b/recipes-kernel/linux/linux-imx.inc
@@ -1,4 +1,4 @@
1# Copyright (C) 2012, 2014 O.S. Systems Software LTDA. 1# Copyright (C) 2012, 2015 O.S. Systems Software LTDA.
2# Released under the MIT license (see COPYING.MIT for the terms) 2# Released under the MIT license (see COPYING.MIT for the terms)
3 3
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
@@ -9,6 +9,7 @@ inherit kernel fsl-kernel-localversion
9# Put a local version until we have a true SRCREV to point to 9# Put a local version until we have a true SRCREV to point to
10LOCALVERSION ?= "" 10LOCALVERSION ?= ""
11SCMVERSION ?= "y" 11SCMVERSION ?= "y"
12SRCBRANCH ?= ""
12 13
13SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git;branch=${SRCBRANCH} \ 14SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git;branch=${SRCBRANCH} \
14 file://defconfig \ 15 file://defconfig \