meta-digi-arm: sync kernel recipes with meta-fsl-arm's

Signed-off-by: Javier Viguera <javier.viguera@digi.com>

meta-digi-arm/recipes-kernel/linux/linux-dey.inc

@@ -14,6 +14,25 @@ inherit kernel
 LOCALVERSION ?= "+dey"
 SCMVERSION ?= "y"
 
+# Add imx-test support hacks
+IMX_TEST_SUPPORT ?= "y"
+
+SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-linux.git;protocol=git"
+SRC_URI_internal = "${DIGI_GIT}linux-2.6.git;protocol=git;branch=${KBRANCH}"
+SRC_URI = " \
+    ${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)} \
+    file://defconfig \
+    ${KERNEL_CFG_FRAGS} \
+"
+
+S = "${WORKDIR}/git"
+
+# We need to pass it as param since kernel might support more then one
+# machine, with different entry points
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
+
+FILES_kernel-image += "/boot/config*"
+
 kernel_conf_variable() {
 	CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;"
 	if test "$2" = "n"
@@ -53,13 +72,15 @@ do_deploy_append() {
 
 # install nedded headers for imx-test compilation
 do_install_append() {
+	if [ "${IMX_TEST_SUPPORT}" = "y" ]; then
 		# bounds.h may be used by a module and is currently missing
 		if [ -d include/generated ]; then
-		cp -a include/generated/* $kerneldir/include/generated/
+			cp -r include/generated/* $kerneldir/include/generated/
 		fi
 
 		# Host architecture object file
 		rm -f $kerneldir/scripts/kconfig/kxgettext.o
+	fi
 }
 
 sysroot_stage_all_append() {

meta-digi-arm/recipes-kernel/linux/linux-dey_2.6.35.14.bb

@@ -1,9 +1,11 @@
 # Copyright (C) 2012 Digi International
 
-include linux-dey.inc
-
 PR = "${DISTRO}.${INC_PR}.0"
 
+require recipes-kernel/linux/linux-dey.inc
+
+COMPATIBLE_MACHINE = "(mxs|mx5)"
+
 KBRANCH_DEFAULT = "del-5.9/meta-digi"
 KBRANCH = "${KBRANCH_DEFAULT}"
 
@@ -14,16 +16,6 @@ SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '
 LOCALVERSION_mx5 = "mx5"
 LOCALVERSION_mxs = "mxs"
 
-SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-linux.git;protocol=git"
-SRC_URI_internal = "${DIGI_GIT}linux-2.6.git;protocol=git;branch=${KBRANCH}"
-SRC_URI = " \
-    ${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)} \
-    file://defconfig \
-    ${KERNEL_CFG_FRAGS} \
-"
-
-S = "${WORKDIR}/git"
-
 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)}"
@@ -36,7 +28,3 @@ KERNEL_CFG_FRAGS_append_ccardimx28js = " ${@base_contains('MACHINE_FEATURES', '1
 KERNEL_CFG_FRAGS_append_ccardimx28js = " ${@base_contains('MACHINE_FEATURES', 'ext-eth', 'file://config-ext-eth.cfg', '', d)}"
 KERNEL_CFG_FRAGS_append_ccardimx28js = " ${@base_contains('DISTRO_FEATURES', 'x11', 'file://config-fb.cfg file://config-touch.cfg', '', d)}"
 KERNEL_CFG_FRAGS_append_ccardimx28js = " ${@base_contains('MACHINE_FEATURES', 'alsa', 'file://config-sound.cfg', '', d)}"
-
-FILES_kernel-image += "/boot/config*"
-
-COMPATIBLE_MACHINE = "(mxs|mx5)"

meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb

@@ -2,12 +2,13 @@
 
 UBOOT_ENTRYPOINT  = "0x40008000"
 
+require recipes-kernel/linux/linux-dey.inc
 require recipes-kernel/linux/linux-dtb.inc
 
-include linux-dey.inc
-
 PR = "${DISTRO}.${INC_PR}.0"
 
+DEPENDS += "lzop-native bc-native"
+
 KBRANCH_DEFAULT = "v3.10/master"
 KBRANCH = "${KBRANCH_DEFAULT}"
 KBRANCH_mxs = "v3.10.y/maint"
@@ -22,18 +23,6 @@ LOCALVERSION_mxs = "mxs"
 KERNEL_CFG_FRAGS ?= ""
 KERNEL_CFG_FRAGS_append = " ${@base_conditional('HAVE_EXAMPLE', '1' , 'file://config-spidev.cfg', '', d)}"
 
-SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-linux.git;protocol=git"
-SRC_URI_internal = "${DIGI_GIT}linux-2.6.git;protocol=git;branch=${KBRANCH}"
-SRC_URI = " \
-    ${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRC_URI_internal}', '${SRC_URI_external}', d)} \
-    file://defconfig \
-    ${KERNEL_CFG_FRAGS} \
-"
-
-S = "${WORKDIR}/git"
-
-KERNEL_EXTRA_ARGS = "LOADADDR=${UBOOT_LOADADDRESS}"
-
 config_dts() {
 	for DTB in ${KERNEL_DEVICETREE}; do
 		if [ "${1}" = "enable" ]; then
@@ -90,6 +79,4 @@ do_update_dts_mxs() {
 }
 addtask update_dts before do_install after do_sizecheck
 
-FILES_kernel-image += "/boot/config*"
-
 COMPATIBLE_MACHINE = "(mxs)"