diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-26 02:47:42 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-26 02:47:42 -0400 |
commit | f9bd170a87948a9e077149b70fb192c563770fdf (patch) | |
tree | c759b57b67ab41a859e19f7dcee571504b368202 /arch/ppc/Kconfig | |
parent | 25635c71e44111a6bd48f342e144e2fc02d0a314 (diff) |
powerpc: Merge i8259.c into arch/powerpc/sysdev
This changes the parameters for i8259_init so that it takes two
parameters: a physical address for generating an interrupt
acknowledge cycle, and an interrupt number offset. i8259_init
now sets the irq_desc[] for its interrupts; all the callers
were doing this, and that code is gone now. This also defines
a CONFIG_PPC_I8259 symbol to select i8259.o for inclusion, and
makes the platforms that need it select that symbol.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/Kconfig')
-rw-r--r-- | arch/ppc/Kconfig | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index e3efaf47d083..114b90fdea24 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig | |||
@@ -589,6 +589,7 @@ config EV64260 | |||
589 | 589 | ||
590 | config LOPEC | 590 | config LOPEC |
591 | bool "Motorola-LoPEC" | 591 | bool "Motorola-LoPEC" |
592 | select PPC_I8259 | ||
592 | 593 | ||
593 | config MVME5100 | 594 | config MVME5100 |
594 | bool "Motorola-MVME5100" | 595 | bool "Motorola-MVME5100" |
@@ -596,6 +597,7 @@ config MVME5100 | |||
596 | 597 | ||
597 | config PPLUS | 598 | config PPLUS |
598 | bool "Motorola-PowerPlus" | 599 | bool "Motorola-PowerPlus" |
600 | select PPC_I8259 | ||
599 | select PPC_INDIRECT_PCI | 601 | select PPC_INDIRECT_PCI |
600 | 602 | ||
601 | config PRPMC750 | 603 | config PRPMC750 |
@@ -608,12 +610,14 @@ config PRPMC800 | |||
608 | 610 | ||
609 | config SANDPOINT | 611 | config SANDPOINT |
610 | bool "Motorola-Sandpoint" | 612 | bool "Motorola-Sandpoint" |
613 | select PPC_I8259 | ||
611 | help | 614 | help |
612 | Select SANDPOINT if configuring for a Motorola Sandpoint X3 | 615 | Select SANDPOINT if configuring for a Motorola Sandpoint X3 |
613 | (any flavor). | 616 | (any flavor). |
614 | 617 | ||
615 | config RADSTONE_PPC7D | 618 | config RADSTONE_PPC7D |
616 | bool "Radstone Technology PPC7D board" | 619 | bool "Radstone Technology PPC7D board" |
620 | select PPC_I8259 | ||
617 | 621 | ||
618 | config PAL4 | 622 | config PAL4 |
619 | bool "SBS-Palomar4" | 623 | bool "SBS-Palomar4" |
@@ -755,6 +759,7 @@ config CPM2 | |||
755 | config PPC_CHRP | 759 | config PPC_CHRP |
756 | bool " Common Hardware Reference Platform (CHRP) based machines" | 760 | bool " Common Hardware Reference Platform (CHRP) based machines" |
757 | depends on PPC_MULTIPLATFORM | 761 | depends on PPC_MULTIPLATFORM |
762 | select PPC_I8259 | ||
758 | select PPC_INDIRECT_PCI | 763 | select PPC_INDIRECT_PCI |
759 | default y | 764 | default y |
760 | 765 | ||
@@ -772,6 +777,7 @@ config PPC_PMAC64 | |||
772 | config PPC_PREP | 777 | config PPC_PREP |
773 | bool " PowerPC Reference Platform (PReP) based machines" | 778 | bool " PowerPC Reference Platform (PReP) based machines" |
774 | depends on PPC_MULTIPLATFORM | 779 | depends on PPC_MULTIPLATFORM |
780 | select PPC_I8259 | ||
775 | select PPC_INDIRECT_PCI | 781 | select PPC_INDIRECT_PCI |
776 | default y | 782 | default y |
777 | 783 | ||
@@ -881,6 +887,7 @@ config HARRIER_STORE_GATHERING | |||
881 | config MVME5100_IPMC761_PRESENT | 887 | config MVME5100_IPMC761_PRESENT |
882 | bool "MVME5100 configured with an IPMC761" | 888 | bool "MVME5100 configured with an IPMC761" |
883 | depends on MVME5100 | 889 | depends on MVME5100 |
890 | select PPC_I8259 | ||
884 | 891 | ||
885 | config SPRUCE_BAUD_33M | 892 | config SPRUCE_BAUD_33M |
886 | bool "Spruce baud clock support" | 893 | bool "Spruce baud clock support" |
@@ -1138,6 +1145,7 @@ menu "Bus options" | |||
1138 | config ISA | 1145 | config ISA |
1139 | bool "Support for ISA-bus hardware" | 1146 | bool "Support for ISA-bus hardware" |
1140 | depends on PPC_PREP || PPC_CHRP | 1147 | depends on PPC_PREP || PPC_CHRP |
1148 | select PPC_I8259 | ||
1141 | help | 1149 | help |
1142 | Find out whether you have ISA slots on your motherboard. ISA is the | 1150 | Find out whether you have ISA slots on your motherboard. ISA is the |
1143 | name of a bus system, i.e. the way the CPU talks to the other stuff | 1151 | name of a bus system, i.e. the way the CPU talks to the other stuff |
@@ -1150,6 +1158,11 @@ config GENERIC_ISA_DMA | |||
1150 | depends on POWER3 || POWER4 || 6xx && !CPM2 | 1158 | depends on POWER3 || POWER4 || 6xx && !CPM2 |
1151 | default y | 1159 | default y |
1152 | 1160 | ||
1161 | config PPC_I8259 | ||
1162 | bool | ||
1163 | default y if 85xx | ||
1164 | default n | ||
1165 | |||
1153 | config PPC_INDIRECT_PCI | 1166 | config PPC_INDIRECT_PCI |
1154 | bool | 1167 | bool |
1155 | depends on PCI | 1168 | depends on PCI |
@@ -1192,6 +1205,7 @@ config MPC83xx_PCI2 | |||
1192 | config PCI_QSPAN | 1205 | config PCI_QSPAN |
1193 | bool "QSpan PCI" | 1206 | bool "QSpan PCI" |
1194 | depends on !4xx && !CPM2 && 8xx | 1207 | depends on !4xx && !CPM2 && 8xx |
1208 | select PPC_I8259 | ||
1195 | help | 1209 | help |
1196 | Say Y here if you have a system based on a Motorola 8xx-series | 1210 | Say Y here if you have a system based on a Motorola 8xx-series |
1197 | embedded processor with a QSPAN PCI interface, otherwise say N. | 1211 | embedded processor with a QSPAN PCI interface, otherwise say N. |