diff options
| author | Grant C. Likely <grant.likely@secretlab.ca> | 2006-01-19 01:12:48 -0700 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-07 22:35:58 +1100 |
| commit | 1a42e53d175074f340a3f85042ed64cfc51be216 (patch) | |
| tree | 6426aebaa777d30be7ea7e6f3f6334fb94029230 /arch/ppc/boot | |
| parent | 562e7370a4d59d7ee8988fb0e13707d1f01a046a (diff) | |
| download | linux-3.10-1a42e53d175074f340a3f85042ed64cfc51be216.tar.gz linux-3.10-1a42e53d175074f340a3f85042ed64cfc51be216.tar.bz2 linux-3.10-1a42e53d175074f340a3f85042ed64cfc51be216.zip | |
[PATCH] powerpc: Migrate Xilinx Vertex support from the OCP bus to the platfom bus.
This patch only deals with the serial port definitions as there is no
support for any other xilinx IP cores in the kernel tree at the moment.
Board specific configuration moved out of virtex.[ch] and into the
xparameters.h wrapper.
This also prepares for the transition to the flattened device tree model.
When the bootloader provides a device tree generated from an xparameters.h
files, the kernel will no longer need xparameters/*. The platform bus will
get populated with data from the device tree, and the device drivers will
be automatically connected to the devices. Only the bootloader (or
ppcboot) will need xparameters directly.
Signed-off-by: Grant C. Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/boot')
| -rw-r--r-- | arch/ppc/boot/common/ns16550.c | 3 | ||||
| -rw-r--r-- | arch/ppc/boot/simple/embed_config.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/ppc/boot/common/ns16550.c b/arch/ppc/boot/common/ns16550.c index 26818bbb6cf..4f00c93ac87 100644 --- a/arch/ppc/boot/common/ns16550.c +++ b/arch/ppc/boot/common/ns16550.c @@ -8,6 +8,9 @@ #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/boot/simple/embed_config.c b/arch/ppc/boot/simple/embed_config.c index 491a691d10c..df24202073b 100644 --- a/arch/ppc/boot/simple/embed_config.c +++ b/arch/ppc/boot/simple/embed_config.c @@ -21,6 +21,9 @@ #ifdef CONFIG_40x #include <asm/io.h> #endif +#ifdef CONFIG_XILINX_VIRTEX +#include <platforms/4xx/xparameters/xparameters.h> +#endif extern unsigned long timebase_period_ns; /* For those boards that don't provide one. |