From 362c0d8250ae1b8d7b2afce5bc4b27075fe82c68 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 19 Jun 2012 09:09:54 +0200 Subject: Update to new NV binary packages L4T R15 Removed nvrm_deamon and corresponding init.d script Kernel from git.toradex.int --- recipes-kernel/linux/linux-colibri-t20_git.bb | 15 ++++++++--- recipes-kernel/linux/linux-colibri-t20_git.bb~ | 36 -------------------------- 2 files changed, 11 insertions(+), 40 deletions(-) delete mode 100644 recipes-kernel/linux/linux-colibri-t20_git.bb~ (limited to 'recipes-kernel/linux') diff --git a/recipes-kernel/linux/linux-colibri-t20_git.bb b/recipes-kernel/linux/linux-colibri-t20_git.bb index be91e90..b081ab8 100644 --- a/recipes-kernel/linux/linux-colibri-t20_git.bb +++ b/recipes-kernel/linux/linux-colibri-t20_git.bb @@ -1,15 +1,18 @@ inherit kernel require recipes-kernel/linux/linux.inc -LINUX_VERSION ?= "2.6.36.2" +LINUX_VERSION ?= "3.1.10" -SRCREV = "99003b6bd73fd8ce4f2bd63a1c7b63f8c3d0cf68" +SRCREV = "37440f3ed07a6f588b05b8f98d0b3025c1949371" -PV = "2.6.36.2+gitr${SRCREV}" +PV = "${LINUX_VERSION}+gitr${SRCREV}" PR = "V1.1b1" S = "${WORKDIR}/git" +#SRC_URI = "\ +# git://gitorious.org/colibri-t20-embedded-linux-bsp/colibri_t20-linux-kernel.git;protocol=git;branch=master \ +# file://bcm4329_warning.patch " SRC_URI = "\ - git://gitorious.org/colibri-t20-embedded-linux-bsp/colibri_t20-linux-kernel.git;protocol=git;branch=master \ + git://git.toradex.com/linux-colibri.git;protocol=git;branch=colibri \ file://bcm4329_warning.patch " #SVN_REV = 190 @@ -35,5 +38,9 @@ do_configure_prepend_colibri-t20() { echo "KBUILD_CFLAGS += -mno-unaligned-access" >> ${S}/Makefile } +do_compile_kernelmodules_colibri-t20() { + : +} + #require recipes-kernel/linux/linux-tools.inc diff --git a/recipes-kernel/linux/linux-colibri-t20_git.bb~ b/recipes-kernel/linux/linux-colibri-t20_git.bb~ deleted file mode 100644 index 233f087..0000000 --- a/recipes-kernel/linux/linux-colibri-t20_git.bb~ +++ /dev/null @@ -1,36 +0,0 @@ -inherit kernel -require recipes-kernel/linux/linux.inc - -LINUX_VERSION ?= "2.6.36.2" - -SRCREV = "99003b6bd73fd8ce4f2bd63a1c7b63f8c3d0cf68" - -PV = "2.6.36.2+gitr${SRCREV}" -PR = "V1.0b6" -S = "${WORKDIR}/git" -SRC_URI = "\ - git://gitorious.org/colibri-t20-embedded-linux-bsp/colibri_t20-linux-kernel.git;protocol=git;branch=master \ - file://bcm4329_warning.patch " - -#SVN_REV = 190 -#PV = "2.6.36.2" -#PR = "${SVN_REV}" -#S = "${WORKDIR}/kernel" -#SRC_URI = "svn://tegradev:tegra123!@mammut.toradex.int:8090/colibri_tegra_linux/trunk;module=kernel;rev=${SVN_REV};proto=http \ -# file://bcm4329_warning.patch " - -COMPATIBLE_MACHINE = "colibri-t20" - -CMDLINE="mem=148M@0M fbmem=12M@148M nvmem=96M@160M vmalloc=248M video=tegrafb root=/dev/nfs ip=:::::eth0:on rw netdevwait mtdparts=tegra_nand:1018368K@28160K(userspace) console=ttyS0,115200n8 usb_high_speed=0" - -do_configure_prepend_colibri-t20() { - #use the defconfig provided in the kernel source tree - install -m 0644 ${S}/arch/arm/configs/colibri_t20_defconfig ${WORKDIR}/defconfig - - #compile with -O2, 4.5. compiler seems to fail with -Os - sed -i -e /CONFIG_CC_OPTIMIZE_FOR_SIZE/d ${WORKDIR}/defconfig - echo "CONFIG_CC_OPTIMIZE_FOR_SIZE=n" >> ${WORKDIR}/defconfig -} - -#require recipes-kernel/linux/linux-tools.inc - -- cgit v1.2.3