linux-davinci: bump PR and point to include file where MACHINE_KERNEL_PR is located

7 files changed, 8 insertions, 11 deletions

diff --git a/conf/machine/dm355-leopard.conf b/conf/machine/dm355-leopard.conf
index b83cca5487..a488e0b1c8 100644
--- a/conf/machine/dm355-leopard.conf
+++ b/conf/machine/dm355-leopard.conf
@@ -2,11 +2,9 @@
 #@NAME: Leopard "beagle buddy" DM355 based IP cam board
 #@DESCRIPTION: Machine configuration for the DM355 leopard board
 
+require conf/machine/include/davinci.inc
 TARGET_ARCH = "arm"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-davinci"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
-
 PREFERRED_VERSION_u-boot = "1.2.0"
 UBOOT_MACHINE = "davinci_leopard_config"
 UBOOT_ENTRYPOINT = "0x80008000"
@@ -15,5 +13,3 @@ SERIAL_CONSOLE ?= "115200 ttyS0"
 
 MACHINE_FEATURES = "kernel26 alsa ethernet usbhost usbgadget mmc"
 
-require conf/machine/include/tune-arm926ejs.inc
-
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index 295a9c7007..0f6123a359 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-arm926ejs.inc
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r0"
+MACHINE_KERNEL_PR = "r6"
 
 TARGET_ARCH = "arm"
 
diff --git a/recipes/linux/linux-davinci_2.6.25.bb b/recipes/linux/linux-davinci_2.6.25.bb
index 97fd0d5210..ef4c919e0e 100644
--- a/recipes/linux/linux-davinci_2.6.25.bb
+++ b/recipes/linux/linux-davinci_2.6.25.bb
@@ -2,8 +2,8 @@ require linux-omap.inc
 
 SRCREV = "f5691bc8f65a08a6cb9900a5c7099a36b2b9b7a7"
 
+# The main PR is now using MACHINE_KERNEL_PR, for davinci see conf/machine/include/davinci.inc
 PV = "2.6.25"
-PR = "r3"
 
 COMPATIBLE_MACHINE = "(davinci-dvevm|davinci-sffsdr)"
 
diff --git a/recipes/linux/linux-davinci_2.6.27.bb b/recipes/linux/linux-davinci_2.6.27.bb
index ad45330b47..4309ed5793 100644
--- a/recipes/linux/linux-davinci_2.6.27.bb
+++ b/recipes/linux/linux-davinci_2.6.27.bb
@@ -8,8 +8,8 @@ require linux-omap.inc
 DAVINCI_SRCREV ?= "9d6ed804d27b9452fb96d68b16ee5f124a07e4f9"
 SRCREV = "${DAVINCI_SRCREV}"
 
+# The main PR is now using MACHINE_KERNEL_PR, for davinci see conf/machine/include/davinci.inc
 PV = "2.6.27"
-PR = "r0"
 
 COMPATIBLE_MACHINE = "(davinci-dvevm)"
 
diff --git a/recipes/linux/linux-davinci_2.6.28.bb b/recipes/linux/linux-davinci_2.6.28.bb
index ef0e0022b3..79abccfef7 100644
--- a/recipes/linux/linux-davinci_2.6.28.bb
+++ b/recipes/linux/linux-davinci_2.6.28.bb
@@ -5,9 +5,9 @@ KERNEL_IMAGETYPE = "uImage"
 
 COMPATIBLE_MACHINE = "(dm6446-evm|dm6467-evm|davinci-sffsdr)"
 
-SRCREV = "0fc192ac07c977ad6f14333651b53096a6027bc6"
+# The main PR is now using MACHINE_KERNEL_PR, for davinci see conf/machine/include/davinci.inc
 
-PR = "r1"
+SRCREV = "0fc192ac07c977ad6f14333651b53096a6027bc6"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git;protocol=git \
            file://defconfig"
diff --git a/recipes/linux/linux-davinci_git.bb b/recipes/linux/linux-davinci_git.bb
index 89d98f47c2..8ee663afe5 100644
--- a/recipes/linux/linux-davinci_git.bb
+++ b/recipes/linux/linux-davinci_git.bb
@@ -9,8 +9,8 @@ DEFAULT_PREFERENCE = "1"
 
 SRCREV = "486afa37130356662213cc1a2199a285b4fd72af"
 
+# 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}"
-PR = "r5"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git;protocol=git \
            file://update-mach-types.patch;patch=1 \
diff --git a/recipes/linux/linux-omap_2.6.29.bb b/recipes/linux/linux-omap_2.6.29.bb
index f9439ebc7c..5be04d2a84 100644
--- a/recipes/linux/linux-omap_2.6.29.bb
+++ b/recipes/linux/linux-omap_2.6.29.bb
@@ -154,6 +154,7 @@ SRC_URI_append = " \
 #           file://isp/standalone/0002-Resizer-bug-fixes-on-top-of-1.0.2-release.patch;patch=1 \
            file://0124-leds-gpio-broken-with-current-git.patch;patch=1 \
            file://modedb-hd720.patch;patch=1 \
+           file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;patch=1 \
 "