aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/Kconfig.debug5
-rw-r--r--arch/cris/Makefile66
-rw-r--r--arch/cris/arch-v10/Kconfig31
-rw-r--r--arch/cris/arch-v10/boot/Makefile9
-rw-r--r--arch/cris/arch-v10/boot/compressed/Makefile43
-rw-r--r--arch/cris/arch-v10/boot/rescue/Makefile45
-rw-r--r--arch/cris/arch-v10/drivers/Kconfig250
-rw-r--r--arch/cris/defconfig376
-rw-r--r--arch/cris/kernel/Makefile3
9 files changed, 515 insertions, 313 deletions
diff --git a/arch/cris/Kconfig.debug b/arch/cris/Kconfig.debug
index f42918bf22a9..cd72324935c4 100644
--- a/arch/cris/Kconfig.debug
+++ b/arch/cris/Kconfig.debug
@@ -38,4 +38,9 @@ config FRAME_POINTER
38 If you don't debug the kernel, you can say N, but we may not be able 38 If you don't debug the kernel, you can say N, but we may not be able
39 to solve problems without frame pointers. 39 to solve problems without frame pointers.
40 40
41config DEBUG_NMI_OOPS
42 bool "NMI causes oops printout"
43 help
44 If the system locks up without any debug information you can say Y
45 here to make it possible to dump an OOPS with an external NMI.
41endmenu 46endmenu
diff --git a/arch/cris/Makefile b/arch/cris/Makefile
index 9d28fa8563cc..90ca8730b120 100644
--- a/arch/cris/Makefile
+++ b/arch/cris/Makefile
@@ -1,4 +1,4 @@
1# $Id: Makefile,v 1.23 2004/10/19 13:07:34 starvik Exp $ 1# $Id: Makefile,v 1.28 2005/03/17 10:44:37 larsv Exp $
2# cris/Makefile 2# cris/Makefile
3# 3#
4# This file is included by the global makefile so that you can add your own 4# This file is included by the global makefile so that you can add your own
@@ -15,6 +15,7 @@
15 15
16arch-y := v10 16arch-y := v10
17arch-$(CONFIG_ETRAX_ARCH_V10) := v10 17arch-$(CONFIG_ETRAX_ARCH_V10) := v10
18arch-$(CONFIG_ETRAX_ARCH_V32) := v32
18 19
19# No config avaiable for make clean etc 20# No config avaiable for make clean etc
20ifneq ($(arch-y),) 21ifneq ($(arch-y),)
@@ -46,6 +47,21 @@ core-y += arch/$(ARCH)/$(SARCH)/kernel/ arch/$(ARCH)/$(SARCH)/mm/
46drivers-y += arch/$(ARCH)/$(SARCH)/drivers/ 47drivers-y += arch/$(ARCH)/$(SARCH)/drivers/
47libs-y += arch/$(ARCH)/$(SARCH)/lib/ $(LIBGCC) 48libs-y += arch/$(ARCH)/$(SARCH)/lib/ $(LIBGCC)
48 49
50# cris source path
51SRC_ARCH = $(srctree)/arch/$(ARCH)
52# cris object files path
53OBJ_ARCH = $(objtree)/arch/$(ARCH)
54
55target_boot_arch_dir = $(OBJ_ARCH)/$(SARCH)/boot
56target_boot_dir = $(OBJ_ARCH)/boot
57src_boot_dir = $(SRC_ARCH)/boot
58target_compressed_dir = $(OBJ_ARCH)/boot/compressed
59src_compressed_dir = $(SRC_ARCH)/boot/compressed
60target_rescue_dir = $(OBJ_ARCH)/boot/rescue
61src_rescue_dir = $(SRC_ARCH)/boot/rescue
62
63export target_boot_arch_dir target_boot_dir src_boot_dir target_compressed_dir src_compressed_dir target_rescue_dir src_rescue_dir
64
49vmlinux.bin: vmlinux 65vmlinux.bin: vmlinux
50 $(OBJCOPY) $(OBJCOPYFLAGS) vmlinux vmlinux.bin 66 $(OBJCOPY) $(OBJCOPYFLAGS) vmlinux vmlinux.bin
51 67
@@ -65,44 +81,52 @@ cramfs:
65 81
66clinux: vmlinux.bin decompress.bin rescue.bin 82clinux: vmlinux.bin decompress.bin rescue.bin
67 83
68decompress.bin: FORCE 84decompress.bin: $(target_boot_dir)
69 @make -C arch/$(ARCH)/boot/compressed decompress.bin 85 @$(MAKE) -f $(src_compressed_dir)/Makefile $(target_compressed_dir)/decompress.bin
70 86
71rescue.bin: FORCE 87$(target_rescue_dir)/rescue.bin: $(target_boot_dir)
72 @make -C arch/$(ARCH)/boot/rescue rescue.bin 88 @$(MAKE) -f $(src_rescue_dir)/Makefile $(target_rescue_dir)/rescue.bin
73 89
74zImage: vmlinux.bin rescue.bin 90zImage: $(target_boot_dir) vmlinux.bin $(target_rescue_dir)/rescue.bin
75## zImage - Compressed kernel (gzip) 91## zImage - Compressed kernel (gzip)
76 @make -C arch/$(ARCH)/boot/ zImage 92 @$(MAKE) -f $(src_boot_dir)/Makefile zImage
93
94$(target_boot_dir): $(target_boot_arch_dir)
95 ln -sfn $< $@
96
97$(target_boot_arch_dir):
98 mkdir -p $@
77 99
78compressed: zImage 100compressed: zImage
79 101
80archmrproper: 102archmrproper:
81archclean: 103archclean:
82 $(Q)$(MAKE) $(clean)=arch/$(ARCH)/boot 104 @if [ -d arch/$(ARCH)/boot ]; then \
105 $(MAKE) $(clean)=arch/$(ARCH)/boot ; \
106 fi
83 rm -f timage vmlinux.bin decompress.bin rescue.bin cramfs.img 107 rm -f timage vmlinux.bin decompress.bin rescue.bin cramfs.img
84 rm -rf $(LD_SCRIPT).tmp 108 rm -rf $(LD_SCRIPT).tmp
85 109
86prepare: arch/$(ARCH)/.links include/asm-$(ARCH)/.arch \ 110prepare: $(SRC_ARCH)/.links $(srctree)/include/asm-$(ARCH)/.arch \
87 include/asm-$(ARCH)/$(SARCH)/offset.h 111 include/asm-$(ARCH)/$(SARCH)/offset.h
88 112
89# Create some links to make all tools happy 113# Create some links to make all tools happy
90arch/$(ARCH)/.links: 114$(SRC_ARCH)/.links:
91 @rm -rf arch/$(ARCH)/drivers 115 @rm -rf $(SRC_ARCH)/drivers
92 @ln -sfn $(SARCH)/drivers arch/$(ARCH)/drivers 116 @ln -sfn $(SRC_ARCH)/$(SARCH)/drivers $(SRC_ARCH)/drivers
93 @rm -rf arch/$(ARCH)/boot 117 @rm -rf $(SRC_ARCH)/boot
94 @ln -sfn $(SARCH)/boot arch/$(ARCH)/boot 118 @ln -sfn $(SRC_ARCH)/$(SARCH)/boot $(SRC_ARCH)/boot
95 @rm -rf arch/$(ARCH)/lib 119 @rm -rf $(SRC_ARCH)/lib
96 @ln -sfn $(SARCH)/lib arch/$(ARCH)/lib 120 @ln -sfn $(SRC_ARCH)/$(SARCH)/lib $(SRC_ARCH)/lib
97 @ln -sfn $(SARCH) arch/$(ARCH)/arch 121 @ln -sfn $(SRC_ARCH)/$(SARCH) $(SRC_ARCH)/arch
98 @ln -sfn ../$(SARCH)/vmlinux.lds.S arch/$(ARCH)/kernel/vmlinux.lds.S 122 @ln -sfn $(SRC_ARCH)/$(SARCH)/vmlinux.lds.S $(SRC_ARCH)/kernel/vmlinux.lds.S
99 @touch $@ 123 @touch $@
100 124
101# Create link to sub arch includes 125# Create link to sub arch includes
102include/asm-$(ARCH)/.arch: $(wildcard include/config/arch/*.h) 126$(srctree)/include/asm-$(ARCH)/.arch: $(wildcard include/config/arch/*.h)
103 @echo ' Making asm-$(ARCH)/arch -> asm-$(ARCH)/$(SARCH) symlink' 127 @echo ' Making $(srctree)/include/asm-$(ARCH)/arch -> $(srctree)/include/asm-$(ARCH)/$(SARCH) symlink'
104 @rm -f include/asm-$(ARCH)/arch 128 @rm -f include/asm-$(ARCH)/arch
105 @ln -sf $(SARCH) include/asm-$(ARCH)/arch 129 @ln -sf $(srctree)/include/asm-$(ARCH)/$(SARCH) $(srctree)/include/asm-$(ARCH)/arch
106 @touch $@ 130 @touch $@
107 131
108arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \ 132arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
diff --git a/arch/cris/arch-v10/Kconfig b/arch/cris/arch-v10/Kconfig
index 2ca64cc40c63..44eb1b9accb3 100644
--- a/arch/cris/arch-v10/Kconfig
+++ b/arch/cris/arch-v10/Kconfig
@@ -260,6 +260,37 @@ config ETRAX_DEBUG_PORT_NULL
260endchoice 260endchoice
261 261
262choice 262choice
263 prompt "Kernel GDB port"
264 depends on ETRAX_KGDB
265 default ETRAX_KGDB_PORT0
266 help
267 Choose a serial port for kernel debugging. NOTE: This port should
268 not be enabled under Drivers for built-in interfaces (as it has its
269 own initialization code) and should not be the same as the debug port.
270
271config ETRAX_KGDB_PORT0
272 bool "Serial-0"
273 help
274 Use serial port 0 for kernel debugging.
275
276config ETRAX_KGDB_PORT1
277 bool "Serial-1"
278 help
279 Use serial port 1 for kernel debugging.
280
281config ETRAX_KGDB_PORT2
282 bool "Serial-2"
283 help
284 Use serial port 2 for kernel debugging.
285
286config ETRAX_KGDB_PORT3
287 bool "Serial-3"
288 help
289 Use serial port 3 for kernel debugging.
290
291endchoice
292
293choice
263 prompt "Product rescue-port" 294 prompt "Product rescue-port"
264 depends on ETRAX_ARCH_V10 295 depends on ETRAX_ARCH_V10
265 default ETRAX_RESCUE_SER0 296 default ETRAX_RESCUE_SER0
diff --git a/arch/cris/arch-v10/boot/Makefile b/arch/cris/arch-v10/boot/Makefile
index fe6650368e6a..e5b105851108 100644
--- a/arch/cris/arch-v10/boot/Makefile
+++ b/arch/cris/arch-v10/boot/Makefile
@@ -1,12 +1,13 @@
1# 1#
2# arch/cris/boot/Makefile 2# arch/cris/boot/Makefile
3# 3#
4target = $(target_boot_dir)
5src = $(src_boot_dir)
4 6
5zImage: compressed/vmlinuz 7zImage: compressed/vmlinuz
6 8
7compressed/vmlinuz: $(TOPDIR)/vmlinux 9compressed/vmlinuz:
8 @$(MAKE) -C compressed vmlinuz 10 @$(MAKE) -f $(src)/compressed/Makefile $(target_compressed_dir)/vmlinuz
9 11
10clean: 12clean:
11 rm -f zImage tools/build compressed/vmlinux.out 13 @$(MAKE) -f $(src)/compressed/Makefile clean
12 @$(MAKE) -C compressed clean
diff --git a/arch/cris/arch-v10/boot/compressed/Makefile b/arch/cris/arch-v10/boot/compressed/Makefile
index 5f71c2c819e6..6584a44820f4 100644
--- a/arch/cris/arch-v10/boot/compressed/Makefile
+++ b/arch/cris/arch-v10/boot/compressed/Makefile
@@ -1,40 +1,45 @@
1# 1#
2# linux/arch/etrax100/boot/compressed/Makefile 2# create a compressed vmlinuz image from the binary vmlinux.bin file
3#
4# create a compressed vmlinux image from the original vmlinux files and romfs
5# 3#
4target = $(target_compressed_dir)
5src = $(src_compressed_dir)
6 6
7CC = gcc-cris -melf -I $(TOPDIR)/include 7CC = gcc-cris -melf $(LINUXINCLUDE)
8CFLAGS = -O2 8CFLAGS = -O2
9LD = ld-cris 9LD = ld-cris
10OBJCOPY = objcopy-cris 10OBJCOPY = objcopy-cris
11OBJCOPYFLAGS = -O binary --remove-section=.bss 11OBJCOPYFLAGS = -O binary --remove-section=.bss
12OBJECTS = head.o misc.o 12OBJECTS = $(target)/head.o $(target)/misc.o
13 13
14# files to compress 14# files to compress
15SYSTEM = $(TOPDIR)/vmlinux.bin 15SYSTEM = $(objtree)/vmlinux.bin
16 16
17all: vmlinuz 17all: $(target_compressed_dir)/vmlinuz
18 18
19decompress.bin: $(OBJECTS) 19$(target)/decompress.bin: $(OBJECTS)
20 $(LD) -T decompress.ld -o decompress.o $(OBJECTS) 20 $(LD) -T $(src)/decompress.ld -o $(target)/decompress.o $(OBJECTS)
21 $(OBJCOPY) $(OBJCOPYFLAGS) decompress.o decompress.bin 21 $(OBJCOPY) $(OBJCOPYFLAGS) $(target)/decompress.o $(target)/decompress.bin
22# save it for mkprod in the topdir.
23 cp decompress.bin $(TOPDIR)
24 22
23# Create vmlinuz image in top-level build directory
24$(target_compressed_dir)/vmlinuz: $(target) piggy.img $(target)/decompress.bin
25 @echo " COMPR vmlinux.bin --> vmlinuz"
26 @cat $(target)/decompress.bin piggy.img > $(target_compressed_dir)/vmlinuz
27 @rm -f piggy.img
25 28
26vmlinuz: piggy.img decompress.bin 29$(target)/head.o: $(src)/head.S
27 cat decompress.bin piggy.img > vmlinuz 30 $(CC) -D__ASSEMBLY__ -traditional -c $< -o $@
28 rm -f piggy.img
29 31
30head.o: head.S 32$(target)/misc.o: $(src)/misc.c
31 $(CC) -D__ASSEMBLY__ -traditional -c head.S -o head.o 33 $(CC) -D__KERNEL__ -c $< -o $@
32 34
33# gzip the kernel image 35# gzip the kernel image
34 36
35piggy.img: $(SYSTEM) 37piggy.img: $(SYSTEM)
36 cat $(SYSTEM) | gzip -f -9 > piggy.img 38 @cat $(SYSTEM) | gzip -f -9 > piggy.img
39
40$(target):
41 mkdir -p $(target)
37 42
38clean: 43clean:
39 rm -f piggy.img vmlinuz vmlinuz.o 44 rm -f piggy.img $(objtree)/vmlinuz
40 45
diff --git a/arch/cris/arch-v10/boot/rescue/Makefile b/arch/cris/arch-v10/boot/rescue/Makefile
index e9f2ba2ad02c..8be9b3130312 100644
--- a/arch/cris/arch-v10/boot/rescue/Makefile
+++ b/arch/cris/arch-v10/boot/rescue/Makefile
@@ -1,52 +1,53 @@
1# 1#
2# Makefile for rescue code 2# Makefile for rescue code
3# 3#
4ifndef TOPDIR 4target = $(target_rescue_dir)
5TOPDIR = ../../../.. 5src = $(src_rescue_dir)
6endif 6
7CC = gcc-cris -mlinux -I $(TOPDIR)/include 7CC = gcc-cris -mlinux $(LINUXINCLUDE)
8CFLAGS = -O2 8CFLAGS = -O2
9LD = gcc-cris -mlinux -nostdlib 9LD = gcc-cris -mlinux -nostdlib
10OBJCOPY = objcopy-cris 10OBJCOPY = objcopy-cris
11OBJCOPYFLAGS = -O binary --remove-section=.bss 11OBJCOPYFLAGS = -O binary --remove-section=.bss
12 12
13all: rescue.bin testrescue.bin kimagerescue.bin 13all: $(target)/rescue.bin $(target)/testrescue.bin $(target)/kimagerescue.bin
14
15rescue: rescue.bin
16 # do nothing
17 14
18rescue.bin: head.o 15$(target)/rescue.bin: $(target) $(target)/head.o
19 $(LD) -T rescue.ld -o rescue.o head.o 16 $(LD) -T $(src)/rescue.ld -o $(target)/rescue.o $(target)/head.o
20 $(OBJCOPY) $(OBJCOPYFLAGS) rescue.o rescue.bin 17 $(OBJCOPY) $(OBJCOPYFLAGS) $(target)/rescue.o $(target)/rescue.bin
21 cp rescue.bin $(TOPDIR) 18# Place a copy in top-level build directory
19 cp -p $(target)/rescue.bin $(objtree)
22 20
23testrescue.bin: testrescue.o 21$(target)/testrescue.bin: $(target) $(target)/testrescue.o
24 $(OBJCOPY) $(OBJCOPYFLAGS) testrescue.o tr.bin 22 $(OBJCOPY) $(OBJCOPYFLAGS) $(target)/testrescue.o tr.bin
25# Pad it to 784 bytes 23# Pad it to 784 bytes
26 dd if=/dev/zero of=tmp2423 bs=1 count=784 24 dd if=/dev/zero of=tmp2423 bs=1 count=784
27 cat tr.bin tmp2423 >testrescue_tmp.bin 25 cat tr.bin tmp2423 >testrescue_tmp.bin
28 dd if=testrescue_tmp.bin of=testrescue.bin bs=1 count=784 26 dd if=testrescue_tmp.bin of=$(target)/testrescue.bin bs=1 count=784
29 rm tr.bin tmp2423 testrescue_tmp.bin 27 rm tr.bin tmp2423 testrescue_tmp.bin
30 28
31kimagerescue.bin: kimagerescue.o 29$(target)/kimagerescue.bin: $(target) $(target)/kimagerescue.o
32 $(OBJCOPY) $(OBJCOPYFLAGS) kimagerescue.o ktr.bin 30 $(OBJCOPY) $(OBJCOPYFLAGS) $(target)/kimagerescue.o ktr.bin
33# Pad it to 784 bytes, that's what the rescue loader expects 31# Pad it to 784 bytes, that's what the rescue loader expects
34 dd if=/dev/zero of=tmp2423 bs=1 count=784 32 dd if=/dev/zero of=tmp2423 bs=1 count=784
35 cat ktr.bin tmp2423 >kimagerescue_tmp.bin 33 cat ktr.bin tmp2423 >kimagerescue_tmp.bin
36 dd if=kimagerescue_tmp.bin of=kimagerescue.bin bs=1 count=784 34 dd if=kimagerescue_tmp.bin of=$(target)/kimagerescue.bin bs=1 count=784
37 rm ktr.bin tmp2423 kimagerescue_tmp.bin 35 rm ktr.bin tmp2423 kimagerescue_tmp.bin
38 36
39head.o: head.S 37$(target):
38 mkdir -p $(target)
39
40$(target)/head.o: $(src)/head.S
40 $(CC) -D__ASSEMBLY__ -traditional -c $< -o $*.o 41 $(CC) -D__ASSEMBLY__ -traditional -c $< -o $*.o
41 42
42testrescue.o: testrescue.S 43$(target)/testrescue.o: $(src)/testrescue.S
43 $(CC) -D__ASSEMBLY__ -traditional -c $< -o $*.o 44 $(CC) -D__ASSEMBLY__ -traditional -c $< -o $*.o
44 45
45kimagerescue.o: kimagerescue.S 46$(target)/kimagerescue.o: $(src)/kimagerescue.S
46 $(CC) -D__ASSEMBLY__ -traditional -c $< -o $*.o 47 $(CC) -D__ASSEMBLY__ -traditional -c $< -o $*.o
47 48
48clean: 49clean:
49 rm -f *.o *.bin 50 rm -f $(target)/*.o $(target)/*.bin
50 51
51fastdep: 52fastdep:
52 53
diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig
index 748374f25b87..8b50e8402954 100644
--- a/arch/cris/arch-v10/drivers/Kconfig
+++ b/arch/cris/arch-v10/drivers/Kconfig
@@ -1,17 +1,11 @@
1config ETRAX_ETHERNET 1config ETRAX_ETHERNET
2 bool "Ethernet support" 2 bool "Ethernet support"
3 depends on ETRAX_ARCH_V10 3 depends on ETRAX_ARCH_V10
4 select NET_ETHERNET
4 help 5 help
5 This option enables the ETRAX 100LX built-in 10/100Mbit Ethernet 6 This option enables the ETRAX 100LX built-in 10/100Mbit Ethernet
6 controller. 7 controller.
7 8
8# this is just so that the user does not have to go into the
9# normal ethernet driver section just to enable ethernetworking
10config NET_ETHERNET
11 bool
12 depends on ETRAX_ETHERNET
13 default y
14
15choice 9choice
16 prompt "Network LED behavior" 10 prompt "Network LED behavior"
17 depends on ETRAX_ETHERNET 11 depends on ETRAX_ETHERNET
@@ -20,26 +14,26 @@ choice
20config ETRAX_NETWORK_LED_ON_WHEN_LINK 14config ETRAX_NETWORK_LED_ON_WHEN_LINK
21 bool "LED_on_when_link" 15 bool "LED_on_when_link"
22 help 16 help
23 Selecting LED_on_when_link will light the LED when there is a 17 Selecting LED_on_when_link will light the LED when there is a
24 connection and will flash off when there is activity. 18 connection and will flash off when there is activity.
25 19
26 Selecting LED_on_when_activity will light the LED only when 20 Selecting LED_on_when_activity will light the LED only when
27 there is activity. 21 there is activity.
28 22
29 This setting will also affect the behaviour of other activity LEDs 23 This setting will also affect the behaviour of other activity LEDs
30 e.g. Bluetooth. 24 e.g. Bluetooth.
31 25
32config ETRAX_NETWORK_LED_ON_WHEN_ACTIVITY 26config ETRAX_NETWORK_LED_ON_WHEN_ACTIVITY
33 bool "LED_on_when_activity" 27 bool "LED_on_when_activity"
34 help 28 help
35 Selecting LED_on_when_link will light the LED when there is a 29 Selecting LED_on_when_link will light the LED when there is a
36 connection and will flash off when there is activity. 30 connection and will flash off when there is activity.
37 31
38 Selecting LED_on_when_activity will light the LED only when 32 Selecting LED_on_when_activity will light the LED only when
39 there is activity. 33 there is activity.
40 34
41 This setting will also affect the behaviour of other activity LEDs 35 This setting will also affect the behaviour of other activity LEDs
42 e.g. Bluetooth. 36 e.g. Bluetooth.
43 37
44endchoice 38endchoice
45 39
@@ -91,11 +85,11 @@ choice
91 depends on ETRAX_SERIAL_PORT0 85 depends on ETRAX_SERIAL_PORT0
92 default ETRAX_SERIAL_PORT0_DMA6_OUT 86 default ETRAX_SERIAL_PORT0_DMA6_OUT
93 87
94config CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_OUT 88config ETRAX_SERIAL_PORT0_NO_DMA_OUT
95 bool "No DMA out" 89 bool "No DMA out"
96 90
97config CONFIG_ETRAX_SERIAL_PORT0_DMA6_OUT 91config ETRAX_SERIAL_PORT0_DMA6_OUT
98 bool "DMA 6" 92 bool "DMA 6"
99 93
100endchoice 94endchoice
101 95
@@ -104,11 +98,11 @@ choice
104 depends on ETRAX_SERIAL_PORT0 98 depends on ETRAX_SERIAL_PORT0
105 default ETRAX_SERIAL_PORT0_DMA7_IN 99 default ETRAX_SERIAL_PORT0_DMA7_IN
106 100
107config CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_IN 101config ETRAX_SERIAL_PORT0_NO_DMA_IN
108 bool "No DMA in" 102 bool "No DMA in"
109 103
110config CONFIG_ETRAX_SERIAL_PORT0_DMA7_IN 104config ETRAX_SERIAL_PORT0_DMA7_IN
111 bool "DMA 7" 105 bool "DMA 7"
112 106
113endchoice 107endchoice
114 108
@@ -205,11 +199,11 @@ choice
205 depends on ETRAX_SERIAL_PORT1 199 depends on ETRAX_SERIAL_PORT1
206 default ETRAX_SERIAL_PORT1_DMA8_OUT 200 default ETRAX_SERIAL_PORT1_DMA8_OUT
207 201
208config CONFIG_ETRAX_SERIAL_PORT1_NO_DMA_OUT 202config ETRAX_SERIAL_PORT1_NO_DMA_OUT
209 bool "No DMA out" 203 bool "No DMA out"
210 204
211config CONFIG_ETRAX_SERIAL_PORT1_DMA8_OUT 205config ETRAX_SERIAL_PORT1_DMA8_OUT
212 bool "DMA 8" 206 bool "DMA 8"
213 207
214endchoice 208endchoice
215 209
@@ -218,11 +212,11 @@ choice
218 depends on ETRAX_SERIAL_PORT1 212 depends on ETRAX_SERIAL_PORT1
219 default ETRAX_SERIAL_PORT1_DMA9_IN 213 default ETRAX_SERIAL_PORT1_DMA9_IN
220 214
221config CONFIG_ETRAX_SERIAL_PORT1_NO_DMA_IN 215config ETRAX_SERIAL_PORT1_NO_DMA_IN
222 bool "No DMA in" 216 bool "No DMA in"
223 217
224config CONFIG_ETRAX_SERIAL_PORT1_DMA9_IN 218config ETRAX_SERIAL_PORT1_DMA9_IN
225 bool "DMA 9" 219 bool "DMA 9"
226 220
227endchoice 221endchoice
228 222
@@ -308,7 +302,7 @@ config ETRAX_SER1_CD_ON_PB_BIT
308 Specify the pin of the PB port to carry the CD signal for serial 302 Specify the pin of the PB port to carry the CD signal for serial
309 port 1. 303 port 1.
310 304
311comment "Make sure you dont have the same PB bits more than once!" 305comment "Make sure you do not have the same PB bits more than once!"
312 depends on ETRAX_SERIAL && ETRAX_SER0_DTR_RI_DSR_CD_ON_PB && ETRAX_SER1_DTR_RI_DSR_CD_ON_PB 306 depends on ETRAX_SERIAL && ETRAX_SER0_DTR_RI_DSR_CD_ON_PB && ETRAX_SER1_DTR_RI_DSR_CD_ON_PB
313 307
314config ETRAX_SERIAL_PORT2 308config ETRAX_SERIAL_PORT2
@@ -322,11 +316,11 @@ choice
322 depends on ETRAX_SERIAL_PORT2 316 depends on ETRAX_SERIAL_PORT2
323 default ETRAX_SERIAL_PORT2_DMA2_OUT 317 default ETRAX_SERIAL_PORT2_DMA2_OUT
324 318
325config CONFIG_ETRAX_SERIAL_PORT2_NO_DMA_OUT 319config ETRAX_SERIAL_PORT2_NO_DMA_OUT
326 bool "No DMA out" 320 bool "No DMA out"
327 321
328config CONFIG_ETRAX_SERIAL_PORT2_DMA2_OUT 322config ETRAX_SERIAL_PORT2_DMA2_OUT
329 bool "DMA 2" 323 bool "DMA 2"
330 324
331endchoice 325endchoice
332 326
@@ -335,11 +329,11 @@ choice
335 depends on ETRAX_SERIAL_PORT2 329 depends on ETRAX_SERIAL_PORT2
336 default ETRAX_SERIAL_PORT2_DMA3_IN 330 default ETRAX_SERIAL_PORT2_DMA3_IN
337 331
338config CONFIG_ETRAX_SERIAL_PORT2_NO_DMA_IN 332config ETRAX_SERIAL_PORT2_NO_DMA_IN
339 bool "No DMA in" 333 bool "No DMA in"
340 334
341config CONFIG_ETRAX_SERIAL_PORT2_DMA3_IN 335config ETRAX_SERIAL_PORT2_DMA3_IN
342 bool "DMA 3" 336 bool "DMA 3"
343 337
344endchoice 338endchoice
345 339
@@ -436,11 +430,11 @@ choice
436 depends on ETRAX_SERIAL_PORT3 430 depends on ETRAX_SERIAL_PORT3
437 default ETRAX_SERIAL_PORT3_DMA4_OUT 431 default ETRAX_SERIAL_PORT3_DMA4_OUT
438 432
439config CONFIG_ETRAX_SERIAL_PORT3_NO_DMA_OUT 433config ETRAX_SERIAL_PORT3_NO_DMA_OUT
440 bool "No DMA out" 434 bool "No DMA out"
441 435
442config CONFIG_ETRAX_SERIAL_PORT3_DMA4_OUT 436config ETRAX_SERIAL_PORT3_DMA4_OUT
443 bool "DMA 4" 437 bool "DMA 4"
444 438
445endchoice 439endchoice
446 440
@@ -449,11 +443,11 @@ choice
449 depends on ETRAX_SERIAL_PORT3 443 depends on ETRAX_SERIAL_PORT3
450 default ETRAX_SERIAL_PORT3_DMA5_IN 444 default ETRAX_SERIAL_PORT3_DMA5_IN
451 445
452config CONFIG_ETRAX_SERIAL_PORT3_NO_DMA_IN 446config ETRAX_SERIAL_PORT3_NO_DMA_IN
453 bool "No DMA in" 447 bool "No DMA in"
454 448
455config CONFIG_ETRAX_SERIAL_PORT3_DMA5_IN 449config ETRAX_SERIAL_PORT3_DMA5_IN
456 bool "DMA 5" 450 bool "DMA 5"
457 451
458endchoice 452endchoice
459 453
@@ -554,7 +548,6 @@ config ETRAX_IDE
554 select BLK_DEV_IDEDISK 548 select BLK_DEV_IDEDISK
555 select BLK_DEV_IDECD 549 select BLK_DEV_IDECD
556 select BLK_DEV_IDEDMA 550 select BLK_DEV_IDEDMA
557 select DMA_NONPCI
558 help 551 help
559 Enable this to get support for ATA/IDE. 552 Enable this to get support for ATA/IDE.
560 You can't use paralell ports or SCSI ports 553 You can't use paralell ports or SCSI ports
@@ -579,7 +572,7 @@ config ETRAX_IDE_PB7_RESET
579 IDE reset on pin 7 on port B 572 IDE reset on pin 7 on port B
580 573
581config ETRAX_IDE_G27_RESET 574config ETRAX_IDE_G27_RESET
582 bool "Port_G_Bit_27" 575 bool "Port_G_Bit_27"
583 help 576 help
584 IDE reset on pin 27 on port G 577 IDE reset on pin 27 on port G
585 578
@@ -588,30 +581,36 @@ endchoice
588 581
589config ETRAX_USB_HOST 582config ETRAX_USB_HOST
590 bool "USB host" 583 bool "USB host"
584 select USB
591 help 585 help
592 This option enables the host functionality of the ETRAX 100LX 586 This option enables the host functionality of the ETRAX 100LX
593 built-in USB controller. In host mode the controller is designed 587 built-in USB controller. In host mode the controller is designed
594 for CTRL and BULK traffic only, INTR traffic may work as well 588 for CTRL and BULK traffic only, INTR traffic may work as well
595 however (depending on the requirements of timeliness). 589 however (depending on the requirements of timeliness).
596 590
597config USB
598 tristate
599 depends on ETRAX_USB_HOST
600 default y
601
602config ETRAX_USB_HOST_PORT1 591config ETRAX_USB_HOST_PORT1
603 bool " USB port 1 enabled" 592 bool "USB port 1 enabled"
604 depends on ETRAX_USB_HOST 593 depends on ETRAX_USB_HOST
605 default n 594 default n
606 595
607config ETRAX_USB_HOST_PORT2 596config ETRAX_USB_HOST_PORT2
608 bool " USB port 2 enabled" 597 bool "USB port 2 enabled"
609 depends on ETRAX_USB_HOST 598 depends on ETRAX_USB_HOST
610 default n 599 default n
611 600
612config ETRAX_AXISFLASHMAP 601config ETRAX_AXISFLASHMAP
613 bool "Axis flash-map support" 602 bool "Axis flash-map support"
614 depends on ETRAX_ARCH_V10 603 depends on ETRAX_ARCH_V10
604 select MTD
605 select MTD_CFI
606 select MTD_CFI_AMDSTD
607 select MTD_OBSOLETE_CHIPS
608 select MTD_AMDSTD
609 select MTD_CHAR
610 select MTD_BLOCK
611 select MTD_PARTITIONS
612 select MTD_CONCAT
613 select MTD_COMPLEX_MAPPINGS
615 help 614 help
616 This option enables MTD mapping of flash devices. Needed to use 615 This option enables MTD mapping of flash devices. Needed to use
617 flash memories. If unsure, say Y. 616 flash memories. If unsure, say Y.
@@ -627,119 +626,6 @@ config ETRAX_PTABLE_SECTOR
627 for changing this is when the flash block size is bigger 626 for changing this is when the flash block size is bigger
628 than 64kB (e.g. when using two parallel 16 bit flashes). 627 than 64kB (e.g. when using two parallel 16 bit flashes).
629 628
630# here we define the CONFIG_'s necessary to enable MTD support
631# for the flash
632config MTD
633 tristate
634 depends on ETRAX_AXISFLASHMAP
635 default y
636 help
637 Memory Technology Devices are flash, RAM and similar chips, often
638 used for solid state file systems on embedded devices. This option
639 will provide the generic support for MTD drivers to register
640 themselves with the kernel and for potential users of MTD devices
641 to enumerate the devices which are present and obtain a handle on
642 them. It will also allow you to select individual drivers for
643 particular hardware and users of MTD devices. If unsure, say N.
644
645config MTD_CFI
646 tristate
647 depends on ETRAX_AXISFLASHMAP
648 default y
649 help
650 The Common Flash Interface specification was developed by Intel,
651 AMD and other flash manufactures that provides a universal method
652 for probing the capabilities of flash devices. If you wish to
653 support any device that is CFI-compliant, you need to enable this
654 option. Visit <http://www.amd.com/products/nvd/overview/cfi.html>
655 for more information on CFI.
656
657config MTD_CFI_AMDSTD
658 tristate
659 depends on ETRAX_AXISFLASHMAP
660 default y
661 help
662 The Common Flash Interface defines a number of different command
663 sets which a CFI-compliant chip may claim to implement. This code
664 provides support for one of those command sets, used on chips
665 chips including the AMD Am29LV320.
666
667config MTD_OBSOLETE_CHIPS
668 bool
669 depends on ETRAX_AXISFLASHMAP
670 default y
671 help
672 This option does not enable any code directly, but will allow you to
673 select some other chip drivers which are now considered obsolete,
674 because the generic CONFIG_JEDEC_PROBE code above should now detect
675 the chips which are supported by these drivers, and allow the generic
676 CFI-compatible drivers to drive the chips. Say 'N' here unless you have
677 already tried the CONFIG_JEDEC_PROBE method and reported its failure
678 to the MTD mailing list at <linux-mtd@lists.infradead.org>
679
680config MTD_AMDSTD
681 tristate
682 depends on ETRAX_AXISFLASHMAP
683 default y
684 help
685 This option enables support for flash chips using AMD-compatible
686 commands, including some which are not CFI-compatible and hence
687 cannot be used with the CONFIG_MTD_CFI_AMDSTD option.
688
689 It also works on AMD compatible chips that do conform to CFI.
690
691config MTD_CHAR
692 tristate
693 depends on ETRAX_AXISFLASHMAP
694 default y
695 help
696 This provides a character device for each MTD device present in
697 the system, allowing the user to read and write directly to the
698 memory chips, and also use ioctl() to obtain information about
699 the device, or to erase parts of it.
700
701config MTD_BLOCK
702 tristate
703 depends on ETRAX_AXISFLASHMAP
704 default y
705 ---help---
706 Although most flash chips have an erase size too large to be useful
707 as block devices, it is possible to use MTD devices which are based
708 on RAM chips in this manner. This block device is a user of MTD
709 devices performing that function.
710
711 At the moment, it is also required for the Journalling Flash File
712 System(s) to obtain a handle on the MTD device when it's mounted
713 (although JFFS and JFFS2 don't actually use any of the functionality
714 of the mtdblock device).
715
716 Later, it may be extended to perform read/erase/modify/write cycles
717 on flash chips to emulate a smaller block size. Needless to say,
718 this is very unsafe, but could be useful for file systems which are
719 almost never written to.
720
721 You do not need this option for use with the DiskOnChip devices. For
722 those, enable NFTL support (CONFIG_NFTL) instead.
723
724config MTD_PARTITIONS
725 tristate
726 depends on ETRAX_AXISFLASHMAP
727 default y
728 help
729 If you have a device which needs to divide its flash chip(s) up
730 into multiple 'partitions', each of which appears to the user as
731 a separate MTD device, you require this option to be enabled. If
732 unsure, say 'Y'.
733
734 Note, however, that you don't need this option for the DiskOnChip
735 devices. Partitioning on NFTL 'devices' is a different - that's the
736 'normal' form of partitioning used on a block device.
737
738config MTD_CONCAT
739 tristate
740 depends on ETRAX_AXISFLASHMAP
741 default y
742
743config ETRAX_I2C 629config ETRAX_I2C
744 bool "I2C support" 630 bool "I2C support"
745 depends on ETRAX_ARCH_V10 631 depends on ETRAX_ARCH_V10
@@ -752,7 +638,7 @@ config ETRAX_I2C
752 val = ioctl(fd, _IO(ETRAXI2C_IOCTYPE, I2C_READREG), i2c_arg); 638 val = ioctl(fd, _IO(ETRAXI2C_IOCTYPE, I2C_READREG), i2c_arg);
753 639
754# this is true for most products since PB-I2C seems to be somewhat 640# this is true for most products since PB-I2C seems to be somewhat
755# flawed.. 641# flawed..
756config ETRAX_I2C_USES_PB_NOT_PB_I2C 642config ETRAX_I2C_USES_PB_NOT_PB_I2C
757 bool "I2C uses PB not PB-I2C" 643 bool "I2C uses PB not PB-I2C"
758 depends on ETRAX_I2C 644 depends on ETRAX_I2C
@@ -886,7 +772,7 @@ config ETRAX_RTC
886 bool "Real Time Clock support" 772 bool "Real Time Clock support"
887 depends on ETRAX_ARCH_V10 773 depends on ETRAX_ARCH_V10
888 help 774 help
889 Enables drivers for the Real-Time Clock battery-backed chips on 775 Enables drivers for the Real-Time Clock battery-backed chips on
890 some products. The kernel reads the time when booting, and 776 some products. The kernel reads the time when booting, and
891 the date can be set using ioctl(fd, RTC_SET_TIME, &rt) with rt a 777 the date can be set using ioctl(fd, RTC_SET_TIME, &rt) with rt a
892 rtc_time struct (see <file:include/asm-cris/rtc.h>) on the /dev/rtc 778 rtc_time struct (see <file:include/asm-cris/rtc.h>) on the /dev/rtc
@@ -903,13 +789,13 @@ config ETRAX_DS1302
903 bool "DS1302" 789 bool "DS1302"
904 help 790 help
905 Enables the driver for the DS1302 Real-Time Clock battery-backed 791 Enables the driver for the DS1302 Real-Time Clock battery-backed
906 chip on some products. 792 chip on some products.
907 793
908config ETRAX_PCF8563 794config ETRAX_PCF8563
909 bool "PCF8563" 795 bool "PCF8563"
910 help 796 help
911 Enables the driver for the PCF8563 Real-Time Clock battery-backed 797 Enables the driver for the PCF8563 Real-Time Clock battery-backed
912 chip on some products. 798 chip on some products.
913 799
914endchoice 800endchoice
915 801
@@ -954,10 +840,8 @@ config ETRAX_DS1302_TRICKLE_CHARGE
954 help 840 help
955 This controls the initial value of the trickle charge register. 841 This controls the initial value of the trickle charge register.
956 0 = disabled (use this if you are unsure or have a non rechargable battery) 842 0 = disabled (use this if you are unsure or have a non rechargable battery)
957 Otherwise the following values can be OR:ed together to control the 843 Otherwise the following values can be OR:ed together to control the
958 charge current: 844 charge current:
959 1 = 2kohm, 2 = 4kohm, 3 = 4kohm 845 1 = 2kohm, 2 = 4kohm, 3 = 4kohm
960 4 = 1 diode, 8 = 2 diodes 846 4 = 1 diode, 8 = 2 diodes
961 Allowed values are (increasing current): 0, 11, 10, 9, 7, 6, 5 847 Allowed values are (increasing current): 0, 11, 10, 9, 7, 6, 5
962
963
diff --git a/arch/cris/defconfig b/arch/cris/defconfig
index 32c9c987dbaa..142a10818af3 100644
--- a/arch/cris/defconfig
+++ b/arch/cris/defconfig
@@ -1,22 +1,27 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.11
4# Mon Jun 20 13:42:02 2005
3# 5#
4CONFIG_MMU=y 6CONFIG_MMU=y
5CONFIG_UID16=y 7CONFIG_UID16=y
6CONFIG_RWSEM_GENERIC_SPINLOCK=y 8CONFIG_RWSEM_GENERIC_SPINLOCK=y
9CONFIG_GENERIC_IOMAP=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y
11CONFIG_CRIS=y
7 12
8# 13#
9# Code maturity level options 14# Code maturity level options
10# 15#
11CONFIG_EXPERIMENTAL=y 16CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y 17CONFIG_CLEAN_COMPILE=y
13CONFIG_STANDALONE=y
14CONFIG_BROKEN_ON_SMP=y 18CONFIG_BROKEN_ON_SMP=y
15 19
16# 20#
17# General setup 21# General setup
18# 22#
19CONFIG_SWAP=y 23CONFIG_LOCALVERSION=""
24# CONFIG_SWAP is not set
20# CONFIG_SYSVIPC is not set 25# CONFIG_SYSVIPC is not set
21# CONFIG_POSIX_MQUEUE is not set 26# CONFIG_POSIX_MQUEUE is not set
22# CONFIG_BSD_PROCESS_ACCT is not set 27# CONFIG_BSD_PROCESS_ACCT is not set
@@ -24,16 +29,19 @@ CONFIG_SYSCTL=y
24# CONFIG_AUDIT is not set 29# CONFIG_AUDIT is not set
25CONFIG_LOG_BUF_SHIFT=14 30CONFIG_LOG_BUF_SHIFT=14
26# CONFIG_HOTPLUG is not set 31# CONFIG_HOTPLUG is not set
32CONFIG_KOBJECT_UEVENT=y
27# CONFIG_IKCONFIG is not set 33# CONFIG_IKCONFIG is not set
28CONFIG_EMBEDDED=y 34CONFIG_EMBEDDED=y
29# CONFIG_KALLSYMS is not set 35# CONFIG_KALLSYMS is not set
30CONFIG_FUTEX=y 36CONFIG_FUTEX=y
31CONFIG_EPOLL=y 37CONFIG_EPOLL=y
32CONFIG_IOSCHED_NOOP=y
33CONFIG_IOSCHED_AS=y
34CONFIG_IOSCHED_DEADLINE=y
35CONFIG_IOSCHED_CFQ=y
36# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 38# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
39CONFIG_SHMEM=y
40CONFIG_CC_ALIGN_FUNCTIONS=0
41CONFIG_CC_ALIGN_LABELS=0
42CONFIG_CC_ALIGN_LOOPS=0
43CONFIG_CC_ALIGN_JUMPS=0
44# CONFIG_TINY_SHMEM is not set
37 45
38# 46#
39# Loadable module support 47# Loadable module support
@@ -45,23 +53,28 @@ CONFIG_IOSCHED_CFQ=y
45# 53#
46CONFIG_BINFMT_ELF=y 54CONFIG_BINFMT_ELF=y
47# CONFIG_BINFMT_MISC is not set 55# CONFIG_BINFMT_MISC is not set
56CONFIG_GENERIC_HARDIRQS=y
57# CONFIG_SMP is not set
48CONFIG_ETRAX_CMDLINE="root=/dev/mtdblock3 init=/linuxrc" 58CONFIG_ETRAX_CMDLINE="root=/dev/mtdblock3 init=/linuxrc"
49CONFIG_ETRAX_WATCHDOG=y 59# CONFIG_ETRAX_WATCHDOG is not set
50CONFIG_ETRAX_WATCHDOG_NICE_DOGGY=y
51CONFIG_ETRAX_FAST_TIMER=y 60CONFIG_ETRAX_FAST_TIMER=y
52# CONFIG_PREEMPT is not set 61# CONFIG_PREEMPT is not set
62# CONFIG_OOM_REBOOT is not set
53 63
54# 64#
55# Hardware setup 65# Hardware setup
56# 66#
57CONFIG_ETRAX100LX=y 67# CONFIG_ETRAX100LX is not set
58# CONFIG_ETRAX100LX_V2 is not set 68CONFIG_ETRAX100LX_V2=y
59# CONFIG_SVINTO_SIM is not set 69# CONFIG_SVINTO_SIM is not set
70# CONFIG_ETRAXFS is not set
71# CONFIG_ETRAXFS_SIM is not set
60CONFIG_ETRAX_ARCH_V10=y 72CONFIG_ETRAX_ARCH_V10=y
61CONFIG_ETRAX_DRAM_SIZE=16 73# CONFIG_ETRAX_ARCH_V32 is not set
74CONFIG_ETRAX_DRAM_SIZE=32
62CONFIG_ETRAX_FLASH_BUSWIDTH=2 75CONFIG_ETRAX_FLASH_BUSWIDTH=2
63CONFIG_CRIS_LOW_MAP=y 76CONFIG_ETRAX_FLASH1_SIZE=4
64CONFIG_ETRAX_DRAM_VIRTUAL_BASE=60000000 77CONFIG_ETRAX_DRAM_VIRTUAL_BASE=c0000000
65CONFIG_ETRAX_PA_LEDS=y 78CONFIG_ETRAX_PA_LEDS=y
66# CONFIG_ETRAX_PB_LEDS is not set 79# CONFIG_ETRAX_PB_LEDS is not set
67# CONFIG_ETRAX_CSP0_LEDS is not set 80# CONFIG_ETRAX_CSP0_LEDS is not set
@@ -81,13 +94,13 @@ CONFIG_ETRAX_RESCUE_SER0=y
81# CONFIG_ETRAX_RESCUE_SER1 is not set 94# CONFIG_ETRAX_RESCUE_SER1 is not set
82# CONFIG_ETRAX_RESCUE_SER2 is not set 95# CONFIG_ETRAX_RESCUE_SER2 is not set
83# CONFIG_ETRAX_RESCUE_SER3 is not set 96# CONFIG_ETRAX_RESCUE_SER3 is not set
84CONFIG_ETRAX_DEF_R_WAITSTATES=0x95f8 97CONFIG_ETRAX_DEF_R_WAITSTATES=0x95a6
85CONFIG_ETRAX_DEF_R_BUS_CONFIG=0x104 98CONFIG_ETRAX_DEF_R_BUS_CONFIG=0x4
86CONFIG_ETRAX_SDRAM=y 99CONFIG_ETRAX_SDRAM=y
87CONFIG_ETRAX_DEF_R_SDRAM_CONFIG=0x00e03636 100CONFIG_ETRAX_DEF_R_SDRAM_CONFIG=0x09e05757
88CONFIG_ETRAX_DEF_R_SDRAM_TIMING=0x80008002 101CONFIG_ETRAX_DEF_R_SDRAM_TIMING=0x80008002
89CONFIG_ETRAX_DEF_R_PORT_PA_DIR=0x1d 102CONFIG_ETRAX_DEF_R_PORT_PA_DIR=0x1d
90CONFIG_ETRAX_DEF_R_PORT_PA_DATA=0xf0 103CONFIG_ETRAX_DEF_R_PORT_PA_DATA=0x00
91CONFIG_ETRAX_DEF_R_PORT_PB_CONFIG=0x00 104CONFIG_ETRAX_DEF_R_PORT_PB_CONFIG=0x00
92CONFIG_ETRAX_DEF_R_PORT_PB_DIR=0x1e 105CONFIG_ETRAX_DEF_R_PORT_PB_DIR=0x1e
93CONFIG_ETRAX_DEF_R_PORT_PB_DATA=0xf3 106CONFIG_ETRAX_DEF_R_PORT_PB_DATA=0xf3
@@ -97,16 +110,17 @@ CONFIG_ETRAX_DEF_R_PORT_PB_DATA=0xf3
97# Drivers for built-in interfaces 110# Drivers for built-in interfaces
98# 111#
99CONFIG_ETRAX_ETHERNET=y 112CONFIG_ETRAX_ETHERNET=y
100CONFIG_NET_ETHERNET=y
101# CONFIG_ETRAX_NETWORK_LED_ON_WHEN_LINK is not set 113# CONFIG_ETRAX_NETWORK_LED_ON_WHEN_LINK is not set
102CONFIG_ETRAX_NETWORK_LED_ON_WHEN_ACTIVITY=y 114CONFIG_ETRAX_NETWORK_LED_ON_WHEN_ACTIVITY=y
103CONFIG_ETRAX_SERIAL=y 115CONFIG_ETRAX_SERIAL=y
104CONFIG_ETRAX_SERIAL_FAST_TIMER=y 116# CONFIG_ETRAX_SERIAL_FAST_TIMER is not set
117# CONFIG_ETRAX_SERIAL_FLUSH_DMA_FAST is not set
118CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS=5
105CONFIG_ETRAX_SERIAL_PORT0=y 119CONFIG_ETRAX_SERIAL_PORT0=y
106# CONFIG_CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_OUT is not set 120# CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_OUT is not set
107CONFIG_CONFIG_ETRAX_SERIAL_PORT0_DMA6_OUT=y 121CONFIG_ETRAX_SERIAL_PORT0_DMA6_OUT=y
108# CONFIG_CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_IN is not set 122# CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_IN is not set
109CONFIG_CONFIG_ETRAX_SERIAL_PORT0_DMA7_IN=y 123CONFIG_ETRAX_SERIAL_PORT0_DMA7_IN=y
110CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_NONE=y 124CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_NONE=y
111# CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_PA is not set 125# CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_PA is not set
112# CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_PB is not set 126# CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_PB is not set
@@ -121,10 +135,10 @@ CONFIG_ETRAX_SER0_DSR_ON_PB_BIT=-1
121CONFIG_ETRAX_SER0_CD_ON_PB_BIT=-1 135CONFIG_ETRAX_SER0_CD_ON_PB_BIT=-1
122# CONFIG_ETRAX_SERIAL_PORT1 is not set 136# CONFIG_ETRAX_SERIAL_PORT1 is not set
123CONFIG_ETRAX_SERIAL_PORT2=y 137CONFIG_ETRAX_SERIAL_PORT2=y
124# CONFIG_CONFIG_ETRAX_SERIAL_PORT2_NO_DMA_OUT is not set 138# CONFIG_ETRAX_SERIAL_PORT2_NO_DMA_OUT is not set
125CONFIG_CONFIG_ETRAX_SERIAL_PORT2_DMA2_OUT=y 139CONFIG_ETRAX_SERIAL_PORT2_DMA2_OUT=y
126# CONFIG_CONFIG_ETRAX_SERIAL_PORT2_NO_DMA_IN is not set 140# CONFIG_ETRAX_SERIAL_PORT2_NO_DMA_IN is not set
127CONFIG_CONFIG_ETRAX_SERIAL_PORT2_DMA3_IN=y 141CONFIG_ETRAX_SERIAL_PORT2_DMA3_IN=y
128CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_ON_NONE=y 142CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_ON_NONE=y
129# CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_ON_PA is not set 143# CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_ON_PA is not set
130# CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_ON_PB is not set 144# CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_ON_PB is not set
@@ -138,44 +152,51 @@ CONFIG_ETRAX_SER2_RI_ON_PB_BIT=-1
138CONFIG_ETRAX_SER2_DSR_ON_PB_BIT=-1 152CONFIG_ETRAX_SER2_DSR_ON_PB_BIT=-1
139CONFIG_ETRAX_SER2_CD_ON_PB_BIT=-1 153CONFIG_ETRAX_SER2_CD_ON_PB_BIT=-1
140# CONFIG_ETRAX_SERIAL_PORT3 is not set 154# CONFIG_ETRAX_SERIAL_PORT3 is not set
141# CONFIG_ETRAX_RS485 is not set 155CONFIG_ETRAX_RS485=y
142# CONFIG_ETRAX_IDE is not set 156# CONFIG_ETRAX_RS485_ON_PA is not set
143# CONFIG_IDE is not set 157# CONFIG_ETRAX_RS485_DISABLE_RECEIVER is not set
144# CONFIG_ETRAX_USB_HOST is not set 158CONFIG_ETRAX_IDE=y
159CONFIG_ETRAX_IDE_DELAY=15
160CONFIG_ETRAX_IDE_PB7_RESET=y
161# CONFIG_ETRAX_IDE_G27_RESET is not set
162CONFIG_ETRAX_USB_HOST=y
163CONFIG_ETRAX_USB_HOST_PORT1=y
164CONFIG_ETRAX_USB_HOST_PORT2=y
145CONFIG_ETRAX_AXISFLASHMAP=y 165CONFIG_ETRAX_AXISFLASHMAP=y
146CONFIG_ETRAX_PTABLE_SECTOR=65536 166CONFIG_ETRAX_PTABLE_SECTOR=65536
147CONFIG_MTD=y
148CONFIG_MTD_CFI=y
149CONFIG_MTD_CFI_AMDSTD=y
150CONFIG_MTD_OBSOLETE_CHIPS=y
151CONFIG_MTD_AMDSTD=y
152CONFIG_MTD_CHAR=y
153CONFIG_MTD_BLOCK=y
154CONFIG_MTD_PARTITIONS=y
155CONFIG_MTD_CONCAT=y
156# CONFIG_ETRAX_I2C is not set 167# CONFIG_ETRAX_I2C is not set
157CONFIG_ETRAX_GPIO=y 168# CONFIG_ETRAX_GPIO is not set
158CONFIG_ETRAX_PA_BUTTON_BITMASK=0x02 169CONFIG_ETRAX_RTC=y
159CONFIG_ETRAX_PA_CHANGEABLE_DIR=0x00 170CONFIG_ETRAX_DS1302=y
160CONFIG_ETRAX_PA_CHANGEABLE_BITS=0xFF 171# CONFIG_ETRAX_PCF8563 is not set
161CONFIG_ETRAX_PB_CHANGEABLE_DIR=0x00 172CONFIG_ETRAX_DS1302_RST_ON_GENERIC_PORT=y
162CONFIG_ETRAX_PB_CHANGEABLE_BITS=0xFF 173CONFIG_ETRAX_DS1302_RSTBIT=0
163# CONFIG_ETRAX_RTC is not set 174CONFIG_ETRAX_DS1302_SCLBIT=1
175CONFIG_ETRAX_DS1302_SDABIT=0
176CONFIG_ETRAX_DS1302_TRICKLE_CHARGE=0
164 177
165# 178#
166# Generic Driver Options 179# Generic Driver Options
167# 180#
181CONFIG_STANDALONE=y
182CONFIG_PREVENT_FIRMWARE_BUILD=y
183# CONFIG_FW_LOADER is not set
168 184
169# 185#
170# Memory Technology Devices (MTD) 186# Memory Technology Devices (MTD)
171# 187#
188CONFIG_MTD=y
172# CONFIG_MTD_DEBUG is not set 189# CONFIG_MTD_DEBUG is not set
190CONFIG_MTD_PARTITIONS=y
191CONFIG_MTD_CONCAT=y
173# CONFIG_MTD_REDBOOT_PARTS is not set 192# CONFIG_MTD_REDBOOT_PARTS is not set
174# CONFIG_MTD_CMDLINE_PARTS is not set 193# CONFIG_MTD_CMDLINE_PARTS is not set
175 194
176# 195#
177# User Modules And Translation Layers 196# User Modules And Translation Layers
178# 197#
198CONFIG_MTD_CHAR=y
199CONFIG_MTD_BLOCK=y
179# CONFIG_FTL is not set 200# CONFIG_FTL is not set
180# CONFIG_NFTL is not set 201# CONFIG_NFTL is not set
181# CONFIG_INFTL is not set 202# CONFIG_INFTL is not set
@@ -183,14 +204,30 @@ CONFIG_ETRAX_PB_CHANGEABLE_BITS=0xFF
183# 204#
184# RAM/ROM/Flash chip drivers 205# RAM/ROM/Flash chip drivers
185# 206#
207CONFIG_MTD_CFI=y
186# CONFIG_MTD_JEDECPROBE is not set 208# CONFIG_MTD_JEDECPROBE is not set
187CONFIG_MTD_GEN_PROBE=y 209CONFIG_MTD_GEN_PROBE=y
188# CONFIG_MTD_CFI_ADV_OPTIONS is not set 210# CONFIG_MTD_CFI_ADV_OPTIONS is not set
211CONFIG_MTD_MAP_BANK_WIDTH_1=y
212CONFIG_MTD_MAP_BANK_WIDTH_2=y
213CONFIG_MTD_MAP_BANK_WIDTH_4=y
214# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
215# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
216# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
217CONFIG_MTD_CFI_I1=y
218CONFIG_MTD_CFI_I2=y
219# CONFIG_MTD_CFI_I4 is not set
220# CONFIG_MTD_CFI_I8 is not set
189# CONFIG_MTD_CFI_INTELEXT is not set 221# CONFIG_MTD_CFI_INTELEXT is not set
222CONFIG_MTD_CFI_AMDSTD=y
223CONFIG_MTD_CFI_AMDSTD_RETRY=0
190# CONFIG_MTD_CFI_STAA is not set 224# CONFIG_MTD_CFI_STAA is not set
225CONFIG_MTD_CFI_UTIL=y
191CONFIG_MTD_RAM=y 226CONFIG_MTD_RAM=y
192# CONFIG_MTD_ROM is not set 227# CONFIG_MTD_ROM is not set
193# CONFIG_MTD_ABSENT is not set 228# CONFIG_MTD_ABSENT is not set
229CONFIG_MTD_OBSOLETE_CHIPS=y
230CONFIG_MTD_AMDSTD=y
194# CONFIG_MTD_SHARP is not set 231# CONFIG_MTD_SHARP is not set
195# CONFIG_MTD_JEDEC is not set 232# CONFIG_MTD_JEDEC is not set
196 233
@@ -204,11 +241,13 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
204# Self-contained MTD device drivers 241# Self-contained MTD device drivers
205# 242#
206# CONFIG_MTD_SLRAM is not set 243# CONFIG_MTD_SLRAM is not set
244# CONFIG_MTD_PHRAM is not set
207CONFIG_MTD_MTDRAM=y 245CONFIG_MTD_MTDRAM=y
208CONFIG_MTDRAM_TOTAL_SIZE=0 246CONFIG_MTDRAM_TOTAL_SIZE=0
209CONFIG_MTDRAM_ERASE_SIZE=64 247CONFIG_MTDRAM_ERASE_SIZE=64
210CONFIG_MTDRAM_ABS_POS=0x0 248CONFIG_MTDRAM_ABS_POS=0x0
211# CONFIG_MTD_BLKMTD is not set 249# CONFIG_MTD_BLKMTD is not set
250# CONFIG_MTD_BLOCK2MTD is not set
212 251
213# 252#
214# Disk-On-Chip Device Drivers 253# Disk-On-Chip Device Drivers
@@ -235,11 +274,25 @@ CONFIG_MTDRAM_ABS_POS=0x0
235# Block devices 274# Block devices
236# 275#
237# CONFIG_BLK_DEV_FD is not set 276# CONFIG_BLK_DEV_FD is not set
277# CONFIG_BLK_DEV_COW_COMMON is not set
238# CONFIG_BLK_DEV_LOOP is not set 278# CONFIG_BLK_DEV_LOOP is not set
239# CONFIG_BLK_DEV_NBD is not set 279# CONFIG_BLK_DEV_NBD is not set
280# CONFIG_BLK_DEV_UB is not set
240CONFIG_BLK_DEV_RAM=y 281CONFIG_BLK_DEV_RAM=y
282CONFIG_BLK_DEV_RAM_COUNT=16
241CONFIG_BLK_DEV_RAM_SIZE=4096 283CONFIG_BLK_DEV_RAM_SIZE=4096
242# CONFIG_BLK_DEV_INITRD is not set 284# CONFIG_BLK_DEV_INITRD is not set
285CONFIG_INITRAMFS_SOURCE=""
286# CONFIG_CDROM_PKTCDVD is not set
287
288#
289# IO Schedulers
290#
291CONFIG_IOSCHED_NOOP=y
292# CONFIG_IOSCHED_AS is not set
293# CONFIG_IOSCHED_DEADLINE is not set
294CONFIG_IOSCHED_CFQ=y
295# CONFIG_ATA_OVER_ETH is not set
243 296
244# 297#
245# Multi-device support (RAID and LVM) 298# Multi-device support (RAID and LVM)
@@ -249,6 +302,28 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
249# 302#
250# ATA/ATAPI/MFM/RLL support 303# ATA/ATAPI/MFM/RLL support
251# 304#
305CONFIG_IDE=y
306CONFIG_BLK_DEV_IDE=y
307
308#
309# Please see Documentation/ide.txt for help/info on IDE drives
310#
311# CONFIG_BLK_DEV_IDE_SATA is not set
312CONFIG_BLK_DEV_IDEDISK=y
313# CONFIG_IDEDISK_MULTI_MODE is not set
314CONFIG_BLK_DEV_IDECD=y
315# CONFIG_BLK_DEV_IDETAPE is not set
316# CONFIG_BLK_DEV_IDEFLOPPY is not set
317# CONFIG_IDE_TASK_IOCTL is not set
318
319#
320# IDE chipset support/bugfixes
321#
322# CONFIG_IDE_GENERIC is not set
323# CONFIG_IDE_ARM is not set
324CONFIG_BLK_DEV_IDEDMA=y
325# CONFIG_IDEDMA_AUTO is not set
326# CONFIG_BLK_DEV_HD is not set
252 327
253# 328#
254# SCSI device support 329# SCSI device support
@@ -258,7 +333,6 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
258# 333#
259# IEEE 1394 (FireWire) support 334# IEEE 1394 (FireWire) support
260# 335#
261# CONFIG_IEEE1394 is not set
262 336
263# 337#
264# I2O device support 338# I2O device support
@@ -288,6 +362,9 @@ CONFIG_INET=y
288# CONFIG_INET_AH is not set 362# CONFIG_INET_AH is not set
289# CONFIG_INET_ESP is not set 363# CONFIG_INET_ESP is not set
290# CONFIG_INET_IPCOMP is not set 364# CONFIG_INET_IPCOMP is not set
365# CONFIG_INET_TUNNEL is not set
366CONFIG_IP_TCPDIAG=y
367# CONFIG_IP_TCPDIAG_IPV6 is not set
291 368
292# 369#
293# IP: Virtual Server Configuration 370# IP: Virtual Server Configuration
@@ -301,11 +378,10 @@ CONFIG_NETFILTER=y
301# IP: Netfilter Configuration 378# IP: Netfilter Configuration
302# 379#
303# CONFIG_IP_NF_CONNTRACK is not set 380# CONFIG_IP_NF_CONNTRACK is not set
381# CONFIG_IP_NF_CONNTRACK_MARK is not set
304# CONFIG_IP_NF_QUEUE is not set 382# CONFIG_IP_NF_QUEUE is not set
305# CONFIG_IP_NF_IPTABLES is not set 383# CONFIG_IP_NF_IPTABLES is not set
306# CONFIG_IP_NF_ARPTABLES is not set 384# CONFIG_IP_NF_ARPTABLES is not set
307# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
308# CONFIG_IP_NF_COMPAT_IPFWADM is not set
309 385
310# 386#
311# SCTP Configuration (EXPERIMENTAL) 387# SCTP Configuration (EXPERIMENTAL)
@@ -323,12 +399,12 @@ CONFIG_NETFILTER=y
323# CONFIG_NET_DIVERT is not set 399# CONFIG_NET_DIVERT is not set
324# CONFIG_ECONET is not set 400# CONFIG_ECONET is not set
325# CONFIG_WAN_ROUTER is not set 401# CONFIG_WAN_ROUTER is not set
326# CONFIG_NET_HW_FLOWCONTROL is not set
327 402
328# 403#
329# QoS and/or fair queueing 404# QoS and/or fair queueing
330# 405#
331# CONFIG_NET_SCHED is not set 406# CONFIG_NET_SCHED is not set
407# CONFIG_NET_CLS_ROUTE is not set
332 408
333# 409#
334# Network testing 410# Network testing
@@ -338,7 +414,26 @@ CONFIG_NETFILTER=y
338# CONFIG_NET_POLL_CONTROLLER is not set 414# CONFIG_NET_POLL_CONTROLLER is not set
339# CONFIG_HAMRADIO is not set 415# CONFIG_HAMRADIO is not set
340# CONFIG_IRDA is not set 416# CONFIG_IRDA is not set
341# CONFIG_BT is not set 417CONFIG_BT=y
418CONFIG_BT_L2CAP=y
419# CONFIG_BT_SCO is not set
420CONFIG_BT_RFCOMM=y
421# CONFIG_BT_RFCOMM_TTY is not set
422CONFIG_BT_BNEP=y
423# CONFIG_BT_BNEP_MC_FILTER is not set
424# CONFIG_BT_BNEP_PROTO_FILTER is not set
425# CONFIG_BT_HIDP is not set
426
427#
428# Bluetooth device drivers
429#
430CONFIG_BT_HCIUSB=y
431# CONFIG_BT_HCIUSB_SCO is not set
432# CONFIG_BT_HCIUART is not set
433# CONFIG_BT_HCIBCM203X is not set
434# CONFIG_BT_HCIBPA10X is not set
435# CONFIG_BT_HCIBFUSB is not set
436# CONFIG_BT_HCIVHCI is not set
342CONFIG_NETDEVICES=y 437CONFIG_NETDEVICES=y
343# CONFIG_DUMMY is not set 438# CONFIG_DUMMY is not set
344# CONFIG_BONDING is not set 439# CONFIG_BONDING is not set
@@ -348,6 +443,7 @@ CONFIG_NETDEVICES=y
348# 443#
349# Ethernet (10 or 100Mbit) 444# Ethernet (10 or 100Mbit)
350# 445#
446CONFIG_NET_ETHERNET=y
351# CONFIG_MII is not set 447# CONFIG_MII is not set
352 448
353# 449#
@@ -389,11 +485,19 @@ CONFIG_NETDEVICES=y
389# 485#
390# Input device support 486# Input device support
391# 487#
392# CONFIG_INPUT is not set 488CONFIG_INPUT=y
393 489
394# 490#
395# Userland interfaces 491# Userland interfaces
396# 492#
493CONFIG_INPUT_MOUSEDEV=y
494CONFIG_INPUT_MOUSEDEV_PSAUX=y
495CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
496CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
497# CONFIG_INPUT_JOYDEV is not set
498# CONFIG_INPUT_TSDEV is not set
499# CONFIG_INPUT_EVDEV is not set
500# CONFIG_INPUT_EVBUG is not set
397 501
398# 502#
399# Input I/O drivers 503# Input I/O drivers
@@ -404,10 +508,25 @@ CONFIG_SERIO=y
404# CONFIG_SERIO_I8042 is not set 508# CONFIG_SERIO_I8042 is not set
405# CONFIG_SERIO_SERPORT is not set 509# CONFIG_SERIO_SERPORT is not set
406# CONFIG_SERIO_CT82C710 is not set 510# CONFIG_SERIO_CT82C710 is not set
511CONFIG_SERIO_LIBPS2=y
512# CONFIG_SERIO_RAW is not set
407 513
408# 514#
409# Input Device Drivers 515# Input Device Drivers
410# 516#
517CONFIG_INPUT_KEYBOARD=y
518CONFIG_KEYBOARD_ATKBD=y
519# CONFIG_KEYBOARD_SUNKBD is not set
520# CONFIG_KEYBOARD_LKKBD is not set
521# CONFIG_KEYBOARD_XTKBD is not set
522# CONFIG_KEYBOARD_NEWTON is not set
523CONFIG_INPUT_MOUSE=y
524CONFIG_MOUSE_PS2=y
525# CONFIG_MOUSE_SERIAL is not set
526# CONFIG_MOUSE_VSXXXAA is not set
527# CONFIG_INPUT_JOYSTICK is not set
528# CONFIG_INPUT_TOUCHSCREEN is not set
529# CONFIG_INPUT_MISC is not set
411 530
412# 531#
413# Character devices 532# Character devices
@@ -426,7 +545,6 @@ CONFIG_SERIO=y
426CONFIG_UNIX98_PTYS=y 545CONFIG_UNIX98_PTYS=y
427CONFIG_LEGACY_PTYS=y 546CONFIG_LEGACY_PTYS=y
428CONFIG_LEGACY_PTY_COUNT=256 547CONFIG_LEGACY_PTY_COUNT=256
429# CONFIG_QIC02_TAPE is not set
430 548
431# 549#
432# IPMI 550# IPMI
@@ -441,13 +559,10 @@ CONFIG_LEGACY_PTY_COUNT=256
441# CONFIG_GEN_RTC is not set 559# CONFIG_GEN_RTC is not set
442# CONFIG_DTLK is not set 560# CONFIG_DTLK is not set
443# CONFIG_R3964 is not set 561# CONFIG_R3964 is not set
444# CONFIG_APPLICOM is not set
445 562
446# 563#
447# Ftape, the floppy tape device driver 564# Ftape, the floppy tape device driver
448# 565#
449# CONFIG_FTAPE is not set
450# CONFIG_AGP is not set
451# CONFIG_DRM is not set 566# CONFIG_DRM is not set
452# CONFIG_RAW_DRIVER is not set 567# CONFIG_RAW_DRIVER is not set
453 568
@@ -469,10 +584,15 @@ CONFIG_LEGACY_PTY_COUNT=256
469# CONFIG_JBD is not set 584# CONFIG_JBD is not set
470# CONFIG_REISERFS_FS is not set 585# CONFIG_REISERFS_FS is not set
471# CONFIG_JFS_FS is not set 586# CONFIG_JFS_FS is not set
587
588#
589# XFS support
590#
472# CONFIG_XFS_FS is not set 591# CONFIG_XFS_FS is not set
473# CONFIG_MINIX_FS is not set 592# CONFIG_MINIX_FS is not set
474# CONFIG_ROMFS_FS is not set 593# CONFIG_ROMFS_FS is not set
475# CONFIG_QUOTA is not set 594# CONFIG_QUOTA is not set
595CONFIG_DNOTIFY=y
476# CONFIG_AUTOFS_FS is not set 596# CONFIG_AUTOFS_FS is not set
477# CONFIG_AUTOFS4_FS is not set 597# CONFIG_AUTOFS4_FS is not set
478 598
@@ -485,7 +605,8 @@ CONFIG_LEGACY_PTY_COUNT=256
485# 605#
486# DOS/FAT/NT Filesystems 606# DOS/FAT/NT Filesystems
487# 607#
488# CONFIG_FAT_FS is not set 608# CONFIG_MSDOS_FS is not set
609# CONFIG_VFAT_FS is not set
489# CONFIG_NTFS_FS is not set 610# CONFIG_NTFS_FS is not set
490 611
491# 612#
@@ -497,6 +618,7 @@ CONFIG_SYSFS=y
497# CONFIG_DEVFS_FS is not set 618# CONFIG_DEVFS_FS is not set
498# CONFIG_DEVPTS_FS_XATTR is not set 619# CONFIG_DEVPTS_FS_XATTR is not set
499CONFIG_TMPFS=y 620CONFIG_TMPFS=y
621# CONFIG_TMPFS_XATTR is not set
500# CONFIG_HUGETLB_PAGE is not set 622# CONFIG_HUGETLB_PAGE is not set
501CONFIG_RAMFS=y 623CONFIG_RAMFS=y
502 624
@@ -512,7 +634,15 @@ CONFIG_RAMFS=y
512# CONFIG_EFS_FS is not set 634# CONFIG_EFS_FS is not set
513CONFIG_JFFS_FS=y 635CONFIG_JFFS_FS=y
514CONFIG_JFFS_FS_VERBOSE=0 636CONFIG_JFFS_FS_VERBOSE=0
515# CONFIG_JFFS2_FS is not set 637# CONFIG_JFFS_PROC_FS is not set
638CONFIG_JFFS2_FS=y
639CONFIG_JFFS2_FS_DEBUG=0
640# CONFIG_JFFS2_FS_NAND is not set
641# CONFIG_JFFS2_FS_NOR_ECC is not set
642# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
643CONFIG_JFFS2_ZLIB=y
644CONFIG_JFFS2_RTIME=y
645# CONFIG_JFFS2_RUBIN is not set
516CONFIG_CRAMFS=y 646CONFIG_CRAMFS=y
517# CONFIG_VXFS_FS is not set 647# CONFIG_VXFS_FS is not set
518# CONFIG_HPFS_FS is not set 648# CONFIG_HPFS_FS is not set
@@ -530,14 +660,13 @@ CONFIG_NFS_V3=y
530# CONFIG_NFSD is not set 660# CONFIG_NFSD is not set
531CONFIG_LOCKD=y 661CONFIG_LOCKD=y
532CONFIG_LOCKD_V4=y 662CONFIG_LOCKD_V4=y
533# CONFIG_EXPORTFS is not set
534CONFIG_SUNRPC=y 663CONFIG_SUNRPC=y
535# CONFIG_RPCSEC_GSS_KRB5 is not set 664# CONFIG_RPCSEC_GSS_KRB5 is not set
665# CONFIG_RPCSEC_GSS_SPKM3 is not set
536# CONFIG_SMB_FS is not set 666# CONFIG_SMB_FS is not set
537# CONFIG_CIFS is not set 667# CONFIG_CIFS is not set
538# CONFIG_NCP_FS is not set 668# CONFIG_NCP_FS is not set
539# CONFIG_CODA_FS is not set 669# CONFIG_CODA_FS is not set
540# CONFIG_INTERMEZZO_FS is not set
541# CONFIG_AFS_FS is not set 670# CONFIG_AFS_FS is not set
542 671
543# 672#
@@ -557,8 +686,120 @@ CONFIG_MSDOS_PARTITION=y
557# CONFIG_SOUND is not set 686# CONFIG_SOUND is not set
558 687
559# 688#
689# PCCARD (PCMCIA/CardBus) support
690#
691# CONFIG_PCCARD is not set
692
693#
694# PC-card bridges
695#
696
697#
560# USB support 698# USB support
561# 699#
700CONFIG_USB=y
701# CONFIG_USB_DEBUG is not set
702
703#
704# Miscellaneous USB options
705#
706CONFIG_USB_DEVICEFS=y
707# CONFIG_USB_BANDWIDTH is not set
708# CONFIG_USB_DYNAMIC_MINORS is not set
709# CONFIG_USB_OTG is not set
710# CONFIG_USB_ARCH_HAS_HCD is not set
711# CONFIG_USB_ARCH_HAS_OHCI is not set
712
713#
714# USB Host Controller Drivers
715#
716# CONFIG_USB_SL811_HCD is not set
717
718#
719# USB Device Class drivers
720#
721
722#
723# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
724#
725# CONFIG_USB_ACM is not set
726# CONFIG_USB_PRINTER is not set
727
728#
729# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
730#
731# CONFIG_USB_STORAGE is not set
732
733#
734# USB Input Devices
735#
736# CONFIG_USB_HID is not set
737
738#
739# USB HID Boot Protocol drivers
740#
741# CONFIG_USB_KBD is not set
742# CONFIG_USB_MOUSE is not set
743# CONFIG_USB_AIPTEK is not set
744# CONFIG_USB_WACOM is not set
745# CONFIG_USB_KBTAB is not set
746# CONFIG_USB_POWERMATE is not set
747# CONFIG_USB_MTOUCH is not set
748# CONFIG_USB_EGALAX is not set
749# CONFIG_USB_XPAD is not set
750# CONFIG_USB_ATI_REMOTE is not set
751
752#
753# USB Imaging devices
754#
755# CONFIG_USB_MDC800 is not set
756
757#
758# USB Multimedia devices
759#
760# CONFIG_USB_DABUSB is not set
761
762#
763# Video4Linux support is needed for USB Multimedia device support
764#
765
766#
767# USB Network Adapters
768#
769# CONFIG_USB_CATC is not set
770# CONFIG_USB_KAWETH is not set
771# CONFIG_USB_PEGASUS is not set
772CONFIG_USB_RTL8150=y
773# CONFIG_USB_USBNET is not set
774
775#
776# USB port drivers
777#
778
779#
780# USB Serial Converter support
781#
782# CONFIG_USB_SERIAL is not set
783
784#
785# USB Miscellaneous drivers
786#
787# CONFIG_USB_EMI62 is not set
788# CONFIG_USB_EMI26 is not set
789# CONFIG_USB_AUERSWALD is not set
790# CONFIG_USB_RIO500 is not set
791# CONFIG_USB_LEGOTOWER is not set
792# CONFIG_USB_LCD is not set
793# CONFIG_USB_LED is not set
794# CONFIG_USB_CYTHERM is not set
795# CONFIG_USB_PHIDGETKIT is not set
796# CONFIG_USB_PHIDGETSERVO is not set
797# CONFIG_USB_IDMOUSE is not set
798# CONFIG_USB_TEST is not set
799
800#
801# USB ATM/DSL drivers
802#
562 803
563# 804#
564# USB Gadget Support 805# USB Gadget Support
@@ -568,14 +809,17 @@ CONFIG_MSDOS_PARTITION=y
568# 809#
569# Kernel hacking 810# Kernel hacking
570# 811#
571# CONFIG_PROFILE is not set 812# CONFIG_PROFILING is not set
813# CONFIG_SYSTEM_PROFILER is not set
572# CONFIG_ETRAX_KGDB is not set 814# CONFIG_ETRAX_KGDB is not set
573# CONFIG_DEBUG_INFO is not set 815# CONFIG_DEBUG_INFO is not set
574# CONFIG_FRAME_POINTER is not set 816# CONFIG_FRAME_POINTER is not set
817# CONFIG_DEBUG_NMI_OOPS is not set
575 818
576# 819#
577# Security options 820# Security options
578# 821#
822# CONFIG_KEYS is not set
579# CONFIG_SECURITY is not set 823# CONFIG_SECURITY is not set
580 824
581# 825#
@@ -584,8 +828,14 @@ CONFIG_MSDOS_PARTITION=y
584# CONFIG_CRYPTO is not set 828# CONFIG_CRYPTO is not set
585 829
586# 830#
831# Hardware crypto devices
832#
833
834#
587# Library routines 835# Library routines
588# 836#
589# CONFIG_CRC32 is not set 837# CONFIG_CRC_CCITT is not set
838CONFIG_CRC32=y
590# CONFIG_LIBCRC32C is not set 839# CONFIG_LIBCRC32C is not set
591CONFIG_ZLIB_INFLATE=y 840CONFIG_ZLIB_INFLATE=y
841CONFIG_ZLIB_DEFLATE=y
diff --git a/arch/cris/kernel/Makefile b/arch/cris/kernel/Makefile
index 1546a0e74047..c8e8ea570989 100644
--- a/arch/cris/kernel/Makefile
+++ b/arch/cris/kernel/Makefile
@@ -1,4 +1,4 @@
1# $Id: Makefile,v 1.10 2004/05/14 10:18:12 starvik Exp $ 1# $Id: Makefile,v 1.12 2004/10/19 13:07:43 starvik Exp $
2# 2#
3# Makefile for the linux kernel. 3# Makefile for the linux kernel.
4# 4#
@@ -10,6 +10,7 @@ obj-y := process.o traps.o irq.o ptrace.o setup.o \
10 10
11obj-$(CONFIG_MODULES) += crisksyms.o 11obj-$(CONFIG_MODULES) += crisksyms.o
12obj-$(CONFIG_MODULES) += module.o 12obj-$(CONFIG_MODULES) += module.o
13obj-$(CONFIG_SYSTEM_PROFILER) += profile.o
13 14
14clean: 15clean:
15 16
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-22 23:05:47 -0500