On 4/30/07, Mohammad Sadegh Sadri <[EMAIL PROTECTED]> wrote:

Well

Don't know if any change should occure in the source files but when I compile 
any version of 2.6 kernel for ml403/405 with UART 16550 support , I encounter 
this error message :

Hmm, yes.  That looks busted.  Try the attached patch and see if it
works for you.

Cheers,
g.


--
Grant Likely, B.Sc. P.Eng.
Secret Lab Technologies Ltd.
[EMAIL PROTECTED]
(403) 399-0195
From 9997006faa2b187fd69766139dc119bdb1331941 Mon Sep 17 00:00:00 2001
From: Grant Likely <[email protected]>
Date: Mon, 30 Apr 2007 01:30:35 -0600
Subject: [PATCH] [POWERPC] Enable Virtex support for early serial

Signed-off-by: Grant Likely <[email protected]>
---
 arch/ppc/boot/common/ns16550.c                   |    3 ---
 arch/ppc/platforms/4xx/xparameters/xparameters.h |    7 ++++++-
 arch/ppc/syslib/gen550_dbg.c                     |    3 +++
 include/asm-ppc/serial.h                         |    2 ++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/arch/ppc/boot/common/ns16550.c b/arch/ppc/boot/common/ns16550.c
index c037a2d..2b39de9 100644
--- a/arch/ppc/boot/common/ns16550.c
+++ b/arch/ppc/boot/common/ns16550.c
@@ -7,9 +7,6 @@
 #include <linux/serial_reg.h>
 #include <asm/serial.h>
 
-#if defined(CONFIG_XILINX_VIRTEX)
-#include <platforms/4xx/xparameters/xparameters.h>
-#endif
 #include "nonstdio.h"
 #include "serial.h"
 
diff --git a/arch/ppc/platforms/4xx/xparameters/xparameters.h b/arch/ppc/platforms/4xx/xparameters/xparameters.h
index 0af94b0..917cc81 100644
--- a/arch/ppc/platforms/4xx/xparameters/xparameters.h
+++ b/arch/ppc/platforms/4xx/xparameters/xparameters.h
@@ -27,7 +27,8 @@
 #endif
 
 #ifndef SERIAL_PORT_DFNS
-  /* zImage serial port definitions */
+#if defined(XPAR_UARTNS550_0_BASEADDR)
+  /* zImage/gen550 serial port definitions; only port 1 supported ATM */
   #define RS_TABLE_SIZE 1
   #define SERIAL_PORT_DFNS {						\
 	.baud_base	 = XPAR_UARTNS550_0_CLOCK_FREQ_HZ/16,		\
@@ -37,6 +38,10 @@
 	.iomem_reg_shift = 2,						\
 	.io_type	 = SERIAL_IO_MEM,				\
   },
+#else
+  #define RS_TABLE_SIZE 0
+  #define SERIAL_PORT_DFNS
+#endif
 #endif
 
 /*
diff --git a/arch/ppc/syslib/gen550_dbg.c b/arch/ppc/syslib/gen550_dbg.c
index 9293f5c..267d6db 100644
--- a/arch/ppc/syslib/gen550_dbg.c
+++ b/arch/ppc/syslib/gen550_dbg.c
@@ -23,6 +23,9 @@
 #include <asm/machdep.h>
 #include <asm/serial.h>
 #include <asm/io.h>
+#if defined(CONFIG_XILINX_VIRTEX)
+#include <platforms/4xx/xparameters/xparameters.h>
+#endif
 
 #define SERIAL_BAUD	9600
 
diff --git a/include/asm-ppc/serial.h b/include/asm-ppc/serial.h
index 8fc1b54..2ff80b4 100644
--- a/include/asm-ppc/serial.h
+++ b/include/asm-ppc/serial.h
@@ -27,6 +27,8 @@
 #include <platforms/sandpoint.h>
 #elif defined(CONFIG_SPRUCE)
 #include <platforms/spruce.h>
+#elif defined(CONFIG_XILINX_VIRTEX)
+#include <platforms/4xx/xparameters/xparameters.h> /* must be before 4xx */
 #elif defined(CONFIG_4xx)
 #include <asm/ibm4xx.h>
 #elif defined(CONFIG_83xx)
-- 
1.5.1

_______________________________________________
Linuxppc-embedded mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-embedded

Reply via email to