summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Gilles <jgilles@multitech.com>2013-12-27 15:06:42 -0600
committerJesse Gilles <jgilles@multitech.com>2013-12-27 15:06:42 -0600
commit1e2d685cc07a2c3c8165662e7c0ebeb19cb1c16d (patch)
treee9813e5bc3c2ce5a1b706e9103d0e87c9002483b
parent43c3ad260e3ea39969b617ba93132fd12474ce7a (diff)
linux-2.6.39-at91: update git rev for atmel_serial fixes
-rw-r--r--multitech/conf/machine/mtocgd3.conf2
-rw-r--r--multitech/recipes/linux/linux_2.6.39-at91.bb6
2 files changed, 4 insertions, 4 deletions
diff --git a/multitech/conf/machine/mtocgd3.conf b/multitech/conf/machine/mtocgd3.conf
index 6f4219c..e422c5b 100644
--- a/multitech/conf/machine/mtocgd3.conf
+++ b/multitech/conf/machine/mtocgd3.conf
@@ -7,7 +7,7 @@ TARGET_ARCH = "arm"
PREFERRED_PROVIDER_virtual/kernel = "linux"
PREFERRED_VERSION_linux = "2.6.39-at91"
-MACHINE_KERNEL_PR = "r11"
+MACHINE_KERNEL_PR = "r12"
PREFERRED_VERSION_mts-io ?= "0.7.1"
KERNEL_IMAGETYPE = "uImage"
diff --git a/multitech/recipes/linux/linux_2.6.39-at91.bb b/multitech/recipes/linux/linux_2.6.39-at91.bb
index 9877c45..41c369e 100644
--- a/multitech/recipes/linux/linux_2.6.39-at91.bb
+++ b/multitech/recipes/linux/linux_2.6.39-at91.bb
@@ -3,11 +3,11 @@ require recipes/linux/linux.inc
# PR is set by MACHINE_KERNEL_PR in machine config
# Linux 2.6.39 for AT91
-# commit Mar 17, 2013 - Serial: 9n12: Enable dbgu dma transfer
-SRCREV="0fdbb8dc2ea4f6f4227a855067ed070fe3a9cff1"
+# commit Dec 4, 2013 - tty/serial: atmel_serial: remove dev_dbg in atmel_set_termios
+SRCREV="5f90e2645cc8bacb958e1f56ac5ce78ee2db0083"
# Add 2.6.39.4 patch customized to patch against at91 branch
-SRC_URI = "git://github.com/linux4sam/linux-at91.git;protocol=http;tag=${SRCREV} \
+SRC_URI = "git://github.com/linux4sam/linux-at91.git;protocol=https;tag=${SRCREV} \
file://linux-2.6.39.4-at91.patch \
file://linux-2.6.39-at91-atmel-nand-debug-bit-flips.patch"