aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/ppc/platforms/4xx/virtex.h40
-rw-r--r--arch/ppc/platforms/4xx/xilinx_ml300.c1
-rw-r--r--arch/ppc/platforms/4xx/xilinx_ml300.h45
-rw-r--r--arch/ppc/platforms/4xx/xilinx_ml403.c1
-rw-r--r--arch/ppc/platforms/4xx/xilinx_ml403.h49
-rw-r--r--include/asm-ppc/ibm4xx.h8
6 files changed, 33 insertions, 111 deletions
diff --git a/arch/ppc/platforms/4xx/virtex.h b/arch/ppc/platforms/4xx/virtex.h
index c14325dfd7b1..e9f58a784314 100644
--- a/arch/ppc/platforms/4xx/virtex.h
+++ b/arch/ppc/platforms/4xx/virtex.h
@@ -1,22 +1,18 @@
1/* 1/*
2 * arch/ppc/platforms/4xx/virtex.h 2 * Basic Virtex platform defines, included by <asm/ibm4xx.h>
3 * 3 *
4 * Include file that defines the Xilinx Virtex-II Pro processor 4 * 2005-2007 (c) Secret Lab Technologies Ltd.
5 * 2002-2004 (c) MontaVista Software, Inc.
5 * 6 *
6 * Author: MontaVista Software, Inc. 7 * This file is licensed under the terms of the GNU General Public License
7 * source@mvista.com 8 * version 2. This program is licensed "as is" without any warranty of any
8 * 9 * kind, whether express or implied.
9 * 2002-2004 (c) MontaVista Software, Inc. This file is licensed under the
10 * terms of the GNU General Public License version 2. This program is licensed
11 * "as is" without any warranty of any kind, whether express or implied.
12 */ 10 */
13 11
14#ifdef __KERNEL__ 12#ifdef __KERNEL__
15#ifndef __ASM_VIRTEX_H__ 13#ifndef __ASM_VIRTEX_H__
16#define __ASM_VIRTEX_H__ 14#define __ASM_VIRTEX_H__
17 15
18/* serial defines */
19
20#include <asm/ibm405.h> 16#include <asm/ibm405.h>
21 17
22/* Ugly, ugly, ugly! BASE_BAUD defined here to keep 8250.c happy. */ 18/* Ugly, ugly, ugly! BASE_BAUD defined here to keep 8250.c happy. */
@@ -29,7 +25,29 @@
29enum ppc_sys_devices { 25enum ppc_sys_devices {
30 VIRTEX_UART, NUM_PPC_SYS_DEVS, 26 VIRTEX_UART, NUM_PPC_SYS_DEVS,
31}; 27};
32#endif
33 28
29typedef struct board_info {
30 unsigned int bi_memsize; /* DRAM installed, in bytes */
31 unsigned char bi_enetaddr[6]; /* Local Ethernet MAC address */
32 unsigned int bi_intfreq; /* Processor speed, in Hz */
33 unsigned int bi_busfreq; /* PLB Bus speed, in Hz */
34 unsigned int bi_pci_busfreq; /* PCI Bus speed, in Hz */
35} bd_t;
36
37/* Some 4xx parts use a different timebase frequency from the internal clock.
38 * the Virtex 405 does not, so just use a macro to make tbfreq match intfreq
39*/
40#define bi_tbfreq bi_intfreq
41
42extern const char* virtex_machine_name;
43#define PPC4xx_MACHINE_NAME (virtex_machine_name)
44
45#endif /* !__ASSEMBLY__ */
46
47/* We don't need anything mapped. Size of zero will accomplish that. */
48#define PPC4xx_ONB_IO_PADDR 0u
49#define PPC4xx_ONB_IO_VADDR 0u
50#define PPC4xx_ONB_IO_SIZE 0u
51
34#endif /* __ASM_VIRTEX_H__ */ 52#endif /* __ASM_VIRTEX_H__ */
35#endif /* __KERNEL__ */ 53#endif /* __KERNEL__ */
diff --git a/arch/ppc/platforms/4xx/xilinx_ml300.c b/arch/ppc/platforms/4xx/xilinx_ml300.c
index fb5f0b5e13d1..4e4aca43c890 100644
--- a/arch/ppc/platforms/4xx/xilinx_ml300.c
+++ b/arch/ppc/platforms/4xx/xilinx_ml300.c
@@ -68,6 +68,7 @@ struct ppc_sys_spec ppc_sys_specs[] = {
68 }, 68 },
69 }, 69 },
70}; 70};
71const char* virtex_machine_name = "ML300 Reference Design";
71 72
72#if defined(XPAR_POWER_0_POWERDOWN_BASEADDR) 73#if defined(XPAR_POWER_0_POWERDOWN_BASEADDR)
73 74
diff --git a/arch/ppc/platforms/4xx/xilinx_ml300.h b/arch/ppc/platforms/4xx/xilinx_ml300.h
deleted file mode 100644
index 3d57332ba820..000000000000
--- a/arch/ppc/platforms/4xx/xilinx_ml300.h
+++ /dev/null
@@ -1,45 +0,0 @@
1/*
2 * Include file that defines the Xilinx ML300 evaluation board
3 *
4 * Author: MontaVista Software, Inc.
5 * source@mvista.com
6 *
7 * 2002-2004 (c) MontaVista Software, Inc. This file is licensed under the
8 * terms of the GNU General Public License version 2. This program is licensed
9 * "as is" without any warranty of any kind, whether express or implied.
10 */
11
12#ifdef __KERNEL__
13#ifndef __ASM_XILINX_ML300_H__
14#define __ASM_XILINX_ML300_H__
15
16/* ML300 has a Xilinx Virtex-II Pro processor */
17#include <platforms/4xx/virtex.h>
18
19#ifndef __ASSEMBLY__
20
21#include <linux/types.h>
22
23typedef struct board_info {
24 unsigned int bi_memsize; /* DRAM installed, in bytes */
25 unsigned char bi_enetaddr[6]; /* Local Ethernet MAC address */
26 unsigned int bi_intfreq; /* Processor speed, in Hz */
27 unsigned int bi_busfreq; /* PLB Bus speed, in Hz */
28 unsigned int bi_pci_busfreq; /* PCI Bus speed, in Hz */
29} bd_t;
30
31/* Some 4xx parts use a different timebase frequency from the internal clock.
32*/
33#define bi_tbfreq bi_intfreq
34
35#endif /* !__ASSEMBLY__ */
36
37/* We don't need anything mapped. Size of zero will accomplish that. */
38#define PPC4xx_ONB_IO_PADDR 0u
39#define PPC4xx_ONB_IO_VADDR 0u
40#define PPC4xx_ONB_IO_SIZE 0u
41
42#define PPC4xx_MACHINE_NAME "Xilinx ML300 Reference System"
43
44#endif /* __ASM_XILINX_ML300_H__ */
45#endif /* __KERNEL__ */
diff --git a/arch/ppc/platforms/4xx/xilinx_ml403.c b/arch/ppc/platforms/4xx/xilinx_ml403.c
index cb3bf7a2bcbe..c98e40a8799f 100644
--- a/arch/ppc/platforms/4xx/xilinx_ml403.c
+++ b/arch/ppc/platforms/4xx/xilinx_ml403.c
@@ -72,6 +72,7 @@ struct ppc_sys_spec ppc_sys_specs[] = {
72 }, 72 },
73 }, 73 },
74}; 74};
75const char* virtex_machine_name = "ML403 Reference Design";
75 76
76#if defined(XPAR_POWER_0_POWERDOWN_BASEADDR) 77#if defined(XPAR_POWER_0_POWERDOWN_BASEADDR)
77 78
diff --git a/arch/ppc/platforms/4xx/xilinx_ml403.h b/arch/ppc/platforms/4xx/xilinx_ml403.h
deleted file mode 100644
index 473596959902..000000000000
--- a/arch/ppc/platforms/4xx/xilinx_ml403.h
+++ /dev/null
@@ -1,49 +0,0 @@
1/*
2 * arch/ppc/platforms/4xx/xilinx_ml403.h
3 *
4 * Include file that defines the Xilinx ML403 reference design
5 *
6 * Author: Grant Likely <grant.likely@secretlab.ca>
7 *
8 * 2005 (c) Secret Lab Technologies Ltd.
9 * 2002-2004 (c) MontaVista Software, Inc.
10 *
11 * This file is licensed under the terms of the GNU General Public License
12 * version 2. This program is licensed "as is" without any warranty of any
13 * kind, whether express or implied.
14 */
15
16#ifdef __KERNEL__
17#ifndef __ASM_XILINX_ML403_H__
18#define __ASM_XILINX_ML403_H__
19
20/* ML403 has a Xilinx Virtex-4 FPGA with a PPC405 hard core */
21#include <platforms/4xx/virtex.h>
22
23#ifndef __ASSEMBLY__
24
25#include <linux/types.h>
26
27typedef struct board_info {
28 unsigned int bi_memsize; /* DRAM installed, in bytes */
29 unsigned char bi_enetaddr[6]; /* Local Ethernet MAC address */
30 unsigned int bi_intfreq; /* Processor speed, in Hz */
31 unsigned int bi_busfreq; /* PLB Bus speed, in Hz */
32 unsigned int bi_pci_busfreq; /* PCI Bus speed, in Hz */
33} bd_t;
34
35/* Some 4xx parts use a different timebase frequency from the internal clock.
36*/
37#define bi_tbfreq bi_intfreq
38
39#endif /* !__ASSEMBLY__ */
40
41/* We don't need anything mapped. Size of zero will accomplish that. */
42#define PPC4xx_ONB_IO_PADDR 0u
43#define PPC4xx_ONB_IO_VADDR 0u
44#define PPC4xx_ONB_IO_SIZE 0u
45
46#define PPC4xx_MACHINE_NAME "Xilinx ML403 Reference Design"
47
48#endif /* __ASM_XILINX_ML403_H__ */
49#endif /* __KERNEL__ */
diff --git a/include/asm-ppc/ibm4xx.h b/include/asm-ppc/ibm4xx.h
index 92fd02d7b177..ed6891af05d3 100644
--- a/include/asm-ppc/ibm4xx.h
+++ b/include/asm-ppc/ibm4xx.h
@@ -47,12 +47,8 @@
47#include <platforms/4xx/walnut.h> 47#include <platforms/4xx/walnut.h>
48#endif 48#endif
49 49
50#if defined(CONFIG_XILINX_ML300) 50#if defined(CONFIG_XILINX_VIRTEX)
51#include <platforms/4xx/xilinx_ml300.h> 51#include <platforms/4xx/virtex.h>
52#endif
53
54#if defined(CONFIG_XILINX_ML403)
55#include <platforms/4xx/xilinx_ml403.h>
56#endif 52#endif
57 53
58#ifndef __ASSEMBLY__ 54#ifndef __ASSEMBLY__
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-07 08:29:49 -0500