CRIS: Rearrange Kconfigs for v10 and v32 to allow compilation without warnings.

- Remove some unneeded configs and add some new ones.
- Merge common config items to common file instead of duplicating them.
- Pull in standard Kconfig.preempt.
- Remove some unneeded Kconfigs for subsystems not (yet) available on CRIS
  (md, scsi, ieee1394, i2o, isdn, telephony, media, pcmcia, pci)
- Rename CRISv32 config items which had different types from CRISv10.
  (ETRAX_LED2G, ETRAX_LED2R, ETRAX_LED3G, ETRAX_LED3R, ETRAX_I2C_DATA_PORT,
  ETRAX_I2C_CLK_PORT)
This commit is contained in:
Jesper Nilsson 2007-12-05 18:10:36 +01:00
parent a4ffc0a0b2
commit 923dd2a463
5 changed files with 990 additions and 538 deletions

View File

@ -13,10 +13,6 @@ config ZONE_DMA
bool bool
default y default y
config NO_DMA
bool
default y
config RWSEM_GENERIC_SPINLOCK config RWSEM_GENERIC_SPINLOCK
bool bool
default y default y
@ -24,6 +20,10 @@ config RWSEM_GENERIC_SPINLOCK
config RWSEM_XCHGADD_ALGORITHM config RWSEM_XCHGADD_ALGORITHM
bool bool
config GENERIC_IOMAP
bool
default y
config ARCH_HAS_ILOG2_U32 config ARCH_HAS_ILOG2_U32
bool bool
default n default n
@ -44,13 +44,16 @@ config GENERIC_CALIBRATE_DELAY
bool bool
default y default y
config IRQ_PER_CPU
bool
default y
config NO_IOPORT config NO_IOPORT
def_bool y def_bool y
config NO_IOMEM
def_bool y
config FORCE_MAX_ZONEORDER
int
default 6
config CRIS config CRIS
bool bool
default y default y
@ -93,17 +96,15 @@ config ETRAX_FAST_TIMER
timers). timers).
This is needed if CONFIG_ETRAX_SERIAL_FAST_TIMER is enabled. This is needed if CONFIG_ETRAX_SERIAL_FAST_TIMER is enabled.
config PREEMPT config ETRAX_KMALLOCED_MODULES
bool "Preemptible Kernel" bool "Enable module allocation with kmalloc"
help help
This option reduces the latency of the kernel when reacting to Enable module allocation with kmalloc instead of vmalloc.
real-time or interactive events by allowing a low priority process to
be preempted even if it is in kernel mode executing a system call.
This allows applications to run more reliably even when the system is
under load.
Say Y here if you are building a kernel for a desktop, embedded config OOM_REBOOT
or real-time system. Say N if you are unsure. bool "Enable reboot at out of memory"
source "kernel/Kconfig.preempt"
source mm/Kconfig source mm/Kconfig
@ -130,24 +131,124 @@ config SVINTO_SIM
help help
Support the xsim ETRAX Simulator. Support the xsim ETRAX Simulator.
config ETRAXFS
bool "ETRAX-FS-V32"
help
Support CRIS V32.
config CRIS_MACH_ARTPEC3
bool "ARTPEC-3"
help
Support Axis ARTPEC-3.
endchoice endchoice
config ETRAX_VCS_SIM
bool "VCS Simulator"
help
Setup hardware to be run in the VCS simulator.
config ETRAX_ARCH_V10 config ETRAX_ARCH_V10
bool bool
default y if ETRAX100LX || ETRAX100LX_V2 default y if ETRAX100LX || ETRAX100LX_V2
default n if !(ETRAX100LX || ETRAX100LX_V2) default n if !(ETRAX100LX || ETRAX100LX_V2)
config ETRAX_ARCH_V32
bool
default y if (ETRAXFS || CRIS_MACH_ARTPEC3)
default n if !(ETRAXFS || CRIS_MACH_ARTPEC3)
config ETRAX_DRAM_SIZE config ETRAX_DRAM_SIZE
int "DRAM size (dec, in MB)" int "DRAM size (dec, in MB)"
default "8" default "8"
help help
Size of DRAM (decimal in MB) typically 2, 8 or 16. Size of DRAM (decimal in MB) typically 2, 8 or 16.
config ETRAX_VMEM_SIZE
int "Video memory size (dec, in MB)"
depends on ETRAX_ARCH_V32 && !ETRAXFS
default 8 if !ETRAXFS
help
Size of Video accessible memory (decimal, in MB).
config ETRAX_FLASH_BUSWIDTH config ETRAX_FLASH_BUSWIDTH
int "Buswidth of flash in bytes" int "Buswidth of NOR flash in bytes"
default "2" default "2"
help help
Width in bytes of the Flash bus (1, 2 or 4). Is usually 2. Width in bytes of the NOR Flash bus (1, 2 or 4). Is usually 2.
config ETRAX_NANDFLASH_BUSWIDTH
int "Buswidth of NAND flash in bytes"
default "1"
help
Width in bytes of the NAND flash (1 or 2).
config ETRAX_FLASH1_SIZE
int "FLASH1 size (dec, in MB. 0 = Unknown)"
default "0"
choice
prompt "Product debug-port"
default ETRAX_DEBUG_PORT0
config ETRAX_DEBUG_PORT0
bool "Serial-0"
help
Choose a serial port for the ETRAX debug console. Default to
port 0.
config ETRAX_DEBUG_PORT1
bool "Serial-1"
help
Use serial port 1 for the console.
config ETRAX_DEBUG_PORT2
bool "Serial-2"
help
Use serial port 2 for the console.
config ETRAX_DEBUG_PORT3
bool "Serial-3"
help
Use serial port 3 for the console.
config ETRAX_DEBUG_PORT_NULL
bool "disabled"
help
Disable serial-port debugging.
endchoice
choice
prompt "Kernel GDB port"
depends on ETRAX_KGDB
default ETRAX_KGDB_PORT0
help
Choose a serial port for kernel debugging. NOTE: This port should
not be enabled under Drivers for built-in interfaces (as it has its
own initialization code) and should not be the same as the debug port.
config ETRAX_KGDB_PORT0
bool "Serial-0"
help
Use serial port 0 for kernel debugging.
config ETRAX_KGDB_PORT1
bool "Serial-1"
help
Use serial port 1 for kernel debugging.
config ETRAX_KGDB_PORT2
bool "Serial-2"
help
Use serial port 2 for kernel debugging.
config ETRAX_KGDB_PORT3
bool "Serial-3"
help
Use serial port 3 for kernel debugging.
endchoice
source arch/cris/arch-v10/Kconfig source arch/cris/arch-v10/Kconfig
source arch/cris/arch-v32/Kconfig source arch/cris/arch-v32/Kconfig
@ -161,6 +262,329 @@ menu "Drivers for built-in interfaces"
source arch/cris/arch-v10/drivers/Kconfig source arch/cris/arch-v10/drivers/Kconfig
source arch/cris/arch-v32/drivers/Kconfig source arch/cris/arch-v32/drivers/Kconfig
choice
prompt "RTC chip"
depends on ETRAX_RTC
default ETRAX_PCF8563 if ETRAX_ARCH_V32
default ETRAX_DS1302 if ETRAX_ARCH_V10
config ETRAX_DS1302
depends on ETRAX_ARCH_V10
bool "DS1302"
help
Enables the driver for the DS1302 Real-Time Clock battery-backed
chip on some products.
config ETRAX_PCF8563
bool "PCF8563"
help
Enables the driver for the PCF8563 Real-Time Clock battery-backed
chip on some products.
endchoice
choice
prompt "Network LED behavior"
depends on ETRAX_ETHERNET
default ETRAX_NETWORK_LED_ON_WHEN_ACTIVITY
config ETRAX_NETWORK_LED_ON_WHEN_LINK
bool "LED_on_when_link"
help
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_ACTIVITY
bool "LED_on_when_activity"
help
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.
endchoice
choice
prompt "Ser0 DMA out channel"
depends on ETRAX_SERIAL_PORT0
default ETRAX_SERIAL_PORT0_DMA6_OUT if ETRAX_ARCH_V32
default ETRAX_SERIAL_PORT0_NO_DMA_OUT if ETRAX_ARCH_V10
config ETRAX_SERIAL_PORT0_NO_DMA_OUT
bool "Ser0 uses no DMA for output"
help
Do not use DMA for ser0 output.
config ETRAX_SERIAL_PORT0_DMA6_OUT
bool "Ser0 uses DMA6 for output"
depends on ETRAXFS
help
Enables the DMA6 output channel for ser0 (ttyS0).
If you do not enable DMA, an interrupt for each character will be
used when transmitting data.
Normally you want to use DMA, unless you use the DMA channel for
something else.
config ETRAX_SERIAL_PORT0_DMA0_OUT
bool "Ser0 uses DMA0 for output"
depends on CRIS_MACH_ARTPEC3
help
Enables the DMA0 output channel for ser0 (ttyS0).
If you do not enable DMA, an interrupt for each character will be
used when transmitting data.
Normally you want to use DMA, unless you use the DMA channel for
something else.
endchoice
choice
prompt "Ser0 DMA in channel "
depends on ETRAX_SERIAL_PORT0
default ETRAX_SERIAL_PORT0_NO_DMA_IN if ETRAX_ARCH_V32
default ETRAX_SERIAL_PORT0_DMA7_IN if ETRAX_ARCH_V10
help
What DMA channel to use for ser0.
config ETRAX_SERIAL_PORT0_NO_DMA_IN
bool "Ser0 uses no DMA for input"
help
Do not use DMA for ser0 input.
config ETRAX_SERIAL_PORT0_DMA7_IN
bool "Ser0 uses DMA7 for input"
depends on ETRAXFS
help
Enables the DMA7 input channel for ser0 (ttyS0).
If you do not enable DMA, an interrupt for each character will be
used when receiving data.
Normally you want to use DMA, unless you use the DMA channel for
something else.
config ETRAX_SERIAL_PORT0_DMA1_IN
bool "Ser0 uses DMA1 for input"
depends on CRIS_MACH_ARTPEC3
help
Enables the DMA1 input channel for ser0 (ttyS0).
If you do not enable DMA, an interrupt for each character will be
used when receiveing data.
Normally you want to use DMA, unless you use the DMA channel for
something else.
endchoice
choice
prompt "Ser1 DMA in channel "
depends on ETRAX_SERIAL_PORT1
default ETRAX_SERIAL_PORT1_NO_DMA_IN if ETRAX_ARCH_V32
default ETRAX_SERIAL_PORT1_DMA9_IN if ETRAX_ARCH_V10
help
What DMA channel to use for ser1.
config ETRAX_SERIAL_PORT1_NO_DMA_IN
bool "Ser1 uses no DMA for input"
help
Do not use DMA for ser1 input.
config ETRAX_SERIAL_PORT1_DMA5_IN
bool "Ser1 uses DMA5 for input"
depends on ETRAX_ARCH_V32
help
Enables the DMA5 input channel for ser1 (ttyS1).
If you do not enable DMA, an interrupt for each character will be
used when receiving data.
Normally you want this on, unless you use the DMA channel for
something else.
config ETRAX_SERIAL_PORT1_DMA9_IN
depends on ETRAX_ARCH_V10
bool "Ser1 uses DMA9 for input"
endchoice
choice
prompt "Ser1 DMA out channel"
depends on ETRAX_SERIAL_PORT1
default ETRAX_SERIAL_PORT1_NO_DMA_OUT if ETRAX_ARCH_V32
default ETRAX_SERIAL_PORT1_DMA8_OUT if ETRAX_ARCH_V10
help
What DMA channel to use for ser1.
config ETRAX_SERIAL_PORT1_NO_DMA_OUT
bool "Ser1 uses no DMA for output"
help
Do not use DMA for ser1 output.
config ETRAX_SERIAL_PORT1_DMA8_OUT
depends on ETRAX_ARCH_V10
bool "Ser1 uses DMA8 for output"
config ETRAX_SERIAL_PORT1_DMA4_OUT
depends on ETRAX_ARCH_V32
bool "Ser1 uses DMA4 for output"
help
Enables the DMA4 output channel for ser1 (ttyS1).
If you do not enable DMA, an interrupt for each character will be
used when transmitting data.
Normally you want this on, unless you use the DMA channel for
something else.
endchoice
choice
prompt "Ser2 DMA out channel"
depends on ETRAX_SERIAL_PORT2
default ETRAX_SERIAL_PORT2_NO_DMA_OUT if ETRAX_ARCH_V32
default ETRAX_SERIAL_PORT2_DMA2_OUT if ETRAX_ARCH_V10
config ETRAX_SERIAL_PORT2_NO_DMA_OUT
bool "Ser2 uses no DMA for output"
help
Do not use DMA for ser2 output.
config ETRAX_SERIAL_PORT2_DMA2_OUT
bool "Ser2 uses DMA2 for output"
depends on ETRAXFS || ETRAX_ARCH_V10
help
Enables the DMA2 output channel for ser2 (ttyS2).
If you do not enable DMA, an interrupt for each character will be
used when transmitting data.
Normally you want to use DMA, unless you use the DMA channel for
something else.
config ETRAX_SERIAL_PORT2_DMA6_OUT
bool "Ser2 uses DMA6 for output"
depends on CRIS_MACH_ARTPEC3
help
Enables the DMA6 output channel for ser2 (ttyS2).
If you do not enable DMA, an interrupt for each character will be
used when transmitting data.
Normally you want to use DMA, unless you use the DMA channel for
something else.
endchoice
choice
prompt "Ser2 DMA in channel"
depends on ETRAX_SERIAL_PORT2
default ETRAX_SERIAL_PORT2_NO_DMA_IN if ETRAX_ARCH_V32
default ETRAX_SERIAL_PORT2_DMA3_IN if ETRAX_ARCH_V10
help
What DMA channel to use for ser2.
config ETRAX_SERIAL_PORT2_NO_DMA_IN
bool "Ser2 uses no DMA for input"
help
Do not use DMA for ser2 input.
config ETRAX_SERIAL_PORT2_DMA3_IN
bool "Ser2 uses DMA3 for input"
depends on ETRAXFS || ETRAX_ARCH_V10
help
Enables the DMA3 input channel for ser2 (ttyS2).
If you do not enable DMA, an interrupt for each character will be
used when receiving data.
Normally you want to use DMA, unless you use the DMA channel for
something else.
config ETRAX_SERIAL_PORT2_DMA7_IN
bool "Ser2 uses DMA7 for input"
depends on CRIS_MACH_ARTPEC3
help
Enables the DMA7 input channel for ser2 (ttyS2).
If you do not enable DMA, an interrupt for each character will be
used when receiveing data.
Normally you want to use DMA, unless you use the DMA channel for
something else.
endchoice
choice
prompt "Ser3 DMA in channel"
depends on ETRAX_SERIAL_PORT3
default ETRAX_SERIAL_PORT3_NO_DMA_IN if ETRAX_ARCH_V32
default ETRAX_SERIAL_PORT3_DMA5_IN if ETRAX_ARCH_V10
help
What DMA channel to use for ser3.
config ETRAX_SERIAL_PORT3_NO_DMA_IN
bool "Ser3 uses no DMA for input"
help
Do not use DMA for ser3 input.
config ETRAX_SERIAL_PORT3_DMA5_IN
depends on ETRAX_ARCH_V10
bool "DMA 5"
config ETRAX_SERIAL_PORT3_DMA9_IN
bool "Ser3 uses DMA9 for input"
depends on ETRAXFS
help
Enables the DMA9 input channel for ser3 (ttyS3).
If you do not enable DMA, an interrupt for each character will be
used when receiving data.
Normally you want to use DMA, unless you use the DMA channel for
something else.
config ETRAX_SERIAL_PORT3_DMA3_IN
bool "Ser3 uses DMA3 for input"
depends on CRIS_MACH_ARTPEC3
help
Enables the DMA3 input channel for ser3 (ttyS3).
If you do not enable DMA, an interrupt for each character will be
used when receiveing data.
Normally you want to use DMA, unless you use the DMA channel for
something else.
endchoice
choice
prompt "Ser3 DMA out channel"
depends on ETRAX_SERIAL_PORT3
default ETRAX_SERIAL_PORT3_NO_DMA_OUT if ETRAX_ARCH_V32
default ETRAX_SERIAL_PORT3_DMA4_OUT if ETRAX_ARCH_V10
config ETRAX_SERIAL_PORT3_NO_DMA_OUT
bool "Ser3 uses no DMA for output"
help
Do not use DMA for ser3 output.
config ETRAX_SERIAL_PORT3_DMA4_OUT
depends on ETRAX_ARCH_V10
bool "DMA 4"
config ETRAX_SERIAL_PORT3_DMA8_OUT
bool "Ser3 uses DMA8 for output"
depends on ETRAXFS
help
Enables the DMA8 output channel for ser3 (ttyS3).
If you do not enable DMA, an interrupt for each character will be
used when transmitting data.
Normally you want to use DMA, unless you use the DMA channel for
something else.
config ETRAX_SERIAL_PORT3_DMA2_OUT
bool "Ser3 uses DMA2 for output"
depends on CRIS_MACH_ARTPEC3
help
Enables the DMA2 output channel for ser3 (ttyS3).
If you do not enable DMA, an interrupt for each character will be
used when transmitting data.
Normally you want to use DMA, unless you use the DMA channel for
something else.
endchoice
endmenu endmenu
source "drivers/base/Kconfig" source "drivers/base/Kconfig"
@ -174,22 +598,10 @@ source "drivers/pnp/Kconfig"
source "drivers/block/Kconfig" source "drivers/block/Kconfig"
source "drivers/md/Kconfig"
source "drivers/ide/Kconfig" source "drivers/ide/Kconfig"
source "drivers/scsi/Kconfig"
source "drivers/ieee1394/Kconfig"
source "drivers/message/i2o/Kconfig"
source "drivers/net/Kconfig" source "drivers/net/Kconfig"
source "drivers/isdn/Kconfig"
source "drivers/telephony/Kconfig"
source "drivers/i2c/Kconfig" source "drivers/i2c/Kconfig"
source "drivers/rtc/Kconfig" source "drivers/rtc/Kconfig"
@ -201,17 +613,8 @@ source "drivers/input/Kconfig"
source "drivers/char/Kconfig" source "drivers/char/Kconfig"
#source drivers/misc/Config.in
source "drivers/media/Kconfig"
source "fs/Kconfig" source "fs/Kconfig"
source "sound/Kconfig"
source "drivers/pcmcia/Kconfig"
source "drivers/pci/Kconfig"
source "drivers/usb/Kconfig" source "drivers/usb/Kconfig"
source "arch/cris/Kconfig.debug" source "arch/cris/Kconfig.debug"

