diff options
| -rw-r--r-- | conf/distro/corecdp.conf | 2 | ||||
| -rw-r--r-- | conf/machine/mtcdp.conf | 2 | ||||
| -rw-r--r-- | recipes/base-files/base-files_3.0.14.bb | 2 | ||||
| -rw-r--r-- | recipes/linux/linux-2.6.32/mtcdp/defconfig | 4 | ||||
| -rw-r--r-- | recipes/linux/linux-2.6.32/mtcdp/linux-2.6.32.3-atmel_serial_disable_hwhs.patch | 32 | ||||
| -rw-r--r-- | recipes/linux/linux_2.6.32.bb | 3 | ||||
| -rw-r--r-- | recipes/multitech/mts-io_0.4.0.bb | 3 | ||||
| -rw-r--r-- | recipes/multitech/mts-io_0.4.1.bb (renamed from recipes/multitech/mts-io_0.2.0.bb) | 0 |
8 files changed, 39 insertions, 9 deletions
diff --git a/conf/distro/corecdp.conf b/conf/distro/corecdp.conf index 1acb1b6609..39ca74a170 100644 --- a/conf/distro/corecdp.conf +++ b/conf/distro/corecdp.conf @@ -11,7 +11,7 @@ require conf/amend-recipes.inc DISTRO_NAME = "CoreCDP" DISTRO = "corecdp" -DISTRO_VERSION = "1.1.0" +DISTRO_VERSION = "1.1.1" DISTRO_TYPE = "release" TARGET_VENDOR = "-corecdp" BUILDNAME = "${DISTRO_NAME} ${DISTRO_VERSION}" diff --git a/conf/machine/mtcdp.conf b/conf/machine/mtcdp.conf index c48d1cb70f..336e31b182 100644 --- a/conf/machine/mtcdp.conf +++ b/conf/machine/mtcdp.conf @@ -7,7 +7,7 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux = "2.6.32" -PREFERRED_VERSION_mts-io ?= "0.4.0" +PREFERRED_VERSION_mts-io ?= "0.4.1" KERNEL_IMAGETYPE = "uImage" UBOOT_MACHINE = "at91sam9g20ek_nandflash_config" diff --git a/recipes/base-files/base-files_3.0.14.bb b/recipes/base-files/base-files_3.0.14.bb index a43057266d..1e6012e13a 100644 --- a/recipes/base-files/base-files_3.0.14.bb +++ b/recipes/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r92" +PR = "r93" LICENSE = "GPL" SRC_URI = " \ diff --git a/recipes/linux/linux-2.6.32/mtcdp/defconfig b/recipes/linux/linux-2.6.32/mtcdp/defconfig index 06207e23ea..926d006ec7 100644 --- a/recipes/linux/linux-2.6.32/mtcdp/defconfig +++ b/recipes/linux/linux-2.6.32/mtcdp/defconfig @@ -1083,7 +1083,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y # USB Device Class drivers # CONFIG_USB_ACM=m -# CONFIG_USB_PRINTER is not set +CONFIG_USB_PRINTER=m # CONFIG_USB_WDM is not set # CONFIG_USB_TMC is not set @@ -1131,7 +1131,7 @@ CONFIG_USB_SERIAL_GENERIC=y # CONFIG_USB_SERIAL_CP210X is not set # CONFIG_USB_SERIAL_CYPRESS_M8 is not set # CONFIG_USB_SERIAL_EMPEG is not set -# CONFIG_USB_SERIAL_FTDI_SIO is not set +CONFIG_USB_SERIAL_FTDI_SIO=m # CONFIG_USB_SERIAL_FUNSOFT is not set # CONFIG_USB_SERIAL_VISOR is not set # CONFIG_USB_SERIAL_IPAQ is not set diff --git a/recipes/linux/linux-2.6.32/mtcdp/linux-2.6.32.3-atmel_serial_disable_hwhs.patch b/recipes/linux/linux-2.6.32/mtcdp/linux-2.6.32.3-atmel_serial_disable_hwhs.patch new file mode 100644 index 0000000000..bd620afb95 --- /dev/null +++ b/recipes/linux/linux-2.6.32/mtcdp/linux-2.6.32.3-atmel_serial_disable_hwhs.patch @@ -0,0 +1,32 @@ +Revert commit 8e706c4d0dab214c625a2df84a0ca69a76bae65d in linux-2.6: + avr32: add hardware handshake support to atmel_serial + +Reverting commit since it breaks hardware flow control for at91sam9g20 + +diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c +index 9d948bc..b659f2c 100644 +--- a/drivers/serial/atmel_serial.c ++++ b/drivers/serial/atmel_serial.c +@@ -1020,8 +1020,7 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios, + + /* Get current mode register */ + mode = UART_GET_MR(port) & ~(ATMEL_US_USCLKS | ATMEL_US_CHRL +- | ATMEL_US_NBSTOP | ATMEL_US_PAR +- | ATMEL_US_USMODE); ++ | ATMEL_US_NBSTOP | ATMEL_US_PAR); + + baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk / 16); + quot = uart_get_divisor(port, baud); +@@ -1066,12 +1065,6 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios, + } else + mode |= ATMEL_US_PAR_NONE; + +- /* hardware handshake (RTS/CTS) */ +- if (termios->c_cflag & CRTSCTS) +- mode |= ATMEL_US_USMODE_HWHS; +- else +- mode |= ATMEL_US_USMODE_NORMAL; +- + spin_lock_irqsave(&port->lock, flags); + + port->read_status_mask = ATMEL_US_OVRE; diff --git a/recipes/linux/linux_2.6.32.bb b/recipes/linux/linux_2.6.32.bb index 8b2292cdd4..2d26523684 100644 --- a/recipes/linux/linux_2.6.32.bb +++ b/recipes/linux/linux_2.6.32.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r6" +PR = "r8" S = "${WORKDIR}/linux-${PV}" @@ -37,6 +37,7 @@ SRC_URI_mtcdp = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;n file://linux-2.6.32.3-at91_mci.patch;patch=1 \ file://linux-2.6.32.3-m25p80.patch;patch=1 \ file://linux-2.6.32.3-at25.patch;patch=1 \ + file://linux-2.6.32.3-atmel_serial_disable_hwhs.patch;patch=1 \ " SRC_URI[build.md5sum] = "6bd3c5fea1e88bb4d0948ec3688bd8f6" SRC_URI[build.sha256sum] = "e7526a7ae7210bc7c4f4837e9d8a666f9b126d59bee16015c41c5850d29c841f" diff --git a/recipes/multitech/mts-io_0.4.0.bb b/recipes/multitech/mts-io_0.4.0.bb deleted file mode 100644 index f903020cc7..0000000000 --- a/recipes/multitech/mts-io_0.4.0.bb +++ /dev/null @@ -1,3 +0,0 @@ -require mts-io.inc - -PR = "${INC_PR}.0" diff --git a/recipes/multitech/mts-io_0.2.0.bb b/recipes/multitech/mts-io_0.4.1.bb index f903020cc7..f903020cc7 100644 --- a/recipes/multitech/mts-io_0.2.0.bb +++ b/recipes/multitech/mts-io_0.4.1.bb |