Commit 562e7370 authored by Grant C. Likely's avatar Grant C. Likely Committed by Paul Mackerras
Browse files

[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: default avatarGrant C. Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent b4367e74

arch/ppc/platforms/4xx/Kconfig

+6 −1
Original line number Diff line number Diff line
@@ -208,11 +208,16 @@ config 405GPR 
	depends on SYCAMORE

	default y



config VIRTEX_II_PRO

config XILINX_VIRTEX_II_PRO

	bool

	depends on XILINX_ML300

	default y



config XILINX_VIRTEX

	bool

	depends on XILINX_VIRTEX_II_PRO

	default y



config STB03xxx

	bool

	depends on REDWOOD_5 || REDWOOD_6

arch/ppc/platforms/4xx/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -26,4 +26,4 @@ obj-$(CONFIG_440SP) += ibm440sp.o 
obj-$(CONFIG_440SPE)		+= ppc440spe.o

obj-$(CONFIG_405EP)		+= ibm405ep.o

obj-$(CONFIG_405GPR)		+= ibm405gpr.o

obj-$(CONFIG_VIRTEX_II_PRO)	+= virtex-ii_pro.o
 
obj-$(CONFIG_XILINX_VIRTEX)	+= virtex.o

arch/ppc/platforms/4xx/virtex-ii_pro.c→arch/ppc/platforms/4xx/virtex.c

+2 −2
Original line number Diff line number Diff line 
/*

 * arch/ppc/platforms/4xx/virtex-ii_pro.c

 * arch/ppc/platforms/4xx/virtex.c

 *

 * Author: MontaVista Software, Inc.

 *         source@mvista.com
@@ -12,7 +12,7 @@ 
#include <linux/config.h>

#include <linux/init.h>

#include <asm/ocp.h>

#include "virtex-ii_pro.h"

#include <platforms/4xx/virtex.h>



/* Have OCP take care of the serial ports. */

struct ocp_def core_ocp[] = {

arch/ppc/platforms/4xx/virtex-ii_pro.h→arch/ppc/platforms/4xx/virtex.h

+4 −4
Original line number Diff line number Diff line 
/*

 * arch/ppc/platforms/4xx/virtex-ii_pro.h

 * arch/ppc/platforms/4xx/virtex.h

 *

 * Include file that defines the Xilinx Virtex-II Pro processor

 *
@@ -12,8 +12,8 @@ 
 */



#ifdef __KERNEL__

#ifndef __ASM_VIRTEXIIPRO_H__

#define __ASM_VIRTEXIIPRO_H__

#ifndef __ASM_VIRTEX_H__

#define __ASM_VIRTEX_H__



#include <linux/config.h>

#include <platforms/4xx/xparameters/xparameters.h>
@@ -95,5 +95,5 @@ 


#include <asm/ibm405.h>



#endif				/* __ASM_VIRTEXIIPRO_H__ */

#endif				/* __ASM_VIRTEX_H__ */

#endif				/* __KERNEL__ */

arch/ppc/platforms/4xx/xilinx_ml300.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <asm/machdep.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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE