[PATCH] powerpc: Make Virtex-II Pro support generic for all Virtex devices
The PPC405 hard core is used in both the Virtex-II Pro and Virtex 4 FX FPGAs. This patch cleans up the Virtex naming convention to reflect more than just the Virtex-II Pro. Rename files virtex-ii_pro.[ch] to virtex.[ch] Rename config value VIRTEX_II_PRO to XILINX_VIRTEX Signed-off-by: Grant C. Likely <grant.likely@secretlab.ca> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
b4367e7451
commit
562e7370a4
|
@ -208,11 +208,16 @@ config 405GPR
|
||||||
depends on SYCAMORE
|
depends on SYCAMORE
|
||||||
default y
|
default y
|
||||||
|
|
||||||
config VIRTEX_II_PRO
|
config XILINX_VIRTEX_II_PRO
|
||||||
bool
|
bool
|
||||||
depends on XILINX_ML300
|
depends on XILINX_ML300
|
||||||
default y
|
default y
|
||||||
|
|
||||||
|
config XILINX_VIRTEX
|
||||||
|
bool
|
||||||
|
depends on XILINX_VIRTEX_II_PRO
|
||||||
|
default y
|
||||||
|
|
||||||
config STB03xxx
|
config STB03xxx
|
||||||
bool
|
bool
|
||||||
depends on REDWOOD_5 || REDWOOD_6
|
depends on REDWOOD_5 || REDWOOD_6
|
||||||
|
|
|
@ -26,4 +26,4 @@ obj-$(CONFIG_440SP) += ibm440sp.o
|
||||||
obj-$(CONFIG_440SPE) += ppc440spe.o
|
obj-$(CONFIG_440SPE) += ppc440spe.o
|
||||||
obj-$(CONFIG_405EP) += ibm405ep.o
|
obj-$(CONFIG_405EP) += ibm405ep.o
|
||||||
obj-$(CONFIG_405GPR) += ibm405gpr.o
|
obj-$(CONFIG_405GPR) += ibm405gpr.o
|
||||||
obj-$(CONFIG_VIRTEX_II_PRO) += virtex-ii_pro.o
|
obj-$(CONFIG_XILINX_VIRTEX) += virtex.o
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* arch/ppc/platforms/4xx/virtex-ii_pro.c
|
* arch/ppc/platforms/4xx/virtex.c
|
||||||
*
|
*
|
||||||
* Author: MontaVista Software, Inc.
|
* Author: MontaVista Software, Inc.
|
||||||
* source@mvista.com
|
* source@mvista.com
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
#include <linux/config.h>
|
#include <linux/config.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <asm/ocp.h>
|
#include <asm/ocp.h>
|
||||||
#include "virtex-ii_pro.h"
|
#include <platforms/4xx/virtex.h>
|
||||||
|
|
||||||
/* Have OCP take care of the serial ports. */
|
/* Have OCP take care of the serial ports. */
|
||||||
struct ocp_def core_ocp[] = {
|
struct ocp_def core_ocp[] = {
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* arch/ppc/platforms/4xx/virtex-ii_pro.h
|
* arch/ppc/platforms/4xx/virtex.h
|
||||||
*
|
*
|
||||||
* Include file that defines the Xilinx Virtex-II Pro processor
|
* Include file that defines the Xilinx Virtex-II Pro processor
|
||||||
*
|
*
|
||||||
|
@ -12,8 +12,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef __KERNEL__
|
#ifdef __KERNEL__
|
||||||
#ifndef __ASM_VIRTEXIIPRO_H__
|
#ifndef __ASM_VIRTEX_H__
|
||||||
#define __ASM_VIRTEXIIPRO_H__
|
#define __ASM_VIRTEX_H__
|
||||||
|
|
||||||
#include <linux/config.h>
|
#include <linux/config.h>
|
||||||
#include <platforms/4xx/xparameters/xparameters.h>
|
#include <platforms/4xx/xparameters/xparameters.h>
|
||||||
|
@ -95,5 +95,5 @@
|
||||||
|
|
||||||
#include <asm/ibm405.h>
|
#include <asm/ibm405.h>
|
||||||
|
|
||||||
#endif /* __ASM_VIRTEXIIPRO_H__ */
|
#endif /* __ASM_VIRTEX_H__ */
|
||||||
#endif /* __KERNEL__ */
|
#endif /* __KERNEL__ */
|
|
@ -22,7 +22,7 @@
|
||||||
#include <asm/machdep.h>
|
#include <asm/machdep.h>
|
||||||
#include <asm/ocp.h>
|
#include <asm/ocp.h>
|
||||||
|
|
||||||
#include <platforms/4xx/virtex-ii_pro.h> /* for NR_SER_PORTS */
|
#include <platforms/4xx/virtex.h> /* for NR_SER_PORTS */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* As an overview of how the following functions (platform_init,
|
* As an overview of how the following functions (platform_init,
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
#define __ASM_XILINX_ML300_H__
|
#define __ASM_XILINX_ML300_H__
|
||||||
|
|
||||||
/* ML300 has a Xilinx Virtex-II Pro processor */
|
/* ML300 has a Xilinx Virtex-II Pro processor */
|
||||||
#include <platforms/4xx/virtex-ii_pro.h>
|
#include <platforms/4xx/virtex.h>
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
#ifndef __ASSEMBLY__
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ obj-$(CONFIG_440GX) += ibm440gx_common.o
|
||||||
obj-$(CONFIG_440SP) += ibm440gx_common.o ibm440sp_common.o
|
obj-$(CONFIG_440SP) += ibm440gx_common.o ibm440sp_common.o
|
||||||
obj-$(CONFIG_440SPE) += ibm440gx_common.o ibm440sp_common.o ppc440spe_pcie.o
|
obj-$(CONFIG_440SPE) += ibm440gx_common.o ibm440sp_common.o ppc440spe_pcie.o
|
||||||
ifeq ($(CONFIG_4xx),y)
|
ifeq ($(CONFIG_4xx),y)
|
||||||
ifeq ($(CONFIG_VIRTEX_II_PRO),y)
|
ifeq ($(CONFIG_XILINX_VIRTEX),y)
|
||||||
obj-$(CONFIG_40x) += xilinx_pic.o
|
obj-$(CONFIG_40x) += xilinx_pic.o
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_403),y)
|
ifeq ($(CONFIG_403),y)
|
||||||
|
|
Loading…
Reference in New Issue