From 0d927aae48e9e84af8df0376c7520b0f4abc0f10 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 14 Apr 2012 11:12:37 +0000
Subject: [PATCH] Fixed bug 3517648.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4093 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/hal/platforms/AT91SAM7/serial_lld.c | 6 ++++--
 readme.txt                             | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/os/hal/platforms/AT91SAM7/serial_lld.c b/os/hal/platforms/AT91SAM7/serial_lld.c
index 6f1bbb1bf..d23aa9b0e 100644
--- a/os/hal/platforms/AT91SAM7/serial_lld.c
+++ b/os/hal/platforms/AT91SAM7/serial_lld.c
@@ -31,7 +31,8 @@
 
 #if HAL_USE_SERIAL || defined(__DOXYGEN__)
 
-#if SAM7_PLATFORM == SAM7S256
+#if (SAM7_PLATFORM == SAM7S64) || (SAM7_PLATFORM == SAM7S128) ||            \
+    (SAM7_PLATFORM == SAM7S256) || (SAM7_PLATFORM == SAM7S512)
 
 #define SAM7_USART0_RX    AT91C_PA5_RXD0
 #define SAM7_USART0_TX    AT91C_PA6_TXD0
@@ -40,7 +41,8 @@
 #define SAM7_DBGU_RX      AT91C_PA9_DRXD
 #define SAM7_DBGU_TX      AT91C_PA10_DTXD
 
-#elif SAM7_PLATFORM == SAM7X256
+#elif (SAM7_PLATFORM == SAM7X128) || (SAM7_PLATFORM == SAM7X256) ||         \
+      (SAM7_PLATFORM == SAM7X512)
 
 #define SAM7_USART0_RX    AT91C_PA0_RXD0
 #define SAM7_USART0_TX    AT91C_PA1_TXD0
diff --git a/readme.txt b/readme.txt
index 66a6d4acd..33cfe3cdb 100644
--- a/readme.txt
+++ b/readme.txt
@@ -79,6 +79,8 @@
 *****************************************************************************
 
 *** 2.5.0 ***
+- FIX: Fixed missing serial driver functionality for SAM7S64, SAM7S128 and
+  SAM7S512 (bug 3517648)(backported to 2.2.10 and 2.4.1).
 - FIX: Fixed spurious ) char in STM32 serial_lld.h (bug 3514138)(backported
   to 2.2.10 and 2.4.1).
 - FIX: Fixed problem with FPU initialization in GCC Cortex-M4 port (bug