linux-davinci git: update to 2.6.30-rc7, drop vpfe patches in favour of using the...

diff --git a/recipes/linux/linux-davinci_git.bb b/recipes/linux/linux-davinci_git.bb
index 8ee663a..7af90fa 100644 (file)
--- a/recipes/linux/linux-davinci_git.bb
+++ b/recipes/linux/linux-davinci_git.bb
@@ -7,27 +7,15 @@ COMPATIBLE_MACHINE = "(dm6446-evm|dm6467-evm|dm355-evm|davinci-sffsdr|dm355-leop
 
 DEFAULT_PREFERENCE = "1"
 
-SRCREV = "486afa37130356662213cc1a2199a285b4fd72af"
+SRCREV = "03022e38318bef016836dae71c70b9ea975723e7"
 
 # The main PR is now using MACHINE_KERNEL_PR, for davinci see conf/machine/include/davinci.inc
-PV = "2.6.29+2.6.29-rc7-${PR}+gitr${SRCREV}"
-
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git;protocol=git \
-           file://update-mach-types.patch;patch=1 \
-           file://vfpe1.patch;patch=1 \
-           file://vfpe2.patch;patch=1 \
-           file://vfpe3.patch;patch=1 \
-           file://vfpe4.patch;patch=1 \
-           file://vfpe5.patch;patch=1 \
-           file://vfpe6.patch;patch=1 \
-           file://vfpe7.patch;patch=1 \
-           file://defconfig"
+PV = "2.6.29+2.6.30-rc7-${PR}+gitr${SRCREV}"
 
-# No vfpe patches for DM6467
-SRC_URI_dm6467-evm = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git;protocol=git \
-           file://update-mach-types.patch;patch=1 \
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git;protocol=git;branch=staging/vpfe \
            file://defconfig"
 
+# Need checking
 SRC_URI_append_davinci-sffsdr = " \
            file://0001-USB-musb-cppi-bugfixes.patch;patch=1 \
            file://0002-ARM-Mark-unsupported-syscalls-as-IGNORE.patch;patch=1 \
@@ -43,9 +31,4 @@ SRC_URI_append_davinci-sffsdr = " \
            file://0012-Update-SFFSDR-to-support-FPGA-and-lyrvpss-drivers.patch;patch=1 \
           "
 
-SRC_URI_append_dm355-leopard = " \
-          file://0001-dm355-leopard-add-board-file-based-on-board-dm355-e.patch;patch=1 \
-          file://vfpe.patch;patch=1 \
-"
-
 S = "${WORKDIR}/git"