Make Virtex-II Pro support generic for all Virtex devices
PATCH 2/10 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 <[email protected]>
---
arch/ppc/platforms/4xx/Kconfig | 2 - arch/ppc/platforms/4xx/Makefile | 2 - arch/ppc/platforms/4xx/virtex-ii_pro.c | 60 ------------------- arch/ppc/platforms/4xx/virtex-ii_pro.h | 99 -------------------------------- arch/ppc/platforms/4xx/virtex.c | 60 +++++++++++++++++++ arch/ppc/platforms/4xx/virtex.h | 99 ++++++++++++++++++++++++++++++++ arch/ppc/platforms/4xx/xilinx_ml300.c | 2 - arch/ppc/platforms/4xx/xilinx_ml300.h | 2 - arch/ppc/syslib/Makefile | 2 - 9 files changed, 164 insertions(+), 164 deletions(-) delete mode 100644 arch/ppc/platforms/4xx/virtex-ii_pro.c delete mode 100644 arch/ppc/platforms/4xx/virtex-ii_pro.h create mode 100644 arch/ppc/platforms/4xx/virtex.c create mode 100644 arch/ppc/platforms/4xx/virtex.h
d40e4910743dd1a103de9af79528eb715e2e13df
arch/ppc/platforms/4xx/Kconfig +1 -1
@@ -208,7 +208,7 @@ config 405GPR depends on SYCAMORE default y -config VIRTEX_II_PRO +config XILINX_VIRTEX bool depends on XILINX_ML300 default y
arch/ppc/platforms/4xx/Makefile +1 -1
@@ -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 deleted +0 -60
60 lines not on this page · raw message
arch/ppc/platforms/4xx/virtex-ii_pro.h deleted +0 -99
99 lines not on this page · raw message
arch/ppc/platforms/4xx/virtex.c new file +60 -0
60 lines not on this page · raw message
arch/ppc/platforms/4xx/virtex.h new file +99 -0
99 lines not on this page · raw message
arch/ppc/platforms/4xx/xilinx_ml300.c +1 -1
@@ -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,
arch/ppc/platforms/4xx/xilinx_ml300.h +1 -1
@@ -16,7 +16,7 @@#define __ASM_XILINX_ML300_H__/* ML300 has a Xilinx Virtex-II Pro processor */ -#include <platforms/4xx/virtex-ii_pro.h> +#include <platforms/4xx/virtex.h> #ifndef __ASSEMBLY__
arch/ppc/syslib/Makefile +1 -1
@@ -17,7 +17,7 @@ obj-$(CONFIG_440GX) += ibm440gx_common. obj-$(CONFIG_440SP) += ibm440gx_common.o ibm440sp_common.o obj-$(CONFIG_440SPE) += ibm440gx_common.o ibm440sp_common.o ppc440spe_pcie.o ifeq ($(CONFIG_4xx),y) -ifeq ($(CONFIG_VIRTEX_II_PRO),y) +ifeq ($(CONFIG_XILINX_VIRTEX),y) obj-$(CONFIG_40x) += xilinx_pic.o else ifeq ($(CONFIG_403),y)
Signature · 1 line
1.1.2-g9e9b-dirty