View File

@ -1,5 +1,7 @@
if ETRAX_ARCH_V10 if ETRAX_ARCH_V10
menu "CRIS v10 options"
# ETRAX 100LX v1 has a MMU "feature" requiring a low mapping # ETRAX 100LX v1 has a MMU "feature" requiring a low mapping
config CRIS_LOW_MAP config CRIS_LOW_MAP
bool bool
@ -228,69 +230,6 @@ config ETRAX_LED12R
For products with only one or two controllable LEDs, For products with only one or two controllable LEDs,
set this to same as CONFIG_ETRAX_LED1G (normally 2). set this to same as CONFIG_ETRAX_LED1G (normally 2).
choice
prompt "Product debug-port"
depends on ETRAX_ARCH_V10
default ETRAX_DEBUG_PORT0
config ETRAX_DEBUG_PORT0
bool "Serial-0"
help
Choose a serial port for the ETRAX debug console. Default to
port 0.
config ETRAX_DEBUG_PORT1
bool "Serial-1"
help
Use serial port 1 for the console.
config ETRAX_DEBUG_PORT2
bool "Serial-2"
help
Use serial port 2 for the console.
config ETRAX_DEBUG_PORT3
bool "Serial-3"
help
Use serial port 3 for the console.
config ETRAX_DEBUG_PORT_NULL
bool "disabled"
help
Disable serial-port debugging.
endchoice
choice
prompt "Kernel GDB port"
depends on ETRAX_KGDB
default ETRAX_KGDB_PORT0
help
Choose a serial port for kernel debugging. NOTE: This port should
not be enabled under Drivers for built-in interfaces (as it has its
own initialization code) and should not be the same as the debug port.
config ETRAX_KGDB_PORT0
bool "Serial-0"
help
Use serial port 0 for kernel debugging.
config ETRAX_KGDB_PORT1
bool "Serial-1"
help
Use serial port 1 for kernel debugging.
config ETRAX_KGDB_PORT2
bool "Serial-2"
help
Use serial port 2 for kernel debugging.
config ETRAX_KGDB_PORT3
bool "Serial-3"
help
Use serial port 3 for kernel debugging.
endchoice
choice choice
prompt "Product rescue-port" prompt "Product rescue-port"
@ -454,4 +393,6 @@ config ETRAX_POWERBUTTON_BIT
help help
Configure where power button is connected. Configure where power button is connected.
endmenu
endif endif

