vserver 1.9.5.x5

[linux-2.6.git] / arch / ppc / 8xx_io / Kconfig

diff --git a/arch/ppc/8xx_io/Kconfig b/arch/ppc/8xx_io/Kconfig
index bf13619..9e2227e 100644 (file)
--- a/arch/ppc/8xx_io/Kconfig
+++ b/arch/ppc/8xx_io/Kconfig
@@ -10,7 +10,7 @@ config SCC_ENET
        depends on NET_ETHERNET
        help
          Enable Ethernet support via the Motorola MPC8xx serial
        depends on NET_ETHERNET
        help
          Enable Ethernet support via the Motorola MPC8xx serial

-         commmunications controller.
+         communications controller.

 
 choice
        prompt "SCC used for Ethernet"
 
 choice
        prompt "SCC used for Ethernet"


@@ -74,37 +74,6 @@ config ENET_BIG_BUFFERS
          Allocate large buffers for MPC8xx Etherenet.  Increases throughput
          and decreases the likelihood of dropped packets, but costs memory.
 
          Allocate large buffers for MPC8xx Etherenet.  Increases throughput
          and decreases the likelihood of dropped packets, but costs memory.
 

-config SMC2_UART
-       bool "Use SMC2 for UART"
-       help
-         If you would like to use SMC2 as a serial port, say Y here.
-
-         If in doubt, say Y here.
-
-config ALTSMC2
-       bool "Use Alternate SMC2 I/O (823/850)"
-       depends on SMC2_UART
-       help
-         If you have an MPC823 or MPC850 and would like to use the alternate
-         SMC2 for I/O, say Y here.
-
-         If in doubt, say N here.
-
-config CONS_SMC2
-       bool "Use SMC2 for Console"
-       depends on SMC2_UART
-       help
-         If you are going to have a serial console on your device and are
-         using SMC2 for your serial port, say Y here, else say N.
-
-config USE_SCC_IO
-       bool "Enable SCC2 and SCC3 for UART"
-       help
-         If your MPC8xx board has other SCC ports that you would like to use
-         for for a serial port, say Y here.
-
-         If in doubt, say N here.
-

 config HTDMSOUND
        bool "Embedded Planet HIOX Audio"
        depends on SOUND=y
 config HTDMSOUND
        bool "Embedded Planet HIOX Audio"
        depends on SOUND=y


@@ -134,13 +103,36 @@ config 8xx_CPU6
 
          If in doubt, say N here.
 
 
          If in doubt, say N here.
 

-config UCODE_PATCH
-       bool "I2C/SPI Microcode Patch"
+choice
+       prompt "Microcode patch selection"
+       default NO_UCODE_PATCH
+       help
+         Help not implemented yet, coming soon.
+
+config NO_UCODE_PATCH
+       bool "None"
+
+config USB_SOF_UCODE_PATCH
+       bool "USB SOF patch"
+       help
+         Help not implemented yet, coming soon.
+
+config I2C_SPI_UCODE_PATCH
+       bool "I2C/SPI relocation patch"

        help
        help

-         Motorola releases microcode updates for their 8xx CPM modules.  The
-         microcode update file has updates for IIC, SMC and USB.  Currently only
-         the USB update is available by default, if the MPC8xx USB option is
-         enabled.  If in doubt, say 'N' here.
+         Help not implemented yet, coming soon.
+
+config I2C_SPI_SMC1_UCODE_PATCH
+       bool "I2C/SPI/SMC1 relocation patch"
+       help
+         Help not implemented yet, coming soon.
+
+endchoice
+
+config UCODE_PATCH
+       bool
+       default y
+       depends on !NO_UCODE_PATCH

 
 endmenu
 
 
 endmenu