diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index 014c91030..31d49adad 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -2,27 +2,17 @@ require recipes-kernel/linux/linux-imx.inc +SUMMARY = "Linux kernel for Digi boards" +DEPENDS += "lzop-native bc-native" LOCALVERSION = "-dey" -# Kernel configuration fragments -KERNEL_CFG_FRAGS ??= "" - SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-linux.git;protocol=git;nobranch=1" SRC_URI_internal = "${DIGI_GIT}linux-2.6.git;protocol=git;branch=${SRCBRANCH}" SRC_URI = " \ ${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)} \ file://defconfig \ - ${KERNEL_CFG_FRAGS} \ " -do_configure() { - for i in $(echo ${WORKDIR}/*.cfg); do - [ "${i}" = "${WORKDIR}/*.cfg" ] && continue - cat ${i} >> ${B}/.config - done - kernel_do_configure -} - do_deploy_append() { (cd ${DEPLOYDIR} && ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}) } diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb index 5a6862e9f..6a5c61ccf 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb @@ -2,8 +2,6 @@ require recipes-kernel/linux/linux-dey.inc -COMPATIBLE_MACHINE = "(mx5)" - # Internal repo branch SRCBRANCH = "v2.6.35/dey-1.4/maint" @@ -11,9 +9,24 @@ SRCREV_external = "" SRCREV_internal = "${AUTOREV}" SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}" -KERNEL_CFG_FRAGS ?= "" -KERNEL_CFG_FRAGS_append_mx5 = "file://config-sahara-module.cfg file://config-camera-module.cfg" -KERNEL_CFG_FRAGS_append_mx5 = " ${@base_contains('MACHINE_FEATURES', 'accelerometer', 'file://config-accel-module.cfg', '', d)}" -KERNEL_CFG_FRAGS_append_mx5 = " ${@base_contains('MACHINE_FEATURES', 'ext-eth', 'file://config-ext-eth-module.cfg', '', d)}" -KERNEL_CFG_FRAGS_append_mx5 = " ${@base_contains('MACHINE_FEATURES', 'wifi', 'file://config-wireless-redpine.cfg', '', d)}" +KERNEL_CFG_FRAGS = " \ + file://config-camera-module.cfg \ + file://config-sahara-module.cfg \ + ${@base_contains('MACHINE_FEATURES', 'accelerometer', 'file://config-accel-module.cfg', '', d)} \ + ${@base_contains('MACHINE_FEATURES', 'ext-eth', 'file://config-ext-eth-module.cfg', '', d)} \ + ${@base_contains('MACHINE_FEATURES', 'wifi', 'file://config-wireless-redpine.cfg', '', d)} \ +" KERNEL_CFG_FRAGS_append_ccimx51js = " file://config-battery-module.cfg" + +SRC_URI += "${KERNEL_CFG_FRAGS}" + +# Override the do_configure function to add the kernel fragments +do_configure() { + for i in $(echo ${WORKDIR}/*.cfg); do + [ "${i}" = "${WORKDIR}/*.cfg" ] && continue + cat ${i} >> ${B}/.config + done + kernel_do_configure +} + +COMPATIBLE_MACHINE = "(ccimx5)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb index 6b11744ff..c1822eb12 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb @@ -3,8 +3,6 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc -DEPENDS += "lzop-native bc-native" - # Internal repo branch SRCBRANCH = "v3.10/dey-1.4/maint" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb index 3eaa9e163..6b8948753 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb @@ -3,8 +3,6 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc -DEPENDS += "lzop-native bc-native" - # Internal repo branch SRCBRANCH = "v3.14/master"