patch-2.4.21 linux-2.4.21/arch/cris/drivers/Config.in
Next file: linux-2.4.21/arch/cris/drivers/Makefile
Previous file: linux-2.4.21/arch/cris/config.in
Back to the patch index
Back to the overall index
- Lines: 195
- Date:
2003-06-13 07:51:29.000000000 -0700
- Orig file:
linux-2.4.20/arch/cris/drivers/Config.in
- Orig date:
2002-11-28 15:53:09.000000000 -0800
diff -urN linux-2.4.20/arch/cris/drivers/Config.in linux-2.4.21/arch/cris/drivers/Config.in
@@ -26,46 +26,150 @@
bool ' Use fast timers for serial DMA flush (experimental)' CONFIG_ETRAX_SERIAL_FAST_TIMER
if [ "$CONFIG_ETRAX_SERIAL_FAST_TIMER" = "n" ]; then
bool ' Fast serial port DMA flush' CONFIG_ETRAX_SERIAL_FLUSH_DMA_FAST
- if [ "$CONFIG_ETRAX100_SERIAL_FLUSH_DMA_FAST" = "n" ]; then
+ if [ "$CONFIG_ETRAX_SERIAL_FLUSH_DMA_FAST" = "n" ]; then
int ' Receive flush timeout (ticks) ' CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS 5
fi
fi
bool ' Serial port 0 enabled' CONFIG_ETRAX_SERIAL_PORT0
if [ "$CONFIG_ETRAX_SERIAL_PORT0" = "y" ]; then
- bool ' Ser0 DTR, RI, DSR, CD on PB' CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_PB
- if [ "$CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_PB" = "y" ]; then
- int ' Ser0 DTR on PB bit' CONFIG_ETRAX_SER0_DTR_ON_PB_BIT 4
- int ' Ser0 RI on PB bit' CONFIG_ETRAX_SER0_RI_ON_PB_BIT 5
- int ' Ser0 DSR on PB bit' CONFIG_ETRAX_SER0_DSR_ON_PB_BIT 6
- int ' Ser0 CD on PB bit' CONFIG_ETRAX_SER0_CD_ON_PB_BIT 7
+ choice 'Ser0 DTR, RI, DSR and CD assignment' \
+ "No_DTR_RI_DSR_CD CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_NONE \
+ DTR_RI_DSR_CD_on_PA CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_PA \
+ DTR_RI_DSR_CD_on_PB CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_PB \
+ DTR_RI_DSR_CD_mixed_on_PA_and_PB CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED" \
+ No_DTR_RI_DSR_CD
+
+ if [ "$CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_PA" = "y" -o \
+ "$CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED" = "y" ]; then
+ int ' Ser0 DTR on PA bit (-1 = not used)' CONFIG_ETRAX_SER0_DTR_ON_PA_BIT 4
+ int ' Ser0 RI on PA bit (-1 = not used)' CONFIG_ETRAX_SER0_RI_ON_PA_BIT 5
+ int ' Ser0 DSR on PA bit (-1 = not used)' CONFIG_ETRAX_SER0_DSR_ON_PA_BIT 6
+ int ' Ser0 CD on PA bit (-1 = not used)' CONFIG_ETRAX_SER0_CD_ON_PA_BIT 7
+ else
+ define_int CONFIG_ETRAX_SER0_DTR_ON_PA_BIT -1
+ define_int CONFIG_ETRAX_SER0_RI_ON_PA_BIT -1
+ define_int CONFIG_ETRAX_SER0_DSR_ON_PA_BIT -1
+ define_int CONFIG_ETRAX_SER0_CD_ON_PA_BIT -1
+ fi
+ if [ "$CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_PB" = "y" -o \
+ "$CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED" = "y" ]; then
+ int ' Ser0 DTR on PB bit (-1 = not used)' CONFIG_ETRAX_SER0_DTR_ON_PB_BIT 4
+ int ' Ser0 RI on PB bit (-1 = not used)' CONFIG_ETRAX_SER0_RI_ON_PB_BIT 5
+ int ' Ser0 DSR on PB bit (-1 = not used)' CONFIG_ETRAX_SER0_DSR_ON_PB_BIT 6
+ int ' Ser0 CD on PB bit (-1 = not used)' CONFIG_ETRAX_SER0_CD_ON_PB_BIT 7
+ else
+ define_int CONFIG_ETRAX_SER0_DTR_ON_PB_BIT -1
+ define_int CONFIG_ETRAX_SER0_RI_ON_PB_BIT -1
+ define_int CONFIG_ETRAX_SER0_DSR_ON_PB_BIT -1
+ define_int CONFIG_ETRAX_SER0_CD_ON_PB_BIT -1
fi
fi
bool ' Serial port 1 enabled' CONFIG_ETRAX_SERIAL_PORT1
if [ "$CONFIG_ETRAX_SERIAL_PORT1" = "y" ]; then
- bool ' Ser1 DTR, RI, DSR, CD on PB' CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_ON_PB
- if [ "$CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_ON_PB" = "y" ]; then
- int ' Ser1 DTR on PB bit' CONFIG_ETRAX_SER1_DTR_ON_PB_BIT 4
- int ' Ser1 RI on PB bit' CONFIG_ETRAX_SER1_RI_ON_PB_BIT 5
- int ' Ser1 DSR on PB bit' CONFIG_ETRAX_SER1_DSR_ON_PB_BIT 6
- int ' Ser1 CD on PB bit' CONFIG_ETRAX_SER1_CD_ON_PB_BIT 7
+ choice 'Ser1 DTR, RI, DSR and CD assignment' \
+ "No_DTR_RI_DSR_CD CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_ON_NONE \
+ DTR_RI_DSR_CD_on_PA CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_ON_PA \
+ DTR_RI_DSR_CD_on_PB CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_ON_PB \
+ DTR_RI_DSR_CD_mixed_on_PA_and_PB CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED" \
+ No_DTR_RI_DSR_CD
+
+ if [ "$CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_ON_PA" = "y" -o \
+ "$CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED" = "y" ]; then
+ int ' Ser1 DTR on PA bit (-1 = not used)' CONFIG_ETRAX_SER1_DTR_ON_PA_BIT 4
+ int ' Ser1 RI on PA bit (-1 = not used)' CONFIG_ETRAX_SER1_RI_ON_PA_BIT 5
+ int ' Ser1 DSR on PA bit (-1 = not used)' CONFIG_ETRAX_SER1_DSR_ON_PA_BIT 6
+ int ' Ser1 CD on PA bit (-1 = not used)' CONFIG_ETRAX_SER1_CD_ON_PA_BIT 7
+ else
+ define_int CONFIG_ETRAX_SER1_DTR_ON_PA_BIT -1
+ define_int CONFIG_ETRAX_SER1_RI_ON_PA_BIT -1
+ define_int CONFIG_ETRAX_SER1_DSR_ON_PA_BIT -1
+ define_int CONFIG_ETRAX_SER1_CD_ON_PA_BIT -1
+ fi
+ if [ "$CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_ON_PB" = "y" -o \
+ "$CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_MIXED" = "y" ]; then
+ int ' Ser1 DTR on PB bit (-1 = not used)' CONFIG_ETRAX_SER1_DTR_ON_PB_BIT 4
+ int ' Ser1 RI on PB bit (-1 = not used)' CONFIG_ETRAX_SER1_RI_ON_PB_BIT 5
+ int ' Ser1 DSR on PB bit (-1 = not used)' CONFIG_ETRAX_SER1_DSR_ON_PB_BIT 6
+ int ' Ser1 CD on PB bit (-1 = not used)' CONFIG_ETRAX_SER1_CD_ON_PB_BIT 7
+ else
+ define_int CONFIG_ETRAX_SER1_DTR_ON_PB_BIT -1
+ define_int CONFIG_ETRAX_SER1_RI_ON_PB_BIT -1
+ define_int CONFIG_ETRAX_SER1_DSR_ON_PB_BIT -1
+ define_int CONFIG_ETRAX_SER1_CD_ON_PB_BIT -1
fi
fi
+
if [ "$CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_PB" = "y" -a \
"$CONFIG_ETRAX_SER1_DTR_RI_DSR_CD_ON_PB" = "y" ]; then
comment 'Make sure you dont have the same PB bits more than once!'
fi
bool ' Serial port 2 enabled' CONFIG_ETRAX_SERIAL_PORT2
if [ "$CONFIG_ETRAX_SERIAL_PORT2" = "y" ]; then
- bool ' Ser2 DTR, RI, DSR, CD on PA' CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_ON_PA
- if [ "$CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_ON_PA" = "y" ]; then
- int ' Ser2 DTR on PA bit' CONFIG_ETRAX_SER2_DTR_ON_PA_BIT 4
- int ' Ser2 RI on PA bit' CONFIG_ETRAX_SER2_RI_ON_PA_BIT 5
- int ' Ser2 DSR on PA bit' CONFIG_ETRAX_SER2_DSR_ON_PA_BIT 6
- int ' Ser2 CD on PA bit' CONFIG_ETRAX_SER2_CD_ON_PA_BIT 7
- fi
+ choice 'Ser2 DTR, RI, DSR and CD assignment' \
+ "No_DTR_RI_DSR_CD CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_ON_NONE \
+ DTR_RI_DSR_CD_on_PA CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_ON_PA \
+ DTR_RI_DSR_CD_on_PB CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_ON_PB \
+ DTR_RI_DSR_CD_mixed_on_PA_and_PB CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED" \
+ No_DTR_RI_DSR_CD
+ if [ "$CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_ON_PA" = "y" -o \
+ "$CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED" = "y" ]; then
+ int ' Ser2 DTR on PA bit (-1 = not used)' CONFIG_ETRAX_SER2_DTR_ON_PA_BIT 4
+ int ' Ser2 RI on PA bit (-1 = not used)' CONFIG_ETRAX_SER2_RI_ON_PA_BIT 5
+ int ' Ser2 DSR on PA bit (-1 = not used)' CONFIG_ETRAX_SER2_DSR_ON_PA_BIT 6
+ int ' Ser2 CD on PA bit (-1 = not used)' CONFIG_ETRAX_SER2_CD_ON_PA_BIT 7
+ else
+ define_int CONFIG_ETRAX_SER2_DTR_ON_PA_BIT -1
+ define_int CONFIG_ETRAX_SER2_RI_ON_PA_BIT -1
+ define_int CONFIG_ETRAX_SER2_DSR_ON_PA_BIT -1
+ define_int CONFIG_ETRAX_SER2_CD_ON_PA_BIT -1
+ fi
+ if [ "$CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_ON_PB" = "y" -o \
+ "$CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED" = "y" ]; then
+ int ' Ser2 DTR on PB bit (-1 = not used)' CONFIG_ETRAX_SER2_DTR_ON_PB_BIT 4
+ int ' Ser2 RI on PB bit (-1 = not used)' CONFIG_ETRAX_SER2_RI_ON_PB_BIT 5
+ int ' Ser2 DSR on PB bit (-1 = not used)' CONFIG_ETRAX_SER2_DSR_ON_PB_BIT 6
+ int ' Ser2 CD on PB bit (-1 = not used)' CONFIG_ETRAX_SER2_CD_ON_PB_BIT 7
+ else
+ define_int CONFIG_ETRAX_SER2_DTR_ON_PB_BIT -1
+ define_int CONFIG_ETRAX_SER2_RI_ON_PB_BIT -1
+ define_int CONFIG_ETRAX_SER2_DSR_ON_PB_BIT -1
+ define_int CONFIG_ETRAX_SER2_CD_ON_PB_BIT -1
+ fi
fi
bool ' Serial port 3 enabled' CONFIG_ETRAX_SERIAL_PORT3
+ if [ "$CONFIG_ETRAX_SERIAL_PORT3" = "y" ]; then
+ choice 'Ser3 DTR, RI, DSR and CD assignment' \
+ "No_DTR_RI_DSR_CD CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_ON_NONE \
+ DTR_RI_DSR_CD_on_PA CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_ON_PA \
+ DTR_RI_DSR_CD_on_PB CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_ON_PB \
+ DTR_RI_DSR_CD_mixed_on_PA_and_PB CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED" \
+ No_DTR_RI_DSR_CD
+ if [ "$CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_ON_PA" = "y" -o \
+ "$CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED" = "y" ]; then
+ int ' Ser3 DTR on PA bit (-1 = not used)' CONFIG_ETRAX_SER3_DTR_ON_PA_BIT -1
+ int ' Ser3 RI on PA bit (-1 = not used)' CONFIG_ETRAX_SER3_RI_ON_PA_BIT -1
+ int ' Ser3 DSR on PA bit (-1 = not used)' CONFIG_ETRAX_SER3_DSR_ON_PA_BIT -1
+ int ' Ser3 CD on PA bit (-1 = not used)' CONFIG_ETRAX_SER3_CD_ON_PA_BIT -1
+ else
+ define_int CONFIG_ETRAX_SER3_DTR_ON_PA_BIT -1
+ define_int CONFIG_ETRAX_SER3_RI_ON_PA_BIT -1
+ define_int CONFIG_ETRAX_SER3_DSR_ON_PA_BIT -1
+ define_int CONFIG_ETRAX_SER3_CD_ON_PA_BIT -1
+ fi
+ if [ "$CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_ON_PB" = "y" -o \
+ "$CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED" = "y" ]; then
+ int ' Ser3 DTR on PB bit (-1 = not used)' CONFIG_ETRAX_SER3_DTR_ON_PB_BIT -1
+ int ' Ser3 RI on PB bit (-1 = not used)' CONFIG_ETRAX_SER3_RI_ON_PB_BIT -1
+ int ' Ser3 DSR on PB bit (-1 = not used)' CONFIG_ETRAX_SER3_DSR_ON_PB_BIT -1
+ int ' Ser3 CD on PB bit (-1 = not used)' CONFIG_ETRAX_SER3_CD_ON_PB_BIT -1
+ else
+ define_int CONFIG_ETRAX_SER3_DTR_ON_PB_BIT -1
+ define_int CONFIG_ETRAX_SER3_RI_ON_PB_BIT -1
+ define_int CONFIG_ETRAX_SER3_DSR_ON_PB_BIT -1
+ define_int CONFIG_ETRAX_SER3_CD_ON_PB_BIT -1
+ fi
+ fi
bool ' RS-485 support' CONFIG_ETRAX_RS485
if [ "$CONFIG_ETRAX_RS485" = "y" ]; then
bool ' RS-485 mode on PA' CONFIG_ETRAX_RS485_ON_PA
@@ -139,7 +243,6 @@
define_bool CONFIG_MTD y
define_bool CONFIG_MTD_CFI y
- define_bool CONFIG_MTD_CFI_INTELEXT n
define_bool CONFIG_MTD_CFI_AMDSTD y
define_bool CONFIG_MTD_OBSOLETE_CHIPS y
@@ -148,6 +251,7 @@
define_bool CONFIG_MTD_CHAR y
define_bool CONFIG_MTD_BLOCK y
define_bool CONFIG_MTD_PARTITIONS y
+ define_bool CONFIG_MTD_CONCAT y
fi
bool 'I2C support' CONFIG_ETRAX_I2C
@@ -209,6 +313,7 @@
int ' DS1302 RST bit number' CONFIG_ETRAX_DS1302_RSTBIT 2
int ' DS1302 SCL bit number' CONFIG_ETRAX_DS1302_SCLBIT 1
int ' DS1302 SDA bit number' CONFIG_ETRAX_DS1302_SDABIT 0
+ int ' DS1302 Trickle charger value' CONFIG_ETRAX_DS1302_TRICKLE_CHARGE 0
fi
endmenu
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)