diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ppc/platforms/4xx/Kconfig | 7 | ||||
| -rw-r--r-- | arch/ppc/platforms/4xx/Makefile | 2 | ||||
| -rw-r--r-- | arch/ppc/platforms/4xx/virtex.c (renamed from arch/ppc/platforms/4xx/virtex-ii_pro.c) | 4 | ||||
| -rw-r--r-- | arch/ppc/platforms/4xx/virtex.h (renamed from arch/ppc/platforms/4xx/virtex-ii_pro.h) | 8 | ||||
| -rw-r--r-- | arch/ppc/platforms/4xx/xilinx_ml300.c | 2 | ||||
| -rw-r--r-- | arch/ppc/platforms/4xx/xilinx_ml300.h | 2 | ||||
| -rw-r--r-- | arch/ppc/syslib/Makefile | 2 |
7 files changed, 16 insertions, 11 deletions
diff --git a/arch/ppc/platforms/4xx/Kconfig b/arch/ppc/platforms/4xx/Kconfig index d8837911bbc6..203abab32cc3 100644 --- a/arch/ppc/platforms/4xx/Kconfig +++ b/arch/ppc/platforms/4xx/Kconfig @@ -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 diff --git a/arch/ppc/platforms/4xx/Makefile b/arch/ppc/platforms/4xx/Makefile index c9bb61170954..be4163c8afe7 100644 --- a/arch/ppc/platforms/4xx/Makefile +++ b/arch/ppc/platforms/4xx/Makefile @@ -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 diff --git a/arch/ppc/platforms/4xx/virtex-ii_pro.c b/arch/ppc/platforms/4xx/virtex.c index 097cc9d5aca0..bbb12c0c0b2c 100644 --- a/arch/ppc/platforms/4xx/virtex-ii_pro.c +++ b/arch/ppc/platforms/4xx/virtex.c @@ -1,5 +1,5 @@ /* - * 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[] = { diff --git a/arch/ppc/platforms/4xx/virtex-ii_pro.h b/arch/ppc/platforms/4xx/virtex.h index 026130c8e72a..049c767d33e7 100644 --- a/arch/ppc/platforms/4xx/virtex-ii_pro.h +++ b/arch/ppc/platforms/4xx/virtex.h @@ -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 * @@ -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__ */ diff --git a/arch/ppc/platforms/4xx/xilinx_ml300.c b/arch/ppc/platforms/4xx/xilinx_ml300.c index 0b1b77d986bf..b0de0a2f131d 100644 --- a/arch/ppc/platforms/4xx/xilinx_ml300.c +++ b/arch/ppc/platforms/4xx/xilinx_ml300.c @@ -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, diff --git a/arch/ppc/platforms/4xx/xilinx_ml300.h b/arch/ppc/platforms/4xx/xilinx_ml300.h index f8c588412336..899398143623 100644 --- a/arch/ppc/platforms/4xx/xilinx_ml300.h +++ b/arch/ppc/platforms/4xx/xilinx_ml300.h @@ -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__ diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile index 159dcd92a6d1..6234ee57b31c 100644 --- a/arch/ppc/syslib/Makefile +++ b/arch/ppc/syslib/Makefile @@ -17,7 +17,7 @@ obj-$(CONFIG_440GX) += ibm440gx_common.o 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) |