From d1ada2510e9de32b605244862252b31c85ae1012 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Tue, 27 Nov 2012 16:07:39 +0100 Subject: [PATCH] meta-fsl-arm: Rename linux-digi-2.6.35 folder to linux. This is the same as the meta-fsl-arm layer and allows for more recipes for different kernel versions to be considered. Signed-off-by: Alex Gonzalez --- .../linux-digi-2.6.35/linux-digi_2.6.35.bb | 15 ---- .../linux-digi-2.6.35/linux-imx.inc | 74 ------------------- .../ccardxmx28js/defconfig | 0 .../ccxmx51js/defconfig | 0 .../ccxmx53js/defconfig | 0 .../recipes-kernel/linux/linux-digi_2.6.35.bb | 18 +++++ 6 files changed, 18 insertions(+), 89 deletions(-) delete mode 100644 meta-digi-arm/recipes-kernel/linux-digi-2.6.35/linux-digi_2.6.35.bb delete mode 100644 meta-digi-arm/recipes-kernel/linux-digi-2.6.35/linux-imx.inc rename meta-digi-arm/recipes-kernel/{linux-digi-2.6.35 => linux}/ccardxmx28js/defconfig (100%) rename meta-digi-arm/recipes-kernel/{linux-digi-2.6.35 => linux}/ccxmx51js/defconfig (100%) rename meta-digi-arm/recipes-kernel/{linux-digi-2.6.35 => linux}/ccxmx53js/defconfig (100%) create mode 100644 meta-digi-arm/recipes-kernel/linux/linux-digi_2.6.35.bb diff --git a/meta-digi-arm/recipes-kernel/linux-digi-2.6.35/linux-digi_2.6.35.bb b/meta-digi-arm/recipes-kernel/linux-digi-2.6.35/linux-digi_2.6.35.bb deleted file mode 100644 index 5cf6889b4..000000000 --- a/meta-digi-arm/recipes-kernel/linux-digi-2.6.35/linux-digi_2.6.35.bb +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (C) 2011-2012 Freescale Semiconductor -# Copyright (C) 2012 Digi International -# Released under the MIT license (see COPYING.MIT for the terms) - -PR = "${INC_PR}.17" - -include linux-imx.inc - -COMPATIBLE_MACHINE = "(mxs|mx5)" - -SRCREV_mxs = "agonzal/yocto" -LOCALVERSION_mxs = "-mxs+agonzal_yocto" - -SRCREV_mx5 = "agonzal/yocto" -LOCALVERSION_mx5 = "-mx5x+agonzal_yocto" \ No newline at end of file diff --git a/meta-digi-arm/recipes-kernel/linux-digi-2.6.35/linux-imx.inc b/meta-digi-arm/recipes-kernel/linux-digi-2.6.35/linux-imx.inc deleted file mode 100644 index e3e8d9820..000000000 --- a/meta-digi-arm/recipes-kernel/linux-digi-2.6.35/linux-imx.inc +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright (C) 2012 O.S. Systems Software LTDA. -# Copyright (C) 2012 Digi International. -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "Linux kernel for imx platforms" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" - -INC_PR = "r32" - -inherit kernel - -# Put a local version until we have a true SRCREV to point to -LOCALVERSION ?= "+master" -SCMVERSION ?= "y" - -SRC_URI = "git://log-sln-cvs.digi.com/data/vcs/git/linux-2.6.git \ - file://defconfig \ -" - -S = "${WORKDIR}/git" - -kernel_conf_variable() { - CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;" - if test "$2" = "n" - then - echo "# CONFIG_$1 is not set" >> ${S}/.config - else - echo "CONFIG_$1=$2" >> ${S}/.config - fi -} - -do_configure_prepend() { - echo "" > ${S}/.config - CONF_SED_SCRIPT="" - - kernel_conf_variable LOCALVERSION "\"${LOCALVERSION}\"" - kernel_conf_variable LOCALVERSION_AUTO y - - sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${S}/.config' - - if [ "${SCMVERSION}" = "y" ]; then - # Add GIT revision to the local version - head=`git rev-parse --verify --short HEAD 2> /dev/null` - printf "%s%s" +g $head > ${S}/.scmversion - fi -} - -# install needs headers for imx-test compilation -do_install_append() { - # [DIGI] We don't compile imx-test - # bounds.h may be used by a module and is currently missing - # if [ -d include/generated ]; then - # cp include/generated/* $kerneldir/include/generated/ - # fi - - # Host architecture object file - rm -f $kerneldir/scripts/kconfig/kxgettext.o -} - -sysroot_stage_all_append() { - # denzil does not have KERNEL_SRC_PATH so we default to /kernel - destdir=${KERNEL_SRC_PATH} - if [ -z "$destdir" ]; then - destdir=/kernel - fi - - # [DIGI] We do not compile imx-test - # Copy native binaries need for imx-test build onto sysroot - # mkdir -p ${SYSROOT_DESTDIR}/usr/src/kernel/scripts/basic \ - # ${SYSROOT_DESTDIR}/usr/src/kernel/scripts/mod - # cp ${S}/scripts/basic/fixdep ${SYSROOT_DESTDIR}$destdir/scripts/basic - # cp ${S}/scripts/mod/modpost ${SYSROOT_DESTDIR}$destdir/scripts/mod -} diff --git a/meta-digi-arm/recipes-kernel/linux-digi-2.6.35/ccardxmx28js/defconfig b/meta-digi-arm/recipes-kernel/linux/ccardxmx28js/defconfig similarity index 100% rename from meta-digi-arm/recipes-kernel/linux-digi-2.6.35/ccardxmx28js/defconfig rename to meta-digi-arm/recipes-kernel/linux/ccardxmx28js/defconfig diff --git a/meta-digi-arm/recipes-kernel/linux-digi-2.6.35/ccxmx51js/defconfig b/meta-digi-arm/recipes-kernel/linux/ccxmx51js/defconfig similarity index 100% rename from meta-digi-arm/recipes-kernel/linux-digi-2.6.35/ccxmx51js/defconfig rename to meta-digi-arm/recipes-kernel/linux/ccxmx51js/defconfig diff --git a/meta-digi-arm/recipes-kernel/linux-digi-2.6.35/ccxmx53js/defconfig b/meta-digi-arm/recipes-kernel/linux/ccxmx53js/defconfig similarity index 100% rename from meta-digi-arm/recipes-kernel/linux-digi-2.6.35/ccxmx53js/defconfig rename to meta-digi-arm/recipes-kernel/linux/ccxmx53js/defconfig diff --git a/meta-digi-arm/recipes-kernel/linux/linux-digi_2.6.35.bb b/meta-digi-arm/recipes-kernel/linux/linux-digi_2.6.35.bb new file mode 100644 index 000000000..99bc6899f --- /dev/null +++ b/meta-digi-arm/recipes-kernel/linux/linux-digi_2.6.35.bb @@ -0,0 +1,18 @@ +# Copyright (C) 2012 Digi International +PR = "${INC_PR}.0" + +include recipes-kernel/linux/linux-imx.inc + +COMPATIBLE_MACHINE = "(mxs|mx5)" + +SRCREV_mxs = "agonzal/yocto" +LOCALVERSION_mxs = "-mxs+agonzal_yocto" + + +SRCREV_mx5 = "agonzal/yocto" +LOCALVERSION_mx5 = "-mx5x+agonzal_yocto" + +SRC_URI = "git://log-sln-git.digi.com/linux-2.6.git \ + file://defconfig \ +" +