X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fppc%2F8xx_io%2FKconfig;h=bf1361958a45803b7734c3944b7c333ae9afee57;hb=3ec04f3d2903fdf6d9849a8633af59b8628164a5;hp=ee9b1f0eec3d227f8fcd5c3f575188c502bfc58d;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/arch/ppc/8xx_io/Kconfig b/arch/ppc/8xx_io/Kconfig
index ee9b1f0ee..bf1361958 100644
--- a/arch/ppc/8xx_io/Kconfig
+++ b/arch/ppc/8xx_io/Kconfig
@@ -74,6 +74,37 @@ config ENET_BIG_BUFFERS
 	  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
@@ -103,36 +134,13 @@ config 8xx_CPU6
 
 	  If in doubt, say N here.
 
-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 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
+	bool "I2C/SPI Microcode Patch"
+	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.
 
 endmenu