colibri-vf: update kernel to latest, port recipe for use with daisy

1 files changed, 20 insertions, 9 deletions

diff --git a/recipes-kernel/linux/linux-toradex-fsl_git.bb b/recipes-kernel/linux/linux-toradex-fsl_git.bb
index c3d3586..9aa0d1d 100644
--- a/recipes-kernel/linux/linux-toradex-fsl_git.bb
+++ b/recipes-kernel/linux/linux-toradex-fsl_git.bb
@@ -6,11 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 inherit kernel
 
+DEPENDS += "lzop-native "
+
 LINUX_VERSION_colibri-vf = "3.0.15"
 LINUX_VERSION_apalis-imx6 ?= "3.0.35"
 
-SRCREV_colibri-vf = "768d4af538e6d1fbc3f3342d6179427fa3e22bfe"
-PR_colibri-vf = "V2.2b1"
+SRCREV_colibri-vf = "1d876acfd2cd445fe46e5bc4c531da2c6bef0c91"
+PR_colibri-vf = "V2.3b1"
 SRCREV_apalis-imx6 = "fbff978ea77f9d0832cc924e91b2497d7cde572c"
 PR_apalis-imx6 = "V2.2b1"
 
@@ -30,10 +32,6 @@ config_script () {
 #    #sets CONFIG_TEGRA_CAMERA unconditionally to 'y'
 #    sed -i -e /CONFIG_TEGRA_CAMERA/d ${S}/.config
 #    echo "CONFIG_TEGRA_CAMERA=y" >> ${S}/.config
-    sed -i -e /CONFIG_B43/d ${S}/.config
-    echo "CONFIG_B43=m" >> ${S}/.config
-    sed -i -e /CONFIG_SSB/d ${S}/.config
-    echo "CONFIG_SSB=m" >> ${S}/.config
     echo "dummy" > /dev/null
 }
 
@@ -48,9 +46,13 @@ do_configure_prepend () {
     config_script 
 }
 
+# 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}"
+
 kernel_do_compile() {
     unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
-     oe_runmake ${KERNEL_IMAGETYPE_FOR_MAKE} ${KERNEL_ALT_IMAGETYPE} LD="${KERNEL_LD}"
+    oe_runmake ${KERNEL_IMAGETYPE_FOR_MAKE} ${KERNEL_ALT_IMAGETYPE} LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS}
     if test "${KERNEL_IMAGETYPE_FOR_MAKE}.gz" = "${KERNEL_IMAGETYPE}"; then
         gzip -9c < "${KERNEL_IMAGETYPE_FOR_MAKE}" > "${KERNEL_OUTPUT}"
     fi
@@ -65,8 +67,17 @@ do_compile_kernelmodules() {
     fi
 }
 
+#since daisy oe refuses to install headers in /usr/include/linux, install
+#them  in /usr/local/include/linux. This is also in gcc's default include paths
+PACKAGES =+ "kernel-fsl-headers-dev"
+FILES_kernel-fsl-headers-dev = "${prefix}/local/include/linux/"
 do_install_append_colibri-vf() {
     #install vybrid specific headers with definitions used for userspace interaction
-    install -d ${D}/${includedir}/linux
-    install -m 644 ${S}/include/linux/mvf_sema4.h ${D}/${includedir}/linux/
+    install -d ${D}/${prefix}/local/include/linux/
+    install -m 644 ${S}/include/linux/mvf_sema4.h ${D}/${prefix}/local/include/linux/
+}
+
+python sysroot_stage_all_append () {
+    if os.path.isdir("${D}/${prefix}/local/include/linux/"):
+        oe.path.copyhardlinktree(d.expand("${D}/${prefix}/local/include/linux/"), d.expand("${SYSROOT_DESTDIR}/${prefix}/local/include/linux/"))
 }