[Armadeus-commitlog] armadeus branch, master, updated. latestrelease-16-ge147308
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2009-07-15 20:58:28
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via e1473089b398ae92cc3d9db1ec144612b2be0c11 (commit)
via 4651c97027b3e299ae4d867b46a36d7519343599 (commit)
from 926b6e1a6f1614cb6b536efa27eedc8dcc1beaa8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e1473089b398ae92cc3d9db1ec144612b2be0c11
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jul 15 22:57:17 2009 +0200
[LINUX] On APF9328 makes it possible to have UART without RTS/CTS support + configure console port accordingly
commit 4651c97027b3e299ae4d867b46a36d7519343599
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jul 15 22:12:55 2009 +0200
[BUILD] Makes quilt script use git + some refinements
-----------------------------------------------------------------------
Summary of changes:
...dont_allocate_rts_interrupt_if_not_needed.patch | 43 ++++++++++++++++++++
scripts/quilt.sh | 27 ++++++++-----
2 files changed, 60 insertions(+), 10 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/100-armadeus-imx-serial-dont_allocate_rts_interrupt_if_not_needed.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/100-armadeus-imx-serial-dont_allocate_rts_interrupt_if_not_needed.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/100-armadeus-imx-serial-dont_allocate_rts_interrupt_if_not_needed.patch
new file mode 100644
index 0000000..f411fdc
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/100-armadeus-imx-serial-dont_allocate_rts_interrupt_if_not_needed.patch
@@ -0,0 +1,43 @@
+
+On MX1 platform, if the UART doesn't require RTS/CTS handling (info given by
+platform data), then don't try to allocate related interrupt.
+Without this patchi, MX1 serial port initialisation will fail if we say that
+we don't require RTS/CTS and don't provide a RTS IRQ number.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.29.4/drivers/serial/imx.c
+===================================================================
+--- linux-2.6.29.4.orig/drivers/serial/imx.c 2009-07-15 17:24:35.000000000 +0200
++++ linux-2.6.29.4/drivers/serial/imx.c 2009-07-15 17:30:00.000000000 +0200
+@@ -575,12 +575,14 @@
+ if (retval)
+ goto error_out2;
+
+- retval = request_irq(sport->rtsirq, imx_rtsint,
+- (sport->rtsirq < MAX_INTERNAL_IRQ) ? 0 :
+- IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
+- DRIVER_NAME, sport);
+- if (retval)
+- goto error_out3;
++ if (sport->have_rtscts) {
++ retval = request_irq(sport->rtsirq, imx_rtsint,
++ (sport->rtsirq < MAX_INTERNAL_IRQ) ? 0 :
++ IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
++ DRIVER_NAME, sport);
++ if (retval)
++ goto error_out3;
++ }
+ } else {
+ retval = request_irq(sport->port.irq, imx_int, 0,
+ DRIVER_NAME, sport);
+@@ -642,7 +644,8 @@
+ * Free the interrupts
+ */
+ if (sport->txirq > 0) {
+- free_irq(sport->rtsirq, sport);
++ if (sport->have_rtscts)
++ free_irq(sport->rtsirq, sport);
+ free_irq(sport->txirq, sport);
+ free_irq(sport->rxirq, sport);
+ } else
diff --git a/scripts/quilt.sh b/scripts/quilt.sh
index 0680d77..49968af 100755
--- a/scripts/quilt.sh
+++ b/scripts/quilt.sh
@@ -3,6 +3,7 @@
make shell_env
. armadeus_env.sh
+echo -e "\nThis script is going to rebuilt a quiltified Linux kernel in the current view..."
if [ "$1" == "export" ]; then
echo "Exporting your work (patches) from $ARMADEUS_LINUX_DIR/patches/ to $ARMADEUS_LINUX_PATCH_DIR"
@@ -14,22 +15,27 @@ fi
# else import patches:
-echo "Updating your SVN view"
-svn update
-
-echo "I will delete this directory: $ARMADEUS_LINUX_DIR"
-echo " Ok ? (y/n)"
-
+# Update repository
+echo "Update (pull) your local repository (y/n) ?"
read response
+if [ "$response" == "y" ] || [ "$response" == "yes" ]; then
+ git pull
+fi
-if [ "$response" != "y" ]; then
- exit 1
+# Move or delete current Linux dir
+echo "Rename or delete the Linux directory: $ARMADEUS_LINUX_DIR"
+echo " ?? (r/d)"
+read response
+EXT=`date +%Y_%M_%d_%H%m`
+if [ "$response" == "d" ]; then
+ rm -rf $ARMADEUS_LINUX_DIR
+else
+ mv $ARMADEUS_LINUX_DIR "$ARMADEUS_LINUX_DIR"."$EXT"
fi
-rm -rf $ARMADEUS_LINUX_DIR
+# Get Linux sources
make linux26-unpacked
-
pushd $ARMADEUS_LINUX_DIR
mkdir patches
@@ -62,3 +68,4 @@ echo -e "\n--- Your can now go to $ARMADEUS_LINUX_DIR\nHappy hacking ! ;-)\n"
echo -e "__ Don't forget to do a \"$0 export\" after your modifications __\n"
exit 0
+
hooks/post-receive
--
armadeus
|