View File

@ -9,37 +9,6 @@ config ETRAX_ETHERNET
This option enables the ETRAX 100LX built-in 10/100Mbit Ethernet This option enables the ETRAX 100LX built-in 10/100Mbit Ethernet
controller. controller.
choice
prompt "Network LED behavior"
depends on ETRAX_ETHERNET
default ETRAX_NETWORK_LED_ON_WHEN_ACTIVITY
config ETRAX_NETWORK_LED_ON_WHEN_LINK
bool "LED_on_when_link"
help
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_ACTIVITY
bool "LED_on_when_activity"
help
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.
endchoice
config ETRAX_SERIAL config ETRAX_SERIAL
bool "Serial-port support" bool "Serial-port support"
depends on ETRAX_ARCH_V10 depends on ETRAX_ARCH_V10
@ -83,32 +52,6 @@ config ETRAX_SERIAL_PORT0
Normally you want this on, unless you use external DMA 1 that uses Normally you want this on, unless you use external DMA 1 that uses
the same DMA channels. the same DMA channels.
choice
prompt "Ser0 DMA out assignment"
depends on ETRAX_SERIAL_PORT0
default ETRAX_SERIAL_PORT0_DMA6_OUT
config ETRAX_SERIAL_PORT0_NO_DMA_OUT
bool "No DMA out"
config ETRAX_SERIAL_PORT0_DMA6_OUT
bool "DMA 6"
endchoice
choice
prompt "Ser0 DMA in assignment"
depends on ETRAX_SERIAL_PORT0
default ETRAX_SERIAL_PORT0_DMA7_IN
config ETRAX_SERIAL_PORT0_NO_DMA_IN
bool "No DMA in"
config ETRAX_SERIAL_PORT0_DMA7_IN
bool "DMA 7"
endchoice
choice choice
prompt "Ser0 DTR, RI, DSR and CD assignment" prompt "Ser0 DTR, RI, DSR and CD assignment"
depends on ETRAX_SERIAL_PORT0 depends on ETRAX_SERIAL_PORT0
@ -197,32 +140,6 @@ config ETRAX_SERIAL_PORT1
help help
Enables the ETRAX 100 serial driver for ser1 (ttyS1). Enables the ETRAX 100 serial driver for ser1 (ttyS1).
choice
prompt "Ser1 DMA out assignment"
depends on ETRAX_SERIAL_PORT1
default ETRAX_SERIAL_PORT1_DMA8_OUT
config ETRAX_SERIAL_PORT1_NO_DMA_OUT
bool "No DMA out"
config ETRAX_SERIAL_PORT1_DMA8_OUT
bool "DMA 8"
endchoice
choice
prompt "Ser1 DMA in assignment"
depends on ETRAX_SERIAL_PORT1
default ETRAX_SERIAL_PORT1_DMA9_IN
config ETRAX_SERIAL_PORT1_NO_DMA_IN
bool "No DMA in"
config ETRAX_SERIAL_PORT1_DMA9_IN
bool "DMA 9"
endchoice
choice choice
prompt "Ser1 DTR, RI, DSR and CD assignment" prompt "Ser1 DTR, RI, DSR and CD assignment"
depends on ETRAX_SERIAL_PORT1 depends on ETRAX_SERIAL_PORT1
@ -314,32 +231,6 @@ config ETRAX_SERIAL_PORT2
help help
Enables the ETRAX 100 serial driver for ser2 (ttyS2). Enables the ETRAX 100 serial driver for ser2 (ttyS2).
choice
prompt "Ser2 DMA out assignment"
depends on ETRAX_SERIAL_PORT2
default ETRAX_SERIAL_PORT2_DMA2_OUT
config ETRAX_SERIAL_PORT2_NO_DMA_OUT
bool "No DMA out"
config ETRAX_SERIAL_PORT2_DMA2_OUT
bool "DMA 2"
endchoice
choice
prompt "Ser2 DMA in assignment"
depends on ETRAX_SERIAL_PORT2
default ETRAX_SERIAL_PORT2_DMA3_IN
config ETRAX_SERIAL_PORT2_NO_DMA_IN
bool "No DMA in"
config ETRAX_SERIAL_PORT2_DMA3_IN
bool "DMA 3"
endchoice
choice choice
prompt "Ser2 DTR, RI, DSR and CD assignment" prompt "Ser2 DTR, RI, DSR and CD assignment"
depends on ETRAX_SERIAL_PORT2 depends on ETRAX_SERIAL_PORT2
@ -428,32 +319,6 @@ config ETRAX_SERIAL_PORT3
help help
Enables the ETRAX 100 serial driver for ser3 (ttyS3). Enables the ETRAX 100 serial driver for ser3 (ttyS3).
choice
prompt "Ser3 DMA out assignment"
depends on ETRAX_SERIAL_PORT3
default ETRAX_SERIAL_PORT3_DMA4_OUT
config ETRAX_SERIAL_PORT3_NO_DMA_OUT
bool "No DMA out"
config ETRAX_SERIAL_PORT3_DMA4_OUT
bool "DMA 4"
endchoice
choice
prompt "Ser3 DMA in assignment"
depends on ETRAX_SERIAL_PORT3
default ETRAX_SERIAL_PORT3_DMA5_IN
config ETRAX_SERIAL_PORT3_NO_DMA_IN
bool "No DMA in"
config ETRAX_SERIAL_PORT3_DMA5_IN
bool "DMA 5"
endchoice
choice choice
prompt "Ser3 DTR, RI, DSR and CD assignment" prompt "Ser3 DTR, RI, DSR and CD assignment"
depends on ETRAX_SERIAL_PORT3 depends on ETRAX_SERIAL_PORT3
@ -743,25 +608,6 @@ config ETRAX_RTC
normal time reading should be done using libc function time and normal time reading should be done using libc function time and
friends. friends.
choice
prompt "RTC chip"
depends on ETRAX_RTC
default ETRAX_DS1302
config ETRAX_DS1302
bool "DS1302"
help
Enables the driver for the DS1302 Real-Time Clock battery-backed
chip on some products.
config ETRAX_PCF8563
bool "PCF8563"
help
Enables the driver for the PCF8563 Real-Time Clock battery-backed
chip on some products.
endchoice
config ETRAX_DS1302_RST_ON_GENERIC_PORT config ETRAX_DS1302_RST_ON_GENERIC_PORT
bool "DS1302 RST on Generic Port" bool "DS1302 RST on Generic Port"
depends on ETRAX_DS1302 depends on ETRAX_DS1302

View File

