diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2015-02-06 12:23:19 -0200 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-02-09 11:05:34 -0200 |
| commit | 6f872fb4595acddf1824d08a50e77c2f8cb4bcde (patch) | |
| tree | ae27b3f93a3a240eeba97310b464bca2e0d505bc | |
| parent | 635633a19957d61d9b71e14137894e80ade50249 (diff) | |
| download | meta-freescale-6f872fb4595acddf1824d08a50e77c2f8cb4bcde.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>
| -rw-r--r-- | meta-fsl-arm/recipes-kernel/linux/linux-fslc.inc | 11 | ||||
| -rw-r--r-- | meta-fsl-arm/recipes-kernel/linux/linux-imx.inc | 3 |
2 files changed, 4 insertions, 10 deletions
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-fslc.inc b/meta-fsl-arm/recipes-kernel/linux/linux-fslc.inc index dc560b93a..416956e70 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-fslc.inc +++ b/meta-fsl-arm/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 | ||
| 4 | LICENSE = "GPLv2" | ||
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" | ||
| 6 | DEPENDS += "lzop-native bc-native" | ||
| 7 | PROVIDES = "virtual/kernel linux-mainline" | ||
| 8 | |||
| 9 | inherit kernel | ||
| 10 | |||
| 11 | require recipes-kernel/linux/linux-imx.inc | 4 | require recipes-kernel/linux/linux-imx.inc |
| 12 | require recipes-kernel/linux/linux-dtb.inc | 5 | require recipes-kernel/linux/linux-dtb.inc |
| 13 | 6 | ||
| 14 | SRCBRANCH ?= "" | 7 | DEPENDS += "lzop-native bc-native" |
| 15 | 8 | ||
| 16 | SRC_URI = "git://github.com/Freescale/linux-mainline.git;branch=${SRCBRANCH} \ | 9 | SRC_URI = "git://github.com/Freescale/linux-mainline.git;branch=${SRCBRANCH} \ |
| 17 | file://defconfig" | 10 | file://defconfig" |
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx.inc b/meta-fsl-arm/recipes-kernel/linux/linux-imx.inc index 1f12cb8f8..d79022724 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx.inc +++ b/meta-fsl-arm/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 | ||
| 4 | LICENSE = "GPLv2" | 4 | LICENSE = "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 |
| 10 | LOCALVERSION ?= "" | 10 | LOCALVERSION ?= "" |
| 11 | SCMVERSION ?= "y" | 11 | SCMVERSION ?= "y" |
| 12 | SRCBRANCH ?= "" | ||
| 12 | 13 | ||
| 13 | SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git;branch=${SRCBRANCH} \ | 14 | SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git;branch=${SRCBRANCH} \ |
| 14 | file://defconfig \ | 15 | file://defconfig \ |
