[PATCH] missing cris config.help entries

Some that got lost along the way...

diff --git a/arch/cris/Config.help b/arch/cris/Config.help
index a26738f9f14b5da5f1685afb4f87db4aa0f5af9c..8fb1a31d37d421ab781c5db766a3ce4f8550162b 100644 (file)
--- a/arch/cris/Config.help
+++ b/arch/cris/Config.help
@@ -392,3 +392,26 @@ CONFIG_ETRAX_RESCUE_SER2
 CONFIG_ETRAX_RESCUE_SER3
   Use serial port 3 as the rescue port.
 
+CONFIG_ETRAX_POWERBUTTON_BIT
+  Configure where power button is connected.
+
+CONFIG_ETRAX_ROOT_DEVICE
+  Specifies the device that should be mounted as root file system
+  when booting from flash. The axisflashmap driver adds an additional
+  mtd partition for the appended root file system image, so this option
+  should normally be the mtdblock device for the partition after the
+  last partition in the partition table.
+
+CONFIG_ETRAX_SHUTDOWN_BIT
+  Configure what pin on CSPO-port that is used for controlling power
+  supply.
+
+CONFIG_ETRAX_SOFT_SHUTDOWN
+  Enable this if Etrax is used with a power-supply that can be turned
+  off and on with PS_ON signal. Gives the possibility to detect
+  powerbutton and then do a power off after unmounting disks.
+
+CONFIG_ETRAX_WATCHDOG_NICE_DOGGY
+  By enabling this you make sure that the watchdog does not bite while
+  printing oopses. Recommended for development systems but not for
+  production releases.

diff --git a/arch/cris/drivers/Config.help b/arch/cris/drivers/Config.help
index abfb47360001cb130e92332add459afee45d7265..074384fc4db5b591706d93dc09a90db89810e61e 100644 (file)
--- a/arch/cris/drivers/Config.help
+++ b/arch/cris/drivers/Config.help
@@ -572,3 +572,39 @@ CONFIG_ETRAX_PARALLEL_PORT0
 CONFIG_ETRAX_PARALLEL_PORT1
   Say Y here to enable parallel port 1.
 
+CONFIG_ETRAX_ETHERNET_LPSLAVE
+  This option enables a slave ETRAX 100 or ETRAX 100LX, connected to a
+  master ETRAX 100 or ETRAX 100LX through par0 and par1, to act as an
+  Ethernet controller.
+
+CONFIG_ETRAX_ETHERNET_LPSLAVE_HAS_LEDS
+  Enable if the slave has it's own LEDs.
+
+CONFIG_ETRAX_IDE
+  Enable this to get support for ATA/IDE.  You can't use parallel
+  ports or SCSI ports at the same time.
+
+CONFIG_ETRAX_NETWORK_LED_ON_WHEN_ACTIVITY
+  Selecting LED_on_when_link will light the LED when there is a
+  connection and will flash off when there is activity.
+
+  Selecting LED_on_when_activity will light the LED only when
+  there is activity.
+
+  This setting will also affect the behaviour of other activity LEDs
+  e.g. Bluetooth.
+
+CONFIG_ETRAX_NETWORK_LED_ON_WHEN_LINK
+  Selecting LED_on_when_link will light the LED when there is a
+  connection and will flash off when there is activity.
+
+  Selecting LED_on_when_activity will light the LED only when
+  there is activity.
+
+  This setting will also affect the behaviour of other activity LEDs
+  e.g. Bluetooth.
+
+CONFIG_ETRAX_SERIAL_PORT0
+  Enables the ETRAX 100 serial driver for ser0 (ttyS0)
+  Normally you want this on, unless you use external DMA 1 that uses
+  the same DMA channels.