@ -1,27 +1,73 @@
if ETRAX_ARCH_V32 if ETRAX_ARCH_V32
source arch/cris/arch-v32/mach-fs/Kconfig
source arch/cris/arch-v32/mach-a3/Kconfig
source drivers/cpufreq/Kconfig
config ETRAX_DRAM_VIRTUAL_BASE config ETRAX_DRAM_VIRTUAL_BASE
hex hex
depends on ETRAX_ARCH_V32 depends on ETRAX_ARCH_V32
default "c0000000" default "c0000000"
config ETRAX_LED1G choice
string "First green LED bit" prompt "Nbr of Ethernet LED groups"
depends on ETRAX_ARCH_V32 depends on ETRAX_ARCH_V32
default ETRAX_NBR_LED_GRP_ONE
help
Select how many Ethernet LED groups that can be used. Usually one per Ethernet
interface is a good choice.
config ETRAX_NBR_LED_GRP_ZERO
bool "Use zero LED groups"
help
Select this if you do not want any Ethernet LEDs.
config ETRAX_NBR_LED_GRP_ONE
bool "Use one LED group"
help
Select this if you want one Ethernet LED group. This LED group
can be used for one or more Ethernet interfaces. However, it is
recomended that each Ethernet interface use a dedicated LED group.
config ETRAX_NBR_LED_GRP_TWO
bool "Use two LED groups"
help
Select this if you want two Ethernet LED groups. This is the
best choice if you have more than one Ethernet interface and
would like to have separate LEDs for the interfaces.
endchoice
config ETRAX_LED_G_NET0
string "Ethernet LED group 0 green LED bit"
depends on ETRAX_ARCH_V32 && (ETRAX_NBR_LED_GRP_ONE || ETRAX_NBR_LED_GRP_TWO)
default "PA3" default "PA3"
help help
Bit to use for the first green LED (network LED). Bit to use for the green LED in Ethernet LED group 0.
Most Axis products use bit A3 here.
config ETRAX_LED1R config ETRAX_LED_R_NET0
string "First red LED bit" string "Ethernet LED group 0 red LED bit"
depends on ETRAX_ARCH_V32 depends on ETRAX_ARCH_V32 && (ETRAX_NBR_LED_GRP_ONE || ETRAX_NBR_LED_GRP_TWO)
default "PA4" default "PA4"
help help
Bit to use for the first red LED (network LED). Bit to use for the red LED in Ethernet LED group 0.
Most Axis products use bit A4 here.
config ETRAX_LED2G config ETRAX_LED_G_NET1
string "Ethernet group 1 green LED bit"
depends on ETRAX_ARCH_V32 && ETRAX_NBR_LED_GRP_TWO
default ""
help
Bit to use for the green LED in Ethernet LED group 1.
config ETRAX_LED_R_NET1
string "Ethernet group 1 red LED bit"
depends on ETRAX_ARCH_V32 && ETRAX_NBR_LED_GRP_TWO
default ""
help
Bit to use for the red LED in Ethernet LED group 1.
config ETRAX_V32_LED2G
string "Second green LED bit" string "Second green LED bit"
depends on ETRAX_ARCH_V32 depends on ETRAX_ARCH_V32
default "PA5" default "PA5"
@ -29,7 +75,7 @@ config ETRAX_LED2G
Bit to use for the first green LED (status LED). Bit to use for the first green LED (status LED).
Most Axis products use bit A5 here. Most Axis products use bit A5 here.
config ETRAX_LED2R config ETRAX_V32_LED2R
string "Second red LED bit" string "Second red LED bit"
depends on ETRAX_ARCH_V32 depends on ETRAX_ARCH_V32
default "PA6" default "PA6"
@ -37,7 +83,7 @@ config ETRAX_LED2R
Bit to use for the first red LED (network LED). Bit to use for the first red LED (network LED).
Most Axis products use bit A6 here. Most Axis products use bit A6 here.
config ETRAX_LED3G config ETRAX_V32_LED3G
string "Third green LED bit" string "Third green LED bit"
depends on ETRAX_ARCH_V32 depends on ETRAX_ARCH_V32
default "PA7" default "PA7"
@ -45,7 +91,7 @@ config ETRAX_LED3G
Bit to use for the first green LED (drive/power LED). Bit to use for the first green LED (drive/power LED).
Most Axis products use bit A7 here. Most Axis products use bit A7 here.
config ETRAX_LED3R config ETRAX_V32_LED3R
string "Third red LED bit" string "Third red LED bit"
depends on ETRAX_ARCH_V32 depends on ETRAX_ARCH_V32
default "PA7" default "PA7"
@ -53,39 +99,6 @@ config ETRAX_LED3R
Bit to use for the first red LED (drive/power LED). Bit to use for the first red LED (drive/power LED).
Most Axis products use bit A7 here. Most Axis products use bit A7 here.
choice
prompt "Product debug-port"
depends on ETRAX_ARCH_V32
default ETRAX_DEBUG_PORT0
config ETRAX_DEBUG_PORT0
bool "Serial-0"
help
Choose a serial port for the ETRAX debug console. Default to
port 0.
config ETRAX_DEBUG_PORT1
bool "Serial-1"
help
Use serial port 1 for the console.
config ETRAX_DEBUG_PORT2
bool "Serial-2"
help
Use serial port 2 for the console.
config ETRAX_DEBUG_PORT3
bool "Serial-3"
help
Use serial port 3 for the console.
config ETRAX_DEBUG_PORT_NULL
bool "disabled"
help
Disable serial-port debugging.
endchoice
choice choice
prompt "Kernel GDB port" prompt "Kernel GDB port"
depends on ETRAX_KGDB depends on ETRAX_KGDB
@ -95,25 +108,11 @@ choice
not be enabled under Drivers for built-in interfaces (as it has its not be enabled under Drivers for built-in interfaces (as it has its
own initialization code) and should not be the same as the debug port. own initialization code) and should not be the same as the debug port.
config ETRAX_KGDB_PORT0 config ETRAX_KGDB_PORT4
bool "Serial-0" bool "Serial-4"
depends on ETRAX_SERIAL_PORTS = 5
help help
Use serial port 0 for kernel debugging. Use serial port 4 for kernel debugging.
config ETRAX_KGDB_PORT1
bool "Serial-1"
help
Use serial port 1 for kernel debugging.
config ETRAX_KGDB_PORT2
bool "Serial-2"
help
Use serial port 2 for kernel debugging.
config ETRAX_KGDB_PORT3
bool "Serial-3"
help
Use serial port 3 for kernel debugging.
endchoice endchoice

View File

