[oe-commits] org.oe.dev merge of '003d5589c32126d84385935351087e649339386a'

[khem commit]

merge of '003d5589c32126d84385935351087e649339386a'
     and 'faac6daf1f748c6f7109cbc33bb0af2fbe932c77'

Author: khem at openembedded.org
Branch: org.openembedded.dev
Revision: 015f212acdab6a197145efe2be30fcf066e7ef75
ViewMTN: http://monotone.openembedded.org/revision/info/015f212acdab6a197145efe2be30fcf066e7ef75
Files:
1
packages/linux/linux-davinci/8250_davinci.patch
packages/linux/linux-davinci_2.6.x+git-davinci.bb
packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
packages/linux/linux-openmoko.inc
Diffs:

#
# mt diff -r003d5589c32126d84385935351087e649339386a -r015f212acdab6a197145efe2be30fcf066e7ef75
#
#
#
# add_file "packages/linux/linux-davinci/8250_davinci.patch"
#  content [b6996c0bbec48b92f65ae360f3f1daf28c1396e6]
# 
# patch "packages/linux/linux-davinci_2.6.x+git-davinci.bb"
#  from [08ffdd8f902b532c93f402c9a38c62540680bfd7]
#    to [f26c59677dde2591abcb386fdfb6b2fa926a2860]
#
============================================================
--- packages/linux/linux-davinci/8250_davinci.patch	b6996c0bbec48b92f65ae360f3f1daf28c1396e6
+++ packages/linux/linux-davinci/8250_davinci.patch	b6996c0bbec48b92f65ae360f3f1daf28c1396e6
@@ -0,0 +1,28 @@
+--- linux-2.6/drivers/serial/8250.c	2008-08-06 15:56:53.000000000 -0500
++++ linux-2.6-vanilla/drivers/serial/8250.c	2008-08-07 12:24:29.000000000 -0500
+@@ -1867,7 +1867,6 @@
+ 	}
+ 
+ 	if (is_real_interrupt(up->port.irq)) {
+-		unsigned char iir1;
+ 		/*
+ 		 * Test for UARTs that do not reassert THRE when the
+ 		 * transmitter is idle and the interrupt has already
+@@ -1881,7 +1880,7 @@
+ 		wait_for_xmitr(up, UART_LSR_THRE);
+ 		serial_out_sync(up, UART_IER, UART_IER_THRI);
+ 		udelay(1); /* allow THRE to set */
+-		iir1 = serial_in(up, UART_IIR);
++		serial_in(up, UART_IIR);
+ 		serial_out(up, UART_IER, 0);
+ 		serial_out_sync(up, UART_IER, UART_IER_THRI);
+ 		udelay(1); /* allow a working UART time to re-assert THRE */
+@@ -1894,7 +1893,7 @@
+ 		 * If the interrupt is not reasserted, setup a timer to
+ 		 * kick the UART on a regular basis.
+ 		 */
+-		if (!(iir1 & UART_IIR_NO_INT) && (iir & UART_IIR_NO_INT)) {
++		if (iir & UART_IIR_NO_INT) {
+ 			pr_debug("ttyS%d - using backup timer\n", port->line);
+ 			up->timer.function = serial8250_backup_timeout;
+ 			up->timer.data = (unsigned long)up;
============================================================
--- packages/linux/linux-davinci_2.6.x+git-davinci.bb	08ffdd8f902b532c93f402c9a38c62540680bfd7
+++ packages/linux/linux-davinci_2.6.x+git-davinci.bb	f26c59677dde2591abcb386fdfb6b2fa926a2860
@@ -13,6 +13,7 @@ SRC_URI = "git://source.mvista.com/git/l
 COMPATIBLE_MACHINE = "(davinci-dvevm|davinci-sffsdr)"
 
 SRC_URI = "git://source.mvista.com/git/linux-davinci-2.6.git;protocol=git \
+           file://8250_davinci.patch;patch=1 \
            file://defconfig"
 
 SRC_URI_append_davinci-sffsdr = " file://sffsdr.patch;patch=1"


#
# mt diff -rfaac6daf1f748c6f7109cbc33bb0af2fbe932c77 -r015f212acdab6a197145efe2be30fcf066e7ef75
#
#
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig"
#  from [971e7cc0b77f0096a7e40064c28bba3037c67293]
#    to [1f59bd0f16dc22cca1e7db406de551e2c776b891]
# 
# patch "packages/linux/linux-openmoko.inc"
#  from [d0d5a324f355c7fe27eb595ec61b2d6c790e7ead]
#    to [10db4c43150df38c73aa0bf5130a81a8f395991a]
#
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig	971e7cc0b77f0096a7e40064c28bba3037c67293
+++ packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig	1f59bd0f16dc22cca1e7db406de551e2c776b891
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.21-hh20
-# Fri Feb 15 01:08:07 2008
+# Thu Aug  7 19:32:15 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -938,7 +938,11 @@ CONFIG_HW_CONSOLE=y
 #
 # Serial drivers
 #
-# CONFIG_SERIAL_8250 is not set
+CONFIG_SERIAL_8250=m
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
 
 #
 # Non-8250 serial port support
============================================================
--- packages/linux/linux-openmoko.inc	d0d5a324f355c7fe27eb595ec61b2d6c790e7ead
+++ packages/linux/linux-openmoko.inc	10db4c43150df38c73aa0bf5130a81a8f395991a
@@ -4,12 +4,12 @@ UBOOT_ENTRYPOINT = "30008000"
 KERNEL_IMAGETYPE = "uImage"
 UBOOT_ENTRYPOINT = "30008000"
 
-FILES_kernel-image = ""
-ALLOW_EMPTY = "1"
-
 COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE = 'om-gta01|om-gta02'
 
+CONFIG_NAME_om-gta01 = "gta01"
+CONFIG_NAME_om-gta02 = "gta02"
+
 CMDLINE = "unused -- bootloader passes ATAG list"
 
 ###############################################################
@@ -66,6 +66,10 @@ else
 			exit 1
 		fi
 
+		if [ ! -f /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ] ; then
+			exit 1
+		fi
+
 		${bindir}/flash_eraseall $MTD_KERNEL_PARTITION
 		${bindir}/nandwrite -p $MTD_KERNEL_PARTITION /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}
 	else