diff options
author | Adrian Bunk <bunk@kernel.org> | 2007-08-27 17:29:53 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-09-17 01:15:04 -0400 |
commit | e6b6e3ffb9ee8926f9f2f7dc9147df73e27d5828 (patch) | |
tree | ecda5a24187801c1ad46e0d9d90a9fc5f547a52b /arch/ppc/Kconfig | |
parent | 8237bf080e9ef6adc3f2adce26060722685bbb15 (diff) |
[POWERPC] Remove APUS support from arch/ppc
Current status of APUS:
- arch/powerpc/: removed in 2.6.23
- arch/ppc/: marked BROKEN since 2 years
This therefore removes the remaining parts of APUS support from
arch/ppc, include/asm-ppc, arch/powerpc and include/asm-powerpc.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/Kconfig')
-rw-r--r-- | arch/ppc/Kconfig | 148 |
1 files changed, 1 insertions, 147 deletions
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 6bdeeb70b157..c1b34eb383cf 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig | |||
@@ -573,24 +573,9 @@ choice | |||
573 | 573 | ||
574 | Select PReP if configuring for a PReP machine. | 574 | Select PReP if configuring for a PReP machine. |
575 | 575 | ||
576 | Select Gemini if configuring for a Synergy Microsystems' Gemini | ||
577 | series Single Board Computer. More information is available at: | ||
578 | <http://www.synergymicro.com/PressRel/97_10_15.html>. | ||
579 | |||
580 | Select APUS if configuring for a PowerUP Amiga. More information is | ||
581 | available at: <http://linux-apus.sourceforge.net/>. | ||
582 | |||
583 | config PPC_PREP | 576 | config PPC_PREP |
584 | bool "PReP" | 577 | bool "PReP" |
585 | 578 | ||
586 | config APUS | ||
587 | bool "Amiga-APUS" | ||
588 | depends on BROKEN | ||
589 | help | ||
590 | Select APUS if configuring for a PowerUP Amiga. | ||
591 | More information is available at: | ||
592 | <http://linux-apus.sourceforge.net/>. | ||
593 | |||
594 | config KATANA | 579 | config KATANA |
595 | bool "Artesyn-Katana" | 580 | bool "Artesyn-Katana" |
596 | help | 581 | help |
@@ -1027,132 +1012,6 @@ config CMDLINE | |||
1027 | some command-line options at build time by entering them here. In | 1012 | some command-line options at build time by entering them here. In |
1028 | most cases you will need to specify the root device here. | 1013 | most cases you will need to specify the root device here. |
1029 | 1014 | ||
1030 | config AMIGA | ||
1031 | bool | ||
1032 | depends on APUS | ||
1033 | default y | ||
1034 | help | ||
1035 | This option enables support for the Amiga series of computers. | ||
1036 | |||
1037 | config ZORRO | ||
1038 | bool | ||
1039 | depends on APUS | ||
1040 | default y | ||
1041 | help | ||
1042 | This enables support for the Zorro bus in the Amiga. If you have | ||
1043 | expansion cards in your Amiga that conform to the Amiga | ||
1044 | AutoConfig(tm) specification, say Y, otherwise N. Note that even | ||
1045 | expansion cards that do not fit in the Zorro slots but fit in e.g. | ||
1046 | the CPU slot may fall in this category, so you have to say Y to let | ||
1047 | Linux use these. | ||
1048 | |||
1049 | config ABSTRACT_CONSOLE | ||
1050 | bool | ||
1051 | depends on APUS | ||
1052 | default y | ||
1053 | |||
1054 | config APUS_FAST_EXCEPT | ||
1055 | bool | ||
1056 | depends on APUS | ||
1057 | default y | ||
1058 | |||
1059 | config AMIGA_PCMCIA | ||
1060 | bool "Amiga 1200/600 PCMCIA support" | ||
1061 | depends on APUS && EXPERIMENTAL | ||
1062 | help | ||
1063 | Include support in the kernel for pcmcia on Amiga 1200 and Amiga | ||
1064 | 600. If you intend to use pcmcia cards say Y; otherwise say N. | ||
1065 | |||
1066 | config AMIGA_BUILTIN_SERIAL | ||
1067 | tristate "Amiga builtin serial support" | ||
1068 | depends on APUS | ||
1069 | help | ||
1070 | If you want to use your Amiga's built-in serial port in Linux, | ||
1071 | answer Y. | ||
1072 | |||
1073 | To compile this driver as a module, choose M here. | ||
1074 | |||
1075 | config GVPIOEXT | ||
1076 | tristate "GVP IO-Extender support" | ||
1077 | depends on APUS | ||
1078 | help | ||
1079 | If you want to use a GVP IO-Extender serial card in Linux, say Y. | ||
1080 | Otherwise, say N. | ||
1081 | |||
1082 | config GVPIOEXT_LP | ||
1083 | tristate "GVP IO-Extender parallel printer support" | ||
1084 | depends on GVPIOEXT | ||
1085 | help | ||
1086 | Say Y to enable driving a printer from the parallel port on your | ||
1087 | GVP IO-Extender card, N otherwise. | ||
1088 | |||
1089 | config GVPIOEXT_PLIP | ||
1090 | tristate "GVP IO-Extender PLIP support" | ||
1091 | depends on GVPIOEXT | ||
1092 | help | ||
1093 | Say Y to enable doing IP over the parallel port on your GVP | ||
1094 | IO-Extender card, N otherwise. | ||
1095 | |||
1096 | config MULTIFACE_III_TTY | ||
1097 | tristate "Multiface Card III serial support" | ||
1098 | depends on APUS | ||
1099 | help | ||
1100 | If you want to use a Multiface III card's serial port in Linux, | ||
1101 | answer Y. | ||
1102 | |||
1103 | To compile this driver as a module, choose M here. | ||
1104 | |||
1105 | config A2232 | ||
1106 | tristate "Commodore A2232 serial support (EXPERIMENTAL)" | ||
1107 | depends on EXPERIMENTAL && APUS | ||
1108 | ---help--- | ||
1109 | This option supports the 2232 7-port serial card shipped with the | ||
1110 | Amiga 2000 and other Zorro-bus machines, dating from 1989. At | ||
1111 | a max of 19,200 bps, the ports are served by a 6551 ACIA UART chip | ||
1112 | each, plus a 8520 CIA, and a master 6502 CPU and buffer as well. The | ||
1113 | ports were connected with 8 pin DIN connectors on the card bracket, | ||
1114 | for which 8 pin to DB25 adapters were supplied. The card also had | ||
1115 | jumpers internally to toggle various pinning configurations. | ||
1116 | |||
1117 | This driver can be built as a module; but then "generic_serial" | ||
1118 | will also be built as a module. This has to be loaded before | ||
1119 | "ser_a2232". If you want to do this, answer M here. | ||
1120 | |||
1121 | config WHIPPET_SERIAL | ||
1122 | tristate "Hisoft Whippet PCMCIA serial support" | ||
1123 | depends on AMIGA_PCMCIA | ||
1124 | help | ||
1125 | HiSoft has a web page at <http://www.hisoft.co.uk/>, but there | ||
1126 | is no listing for the Whippet in their Amiga section. | ||
1127 | |||
1128 | config APNE | ||
1129 | tristate "PCMCIA NE2000 support" | ||
1130 | depends on AMIGA_PCMCIA | ||
1131 | help | ||
1132 | If you have a PCMCIA NE2000 compatible adapter, say Y. Otherwise, | ||
1133 | say N. | ||
1134 | |||
1135 | To compile this driver as a module, choose M here: the | ||
1136 | module will be called apne. | ||
1137 | |||
1138 | config SERIAL_CONSOLE | ||
1139 | bool "Support for serial port console" | ||
1140 | depends on APUS && (AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y) | ||
1141 | |||
1142 | config HEARTBEAT | ||
1143 | bool "Use power LED as a heartbeat" | ||
1144 | depends on APUS | ||
1145 | help | ||
1146 | Use the power-on LED on your machine as a load meter. The exact | ||
1147 | behavior is platform-dependent, but normally the flash frequency is | ||
1148 | a hyperbolic function of the 5-minute load average. | ||
1149 | |||
1150 | config PROC_HARDWARE | ||
1151 | bool "/proc/hardware support" | ||
1152 | depends on APUS | ||
1153 | |||
1154 | source "drivers/zorro/Kconfig" | ||
1155 | |||
1156 | if !44x || BROKEN | 1015 | if !44x || BROKEN |
1157 | source kernel/power/Kconfig | 1016 | source kernel/power/Kconfig |
1158 | endif | 1017 | endif |
@@ -1227,8 +1086,7 @@ config MCA | |||
1227 | 1086 | ||
1228 | config PCI | 1087 | config PCI |
1229 | bool "PCI support" if 40x || CPM2 || 83xx || 85xx || PPC_MPC52xx | 1088 | bool "PCI support" if 40x || CPM2 || 83xx || 85xx || PPC_MPC52xx |
1230 | default y if !40x && !CPM2 && !8xx && !APUS && !83xx && !85xx | 1089 | default y if !40x && !CPM2 && !8xx && !83xx && !85xx |
1231 | default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS | ||
1232 | default PCI_QSPAN if !4xx && !CPM2 && 8xx | 1090 | default PCI_QSPAN if !4xx && !CPM2 && 8xx |
1233 | help | 1091 | help |
1234 | Find out whether your system includes a PCI bus. PCI is the name of | 1092 | Find out whether your system includes a PCI bus. PCI is the name of |
@@ -1284,10 +1142,6 @@ config 8260_PCI9_IDMA4 | |||
1284 | 1142 | ||
1285 | endchoice | 1143 | endchoice |
1286 | 1144 | ||
1287 | config PCI_PERMEDIA | ||
1288 | bool "PCI for Permedia2" | ||
1289 | depends on !4xx && !8xx && APUS | ||
1290 | |||
1291 | source "drivers/pci/Kconfig" | 1145 | source "drivers/pci/Kconfig" |
1292 | 1146 | ||
1293 | source "drivers/pcmcia/Kconfig" | 1147 | source "drivers/pcmcia/Kconfig" |