@ -4,64 +4,102 @@ config ETRAX_ETHERNET
bool "Ethernet support" bool "Ethernet support"
depends on ETRAX_ARCH_V32 depends on ETRAX_ARCH_V32
select NET_ETHERNET select NET_ETHERNET
select MII
help help
This option enables the ETRAX FS built-in 10/100Mbit Ethernet This option enables the ETRAX FS built-in 10/100Mbit Ethernet
controller. controller.
config ETRAX_ETHERNET_HW_CSUM config ETRAX_NO_PHY
bool "Hardware accelerated ethernet checksum and scatter/gather" bool "PHY not present"
depends on ETRAX_ETHERNET depends on ETRAX_ETHERNET
depends on ETRAX_STREAMCOPROC default N
default y
help help
Hardware acceleration of checksumming and scatter/gather This option disables all MDIO communication with an ethernet
transceiver connected to the MII interface. This option shall
typically be enabled if the MII interface is connected to a
switch. This option should normally be disabled. If enabled,
speed and duplex will be locked to 100 Mbit and full duplex.
config ETRAX_ETHERNET_IFACE0 config ETRAX_ETHERNET_IFACE0
depends on ETRAX_ETHERNET depends on ETRAX_ETHERNET
bool "Enable network interface 0" bool "Enable network interface 0"
config ETRAX_ETHERNET_IFACE1 config ETRAX_ETHERNET_IFACE1
depends on ETRAX_ETHERNET depends on (ETRAX_ETHERNET && ETRAXFS)
bool "Enable network interface 1 (uses DMA6 and DMA7)" bool "Enable network interface 1 (uses DMA6 and DMA7)"
config ETRAX_ETHERNET_GBIT
depends on (ETRAX_ETHERNET && CRIS_MACH_ARTPEC3)
bool "Enable gigabit Ethernet support"
choice choice
prompt "Network LED behavior" prompt "Eth0 led group"
depends on ETRAX_ETHERNET depends on ETRAX_ETHERNET_IFACE0
default ETRAX_NETWORK_LED_ON_WHEN_ACTIVITY default ETRAX_ETH0_USE_LEDGRP0
config ETRAX_NETWORK_LED_ON_WHEN_LINK config ETRAX_ETH0_USE_LEDGRP0
bool "LED_on_when_link" bool "Use LED grp 0"
depends on ETRAX_NBR_LED_GRP_ONE || ETRAX_NBR_LED_GRP_TWO
help help
Selecting LED_on_when_link will light the LED when there is a Use LED grp 0 for eth0
connection and will flash off when there is activity.
Selecting LED_on_when_activity will light the LED only when config ETRAX_ETH0_USE_LEDGRP1
there is activity. bool "Use LED grp 1"
depends on ETRAX_NBR_LED_GRP_TWO
This setting will also affect the behaviour of other activity LEDs
e.g. Bluetooth.
config ETRAX_NETWORK_LED_ON_WHEN_ACTIVITY
bool "LED_on_when_activity"
help help
Selecting LED_on_when_link will light the LED when there is a Use LED grp 1 for eth0
connection and will flash off when there is activity.
Selecting LED_on_when_activity will light the LED only when config ETRAX_ETH0_USE_LEDGRPNULL
there is activity. bool "Use no LEDs for eth0"
help
Use no LEDs for eth0
endchoice
This setting will also affect the behaviour of other activity LEDs choice
e.g. Bluetooth. prompt "Eth1 led group"
depends on ETRAX_ETHERNET_IFACE1
default ETRAX_ETH1_USE_LEDGRP1
config ETRAX_ETH1_USE_LEDGRP0
bool "Use LED grp 0"
depends on ETRAX_NBR_LED_GRP_ONE || ETRAX_NBR_LED_GRP_TWO
help
Use LED grp 0 for eth1
config ETRAX_ETH1_USE_LEDGRP1
bool "Use LED grp 1"
depends on ETRAX_NBR_LED_GRP_TWO
help
Use LED grp 1 for eth1
config ETRAX_ETH1_USE_LEDGRPNULL
bool "Use no LEDs for eth1"
help
Use no LEDs for eth1
endchoice endchoice
config ETRAXFS_SERIAL config ETRAXFS_SERIAL
bool "Serial-port support" bool "Serial-port support"
depends on ETRAX_ARCH_V32 depends on ETRAX_ARCH_V32
select SERIAL_CORE
select SERIAL_CORE_CONSOLE
help help
Enables the ETRAX FS serial driver for ser0 (ttyS0) Enables the ETRAX FS serial driver for ser0 (ttyS0)
You probably want this enabled. You probably want this enabled.
config ETRAX_RS485
bool "RS-485 support"
depends on ETRAXFS_SERIAL
help
Enables support for RS-485 serial communication.
config ETRAX_RS485_DISABLE_RECEIVER
bool "Disable serial receiver"
depends on ETRAX_RS485
help
It is necessary to disable the serial receiver to avoid serial
loopback. Not all products are able to do this in software only.
config ETRAX_SERIAL_PORT0 config ETRAX_SERIAL_PORT0
bool "Serial port 0 enabled" bool "Serial port 0 enabled"
depends on ETRAXFS_SERIAL depends on ETRAXFS_SERIAL
@ -72,50 +110,28 @@ config ETRAX_SERIAL_PORT0
ser0 can use dma4 or dma6 for output and dma5 or dma7 for input. ser0 can use dma4 or dma6 for output and dma5 or dma7 for input.
choice choice
prompt "Ser0 DMA in channel " prompt "Ser0 default port type "
depends on ETRAX_SERIAL_PORT0 depends on ETRAX_SERIAL_PORT0
default ETRAX_SERIAL_PORT0_NO_DMA_IN default ETRAX_SERIAL_PORT0_TYPE_232
help help
What DMA channel to use for ser0. Type of serial port.
config ETRAX_SERIAL_PORT0_TYPE_232
config ETRAX_SERIAL_PORT0_NO_DMA_IN bool "Ser0 is a RS-232 port"
bool "Ser0 uses no DMA for input"
help help
Do not use DMA for ser0 input. Configure serial port 0 to be a RS-232 port.
config ETRAX_SERIAL_PORT0_DMA7_IN config ETRAX_SERIAL_PORT0_TYPE_485HD
bool "Ser0 uses DMA7 for input" bool "Ser0 is a half duplex RS-485 port"
depends on ETRAX_SERIAL_PORT0 depends on ETRAX_RS485
help help
Enables the DMA7 input channel for ser0 (ttyS0). Configure serial port 0 to be a half duplex (two wires) RS-485 port.
If you do not enable DMA, an interrupt for each character will be
used when receiving data.
Normally you want to use DMA, unless you use the DMA channel for
something else.
endchoice config ETRAX_SERIAL_PORT0_TYPE_485FD
bool "Ser0 is a full duplex RS-485 port"
choice depends on ETRAX_RS485
prompt "Ser0 DMA out channel"
depends on ETRAX_SERIAL_PORT0
default ETRAX_SERIAL_PORT0_NO_DMA_OUT
config ETRAX_SERIAL_PORT0_NO_DMA_OUT
bool "Ser0 uses no DMA for output"
help help
Do not use DMA for ser0 output. Configure serial port 0 to be a full duplex (four wires) RS-485 port.
config ETRAX_SERIAL_PORT0_DMA6_OUT
bool "Ser0 uses DMA6 for output"
depends on ETRAX_SERIAL_PORT0
help
Enables the DMA6 output channel for ser0 (ttyS0).
If you do not enable DMA, an interrupt for each character will be
used when transmitting data.
Normally you want to use DMA, unless you use the DMA channel for
something else.
endchoice endchoice
config ETRAX_SER0_DTR_BIT config ETRAX_SER0_DTR_BIT
@ -141,52 +157,28 @@ config ETRAX_SERIAL_PORT1
Enables the ETRAX FS serial driver for ser1 (ttyS1). Enables the ETRAX FS serial driver for ser1 (ttyS1).
choice choice
prompt "Ser1 DMA in channel " prompt "Ser1 default port type"
depends on ETRAX_SERIAL_PORT1 depends on ETRAX_SERIAL_PORT1
default ETRAX_SERIAL_PORT1_NO_DMA_IN default ETRAX_SERIAL_PORT1_TYPE_232
help help
What DMA channel to use for ser1. Type of serial port.
config ETRAX_SERIAL_PORT1_TYPE_232
config ETRAX_SERIAL_PORT1_NO_DMA_IN bool "Ser1 is a RS-232 port"
bool "Ser1 uses no DMA for input"
help help
Do not use DMA for ser1 input. Configure serial port 1 to be a RS-232 port.
config ETRAX_SERIAL_PORT1_DMA5_IN config ETRAX_SERIAL_PORT1_TYPE_485HD
bool "Ser1 uses DMA5 for input" bool "Ser1 is a half duplex RS-485 port"
depends on ETRAX_SERIAL_PORT1 depends on ETRAX_RS485
help help
Enables the DMA5 input channel for ser1 (ttyS1). Configure serial port 1 to be a half duplex (two wires) RS-485 port.
If you do not enable DMA, an interrupt for each character will be
used when receiving data.
Normally you want this on, unless you use the DMA channel for
something else.
endchoice config ETRAX_SERIAL_PORT1_TYPE_485FD
bool "Ser1 is a full duplex RS-485 port"
choice depends on ETRAX_RS485
prompt "Ser1 DMA out channel "
depends on ETRAX_SERIAL_PORT1
default ETRAX_SERIAL_PORT1_NO_DMA_OUT
help help
What DMA channel to use for ser1. Configure serial port 1 to be a full duplex (four wires) RS-485 port.
config ETRAX_SERIAL_PORT1_NO_DMA_OUT
bool "Ser1 uses no DMA for output"
help
Do not use DMA for ser1 output.
config ETRAX_SERIAL_PORT1_DMA4_OUT
bool "Ser1 uses DMA4 for output"
depends on ETRAX_SERIAL_PORT1
help
Enables the DMA4 output channel for ser1 (ttyS1).
If you do not enable DMA, an interrupt for each character will be
used when transmitting data.
Normally you want this on, unless you use the DMA channel for
something else.
endchoice endchoice
config ETRAX_SER1_DTR_BIT config ETRAX_SER1_DTR_BIT
@ -212,51 +204,30 @@ config ETRAX_SERIAL_PORT2
Enables the ETRAX FS serial driver for ser2 (ttyS2). Enables the ETRAX FS serial driver for ser2 (ttyS2).
choice choice
prompt "Ser2 DMA in channel " prompt "Ser2 default port type"
depends on ETRAX_SERIAL_PORT2 depends on ETRAX_SERIAL_PORT2
default ETRAX_SERIAL_PORT2_NO_DMA_IN default ETRAX_SERIAL_PORT2_TYPE_232
help help
What DMA channel to use for ser2. What DMA channel to use for ser2
config ETRAX_SERIAL_PORT2_TYPE_232
config ETRAX_SERIAL_PORT2_NO_DMA_IN bool "Ser2 is a RS-232 port"
bool "Ser2 uses no DMA for input"
help help
Do not use DMA for ser2 input. Configure serial port 2 to be a RS-232 port.
config ETRAX_SERIAL_PORT2_DMA3_IN config ETRAX_SERIAL_PORT2_TYPE_485HD
bool "Ser2 uses DMA3 for input" bool "Ser2 is a half duplex RS-485 port"
depends on ETRAX_SERIAL_PORT2 depends on ETRAX_RS485
help help
Enables the DMA3 input channel for ser2 (ttyS2). Configure serial port 2 to be a half duplex (two wires) RS-485 port.
If you do not enable DMA, an interrupt for each character will be
used when receiving data.
Normally you want to use DMA, unless you use the DMA channel for
something else.
config ETRAX_SERIAL_PORT2_TYPE_485FD
bool "Ser2 is a full duplex RS-485 port"
depends on ETRAX_RS485
help
Configure serial port 2 to be a full duplex (four wires) RS-485 port.
endchoice endchoice
choice
prompt "Ser2 DMA out channel"
depends on ETRAX_SERIAL_PORT2
default ETRAX_SERIAL_PORT2_NO_DMA_OUT
config ETRAX_SERIAL_PORT2_NO_DMA_OUT
bool "Ser2 uses no DMA for output"
help
Do not use DMA for ser2 output.
config ETRAX_SERIAL_PORT2_DMA2_OUT
bool "Ser2 uses DMA2 for output"
depends on ETRAX_SERIAL_PORT2
help
Enables the DMA2 output channel for ser2 (ttyS2).
If you do not enable DMA, an interrupt for each character will be
used when transmitting data.
Normally you want to use DMA, unless you use the DMA channel for
something else.
endchoice
config ETRAX_SER2_DTR_BIT config ETRAX_SER2_DTR_BIT
string "Ser 2 DTR bit (empty = not used)" string "Ser 2 DTR bit (empty = not used)"
@ -281,50 +252,28 @@ config ETRAX_SERIAL_PORT3
Enables the ETRAX FS serial driver for ser3 (ttyS3). Enables the ETRAX FS serial driver for ser3 (ttyS3).
choice choice
prompt "Ser3 DMA in channel " prompt "Ser3 default port type"
depends on ETRAX_SERIAL_PORT3 depends on ETRAX_SERIAL_PORT3
default ETRAX_SERIAL_PORT3_NO_DMA_IN default ETRAX_SERIAL_PORT3_TYPE_232
help help
What DMA channel to use for ser3. What DMA channel to use for ser3.
config ETRAX_SERIAL_PORT3_TYPE_232
config ETRAX_SERIAL_PORT3_NO_DMA_IN bool "Ser3 is a RS-232 port"
bool "Ser3 uses no DMA for input"
help help
Do not use DMA for ser3 input. Configure serial port 3 to be a RS-232 port.
config ETRAX_SERIAL_PORT3_DMA9_IN config ETRAX_SERIAL_PORT3_TYPE_485HD
bool "Ser3 uses DMA9 for input" bool "Ser3 is a half duplex RS-485 port"
depends on ETRAX_SERIAL_PORT3 depends on ETRAX_RS485
help help
Enables the DMA9 input channel for ser3 (ttyS3). Configure serial port 3 to be a half duplex (two wires) RS-485 port.
If you do not enable DMA, an interrupt for each character will be
used when receiving data.
Normally you want to use DMA, unless you use the DMA channel for
something else.
endchoice config ETRAX_SERIAL_PORT3_TYPE_485FD
bool "Ser3 is a full duplex RS-485 port"
choice depends on ETRAX_RS485
prompt "Ser3 DMA out channel"
depends on ETRAX_SERIAL_PORT3
default ETRAX_SERIAL_PORT3_NO_DMA_OUT
config ETRAX_SERIAL_PORT3_NO_DMA_OUT
bool "Ser3 uses no DMA for output"
help help
Do not use DMA for ser3 output. Configure serial port 3 to be a full duplex (four wires) RS-485 port.
config ETRAX_SERIAL_PORT3_DMA8_OUT
bool "Ser3 uses DMA8 for output"
depends on ETRAX_SERIAL_PORT3
help
Enables the DMA8 output channel for ser3 (ttyS3).
If you do not enable DMA, an interrupt for each character will be
used when transmitting data.
Normally you want to use DMA, unless you use the DMA channel for
something else.
endchoice endchoice
config ETRAX_SER3_DTR_BIT config ETRAX_SER3_DTR_BIT
@ -343,9 +292,81 @@ config ETRAX_SER3_CD_BIT
string "Ser 3 CD bit (empty = not used)" string "Ser 3 CD bit (empty = not used)"
depends on ETRAX_SERIAL_PORT3 depends on ETRAX_SERIAL_PORT3
config ETRAX_SERIAL_PORT4
bool "Serial port 4 enabled"
depends on ETRAXFS_SERIAL && CRIS_MACH_ARTPEC3
help
Enables the ETRAX FS serial driver for ser4 (ttyS4).
choice
prompt "Ser4 default port type"
depends on ETRAX_SERIAL_PORT4
default ETRAX_SERIAL_PORT4_TYPE_232
help
What DMA channel to use for ser4.
config ETRAX_SERIAL_PORT4_TYPE_232
bool "Ser4 is a RS-232 port"
help
Configure serial port 4 to be a RS-232 port.
config ETRAX_SERIAL_PORT4_TYPE_485HD
bool "Ser4 is a half duplex RS-485 port"
depends on ETRAX_RS485
help
Configure serial port 4 to be a half duplex (two wires) RS-485 port.
config ETRAX_SERIAL_PORT4_TYPE_485FD
bool "Ser4 is a full duplex RS-485 port"
depends on ETRAX_RS485
help
Configure serial port 4 to be a full duplex (four wires) RS-485 port.
endchoice
choice
prompt "Ser4 DMA in channel "
depends on ETRAX_SERIAL_PORT4
default ETRAX_SERIAL_PORT4_NO_DMA_IN
help
What DMA channel to use for ser4.
config ETRAX_SERIAL_PORT4_NO_DMA_IN
bool "Ser4 uses no DMA for input"
help
Do not use DMA for ser4 input.
config ETRAX_SERIAL_PORT4_DMA9_IN
bool "Ser4 uses DMA9 for input"
depends on ETRAX_SERIAL_PORT4
help
Enables the DMA9 input channel for ser4 (ttyS4).
If you do not enable DMA, an interrupt for each character will be
used when receiveing data.
Normally you want to use DMA, unless you use the DMA channel for
something else.
endchoice
config ETRAX_SER4_DTR_BIT
string "Ser 4 DTR bit (empty = not used)"
depends on ETRAX_SERIAL_PORT4
config ETRAX_SER4_RI_BIT
string "Ser 4 RI bit (empty = not used)"
depends on ETRAX_SERIAL_PORT4
config ETRAX_SER4_DSR_BIT
string "Ser 4 DSR bit (empty = not used)"
depends on ETRAX_SERIAL_PORT4
config ETRAX_SER3_CD_BIT
string "Ser 4 CD bit (empty = not used)"
depends on ETRAX_SERIAL_PORT4
config ETRAX_RS485 config ETRAX_RS485
bool "RS-485 support" bool "RS-485 support"
depends on ETRAX_SERIAL depends on ETRAXFS_SERIAL
help help
Enables support for RS-485 serial communication. For a primer on Enables support for RS-485 serial communication. For a primer on
RS-485, see <http://www.hw.cz/english/docs/rs485/rs485.html>. RS-485, see <http://www.hw.cz/english/docs/rs485/rs485.html>.
@ -356,7 +377,6 @@ config ETRAX_RS485_DISABLE_RECEIVER
help help
It is necessary to disable the serial receiver to avoid serial It is necessary to disable the serial receiver to avoid serial
loopback. Not all products are able to do this in software only. loopback. Not all products are able to do this in software only.
Axis 2400/2401 must disable receiver.
config ETRAX_AXISFLASHMAP config ETRAX_AXISFLASHMAP
bool "Axis flash-map support" bool "Axis flash-map support"
@ -364,6 +384,7 @@ config ETRAX_AXISFLASHMAP
select MTD select MTD
select MTD_CFI select MTD_CFI
select MTD_CFI_AMDSTD select MTD_CFI_AMDSTD
select MTD_JEDECPROBE
select MTD_CHAR select MTD_CHAR
select MTD_BLOCK select MTD_BLOCK
select MTD_PARTITIONS select MTD_PARTITIONS
@ -394,7 +415,7 @@ config ETRAX_SYNCHRONOUS_SERIAL0_DMA
config ETRAX_SYNCHRONOUS_SERIAL_PORT1 config ETRAX_SYNCHRONOUS_SERIAL_PORT1
bool "Synchronous serial port 1 enabled" bool "Synchronous serial port 1 enabled"
depends on ETRAX_SYNCHRONOUS_SERIAL depends on ETRAX_SYNCHRONOUS_SERIAL && ETRAXFS
help help
Enabled synchronous serial port 1. Enabled synchronous serial port 1.
@ -405,6 +426,31 @@ config ETRAX_SYNCHRONOUS_SERIAL1_DMA
A synchronous serial port can run in manual or DMA mode. A synchronous serial port can run in manual or DMA mode.
Selecting this option will make it run in DMA mode. Selecting this option will make it run in DMA mode.
config ETRAX_AXISFLASHMAP
bool "Axis flash-map support"
depends on ETRAX_ARCH_V32
select MTD
select MTD_CFI
select MTD_CFI_AMDSTD
select MTD_JEDECPROBE
select MTD_CHAR
select MTD_BLOCK
select MTD_PARTITIONS
select MTD_CONCAT
select MTD_COMPLEX_MAPPINGS
help
This option enables MTD mapping of flash devices. Needed to use
flash memories. If unsure, say Y.
config ETRAX_AXISFLASHMAP_MTD0WHOLE
bool "MTD0 is whole boot flash device"
depends on ETRAX_AXISFLASHMAP
default N
help
When this option is not set, mtd0 refers to the first partition
on the boot flash device. When set, mtd0 refers to the whole
device, with mtd1 referring to the first partition etc.
config ETRAX_PTABLE_SECTOR config ETRAX_PTABLE_SECTOR
int "Byte-offset of partition table sector" int "Byte-offset of partition table sector"
depends on ETRAX_AXISFLASHMAP depends on ETRAX_AXISFLASHMAP
@ -425,19 +471,27 @@ config ETRAX_NANDFLASH
This option enables MTD mapping of NAND flash devices. Needed to use This option enables MTD mapping of NAND flash devices. Needed to use
NAND flash memories. If unsure, say Y. NAND flash memories. If unsure, say Y.
config ETRAX_NANDBOOT
bool "Boot from NAND flash"
depends on ETRAX_NANDFLASH
help
This options enables booting from NAND flash devices.
Say Y if your boot code, kernel and root file system is in
NAND flash. Say N if they are in NOR flash.
config ETRAX_I2C config ETRAX_I2C
bool "I2C driver" bool "I2C driver"
depends on ETRAX_ARCH_V32 depends on ETRAX_ARCH_V32
help help
This option enabled the I2C driver used by e.g. the RTC driver. This option enables the I2C driver used by e.g. the RTC driver.
config ETRAX_I2C_DATA_PORT config ETRAX_V32_I2C_DATA_PORT
string "I2C data pin" string "I2C data pin"
depends on ETRAX_I2C depends on ETRAX_I2C
help help
The pin to use for I2C data. The pin to use for I2C data.
config ETRAX_I2C_CLK_PORT config ETRAX_V32_I2C_CLK_PORT
string "I2C clock pin" string "I2C clock pin"
depends on ETRAX_I2C depends on ETRAX_I2C
help help
@ -445,22 +499,10 @@ config ETRAX_I2C_CLK_PORT
config ETRAX_RTC config ETRAX_RTC
bool "Real Time Clock support" bool "Real Time Clock support"
depends on ETRAX_ARCH_V32 depends on ETRAX_ARCH_V32 && ETRAX_I2C
help help
Enabled RTC support. Enabled RTC support.
choice
prompt "RTC chip"
depends on ETRAX_RTC
default ETRAX_PCF8563
config ETRAX_PCF8563
bool "PCF8563"
help
Philips PCF8563 RTC
endchoice
config ETRAX_GPIO config ETRAX_GPIO
bool "GPIO support" bool "GPIO support"
depends on ETRAX_ARCH_V32 depends on ETRAX_ARCH_V32
@ -476,33 +518,36 @@ config ETRAX_GPIO
Remember that you need to setup the port directions appropriately in Remember that you need to setup the port directions appropriately in
the General configuration. the General configuration.
config ETRAX_PA_BUTTON_BITMASK config ETRAX_VIRTUAL_GPIO
hex "PA-buttons bitmask" bool "Virtual GPIO support"
depends on ETRAX_GPIO depends on ETRAX_GPIO
default "0x02"
help help
This is a bitmask (8 bits) with information about what bits on PA Enables the virtual Etrax general port device (major 120, minor 6).
that are used for buttons. It uses an I/O expander for the I2C-bus.
Most products has a so called TEST button on PA1, if that is true
use 0x02 here. config ETRAX_VIRTUAL_GPIO_INTERRUPT_PA_PIN
Use 00 if there are no buttons on PA. int "Virtual GPIO interrupt pin on PA pin"
If the bitmask is <> 00 a button driver will be included in the gpio range 0 7
driver. ETRAX general I/O support must be enabled. depends on ETRAX_VIRTUAL_GPIO
help
The pin to use on PA for virtual gpio interrupt.
config ETRAX_PA_CHANGEABLE_DIR config ETRAX_PA_CHANGEABLE_DIR
hex "PA user changeable dir mask" hex "PA user changeable dir mask"
depends on ETRAX_GPIO depends on ETRAX_GPIO
default "0x00" default "0x00" if ETRAXFS
default "0x00000000" if !ETRAXFS
help help
This is a bitmask (8 bits) with information of what bits in PA that a This is a bitmask (8 bits) with information of what bits in PA that a
user can change direction on using ioctl's. user can change direction on using ioctl's.
Bit set = changeable. Bit set = changeable.
You probably want 0x00 here, but it depends on your hardware. You probably want 0 here, but it depends on your hardware.
config ETRAX_PA_CHANGEABLE_BITS config ETRAX_PA_CHANGEABLE_BITS
hex "PA user changeable bits mask" hex "PA user changeable bits mask"
depends on ETRAX_GPIO depends on ETRAX_GPIO
default "0x00" default "0x00" if ETRAXFS
default "0x00000000" if !ETRAXFS
help help
This is a bitmask (8 bits) with information of what bits in PA This is a bitmask (8 bits) with information of what bits in PA
that a user can change the value on using ioctl's. that a user can change the value on using ioctl's.
@ -511,17 +556,19 @@ config ETRAX_PA_CHANGEABLE_BITS
config ETRAX_PB_CHANGEABLE_DIR config ETRAX_PB_CHANGEABLE_DIR
hex "PB user changeable dir mask" hex "PB user changeable dir mask"
depends on ETRAX_GPIO depends on ETRAX_GPIO
default "0x00000" default "0x00000" if ETRAXFS
default "0x00000000" if !ETRAXFS
help help
This is a bitmask (18 bits) with information of what bits in PB This is a bitmask (18 bits) with information of what bits in PB
that a user can change direction on using ioctl's. that a user can change direction on using ioctl's.
Bit set = changeable. Bit set = changeable.
You probably want 0x00000 here, but it depends on your hardware. You probably want 0 here, but it depends on your hardware.
config ETRAX_PB_CHANGEABLE_BITS config ETRAX_PB_CHANGEABLE_BITS
hex "PB user changeable bits mask" hex "PB user changeable bits mask"
depends on ETRAX_GPIO depends on ETRAX_GPIO
default "0x00000" default "0x00000" if ETRAXFS
default "0x00000000" if !ETRAXFS
help help
This is a bitmask (18 bits) with information of what bits in PB This is a bitmask (18 bits) with information of what bits in PB
that a user can change the value on using ioctl's. that a user can change the value on using ioctl's.
@ -530,17 +577,19 @@ config ETRAX_PB_CHANGEABLE_BITS
config ETRAX_PC_CHANGEABLE_DIR config ETRAX_PC_CHANGEABLE_DIR
hex "PC user changeable dir mask" hex "PC user changeable dir mask"
depends on ETRAX_GPIO depends on ETRAX_GPIO
default "0x00000" default "0x00000" if ETRAXFS
default "0x00000000" if !ETRAXFS
help help
This is a bitmask (18 bits) with information of what bits in PC This is a bitmask (18 bits) with information of what bits in PC
that a user can change direction on using ioctl's. that a user can change direction on using ioctl's.
Bit set = changeable. Bit set = changeable.
You probably want 0x00000 here, but it depends on your hardware. You probably want 0 here, but it depends on your hardware.
config ETRAX_PC_CHANGEABLE_BITS config ETRAX_PC_CHANGEABLE_BITS
hex "PC user changeable bits mask" hex "PC user changeable bits mask"
depends on ETRAX_GPIO depends on ETRAX_GPIO
default "0x00000" default "0x00000" if ETRAXFS
default "0x00000000" if ETRAXFS
help help
This is a bitmask (18 bits) with information of what bits in PC This is a bitmask (18 bits) with information of what bits in PC
that a user can change the value on using ioctl's. that a user can change the value on using ioctl's.
@ -548,7 +597,7 @@ config ETRAX_PC_CHANGEABLE_BITS
config ETRAX_PD_CHANGEABLE_DIR config ETRAX_PD_CHANGEABLE_DIR
hex "PD user changeable dir mask" hex "PD user changeable dir mask"
depends on ETRAX_GPIO depends on ETRAX_GPIO && ETRAXFS
default "0x00000" default "0x00000"
help help
This is a bitmask (18 bits) with information of what bits in PD This is a bitmask (18 bits) with information of what bits in PD
@ -558,7 +607,7 @@ config ETRAX_PD_CHANGEABLE_DIR
config ETRAX_PD_CHANGEABLE_BITS config ETRAX_PD_CHANGEABLE_BITS
hex "PD user changeable bits mask" hex "PD user changeable bits mask"
depends on ETRAX_GPIO depends on ETRAX_GPIO && ETRAXFS
default "0x00000" default "0x00000"
help help
This is a bitmask (18 bits) with information of what bits in PD This is a bitmask (18 bits) with information of what bits in PD
@ -567,7 +616,7 @@ config ETRAX_PD_CHANGEABLE_BITS
config ETRAX_PE_CHANGEABLE_DIR config ETRAX_PE_CHANGEABLE_DIR
hex "PE user changeable dir mask" hex "PE user changeable dir mask"
depends on ETRAX_GPIO depends on ETRAX_GPIO && ETRAXFS
default "0x00000" default "0x00000"
help help
This is a bitmask (18 bits) with information of what bits in PE This is a bitmask (18 bits) with information of what bits in PE
@ -577,20 +626,36 @@ config ETRAX_PE_CHANGEABLE_DIR
config ETRAX_PE_CHANGEABLE_BITS config ETRAX_PE_CHANGEABLE_BITS
hex "PE user changeable bits mask" hex "PE user changeable bits mask"
depends on ETRAX_GPIO depends on ETRAX_GPIO && ETRAXFS
default "0x00000" default "0x00000"
help help
This is a bitmask (18 bits) with information of what bits in PE This is a bitmask (18 bits) with information of what bits in PE
that a user can change the value on using ioctl's. that a user can change the value on using ioctl's.
Bit set = changeable. Bit set = changeable.
config ETRAX_PV_CHANGEABLE_DIR
hex "PV user changeable dir mask"
depends on ETRAX_VIRTUAL_GPIO
default "0x0000"
help
This is a bitmask (16 bits) with information of what bits in PV
that a user can change direction on using ioctl's.
Bit set = changeable.
You probably want 0x0000 here, but it depends on your hardware.
config ETRAX_PV_CHANGEABLE_BITS
hex "PV user changeable bits mask"
depends on ETRAX_VIRTUAL_GPIO
default "0x0000"
help
This is a bitmask (16 bits) with information of what bits in PV
that a user can change the value on using ioctl's.
Bit set = changeable.
config ETRAX_CARDBUS config ETRAX_CARDBUS
bool "Cardbus support" bool "Cardbus support"
depends on ETRAX_ARCH_V32 depends on ETRAX_ARCH_V32
select PCCARD
select CARDBUS
select HOTPLUG select HOTPLUG
select PCCARD_NONSTATIC
help help
Enabled the ETRAX Cardbus driver. Enabled the ETRAX Cardbus driver.
@ -613,4 +678,202 @@ config ETRAX_STREAMCOPROC
This option enables a driver for the stream co-processor This option enables a driver for the stream co-processor
for cryptographic operations. for cryptographic operations.
source drivers/mmc/Kconfig
config ETRAX_MMC_IOP
tristate "MMC/SD host driver using IO-processor"
depends on ETRAX_ARCH_V32 && MMC
help
This option enables the SD/MMC host controller interface.
The host controller is implemented using the built in
IO-Processor. Only the SPU is used in this implementation.
config ETRAX_SPI_MMC
# Make this one of several "choices" (possible simultaneously but
# suggested uniquely) when an IOP driver emerges for "real" MMC/SD
# protocol support.
tristate
depends on !ETRAX_MMC_IOP
default MMC
select SPI
select MMC_SPI
select ETRAX_SPI_MMC_BOARD
# For the parts that can't be a module (due to restrictions in
# framework elsewhere).
config ETRAX_SPI_MMC_BOARD
boolean
default n
# While the board info is MMC_SPI only, the drivers are written to be
# independent of MMC_SPI, so we'll keep SPI non-dependent on the
# MMC_SPI config choices (well, except for a single depends-on-line
# for the board-info file until a separate non-MMC SPI board file
# emerges).
# FIXME: When that happens, we'll need to be able to ask for and
# configure non-MMC SPI ports together with MMC_SPI ports (if multiple
# SPI ports are enabled).
config SPI_ETRAX_SSER
tristate
depends on SPI_MASTER && ETRAX_ARCH_V32 && EXPERIMENTAL
select SPI_BITBANG
help
This enables using an synchronous serial (sser) port as a
SPI master controller on Axis ETRAX FS and later. The
driver can be configured to use any sser port.
config SPI_ETRAX_GPIO
tristate
depends on SPI_MASTER && ETRAX_ARCH_V32 && EXPERIMENTAL
select SPI_BITBANG
help
This enables using GPIO pins port as a SPI master controller
on Axis ETRAX FS and later. The driver can be configured to
use any GPIO pins.
config ETRAX_SPI_SSER0
tristate "SPI using synchronous serial port 0 (sser0)"
depends on ETRAX_SPI_MMC
default m if MMC_SPI=m
default y if MMC_SPI=y
default y if MMC_SPI=n
select SPI_ETRAX_SSER
help
Say Y for an MMC/SD socket connected to synchronous serial port 0,
or for devices using the SPI protocol on that port. Say m if you
want to build it as a module, which will be named spi_crisv32_sser.
(You need to select MMC separately.)
config ETRAX_SPI_SSER0_DMA
bool "DMA for SPI on sser0 enabled"
depends on ETRAX_SPI_SSER0
depends on !ETRAX_SERIAL_PORT1_DMA4_OUT && !ETRAX_SERIAL_PORT1_DMA5_IN
default y
help
Say Y if using DMA (dma4/dma5) for SPI on synchronous serial port 0.
config ETRAX_SPI_MMC_CD_SSER0_PIN
string "MMC/SD card detect pin for SPI on sser0"
depends on ETRAX_SPI_SSER0 && MMC_SPI
default "pd11"
help
The pin to use for SD/MMC card detect. This pin should be pulled up
and grounded when a card is present. If defined as " " (space), no
pin is selected. A card must then always be inserted for proper
action.
config ETRAX_SPI_MMC_WP_SSER0_PIN
string "MMC/SD card write-protect pin for SPI on sser0"
depends on ETRAX_SPI_SSER0 && MMC_SPI
default "pd10"
help
The pin to use for the SD/MMC write-protect signal for a memory
card. If defined as " " (space), the card is considered writable.
config ETRAX_SPI_SSER1
tristate "SPI using synchronous serial port 1 (sser1)"
depends on ETRAX_SPI_MMC
default m if MMC_SPI=m && ETRAX_SPI_SSER0=n
default y if MMC_SPI=y && ETRAX_SPI_SSER0=n
default y if MMC_SPI=n && ETRAX_SPI_SSER0=n
select SPI_ETRAX_SSER
help
Say Y for an MMC/SD socket connected to synchronous serial port 1,
or for devices using the SPI protocol on that port. Say m if you
want to build it as a module, which will be named spi_crisv32_sser.
(You need to select MMC separately.)
config ETRAX_SPI_SSER1_DMA
bool "DMA for SPI on sser1 enabled"
depends on ETRAX_SPI_SSER1 && !ETRAX_ETHERNET_IFACE1
depends on !ETRAX_SERIAL_PORT0_DMA6_OUT && !ETRAX_SERIAL_PORT0_DMA7_IN
default y
help
Say Y if using DMA (dma6/dma7) for SPI on synchronous serial port 1.
config ETRAX_SPI_MMC_CD_SSER1_PIN
string "MMC/SD card detect pin for SPI on sser1"
depends on ETRAX_SPI_SSER1 && MMC_SPI
default "pd12"
help
The pin to use for SD/MMC card detect. This pin should be pulled up
and grounded when a card is present. If defined as " " (space), no
pin is selected. A card must then always be inserted for proper
action.
config ETRAX_SPI_MMC_WP_SSER1_PIN
string "MMC/SD card write-protect pin for SPI on sser1"
depends on ETRAX_SPI_SSER1 && MMC_SPI
default "pd9"
help
The pin to use for the SD/MMC write-protect signal for a memory
card. If defined as " " (space), the card is considered writable.
config ETRAX_SPI_GPIO
tristate "Bitbanged SPI using gpio pins"
depends on ETRAX_SPI_MMC
select SPI_ETRAX_GPIO
default m if MMC_SPI=m && ETRAX_SPI_SSER0=n && ETRAX_SPI_SSER1=n
default y if MMC_SPI=y && ETRAX_SPI_SSER0=n && ETRAX_SPI_SSER1=n
default y if MMC_SPI=n && ETRAX_SPI_SSER0=n && ETRAX_SPI_SSER1=n
help
Say Y for an MMC/SD socket connected to general I/O pins (but not
a complete synchronous serial ports), or for devices using the SPI
protocol on general I/O pins. Slow and slows down the system.
Say m to build it as a module, which will be called spi_crisv32_gpio.
(You need to select MMC separately.)
# The default match that of sser0, only because that's how it was tested.
config ETRAX_SPI_CS_PIN
string "SPI chip select pin"
depends on ETRAX_SPI_GPIO
default "pc3"
help
The pin to use for SPI chip select.
config ETRAX_SPI_CLK_PIN
string "SPI clock pin"
depends on ETRAX_SPI_GPIO
default "pc1"
help
The pin to use for the SPI clock.
config ETRAX_SPI_DATAIN_PIN
string "SPI MISO (data in) pin"
depends on ETRAX_SPI_GPIO
default "pc16"
help
The pin to use for SPI data in from the device.
config ETRAX_SPI_DATAOUT_PIN
string "SPI MOSI (data out) pin"
depends on ETRAX_SPI_GPIO
default "pc0"
help
The pin to use for SPI data out to the device.
config ETRAX_SPI_MMC_CD_GPIO_PIN
string "MMC/SD card detect pin for SPI using gpio (space for none)"
depends on ETRAX_SPI_GPIO && MMC_SPI
default "pd11"
help
The pin to use for SD/MMC card detect. This pin should be pulled up
and grounded when a card is present. If defined as " " (space), no
pin is selected. A card must then always be inserted for proper
action.
config ETRAX_SPI_MMC_WP_GPIO_PIN
string "MMC/SD card write-protect pin for SPI using gpio (space for none)"
depends on ETRAX_SPI_GPIO && MMC_SPI
default "pd10"
help
The pin to use for the SD/MMC write-protect signal for a memory
card. If defined as " " (space), the card is considered writable.
# Avoid choices causing non-working configs by conditionalizing the inclusion.
if ETRAX_SPI_MMC
source drivers/spi/Kconfig
endif
endif endif