diff options
author | Paul Mackerras <paulus@samba.org> | 2007-08-28 01:56:11 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-08-28 01:56:11 -0400 |
commit | 35438c4327df18dbf5e7f597b69299119f4a14de (patch) | |
tree | a4589d731015db93f2eba8f84ffb1f48a8084020 /arch | |
parent | 2f6c9d961081dc7b109eb19166244bcb2a5dfc28 (diff) | |
parent | b07d68b5ca4d55a16fab223d63d5fb36f89ff42f (diff) |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'arch')
174 files changed, 4013 insertions, 6752 deletions
diff --git a/arch/arm/mach-ks8695/board-micrel.c b/arch/arm/mach-ks8695/board-micrel.c index 8fc0edb5211e..2feeef81d843 100644 --- a/arch/arm/mach-ks8695/board-micrel.c +++ b/arch/arm/mach-ks8695/board-micrel.c | |||
@@ -23,24 +23,24 @@ | |||
23 | #include "generic.h" | 23 | #include "generic.h" |
24 | 24 | ||
25 | #ifdef CONFIG_PCI | 25 | #ifdef CONFIG_PCI |
26 | static int __init micrel_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 26 | static int micrel_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) |
27 | { | 27 | { |
28 | return KS8695_IRQ_EXTERN0; | 28 | return KS8695_IRQ_EXTERN0; |
29 | } | 29 | } |
30 | 30 | ||
31 | static struct ks8695_pci_cfg micrel_pci = { | 31 | static struct ks8695_pci_cfg __initdata micrel_pci = { |
32 | .mode = KS8695_MODE_MINIPCI, | 32 | .mode = KS8695_MODE_MINIPCI, |
33 | .map_irq = micrel_pci_map_irq, | 33 | .map_irq = micrel_pci_map_irq, |
34 | }; | 34 | }; |
35 | #endif | 35 | #endif |
36 | 36 | ||
37 | 37 | ||
38 | static void micrel_init(void) | 38 | static void __init micrel_init(void) |
39 | { | 39 | { |
40 | printk(KERN_INFO "Micrel KS8695 Development Board initializing\n"); | 40 | printk(KERN_INFO "Micrel KS8695 Development Board initializing\n"); |
41 | 41 | ||
42 | #ifdef CONFIG_PCI | 42 | #ifdef CONFIG_PCI |
43 | ks8695_init_pci(&micrel_pci); | 43 | // ks8695_init_pci(&micrel_pci); |
44 | #endif | 44 | #endif |
45 | 45 | ||
46 | /* Add devices */ | 46 | /* Add devices */ |
diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig index 88d5fd34fe3b..26d131a77074 100644 --- a/arch/arm/mach-s3c2442/Kconfig +++ b/arch/arm/mach-s3c2442/Kconfig | |||
@@ -6,7 +6,7 @@ | |||
6 | 6 | ||
7 | config CPU_S3C2442 | 7 | config CPU_S3C2442 |
8 | bool | 8 | bool |
9 | depends on ARCH_S3C2420 | 9 | depends on ARCH_S3C2410 |
10 | select S3C2410_CLOCK | 10 | select S3C2410_CLOCK |
11 | select S3C2410_GPIO | 11 | select S3C2410_GPIO |
12 | select S3C2410_PM if PM | 12 | select S3C2410_PM if PM |
diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c index 2edcecdea8bd..ef801563bbf5 100644 --- a/arch/avr32/boards/atngw100/setup.c +++ b/arch/avr32/boards/atngw100/setup.c | |||
@@ -9,6 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | #include <linux/clk.h> | 10 | #include <linux/clk.h> |
11 | #include <linux/etherdevice.h> | 11 | #include <linux/etherdevice.h> |
12 | #include <linux/i2c-gpio.h> | ||
12 | #include <linux/init.h> | 13 | #include <linux/init.h> |
13 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
14 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
@@ -123,6 +124,19 @@ static struct platform_device ngw_gpio_leds = { | |||
123 | } | 124 | } |
124 | }; | 125 | }; |
125 | 126 | ||
127 | static struct i2c_gpio_platform_data i2c_gpio_data = { | ||
128 | .sda_pin = GPIO_PIN_PA(6), | ||
129 | .scl_pin = GPIO_PIN_PA(7), | ||
130 | }; | ||
131 | |||
132 | static struct platform_device i2c_gpio_device = { | ||
133 | .name = "i2c-gpio", | ||
134 | .id = 0, | ||
135 | .dev = { | ||
136 | .platform_data = &i2c_gpio_data, | ||
137 | }, | ||
138 | }; | ||
139 | |||
126 | static int __init atngw100_init(void) | 140 | static int __init atngw100_init(void) |
127 | { | 141 | { |
128 | unsigned i; | 142 | unsigned i; |
@@ -147,6 +161,10 @@ static int __init atngw100_init(void) | |||
147 | } | 161 | } |
148 | platform_device_register(&ngw_gpio_leds); | 162 | platform_device_register(&ngw_gpio_leds); |
149 | 163 | ||
164 | at32_select_gpio(i2c_gpio_data.sda_pin, 0); | ||
165 | at32_select_gpio(i2c_gpio_data.scl_pin, 0); | ||
166 | platform_device_register(&i2c_gpio_device); | ||
167 | |||
150 | return 0; | 168 | return 0; |
151 | } | 169 | } |
152 | postcore_initcall(atngw100_init); | 170 | postcore_initcall(atngw100_init); |
diff --git a/arch/avr32/boards/atstk1000/Kconfig b/arch/avr32/boards/atstk1000/Kconfig index 71bc7d364fb7..718578f64069 100644 --- a/arch/avr32/boards/atstk1000/Kconfig +++ b/arch/avr32/boards/atstk1000/Kconfig | |||
@@ -50,4 +50,30 @@ config BOARD_ATSTK1002_SPI1 | |||
50 | GPIO lines and accessed through the J1 jumper block. Say "y" | 50 | GPIO lines and accessed through the J1 jumper block. Say "y" |
51 | here to configure that SPI controller. | 51 | here to configure that SPI controller. |
52 | 52 | ||
53 | config BOARD_ATSTK1002_J2_LED | ||
54 | bool | ||
55 | default BOARD_ATSTK1002_J2_LED8 || BOARD_ATSTK1002_J2_RGB | ||
56 | |||
57 | choice | ||
58 | prompt "LEDs connected to J2:" | ||
59 | depends on LEDS_GPIO && !BOARD_ATSTK1002_SW4_CUSTOM | ||
60 | optional | ||
61 | help | ||
62 | Select this if you have jumpered the J2 jumper block to the | ||
63 | LED0..LED7 amber leds, or to the RGB leds, using a ten-pin | ||
64 | IDC cable. A default "heartbeat" trigger is provided, but | ||
65 | you can of course override this. | ||
66 | |||
67 | config BOARD_ATSTK1002_J2_LED8 | ||
68 | bool "LED0..LED7" | ||
69 | help | ||
70 | Select this if J2 is jumpered to LED0..LED7 amber leds. | ||
71 | |||
72 | config BOARD_ATSTK1002_J2_RGB | ||
73 | bool "RGB leds" | ||
74 | help | ||
75 | Select this if J2 is jumpered to the RGB leds. | ||
76 | |||
77 | endchoice | ||
78 | |||
53 | endif # stk 1002 | 79 | endif # stk 1002 |
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c index cb93eabb9c6c..c9981b731efa 100644 --- a/arch/avr32/boards/atstk1000/atstk1002.c +++ b/arch/avr32/boards/atstk1000/atstk1002.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/etherdevice.h> | 11 | #include <linux/etherdevice.h> |
12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
14 | #include <linux/leds.h> | ||
14 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
15 | #include <linux/string.h> | 16 | #include <linux/string.h> |
16 | #include <linux/types.h> | 17 | #include <linux/types.h> |
@@ -120,6 +121,65 @@ static void __init set_hw_addr(struct platform_device *pdev) | |||
120 | clk_put(pclk); | 121 | clk_put(pclk); |
121 | } | 122 | } |
122 | 123 | ||
124 | #ifdef CONFIG_BOARD_ATSTK1002_J2_LED | ||
125 | |||
126 | static struct gpio_led stk_j2_led[] = { | ||
127 | #ifdef CONFIG_BOARD_ATSTK1002_J2_LED8 | ||
128 | #define LEDSTRING "J2 jumpered to LED8" | ||
129 | { .name = "led0:amber", .gpio = GPIO_PIN_PB( 8), }, | ||
130 | { .name = "led1:amber", .gpio = GPIO_PIN_PB( 9), }, | ||
131 | { .name = "led2:amber", .gpio = GPIO_PIN_PB(10), }, | ||
132 | { .name = "led3:amber", .gpio = GPIO_PIN_PB(13), }, | ||
133 | { .name = "led4:amber", .gpio = GPIO_PIN_PB(14), }, | ||
134 | { .name = "led5:amber", .gpio = GPIO_PIN_PB(15), }, | ||
135 | { .name = "led6:amber", .gpio = GPIO_PIN_PB(16), }, | ||
136 | { .name = "led7:amber", .gpio = GPIO_PIN_PB(30), | ||
137 | .default_trigger = "heartbeat", }, | ||
138 | #else /* RGB */ | ||
139 | #define LEDSTRING "J2 jumpered to RGB LEDs" | ||
140 | { .name = "r1:red", .gpio = GPIO_PIN_PB( 8), }, | ||
141 | { .name = "g1:green", .gpio = GPIO_PIN_PB(10), }, | ||
142 | { .name = "b1:blue", .gpio = GPIO_PIN_PB(14), }, | ||
143 | |||
144 | { .name = "r2:red", .gpio = GPIO_PIN_PB( 9), | ||
145 | .default_trigger = "heartbeat", }, | ||
146 | { .name = "g2:green", .gpio = GPIO_PIN_PB(13), }, | ||
147 | { .name = "b2:blue", .gpio = GPIO_PIN_PB(15), | ||
148 | .default_trigger = "heartbeat", }, | ||
149 | /* PB16, PB30 unused */ | ||
150 | #endif | ||
151 | }; | ||
152 | |||
153 | static struct gpio_led_platform_data stk_j2_led_data = { | ||
154 | .num_leds = ARRAY_SIZE(stk_j2_led), | ||
155 | .leds = stk_j2_led, | ||
156 | }; | ||
157 | |||
158 | static struct platform_device stk_j2_led_dev = { | ||
159 | .name = "leds-gpio", | ||
160 | .id = 2, /* gpio block J2 */ | ||
161 | .dev = { | ||
162 | .platform_data = &stk_j2_led_data, | ||
163 | }, | ||
164 | }; | ||
165 | |||
166 | static void setup_j2_leds(void) | ||
167 | { | ||
168 | unsigned i; | ||
169 | |||
170 | for (i = 0; i < ARRAY_SIZE(stk_j2_led); i++) | ||
171 | at32_select_gpio(stk_j2_led[i].gpio, AT32_GPIOF_OUTPUT); | ||
172 | |||
173 | printk("STK1002: " LEDSTRING "\n"); | ||
174 | platform_device_register(&stk_j2_led_dev); | ||
175 | } | ||
176 | |||
177 | #else | ||
178 | static void setup_j2_leds(void) | ||
179 | { | ||
180 | } | ||
181 | #endif | ||
182 | |||
123 | void __init setup_board(void) | 183 | void __init setup_board(void) |
124 | { | 184 | { |
125 | #ifdef CONFIG_BOARD_ATSTK1002_SW2_CUSTOM | 185 | #ifdef CONFIG_BOARD_ATSTK1002_SW2_CUSTOM |
@@ -185,6 +245,8 @@ static int __init atstk1002_init(void) | |||
185 | at32_add_device_ssc(0, ATMEL_SSC_TX); | 245 | at32_add_device_ssc(0, ATMEL_SSC_TX); |
186 | #endif | 246 | #endif |
187 | 247 | ||
248 | setup_j2_leds(); | ||
249 | |||
188 | return 0; | 250 | return 0; |
189 | } | 251 | } |
190 | postcore_initcall(atstk1002_init); | 252 | postcore_initcall(atstk1002_init); |
diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig index e7e724bc0ba6..03e2e68f947d 100644 --- a/arch/cris/arch-v10/drivers/Kconfig +++ b/arch/cris/arch-v10/drivers/Kconfig | |||
@@ -548,6 +548,7 @@ config ETRAX_IDE | |||
548 | select BLK_DEV_IDEDISK | 548 | select BLK_DEV_IDEDISK |
549 | select BLK_DEV_IDECD | 549 | select BLK_DEV_IDECD |
550 | select BLK_DEV_IDEDMA | 550 | select BLK_DEV_IDEDMA |
551 | select IDE_GENERIC | ||
551 | help | 552 | help |
552 | Enable this to get support for ATA/IDE. | 553 | Enable this to get support for ATA/IDE. |
553 | You can't use parallel ports or SCSI ports | 554 | You can't use parallel ports or SCSI ports |
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig index 1d859c16931e..cc6ba5423754 100644 --- a/arch/cris/arch-v32/drivers/Kconfig +++ b/arch/cris/arch-v32/drivers/Kconfig | |||
@@ -592,6 +592,7 @@ config ETRAX_IDE | |||
592 | select BLK_DEV_IDEDISK | 592 | select BLK_DEV_IDEDISK |
593 | select BLK_DEV_IDECD | 593 | select BLK_DEV_IDECD |
594 | select BLK_DEV_IDEDMA | 594 | select BLK_DEV_IDEDMA |
595 | select IDE_GENERIC | ||
595 | help | 596 | help |
596 | Enables the ETRAX IDE driver. | 597 | Enables the ETRAX IDE driver. |
597 | 598 | ||
diff --git a/arch/h8300/kernel/process.c b/arch/h8300/kernel/process.c index e061b63a0038..dfbe7ab9ffe2 100644 --- a/arch/h8300/kernel/process.c +++ b/arch/h8300/kernel/process.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include <linux/a.out.h> | 37 | #include <linux/a.out.h> |
38 | #include <linux/interrupt.h> | 38 | #include <linux/interrupt.h> |
39 | #include <linux/reboot.h> | 39 | #include <linux/reboot.h> |
40 | #include <linux/fs.h> | ||
40 | 41 | ||
41 | #include <asm/uaccess.h> | 42 | #include <asm/uaccess.h> |
42 | #include <asm/system.h> | 43 | #include <asm/system.h> |
diff --git a/arch/h8300/kernel/sys_h8300.c b/arch/h8300/kernel/sys_h8300.c index de7688cfd573..ddc62727dc9f 100644 --- a/arch/h8300/kernel/sys_h8300.c +++ b/arch/h8300/kernel/sys_h8300.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/mman.h> | 18 | #include <linux/mman.h> |
19 | #include <linux/file.h> | 19 | #include <linux/file.h> |
20 | #include <linux/utsname.h> | 20 | #include <linux/utsname.h> |
21 | #include <linux/fs.h> | ||
21 | 22 | ||
22 | #include <asm/setup.h> | 23 | #include <asm/setup.h> |
23 | #include <asm/uaccess.h> | 24 | #include <asm/uaccess.h> |
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index f9524933258a..97b64d7d6bf6 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig | |||
@@ -614,10 +614,14 @@ config X86_PAE | |||
614 | 614 | ||
615 | # Common NUMA Features | 615 | # Common NUMA Features |
616 | config NUMA | 616 | config NUMA |
617 | bool "Numa Memory Allocation and Scheduler Support" | 617 | bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)" |
618 | depends on SMP && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI) | 618 | depends on SMP && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI) && EXPERIMENTAL |
619 | default n if X86_PC | 619 | default n if X86_PC |
620 | default y if (X86_NUMAQ || X86_SUMMIT) | 620 | default y if (X86_NUMAQ || X86_SUMMIT) |
621 | help | ||
622 | NUMA support for i386. This is currently high experimental | ||
623 | and should be only used for kernel development. It might also | ||
624 | cause boot failures. | ||
621 | 625 | ||
622 | comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI" | 626 | comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI" |
623 | depends on X86_SUMMIT && (!HIGHMEM64G || !ACPI) | 627 | depends on X86_SUMMIT && (!HIGHMEM64G || !ACPI) |
@@ -1228,6 +1232,11 @@ menuconfig INSTRUMENTATION | |||
1228 | bool "Instrumentation Support" | 1232 | bool "Instrumentation Support" |
1229 | depends on EXPERIMENTAL | 1233 | depends on EXPERIMENTAL |
1230 | default y | 1234 | default y |
1235 | ---help--- | ||
1236 | Say Y here to get to see options related to performance measurement, | ||
1237 | debugging, and testing. This option alone does not add any kernel code. | ||
1238 | |||
1239 | If you say N, all options in this submenu will be skipped and disabled. | ||
1231 | 1240 | ||
1232 | if INSTRUMENTATION | 1241 | if INSTRUMENTATION |
1233 | 1242 | ||
diff --git a/arch/i386/Makefile b/arch/i386/Makefile index 01f0ff0daaf4..52b932478c6d 100644 --- a/arch/i386/Makefile +++ b/arch/i386/Makefile | |||
@@ -51,8 +51,8 @@ cflags-y += -maccumulate-outgoing-args | |||
51 | CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then echo $(call cc-option,-fno-unit-at-a-time); fi ;) | 51 | CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then echo $(call cc-option,-fno-unit-at-a-time); fi ;) |
52 | 52 | ||
53 | # do binutils support CFI? | 53 | # do binutils support CFI? |
54 | cflags-y += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,) | 54 | cflags-y += $(call as-instr,.cfi_startproc\n.cfi_rel_offset esp${comma}0\n.cfi_endproc,-DCONFIG_AS_CFI=1,) |
55 | AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,) | 55 | AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_rel_offset esp${comma}0\n.cfi_endproc,-DCONFIG_AS_CFI=1,) |
56 | 56 | ||
57 | # is .cfi_signal_frame supported too? | 57 | # is .cfi_signal_frame supported too? |
58 | cflags-y += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1,) | 58 | cflags-y += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1,) |
diff --git a/arch/i386/boot/boot.h b/arch/i386/boot/boot.h index dec70c9b6050..20bab9431acb 100644 --- a/arch/i386/boot/boot.h +++ b/arch/i386/boot/boot.h | |||
@@ -87,7 +87,7 @@ static inline void set_fs(u16 seg) | |||
87 | static inline u16 fs(void) | 87 | static inline u16 fs(void) |
88 | { | 88 | { |
89 | u16 seg; | 89 | u16 seg; |
90 | asm("movw %%fs,%0" : "=rm" (seg)); | 90 | asm volatile("movw %%fs,%0" : "=rm" (seg)); |
91 | return seg; | 91 | return seg; |
92 | } | 92 | } |
93 | 93 | ||
@@ -98,7 +98,7 @@ static inline void set_gs(u16 seg) | |||
98 | static inline u16 gs(void) | 98 | static inline u16 gs(void) |
99 | { | 99 | { |
100 | u16 seg; | 100 | u16 seg; |
101 | asm("movw %%gs,%0" : "=rm" (seg)); | 101 | asm volatile("movw %%gs,%0" : "=rm" (seg)); |
102 | return seg; | 102 | return seg; |
103 | } | 103 | } |
104 | 104 | ||
@@ -107,19 +107,19 @@ typedef unsigned int addr_t; | |||
107 | static inline u8 rdfs8(addr_t addr) | 107 | static inline u8 rdfs8(addr_t addr) |
108 | { | 108 | { |
109 | u8 v; | 109 | u8 v; |
110 | asm("movb %%fs:%1,%0" : "=r" (v) : "m" (*(u8 *)addr)); | 110 | asm volatile("movb %%fs:%1,%0" : "=r" (v) : "m" (*(u8 *)addr)); |
111 | return v; | 111 | return v; |
112 | } | 112 | } |
113 | static inline u16 rdfs16(addr_t addr) | 113 | static inline u16 rdfs16(addr_t addr) |
114 | { | 114 | { |
115 | u16 v; | 115 | u16 v; |
116 | asm("movw %%fs:%1,%0" : "=r" (v) : "m" (*(u16 *)addr)); | 116 | asm volatile("movw %%fs:%1,%0" : "=r" (v) : "m" (*(u16 *)addr)); |
117 | return v; | 117 | return v; |
118 | } | 118 | } |
119 | static inline u32 rdfs32(addr_t addr) | 119 | static inline u32 rdfs32(addr_t addr) |
120 | { | 120 | { |
121 | u32 v; | 121 | u32 v; |
122 | asm("movl %%fs:%1,%0" : "=r" (v) : "m" (*(u32 *)addr)); | 122 | asm volatile("movl %%fs:%1,%0" : "=r" (v) : "m" (*(u32 *)addr)); |
123 | return v; | 123 | return v; |
124 | } | 124 | } |
125 | 125 | ||
@@ -139,19 +139,19 @@ static inline void wrfs32(u32 v, addr_t addr) | |||
139 | static inline u8 rdgs8(addr_t addr) | 139 | static inline u8 rdgs8(addr_t addr) |
140 | { | 140 | { |
141 | u8 v; | 141 | u8 v; |
142 | asm("movb %%gs:%1,%0" : "=r" (v) : "m" (*(u8 *)addr)); | 142 | asm volatile("movb %%gs:%1,%0" : "=r" (v) : "m" (*(u8 *)addr)); |
143 | return v; | 143 | return v; |
144 | } | 144 | } |
145 | static inline u16 rdgs16(addr_t addr) | 145 | static inline u16 rdgs16(addr_t addr) |
146 | { | 146 | { |
147 | u16 v; | 147 | u16 v; |
148 | asm("movw %%gs:%1,%0" : "=r" (v) : "m" (*(u16 *)addr)); | 148 | asm volatile("movw %%gs:%1,%0" : "=r" (v) : "m" (*(u16 *)addr)); |
149 | return v; | 149 | return v; |
150 | } | 150 | } |
151 | static inline u32 rdgs32(addr_t addr) | 151 | static inline u32 rdgs32(addr_t addr) |
152 | { | 152 | { |
153 | u32 v; | 153 | u32 v; |
154 | asm("movl %%gs:%1,%0" : "=r" (v) : "m" (*(u32 *)addr)); | 154 | asm volatile("movl %%gs:%1,%0" : "=r" (v) : "m" (*(u32 *)addr)); |
155 | return v; | 155 | return v; |
156 | } | 156 | } |
157 | 157 | ||
@@ -180,15 +180,15 @@ static inline int memcmp(const void *s1, const void *s2, size_t len) | |||
180 | static inline int memcmp_fs(const void *s1, addr_t s2, size_t len) | 180 | static inline int memcmp_fs(const void *s1, addr_t s2, size_t len) |
181 | { | 181 | { |
182 | u8 diff; | 182 | u8 diff; |
183 | asm("fs; repe; cmpsb; setnz %0" | 183 | asm volatile("fs; repe; cmpsb; setnz %0" |
184 | : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); | 184 | : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); |
185 | return diff; | 185 | return diff; |
186 | } | 186 | } |
187 | static inline int memcmp_gs(const void *s1, addr_t s2, size_t len) | 187 | static inline int memcmp_gs(const void *s1, addr_t s2, size_t len) |
188 | { | 188 | { |
189 | u8 diff; | 189 | u8 diff; |
190 | asm("gs; repe; cmpsb; setnz %0" | 190 | asm volatile("gs; repe; cmpsb; setnz %0" |
191 | : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); | 191 | : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); |
192 | return diff; | 192 | return diff; |
193 | } | 193 | } |
194 | 194 | ||
diff --git a/arch/i386/boot/cpucheck.c b/arch/i386/boot/cpucheck.c index 991e8ceae1de..e655a89c5510 100644 --- a/arch/i386/boot/cpucheck.c +++ b/arch/i386/boot/cpucheck.c | |||
@@ -96,7 +96,8 @@ static int has_fpu(void) | |||
96 | asm volatile("movl %0,%%cr0" : : "r" (cr0)); | 96 | asm volatile("movl %0,%%cr0" : : "r" (cr0)); |
97 | } | 97 | } |
98 | 98 | ||
99 | asm("fninit ; fnstsw %0 ; fnstcw %1" : "+m" (fsw), "+m" (fcw)); | 99 | asm volatile("fninit ; fnstsw %0 ; fnstcw %1" |
100 | : "+m" (fsw), "+m" (fcw)); | ||
100 | 101 | ||
101 | return fsw == 0 && (fcw & 0x103f) == 0x003f; | 102 | return fsw == 0 && (fcw & 0x103f) == 0x003f; |
102 | } | 103 | } |
diff --git a/arch/i386/boot/edd.c b/arch/i386/boot/edd.c index 658834d9f92a..bd138e442ec2 100644 --- a/arch/i386/boot/edd.c +++ b/arch/i386/boot/edd.c | |||
@@ -19,57 +19,28 @@ | |||
19 | 19 | ||
20 | #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE) | 20 | #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE) |
21 | 21 | ||
22 | struct edd_dapa { | ||
23 | u8 pkt_size; | ||
24 | u8 rsvd; | ||
25 | u16 sector_cnt; | ||
26 | u16 buf_off, buf_seg; | ||
27 | u64 lba; | ||
28 | u64 buf_lin_addr; | ||
29 | }; | ||
30 | |||
31 | /* | 22 | /* |
32 | * Read the MBR (first sector) from a specific device. | 23 | * Read the MBR (first sector) from a specific device. |
33 | */ | 24 | */ |
34 | static int read_mbr(u8 devno, void *buf) | 25 | static int read_mbr(u8 devno, void *buf) |
35 | { | 26 | { |
36 | struct edd_dapa dapa; | 27 | u16 ax, bx, cx, dx; |
37 | u16 ax, bx, cx, dx, si; | ||
38 | |||
39 | memset(&dapa, 0, sizeof dapa); | ||
40 | dapa.pkt_size = sizeof(dapa); | ||
41 | dapa.sector_cnt = 1; | ||
42 | dapa.buf_off = (size_t)buf; | ||
43 | dapa.buf_seg = ds(); | ||
44 | /* dapa.lba = 0; */ | ||
45 | |||
46 | ax = 0x4200; /* Extended Read */ | ||
47 | si = (size_t)&dapa; | ||
48 | dx = devno; | ||
49 | asm("pushfl; stc; int $0x13; setc %%al; popfl" | ||
50 | : "+a" (ax), "+S" (si), "+d" (dx) | ||
51 | : "m" (dapa) | ||
52 | : "ebx", "ecx", "edi", "memory"); | ||
53 | |||
54 | if (!(u8)ax) | ||
55 | return 0; /* OK */ | ||
56 | 28 | ||
57 | ax = 0x0201; /* Legacy Read, one sector */ | 29 | ax = 0x0201; /* Legacy Read, one sector */ |
58 | cx = 0x0001; /* Sector 0-0-1 */ | 30 | cx = 0x0001; /* Sector 0-0-1 */ |
59 | dx = devno; | 31 | dx = devno; |
60 | bx = (size_t)buf; | 32 | bx = (size_t)buf; |
61 | asm("pushfl; stc; int $0x13; setc %%al; popfl" | 33 | asm volatile("pushfl; stc; int $0x13; setc %%al; popfl" |
62 | : "+a" (ax), "+c" (cx), "+d" (dx), "+b" (bx) | 34 | : "+a" (ax), "+c" (cx), "+d" (dx), "+b" (bx) |
63 | : : "esi", "edi", "memory"); | 35 | : : "esi", "edi", "memory"); |
64 | 36 | ||
65 | return -(u8)ax; /* 0 or -1 */ | 37 | return -(u8)ax; /* 0 or -1 */ |
66 | } | 38 | } |
67 | 39 | ||
68 | static u32 read_mbr_sig(u8 devno, struct edd_info *ei) | 40 | static u32 read_mbr_sig(u8 devno, struct edd_info *ei, u32 *mbrsig) |
69 | { | 41 | { |
70 | int sector_size; | 42 | int sector_size; |
71 | char *mbrbuf_ptr, *mbrbuf_end; | 43 | char *mbrbuf_ptr, *mbrbuf_end; |
72 | u32 mbrsig; | ||
73 | u32 buf_base, mbr_base; | 44 | u32 buf_base, mbr_base; |
74 | extern char _end[]; | 45 | extern char _end[]; |
75 | 46 | ||
@@ -85,15 +56,15 @@ static u32 read_mbr_sig(u8 devno, struct edd_info *ei) | |||
85 | 56 | ||
86 | /* Make sure we actually have space on the heap... */ | 57 | /* Make sure we actually have space on the heap... */ |
87 | if (!(boot_params.hdr.loadflags & CAN_USE_HEAP)) | 58 | if (!(boot_params.hdr.loadflags & CAN_USE_HEAP)) |
88 | return 0; | 59 | return -1; |
89 | if (mbrbuf_end > (char *)(size_t)boot_params.hdr.heap_end_ptr) | 60 | if (mbrbuf_end > (char *)(size_t)boot_params.hdr.heap_end_ptr) |
90 | return 0; | 61 | return -1; |
91 | 62 | ||
92 | if (read_mbr(devno, mbrbuf_ptr)) | 63 | if (read_mbr(devno, mbrbuf_ptr)) |
93 | return 0; | 64 | return -1; |
94 | 65 | ||
95 | mbrsig = *(u32 *)&mbrbuf_ptr[EDD_MBR_SIG_OFFSET]; | 66 | *mbrsig = *(u32 *)&mbrbuf_ptr[EDD_MBR_SIG_OFFSET]; |
96 | return mbrsig; | 67 | return 0; |
97 | } | 68 | } |
98 | 69 | ||
99 | static int get_edd_info(u8 devno, struct edd_info *ei) | 70 | static int get_edd_info(u8 devno, struct edd_info *ei) |
@@ -160,6 +131,7 @@ void query_edd(void) | |||
160 | int do_edd = 1; | 131 | int do_edd = 1; |
161 | int devno; | 132 | int devno; |
162 | struct edd_info ei, *edp; | 133 | struct edd_info ei, *edp; |
134 | u32 *mbrptr; | ||
163 | 135 | ||
164 | if (cmdline_find_option("edd", eddarg, sizeof eddarg) > 0) { | 136 | if (cmdline_find_option("edd", eddarg, sizeof eddarg) > 0) { |
165 | if (!strcmp(eddarg, "skipmbr") || !strcmp(eddarg, "skip")) | 137 | if (!strcmp(eddarg, "skipmbr") || !strcmp(eddarg, "skip")) |
@@ -168,7 +140,8 @@ void query_edd(void) | |||
168 | do_edd = 0; | 140 | do_edd = 0; |
169 | } | 141 | } |
170 | 142 | ||
171 | edp = (struct edd_info *)boot_params.eddbuf; | 143 | edp = boot_params.eddbuf; |
144 | mbrptr = boot_params.edd_mbr_sig_buffer; | ||
172 | 145 | ||
173 | if (!do_edd) | 146 | if (!do_edd) |
174 | return; | 147 | return; |
@@ -186,11 +159,8 @@ void query_edd(void) | |||
186 | boot_params.eddbuf_entries++; | 159 | boot_params.eddbuf_entries++; |
187 | } | 160 | } |
188 | 161 | ||
189 | if (do_mbr) { | 162 | if (do_mbr && !read_mbr_sig(devno, &ei, mbrptr++)) |
190 | u32 mbr_sig; | 163 | boot_params.edd_mbr_sig_buf_entries = devno-0x80+1; |
191 | mbr_sig = read_mbr_sig(devno, &ei); | ||
192 | boot_params.edd_mbr_sig_buffer[devno-0x80] = mbr_sig; | ||
193 | } | ||
194 | } | 164 | } |
195 | } | 165 | } |
196 | 166 | ||
diff --git a/arch/i386/boot/tty.c b/arch/i386/boot/tty.c index 9c668aad3515..f3f14bd26371 100644 --- a/arch/i386/boot/tty.c +++ b/arch/i386/boot/tty.c | |||
@@ -54,9 +54,9 @@ static u8 gettime(void) | |||
54 | u16 ax = 0x0200; | 54 | u16 ax = 0x0200; |
55 | u16 cx, dx; | 55 | u16 cx, dx; |
56 | 56 | ||
57 | asm("int $0x1a" | 57 | asm volatile("int $0x1a" |
58 | : "+a" (ax), "=c" (cx), "=d" (dx) | 58 | : "+a" (ax), "=c" (cx), "=d" (dx) |
59 | : : "ebx", "esi", "edi"); | 59 | : : "ebx", "esi", "edi"); |
60 | 60 | ||
61 | return dx >> 8; | 61 | return dx >> 8; |
62 | } | 62 | } |
@@ -67,7 +67,7 @@ static u8 gettime(void) | |||
67 | int getchar(void) | 67 | int getchar(void) |
68 | { | 68 | { |
69 | u16 ax = 0; | 69 | u16 ax = 0; |
70 | asm("int $0x16" : "+a" (ax)); | 70 | asm volatile("int $0x16" : "+a" (ax)); |
71 | 71 | ||
72 | return ax & 0xff; | 72 | return ax & 0xff; |
73 | } | 73 | } |
@@ -75,9 +75,9 @@ int getchar(void) | |||
75 | static int kbd_pending(void) | 75 | static int kbd_pending(void) |
76 | { | 76 | { |
77 | u8 pending; | 77 | u8 pending; |
78 | asm("int $0x16; setnz %0" | 78 | asm volatile("int $0x16; setnz %0" |
79 | : "=rm" (pending) | 79 | : "=rm" (pending) |
80 | : "a" (0x0100)); | 80 | : "a" (0x0100)); |
81 | return pending; | 81 | return pending; |
82 | } | 82 | } |
83 | 83 | ||
diff --git a/arch/i386/boot/video-vga.c b/arch/i386/boot/video-vga.c index 700d09a9c9b3..aef02f9ec0c1 100644 --- a/arch/i386/boot/video-vga.c +++ b/arch/i386/boot/video-vga.c | |||
@@ -47,16 +47,16 @@ static u8 vga_set_basic_mode(void) | |||
47 | 47 | ||
48 | #ifdef CONFIG_VIDEO_400_HACK | 48 | #ifdef CONFIG_VIDEO_400_HACK |
49 | if (adapter >= ADAPTER_VGA) { | 49 | if (adapter >= ADAPTER_VGA) { |
50 | asm(INT10 | 50 | asm volatile(INT10 |
51 | : : "a" (0x1202), "b" (0x0030) | 51 | : : "a" (0x1202), "b" (0x0030) |
52 | : "ecx", "edx", "esi", "edi"); | 52 | : "ecx", "edx", "esi", "edi"); |
53 | } | 53 | } |
54 | #endif | 54 | #endif |
55 | 55 | ||
56 | ax = 0x0f00; | 56 | ax = 0x0f00; |
57 | asm(INT10 | 57 | asm volatile(INT10 |
58 | : "+a" (ax) | 58 | : "+a" (ax) |
59 | : : "ebx", "ecx", "edx", "esi", "edi"); | 59 | : : "ebx", "ecx", "edx", "esi", "edi"); |
60 | 60 | ||
61 | mode = (u8)ax; | 61 | mode = (u8)ax; |
62 | 62 | ||
@@ -73,9 +73,10 @@ static u8 vga_set_basic_mode(void) | |||
73 | mode = 3; | 73 | mode = 3; |
74 | 74 | ||
75 | /* Set the mode */ | 75 | /* Set the mode */ |
76 | ax = mode; | ||
76 | asm volatile(INT10 | 77 | asm volatile(INT10 |
77 | : : "a" (mode) | 78 | : "+a" (ax) |
78 | : "ebx", "ecx", "edx", "esi", "edi"); | 79 | : : "ebx", "ecx", "edx", "esi", "edi"); |
79 | do_restore = 1; | 80 | do_restore = 1; |
80 | return mode; | 81 | return mode; |
81 | } | 82 | } |
diff --git a/arch/i386/boot/video.c b/arch/i386/boot/video.c index 958130ef0042..693f20d3102e 100644 --- a/arch/i386/boot/video.c +++ b/arch/i386/boot/video.c | |||
@@ -61,7 +61,7 @@ static void store_video_mode(void) | |||
61 | 61 | ||
62 | /* Not all BIOSes are clean with respect to the top bit */ | 62 | /* Not all BIOSes are clean with respect to the top bit */ |
63 | boot_params.screen_info.orig_video_mode = ax & 0x7f; | 63 | boot_params.screen_info.orig_video_mode = ax & 0x7f; |
64 | boot_params.screen_info.orig_video_page = page; | 64 | boot_params.screen_info.orig_video_page = page >> 8; |
65 | } | 65 | } |
66 | 66 | ||
67 | /* | 67 | /* |
diff --git a/arch/i386/kernel/alternative.c b/arch/i386/kernel/alternative.c index 1b66d5c70eaf..9f4ac8b02de4 100644 --- a/arch/i386/kernel/alternative.c +++ b/arch/i386/kernel/alternative.c | |||
@@ -366,6 +366,8 @@ void apply_paravirt(struct paravirt_patch_site *start, | |||
366 | unsigned int used; | 366 | unsigned int used; |
367 | 367 | ||
368 | BUG_ON(p->len > MAX_PATCH_LEN); | 368 | BUG_ON(p->len > MAX_PATCH_LEN); |
369 | /* prep the buffer with the original instructions */ | ||
370 | memcpy(insnbuf, p->instr, p->len); | ||
369 | used = paravirt_ops.patch(p->instrtype, p->clobbers, insnbuf, | 371 | used = paravirt_ops.patch(p->instrtype, p->clobbers, insnbuf, |
370 | (unsigned long)p->instr, p->len); | 372 | (unsigned long)p->instr, p->len); |
371 | 373 | ||
diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c index f9fff29e01a9..3d67ae18d762 100644 --- a/arch/i386/kernel/apic.c +++ b/arch/i386/kernel/apic.c | |||
@@ -1085,7 +1085,7 @@ static int __init detect_init_APIC (void) | |||
1085 | if (l & MSR_IA32_APICBASE_ENABLE) | 1085 | if (l & MSR_IA32_APICBASE_ENABLE) |
1086 | mp_lapic_addr = l & MSR_IA32_APICBASE_BASE; | 1086 | mp_lapic_addr = l & MSR_IA32_APICBASE_BASE; |
1087 | 1087 | ||
1088 | if (nmi_watchdog != NMI_NONE) | 1088 | if (nmi_watchdog != NMI_NONE && nmi_watchdog != NMI_DISABLED) |
1089 | nmi_watchdog = NMI_LOCAL_APIC; | 1089 | nmi_watchdog = NMI_LOCAL_APIC; |
1090 | 1090 | ||
1091 | printk(KERN_INFO "Found and enabled local APIC!\n"); | 1091 | printk(KERN_INFO "Found and enabled local APIC!\n"); |
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c index 4b8a8da4b2e0..e2f4a1c68547 100644 --- a/arch/i386/kernel/io_apic.c +++ b/arch/i386/kernel/io_apic.c | |||
@@ -754,14 +754,6 @@ static int pirq_entries [MAX_PIRQS]; | |||
754 | static int pirqs_enabled; | 754 | static int pirqs_enabled; |
755 | int skip_ioapic_setup; | 755 | int skip_ioapic_setup; |
756 | 756 | ||
757 | static int __init ioapic_setup(char *str) | ||
758 | { | ||
759 | skip_ioapic_setup = 1; | ||
760 | return 1; | ||
761 | } | ||
762 | |||
763 | __setup("noapic", ioapic_setup); | ||
764 | |||
765 | static int __init ioapic_pirq_setup(char *str) | 757 | static int __init ioapic_pirq_setup(char *str) |
766 | { | 758 | { |
767 | int i, max; | 759 | int i, max; |
diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c index 99beac7f96ce..8c1c965eb2a8 100644 --- a/arch/i386/kernel/nmi.c +++ b/arch/i386/kernel/nmi.c | |||
@@ -77,7 +77,7 @@ static int __init check_nmi_watchdog(void) | |||
77 | unsigned int *prev_nmi_count; | 77 | unsigned int *prev_nmi_count; |
78 | int cpu; | 78 | int cpu; |
79 | 79 | ||
80 | if ((nmi_watchdog == NMI_NONE) || (nmi_watchdog == NMI_DEFAULT)) | 80 | if ((nmi_watchdog == NMI_NONE) || (nmi_watchdog == NMI_DISABLED)) |
81 | return 0; | 81 | return 0; |
82 | 82 | ||
83 | if (!atomic_read(&nmi_active)) | 83 | if (!atomic_read(&nmi_active)) |
@@ -424,7 +424,7 @@ int proc_nmi_enabled(struct ctl_table *table, int write, struct file *file, | |||
424 | if (!!old_state == !!nmi_watchdog_enabled) | 424 | if (!!old_state == !!nmi_watchdog_enabled) |
425 | return 0; | 425 | return 0; |
426 | 426 | ||
427 | if (atomic_read(&nmi_active) < 0) { | 427 | if (atomic_read(&nmi_active) < 0 || nmi_watchdog == NMI_DISABLED) { |
428 | printk( KERN_WARNING "NMI watchdog is permanently disabled\n"); | 428 | printk( KERN_WARNING "NMI watchdog is permanently disabled\n"); |
429 | return -EIO; | 429 | return -EIO; |
430 | } | 430 | } |
diff --git a/arch/i386/kernel/tsc.c b/arch/i386/kernel/tsc.c index debd7dbb4158..a39280b4dd3a 100644 --- a/arch/i386/kernel/tsc.c +++ b/arch/i386/kernel/tsc.c | |||
@@ -292,7 +292,6 @@ static struct clocksource clocksource_tsc = { | |||
292 | 292 | ||
293 | void mark_tsc_unstable(char *reason) | 293 | void mark_tsc_unstable(char *reason) |
294 | { | 294 | { |
295 | sched_clock_unstable_event(); | ||
296 | if (!tsc_unstable) { | 295 | if (!tsc_unstable) { |
297 | tsc_unstable = 1; | 296 | tsc_unstable = 1; |
298 | tsc_enabled = 0; | 297 | tsc_enabled = 0; |
diff --git a/arch/i386/mm/fault.c b/arch/i386/mm/fault.c index 01ffdd4964f0..fcb38e7f3543 100644 --- a/arch/i386/mm/fault.c +++ b/arch/i386/mm/fault.c | |||
@@ -249,9 +249,10 @@ static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned long address) | |||
249 | pmd_k = pmd_offset(pud_k, address); | 249 | pmd_k = pmd_offset(pud_k, address); |
250 | if (!pmd_present(*pmd_k)) | 250 | if (!pmd_present(*pmd_k)) |
251 | return NULL; | 251 | return NULL; |
252 | if (!pmd_present(*pmd)) | 252 | if (!pmd_present(*pmd)) { |
253 | set_pmd(pmd, *pmd_k); | 253 | set_pmd(pmd, *pmd_k); |
254 | else | 254 | arch_flush_lazy_mmu_mode(); |
255 | } else | ||
255 | BUG_ON(pmd_page(*pmd) != pmd_page(*pmd_k)); | 256 | BUG_ON(pmd_page(*pmd) != pmd_page(*pmd_k)); |
256 | return pmd_k; | 257 | return pmd_k; |
257 | } | 258 | } |
diff --git a/arch/i386/xen/xen-head.S b/arch/i386/xen/xen-head.S index bc71f3bc4014..f8d6937db2ec 100644 --- a/arch/i386/xen/xen-head.S +++ b/arch/i386/xen/xen-head.S | |||
@@ -7,20 +7,20 @@ | |||
7 | #include <asm/boot.h> | 7 | #include <asm/boot.h> |
8 | #include <xen/interface/elfnote.h> | 8 | #include <xen/interface/elfnote.h> |
9 | 9 | ||
10 | .section .init.text | 10 | .pushsection .init.text |
11 | ENTRY(startup_xen) | 11 | ENTRY(startup_xen) |
12 | movl %esi,xen_start_info | 12 | movl %esi,xen_start_info |
13 | cld | 13 | cld |
14 | movl $(init_thread_union+THREAD_SIZE),%esp | 14 | movl $(init_thread_union+THREAD_SIZE),%esp |
15 | jmp xen_start_kernel | 15 | jmp xen_start_kernel |
16 | .popsection | ||
16 | 17 | ||
17 | .pushsection ".bss.page_aligned" | 18 | .pushsection .bss.page_aligned |
18 | .align PAGE_SIZE_asm | 19 | .align PAGE_SIZE_asm |
19 | ENTRY(hypercall_page) | 20 | ENTRY(hypercall_page) |
20 | .skip 0x1000 | 21 | .skip 0x1000 |
21 | .popsection | 22 | .popsection |
22 | 23 | ||
23 | .section .text | ||
24 | ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS, .asciz "linux") | 24 | ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS, .asciz "linux") |
25 | ELFNOTE(Xen, XEN_ELFNOTE_GUEST_VERSION, .asciz "2.6") | 25 | ELFNOTE(Xen, XEN_ELFNOTE_GUEST_VERSION, .asciz "2.6") |
26 | ELFNOTE(Xen, XEN_ELFNOTE_XEN_VERSION, .asciz "xen-3.0") | 26 | ELFNOTE(Xen, XEN_ELFNOTE_XEN_VERSION, .asciz "xen-3.0") |
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 21aa4fc5f8ef..8c39913d1729 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -327,17 +327,7 @@ config FORCE_CPEI_RETARGET | |||
327 | This option it useful to enable this feature on older BIOS's as well. | 327 | This option it useful to enable this feature on older BIOS's as well. |
328 | You can also enable this by using boot command line option force_cpei=1. | 328 | You can also enable this by using boot command line option force_cpei=1. |
329 | 329 | ||
330 | config PREEMPT | 330 | source "kernel/Kconfig.preempt" |
331 | bool "Preemptible Kernel" | ||
332 | help | ||
333 | This option reduces the latency of the kernel when reacting to | ||
334 | real-time or interactive events by allowing a low priority process to | ||
335 | be preempted even if it is in kernel mode executing a system call. | ||
336 | This allows applications to run more reliably even when the system is | ||
337 | under load. | ||
338 | |||
339 | Say Y here if you are building a kernel for a desktop, embedded | ||
340 | or real-time system. Say N if you are unsure. | ||
341 | 331 | ||
342 | source "mm/Kconfig" | 332 | source "mm/Kconfig" |
343 | 333 | ||
diff --git a/arch/ia64/configs/bigsur_defconfig b/arch/ia64/configs/bigsur_defconfig index 9eb48c0927b0..6dd8655664f3 100644 --- a/arch/ia64/configs/bigsur_defconfig +++ b/arch/ia64/configs/bigsur_defconfig | |||
@@ -42,7 +42,7 @@ CONFIG_CC_ALIGN_FUNCTIONS=0 | |||
42 | CONFIG_CC_ALIGN_LABELS=0 | 42 | CONFIG_CC_ALIGN_LABELS=0 |
43 | CONFIG_CC_ALIGN_LOOPS=0 | 43 | CONFIG_CC_ALIGN_LOOPS=0 |
44 | CONFIG_CC_ALIGN_JUMPS=0 | 44 | CONFIG_CC_ALIGN_JUMPS=0 |
45 | CONFIG_SLAB=y | 45 | CONFIG_SLUB=y |
46 | # CONFIG_TINY_SHMEM is not set | 46 | # CONFIG_TINY_SHMEM is not set |
47 | CONFIG_BASE_SMALL=0 | 47 | CONFIG_BASE_SMALL=0 |
48 | # CONFIG_SLOB is not set | 48 | # CONFIG_SLOB is not set |
diff --git a/arch/ia64/configs/gensparse_defconfig b/arch/ia64/configs/gensparse_defconfig index 3a9ed951db08..e86fbd39c795 100644 --- a/arch/ia64/configs/gensparse_defconfig +++ b/arch/ia64/configs/gensparse_defconfig | |||
@@ -43,7 +43,7 @@ CONFIG_CC_ALIGN_FUNCTIONS=0 | |||
43 | CONFIG_CC_ALIGN_LABELS=0 | 43 | CONFIG_CC_ALIGN_LABELS=0 |
44 | CONFIG_CC_ALIGN_LOOPS=0 | 44 | CONFIG_CC_ALIGN_LOOPS=0 |
45 | CONFIG_CC_ALIGN_JUMPS=0 | 45 | CONFIG_CC_ALIGN_JUMPS=0 |
46 | CONFIG_SLAB=y | 46 | CONFIG_SLUB=y |
47 | # CONFIG_TINY_SHMEM is not set | 47 | # CONFIG_TINY_SHMEM is not set |
48 | CONFIG_BASE_SMALL=0 | 48 | CONFIG_BASE_SMALL=0 |
49 | # CONFIG_SLOB is not set | 49 | # CONFIG_SLOB is not set |
diff --git a/arch/ia64/configs/sim_defconfig b/arch/ia64/configs/sim_defconfig index c420d9f3df98..546a772f438e 100644 --- a/arch/ia64/configs/sim_defconfig +++ b/arch/ia64/configs/sim_defconfig | |||
@@ -43,7 +43,7 @@ CONFIG_CC_ALIGN_FUNCTIONS=0 | |||
43 | CONFIG_CC_ALIGN_LABELS=0 | 43 | CONFIG_CC_ALIGN_LABELS=0 |
44 | CONFIG_CC_ALIGN_LOOPS=0 | 44 | CONFIG_CC_ALIGN_LOOPS=0 |
45 | CONFIG_CC_ALIGN_JUMPS=0 | 45 | CONFIG_CC_ALIGN_JUMPS=0 |
46 | CONFIG_SLAB=y | 46 | CONFIG_SLUB=y |
47 | # CONFIG_TINY_SHMEM is not set | 47 | # CONFIG_TINY_SHMEM is not set |
48 | CONFIG_BASE_SMALL=0 | 48 | CONFIG_BASE_SMALL=0 |
49 | # CONFIG_SLOB is not set | 49 | # CONFIG_SLOB is not set |
diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig index 4c9ffc47bc7a..9aecfceeb38c 100644 --- a/arch/ia64/configs/sn2_defconfig +++ b/arch/ia64/configs/sn2_defconfig | |||
@@ -46,7 +46,7 @@ CONFIG_BASE_FULL=y | |||
46 | CONFIG_FUTEX=y | 46 | CONFIG_FUTEX=y |
47 | CONFIG_EPOLL=y | 47 | CONFIG_EPOLL=y |
48 | CONFIG_SHMEM=y | 48 | CONFIG_SHMEM=y |
49 | CONFIG_SLAB=y | 49 | CONFIG_SLUB=y |
50 | CONFIG_VM_EVENT_COUNTERS=y | 50 | CONFIG_VM_EVENT_COUNTERS=y |
51 | CONFIG_RT_MUTEXES=y | 51 | CONFIG_RT_MUTEXES=y |
52 | # CONFIG_TINY_SHMEM is not set | 52 | # CONFIG_TINY_SHMEM is not set |
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig index 3dbb3987df27..797acf9066c1 100644 --- a/arch/ia64/configs/tiger_defconfig +++ b/arch/ia64/configs/tiger_defconfig | |||
@@ -53,7 +53,7 @@ CONFIG_TIMERFD=y | |||
53 | CONFIG_EVENTFD=y | 53 | CONFIG_EVENTFD=y |
54 | CONFIG_SHMEM=y | 54 | CONFIG_SHMEM=y |
55 | CONFIG_VM_EVENT_COUNTERS=y | 55 | CONFIG_VM_EVENT_COUNTERS=y |
56 | CONFIG_SLAB=y | 56 | CONFIG_SLUB=y |
57 | # CONFIG_SLUB is not set | 57 | # CONFIG_SLUB is not set |
58 | # CONFIG_SLOB is not set | 58 | # CONFIG_SLOB is not set |
59 | CONFIG_RT_MUTEXES=y | 59 | CONFIG_RT_MUTEXES=y |
diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig index 4a060fc39934..0a06b1333c95 100644 --- a/arch/ia64/configs/zx1_defconfig +++ b/arch/ia64/configs/zx1_defconfig | |||
@@ -48,7 +48,7 @@ CONFIG_BASE_FULL=y | |||
48 | CONFIG_FUTEX=y | 48 | CONFIG_FUTEX=y |
49 | CONFIG_EPOLL=y | 49 | CONFIG_EPOLL=y |
50 | CONFIG_SHMEM=y | 50 | CONFIG_SHMEM=y |
51 | CONFIG_SLAB=y | 51 | CONFIG_SLUB=y |
52 | CONFIG_VM_EVENT_COUNTERS=y | 52 | CONFIG_VM_EVENT_COUNTERS=y |
53 | CONFIG_RT_MUTEXES=y | 53 | CONFIG_RT_MUTEXES=y |
54 | # CONFIG_TINY_SHMEM is not set | 54 | # CONFIG_TINY_SHMEM is not set |
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig index 03172dc8c403..0210545e7f61 100644 --- a/arch/ia64/defconfig +++ b/arch/ia64/defconfig | |||
@@ -53,8 +53,7 @@ CONFIG_TIMERFD=y | |||
53 | CONFIG_EVENTFD=y | 53 | CONFIG_EVENTFD=y |
54 | CONFIG_SHMEM=y | 54 | CONFIG_SHMEM=y |
55 | CONFIG_VM_EVENT_COUNTERS=y | 55 | CONFIG_VM_EVENT_COUNTERS=y |
56 | CONFIG_SLAB=y | 56 | CONFIG_SLUB=y |
57 | # CONFIG_SLUB is not set | ||
58 | # CONFIG_SLOB is not set | 57 | # CONFIG_SLOB is not set |
59 | CONFIG_RT_MUTEXES=y | 58 | CONFIG_RT_MUTEXES=y |
60 | # CONFIG_TINY_SHMEM is not set | 59 | # CONFIG_TINY_SHMEM is not set |
diff --git a/arch/ia64/hp/sim/boot/boot_head.S b/arch/ia64/hp/sim/boot/boot_head.S index a9bd71ac78e2..8808565491fb 100644 --- a/arch/ia64/hp/sim/boot/boot_head.S +++ b/arch/ia64/hp/sim/boot/boot_head.S | |||
@@ -26,6 +26,7 @@ GLOBAL_ENTRY(_start) | |||
26 | movl sp = stack_mem+16384-16 | 26 | movl sp = stack_mem+16384-16 |
27 | bsw.1 | 27 | bsw.1 |
28 | br.call.sptk.many rp=start_bootloader | 28 | br.call.sptk.many rp=start_bootloader |
29 | 0: nop 0 /* dummy nop to make unwinding work */ | ||
29 | END(_start) | 30 | END(_start) |
30 | 31 | ||
31 | /* | 32 | /* |
diff --git a/arch/ia64/kernel/cpufreq/acpi-cpufreq.c b/arch/ia64/kernel/cpufreq/acpi-cpufreq.c index 15c08d52f09f..8c6ec7070844 100644 --- a/arch/ia64/kernel/cpufreq/acpi-cpufreq.c +++ b/arch/ia64/kernel/cpufreq/acpi-cpufreq.c | |||
@@ -113,10 +113,8 @@ processor_get_freq ( | |||
113 | 113 | ||
114 | saved_mask = current->cpus_allowed; | 114 | saved_mask = current->cpus_allowed; |
115 | set_cpus_allowed(current, cpumask_of_cpu(cpu)); | 115 | set_cpus_allowed(current, cpumask_of_cpu(cpu)); |
116 | if (smp_processor_id() != cpu) { | 116 | if (smp_processor_id() != cpu) |
117 | ret = -EAGAIN; | ||
118 | goto migrate_end; | 117 | goto migrate_end; |
119 | } | ||
120 | 118 | ||
121 | /* processor_get_pstate gets the instantaneous frequency */ | 119 | /* processor_get_pstate gets the instantaneous frequency */ |
122 | ret = processor_get_pstate(&value); | 120 | ret = processor_get_pstate(&value); |
@@ -125,7 +123,7 @@ processor_get_freq ( | |||
125 | set_cpus_allowed(current, saved_mask); | 123 | set_cpus_allowed(current, saved_mask); |
126 | printk(KERN_WARNING "get performance failed with error %d\n", | 124 | printk(KERN_WARNING "get performance failed with error %d\n", |
127 | ret); | 125 | ret); |
128 | ret = -EAGAIN; | 126 | ret = 0; |
129 | goto migrate_end; | 127 | goto migrate_end; |
130 | } | 128 | } |
131 | clock_freq = extract_clock(data, value, cpu); | 129 | clock_freq = extract_clock(data, value, cpu); |
diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c index cc3ee4ef37af..44be1c952b7c 100644 --- a/arch/ia64/kernel/irq.c +++ b/arch/ia64/kernel/irq.c | |||
@@ -33,6 +33,11 @@ void ack_bad_irq(unsigned int irq) | |||
33 | } | 33 | } |
34 | 34 | ||
35 | #ifdef CONFIG_IA64_GENERIC | 35 | #ifdef CONFIG_IA64_GENERIC |
36 | ia64_vector __ia64_irq_to_vector(int irq) | ||
37 | { | ||
38 | return irq_cfg[irq].vector; | ||
39 | } | ||
40 | |||
36 | unsigned int __ia64_local_vector_to_irq (ia64_vector vec) | 41 | unsigned int __ia64_local_vector_to_irq (ia64_vector vec) |
37 | { | 42 | { |
38 | return __get_cpu_var(vector_irq)[vec]; | 43 | return __get_cpu_var(vector_irq)[vec]; |
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c index ff28620cb992..63b73f3d4c9f 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c | |||
@@ -2018,22 +2018,26 @@ ia64_mca_late_init(void) | |||
2018 | 2018 | ||
2019 | if (cpe_vector >= 0) { | 2019 | if (cpe_vector >= 0) { |
2020 | /* If platform supports CPEI, enable the irq. */ | 2020 | /* If platform supports CPEI, enable the irq. */ |
2021 | cpe_poll_enabled = 0; | 2021 | irq = local_vector_to_irq(cpe_vector); |
2022 | for (irq = 0; irq < NR_IRQS; ++irq) | 2022 | if (irq > 0) { |
2023 | if (irq_to_vector(irq) == cpe_vector) { | 2023 | cpe_poll_enabled = 0; |
2024 | desc = irq_desc + irq; | 2024 | desc = irq_desc + irq; |
2025 | desc->status |= IRQ_PER_CPU; | 2025 | desc->status |= IRQ_PER_CPU; |
2026 | setup_irq(irq, &mca_cpe_irqaction); | 2026 | setup_irq(irq, &mca_cpe_irqaction); |
2027 | ia64_cpe_irq = irq; | 2027 | ia64_cpe_irq = irq; |
2028 | } | 2028 | ia64_mca_register_cpev(cpe_vector); |
2029 | ia64_mca_register_cpev(cpe_vector); | 2029 | IA64_MCA_DEBUG("%s: CPEI/P setup and enabled.\n", |
2030 | IA64_MCA_DEBUG("%s: CPEI/P setup and enabled.\n", __FUNCTION__); | 2030 | __FUNCTION__); |
2031 | } else { | 2031 | return 0; |
2032 | /* If platform doesn't support CPEI, get the timer going. */ | ||
2033 | if (cpe_poll_enabled) { | ||
2034 | ia64_mca_cpe_poll(0UL); | ||
2035 | IA64_MCA_DEBUG("%s: CPEP setup and enabled.\n", __FUNCTION__); | ||
2036 | } | 2032 | } |
2033 | printk(KERN_ERR "%s: Failed to find irq for CPE " | ||
2034 | "interrupt handler, vector %d\n", | ||
2035 | __FUNCTION__, cpe_vector); | ||
2036 | } | ||
2037 | /* If platform doesn't support CPEI, get the timer going. */ | ||
2038 | if (cpe_poll_enabled) { | ||
2039 | ia64_mca_cpe_poll(0UL); | ||
2040 | IA64_MCA_DEBUG("%s: CPEP setup and enabled.\n", __FUNCTION__); | ||
2037 | } | 2041 | } |
2038 | } | 2042 | } |
2039 | #endif | 2043 | #endif |
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index 4158906c45aa..c613fc0e91cc 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c | |||
@@ -198,9 +198,13 @@ default_idle (void) | |||
198 | { | 198 | { |
199 | local_irq_enable(); | 199 | local_irq_enable(); |
200 | while (!need_resched()) { | 200 | while (!need_resched()) { |
201 | if (can_do_pal_halt) | 201 | if (can_do_pal_halt) { |
202 | safe_halt(); | 202 | local_irq_disable(); |
203 | else | 203 | if (!need_resched()) { |
204 | safe_halt(); | ||
205 | } | ||
206 | local_irq_enable(); | ||
207 | } else | ||
204 | cpu_relax(); | 208 | cpu_relax(); |
205 | } | 209 | } |
206 | } | 210 | } |
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c index 00f803246948..122444a97897 100644 --- a/arch/ia64/kernel/ptrace.c +++ b/arch/ia64/kernel/ptrace.c | |||
@@ -951,10 +951,14 @@ access_uarea (struct task_struct *child, unsigned long addr, | |||
951 | return 0; | 951 | return 0; |
952 | 952 | ||
953 | case PT_CR_IPSR: | 953 | case PT_CR_IPSR: |
954 | if (write_access) | 954 | if (write_access) { |
955 | pt->cr_ipsr = ((*data & IPSR_MASK) | 955 | unsigned long tmp = *data; |
956 | /* psr.ri==3 is a reserved value: SDM 2:25 */ | ||
957 | if ((tmp & IA64_PSR_RI) == IA64_PSR_RI) | ||
958 | tmp &= ~IA64_PSR_RI; | ||
959 | pt->cr_ipsr = ((tmp & IPSR_MASK) | ||
956 | | (pt->cr_ipsr & ~IPSR_MASK)); | 960 | | (pt->cr_ipsr & ~IPSR_MASK)); |
957 | else | 961 | } else |
958 | *data = (pt->cr_ipsr & IPSR_MASK); | 962 | *data = (pt->cr_ipsr & IPSR_MASK); |
959 | return 0; | 963 | return 0; |
960 | 964 | ||
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index cd9a37a552c3..407efea04bf5 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
@@ -389,6 +389,13 @@ early_console_setup (char *cmdline) | |||
389 | if (!efi_setup_pcdp_console(cmdline)) | 389 | if (!efi_setup_pcdp_console(cmdline)) |
390 | earlycons++; | 390 | earlycons++; |
391 | #endif | 391 | #endif |
392 | #ifdef CONFIG_HP_SIMSERIAL_CONSOLE | ||
393 | { | ||
394 | extern struct console hpsim_cons; | ||
395 | register_console(&hpsim_cons); | ||
396 | earlycons++; | ||
397 | } | ||
398 | #endif | ||
392 | 399 | ||
393 | return (earlycons) ? 0 : -1; | 400 | return (earlycons) ? 0 : -1; |
394 | } | 401 | } |
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S index 83e80677de70..00232b4357ba 100644 --- a/arch/ia64/kernel/vmlinux.lds.S +++ b/arch/ia64/kernel/vmlinux.lds.S | |||
@@ -20,6 +20,8 @@ PHDRS { | |||
20 | code PT_LOAD; | 20 | code PT_LOAD; |
21 | percpu PT_LOAD; | 21 | percpu PT_LOAD; |
22 | data PT_LOAD; | 22 | data PT_LOAD; |
23 | note PT_NOTE; | ||
24 | unwind 0x70000001; /* PT_IA_64_UNWIND, but ld doesn't match the name */ | ||
23 | } | 25 | } |
24 | SECTIONS | 26 | SECTIONS |
25 | { | 27 | { |
@@ -62,6 +64,9 @@ SECTIONS | |||
62 | 64 | ||
63 | /* Read-only data */ | 65 | /* Read-only data */ |
64 | 66 | ||
67 | NOTES :code :note /* put .notes in text and mark in PT_NOTE */ | ||
68 | code_continues : {} :code /* switch back to regular program... */ | ||
69 | |||
65 | /* Exception table */ | 70 | /* Exception table */ |
66 | . = ALIGN(16); | 71 | . = ALIGN(16); |
67 | __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) | 72 | __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) |
@@ -99,7 +104,8 @@ SECTIONS | |||
99 | __start_unwind = .; | 104 | __start_unwind = .; |
100 | *(.IA_64.unwind*) | 105 | *(.IA_64.unwind*) |
101 | __end_unwind = .; | 106 | __end_unwind = .; |
102 | } | 107 | } :code :unwind |
108 | code_continues2 : {} : code | ||
103 | 109 | ||
104 | RODATA | 110 | RODATA |
105 | 111 | ||
@@ -276,10 +282,6 @@ SECTIONS | |||
276 | .debug_typenames 0 : { *(.debug_typenames) } | 282 | .debug_typenames 0 : { *(.debug_typenames) } |
277 | .debug_varnames 0 : { *(.debug_varnames) } | 283 | .debug_varnames 0 : { *(.debug_varnames) } |
278 | /* These must appear regardless of . */ | 284 | /* These must appear regardless of . */ |
279 | /* Discard them for now since Intel SoftSDV cannot handle them. | ||
280 | .comment 0 : { *(.comment) } | ||
281 | .note 0 : { *(.note) } | ||
282 | */ | ||
283 | /DISCARD/ : { *(.comment) } | 285 | /DISCARD/ : { *(.comment) } |
284 | /DISCARD/ : { *(.note) } | 286 | /DISCARD/ : { *(.note) } |
285 | } | 287 | } |
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c index 73ccb6010c05..9150ffaff9e8 100644 --- a/arch/ia64/mm/fault.c +++ b/arch/ia64/mm/fault.c | |||
@@ -112,11 +112,17 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re | |||
112 | down_read(&mm->mmap_sem); | 112 | down_read(&mm->mmap_sem); |
113 | 113 | ||
114 | vma = find_vma_prev(mm, address, &prev_vma); | 114 | vma = find_vma_prev(mm, address, &prev_vma); |
115 | if (!vma) | 115 | if (!vma && !prev_vma ) |
116 | goto bad_area; | 116 | goto bad_area; |
117 | 117 | ||
118 | /* find_vma_prev() returns vma such that address < vma->vm_end or NULL */ | 118 | /* |
119 | if (address < vma->vm_start) | 119 | * find_vma_prev() returns vma such that address < vma->vm_end or NULL |
120 | * | ||
121 | * May find no vma, but could be that the last vm area is the | ||
122 | * register backing store that needs to expand upwards, in | ||
123 | * this case vma will be null, but prev_vma will ne non-null | ||
124 | */ | ||
125 | if (( !vma && prev_vma ) || (address < vma->vm_start) ) | ||
120 | goto check_expansion; | 126 | goto check_expansion; |
121 | 127 | ||
122 | good_area: | 128 | good_area: |
@@ -172,6 +178,8 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re | |||
172 | 178 | ||
173 | check_expansion: | 179 | check_expansion: |
174 | if (!(prev_vma && (prev_vma->vm_flags & VM_GROWSUP) && (address == prev_vma->vm_end))) { | 180 | if (!(prev_vma && (prev_vma->vm_flags & VM_GROWSUP) && (address == prev_vma->vm_end))) { |
181 | if (!vma) | ||
182 | goto bad_area; | ||
175 | if (!(vma->vm_flags & VM_GROWSDOWN)) | 183 | if (!(vma->vm_flags & VM_GROWSDOWN)) |
176 | goto bad_area; | 184 | goto bad_area; |
177 | if (REGION_NUMBER(address) != REGION_NUMBER(vma->vm_start) | 185 | if (REGION_NUMBER(address) != REGION_NUMBER(vma->vm_start) |
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c index 7f6d2360a262..360047389449 100644 --- a/arch/ia64/sn/kernel/irq.c +++ b/arch/ia64/sn/kernel/irq.c | |||
@@ -256,6 +256,13 @@ struct irq_chip irq_type_sn = { | |||
256 | .set_affinity = sn_set_affinity_irq | 256 | .set_affinity = sn_set_affinity_irq |
257 | }; | 257 | }; |
258 | 258 | ||
259 | ia64_vector sn_irq_to_vector(int irq) | ||
260 | { | ||
261 | if (irq >= IA64_NUM_VECTORS) | ||
262 | return 0; | ||
263 | return (ia64_vector)irq; | ||
264 | } | ||
265 | |||
259 | unsigned int sn_local_vector_to_irq(u8 vector) | 266 | unsigned int sn_local_vector_to_irq(u8 vector) |
260 | { | 267 | { |
261 | return (CPU_VECTOR_TO_IRQ(smp_processor_id(), vector)); | 268 | return (CPU_VECTOR_TO_IRQ(smp_processor_id(), vector)); |
@@ -398,7 +405,10 @@ sn_call_force_intr_provider(struct sn_irq_info *sn_irq_info) | |||
398 | struct sn_pcibus_provider *pci_provider; | 405 | struct sn_pcibus_provider *pci_provider; |
399 | 406 | ||
400 | pci_provider = sn_pci_provider[sn_irq_info->irq_bridge_type]; | 407 | pci_provider = sn_pci_provider[sn_irq_info->irq_bridge_type]; |
401 | if (pci_provider && pci_provider->force_interrupt) | 408 | |
409 | /* Don't force an interrupt if the irq has been disabled */ | ||
410 | if (!(irq_desc[sn_irq_info->irq_irq].status & IRQ_DISABLED) && | ||
411 | pci_provider && pci_provider->force_interrupt) | ||
402 | (*pci_provider->force_interrupt)(sn_irq_info); | 412 | (*pci_provider->force_interrupt)(sn_irq_info); |
403 | } | 413 | } |
404 | 414 | ||
diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c index 7e6d5fb75390..ed3a4caec620 100644 --- a/arch/m68k/kernel/setup.c +++ b/arch/m68k/kernel/setup.c | |||
@@ -62,7 +62,6 @@ EXPORT_SYMBOL(m68k_num_memory); | |||
62 | int m68k_realnum_memory; | 62 | int m68k_realnum_memory; |
63 | EXPORT_SYMBOL(m68k_realnum_memory); | 63 | EXPORT_SYMBOL(m68k_realnum_memory); |
64 | unsigned long m68k_memoffset; | 64 | unsigned long m68k_memoffset; |
65 | EXPORT_SYMBOL(m68k_memoffset); | ||
66 | struct mem_info m68k_memory[NUM_MEMINFO]; | 65 | struct mem_info m68k_memory[NUM_MEMINFO]; |
67 | EXPORT_SYMBOL(m68k_memory); | 66 | EXPORT_SYMBOL(m68k_memory); |
68 | 67 | ||
@@ -200,7 +199,6 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record) | |||
200 | (m68k_num_memory - 1)); | 199 | (m68k_num_memory - 1)); |
201 | m68k_num_memory = 1; | 200 | m68k_num_memory = 1; |
202 | } | 201 | } |
203 | m68k_memoffset = m68k_memory[0].addr-PAGE_OFFSET; | ||
204 | #endif | 202 | #endif |
205 | } | 203 | } |
206 | 204 | ||
diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds index c42245775a4d..59fe285865ec 100644 --- a/arch/m68k/kernel/vmlinux-std.lds +++ b/arch/m68k/kernel/vmlinux-std.lds | |||
@@ -19,6 +19,8 @@ SECTIONS | |||
19 | *(.gnu.warning) | 19 | *(.gnu.warning) |
20 | } :text = 0x4e75 | 20 | } :text = 0x4e75 |
21 | 21 | ||
22 | _etext = .; /* End of text section */ | ||
23 | |||
22 | . = ALIGN(16); /* Exception table */ | 24 | . = ALIGN(16); /* Exception table */ |
23 | __start___ex_table = .; | 25 | __start___ex_table = .; |
24 | __ex_table : { *(__ex_table) } | 26 | __ex_table : { *(__ex_table) } |
@@ -26,8 +28,6 @@ SECTIONS | |||
26 | 28 | ||
27 | RODATA | 29 | RODATA |
28 | 30 | ||
29 | _etext = .; /* End of text section */ | ||
30 | |||
31 | .data : { /* Data */ | 31 | .data : { /* Data */ |
32 | DATA_DATA | 32 | DATA_DATA |
33 | CONSTRUCTORS | 33 | CONSTRUCTORS |
diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c index 7d571a2b44dd..30d34f285024 100644 --- a/arch/m68k/mm/motorola.c +++ b/arch/m68k/mm/motorola.c | |||
@@ -210,11 +210,7 @@ void __init paging_init(void) | |||
210 | int i; | 210 | int i; |
211 | 211 | ||
212 | #ifdef DEBUG | 212 | #ifdef DEBUG |
213 | { | 213 | printk ("start of paging_init (%p, %lx)\n", kernel_pg_dir, availmem); |
214 | extern unsigned long availmem; | ||
215 | printk ("start of paging_init (%p, %lx)\n", | ||
216 | kernel_pg_dir, availmem); | ||
217 | } | ||
218 | #endif | 214 | #endif |
219 | 215 | ||
220 | /* Fix the cache mode in the page descriptors for the 680[46]0. */ | 216 | /* Fix the cache mode in the page descriptors for the 680[46]0. */ |
diff --git a/arch/m68knommu/kernel/process.c b/arch/m68knommu/kernel/process.c index 846f97534685..47502d5ec19f 100644 --- a/arch/m68knommu/kernel/process.c +++ b/arch/m68knommu/kernel/process.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <linux/a.out.h> | 28 | #include <linux/a.out.h> |
29 | #include <linux/interrupt.h> | 29 | #include <linux/interrupt.h> |
30 | #include <linux/reboot.h> | 30 | #include <linux/reboot.h> |
31 | #include <linux/fs.h> | ||
31 | 32 | ||
32 | #include <asm/uaccess.h> | 33 | #include <asm/uaccess.h> |
33 | #include <asm/system.h> | 34 | #include <asm/system.h> |
diff --git a/arch/m68knommu/kernel/sys_m68k.c b/arch/m68knommu/kernel/sys_m68k.c index 48e6b33e8b44..15d62c5279a9 100644 --- a/arch/m68knommu/kernel/sys_m68k.c +++ b/arch/m68knommu/kernel/sys_m68k.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/mman.h> | 18 | #include <linux/mman.h> |
19 | #include <linux/file.h> | 19 | #include <linux/file.h> |
20 | #include <linux/utsname.h> | 20 | #include <linux/utsname.h> |
21 | #include <linux/fs.h> | ||
21 | 22 | ||
22 | #include <asm/setup.h> | 23 | #include <asm/setup.h> |
23 | #include <asm/uaccess.h> | 24 | #include <asm/uaccess.h> |
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 3b404b7dfa39..04797b289c21 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -28,7 +28,6 @@ config BASLER_EXCITE | |||
28 | select MIPS_RM9122 | 28 | select MIPS_RM9122 |
29 | select SYS_HAS_CPU_RM9000 | 29 | select SYS_HAS_CPU_RM9000 |
30 | select SYS_SUPPORTS_32BIT_KERNEL | 30 | select SYS_SUPPORTS_32BIT_KERNEL |
31 | select SYS_SUPPORTS_64BIT_KERNEL | ||
32 | select SYS_SUPPORTS_BIG_ENDIAN | 31 | select SYS_SUPPORTS_BIG_ENDIAN |
33 | select SYS_SUPPORTS_KGDB | 32 | select SYS_SUPPORTS_KGDB |
34 | help | 33 | help |
@@ -126,6 +125,7 @@ config LEMOTE_FULONG | |||
126 | select SYS_SUPPORTS_HIGHMEM | 125 | select SYS_SUPPORTS_HIGHMEM |
127 | select SYS_HAS_EARLY_PRINTK | 126 | select SYS_HAS_EARLY_PRINTK |
128 | select GENERIC_HARDIRQS_NO__DO_IRQ | 127 | select GENERIC_HARDIRQS_NO__DO_IRQ |
128 | select GENERIC_ISA_DMA_SUPPORT_BROKEN | ||
129 | select CPU_HAS_WB | 129 | select CPU_HAS_WB |
130 | help | 130 | help |
131 | Lemote Fulong mini-PC board based on the Chinese Loongson-2E CPU and | 131 | Lemote Fulong mini-PC board based on the Chinese Loongson-2E CPU and |
@@ -192,8 +192,7 @@ config MIPS_MALTA | |||
192 | board. | 192 | board. |
193 | 193 | ||
194 | config MIPS_SEAD | 194 | config MIPS_SEAD |
195 | bool "MIPS SEAD board (EXPERIMENTAL)" | 195 | bool "MIPS SEAD board" |
196 | depends on EXPERIMENTAL | ||
197 | select IRQ_CPU | 196 | select IRQ_CPU |
198 | select DMA_NONCOHERENT | 197 | select DMA_NONCOHERENT |
199 | select SYS_HAS_EARLY_PRINTK | 198 | select SYS_HAS_EARLY_PRINTK |
@@ -528,6 +527,7 @@ config TOSHIBA_JMR3927 | |||
528 | select DMA_NONCOHERENT | 527 | select DMA_NONCOHERENT |
529 | select HW_HAS_PCI | 528 | select HW_HAS_PCI |
530 | select MIPS_TX3927 | 529 | select MIPS_TX3927 |
530 | select IRQ_TXX9 | ||
531 | select SWAP_IO_SPACE | 531 | select SWAP_IO_SPACE |
532 | select SYS_HAS_CPU_TX39XX | 532 | select SYS_HAS_CPU_TX39XX |
533 | select SYS_SUPPORTS_32BIT_KERNEL | 533 | select SYS_SUPPORTS_32BIT_KERNEL |
@@ -540,7 +540,9 @@ config TOSHIBA_RBTX4927 | |||
540 | select DMA_NONCOHERENT | 540 | select DMA_NONCOHERENT |
541 | select HAS_TXX9_SERIAL | 541 | select HAS_TXX9_SERIAL |
542 | select HW_HAS_PCI | 542 | select HW_HAS_PCI |
543 | select I8259 | 543 | select IRQ_CPU |
544 | select IRQ_TXX9 | ||
545 | select I8259 if TOSHIBA_FPCIB0 | ||
544 | select SWAP_IO_SPACE | 546 | select SWAP_IO_SPACE |
545 | select SYS_HAS_CPU_TX49XX | 547 | select SYS_HAS_CPU_TX49XX |
546 | select SYS_SUPPORTS_32BIT_KERNEL | 548 | select SYS_SUPPORTS_32BIT_KERNEL |
@@ -555,12 +557,11 @@ config TOSHIBA_RBTX4927 | |||
555 | 557 | ||
556 | config TOSHIBA_RBTX4938 | 558 | config TOSHIBA_RBTX4938 |
557 | bool "Toshiba RBTX4938 board" | 559 | bool "Toshiba RBTX4938 board" |
558 | select HAVE_STD_PC_SERIAL_PORT | ||
559 | select DMA_NONCOHERENT | 560 | select DMA_NONCOHERENT |
560 | select GENERIC_ISA_DMA | ||
561 | select HAS_TXX9_SERIAL | 561 | select HAS_TXX9_SERIAL |
562 | select HW_HAS_PCI | 562 | select HW_HAS_PCI |
563 | select I8259 | 563 | select IRQ_CPU |
564 | select IRQ_TXX9 | ||
564 | select SWAP_IO_SPACE | 565 | select SWAP_IO_SPACE |
565 | select SYS_HAS_CPU_TX49XX | 566 | select SYS_HAS_CPU_TX49XX |
566 | select SYS_SUPPORTS_32BIT_KERNEL | 567 | select SYS_SUPPORTS_32BIT_KERNEL |
@@ -604,7 +605,6 @@ source "arch/mips/sibyte/Kconfig" | |||
604 | source "arch/mips/tx4927/Kconfig" | 605 | source "arch/mips/tx4927/Kconfig" |
605 | source "arch/mips/tx4938/Kconfig" | 606 | source "arch/mips/tx4938/Kconfig" |
606 | source "arch/mips/vr41xx/Kconfig" | 607 | source "arch/mips/vr41xx/Kconfig" |
607 | source "arch/mips/philips/pnx8550/common/Kconfig" | ||
608 | 608 | ||
609 | endmenu | 609 | endmenu |
610 | 610 | ||
@@ -693,9 +693,9 @@ config EARLY_PRINTK | |||
693 | config SYS_HAS_EARLY_PRINTK | 693 | config SYS_HAS_EARLY_PRINTK |
694 | bool | 694 | bool |
695 | 695 | ||
696 | config GENERIC_ISA_DMA | 696 | config HOTPLUG_CPU |
697 | bool | 697 | bool |
698 | select ZONE_DMA | 698 | default n |
699 | 699 | ||
700 | config I8259 | 700 | config I8259 |
701 | bool | 701 | bool |
@@ -712,9 +712,13 @@ config MIPS_DISABLE_OBSOLETE_IDE | |||
712 | config NO_IOPORT | 712 | config NO_IOPORT |
713 | def_bool n | 713 | def_bool n |
714 | 714 | ||
715 | config GENERIC_ISA_DMA | ||
716 | bool | ||
717 | select ZONE_DMA if GENERIC_ISA_DMA_SUPPORT_BROKEN=n | ||
718 | |||
715 | config GENERIC_ISA_DMA_SUPPORT_BROKEN | 719 | config GENERIC_ISA_DMA_SUPPORT_BROKEN |
716 | bool | 720 | bool |
717 | select ZONE_DMA | 721 | select GENERIC_ISA_DMA |
718 | 722 | ||
719 | config GENERIC_GPIO | 723 | config GENERIC_GPIO |
720 | bool | 724 | bool |
@@ -768,6 +772,9 @@ config IRQ_MSP_SLP | |||
768 | config IRQ_MSP_CIC | 772 | config IRQ_MSP_CIC |
769 | bool | 773 | bool |
770 | 774 | ||
775 | config IRQ_TXX9 | ||
776 | bool | ||
777 | |||
771 | config MIPS_BOARDS_GEN | 778 | config MIPS_BOARDS_GEN |
772 | bool | 779 | bool |
773 | 780 | ||
@@ -1427,8 +1434,7 @@ config SB1_PASS_2_1_WORKAROUNDS | |||
1427 | default y | 1434 | default y |
1428 | 1435 | ||
1429 | config 64BIT_PHYS_ADDR | 1436 | config 64BIT_PHYS_ADDR |
1430 | bool "Support for 64-bit physical address space" | 1437 | bool |
1431 | depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 || CPU_R10000 || CPU_SB1 || CPU_MIPS32 || CPU_MIPS64) && 32BIT | ||
1432 | 1438 | ||
1433 | config CPU_HAS_LLSC | 1439 | config CPU_HAS_LLSC |
1434 | bool | 1440 | bool |
diff --git a/arch/mips/au1000/Kconfig b/arch/mips/au1000/Kconfig index abea88098253..29c95d97217d 100644 --- a/arch/mips/au1000/Kconfig +++ b/arch/mips/au1000/Kconfig | |||
@@ -136,6 +136,7 @@ config SOC_AU1200 | |||
136 | 136 | ||
137 | config SOC_AU1X00 | 137 | config SOC_AU1X00 |
138 | bool | 138 | bool |
139 | select 64BIT_PHYS_ADDR | ||
139 | select SYS_HAS_CPU_MIPS32_R1 | 140 | select SYS_HAS_CPU_MIPS32_R1 |
140 | select SYS_SUPPORTS_32BIT_KERNEL | 141 | select SYS_SUPPORTS_32BIT_KERNEL |
141 | select SYS_SUPPORTS_APM_EMULATION | 142 | select SYS_SUPPORTS_APM_EMULATION |
diff --git a/arch/mips/au1000/common/gpio.c b/arch/mips/au1000/common/gpio.c index 7abe42099439..8527856aec45 100644 --- a/arch/mips/au1000/common/gpio.c +++ b/arch/mips/au1000/common/gpio.c | |||
@@ -131,12 +131,12 @@ int au1xxx_gpio_direction_input(unsigned gpio) | |||
131 | { | 131 | { |
132 | if (gpio >= AU1XXX_GPIO_BASE) | 132 | if (gpio >= AU1XXX_GPIO_BASE) |
133 | #if defined(CONFIG_SOC_AU1000) | 133 | #if defined(CONFIG_SOC_AU1000) |
134 | ; | 134 | return -ENODEV; |
135 | #else | 135 | #else |
136 | return au1xxx_gpio2_direction_input(gpio); | 136 | return au1xxx_gpio2_direction_input(gpio); |
137 | #endif | 137 | #endif |
138 | else | 138 | |
139 | return au1xxx_gpio1_direction_input(gpio); | 139 | return au1xxx_gpio1_direction_input(gpio); |
140 | } | 140 | } |
141 | 141 | ||
142 | EXPORT_SYMBOL(au1xxx_gpio_direction_input); | 142 | EXPORT_SYMBOL(au1xxx_gpio_direction_input); |
@@ -145,12 +145,12 @@ int au1xxx_gpio_direction_output(unsigned gpio, int value) | |||
145 | { | 145 | { |
146 | if (gpio >= AU1XXX_GPIO_BASE) | 146 | if (gpio >= AU1XXX_GPIO_BASE) |
147 | #if defined(CONFIG_SOC_AU1000) | 147 | #if defined(CONFIG_SOC_AU1000) |
148 | ; | 148 | return -ENODEV; |
149 | #else | 149 | #else |
150 | return au1xxx_gpio2_direction_output(gpio, value); | 150 | return au1xxx_gpio2_direction_output(gpio, value); |
151 | #endif | 151 | #endif |
152 | else | 152 | |
153 | return au1xxx_gpio1_direction_output(gpio, value); | 153 | return au1xxx_gpio1_direction_output(gpio, value); |
154 | } | 154 | } |
155 | 155 | ||
156 | EXPORT_SYMBOL(au1xxx_gpio_direction_output); | 156 | EXPORT_SYMBOL(au1xxx_gpio_direction_output); |
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig index 67a80f4c7d87..700a3a2d688e 100644 --- a/arch/mips/configs/bigsur_defconfig +++ b/arch/mips/configs/bigsur_defconfig | |||
@@ -663,8 +663,8 @@ CONFIG_MOXA_SMARTIO_NEW=m | |||
663 | # CONFIG_SX is not set | 663 | # CONFIG_SX is not set |
664 | # CONFIG_RIO is not set | 664 | # CONFIG_RIO is not set |
665 | # CONFIG_STALDRV is not set | 665 | # CONFIG_STALDRV is not set |
666 | CONFIG_SIBYTE_SB1250_DUART=y | 666 | CONFIG_SERIAL_SB1250_DUART=y |
667 | CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y | 667 | CONFIG_SERIAL_SB1250_DUART_CONSOLE=y |
668 | 668 | ||
669 | # | 669 | # |
670 | # Serial drivers | 670 | # Serial drivers |
diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig index 4dc3197e2e9f..8ecbbb226c76 100644 --- a/arch/mips/configs/capcella_defconfig +++ b/arch/mips/configs/capcella_defconfig | |||
@@ -1,60 +1,47 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.20 | 3 | # Linux kernel version: 2.6.23-rc2 |
4 | # Tue Feb 20 21:47:22 2007 | 4 | # Wed Aug 8 10:23:16 2007 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
8 | # | 8 | # |
9 | # Machine selection | 9 | # Machine selection |
10 | # | 10 | # |
11 | CONFIG_ZONE_DMA=y | 11 | # CONFIG_MACH_ALCHEMY is not set |
12 | # CONFIG_MIPS_MTX1 is not set | ||
13 | # CONFIG_MIPS_BOSPORUS is not set | ||
14 | # CONFIG_MIPS_PB1000 is not set | ||
15 | # CONFIG_MIPS_PB1100 is not set | ||
16 | # CONFIG_MIPS_PB1500 is not set | ||
17 | # CONFIG_MIPS_PB1550 is not set | ||
18 | # CONFIG_MIPS_PB1200 is not set | ||
19 | # CONFIG_MIPS_DB1000 is not set | ||
20 | # CONFIG_MIPS_DB1100 is not set | ||
21 | # CONFIG_MIPS_DB1500 is not set | ||
22 | # CONFIG_MIPS_DB1550 is not set | ||
23 | # CONFIG_MIPS_DB1200 is not set | ||
24 | # CONFIG_MIPS_MIRAGE is not set | ||
25 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
26 | # CONFIG_MIPS_COBALT is not set | 13 | # CONFIG_MIPS_COBALT is not set |
27 | # CONFIG_MACH_DECSTATION is not set | 14 | # CONFIG_MACH_DECSTATION is not set |
28 | # CONFIG_MACH_JAZZ is not set | 15 | # CONFIG_MACH_JAZZ is not set |
16 | # CONFIG_LEMOTE_FULONG is not set | ||
29 | # CONFIG_MIPS_ATLAS is not set | 17 | # CONFIG_MIPS_ATLAS is not set |
30 | # CONFIG_MIPS_MALTA is not set | 18 | # CONFIG_MIPS_MALTA is not set |
31 | # CONFIG_MIPS_SEAD is not set | 19 | # CONFIG_MIPS_SEAD is not set |
32 | # CONFIG_WR_PPMC is not set | ||
33 | # CONFIG_MIPS_SIM is not set | 20 | # CONFIG_MIPS_SIM is not set |
34 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 21 | # CONFIG_MARKEINS is not set |
35 | # CONFIG_MIPS_XXS1500 is not set | 22 | CONFIG_MACH_VR41XX=y |
36 | # CONFIG_PNX8550_JBS is not set | 23 | # CONFIG_PNX8550_JBS is not set |
37 | # CONFIG_PNX8550_STB810 is not set | 24 | # CONFIG_PNX8550_STB810 is not set |
38 | CONFIG_MACH_VR41XX=y | 25 | # CONFIG_PMC_MSP is not set |
39 | # CONFIG_PMC_YOSEMITE is not set | 26 | # CONFIG_PMC_YOSEMITE is not set |
40 | # CONFIG_QEMU is not set | 27 | # CONFIG_QEMU is not set |
41 | # CONFIG_MARKEINS is not set | ||
42 | # CONFIG_SGI_IP22 is not set | 28 | # CONFIG_SGI_IP22 is not set |
43 | # CONFIG_SGI_IP27 is not set | 29 | # CONFIG_SGI_IP27 is not set |
44 | # CONFIG_SGI_IP32 is not set | 30 | # CONFIG_SGI_IP32 is not set |
45 | # CONFIG_SIBYTE_BIGSUR is not set | 31 | # CONFIG_SIBYTE_CRHINE is not set |
32 | # CONFIG_SIBYTE_CARMEL is not set | ||
33 | # CONFIG_SIBYTE_CRHONE is not set | ||
34 | # CONFIG_SIBYTE_RHONE is not set | ||
46 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | ||
49 | # CONFIG_SIBYTE_CARMEL is not set | ||
50 | # CONFIG_SIBYTE_PTSWARM is not set | 38 | # CONFIG_SIBYTE_PTSWARM is not set |
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 39 | # CONFIG_SIBYTE_BIGSUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | ||
53 | # CONFIG_SIBYTE_CRHONE is not set | ||
54 | # CONFIG_SNI_RM is not set | 40 | # CONFIG_SNI_RM is not set |
55 | # CONFIG_TOSHIBA_JMR3927 is not set | 41 | # CONFIG_TOSHIBA_JMR3927 is not set |
56 | # CONFIG_TOSHIBA_RBTX4927 is not set | 42 | # CONFIG_TOSHIBA_RBTX4927 is not set |
57 | # CONFIG_TOSHIBA_RBTX4938 is not set | 43 | # CONFIG_TOSHIBA_RBTX4938 is not set |
44 | # CONFIG_WR_PPMC is not set | ||
58 | # CONFIG_CASIO_E55 is not set | 45 | # CONFIG_CASIO_E55 is not set |
59 | # CONFIG_IBM_WORKPAD is not set | 46 | # CONFIG_IBM_WORKPAD is not set |
60 | # CONFIG_NEC_CMBVR4133 is not set | 47 | # CONFIG_NEC_CMBVR4133 is not set |
@@ -73,6 +60,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
73 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 60 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
74 | CONFIG_DMA_NONCOHERENT=y | 61 | CONFIG_DMA_NONCOHERENT=y |
75 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 62 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
63 | # CONFIG_HOTPLUG_CPU is not set | ||
64 | # CONFIG_NO_IOPORT is not set | ||
76 | # CONFIG_CPU_BIG_ENDIAN is not set | 65 | # CONFIG_CPU_BIG_ENDIAN is not set |
77 | CONFIG_CPU_LITTLE_ENDIAN=y | 66 | CONFIG_CPU_LITTLE_ENDIAN=y |
78 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 67 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
@@ -82,6 +71,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
82 | # | 71 | # |
83 | # CPU selection | 72 | # CPU selection |
84 | # | 73 | # |
74 | # CONFIG_CPU_LOONGSON2 is not set | ||
85 | # CONFIG_CPU_MIPS32_R1 is not set | 75 | # CONFIG_CPU_MIPS32_R1 is not set |
86 | # CONFIG_CPU_MIPS32_R2 is not set | 76 | # CONFIG_CPU_MIPS32_R2 is not set |
87 | # CONFIG_CPU_MIPS64_R1 is not set | 77 | # CONFIG_CPU_MIPS64_R1 is not set |
@@ -103,7 +93,6 @@ CONFIG_CPU_VR41XX=y | |||
103 | # CONFIG_CPU_SB1 is not set | 93 | # CONFIG_CPU_SB1 is not set |
104 | CONFIG_SYS_HAS_CPU_VR41XX=y | 94 | CONFIG_SYS_HAS_CPU_VR41XX=y |
105 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y | 95 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y |
106 | CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y | ||
107 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y | 96 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y |
108 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y | 97 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y |
109 | 98 | ||
@@ -119,7 +108,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
119 | CONFIG_MIPS_MT_DISABLED=y | 108 | CONFIG_MIPS_MT_DISABLED=y |
120 | # CONFIG_MIPS_MT_SMP is not set | 109 | # CONFIG_MIPS_MT_SMP is not set |
121 | # CONFIG_MIPS_MT_SMTC is not set | 110 | # CONFIG_MIPS_MT_SMTC is not set |
122 | # CONFIG_MIPS_VPE_LOADER is not set | ||
123 | CONFIG_CPU_HAS_SYNC=y | 111 | CONFIG_CPU_HAS_SYNC=y |
124 | CONFIG_GENERIC_HARDIRQS=y | 112 | CONFIG_GENERIC_HARDIRQS=y |
125 | CONFIG_GENERIC_IRQ_PROBE=y | 113 | CONFIG_GENERIC_IRQ_PROBE=y |
@@ -133,48 +121,47 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
133 | # CONFIG_SPARSEMEM_STATIC is not set | 121 | # CONFIG_SPARSEMEM_STATIC is not set |
134 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 122 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
135 | # CONFIG_RESOURCES_64BIT is not set | 123 | # CONFIG_RESOURCES_64BIT is not set |
136 | CONFIG_ZONE_DMA_FLAG=1 | 124 | CONFIG_ZONE_DMA_FLAG=0 |
125 | CONFIG_VIRT_TO_BUS=y | ||
137 | # CONFIG_HZ_48 is not set | 126 | # CONFIG_HZ_48 is not set |
138 | # CONFIG_HZ_100 is not set | 127 | # CONFIG_HZ_100 is not set |
139 | # CONFIG_HZ_128 is not set | 128 | # CONFIG_HZ_128 is not set |
140 | # CONFIG_HZ_250 is not set | 129 | CONFIG_HZ_250=y |
141 | # CONFIG_HZ_256 is not set | 130 | # CONFIG_HZ_256 is not set |
142 | CONFIG_HZ_1000=y | 131 | # CONFIG_HZ_1000 is not set |
143 | # CONFIG_HZ_1024 is not set | 132 | # CONFIG_HZ_1024 is not set |
144 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y | 133 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y |
145 | CONFIG_HZ=1000 | 134 | CONFIG_HZ=250 |
146 | CONFIG_PREEMPT_NONE=y | 135 | CONFIG_PREEMPT_NONE=y |
147 | # CONFIG_PREEMPT_VOLUNTARY is not set | 136 | # CONFIG_PREEMPT_VOLUNTARY is not set |
148 | # CONFIG_PREEMPT is not set | 137 | # CONFIG_PREEMPT is not set |
149 | # CONFIG_KEXEC is not set | 138 | # CONFIG_KEXEC is not set |
139 | CONFIG_SECCOMP=y | ||
150 | CONFIG_LOCKDEP_SUPPORT=y | 140 | CONFIG_LOCKDEP_SUPPORT=y |
151 | CONFIG_STACKTRACE_SUPPORT=y | 141 | CONFIG_STACKTRACE_SUPPORT=y |
152 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 142 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
153 | 143 | ||
154 | # | 144 | # |
155 | # Code maturity level options | 145 | # General setup |
156 | # | 146 | # |
157 | CONFIG_EXPERIMENTAL=y | 147 | CONFIG_EXPERIMENTAL=y |
158 | CONFIG_BROKEN_ON_SMP=y | 148 | CONFIG_BROKEN_ON_SMP=y |
159 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 149 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
160 | |||
161 | # | ||
162 | # General setup | ||
163 | # | ||
164 | CONFIG_LOCALVERSION="" | 150 | CONFIG_LOCALVERSION="" |
165 | CONFIG_LOCALVERSION_AUTO=y | 151 | CONFIG_LOCALVERSION_AUTO=y |
166 | CONFIG_SWAP=y | 152 | CONFIG_SWAP=y |
167 | CONFIG_SYSVIPC=y | 153 | CONFIG_SYSVIPC=y |
168 | # CONFIG_IPC_NS is not set | ||
169 | CONFIG_SYSVIPC_SYSCTL=y | 154 | CONFIG_SYSVIPC_SYSCTL=y |
170 | # CONFIG_POSIX_MQUEUE is not set | 155 | # CONFIG_POSIX_MQUEUE is not set |
171 | # CONFIG_BSD_PROCESS_ACCT is not set | 156 | # CONFIG_BSD_PROCESS_ACCT is not set |
172 | # CONFIG_TASKSTATS is not set | 157 | # CONFIG_TASKSTATS is not set |
173 | # CONFIG_UTS_NS is not set | 158 | # CONFIG_USER_NS is not set |
174 | # CONFIG_AUDIT is not set | 159 | # CONFIG_AUDIT is not set |
175 | # CONFIG_IKCONFIG is not set | 160 | # CONFIG_IKCONFIG is not set |
161 | CONFIG_LOG_BUF_SHIFT=14 | ||
176 | CONFIG_SYSFS_DEPRECATED=y | 162 | CONFIG_SYSFS_DEPRECATED=y |
177 | # CONFIG_RELAY is not set | 163 | # CONFIG_RELAY is not set |
164 | # CONFIG_BLK_DEV_INITRD is not set | ||
178 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 165 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
179 | CONFIG_SYSCTL=y | 166 | CONFIG_SYSCTL=y |
180 | CONFIG_EMBEDDED=y | 167 | CONFIG_EMBEDDED=y |
@@ -187,32 +174,30 @@ CONFIG_BUG=y | |||
187 | CONFIG_ELF_CORE=y | 174 | CONFIG_ELF_CORE=y |
188 | CONFIG_BASE_FULL=y | 175 | CONFIG_BASE_FULL=y |
189 | CONFIG_FUTEX=y | 176 | CONFIG_FUTEX=y |
177 | CONFIG_ANON_INODES=y | ||
190 | CONFIG_EPOLL=y | 178 | CONFIG_EPOLL=y |
179 | CONFIG_SIGNALFD=y | ||
180 | CONFIG_TIMERFD=y | ||
181 | CONFIG_EVENTFD=y | ||
191 | CONFIG_SHMEM=y | 182 | CONFIG_SHMEM=y |
192 | CONFIG_SLAB=y | ||
193 | CONFIG_VM_EVENT_COUNTERS=y | 183 | CONFIG_VM_EVENT_COUNTERS=y |
184 | CONFIG_SLAB=y | ||
185 | # CONFIG_SLUB is not set | ||
186 | # CONFIG_SLOB is not set | ||
194 | CONFIG_RT_MUTEXES=y | 187 | CONFIG_RT_MUTEXES=y |
195 | # CONFIG_TINY_SHMEM is not set | 188 | # CONFIG_TINY_SHMEM is not set |
196 | CONFIG_BASE_SMALL=0 | 189 | CONFIG_BASE_SMALL=0 |
197 | # CONFIG_SLOB is not set | ||
198 | |||
199 | # | ||
200 | # Loadable module support | ||
201 | # | ||
202 | CONFIG_MODULES=y | 190 | CONFIG_MODULES=y |
203 | CONFIG_MODULE_UNLOAD=y | 191 | CONFIG_MODULE_UNLOAD=y |
204 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 192 | CONFIG_MODULE_FORCE_UNLOAD=y |
205 | CONFIG_MODVERSIONS=y | 193 | CONFIG_MODVERSIONS=y |
206 | CONFIG_MODULE_SRCVERSION_ALL=y | 194 | CONFIG_MODULE_SRCVERSION_ALL=y |
207 | CONFIG_KMOD=y | 195 | CONFIG_KMOD=y |
208 | |||
209 | # | ||
210 | # Block layer | ||
211 | # | ||
212 | CONFIG_BLOCK=y | 196 | CONFIG_BLOCK=y |
213 | # CONFIG_LBD is not set | 197 | # CONFIG_LBD is not set |
214 | # CONFIG_BLK_DEV_IO_TRACE is not set | 198 | # CONFIG_BLK_DEV_IO_TRACE is not set |
215 | # CONFIG_LSF is not set | 199 | # CONFIG_LSF is not set |
200 | # CONFIG_BLK_DEV_BSG is not set | ||
216 | 201 | ||
217 | # | 202 | # |
218 | # IO Schedulers | 203 | # IO Schedulers |
@@ -232,16 +217,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
232 | # | 217 | # |
233 | CONFIG_HW_HAS_PCI=y | 218 | CONFIG_HW_HAS_PCI=y |
234 | CONFIG_PCI=y | 219 | CONFIG_PCI=y |
220 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
235 | CONFIG_MMU=y | 221 | CONFIG_MMU=y |
236 | 222 | ||
237 | # | 223 | # |
238 | # PCCARD (PCMCIA/CardBus) support | 224 | # PCCARD (PCMCIA/CardBus) support |
239 | # | 225 | # |
240 | # CONFIG_PCCARD is not set | 226 | # CONFIG_PCCARD is not set |
241 | |||
242 | # | ||
243 | # PCI Hotplug Support | ||
244 | # | ||
245 | # CONFIG_HOTPLUG_PCI is not set | 227 | # CONFIG_HOTPLUG_PCI is not set |
246 | 228 | ||
247 | # | 229 | # |
@@ -254,10 +236,7 @@ CONFIG_TRAD_SIGNALS=y | |||
254 | # | 236 | # |
255 | # Power management options | 237 | # Power management options |
256 | # | 238 | # |
257 | CONFIG_PM=y | 239 | # CONFIG_PM is not set |
258 | # CONFIG_PM_LEGACY is not set | ||
259 | # CONFIG_PM_DEBUG is not set | ||
260 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
261 | 240 | ||
262 | # | 241 | # |
263 | # Networking | 242 | # Networking |
@@ -267,7 +246,6 @@ CONFIG_NET=y | |||
267 | # | 246 | # |
268 | # Networking options | 247 | # Networking options |
269 | # | 248 | # |
270 | # CONFIG_NETDEBUG is not set | ||
271 | CONFIG_PACKET=y | 249 | CONFIG_PACKET=y |
272 | CONFIG_PACKET_MMAP=y | 250 | CONFIG_PACKET_MMAP=y |
273 | CONFIG_UNIX=y | 251 | CONFIG_UNIX=y |
@@ -309,20 +287,13 @@ CONFIG_TCP_MD5SIG=y | |||
309 | # CONFIG_INET6_TUNNEL is not set | 287 | # CONFIG_INET6_TUNNEL is not set |
310 | CONFIG_NETWORK_SECMARK=y | 288 | CONFIG_NETWORK_SECMARK=y |
311 | # CONFIG_NETFILTER is not set | 289 | # CONFIG_NETFILTER is not set |
312 | |||
313 | # | ||
314 | # DCCP Configuration (EXPERIMENTAL) | ||
315 | # | ||
316 | # CONFIG_IP_DCCP is not set | 290 | # CONFIG_IP_DCCP is not set |
317 | 291 | CONFIG_IP_SCTP=m | |
318 | # | 292 | # CONFIG_SCTP_DBG_MSG is not set |
319 | # SCTP Configuration (EXPERIMENTAL) | 293 | # CONFIG_SCTP_DBG_OBJCNT is not set |
320 | # | 294 | # CONFIG_SCTP_HMAC_NONE is not set |
321 | # CONFIG_IP_SCTP is not set | 295 | # CONFIG_SCTP_HMAC_SHA1 is not set |
322 | 296 | CONFIG_SCTP_HMAC_MD5=y | |
323 | # | ||
324 | # TIPC Configuration (EXPERIMENTAL) | ||
325 | # | ||
326 | # CONFIG_TIPC is not set | 297 | # CONFIG_TIPC is not set |
327 | # CONFIG_ATM is not set | 298 | # CONFIG_ATM is not set |
328 | # CONFIG_BRIDGE is not set | 299 | # CONFIG_BRIDGE is not set |
@@ -348,7 +319,17 @@ CONFIG_NETWORK_SECMARK=y | |||
348 | # CONFIG_HAMRADIO is not set | 319 | # CONFIG_HAMRADIO is not set |
349 | # CONFIG_IRDA is not set | 320 | # CONFIG_IRDA is not set |
350 | # CONFIG_BT is not set | 321 | # CONFIG_BT is not set |
322 | # CONFIG_AF_RXRPC is not set | ||
323 | |||
324 | # | ||
325 | # Wireless | ||
326 | # | ||
327 | # CONFIG_CFG80211 is not set | ||
328 | # CONFIG_WIRELESS_EXT is not set | ||
329 | # CONFIG_MAC80211 is not set | ||
351 | # CONFIG_IEEE80211 is not set | 330 | # CONFIG_IEEE80211 is not set |
331 | # CONFIG_RFKILL is not set | ||
332 | # CONFIG_NET_9P is not set | ||
352 | 333 | ||
353 | # | 334 | # |
354 | # Device Drivers | 335 | # Device Drivers |
@@ -361,30 +342,10 @@ CONFIG_STANDALONE=y | |||
361 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 342 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
362 | CONFIG_FW_LOADER=m | 343 | CONFIG_FW_LOADER=m |
363 | # CONFIG_SYS_HYPERVISOR is not set | 344 | # CONFIG_SYS_HYPERVISOR is not set |
364 | 345 | # CONFIG_CONNECTOR is not set | |
365 | # | ||
366 | # Connector - unified userspace <-> kernelspace linker | ||
367 | # | ||
368 | CONFIG_CONNECTOR=m | ||
369 | |||
370 | # | ||
371 | # Memory Technology Devices (MTD) | ||
372 | # | ||
373 | # CONFIG_MTD is not set | 346 | # CONFIG_MTD is not set |
374 | |||
375 | # | ||
376 | # Parallel port support | ||
377 | # | ||
378 | # CONFIG_PARPORT is not set | 347 | # CONFIG_PARPORT is not set |
379 | 348 | CONFIG_BLK_DEV=y | |
380 | # | ||
381 | # Plug and Play support | ||
382 | # | ||
383 | # CONFIG_PNPACPI is not set | ||
384 | |||
385 | # | ||
386 | # Block devices | ||
387 | # | ||
388 | # CONFIG_BLK_CPQ_DA is not set | 349 | # CONFIG_BLK_CPQ_DA is not set |
389 | # CONFIG_BLK_CPQ_CISS_DA is not set | 350 | # CONFIG_BLK_CPQ_CISS_DA is not set |
390 | # CONFIG_BLK_DEV_DAC960 is not set | 351 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -397,19 +358,9 @@ CONFIG_BLK_DEV_RAM=y | |||
397 | CONFIG_BLK_DEV_RAM_COUNT=16 | 358 | CONFIG_BLK_DEV_RAM_COUNT=16 |
398 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 359 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
399 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 360 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
400 | # CONFIG_BLK_DEV_INITRD is not set | ||
401 | # CONFIG_CDROM_PKTCDVD is not set | 361 | # CONFIG_CDROM_PKTCDVD is not set |
402 | # CONFIG_ATA_OVER_ETH is not set | 362 | # CONFIG_ATA_OVER_ETH is not set |
403 | 363 | # CONFIG_MISC_DEVICES is not set | |
404 | # | ||
405 | # Misc devices | ||
406 | # | ||
407 | CONFIG_SGI_IOC4=m | ||
408 | # CONFIG_TIFM_CORE is not set | ||
409 | |||
410 | # | ||
411 | # ATA/ATAPI/MFM/RLL support | ||
412 | # | ||
413 | CONFIG_IDE=y | 364 | CONFIG_IDE=y |
414 | CONFIG_IDE_MAX_HWIFS=4 | 365 | CONFIG_IDE_MAX_HWIFS=4 |
415 | CONFIG_BLK_DEV_IDE=y | 366 | CONFIG_BLK_DEV_IDE=y |
@@ -424,15 +375,16 @@ CONFIG_BLK_DEV_IDEDISK=y | |||
424 | # CONFIG_BLK_DEV_IDETAPE is not set | 375 | # CONFIG_BLK_DEV_IDETAPE is not set |
425 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | 376 | # CONFIG_BLK_DEV_IDEFLOPPY is not set |
426 | # CONFIG_IDE_TASK_IOCTL is not set | 377 | # CONFIG_IDE_TASK_IOCTL is not set |
378 | CONFIG_IDE_PROC_FS=y | ||
427 | 379 | ||
428 | # | 380 | # |
429 | # IDE chipset support/bugfixes | 381 | # IDE chipset support/bugfixes |
430 | # | 382 | # |
431 | CONFIG_IDE_GENERIC=y | 383 | CONFIG_IDE_GENERIC=y |
432 | # CONFIG_BLK_DEV_IDEPCI is not set | 384 | # CONFIG_BLK_DEV_IDEPCI is not set |
385 | # CONFIG_IDEPCI_PCIBUS_ORDER is not set | ||
433 | # CONFIG_IDE_ARM is not set | 386 | # CONFIG_IDE_ARM is not set |
434 | # CONFIG_BLK_DEV_IDEDMA is not set | 387 | # CONFIG_BLK_DEV_IDEDMA is not set |
435 | # CONFIG_IDEDMA_AUTO is not set | ||
436 | # CONFIG_BLK_DEV_HD is not set | 388 | # CONFIG_BLK_DEV_HD is not set |
437 | 389 | ||
438 | # | 390 | # |
@@ -440,16 +392,9 @@ CONFIG_IDE_GENERIC=y | |||
440 | # | 392 | # |
441 | # CONFIG_RAID_ATTRS is not set | 393 | # CONFIG_RAID_ATTRS is not set |
442 | # CONFIG_SCSI is not set | 394 | # CONFIG_SCSI is not set |
395 | # CONFIG_SCSI_DMA is not set | ||
443 | # CONFIG_SCSI_NETLINK is not set | 396 | # CONFIG_SCSI_NETLINK is not set |
444 | |||
445 | # | ||
446 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
447 | # | ||
448 | # CONFIG_ATA is not set | 397 | # CONFIG_ATA is not set |
449 | |||
450 | # | ||
451 | # Multi-device support (RAID and LVM) | ||
452 | # | ||
453 | # CONFIG_MD is not set | 398 | # CONFIG_MD is not set |
454 | 399 | ||
455 | # | 400 | # |
@@ -460,30 +405,17 @@ CONFIG_IDE_GENERIC=y | |||
460 | # | 405 | # |
461 | # IEEE 1394 (FireWire) support | 406 | # IEEE 1394 (FireWire) support |
462 | # | 407 | # |
408 | # CONFIG_FIREWIRE is not set | ||
463 | # CONFIG_IEEE1394 is not set | 409 | # CONFIG_IEEE1394 is not set |
464 | |||
465 | # | ||
466 | # I2O device support | ||
467 | # | ||
468 | # CONFIG_I2O is not set | 410 | # CONFIG_I2O is not set |
469 | |||
470 | # | ||
471 | # Network device support | ||
472 | # | ||
473 | CONFIG_NETDEVICES=y | 411 | CONFIG_NETDEVICES=y |
412 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
474 | # CONFIG_DUMMY is not set | 413 | # CONFIG_DUMMY is not set |
475 | # CONFIG_BONDING is not set | 414 | # CONFIG_BONDING is not set |
415 | # CONFIG_MACVLAN is not set | ||
476 | # CONFIG_EQUALIZER is not set | 416 | # CONFIG_EQUALIZER is not set |
477 | # CONFIG_TUN is not set | 417 | # CONFIG_TUN is not set |
478 | |||
479 | # | ||
480 | # ARCnet devices | ||
481 | # | ||
482 | # CONFIG_ARCNET is not set | 418 | # CONFIG_ARCNET is not set |
483 | |||
484 | # | ||
485 | # PHY device support | ||
486 | # | ||
487 | CONFIG_PHYLIB=m | 419 | CONFIG_PHYLIB=m |
488 | 420 | ||
489 | # | 421 | # |
@@ -497,22 +429,16 @@ CONFIG_CICADA_PHY=m | |||
497 | CONFIG_VITESSE_PHY=m | 429 | CONFIG_VITESSE_PHY=m |
498 | CONFIG_SMSC_PHY=m | 430 | CONFIG_SMSC_PHY=m |
499 | # CONFIG_BROADCOM_PHY is not set | 431 | # CONFIG_BROADCOM_PHY is not set |
432 | # CONFIG_ICPLUS_PHY is not set | ||
500 | # CONFIG_FIXED_PHY is not set | 433 | # CONFIG_FIXED_PHY is not set |
501 | |||
502 | # | ||
503 | # Ethernet (10 or 100Mbit) | ||
504 | # | ||
505 | CONFIG_NET_ETHERNET=y | 434 | CONFIG_NET_ETHERNET=y |
506 | CONFIG_MII=y | 435 | CONFIG_MII=y |
436 | # CONFIG_AX88796 is not set | ||
507 | # CONFIG_HAPPYMEAL is not set | 437 | # CONFIG_HAPPYMEAL is not set |
508 | # CONFIG_SUNGEM is not set | 438 | # CONFIG_SUNGEM is not set |
509 | # CONFIG_CASSINI is not set | 439 | # CONFIG_CASSINI is not set |
510 | # CONFIG_NET_VENDOR_3COM is not set | 440 | # CONFIG_NET_VENDOR_3COM is not set |
511 | # CONFIG_DM9000 is not set | 441 | # CONFIG_DM9000 is not set |
512 | |||
513 | # | ||
514 | # Tulip family network device support | ||
515 | # | ||
516 | # CONFIG_NET_TULIP is not set | 442 | # CONFIG_NET_TULIP is not set |
517 | # CONFIG_HP100 is not set | 443 | # CONFIG_HP100 is not set |
518 | CONFIG_NET_PCI=y | 444 | CONFIG_NET_PCI=y |
@@ -521,6 +447,7 @@ CONFIG_NET_PCI=y | |||
521 | # CONFIG_ADAPTEC_STARFIRE is not set | 447 | # CONFIG_ADAPTEC_STARFIRE is not set |
522 | # CONFIG_B44 is not set | 448 | # CONFIG_B44 is not set |
523 | # CONFIG_FORCEDETH is not set | 449 | # CONFIG_FORCEDETH is not set |
450 | # CONFIG_TC35815 is not set | ||
524 | # CONFIG_DGRS is not set | 451 | # CONFIG_DGRS is not set |
525 | # CONFIG_EEPRO100 is not set | 452 | # CONFIG_EEPRO100 is not set |
526 | # CONFIG_E100 is not set | 453 | # CONFIG_E100 is not set |
@@ -539,50 +466,15 @@ CONFIG_8139TOO_PIO=y | |||
539 | # CONFIG_TLAN is not set | 466 | # CONFIG_TLAN is not set |
540 | # CONFIG_VIA_RHINE is not set | 467 | # CONFIG_VIA_RHINE is not set |
541 | # CONFIG_SC92031 is not set | 468 | # CONFIG_SC92031 is not set |
542 | 469 | # CONFIG_NETDEV_1000 is not set | |
543 | # | 470 | # CONFIG_NETDEV_10000 is not set |
544 | # Ethernet (1000 Mbit) | ||
545 | # | ||
546 | # CONFIG_ACENIC is not set | ||
547 | # CONFIG_DL2K is not set | ||
548 | # CONFIG_E1000 is not set | ||
549 | # CONFIG_NS83820 is not set | ||
550 | # CONFIG_HAMACHI is not set | ||
551 | # CONFIG_YELLOWFIN is not set | ||
552 | # CONFIG_R8169 is not set | ||
553 | # CONFIG_SIS190 is not set | ||
554 | # CONFIG_SKGE is not set | ||
555 | # CONFIG_SKY2 is not set | ||
556 | # CONFIG_SK98LIN is not set | ||
557 | # CONFIG_VIA_VELOCITY is not set | ||
558 | # CONFIG_TIGON3 is not set | ||
559 | # CONFIG_BNX2 is not set | ||
560 | CONFIG_QLA3XXX=m | ||
561 | # CONFIG_ATL1 is not set | ||
562 | |||
563 | # | ||
564 | # Ethernet (10000 Mbit) | ||
565 | # | ||
566 | # CONFIG_CHELSIO_T1 is not set | ||
567 | CONFIG_CHELSIO_T3=m | ||
568 | # CONFIG_IXGB is not set | ||
569 | # CONFIG_S2IO is not set | ||
570 | # CONFIG_MYRI10GE is not set | ||
571 | CONFIG_NETXEN_NIC=m | ||
572 | |||
573 | # | ||
574 | # Token Ring devices | ||
575 | # | ||
576 | # CONFIG_TR is not set | 471 | # CONFIG_TR is not set |
577 | 472 | ||
578 | # | 473 | # |
579 | # Wireless LAN (non-hamradio) | 474 | # Wireless LAN |
580 | # | ||
581 | # CONFIG_NET_RADIO is not set | ||
582 | |||
583 | # | ||
584 | # Wan interfaces | ||
585 | # | 475 | # |
476 | # CONFIG_WLAN_PRE80211 is not set | ||
477 | # CONFIG_WLAN_80211 is not set | ||
586 | # CONFIG_WAN is not set | 478 | # CONFIG_WAN is not set |
587 | # CONFIG_FDDI is not set | 479 | # CONFIG_FDDI is not set |
588 | # CONFIG_HIPPI is not set | 480 | # CONFIG_HIPPI is not set |
@@ -592,15 +484,7 @@ CONFIG_NETXEN_NIC=m | |||
592 | # CONFIG_NETCONSOLE is not set | 484 | # CONFIG_NETCONSOLE is not set |
593 | # CONFIG_NETPOLL is not set | 485 | # CONFIG_NETPOLL is not set |
594 | # CONFIG_NET_POLL_CONTROLLER is not set | 486 | # CONFIG_NET_POLL_CONTROLLER is not set |
595 | |||
596 | # | ||
597 | # ISDN subsystem | ||
598 | # | ||
599 | # CONFIG_ISDN is not set | 487 | # CONFIG_ISDN is not set |
600 | |||
601 | # | ||
602 | # Telephony Support | ||
603 | # | ||
604 | # CONFIG_PHONE is not set | 488 | # CONFIG_PHONE is not set |
605 | 489 | ||
606 | # | 490 | # |
@@ -608,6 +492,7 @@ CONFIG_NETXEN_NIC=m | |||
608 | # | 492 | # |
609 | CONFIG_INPUT=y | 493 | CONFIG_INPUT=y |
610 | # CONFIG_INPUT_FF_MEMLESS is not set | 494 | # CONFIG_INPUT_FF_MEMLESS is not set |
495 | # CONFIG_INPUT_POLLDEV is not set | ||
611 | 496 | ||
612 | # | 497 | # |
613 | # Userland interfaces | 498 | # Userland interfaces |
@@ -624,6 +509,7 @@ CONFIG_INPUT=y | |||
624 | # CONFIG_INPUT_KEYBOARD is not set | 509 | # CONFIG_INPUT_KEYBOARD is not set |
625 | # CONFIG_INPUT_MOUSE is not set | 510 | # CONFIG_INPUT_MOUSE is not set |
626 | # CONFIG_INPUT_JOYSTICK is not set | 511 | # CONFIG_INPUT_JOYSTICK is not set |
512 | # CONFIG_INPUT_TABLET is not set | ||
627 | # CONFIG_INPUT_TOUCHSCREEN is not set | 513 | # CONFIG_INPUT_TOUCHSCREEN is not set |
628 | # CONFIG_INPUT_MISC is not set | 514 | # CONFIG_INPUT_MISC is not set |
629 | 515 | ||
@@ -658,34 +544,17 @@ CONFIG_SERIAL_VR41XX_CONSOLE=y | |||
658 | CONFIG_UNIX98_PTYS=y | 544 | CONFIG_UNIX98_PTYS=y |
659 | CONFIG_LEGACY_PTYS=y | 545 | CONFIG_LEGACY_PTYS=y |
660 | CONFIG_LEGACY_PTY_COUNT=256 | 546 | CONFIG_LEGACY_PTY_COUNT=256 |
661 | |||
662 | # | ||
663 | # IPMI | ||
664 | # | ||
665 | # CONFIG_IPMI_HANDLER is not set | 547 | # CONFIG_IPMI_HANDLER is not set |
666 | |||
667 | # | ||
668 | # Watchdog Cards | ||
669 | # | ||
670 | # CONFIG_WATCHDOG is not set | 548 | # CONFIG_WATCHDOG is not set |
671 | # CONFIG_HW_RANDOM is not set | 549 | # CONFIG_HW_RANDOM is not set |
672 | # CONFIG_RTC is not set | 550 | # CONFIG_RTC is not set |
673 | # CONFIG_GEN_RTC is not set | ||
674 | # CONFIG_DTLK is not set | ||
675 | # CONFIG_R3964 is not set | 551 | # CONFIG_R3964 is not set |
676 | # CONFIG_APPLICOM is not set | 552 | # CONFIG_APPLICOM is not set |
677 | # CONFIG_DRM is not set | 553 | # CONFIG_DRM is not set |
678 | CONFIG_GPIO_VR41XX=y | 554 | CONFIG_GPIO_VR41XX=y |
679 | # CONFIG_RAW_DRIVER is not set | 555 | # CONFIG_RAW_DRIVER is not set |
680 | |||
681 | # | ||
682 | # TPM devices | ||
683 | # | ||
684 | # CONFIG_TCG_TPM is not set | 556 | # CONFIG_TCG_TPM is not set |
685 | 557 | CONFIG_DEVPORT=y | |
686 | # | ||
687 | # I2C support | ||
688 | # | ||
689 | # CONFIG_I2C is not set | 558 | # CONFIG_I2C is not set |
690 | 559 | ||
691 | # | 560 | # |
@@ -693,32 +562,33 @@ CONFIG_GPIO_VR41XX=y | |||
693 | # | 562 | # |
694 | # CONFIG_SPI is not set | 563 | # CONFIG_SPI is not set |
695 | # CONFIG_SPI_MASTER is not set | 564 | # CONFIG_SPI_MASTER is not set |
696 | |||
697 | # | ||
698 | # Dallas's 1-wire bus | ||
699 | # | ||
700 | # CONFIG_W1 is not set | 565 | # CONFIG_W1 is not set |
566 | # CONFIG_POWER_SUPPLY is not set | ||
567 | # CONFIG_HWMON is not set | ||
701 | 568 | ||
702 | # | 569 | # |
703 | # Hardware Monitoring support | 570 | # Multifunction device drivers |
704 | # | 571 | # |
705 | # CONFIG_HWMON is not set | 572 | # CONFIG_MFD_SM501 is not set |
706 | # CONFIG_HWMON_VID is not set | ||
707 | 573 | ||
708 | # | 574 | # |
709 | # Multimedia devices | 575 | # Multimedia devices |
710 | # | 576 | # |
711 | # CONFIG_VIDEO_DEV is not set | 577 | # CONFIG_VIDEO_DEV is not set |
578 | # CONFIG_DVB_CORE is not set | ||
579 | # CONFIG_DAB is not set | ||
712 | 580 | ||
713 | # | 581 | # |
714 | # Digital Video Broadcasting Devices | 582 | # Graphics support |
715 | # | 583 | # |
716 | # CONFIG_DVB is not set | 584 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
717 | 585 | ||
718 | # | 586 | # |
719 | # Graphics support | 587 | # Display device support |
720 | # | 588 | # |
721 | # CONFIG_FIRMWARE_EDID is not set | 589 | # CONFIG_DISPLAY_SUPPORT is not set |
590 | # CONFIG_VGASTATE is not set | ||
591 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
722 | # CONFIG_FB is not set | 592 | # CONFIG_FB is not set |
723 | 593 | ||
724 | # | 594 | # |
@@ -726,65 +596,16 @@ CONFIG_GPIO_VR41XX=y | |||
726 | # | 596 | # |
727 | # CONFIG_VGA_CONSOLE is not set | 597 | # CONFIG_VGA_CONSOLE is not set |
728 | CONFIG_DUMMY_CONSOLE=y | 598 | CONFIG_DUMMY_CONSOLE=y |
729 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
730 | 599 | ||
731 | # | 600 | # |
732 | # Sound | 601 | # Sound |
733 | # | 602 | # |
734 | # CONFIG_SOUND is not set | 603 | # CONFIG_SOUND is not set |
735 | 604 | # CONFIG_HID_SUPPORT is not set | |
736 | # | 605 | # CONFIG_USB_SUPPORT is not set |
737 | # HID Devices | ||
738 | # | ||
739 | # CONFIG_HID is not set | ||
740 | |||
741 | # | ||
742 | # USB support | ||
743 | # | ||
744 | CONFIG_USB_ARCH_HAS_HCD=y | ||
745 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
746 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
747 | # CONFIG_USB is not set | ||
748 | |||
749 | # | ||
750 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
751 | # | ||
752 | |||
753 | # | ||
754 | # USB Gadget Support | ||
755 | # | ||
756 | # CONFIG_USB_GADGET is not set | ||
757 | |||
758 | # | ||
759 | # MMC/SD Card support | ||
760 | # | ||
761 | # CONFIG_MMC is not set | 606 | # CONFIG_MMC is not set |
762 | |||
763 | # | ||
764 | # LED devices | ||
765 | # | ||
766 | # CONFIG_NEW_LEDS is not set | 607 | # CONFIG_NEW_LEDS is not set |
767 | |||
768 | # | ||
769 | # LED drivers | ||
770 | # | ||
771 | |||
772 | # | ||
773 | # LED Triggers | ||
774 | # | ||
775 | |||
776 | # | ||
777 | # InfiniBand support | ||
778 | # | ||
779 | # CONFIG_INFINIBAND is not set | 608 | # CONFIG_INFINIBAND is not set |
780 | |||
781 | # | ||
782 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
783 | # | ||
784 | |||
785 | # | ||
786 | # Real Time Clock | ||
787 | # | ||
788 | CONFIG_RTC_LIB=y | 609 | CONFIG_RTC_LIB=y |
789 | CONFIG_RTC_CLASS=y | 610 | CONFIG_RTC_CLASS=y |
790 | CONFIG_RTC_HCTOSYS=y | 611 | CONFIG_RTC_HCTOSYS=y |
@@ -798,18 +619,29 @@ CONFIG_RTC_INTF_SYSFS=y | |||
798 | CONFIG_RTC_INTF_PROC=y | 619 | CONFIG_RTC_INTF_PROC=y |
799 | CONFIG_RTC_INTF_DEV=y | 620 | CONFIG_RTC_INTF_DEV=y |
800 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | 621 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set |
622 | # CONFIG_RTC_DRV_TEST is not set | ||
623 | |||
624 | # | ||
625 | # SPI RTC drivers | ||
626 | # | ||
801 | 627 | ||
802 | # | 628 | # |
803 | # RTC drivers | 629 | # Platform RTC drivers |
804 | # | 630 | # |
631 | # CONFIG_RTC_DRV_CMOS is not set | ||
805 | # CONFIG_RTC_DRV_DS1553 is not set | 632 | # CONFIG_RTC_DRV_DS1553 is not set |
633 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
806 | # CONFIG_RTC_DRV_DS1742 is not set | 634 | # CONFIG_RTC_DRV_DS1742 is not set |
807 | # CONFIG_RTC_DRV_M48T86 is not set | 635 | # CONFIG_RTC_DRV_M48T86 is not set |
808 | CONFIG_RTC_DRV_VR41XX=y | 636 | # CONFIG_RTC_DRV_M48T59 is not set |
809 | # CONFIG_RTC_DRV_TEST is not set | ||
810 | # CONFIG_RTC_DRV_V3020 is not set | 637 | # CONFIG_RTC_DRV_V3020 is not set |
811 | 638 | ||
812 | # | 639 | # |
640 | # on-CPU RTC drivers | ||
641 | # | ||
642 | CONFIG_RTC_DRV_VR41XX=y | ||
643 | |||
644 | # | ||
813 | # DMA Engine support | 645 | # DMA Engine support |
814 | # | 646 | # |
815 | # CONFIG_DMA_ENGINE is not set | 647 | # CONFIG_DMA_ENGINE is not set |
@@ -823,12 +655,9 @@ CONFIG_RTC_DRV_VR41XX=y | |||
823 | # | 655 | # |
824 | 656 | ||
825 | # | 657 | # |
826 | # Auxiliary Display support | 658 | # Userspace I/O |
827 | # | ||
828 | |||
829 | # | ||
830 | # Virtualization | ||
831 | # | 659 | # |
660 | # CONFIG_UIO is not set | ||
832 | 661 | ||
833 | # | 662 | # |
834 | # File systems | 663 | # File systems |
@@ -836,8 +665,14 @@ CONFIG_RTC_DRV_VR41XX=y | |||
836 | CONFIG_EXT2_FS=y | 665 | CONFIG_EXT2_FS=y |
837 | # CONFIG_EXT2_FS_XATTR is not set | 666 | # CONFIG_EXT2_FS_XATTR is not set |
838 | # CONFIG_EXT2_FS_XIP is not set | 667 | # CONFIG_EXT2_FS_XIP is not set |
839 | # CONFIG_EXT3_FS is not set | 668 | CONFIG_EXT3_FS=y |
669 | CONFIG_EXT3_FS_XATTR=y | ||
670 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
671 | # CONFIG_EXT3_FS_SECURITY is not set | ||
840 | # CONFIG_EXT4DEV_FS is not set | 672 | # CONFIG_EXT4DEV_FS is not set |
673 | CONFIG_JBD=y | ||
674 | # CONFIG_JBD_DEBUG is not set | ||
675 | CONFIG_FS_MBCACHE=y | ||
841 | # CONFIG_REISERFS_FS is not set | 676 | # CONFIG_REISERFS_FS is not set |
842 | # CONFIG_JFS_FS is not set | 677 | # CONFIG_JFS_FS is not set |
843 | CONFIG_FS_POSIX_ACL=y | 678 | CONFIG_FS_POSIX_ACL=y |
@@ -852,7 +687,7 @@ CONFIG_INOTIFY_USER=y | |||
852 | CONFIG_DNOTIFY=y | 687 | CONFIG_DNOTIFY=y |
853 | # CONFIG_AUTOFS_FS is not set | 688 | # CONFIG_AUTOFS_FS is not set |
854 | CONFIG_AUTOFS4_FS=y | 689 | CONFIG_AUTOFS4_FS=y |
855 | CONFIG_FUSE_FS=m | 690 | # CONFIG_FUSE_FS is not set |
856 | CONFIG_GENERIC_ACL=y | 691 | CONFIG_GENERIC_ACL=y |
857 | 692 | ||
858 | # | 693 | # |
@@ -879,7 +714,7 @@ CONFIG_TMPFS=y | |||
879 | CONFIG_TMPFS_POSIX_ACL=y | 714 | CONFIG_TMPFS_POSIX_ACL=y |
880 | # CONFIG_HUGETLB_PAGE is not set | 715 | # CONFIG_HUGETLB_PAGE is not set |
881 | CONFIG_RAMFS=y | 716 | CONFIG_RAMFS=y |
882 | CONFIG_CONFIGFS_FS=m | 717 | # CONFIG_CONFIGFS_FS is not set |
883 | 718 | ||
884 | # | 719 | # |
885 | # Miscellaneous filesystems | 720 | # Miscellaneous filesystems |
@@ -905,14 +740,12 @@ CONFIG_NFS_FS=y | |||
905 | # CONFIG_NFS_V3 is not set | 740 | # CONFIG_NFS_V3 is not set |
906 | # CONFIG_NFS_V4 is not set | 741 | # CONFIG_NFS_V4 is not set |
907 | # CONFIG_NFS_DIRECTIO is not set | 742 | # CONFIG_NFS_DIRECTIO is not set |
908 | CONFIG_NFSD=y | 743 | # CONFIG_NFSD is not set |
909 | # CONFIG_NFSD_V3 is not set | ||
910 | # CONFIG_NFSD_TCP is not set | ||
911 | CONFIG_ROOT_NFS=y | 744 | CONFIG_ROOT_NFS=y |
912 | CONFIG_LOCKD=y | 745 | CONFIG_LOCKD=y |
913 | CONFIG_EXPORTFS=y | ||
914 | CONFIG_NFS_COMMON=y | 746 | CONFIG_NFS_COMMON=y |
915 | CONFIG_SUNRPC=y | 747 | CONFIG_SUNRPC=y |
748 | # CONFIG_SUNRPC_BIND34 is not set | ||
916 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 749 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
917 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 750 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
918 | # CONFIG_SMB_FS is not set | 751 | # CONFIG_SMB_FS is not set |
@@ -920,7 +753,6 @@ CONFIG_SUNRPC=y | |||
920 | # CONFIG_NCP_FS is not set | 753 | # CONFIG_NCP_FS is not set |
921 | # CONFIG_CODA_FS is not set | 754 | # CONFIG_CODA_FS is not set |
922 | # CONFIG_AFS_FS is not set | 755 | # CONFIG_AFS_FS is not set |
923 | # CONFIG_9P_FS is not set | ||
924 | 756 | ||
925 | # | 757 | # |
926 | # Partition Types | 758 | # Partition Types |
@@ -936,10 +768,7 @@ CONFIG_MSDOS_PARTITION=y | |||
936 | # | 768 | # |
937 | # Distributed Lock Manager | 769 | # Distributed Lock Manager |
938 | # | 770 | # |
939 | CONFIG_DLM=m | 771 | # CONFIG_DLM is not set |
940 | CONFIG_DLM_TCP=y | ||
941 | # CONFIG_DLM_SCTP is not set | ||
942 | # CONFIG_DLM_DEBUG is not set | ||
943 | 772 | ||
944 | # | 773 | # |
945 | # Profiling support | 774 | # Profiling support |
@@ -957,7 +786,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
957 | # CONFIG_DEBUG_FS is not set | 786 | # CONFIG_DEBUG_FS is not set |
958 | # CONFIG_HEADERS_CHECK is not set | 787 | # CONFIG_HEADERS_CHECK is not set |
959 | # CONFIG_DEBUG_KERNEL is not set | 788 | # CONFIG_DEBUG_KERNEL is not set |
960 | CONFIG_LOG_BUF_SHIFT=14 | ||
961 | CONFIG_CROSSCOMPILE=y | 789 | CONFIG_CROSSCOMPILE=y |
962 | CONFIG_CMDLINE="mem=32M console=ttyVR0,38400" | 790 | CONFIG_CMDLINE="mem=32M console=ttyVR0,38400" |
963 | 791 | ||
@@ -966,10 +794,6 @@ CONFIG_CMDLINE="mem=32M console=ttyVR0,38400" | |||
966 | # | 794 | # |
967 | # CONFIG_KEYS is not set | 795 | # CONFIG_KEYS is not set |
968 | # CONFIG_SECURITY is not set | 796 | # CONFIG_SECURITY is not set |
969 | |||
970 | # | ||
971 | # Cryptographic options | ||
972 | # | ||
973 | CONFIG_CRYPTO=y | 797 | CONFIG_CRYPTO=y |
974 | CONFIG_CRYPTO_ALGAPI=y | 798 | CONFIG_CRYPTO_ALGAPI=y |
975 | CONFIG_CRYPTO_BLKCIPHER=m | 799 | CONFIG_CRYPTO_BLKCIPHER=m |
@@ -990,6 +814,7 @@ CONFIG_CRYPTO_ECB=m | |||
990 | CONFIG_CRYPTO_CBC=m | 814 | CONFIG_CRYPTO_CBC=m |
991 | CONFIG_CRYPTO_PCBC=m | 815 | CONFIG_CRYPTO_PCBC=m |
992 | CONFIG_CRYPTO_LRW=m | 816 | CONFIG_CRYPTO_LRW=m |
817 | # CONFIG_CRYPTO_CRYPTD is not set | ||
993 | CONFIG_CRYPTO_DES=m | 818 | CONFIG_CRYPTO_DES=m |
994 | CONFIG_CRYPTO_FCRYPT=m | 819 | CONFIG_CRYPTO_FCRYPT=m |
995 | CONFIG_CRYPTO_BLOWFISH=m | 820 | CONFIG_CRYPTO_BLOWFISH=m |
@@ -1008,10 +833,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=m | |||
1008 | # CONFIG_CRYPTO_CRC32C is not set | 833 | # CONFIG_CRYPTO_CRC32C is not set |
1009 | CONFIG_CRYPTO_CAMELLIA=m | 834 | CONFIG_CRYPTO_CAMELLIA=m |
1010 | # CONFIG_CRYPTO_TEST is not set | 835 | # CONFIG_CRYPTO_TEST is not set |
1011 | 836 | # CONFIG_CRYPTO_HW is not set | |
1012 | # | ||
1013 | # Hardware crypto devices | ||
1014 | # | ||
1015 | 837 | ||
1016 | # | 838 | # |
1017 | # Library routines | 839 | # Library routines |
@@ -1019,10 +841,13 @@ CONFIG_CRYPTO_CAMELLIA=m | |||
1019 | CONFIG_BITREVERSE=y | 841 | CONFIG_BITREVERSE=y |
1020 | # CONFIG_CRC_CCITT is not set | 842 | # CONFIG_CRC_CCITT is not set |
1021 | # CONFIG_CRC16 is not set | 843 | # CONFIG_CRC16 is not set |
844 | # CONFIG_CRC_ITU_T is not set | ||
1022 | CONFIG_CRC32=y | 845 | CONFIG_CRC32=y |
846 | # CONFIG_CRC7 is not set | ||
1023 | # CONFIG_LIBCRC32C is not set | 847 | # CONFIG_LIBCRC32C is not set |
1024 | CONFIG_ZLIB_INFLATE=m | 848 | CONFIG_ZLIB_INFLATE=m |
1025 | CONFIG_ZLIB_DEFLATE=m | 849 | CONFIG_ZLIB_DEFLATE=m |
1026 | CONFIG_PLIST=y | 850 | CONFIG_PLIST=y |
1027 | CONFIG_HAS_IOMEM=y | 851 | CONFIG_HAS_IOMEM=y |
1028 | CONFIG_HAS_IOPORT=y | 852 | CONFIG_HAS_IOPORT=y |
853 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig index 6d6a01b9a817..ebcb7ad8814b 100644 --- a/arch/mips/configs/cobalt_defconfig +++ b/arch/mips/configs/cobalt_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.22-rc2 | 3 | # Linux kernel version: 2.6.23-rc2 |
4 | # Fri May 25 11:17:29 2007 | 4 | # Tue Aug 7 22:12:54 2007 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
@@ -13,33 +13,35 @@ CONFIG_MIPS=y | |||
13 | CONFIG_MIPS_COBALT=y | 13 | CONFIG_MIPS_COBALT=y |
14 | # CONFIG_MACH_DECSTATION is not set | 14 | # CONFIG_MACH_DECSTATION is not set |
15 | # CONFIG_MACH_JAZZ is not set | 15 | # CONFIG_MACH_JAZZ is not set |
16 | # CONFIG_LEMOTE_FULONG is not set | ||
16 | # CONFIG_MIPS_ATLAS is not set | 17 | # CONFIG_MIPS_ATLAS is not set |
17 | # CONFIG_MIPS_MALTA is not set | 18 | # CONFIG_MIPS_MALTA is not set |
18 | # CONFIG_MIPS_SEAD is not set | 19 | # CONFIG_MIPS_SEAD is not set |
19 | # CONFIG_WR_PPMC is not set | ||
20 | # CONFIG_MIPS_SIM is not set | 20 | # CONFIG_MIPS_SIM is not set |
21 | # CONFIG_MARKEINS is not set | ||
22 | # CONFIG_MACH_VR41XX is not set | ||
21 | # CONFIG_PNX8550_JBS is not set | 23 | # CONFIG_PNX8550_JBS is not set |
22 | # CONFIG_PNX8550_STB810 is not set | 24 | # CONFIG_PNX8550_STB810 is not set |
23 | # CONFIG_MACH_VR41XX is not set | 25 | # CONFIG_PMC_MSP is not set |
24 | # CONFIG_PMC_YOSEMITE is not set | 26 | # CONFIG_PMC_YOSEMITE is not set |
25 | # CONFIG_QEMU is not set | 27 | # CONFIG_QEMU is not set |
26 | # CONFIG_MARKEINS is not set | ||
27 | # CONFIG_SGI_IP22 is not set | 28 | # CONFIG_SGI_IP22 is not set |
28 | # CONFIG_SGI_IP27 is not set | 29 | # CONFIG_SGI_IP27 is not set |
29 | # CONFIG_SGI_IP32 is not set | 30 | # CONFIG_SGI_IP32 is not set |
30 | # CONFIG_SIBYTE_BIGSUR is not set | 31 | # CONFIG_SIBYTE_CRHINE is not set |
32 | # CONFIG_SIBYTE_CARMEL is not set | ||
33 | # CONFIG_SIBYTE_CRHONE is not set | ||
34 | # CONFIG_SIBYTE_RHONE is not set | ||
31 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
32 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
33 | # CONFIG_SIBYTE_RHONE is not set | ||
34 | # CONFIG_SIBYTE_CARMEL is not set | ||
35 | # CONFIG_SIBYTE_PTSWARM is not set | 38 | # CONFIG_SIBYTE_PTSWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | 39 | # CONFIG_SIBYTE_BIGSUR is not set |
37 | # CONFIG_SIBYTE_CRHINE is not set | ||
38 | # CONFIG_SIBYTE_CRHONE is not set | ||
39 | # CONFIG_SNI_RM is not set | 40 | # CONFIG_SNI_RM is not set |
40 | # CONFIG_TOSHIBA_JMR3927 is not set | 41 | # CONFIG_TOSHIBA_JMR3927 is not set |
41 | # CONFIG_TOSHIBA_RBTX4927 is not set | 42 | # CONFIG_TOSHIBA_RBTX4927 is not set |
42 | # CONFIG_TOSHIBA_RBTX4938 is not set | 43 | # CONFIG_TOSHIBA_RBTX4938 is not set |
44 | # CONFIG_WR_PPMC is not set | ||
43 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 45 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
44 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 46 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
45 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 47 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
@@ -54,6 +56,7 @@ CONFIG_DMA_NEED_PCI_MAP_STATE=y | |||
54 | CONFIG_EARLY_PRINTK=y | 56 | CONFIG_EARLY_PRINTK=y |
55 | CONFIG_SYS_HAS_EARLY_PRINTK=y | 57 | CONFIG_SYS_HAS_EARLY_PRINTK=y |
56 | CONFIG_I8259=y | 58 | CONFIG_I8259=y |
59 | # CONFIG_NO_IOPORT is not set | ||
57 | # CONFIG_CPU_BIG_ENDIAN is not set | 60 | # CONFIG_CPU_BIG_ENDIAN is not set |
58 | CONFIG_CPU_LITTLE_ENDIAN=y | 61 | CONFIG_CPU_LITTLE_ENDIAN=y |
59 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 62 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
@@ -64,6 +67,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
64 | # | 67 | # |
65 | # CPU selection | 68 | # CPU selection |
66 | # | 69 | # |
70 | # CONFIG_CPU_LOONGSON2 is not set | ||
67 | # CONFIG_CPU_MIPS32_R1 is not set | 71 | # CONFIG_CPU_MIPS32_R1 is not set |
68 | # CONFIG_CPU_MIPS32_R2 is not set | 72 | # CONFIG_CPU_MIPS32_R2 is not set |
69 | # CONFIG_CPU_MIPS64_R1 is not set | 73 | # CONFIG_CPU_MIPS64_R1 is not set |
@@ -101,7 +105,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
101 | CONFIG_MIPS_MT_DISABLED=y | 105 | CONFIG_MIPS_MT_DISABLED=y |
102 | # CONFIG_MIPS_MT_SMP is not set | 106 | # CONFIG_MIPS_MT_SMP is not set |
103 | # CONFIG_MIPS_MT_SMTC is not set | 107 | # CONFIG_MIPS_MT_SMTC is not set |
104 | # CONFIG_MIPS_VPE_LOADER is not set | ||
105 | CONFIG_CPU_HAS_LLSC=y | 108 | CONFIG_CPU_HAS_LLSC=y |
106 | CONFIG_CPU_HAS_SYNC=y | 109 | CONFIG_CPU_HAS_SYNC=y |
107 | CONFIG_GENERIC_HARDIRQS=y | 110 | CONFIG_GENERIC_HARDIRQS=y |
@@ -117,43 +120,40 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
117 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 120 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
118 | # CONFIG_RESOURCES_64BIT is not set | 121 | # CONFIG_RESOURCES_64BIT is not set |
119 | CONFIG_ZONE_DMA_FLAG=0 | 122 | CONFIG_ZONE_DMA_FLAG=0 |
123 | CONFIG_VIRT_TO_BUS=y | ||
120 | # CONFIG_HZ_48 is not set | 124 | # CONFIG_HZ_48 is not set |
121 | # CONFIG_HZ_100 is not set | 125 | # CONFIG_HZ_100 is not set |
122 | # CONFIG_HZ_128 is not set | 126 | # CONFIG_HZ_128 is not set |
123 | # CONFIG_HZ_250 is not set | 127 | CONFIG_HZ_250=y |
124 | # CONFIG_HZ_256 is not set | 128 | # CONFIG_HZ_256 is not set |
125 | CONFIG_HZ_1000=y | 129 | # CONFIG_HZ_1000 is not set |
126 | # CONFIG_HZ_1024 is not set | 130 | # CONFIG_HZ_1024 is not set |
127 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y | 131 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y |
128 | CONFIG_HZ=1000 | 132 | CONFIG_HZ=250 |
129 | CONFIG_PREEMPT_NONE=y | 133 | CONFIG_PREEMPT_NONE=y |
130 | # CONFIG_PREEMPT_VOLUNTARY is not set | 134 | # CONFIG_PREEMPT_VOLUNTARY is not set |
131 | # CONFIG_PREEMPT is not set | 135 | # CONFIG_PREEMPT is not set |
132 | # CONFIG_KEXEC is not set | 136 | # CONFIG_KEXEC is not set |
137 | CONFIG_SECCOMP=y | ||
133 | CONFIG_LOCKDEP_SUPPORT=y | 138 | CONFIG_LOCKDEP_SUPPORT=y |
134 | CONFIG_STACKTRACE_SUPPORT=y | 139 | CONFIG_STACKTRACE_SUPPORT=y |
135 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 140 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
136 | 141 | ||
137 | # | 142 | # |
138 | # Code maturity level options | 143 | # General setup |
139 | # | 144 | # |
140 | CONFIG_EXPERIMENTAL=y | 145 | CONFIG_EXPERIMENTAL=y |
141 | CONFIG_BROKEN_ON_SMP=y | 146 | CONFIG_BROKEN_ON_SMP=y |
142 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 147 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
143 | |||
144 | # | ||
145 | # General setup | ||
146 | # | ||
147 | CONFIG_LOCALVERSION="" | 148 | CONFIG_LOCALVERSION="" |
148 | CONFIG_LOCALVERSION_AUTO=y | 149 | CONFIG_LOCALVERSION_AUTO=y |
149 | CONFIG_SWAP=y | 150 | CONFIG_SWAP=y |
150 | CONFIG_SYSVIPC=y | 151 | CONFIG_SYSVIPC=y |
151 | # CONFIG_IPC_NS is not set | ||
152 | CONFIG_SYSVIPC_SYSCTL=y | 152 | CONFIG_SYSVIPC_SYSCTL=y |
153 | # CONFIG_POSIX_MQUEUE is not set | 153 | # CONFIG_POSIX_MQUEUE is not set |
154 | # CONFIG_BSD_PROCESS_ACCT is not set | 154 | # CONFIG_BSD_PROCESS_ACCT is not set |
155 | # CONFIG_TASKSTATS is not set | 155 | # CONFIG_TASKSTATS is not set |
156 | # CONFIG_UTS_NS is not set | 156 | # CONFIG_USER_NS is not set |
157 | # CONFIG_AUDIT is not set | 157 | # CONFIG_AUDIT is not set |
158 | # CONFIG_IKCONFIG is not set | 158 | # CONFIG_IKCONFIG is not set |
159 | CONFIG_LOG_BUF_SHIFT=14 | 159 | CONFIG_LOG_BUF_SHIFT=14 |
@@ -185,19 +185,17 @@ CONFIG_SLAB=y | |||
185 | CONFIG_RT_MUTEXES=y | 185 | CONFIG_RT_MUTEXES=y |
186 | # CONFIG_TINY_SHMEM is not set | 186 | # CONFIG_TINY_SHMEM is not set |
187 | CONFIG_BASE_SMALL=0 | 187 | CONFIG_BASE_SMALL=0 |
188 | 188 | CONFIG_MODULES=y | |
189 | # | 189 | CONFIG_MODULE_UNLOAD=y |
190 | # Loadable module support | 190 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
191 | # | 191 | # CONFIG_MODVERSIONS is not set |
192 | # CONFIG_MODULES is not set | 192 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
193 | 193 | # CONFIG_KMOD is not set | |
194 | # | ||
195 | # Block layer | ||
196 | # | ||
197 | CONFIG_BLOCK=y | 194 | CONFIG_BLOCK=y |
198 | # CONFIG_LBD is not set | 195 | # CONFIG_LBD is not set |
199 | # CONFIG_BLK_DEV_IO_TRACE is not set | 196 | # CONFIG_BLK_DEV_IO_TRACE is not set |
200 | # CONFIG_LSF is not set | 197 | # CONFIG_LSF is not set |
198 | # CONFIG_BLK_DEV_BSG is not set | ||
201 | 199 | ||
202 | # | 200 | # |
203 | # IO Schedulers | 201 | # IO Schedulers |
@@ -236,10 +234,7 @@ CONFIG_TRAD_SIGNALS=y | |||
236 | # | 234 | # |
237 | # Power management options | 235 | # Power management options |
238 | # | 236 | # |
239 | CONFIG_PM=y | 237 | # CONFIG_PM is not set |
240 | # CONFIG_PM_LEGACY is not set | ||
241 | # CONFIG_PM_DEBUG is not set | ||
242 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
243 | 238 | ||
244 | # | 239 | # |
245 | # Networking | 240 | # Networking |
@@ -286,20 +281,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
286 | # CONFIG_INET6_TUNNEL is not set | 281 | # CONFIG_INET6_TUNNEL is not set |
287 | # CONFIG_NETWORK_SECMARK is not set | 282 | # CONFIG_NETWORK_SECMARK is not set |
288 | # CONFIG_NETFILTER is not set | 283 | # CONFIG_NETFILTER is not set |
289 | |||
290 | # | ||
291 | # DCCP Configuration (EXPERIMENTAL) | ||
292 | # | ||
293 | # CONFIG_IP_DCCP is not set | 284 | # CONFIG_IP_DCCP is not set |
294 | |||
295 | # | ||
296 | # SCTP Configuration (EXPERIMENTAL) | ||
297 | # | ||
298 | # CONFIG_IP_SCTP is not set | 285 | # CONFIG_IP_SCTP is not set |
299 | |||
300 | # | ||
301 | # TIPC Configuration (EXPERIMENTAL) | ||
302 | # | ||
303 | # CONFIG_TIPC is not set | 286 | # CONFIG_TIPC is not set |
304 | # CONFIG_ATM is not set | 287 | # CONFIG_ATM is not set |
305 | # CONFIG_BRIDGE is not set | 288 | # CONFIG_BRIDGE is not set |
@@ -335,6 +318,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
335 | # CONFIG_MAC80211 is not set | 318 | # CONFIG_MAC80211 is not set |
336 | # CONFIG_IEEE80211 is not set | 319 | # CONFIG_IEEE80211 is not set |
337 | # CONFIG_RFKILL is not set | 320 | # CONFIG_RFKILL is not set |
321 | # CONFIG_NET_9P is not set | ||
338 | 322 | ||
339 | # | 323 | # |
340 | # Device Drivers | 324 | # Device Drivers |
@@ -347,12 +331,7 @@ CONFIG_STANDALONE=y | |||
347 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 331 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
348 | CONFIG_FW_LOADER=y | 332 | CONFIG_FW_LOADER=y |
349 | # CONFIG_SYS_HYPERVISOR is not set | 333 | # CONFIG_SYS_HYPERVISOR is not set |
350 | 334 | # CONFIG_CONNECTOR is not set | |
351 | # | ||
352 | # Connector - unified userspace <-> kernelspace linker | ||
353 | # | ||
354 | CONFIG_CONNECTOR=y | ||
355 | CONFIG_PROC_EVENTS=y | ||
356 | CONFIG_MTD=y | 335 | CONFIG_MTD=y |
357 | # CONFIG_MTD_DEBUG is not set | 336 | # CONFIG_MTD_DEBUG is not set |
358 | # CONFIG_MTD_CONCAT is not set | 337 | # CONFIG_MTD_CONCAT is not set |
@@ -430,20 +409,8 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=0 | |||
430 | # UBI - Unsorted block images | 409 | # UBI - Unsorted block images |
431 | # | 410 | # |
432 | # CONFIG_MTD_UBI is not set | 411 | # CONFIG_MTD_UBI is not set |
433 | |||
434 | # | ||
435 | # Parallel port support | ||
436 | # | ||
437 | # CONFIG_PARPORT is not set | 412 | # CONFIG_PARPORT is not set |
438 | 413 | CONFIG_BLK_DEV=y | |
439 | # | ||
440 | # Plug and Play support | ||
441 | # | ||
442 | # CONFIG_PNPACPI is not set | ||
443 | |||
444 | # | ||
445 | # Block devices | ||
446 | # | ||
447 | # CONFIG_BLK_CPQ_DA is not set | 414 | # CONFIG_BLK_CPQ_DA is not set |
448 | # CONFIG_BLK_CPQ_CISS_DA is not set | 415 | # CONFIG_BLK_CPQ_CISS_DA is not set |
449 | # CONFIG_BLK_DEV_DAC960 is not set | 416 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -453,17 +420,11 @@ CONFIG_BLK_DEV_LOOP=y | |||
453 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 420 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
454 | # CONFIG_BLK_DEV_NBD is not set | 421 | # CONFIG_BLK_DEV_NBD is not set |
455 | # CONFIG_BLK_DEV_SX8 is not set | 422 | # CONFIG_BLK_DEV_SX8 is not set |
423 | # CONFIG_BLK_DEV_UB is not set | ||
456 | # CONFIG_BLK_DEV_RAM is not set | 424 | # CONFIG_BLK_DEV_RAM is not set |
457 | # CONFIG_CDROM_PKTCDVD is not set | 425 | # CONFIG_CDROM_PKTCDVD is not set |
458 | # CONFIG_ATA_OVER_ETH is not set | 426 | # CONFIG_ATA_OVER_ETH is not set |
459 | 427 | # CONFIG_MISC_DEVICES is not set | |
460 | # | ||
461 | # Misc devices | ||
462 | # | ||
463 | # CONFIG_PHANTOM is not set | ||
464 | # CONFIG_SGI_IOC4 is not set | ||
465 | # CONFIG_TIFM_CORE is not set | ||
466 | # CONFIG_BLINK is not set | ||
467 | # CONFIG_IDE is not set | 428 | # CONFIG_IDE is not set |
468 | 429 | ||
469 | # | 430 | # |
@@ -471,6 +432,7 @@ CONFIG_BLK_DEV_LOOP=y | |||
471 | # | 432 | # |
472 | CONFIG_RAID_ATTRS=y | 433 | CONFIG_RAID_ATTRS=y |
473 | CONFIG_SCSI=y | 434 | CONFIG_SCSI=y |
435 | CONFIG_SCSI_DMA=y | ||
474 | # CONFIG_SCSI_TGT is not set | 436 | # CONFIG_SCSI_TGT is not set |
475 | # CONFIG_SCSI_NETLINK is not set | 437 | # CONFIG_SCSI_NETLINK is not set |
476 | CONFIG_SCSI_PROC_FS=y | 438 | CONFIG_SCSI_PROC_FS=y |
@@ -492,6 +454,7 @@ CONFIG_BLK_DEV_SD=y | |||
492 | # CONFIG_SCSI_CONSTANTS is not set | 454 | # CONFIG_SCSI_CONSTANTS is not set |
493 | # CONFIG_SCSI_LOGGING is not set | 455 | # CONFIG_SCSI_LOGGING is not set |
494 | # CONFIG_SCSI_SCAN_ASYNC is not set | 456 | # CONFIG_SCSI_SCAN_ASYNC is not set |
457 | CONFIG_SCSI_WAIT_SCAN=m | ||
495 | 458 | ||
496 | # | 459 | # |
497 | # SCSI Transports | 460 | # SCSI Transports |
@@ -499,45 +462,8 @@ CONFIG_BLK_DEV_SD=y | |||
499 | # CONFIG_SCSI_SPI_ATTRS is not set | 462 | # CONFIG_SCSI_SPI_ATTRS is not set |
500 | # CONFIG_SCSI_FC_ATTRS is not set | 463 | # CONFIG_SCSI_FC_ATTRS is not set |
501 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 464 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
502 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
503 | # CONFIG_SCSI_SAS_LIBSAS is not set | 465 | # CONFIG_SCSI_SAS_LIBSAS is not set |
504 | 466 | # CONFIG_SCSI_LOWLEVEL is not set | |
505 | # | ||
506 | # SCSI low-level drivers | ||
507 | # | ||
508 | # CONFIG_ISCSI_TCP is not set | ||
509 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
510 | # CONFIG_SCSI_3W_9XXX is not set | ||
511 | # CONFIG_SCSI_ACARD is not set | ||
512 | # CONFIG_SCSI_AACRAID is not set | ||
513 | # CONFIG_SCSI_AIC7XXX is not set | ||
514 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
515 | # CONFIG_SCSI_AIC79XX is not set | ||
516 | # CONFIG_SCSI_AIC94XX is not set | ||
517 | # CONFIG_SCSI_DPT_I2O is not set | ||
518 | # CONFIG_SCSI_ARCMSR is not set | ||
519 | # CONFIG_MEGARAID_NEWGEN is not set | ||
520 | # CONFIG_MEGARAID_LEGACY is not set | ||
521 | # CONFIG_MEGARAID_SAS is not set | ||
522 | # CONFIG_SCSI_HPTIOP is not set | ||
523 | # CONFIG_SCSI_DMX3191D is not set | ||
524 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
525 | # CONFIG_SCSI_IPS is not set | ||
526 | # CONFIG_SCSI_INITIO is not set | ||
527 | # CONFIG_SCSI_INIA100 is not set | ||
528 | # CONFIG_SCSI_STEX is not set | ||
529 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
530 | # CONFIG_SCSI_IPR is not set | ||
531 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
532 | # CONFIG_SCSI_QLA_FC is not set | ||
533 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
534 | # CONFIG_SCSI_LPFC is not set | ||
535 | # CONFIG_SCSI_DC395x is not set | ||
536 | # CONFIG_SCSI_DC390T is not set | ||
537 | # CONFIG_SCSI_NSP32 is not set | ||
538 | # CONFIG_SCSI_DEBUG is not set | ||
539 | # CONFIG_SCSI_ESP_CORE is not set | ||
540 | # CONFIG_SCSI_SRP is not set | ||
541 | CONFIG_ATA=y | 467 | CONFIG_ATA=y |
542 | # CONFIG_ATA_NONSTANDARD is not set | 468 | # CONFIG_ATA_NONSTANDARD is not set |
543 | # CONFIG_SATA_AHCI is not set | 469 | # CONFIG_SATA_AHCI is not set |
@@ -593,10 +519,6 @@ CONFIG_ATA=y | |||
593 | CONFIG_PATA_VIA=y | 519 | CONFIG_PATA_VIA=y |
594 | # CONFIG_PATA_WINBOND is not set | 520 | # CONFIG_PATA_WINBOND is not set |
595 | # CONFIG_PATA_PLATFORM is not set | 521 | # CONFIG_PATA_PLATFORM is not set |
596 | |||
597 | # | ||
598 | # Multi-device support (RAID and LVM) | ||
599 | # | ||
600 | # CONFIG_MD is not set | 522 | # CONFIG_MD is not set |
601 | 523 | ||
602 | # | 524 | # |
@@ -612,41 +534,24 @@ CONFIG_PATA_VIA=y | |||
612 | # | 534 | # |
613 | # CONFIG_FIREWIRE is not set | 535 | # CONFIG_FIREWIRE is not set |
614 | # CONFIG_IEEE1394 is not set | 536 | # CONFIG_IEEE1394 is not set |
615 | |||
616 | # | ||
617 | # I2O device support | ||
618 | # | ||
619 | # CONFIG_I2O is not set | 537 | # CONFIG_I2O is not set |
620 | |||
621 | # | ||
622 | # Network device support | ||
623 | # | ||
624 | CONFIG_NETDEVICES=y | 538 | CONFIG_NETDEVICES=y |
539 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
625 | # CONFIG_DUMMY is not set | 540 | # CONFIG_DUMMY is not set |
626 | # CONFIG_BONDING is not set | 541 | # CONFIG_BONDING is not set |
542 | # CONFIG_MACVLAN is not set | ||
627 | # CONFIG_EQUALIZER is not set | 543 | # CONFIG_EQUALIZER is not set |
628 | # CONFIG_TUN is not set | 544 | # CONFIG_TUN is not set |
629 | |||
630 | # | ||
631 | # ARCnet devices | ||
632 | # | ||
633 | # CONFIG_ARCNET is not set | 545 | # CONFIG_ARCNET is not set |
634 | # CONFIG_PHYLIB is not set | 546 | # CONFIG_PHYLIB is not set |
635 | |||
636 | # | ||
637 | # Ethernet (10 or 100Mbit) | ||
638 | # | ||
639 | CONFIG_NET_ETHERNET=y | 547 | CONFIG_NET_ETHERNET=y |
640 | # CONFIG_MII is not set | 548 | # CONFIG_MII is not set |
549 | # CONFIG_AX88796 is not set | ||
641 | # CONFIG_HAPPYMEAL is not set | 550 | # CONFIG_HAPPYMEAL is not set |
642 | # CONFIG_SUNGEM is not set | 551 | # CONFIG_SUNGEM is not set |
643 | # CONFIG_CASSINI is not set | 552 | # CONFIG_CASSINI is not set |
644 | # CONFIG_NET_VENDOR_3COM is not set | 553 | # CONFIG_NET_VENDOR_3COM is not set |
645 | # CONFIG_DM9000 is not set | 554 | # CONFIG_DM9000 is not set |
646 | |||
647 | # | ||
648 | # Tulip family network device support | ||
649 | # | ||
650 | CONFIG_NET_TULIP=y | 555 | CONFIG_NET_TULIP=y |
651 | CONFIG_DE2104X=y | 556 | CONFIG_DE2104X=y |
652 | CONFIG_TULIP=y | 557 | CONFIG_TULIP=y |
@@ -661,10 +566,6 @@ CONFIG_TULIP=y | |||
661 | # CONFIG_NET_PCI is not set | 566 | # CONFIG_NET_PCI is not set |
662 | # CONFIG_NETDEV_1000 is not set | 567 | # CONFIG_NETDEV_1000 is not set |
663 | # CONFIG_NETDEV_10000 is not set | 568 | # CONFIG_NETDEV_10000 is not set |
664 | |||
665 | # | ||
666 | # Token Ring devices | ||
667 | # | ||
668 | # CONFIG_TR is not set | 569 | # CONFIG_TR is not set |
669 | 570 | ||
670 | # | 571 | # |
@@ -672,6 +573,16 @@ CONFIG_TULIP=y | |||
672 | # | 573 | # |
673 | # CONFIG_WLAN_PRE80211 is not set | 574 | # CONFIG_WLAN_PRE80211 is not set |
674 | # CONFIG_WLAN_80211 is not set | 575 | # CONFIG_WLAN_80211 is not set |
576 | |||
577 | # | ||
578 | # USB Network Adapters | ||
579 | # | ||
580 | # CONFIG_USB_CATC is not set | ||
581 | # CONFIG_USB_KAWETH is not set | ||
582 | # CONFIG_USB_PEGASUS is not set | ||
583 | # CONFIG_USB_RTL8150 is not set | ||
584 | # CONFIG_USB_USBNET_MII is not set | ||
585 | # CONFIG_USB_USBNET is not set | ||
675 | # CONFIG_WAN is not set | 586 | # CONFIG_WAN is not set |
676 | # CONFIG_FDDI is not set | 587 | # CONFIG_FDDI is not set |
677 | # CONFIG_HIPPI is not set | 588 | # CONFIG_HIPPI is not set |
@@ -682,15 +593,7 @@ CONFIG_TULIP=y | |||
682 | # CONFIG_NETCONSOLE is not set | 593 | # CONFIG_NETCONSOLE is not set |
683 | # CONFIG_NETPOLL is not set | 594 | # CONFIG_NETPOLL is not set |
684 | # CONFIG_NET_POLL_CONTROLLER is not set | 595 | # CONFIG_NET_POLL_CONTROLLER is not set |
685 | |||
686 | # | ||
687 | # ISDN subsystem | ||
688 | # | ||
689 | # CONFIG_ISDN is not set | 596 | # CONFIG_ISDN is not set |
690 | |||
691 | # | ||
692 | # Telephony Support | ||
693 | # | ||
694 | # CONFIG_PHONE is not set | 597 | # CONFIG_PHONE is not set |
695 | 598 | ||
696 | # | 599 | # |
@@ -698,6 +601,7 @@ CONFIG_TULIP=y | |||
698 | # | 601 | # |
699 | CONFIG_INPUT=y | 602 | CONFIG_INPUT=y |
700 | # CONFIG_INPUT_FF_MEMLESS is not set | 603 | # CONFIG_INPUT_FF_MEMLESS is not set |
604 | CONFIG_INPUT_POLLDEV=y | ||
701 | 605 | ||
702 | # | 606 | # |
703 | # Userland interfaces | 607 | # Userland interfaces |
@@ -705,7 +609,7 @@ CONFIG_INPUT=y | |||
705 | # CONFIG_INPUT_MOUSEDEV is not set | 609 | # CONFIG_INPUT_MOUSEDEV is not set |
706 | # CONFIG_INPUT_JOYDEV is not set | 610 | # CONFIG_INPUT_JOYDEV is not set |
707 | # CONFIG_INPUT_TSDEV is not set | 611 | # CONFIG_INPUT_TSDEV is not set |
708 | # CONFIG_INPUT_EVDEV is not set | 612 | CONFIG_INPUT_EVDEV=y |
709 | # CONFIG_INPUT_EVBUG is not set | 613 | # CONFIG_INPUT_EVBUG is not set |
710 | 614 | ||
711 | # | 615 | # |
@@ -725,7 +629,6 @@ CONFIG_INPUT_COBALT_BTNS=y | |||
725 | # CONFIG_INPUT_POWERMATE is not set | 629 | # CONFIG_INPUT_POWERMATE is not set |
726 | # CONFIG_INPUT_YEALINK is not set | 630 | # CONFIG_INPUT_YEALINK is not set |
727 | # CONFIG_INPUT_UINPUT is not set | 631 | # CONFIG_INPUT_UINPUT is not set |
728 | CONFIG_INPUT_POLLDEV=y | ||
729 | 632 | ||
730 | # | 633 | # |
731 | # Hardware I/O ports | 634 | # Hardware I/O ports |
@@ -761,24 +664,15 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
761 | CONFIG_UNIX98_PTYS=y | 664 | CONFIG_UNIX98_PTYS=y |
762 | CONFIG_LEGACY_PTYS=y | 665 | CONFIG_LEGACY_PTYS=y |
763 | CONFIG_LEGACY_PTY_COUNT=256 | 666 | CONFIG_LEGACY_PTY_COUNT=256 |
764 | |||
765 | # | ||
766 | # IPMI | ||
767 | # | ||
768 | # CONFIG_IPMI_HANDLER is not set | 667 | # CONFIG_IPMI_HANDLER is not set |
769 | # CONFIG_WATCHDOG is not set | 668 | # CONFIG_WATCHDOG is not set |
770 | # CONFIG_HW_RANDOM is not set | 669 | # CONFIG_HW_RANDOM is not set |
771 | # CONFIG_RTC is not set | 670 | # CONFIG_RTC is not set |
772 | # CONFIG_GEN_RTC is not set | ||
773 | CONFIG_COBALT_LCD=y | 671 | CONFIG_COBALT_LCD=y |
774 | # CONFIG_R3964 is not set | 672 | # CONFIG_R3964 is not set |
775 | # CONFIG_APPLICOM is not set | 673 | # CONFIG_APPLICOM is not set |
776 | # CONFIG_DRM is not set | 674 | # CONFIG_DRM is not set |
777 | # CONFIG_RAW_DRIVER is not set | 675 | # CONFIG_RAW_DRIVER is not set |
778 | |||
779 | # | ||
780 | # TPM devices | ||
781 | # | ||
782 | # CONFIG_TCG_TPM is not set | 676 | # CONFIG_TCG_TPM is not set |
783 | CONFIG_DEVPORT=y | 677 | CONFIG_DEVPORT=y |
784 | # CONFIG_I2C is not set | 678 | # CONFIG_I2C is not set |
@@ -788,11 +682,8 @@ CONFIG_DEVPORT=y | |||
788 | # | 682 | # |
789 | # CONFIG_SPI is not set | 683 | # CONFIG_SPI is not set |
790 | # CONFIG_SPI_MASTER is not set | 684 | # CONFIG_SPI_MASTER is not set |
791 | |||
792 | # | ||
793 | # Dallas's 1-wire bus | ||
794 | # | ||
795 | # CONFIG_W1 is not set | 685 | # CONFIG_W1 is not set |
686 | # CONFIG_POWER_SUPPLY is not set | ||
796 | # CONFIG_HWMON is not set | 687 | # CONFIG_HWMON is not set |
797 | 688 | ||
798 | # | 689 | # |
@@ -817,6 +708,7 @@ CONFIG_DEVPORT=y | |||
817 | # | 708 | # |
818 | # CONFIG_DISPLAY_SUPPORT is not set | 709 | # CONFIG_DISPLAY_SUPPORT is not set |
819 | # CONFIG_VGASTATE is not set | 710 | # CONFIG_VGASTATE is not set |
711 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
820 | # CONFIG_FB is not set | 712 | # CONFIG_FB is not set |
821 | 713 | ||
822 | # | 714 | # |
@@ -829,55 +721,131 @@ CONFIG_DUMMY_CONSOLE=y | |||
829 | # Sound | 721 | # Sound |
830 | # | 722 | # |
831 | # CONFIG_SOUND is not set | 723 | # CONFIG_SOUND is not set |
724 | CONFIG_HID_SUPPORT=y | ||
725 | CONFIG_HID=m | ||
726 | # CONFIG_HID_DEBUG is not set | ||
832 | 727 | ||
833 | # | 728 | # |
834 | # HID Devices | 729 | # USB Input Devices |
835 | # | 730 | # |
836 | # CONFIG_HID is not set | 731 | CONFIG_USB_HID=m |
732 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
733 | # CONFIG_HID_FF is not set | ||
734 | # CONFIG_USB_HIDDEV is not set | ||
837 | 735 | ||
838 | # | 736 | # |
839 | # USB support | 737 | # USB HID Boot Protocol drivers |
840 | # | 738 | # |
739 | # CONFIG_USB_KBD is not set | ||
740 | # CONFIG_USB_MOUSE is not set | ||
741 | CONFIG_USB_SUPPORT=y | ||
841 | CONFIG_USB_ARCH_HAS_HCD=y | 742 | CONFIG_USB_ARCH_HAS_HCD=y |
842 | CONFIG_USB_ARCH_HAS_OHCI=y | 743 | CONFIG_USB_ARCH_HAS_OHCI=y |
843 | CONFIG_USB_ARCH_HAS_EHCI=y | 744 | CONFIG_USB_ARCH_HAS_EHCI=y |
844 | # CONFIG_USB is not set | 745 | CONFIG_USB=m |
746 | # CONFIG_USB_DEBUG is not set | ||
747 | |||
748 | # | ||
749 | # Miscellaneous USB options | ||
750 | # | ||
751 | # CONFIG_USB_DEVICEFS is not set | ||
752 | # CONFIG_USB_DEVICE_CLASS is not set | ||
753 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
754 | # CONFIG_USB_OTG is not set | ||
755 | |||
756 | # | ||
757 | # USB Host Controller Drivers | ||
758 | # | ||
759 | CONFIG_USB_EHCI_HCD=m | ||
760 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
761 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | ||
762 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | ||
763 | # CONFIG_USB_ISP116X_HCD is not set | ||
764 | CONFIG_USB_OHCI_HCD=m | ||
765 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
766 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
767 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
768 | # CONFIG_USB_UHCI_HCD is not set | ||
769 | # CONFIG_USB_SL811_HCD is not set | ||
770 | # CONFIG_USB_R8A66597_HCD is not set | ||
771 | |||
772 | # | ||
773 | # USB Device Class drivers | ||
774 | # | ||
775 | # CONFIG_USB_ACM is not set | ||
776 | # CONFIG_USB_PRINTER is not set | ||
845 | 777 | ||
846 | # | 778 | # |
847 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 779 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
848 | # | 780 | # |
849 | 781 | ||
850 | # | 782 | # |
851 | # USB Gadget Support | 783 | # may also be needed; see USB_STORAGE Help for more information |
852 | # | 784 | # |
853 | # CONFIG_USB_GADGET is not set | 785 | CONFIG_USB_STORAGE=m |
854 | # CONFIG_MMC is not set | 786 | # CONFIG_USB_STORAGE_DEBUG is not set |
787 | # CONFIG_USB_STORAGE_DATAFAB is not set | ||
788 | # CONFIG_USB_STORAGE_FREECOM is not set | ||
789 | # CONFIG_USB_STORAGE_DPCM is not set | ||
790 | # CONFIG_USB_STORAGE_USBAT is not set | ||
791 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
792 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
793 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
794 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
795 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
796 | # CONFIG_USB_STORAGE_KARMA is not set | ||
797 | # CONFIG_USB_LIBUSUAL is not set | ||
855 | 798 | ||
856 | # | 799 | # |
857 | # LED devices | 800 | # USB Imaging devices |
858 | # | 801 | # |
859 | # CONFIG_NEW_LEDS is not set | 802 | # CONFIG_USB_MDC800 is not set |
803 | # CONFIG_USB_MICROTEK is not set | ||
804 | CONFIG_USB_MON=y | ||
860 | 805 | ||
861 | # | 806 | # |
862 | # LED drivers | 807 | # USB port drivers |
863 | # | 808 | # |
864 | 809 | ||
865 | # | 810 | # |
866 | # LED Triggers | 811 | # USB Serial Converter support |
867 | # | 812 | # |
813 | # CONFIG_USB_SERIAL is not set | ||
868 | 814 | ||
869 | # | 815 | # |
870 | # InfiniBand support | 816 | # USB Miscellaneous drivers |
871 | # | 817 | # |
872 | # CONFIG_INFINIBAND is not set | 818 | # CONFIG_USB_EMI62 is not set |
819 | # CONFIG_USB_EMI26 is not set | ||
820 | # CONFIG_USB_ADUTUX is not set | ||
821 | # CONFIG_USB_AUERSWALD is not set | ||
822 | # CONFIG_USB_RIO500 is not set | ||
823 | # CONFIG_USB_LEGOTOWER is not set | ||
824 | # CONFIG_USB_LCD is not set | ||
825 | # CONFIG_USB_BERRY_CHARGE is not set | ||
826 | # CONFIG_USB_LED is not set | ||
827 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
828 | # CONFIG_USB_CYTHERM is not set | ||
829 | # CONFIG_USB_PHIDGET is not set | ||
830 | # CONFIG_USB_IDMOUSE is not set | ||
831 | # CONFIG_USB_FTDI_ELAN is not set | ||
832 | # CONFIG_USB_APPLEDISPLAY is not set | ||
833 | # CONFIG_USB_SISUSBVGA is not set | ||
834 | # CONFIG_USB_LD is not set | ||
835 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
836 | # CONFIG_USB_IOWARRIOR is not set | ||
873 | 837 | ||
874 | # | 838 | # |
875 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 839 | # USB DSL modem support |
876 | # | 840 | # |
877 | 841 | ||
878 | # | 842 | # |
879 | # Real Time Clock | 843 | # USB Gadget Support |
880 | # | 844 | # |
845 | # CONFIG_USB_GADGET is not set | ||
846 | # CONFIG_MMC is not set | ||
847 | # CONFIG_NEW_LEDS is not set | ||
848 | # CONFIG_INFINIBAND is not set | ||
881 | CONFIG_RTC_LIB=y | 849 | CONFIG_RTC_LIB=y |
882 | CONFIG_RTC_CLASS=y | 850 | CONFIG_RTC_CLASS=y |
883 | CONFIG_RTC_HCTOSYS=y | 851 | CONFIG_RTC_HCTOSYS=y |
@@ -894,10 +862,6 @@ CONFIG_RTC_INTF_DEV=y | |||
894 | # CONFIG_RTC_DRV_TEST is not set | 862 | # CONFIG_RTC_DRV_TEST is not set |
895 | 863 | ||
896 | # | 864 | # |
897 | # I2C RTC drivers | ||
898 | # | ||
899 | |||
900 | # | ||
901 | # SPI RTC drivers | 865 | # SPI RTC drivers |
902 | # | 866 | # |
903 | 867 | ||
@@ -906,8 +870,10 @@ CONFIG_RTC_INTF_DEV=y | |||
906 | # | 870 | # |
907 | CONFIG_RTC_DRV_CMOS=y | 871 | CONFIG_RTC_DRV_CMOS=y |
908 | # CONFIG_RTC_DRV_DS1553 is not set | 872 | # CONFIG_RTC_DRV_DS1553 is not set |
873 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
909 | # CONFIG_RTC_DRV_DS1742 is not set | 874 | # CONFIG_RTC_DRV_DS1742 is not set |
910 | # CONFIG_RTC_DRV_M48T86 is not set | 875 | # CONFIG_RTC_DRV_M48T86 is not set |
876 | # CONFIG_RTC_DRV_M48T59 is not set | ||
911 | # CONFIG_RTC_DRV_V3020 is not set | 877 | # CONFIG_RTC_DRV_V3020 is not set |
912 | 878 | ||
913 | # | 879 | # |
@@ -928,6 +894,11 @@ CONFIG_RTC_DRV_CMOS=y | |||
928 | # | 894 | # |
929 | 895 | ||
930 | # | 896 | # |
897 | # Userspace I/O | ||
898 | # | ||
899 | # CONFIG_UIO is not set | ||
900 | |||
901 | # | ||
931 | # File systems | 902 | # File systems |
932 | # | 903 | # |
933 | CONFIG_EXT2_FS=y | 904 | CONFIG_EXT2_FS=y |
@@ -1032,7 +1003,6 @@ CONFIG_SUNRPC=y | |||
1032 | # CONFIG_NCP_FS is not set | 1003 | # CONFIG_NCP_FS is not set |
1033 | # CONFIG_CODA_FS is not set | 1004 | # CONFIG_CODA_FS is not set |
1034 | # CONFIG_AFS_FS is not set | 1005 | # CONFIG_AFS_FS is not set |
1035 | # CONFIG_9P_FS is not set | ||
1036 | 1006 | ||
1037 | # | 1007 | # |
1038 | # Partition Types | 1008 | # Partition Types |
@@ -1074,10 +1044,6 @@ CONFIG_CMDLINE="" | |||
1074 | # | 1044 | # |
1075 | # CONFIG_KEYS is not set | 1045 | # CONFIG_KEYS is not set |
1076 | # CONFIG_SECURITY is not set | 1046 | # CONFIG_SECURITY is not set |
1077 | |||
1078 | # | ||
1079 | # Cryptographic options | ||
1080 | # | ||
1081 | # CONFIG_CRYPTO is not set | 1047 | # CONFIG_CRYPTO is not set |
1082 | 1048 | ||
1083 | # | 1049 | # |
@@ -1088,6 +1054,7 @@ CONFIG_BITREVERSE=y | |||
1088 | # CONFIG_CRC16 is not set | 1054 | # CONFIG_CRC16 is not set |
1089 | # CONFIG_CRC_ITU_T is not set | 1055 | # CONFIG_CRC_ITU_T is not set |
1090 | CONFIG_CRC32=y | 1056 | CONFIG_CRC32=y |
1057 | # CONFIG_CRC7 is not set | ||
1091 | CONFIG_LIBCRC32C=y | 1058 | CONFIG_LIBCRC32C=y |
1092 | CONFIG_PLIST=y | 1059 | CONFIG_PLIST=y |
1093 | CONFIG_HAS_IOMEM=y | 1060 | CONFIG_HAS_IOMEM=y |
diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig index 5467d750b6eb..d0d07faeb844 100644 --- a/arch/mips/configs/e55_defconfig +++ b/arch/mips/configs/e55_defconfig | |||
@@ -1,60 +1,47 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.20 | 3 | # Linux kernel version: 2.6.23-rc2 |
4 | # Tue Feb 20 21:47:28 2007 | 4 | # Wed Aug 8 10:36:25 2007 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
8 | # | 8 | # |
9 | # Machine selection | 9 | # Machine selection |
10 | # | 10 | # |
11 | CONFIG_ZONE_DMA=y | 11 | # CONFIG_MACH_ALCHEMY is not set |
12 | # CONFIG_MIPS_MTX1 is not set | ||
13 | # CONFIG_MIPS_BOSPORUS is not set | ||
14 | # CONFIG_MIPS_PB1000 is not set | ||
15 | # CONFIG_MIPS_PB1100 is not set | ||
16 | # CONFIG_MIPS_PB1500 is not set | ||
17 | # CONFIG_MIPS_PB1550 is not set | ||
18 | # CONFIG_MIPS_PB1200 is not set | ||
19 | # CONFIG_MIPS_DB1000 is not set | ||
20 | # CONFIG_MIPS_DB1100 is not set | ||
21 | # CONFIG_MIPS_DB1500 is not set | ||
22 | # CONFIG_MIPS_DB1550 is not set | ||
23 | # CONFIG_MIPS_DB1200 is not set | ||
24 | # CONFIG_MIPS_MIRAGE is not set | ||
25 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
26 | # CONFIG_MIPS_COBALT is not set | 13 | # CONFIG_MIPS_COBALT is not set |
27 | # CONFIG_MACH_DECSTATION is not set | 14 | # CONFIG_MACH_DECSTATION is not set |
28 | # CONFIG_MACH_JAZZ is not set | 15 | # CONFIG_MACH_JAZZ is not set |
16 | # CONFIG_LEMOTE_FULONG is not set | ||
29 | # CONFIG_MIPS_ATLAS is not set | 17 | # CONFIG_MIPS_ATLAS is not set |
30 | # CONFIG_MIPS_MALTA is not set | 18 | # CONFIG_MIPS_MALTA is not set |
31 | # CONFIG_MIPS_SEAD is not set | 19 | # CONFIG_MIPS_SEAD is not set |
32 | # CONFIG_WR_PPMC is not set | ||
33 | # CONFIG_MIPS_SIM is not set | 20 | # CONFIG_MIPS_SIM is not set |
34 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 21 | # CONFIG_MARKEINS is not set |
35 | # CONFIG_MIPS_XXS1500 is not set | 22 | CONFIG_MACH_VR41XX=y |
36 | # CONFIG_PNX8550_JBS is not set | 23 | # CONFIG_PNX8550_JBS is not set |
37 | # CONFIG_PNX8550_STB810 is not set | 24 | # CONFIG_PNX8550_STB810 is not set |
38 | CONFIG_MACH_VR41XX=y | 25 | # CONFIG_PMC_MSP is not set |
39 | # CONFIG_PMC_YOSEMITE is not set | 26 | # CONFIG_PMC_YOSEMITE is not set |
40 | # CONFIG_QEMU is not set | 27 | # CONFIG_QEMU is not set |
41 | # CONFIG_MARKEINS is not set | ||
42 | # CONFIG_SGI_IP22 is not set | 28 | # CONFIG_SGI_IP22 is not set |
43 | # CONFIG_SGI_IP27 is not set | 29 | # CONFIG_SGI_IP27 is not set |
44 | # CONFIG_SGI_IP32 is not set | 30 | # CONFIG_SGI_IP32 is not set |
45 | # CONFIG_SIBYTE_BIGSUR is not set | 31 | # CONFIG_SIBYTE_CRHINE is not set |
32 | # CONFIG_SIBYTE_CARMEL is not set | ||
33 | # CONFIG_SIBYTE_CRHONE is not set | ||
34 | # CONFIG_SIBYTE_RHONE is not set | ||
46 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | ||
49 | # CONFIG_SIBYTE_CARMEL is not set | ||
50 | # CONFIG_SIBYTE_PTSWARM is not set | 38 | # CONFIG_SIBYTE_PTSWARM is not set |
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 39 | # CONFIG_SIBYTE_BIGSUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | ||
53 | # CONFIG_SIBYTE_CRHONE is not set | ||
54 | # CONFIG_SNI_RM is not set | 40 | # CONFIG_SNI_RM is not set |
55 | # CONFIG_TOSHIBA_JMR3927 is not set | 41 | # CONFIG_TOSHIBA_JMR3927 is not set |
56 | # CONFIG_TOSHIBA_RBTX4927 is not set | 42 | # CONFIG_TOSHIBA_RBTX4927 is not set |
57 | # CONFIG_TOSHIBA_RBTX4938 is not set | 43 | # CONFIG_TOSHIBA_RBTX4938 is not set |
44 | # CONFIG_WR_PPMC is not set | ||
58 | CONFIG_CASIO_E55=y | 45 | CONFIG_CASIO_E55=y |
59 | # CONFIG_IBM_WORKPAD is not set | 46 | # CONFIG_IBM_WORKPAD is not set |
60 | # CONFIG_NEC_CMBVR4133 is not set | 47 | # CONFIG_NEC_CMBVR4133 is not set |
@@ -72,6 +59,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
72 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 59 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
73 | CONFIG_DMA_NONCOHERENT=y | 60 | CONFIG_DMA_NONCOHERENT=y |
74 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 61 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
62 | # CONFIG_HOTPLUG_CPU is not set | ||
63 | # CONFIG_NO_IOPORT is not set | ||
75 | # CONFIG_CPU_BIG_ENDIAN is not set | 64 | # CONFIG_CPU_BIG_ENDIAN is not set |
76 | CONFIG_CPU_LITTLE_ENDIAN=y | 65 | CONFIG_CPU_LITTLE_ENDIAN=y |
77 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 66 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
@@ -81,6 +70,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
81 | # | 70 | # |
82 | # CPU selection | 71 | # CPU selection |
83 | # | 72 | # |
73 | # CONFIG_CPU_LOONGSON2 is not set | ||
84 | # CONFIG_CPU_MIPS32_R1 is not set | 74 | # CONFIG_CPU_MIPS32_R1 is not set |
85 | # CONFIG_CPU_MIPS32_R2 is not set | 75 | # CONFIG_CPU_MIPS32_R2 is not set |
86 | # CONFIG_CPU_MIPS64_R1 is not set | 76 | # CONFIG_CPU_MIPS64_R1 is not set |
@@ -102,7 +92,6 @@ CONFIG_CPU_VR41XX=y | |||
102 | # CONFIG_CPU_SB1 is not set | 92 | # CONFIG_CPU_SB1 is not set |
103 | CONFIG_SYS_HAS_CPU_VR41XX=y | 93 | CONFIG_SYS_HAS_CPU_VR41XX=y |
104 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y | 94 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y |
105 | CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y | ||
106 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y | 95 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y |
107 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y | 96 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y |
108 | 97 | ||
@@ -118,7 +107,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
118 | CONFIG_MIPS_MT_DISABLED=y | 107 | CONFIG_MIPS_MT_DISABLED=y |
119 | # CONFIG_MIPS_MT_SMP is not set | 108 | # CONFIG_MIPS_MT_SMP is not set |
120 | # CONFIG_MIPS_MT_SMTC is not set | 109 | # CONFIG_MIPS_MT_SMTC is not set |
121 | # CONFIG_MIPS_VPE_LOADER is not set | ||
122 | CONFIG_CPU_HAS_SYNC=y | 110 | CONFIG_CPU_HAS_SYNC=y |
123 | CONFIG_GENERIC_HARDIRQS=y | 111 | CONFIG_GENERIC_HARDIRQS=y |
124 | CONFIG_GENERIC_IRQ_PROBE=y | 112 | CONFIG_GENERIC_IRQ_PROBE=y |
@@ -132,45 +120,44 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
132 | # CONFIG_SPARSEMEM_STATIC is not set | 120 | # CONFIG_SPARSEMEM_STATIC is not set |
133 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 121 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
134 | # CONFIG_RESOURCES_64BIT is not set | 122 | # CONFIG_RESOURCES_64BIT is not set |
135 | CONFIG_ZONE_DMA_FLAG=1 | 123 | CONFIG_ZONE_DMA_FLAG=0 |
124 | CONFIG_VIRT_TO_BUS=y | ||
136 | # CONFIG_HZ_48 is not set | 125 | # CONFIG_HZ_48 is not set |
137 | # CONFIG_HZ_100 is not set | 126 | # CONFIG_HZ_100 is not set |
138 | # CONFIG_HZ_128 is not set | 127 | # CONFIG_HZ_128 is not set |
139 | # CONFIG_HZ_250 is not set | 128 | CONFIG_HZ_250=y |
140 | # CONFIG_HZ_256 is not set | 129 | # CONFIG_HZ_256 is not set |
141 | CONFIG_HZ_1000=y | 130 | # CONFIG_HZ_1000 is not set |
142 | # CONFIG_HZ_1024 is not set | 131 | # CONFIG_HZ_1024 is not set |
143 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y | 132 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y |
144 | CONFIG_HZ=1000 | 133 | CONFIG_HZ=250 |
145 | CONFIG_PREEMPT_NONE=y | 134 | CONFIG_PREEMPT_NONE=y |
146 | # CONFIG_PREEMPT_VOLUNTARY is not set | 135 | # CONFIG_PREEMPT_VOLUNTARY is not set |
147 | # CONFIG_PREEMPT is not set | 136 | # CONFIG_PREEMPT is not set |
148 | # CONFIG_KEXEC is not set | 137 | # CONFIG_KEXEC is not set |
138 | CONFIG_SECCOMP=y | ||
149 | CONFIG_LOCKDEP_SUPPORT=y | 139 | CONFIG_LOCKDEP_SUPPORT=y |
150 | CONFIG_STACKTRACE_SUPPORT=y | 140 | CONFIG_STACKTRACE_SUPPORT=y |
151 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 141 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
152 | 142 | ||
153 | # | 143 | # |
154 | # Code maturity level options | 144 | # General setup |
155 | # | 145 | # |
156 | CONFIG_EXPERIMENTAL=y | 146 | CONFIG_EXPERIMENTAL=y |
157 | CONFIG_BROKEN_ON_SMP=y | 147 | CONFIG_BROKEN_ON_SMP=y |
158 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 148 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
159 | |||
160 | # | ||
161 | # General setup | ||
162 | # | ||
163 | CONFIG_LOCALVERSION="" | 149 | CONFIG_LOCALVERSION="" |
164 | CONFIG_LOCALVERSION_AUTO=y | 150 | CONFIG_LOCALVERSION_AUTO=y |
165 | CONFIG_SWAP=y | 151 | CONFIG_SWAP=y |
166 | CONFIG_SYSVIPC=y | 152 | CONFIG_SYSVIPC=y |
167 | # CONFIG_IPC_NS is not set | ||
168 | CONFIG_SYSVIPC_SYSCTL=y | 153 | CONFIG_SYSVIPC_SYSCTL=y |
169 | # CONFIG_BSD_PROCESS_ACCT is not set | 154 | # CONFIG_BSD_PROCESS_ACCT is not set |
170 | # CONFIG_UTS_NS is not set | 155 | # CONFIG_USER_NS is not set |
171 | # CONFIG_IKCONFIG is not set | 156 | # CONFIG_IKCONFIG is not set |
157 | CONFIG_LOG_BUF_SHIFT=14 | ||
172 | CONFIG_SYSFS_DEPRECATED=y | 158 | CONFIG_SYSFS_DEPRECATED=y |
173 | # CONFIG_RELAY is not set | 159 | # CONFIG_RELAY is not set |
160 | # CONFIG_BLK_DEV_INITRD is not set | ||
174 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 161 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
175 | CONFIG_SYSCTL=y | 162 | CONFIG_SYSCTL=y |
176 | CONFIG_EMBEDDED=y | 163 | CONFIG_EMBEDDED=y |
@@ -183,32 +170,30 @@ CONFIG_BUG=y | |||
183 | CONFIG_ELF_CORE=y | 170 | CONFIG_ELF_CORE=y |
184 | CONFIG_BASE_FULL=y | 171 | CONFIG_BASE_FULL=y |
185 | CONFIG_FUTEX=y | 172 | CONFIG_FUTEX=y |
173 | CONFIG_ANON_INODES=y | ||
186 | CONFIG_EPOLL=y | 174 | CONFIG_EPOLL=y |
175 | CONFIG_SIGNALFD=y | ||
176 | CONFIG_TIMERFD=y | ||
177 | CONFIG_EVENTFD=y | ||
187 | CONFIG_SHMEM=y | 178 | CONFIG_SHMEM=y |
188 | CONFIG_SLAB=y | ||
189 | CONFIG_VM_EVENT_COUNTERS=y | 179 | CONFIG_VM_EVENT_COUNTERS=y |
180 | CONFIG_SLAB=y | ||
181 | # CONFIG_SLUB is not set | ||
182 | # CONFIG_SLOB is not set | ||
190 | CONFIG_RT_MUTEXES=y | 183 | CONFIG_RT_MUTEXES=y |
191 | # CONFIG_TINY_SHMEM is not set | 184 | # CONFIG_TINY_SHMEM is not set |
192 | CONFIG_BASE_SMALL=0 | 185 | CONFIG_BASE_SMALL=0 |
193 | # CONFIG_SLOB is not set | ||
194 | |||
195 | # | ||
196 | # Loadable module support | ||
197 | # | ||
198 | CONFIG_MODULES=y | 186 | CONFIG_MODULES=y |
199 | CONFIG_MODULE_UNLOAD=y | 187 | CONFIG_MODULE_UNLOAD=y |
200 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 188 | CONFIG_MODULE_FORCE_UNLOAD=y |
201 | CONFIG_MODVERSIONS=y | 189 | CONFIG_MODVERSIONS=y |
202 | CONFIG_MODULE_SRCVERSION_ALL=y | 190 | CONFIG_MODULE_SRCVERSION_ALL=y |
203 | CONFIG_KMOD=y | 191 | CONFIG_KMOD=y |
204 | |||
205 | # | ||
206 | # Block layer | ||
207 | # | ||
208 | CONFIG_BLOCK=y | 192 | CONFIG_BLOCK=y |
209 | # CONFIG_LBD is not set | 193 | # CONFIG_LBD is not set |
210 | # CONFIG_BLK_DEV_IO_TRACE is not set | 194 | # CONFIG_BLK_DEV_IO_TRACE is not set |
211 | # CONFIG_LSF is not set | 195 | # CONFIG_LSF is not set |
196 | # CONFIG_BLK_DEV_BSG is not set | ||
212 | 197 | ||
213 | # | 198 | # |
214 | # IO Schedulers | 199 | # IO Schedulers |
@@ -226,6 +211,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
226 | # | 211 | # |
227 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 212 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
228 | # | 213 | # |
214 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
229 | CONFIG_ISA=y | 215 | CONFIG_ISA=y |
230 | CONFIG_MMU=y | 216 | CONFIG_MMU=y |
231 | 217 | ||
@@ -234,10 +220,6 @@ CONFIG_MMU=y | |||
234 | # | 220 | # |
235 | 221 | ||
236 | # | 222 | # |
237 | # PCI Hotplug Support | ||
238 | # | ||
239 | |||
240 | # | ||
241 | # Executable file formats | 223 | # Executable file formats |
242 | # | 224 | # |
243 | CONFIG_BINFMT_ELF=y | 225 | CONFIG_BINFMT_ELF=y |
@@ -247,10 +229,7 @@ CONFIG_TRAD_SIGNALS=y | |||
247 | # | 229 | # |
248 | # Power management options | 230 | # Power management options |
249 | # | 231 | # |
250 | CONFIG_PM=y | 232 | # CONFIG_PM is not set |
251 | # CONFIG_PM_LEGACY is not set | ||
252 | # CONFIG_PM_DEBUG is not set | ||
253 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
254 | 233 | ||
255 | # | 234 | # |
256 | # Networking | 235 | # Networking |
@@ -267,46 +246,18 @@ CONFIG_PM=y | |||
267 | CONFIG_STANDALONE=y | 246 | CONFIG_STANDALONE=y |
268 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 247 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
269 | # CONFIG_SYS_HYPERVISOR is not set | 248 | # CONFIG_SYS_HYPERVISOR is not set |
270 | |||
271 | # | ||
272 | # Connector - unified userspace <-> kernelspace linker | ||
273 | # | ||
274 | |||
275 | # | ||
276 | # Memory Technology Devices (MTD) | ||
277 | # | ||
278 | # CONFIG_MTD is not set | 249 | # CONFIG_MTD is not set |
279 | |||
280 | # | ||
281 | # Parallel port support | ||
282 | # | ||
283 | # CONFIG_PARPORT is not set | 250 | # CONFIG_PARPORT is not set |
284 | |||
285 | # | ||
286 | # Plug and Play support | ||
287 | # | ||
288 | # CONFIG_PNP is not set | 251 | # CONFIG_PNP is not set |
289 | # CONFIG_PNPACPI is not set | 252 | CONFIG_BLK_DEV=y |
290 | |||
291 | # | ||
292 | # Block devices | ||
293 | # | ||
294 | # CONFIG_BLK_DEV_COW_COMMON is not set | 253 | # CONFIG_BLK_DEV_COW_COMMON is not set |
295 | # CONFIG_BLK_DEV_LOOP is not set | 254 | # CONFIG_BLK_DEV_LOOP is not set |
296 | CONFIG_BLK_DEV_RAM=m | 255 | CONFIG_BLK_DEV_RAM=y |
297 | CONFIG_BLK_DEV_RAM_COUNT=16 | 256 | CONFIG_BLK_DEV_RAM_COUNT=16 |
298 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 257 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
299 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 258 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
300 | # CONFIG_BLK_DEV_INITRD is not set | ||
301 | # CONFIG_CDROM_PKTCDVD is not set | 259 | # CONFIG_CDROM_PKTCDVD is not set |
302 | 260 | # CONFIG_MISC_DEVICES is not set | |
303 | # | ||
304 | # Misc devices | ||
305 | # | ||
306 | |||
307 | # | ||
308 | # ATA/ATAPI/MFM/RLL support | ||
309 | # | ||
310 | CONFIG_IDE=y | 261 | CONFIG_IDE=y |
311 | CONFIG_IDE_MAX_HWIFS=4 | 262 | CONFIG_IDE_MAX_HWIFS=4 |
312 | CONFIG_BLK_DEV_IDE=y | 263 | CONFIG_BLK_DEV_IDE=y |
@@ -321,15 +272,16 @@ CONFIG_BLK_DEV_IDEDISK=y | |||
321 | # CONFIG_BLK_DEV_IDETAPE is not set | 272 | # CONFIG_BLK_DEV_IDETAPE is not set |
322 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | 273 | # CONFIG_BLK_DEV_IDEFLOPPY is not set |
323 | # CONFIG_IDE_TASK_IOCTL is not set | 274 | # CONFIG_IDE_TASK_IOCTL is not set |
275 | CONFIG_IDE_PROC_FS=y | ||
324 | 276 | ||
325 | # | 277 | # |
326 | # IDE chipset support/bugfixes | 278 | # IDE chipset support/bugfixes |
327 | # | 279 | # |
328 | CONFIG_IDE_GENERIC=y | 280 | CONFIG_IDE_GENERIC=y |
281 | # CONFIG_IDEPCI_PCIBUS_ORDER is not set | ||
329 | # CONFIG_IDE_ARM is not set | 282 | # CONFIG_IDE_ARM is not set |
330 | # CONFIG_IDE_CHIPSETS is not set | 283 | # CONFIG_IDE_CHIPSETS is not set |
331 | # CONFIG_BLK_DEV_IDEDMA is not set | 284 | # CONFIG_BLK_DEV_IDEDMA is not set |
332 | # CONFIG_IDEDMA_AUTO is not set | ||
333 | # CONFIG_BLK_DEV_HD is not set | 285 | # CONFIG_BLK_DEV_HD is not set |
334 | 286 | ||
335 | # | 287 | # |
@@ -337,43 +289,10 @@ CONFIG_IDE_GENERIC=y | |||
337 | # | 289 | # |
338 | # CONFIG_RAID_ATTRS is not set | 290 | # CONFIG_RAID_ATTRS is not set |
339 | # CONFIG_SCSI is not set | 291 | # CONFIG_SCSI is not set |
292 | # CONFIG_SCSI_DMA is not set | ||
340 | # CONFIG_SCSI_NETLINK is not set | 293 | # CONFIG_SCSI_NETLINK is not set |
341 | |||
342 | # | ||
343 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
344 | # | ||
345 | # CONFIG_ATA is not set | 294 | # CONFIG_ATA is not set |
346 | |||
347 | # | ||
348 | # Old CD-ROM drivers (not SCSI, not IDE) | ||
349 | # | ||
350 | # CONFIG_CD_NO_IDESCSI is not set | ||
351 | |||
352 | # | ||
353 | # Multi-device support (RAID and LVM) | ||
354 | # | ||
355 | # CONFIG_MD is not set | 295 | # CONFIG_MD is not set |
356 | |||
357 | # | ||
358 | # Fusion MPT device support | ||
359 | # | ||
360 | # CONFIG_FUSION is not set | ||
361 | |||
362 | # | ||
363 | # IEEE 1394 (FireWire) support | ||
364 | # | ||
365 | |||
366 | # | ||
367 | # I2O device support | ||
368 | # | ||
369 | |||
370 | # | ||
371 | # ISDN subsystem | ||
372 | # | ||
373 | |||
374 | # | ||
375 | # Telephony Support | ||
376 | # | ||
377 | # CONFIG_PHONE is not set | 296 | # CONFIG_PHONE is not set |
378 | 297 | ||
379 | # | 298 | # |
@@ -381,14 +300,12 @@ CONFIG_IDE_GENERIC=y | |||
381 | # | 300 | # |
382 | CONFIG_INPUT=y | 301 | CONFIG_INPUT=y |
383 | # CONFIG_INPUT_FF_MEMLESS is not set | 302 | # CONFIG_INPUT_FF_MEMLESS is not set |
303 | # CONFIG_INPUT_POLLDEV is not set | ||
384 | 304 | ||
385 | # | 305 | # |
386 | # Userland interfaces | 306 | # Userland interfaces |
387 | # | 307 | # |
388 | CONFIG_INPUT_MOUSEDEV=y | 308 | # CONFIG_INPUT_MOUSEDEV is not set |
389 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
390 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 | ||
391 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 | ||
392 | # CONFIG_INPUT_JOYDEV is not set | 309 | # CONFIG_INPUT_JOYDEV is not set |
393 | # CONFIG_INPUT_TSDEV is not set | 310 | # CONFIG_INPUT_TSDEV is not set |
394 | # CONFIG_INPUT_EVDEV is not set | 311 | # CONFIG_INPUT_EVDEV is not set |
@@ -400,6 +317,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 | |||
400 | # CONFIG_INPUT_KEYBOARD is not set | 317 | # CONFIG_INPUT_KEYBOARD is not set |
401 | # CONFIG_INPUT_MOUSE is not set | 318 | # CONFIG_INPUT_MOUSE is not set |
402 | # CONFIG_INPUT_JOYSTICK is not set | 319 | # CONFIG_INPUT_JOYSTICK is not set |
320 | # CONFIG_INPUT_TABLET is not set | ||
403 | # CONFIG_INPUT_TOUCHSCREEN is not set | 321 | # CONFIG_INPUT_TOUCHSCREEN is not set |
404 | # CONFIG_INPUT_MISC is not set | 322 | # CONFIG_INPUT_MISC is not set |
405 | 323 | ||
@@ -433,45 +351,16 @@ CONFIG_SERIAL_VR41XX_CONSOLE=y | |||
433 | CONFIG_UNIX98_PTYS=y | 351 | CONFIG_UNIX98_PTYS=y |
434 | CONFIG_LEGACY_PTYS=y | 352 | CONFIG_LEGACY_PTYS=y |
435 | CONFIG_LEGACY_PTY_COUNT=256 | 353 | CONFIG_LEGACY_PTY_COUNT=256 |
436 | |||
437 | # | ||
438 | # IPMI | ||
439 | # | ||
440 | # CONFIG_IPMI_HANDLER is not set | 354 | # CONFIG_IPMI_HANDLER is not set |
441 | 355 | # CONFIG_WATCHDOG is not set | |
442 | # | ||
443 | # Watchdog Cards | ||
444 | # | ||
445 | CONFIG_WATCHDOG=y | ||
446 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
447 | |||
448 | # | ||
449 | # Watchdog Device Drivers | ||
450 | # | ||
451 | # CONFIG_SOFT_WATCHDOG is not set | ||
452 | |||
453 | # | ||
454 | # ISA-based Watchdog Cards | ||
455 | # | ||
456 | # CONFIG_PCWATCHDOG is not set | ||
457 | # CONFIG_MIXCOMWD is not set | ||
458 | # CONFIG_WDT is not set | ||
459 | # CONFIG_HW_RANDOM is not set | 356 | # CONFIG_HW_RANDOM is not set |
460 | # CONFIG_RTC is not set | 357 | # CONFIG_RTC is not set |
461 | # CONFIG_GEN_RTC is not set | ||
462 | # CONFIG_DTLK is not set | 358 | # CONFIG_DTLK is not set |
463 | # CONFIG_R3964 is not set | 359 | # CONFIG_R3964 is not set |
464 | CONFIG_GPIO_VR41XX=y | 360 | CONFIG_GPIO_VR41XX=y |
465 | # CONFIG_RAW_DRIVER is not set | 361 | # CONFIG_RAW_DRIVER is not set |
466 | |||
467 | # | ||
468 | # TPM devices | ||
469 | # | ||
470 | # CONFIG_TCG_TPM is not set | 362 | # CONFIG_TCG_TPM is not set |
471 | 363 | CONFIG_DEVPORT=y | |
472 | # | ||
473 | # I2C support | ||
474 | # | ||
475 | # CONFIG_I2C is not set | 364 | # CONFIG_I2C is not set |
476 | 365 | ||
477 | # | 366 | # |
@@ -479,31 +368,32 @@ CONFIG_GPIO_VR41XX=y | |||
479 | # | 368 | # |
480 | # CONFIG_SPI is not set | 369 | # CONFIG_SPI is not set |
481 | # CONFIG_SPI_MASTER is not set | 370 | # CONFIG_SPI_MASTER is not set |
482 | |||
483 | # | ||
484 | # Dallas's 1-wire bus | ||
485 | # | ||
486 | # CONFIG_W1 is not set | 371 | # CONFIG_W1 is not set |
372 | # CONFIG_POWER_SUPPLY is not set | ||
373 | # CONFIG_HWMON is not set | ||
487 | 374 | ||
488 | # | 375 | # |
489 | # Hardware Monitoring support | 376 | # Multifunction device drivers |
490 | # | 377 | # |
491 | # CONFIG_HWMON is not set | 378 | # CONFIG_MFD_SM501 is not set |
492 | # CONFIG_HWMON_VID is not set | ||
493 | 379 | ||
494 | # | 380 | # |
495 | # Multimedia devices | 381 | # Multimedia devices |
496 | # | 382 | # |
497 | # CONFIG_VIDEO_DEV is not set | 383 | # CONFIG_VIDEO_DEV is not set |
384 | # CONFIG_DAB is not set | ||
498 | 385 | ||
499 | # | 386 | # |
500 | # Digital Video Broadcasting Devices | 387 | # Graphics support |
501 | # | 388 | # |
389 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
502 | 390 | ||
503 | # | 391 | # |
504 | # Graphics support | 392 | # Display device support |
505 | # | 393 | # |
506 | # CONFIG_FIRMWARE_EDID is not set | 394 | # CONFIG_DISPLAY_SUPPORT is not set |
395 | # CONFIG_VGASTATE is not set | ||
396 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
507 | # CONFIG_FB is not set | 397 | # CONFIG_FB is not set |
508 | 398 | ||
509 | # | 399 | # |
@@ -512,65 +402,49 @@ CONFIG_GPIO_VR41XX=y | |||
512 | # CONFIG_VGA_CONSOLE is not set | 402 | # CONFIG_VGA_CONSOLE is not set |
513 | # CONFIG_MDA_CONSOLE is not set | 403 | # CONFIG_MDA_CONSOLE is not set |
514 | CONFIG_DUMMY_CONSOLE=y | 404 | CONFIG_DUMMY_CONSOLE=y |
515 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
516 | 405 | ||
517 | # | 406 | # |
518 | # Sound | 407 | # Sound |
519 | # | 408 | # |
520 | # CONFIG_SOUND is not set | 409 | # CONFIG_SOUND is not set |
521 | 410 | # CONFIG_HID_SUPPORT is not set | |
522 | # | 411 | # CONFIG_USB_SUPPORT is not set |
523 | # HID Devices | ||
524 | # | ||
525 | CONFIG_HID=y | ||
526 | # CONFIG_HID_DEBUG is not set | ||
527 | |||
528 | # | ||
529 | # USB support | ||
530 | # | ||
531 | # CONFIG_USB_ARCH_HAS_HCD is not set | ||
532 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
533 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
534 | |||
535 | # | ||
536 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
537 | # | ||
538 | |||
539 | # | ||
540 | # USB Gadget Support | ||
541 | # | ||
542 | # CONFIG_USB_GADGET is not set | ||
543 | |||
544 | # | ||
545 | # MMC/SD Card support | ||
546 | # | ||
547 | # CONFIG_MMC is not set | 412 | # CONFIG_MMC is not set |
548 | |||
549 | # | ||
550 | # LED devices | ||
551 | # | ||
552 | # CONFIG_NEW_LEDS is not set | 413 | # CONFIG_NEW_LEDS is not set |
414 | CONFIG_RTC_LIB=y | ||
415 | CONFIG_RTC_CLASS=y | ||
416 | CONFIG_RTC_HCTOSYS=y | ||
417 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
418 | # CONFIG_RTC_DEBUG is not set | ||
553 | 419 | ||
554 | # | 420 | # |
555 | # LED drivers | 421 | # RTC interfaces |
556 | # | 422 | # |
423 | CONFIG_RTC_INTF_SYSFS=y | ||
424 | CONFIG_RTC_INTF_PROC=y | ||
425 | CONFIG_RTC_INTF_DEV=y | ||
426 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
427 | # CONFIG_RTC_DRV_TEST is not set | ||
557 | 428 | ||
558 | # | 429 | # |
559 | # LED Triggers | 430 | # SPI RTC drivers |
560 | # | 431 | # |
561 | 432 | ||
562 | # | 433 | # |
563 | # InfiniBand support | 434 | # Platform RTC drivers |
564 | # | 435 | # |
436 | # CONFIG_RTC_DRV_CMOS is not set | ||
437 | # CONFIG_RTC_DRV_DS1553 is not set | ||
438 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
439 | # CONFIG_RTC_DRV_DS1742 is not set | ||
440 | # CONFIG_RTC_DRV_M48T86 is not set | ||
441 | # CONFIG_RTC_DRV_M48T59 is not set | ||
442 | # CONFIG_RTC_DRV_V3020 is not set | ||
565 | 443 | ||
566 | # | 444 | # |
567 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 445 | # on-CPU RTC drivers |
568 | # | 446 | # |
569 | 447 | CONFIG_RTC_DRV_VR41XX=y | |
570 | # | ||
571 | # Real Time Clock | ||
572 | # | ||
573 | # CONFIG_RTC_CLASS is not set | ||
574 | 448 | ||
575 | # | 449 | # |
576 | # DMA Engine support | 450 | # DMA Engine support |
@@ -586,12 +460,9 @@ CONFIG_HID=y | |||
586 | # | 460 | # |
587 | 461 | ||
588 | # | 462 | # |
589 | # Auxiliary Display support | 463 | # Userspace I/O |
590 | # | ||
591 | |||
592 | # | ||
593 | # Virtualization | ||
594 | # | 464 | # |
465 | # CONFIG_UIO is not set | ||
595 | 466 | ||
596 | # | 467 | # |
597 | # File systems | 468 | # File systems |
@@ -599,8 +470,14 @@ CONFIG_HID=y | |||
599 | CONFIG_EXT2_FS=y | 470 | CONFIG_EXT2_FS=y |
600 | # CONFIG_EXT2_FS_XATTR is not set | 471 | # CONFIG_EXT2_FS_XATTR is not set |
601 | # CONFIG_EXT2_FS_XIP is not set | 472 | # CONFIG_EXT2_FS_XIP is not set |
602 | # CONFIG_EXT3_FS is not set | 473 | CONFIG_EXT3_FS=y |
474 | CONFIG_EXT3_FS_XATTR=y | ||
475 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
476 | # CONFIG_EXT3_FS_SECURITY is not set | ||
603 | # CONFIG_EXT4DEV_FS is not set | 477 | # CONFIG_EXT4DEV_FS is not set |
478 | CONFIG_JBD=y | ||
479 | # CONFIG_JBD_DEBUG is not set | ||
480 | CONFIG_FS_MBCACHE=y | ||
604 | # CONFIG_REISERFS_FS is not set | 481 | # CONFIG_REISERFS_FS is not set |
605 | # CONFIG_JFS_FS is not set | 482 | # CONFIG_JFS_FS is not set |
606 | CONFIG_FS_POSIX_ACL=y | 483 | CONFIG_FS_POSIX_ACL=y |
@@ -614,7 +491,7 @@ CONFIG_INOTIFY_USER=y | |||
614 | CONFIG_DNOTIFY=y | 491 | CONFIG_DNOTIFY=y |
615 | # CONFIG_AUTOFS_FS is not set | 492 | # CONFIG_AUTOFS_FS is not set |
616 | CONFIG_AUTOFS4_FS=y | 493 | CONFIG_AUTOFS4_FS=y |
617 | CONFIG_FUSE_FS=m | 494 | # CONFIG_FUSE_FS is not set |
618 | CONFIG_GENERIC_ACL=y | 495 | CONFIG_GENERIC_ACL=y |
619 | 496 | ||
620 | # | 497 | # |
@@ -687,7 +564,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
687 | # CONFIG_DEBUG_FS is not set | 564 | # CONFIG_DEBUG_FS is not set |
688 | # CONFIG_HEADERS_CHECK is not set | 565 | # CONFIG_HEADERS_CHECK is not set |
689 | # CONFIG_DEBUG_KERNEL is not set | 566 | # CONFIG_DEBUG_KERNEL is not set |
690 | CONFIG_LOG_BUF_SHIFT=14 | ||
691 | CONFIG_CROSSCOMPILE=y | 567 | CONFIG_CROSSCOMPILE=y |
692 | CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M" | 568 | CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M" |
693 | 569 | ||
@@ -696,10 +572,6 @@ CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M" | |||
696 | # | 572 | # |
697 | # CONFIG_KEYS is not set | 573 | # CONFIG_KEYS is not set |
698 | # CONFIG_SECURITY is not set | 574 | # CONFIG_SECURITY is not set |
699 | |||
700 | # | ||
701 | # Cryptographic options | ||
702 | # | ||
703 | # CONFIG_CRYPTO is not set | 575 | # CONFIG_CRYPTO is not set |
704 | 576 | ||
705 | # | 577 | # |
@@ -707,8 +579,11 @@ CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M" | |||
707 | # | 579 | # |
708 | # CONFIG_CRC_CCITT is not set | 580 | # CONFIG_CRC_CCITT is not set |
709 | # CONFIG_CRC16 is not set | 581 | # CONFIG_CRC16 is not set |
582 | # CONFIG_CRC_ITU_T is not set | ||
710 | # CONFIG_CRC32 is not set | 583 | # CONFIG_CRC32 is not set |
584 | # CONFIG_CRC7 is not set | ||
711 | # CONFIG_LIBCRC32C is not set | 585 | # CONFIG_LIBCRC32C is not set |
712 | CONFIG_PLIST=y | 586 | CONFIG_PLIST=y |
713 | CONFIG_HAS_IOMEM=y | 587 | CONFIG_HAS_IOMEM=y |
714 | CONFIG_HAS_IOPORT=y | 588 | CONFIG_HAS_IOPORT=y |
589 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig index 934d8a008936..670039bb1a7c 100644 --- a/arch/mips/configs/ip22_defconfig +++ b/arch/mips/configs/ip22_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.20 | 3 | # Linux kernel version: 2.6.23-rc2 |
4 | # Tue Feb 20 21:47:32 2007 | 4 | # Tue Aug 7 12:39:49 2007 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
@@ -9,52 +9,40 @@ CONFIG_MIPS=y | |||
9 | # Machine selection | 9 | # Machine selection |
10 | # | 10 | # |
11 | CONFIG_ZONE_DMA=y | 11 | CONFIG_ZONE_DMA=y |
12 | # CONFIG_MIPS_MTX1 is not set | 12 | # CONFIG_MACH_ALCHEMY is not set |
13 | # CONFIG_MIPS_BOSPORUS is not set | ||
14 | # CONFIG_MIPS_PB1000 is not set | ||
15 | # CONFIG_MIPS_PB1100 is not set | ||
16 | # CONFIG_MIPS_PB1500 is not set | ||
17 | # CONFIG_MIPS_PB1550 is not set | ||
18 | # CONFIG_MIPS_PB1200 is not set | ||
19 | # CONFIG_MIPS_DB1000 is not set | ||
20 | # CONFIG_MIPS_DB1100 is not set | ||
21 | # CONFIG_MIPS_DB1500 is not set | ||
22 | # CONFIG_MIPS_DB1550 is not set | ||
23 | # CONFIG_MIPS_DB1200 is not set | ||
24 | # CONFIG_MIPS_MIRAGE is not set | ||
25 | # CONFIG_BASLER_EXCITE is not set | 13 | # CONFIG_BASLER_EXCITE is not set |
26 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
27 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
28 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
17 | # CONFIG_LEMOTE_FULONG is not set | ||
29 | # CONFIG_MIPS_ATLAS is not set | 18 | # CONFIG_MIPS_ATLAS is not set |
30 | # CONFIG_MIPS_MALTA is not set | 19 | # CONFIG_MIPS_MALTA is not set |
31 | # CONFIG_MIPS_SEAD is not set | 20 | # CONFIG_MIPS_SEAD is not set |
32 | # CONFIG_WR_PPMC is not set | ||
33 | # CONFIG_MIPS_SIM is not set | 21 | # CONFIG_MIPS_SIM is not set |
34 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 22 | # CONFIG_MARKEINS is not set |
35 | # CONFIG_MIPS_XXS1500 is not set | 23 | # CONFIG_MACH_VR41XX is not set |
36 | # CONFIG_PNX8550_JBS is not set | 24 | # CONFIG_PNX8550_JBS is not set |
37 | # CONFIG_PNX8550_STB810 is not set | 25 | # CONFIG_PNX8550_STB810 is not set |
38 | # CONFIG_MACH_VR41XX is not set | 26 | # CONFIG_PMC_MSP is not set |
39 | # CONFIG_PMC_YOSEMITE is not set | 27 | # CONFIG_PMC_YOSEMITE is not set |
40 | # CONFIG_QEMU is not set | 28 | # CONFIG_QEMU is not set |
41 | # CONFIG_MARKEINS is not set | ||
42 | CONFIG_SGI_IP22=y | 29 | CONFIG_SGI_IP22=y |
43 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
44 | # CONFIG_SGI_IP32 is not set | 31 | # CONFIG_SGI_IP32 is not set |
45 | # CONFIG_SIBYTE_BIGSUR is not set | 32 | # CONFIG_SIBYTE_CRHINE is not set |
33 | # CONFIG_SIBYTE_CARMEL is not set | ||
34 | # CONFIG_SIBYTE_CRHONE is not set | ||
35 | # CONFIG_SIBYTE_RHONE is not set | ||
46 | # CONFIG_SIBYTE_SWARM is not set | 36 | # CONFIG_SIBYTE_SWARM is not set |
37 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 38 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | ||
49 | # CONFIG_SIBYTE_CARMEL is not set | ||
50 | # CONFIG_SIBYTE_PTSWARM is not set | 39 | # CONFIG_SIBYTE_PTSWARM is not set |
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 40 | # CONFIG_SIBYTE_BIGSUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | ||
53 | # CONFIG_SIBYTE_CRHONE is not set | ||
54 | # CONFIG_SNI_RM is not set | 41 | # CONFIG_SNI_RM is not set |
55 | # CONFIG_TOSHIBA_JMR3927 is not set | 42 | # CONFIG_TOSHIBA_JMR3927 is not set |
56 | # CONFIG_TOSHIBA_RBTX4927 is not set | 43 | # CONFIG_TOSHIBA_RBTX4927 is not set |
57 | # CONFIG_TOSHIBA_RBTX4938 is not set | 44 | # CONFIG_TOSHIBA_RBTX4938 is not set |
45 | # CONFIG_WR_PPMC is not set | ||
58 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 46 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
59 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 47 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
60 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 48 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
@@ -67,6 +55,9 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
67 | CONFIG_ARC=y | 55 | CONFIG_ARC=y |
68 | CONFIG_DMA_NONCOHERENT=y | 56 | CONFIG_DMA_NONCOHERENT=y |
69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 57 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
58 | CONFIG_EARLY_PRINTK=y | ||
59 | CONFIG_SYS_HAS_EARLY_PRINTK=y | ||
60 | # CONFIG_NO_IOPORT is not set | ||
70 | CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y | 61 | CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y |
71 | CONFIG_CPU_BIG_ENDIAN=y | 62 | CONFIG_CPU_BIG_ENDIAN=y |
72 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 63 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
@@ -82,6 +73,7 @@ CONFIG_ARC_PROMLIB=y | |||
82 | # | 73 | # |
83 | # CPU selection | 74 | # CPU selection |
84 | # | 75 | # |
76 | # CONFIG_CPU_LOONGSON2 is not set | ||
85 | # CONFIG_CPU_MIPS32_R1 is not set | 77 | # CONFIG_CPU_MIPS32_R1 is not set |
86 | # CONFIG_CPU_MIPS32_R2 is not set | 78 | # CONFIG_CPU_MIPS32_R2 is not set |
87 | # CONFIG_CPU_MIPS64_R1 is not set | 79 | # CONFIG_CPU_MIPS64_R1 is not set |
@@ -122,8 +114,6 @@ CONFIG_IP22_CPU_SCACHE=y | |||
122 | CONFIG_MIPS_MT_DISABLED=y | 114 | CONFIG_MIPS_MT_DISABLED=y |
123 | # CONFIG_MIPS_MT_SMP is not set | 115 | # CONFIG_MIPS_MT_SMP is not set |
124 | # CONFIG_MIPS_MT_SMTC is not set | 116 | # CONFIG_MIPS_MT_SMTC is not set |
125 | # CONFIG_MIPS_VPE_LOADER is not set | ||
126 | # CONFIG_64BIT_PHYS_ADDR is not set | ||
127 | CONFIG_CPU_HAS_LLSC=y | 117 | CONFIG_CPU_HAS_LLSC=y |
128 | CONFIG_CPU_HAS_SYNC=y | 118 | CONFIG_CPU_HAS_SYNC=y |
129 | CONFIG_GENERIC_HARDIRQS=y | 119 | CONFIG_GENERIC_HARDIRQS=y |
@@ -139,6 +129,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
139 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 129 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
140 | # CONFIG_RESOURCES_64BIT is not set | 130 | # CONFIG_RESOURCES_64BIT is not set |
141 | CONFIG_ZONE_DMA_FLAG=1 | 131 | CONFIG_ZONE_DMA_FLAG=1 |
132 | CONFIG_BOUNCE=y | ||
133 | CONFIG_VIRT_TO_BUS=y | ||
142 | # CONFIG_HZ_48 is not set | 134 | # CONFIG_HZ_48 is not set |
143 | # CONFIG_HZ_100 is not set | 135 | # CONFIG_HZ_100 is not set |
144 | # CONFIG_HZ_128 is not set | 136 | # CONFIG_HZ_128 is not set |
@@ -152,35 +144,33 @@ CONFIG_HZ=1000 | |||
152 | CONFIG_PREEMPT_VOLUNTARY=y | 144 | CONFIG_PREEMPT_VOLUNTARY=y |
153 | # CONFIG_PREEMPT is not set | 145 | # CONFIG_PREEMPT is not set |
154 | # CONFIG_KEXEC is not set | 146 | # CONFIG_KEXEC is not set |
147 | CONFIG_SECCOMP=y | ||
155 | CONFIG_LOCKDEP_SUPPORT=y | 148 | CONFIG_LOCKDEP_SUPPORT=y |
156 | CONFIG_STACKTRACE_SUPPORT=y | 149 | CONFIG_STACKTRACE_SUPPORT=y |
157 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 150 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
158 | 151 | ||
159 | # | 152 | # |
160 | # Code maturity level options | 153 | # General setup |
161 | # | 154 | # |
162 | CONFIG_EXPERIMENTAL=y | 155 | CONFIG_EXPERIMENTAL=y |
163 | CONFIG_BROKEN_ON_SMP=y | 156 | CONFIG_BROKEN_ON_SMP=y |
164 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 157 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
165 | |||
166 | # | ||
167 | # General setup | ||
168 | # | ||
169 | CONFIG_LOCALVERSION="" | 158 | CONFIG_LOCALVERSION="" |
170 | CONFIG_LOCALVERSION_AUTO=y | 159 | CONFIG_LOCALVERSION_AUTO=y |
171 | CONFIG_SWAP=y | 160 | CONFIG_SWAP=y |
172 | CONFIG_SYSVIPC=y | 161 | CONFIG_SYSVIPC=y |
173 | # CONFIG_IPC_NS is not set | ||
174 | CONFIG_SYSVIPC_SYSCTL=y | 162 | CONFIG_SYSVIPC_SYSCTL=y |
175 | # CONFIG_POSIX_MQUEUE is not set | 163 | # CONFIG_POSIX_MQUEUE is not set |
176 | # CONFIG_BSD_PROCESS_ACCT is not set | 164 | # CONFIG_BSD_PROCESS_ACCT is not set |
177 | # CONFIG_TASKSTATS is not set | 165 | # CONFIG_TASKSTATS is not set |
178 | # CONFIG_UTS_NS is not set | 166 | # CONFIG_USER_NS is not set |
179 | # CONFIG_AUDIT is not set | 167 | # CONFIG_AUDIT is not set |
180 | CONFIG_IKCONFIG=y | 168 | CONFIG_IKCONFIG=y |
181 | CONFIG_IKCONFIG_PROC=y | 169 | CONFIG_IKCONFIG_PROC=y |
170 | CONFIG_LOG_BUF_SHIFT=14 | ||
182 | CONFIG_SYSFS_DEPRECATED=y | 171 | CONFIG_SYSFS_DEPRECATED=y |
183 | CONFIG_RELAY=y | 172 | CONFIG_RELAY=y |
173 | # CONFIG_BLK_DEV_INITRD is not set | ||
184 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 174 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
185 | CONFIG_SYSCTL=y | 175 | CONFIG_SYSCTL=y |
186 | CONFIG_EMBEDDED=y | 176 | CONFIG_EMBEDDED=y |
@@ -193,32 +183,30 @@ CONFIG_BUG=y | |||
193 | CONFIG_ELF_CORE=y | 183 | CONFIG_ELF_CORE=y |
194 | CONFIG_BASE_FULL=y | 184 | CONFIG_BASE_FULL=y |
195 | CONFIG_FUTEX=y | 185 | CONFIG_FUTEX=y |
186 | CONFIG_ANON_INODES=y | ||
196 | CONFIG_EPOLL=y | 187 | CONFIG_EPOLL=y |
188 | CONFIG_SIGNALFD=y | ||
189 | CONFIG_TIMERFD=y | ||
190 | CONFIG_EVENTFD=y | ||
197 | CONFIG_SHMEM=y | 191 | CONFIG_SHMEM=y |
198 | CONFIG_SLAB=y | ||
199 | CONFIG_VM_EVENT_COUNTERS=y | 192 | CONFIG_VM_EVENT_COUNTERS=y |
193 | CONFIG_SLAB=y | ||
194 | # CONFIG_SLUB is not set | ||
195 | # CONFIG_SLOB is not set | ||
200 | CONFIG_RT_MUTEXES=y | 196 | CONFIG_RT_MUTEXES=y |
201 | # CONFIG_TINY_SHMEM is not set | 197 | # CONFIG_TINY_SHMEM is not set |
202 | CONFIG_BASE_SMALL=0 | 198 | CONFIG_BASE_SMALL=0 |
203 | # CONFIG_SLOB is not set | ||
204 | |||
205 | # | ||
206 | # Loadable module support | ||
207 | # | ||
208 | CONFIG_MODULES=y | 199 | CONFIG_MODULES=y |
209 | CONFIG_MODULE_UNLOAD=y | 200 | CONFIG_MODULE_UNLOAD=y |
210 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 201 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
211 | CONFIG_MODVERSIONS=y | 202 | CONFIG_MODVERSIONS=y |
212 | CONFIG_MODULE_SRCVERSION_ALL=y | 203 | CONFIG_MODULE_SRCVERSION_ALL=y |
213 | CONFIG_KMOD=y | 204 | CONFIG_KMOD=y |
214 | |||
215 | # | ||
216 | # Block layer | ||
217 | # | ||
218 | CONFIG_BLOCK=y | 205 | CONFIG_BLOCK=y |
219 | # CONFIG_LBD is not set | 206 | # CONFIG_LBD is not set |
220 | # CONFIG_BLK_DEV_IO_TRACE is not set | 207 | # CONFIG_BLK_DEV_IO_TRACE is not set |
221 | # CONFIG_LSF is not set | 208 | # CONFIG_LSF is not set |
209 | # CONFIG_BLK_DEV_BSG is not set | ||
222 | 210 | ||
223 | # | 211 | # |
224 | # IO Schedulers | 212 | # IO Schedulers |
@@ -237,6 +225,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
237 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 225 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
238 | # | 226 | # |
239 | CONFIG_HW_HAS_EISA=y | 227 | CONFIG_HW_HAS_EISA=y |
228 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
240 | # CONFIG_EISA is not set | 229 | # CONFIG_EISA is not set |
241 | CONFIG_MMU=y | 230 | CONFIG_MMU=y |
242 | 231 | ||
@@ -245,10 +234,6 @@ CONFIG_MMU=y | |||
245 | # | 234 | # |
246 | 235 | ||
247 | # | 236 | # |
248 | # PCI Hotplug Support | ||
249 | # | ||
250 | |||
251 | # | ||
252 | # Executable file formats | 237 | # Executable file formats |
253 | # | 238 | # |
254 | CONFIG_BINFMT_ELF=y | 239 | CONFIG_BINFMT_ELF=y |
@@ -261,7 +246,7 @@ CONFIG_TRAD_SIGNALS=y | |||
261 | CONFIG_PM=y | 246 | CONFIG_PM=y |
262 | # CONFIG_PM_LEGACY is not set | 247 | # CONFIG_PM_LEGACY is not set |
263 | # CONFIG_PM_DEBUG is not set | 248 | # CONFIG_PM_DEBUG is not set |
264 | # CONFIG_PM_SYSFS_DEPRECATED is not set | 249 | # CONFIG_SUSPEND is not set |
265 | 250 | ||
266 | # | 251 | # |
267 | # Networking | 252 | # Networking |
@@ -271,7 +256,6 @@ CONFIG_NET=y | |||
271 | # | 256 | # |
272 | # Networking options | 257 | # Networking options |
273 | # | 258 | # |
274 | # CONFIG_NETDEBUG is not set | ||
275 | CONFIG_PACKET=y | 259 | CONFIG_PACKET=y |
276 | CONFIG_PACKET_MMAP=y | 260 | CONFIG_PACKET_MMAP=y |
277 | CONFIG_UNIX=y | 261 | CONFIG_UNIX=y |
@@ -308,10 +292,6 @@ CONFIG_INET_TCP_DIAG=y | |||
308 | CONFIG_TCP_CONG_CUBIC=y | 292 | CONFIG_TCP_CONG_CUBIC=y |
309 | CONFIG_DEFAULT_TCP_CONG="cubic" | 293 | CONFIG_DEFAULT_TCP_CONG="cubic" |
310 | CONFIG_TCP_MD5SIG=y | 294 | CONFIG_TCP_MD5SIG=y |
311 | |||
312 | # | ||
313 | # IP: Virtual Server Configuration | ||
314 | # | ||
315 | CONFIG_IP_VS=m | 295 | CONFIG_IP_VS=m |
316 | # CONFIG_IP_VS_DEBUG is not set | 296 | # CONFIG_IP_VS_DEBUG is not set |
317 | CONFIG_IP_VS_TAB_BITS=12 | 297 | CONFIG_IP_VS_TAB_BITS=12 |
@@ -346,10 +326,11 @@ CONFIG_IPV6=m | |||
346 | CONFIG_IPV6_PRIVACY=y | 326 | CONFIG_IPV6_PRIVACY=y |
347 | CONFIG_IPV6_ROUTER_PREF=y | 327 | CONFIG_IPV6_ROUTER_PREF=y |
348 | CONFIG_IPV6_ROUTE_INFO=y | 328 | CONFIG_IPV6_ROUTE_INFO=y |
329 | CONFIG_IPV6_OPTIMISTIC_DAD=y | ||
349 | CONFIG_INET6_AH=m | 330 | CONFIG_INET6_AH=m |
350 | CONFIG_INET6_ESP=m | 331 | CONFIG_INET6_ESP=m |
351 | CONFIG_INET6_IPCOMP=m | 332 | CONFIG_INET6_IPCOMP=m |
352 | CONFIG_IPV6_MIP6=y | 333 | CONFIG_IPV6_MIP6=m |
353 | CONFIG_INET6_XFRM_TUNNEL=m | 334 | CONFIG_INET6_XFRM_TUNNEL=m |
354 | CONFIG_INET6_TUNNEL=m | 335 | CONFIG_INET6_TUNNEL=m |
355 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | 336 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m |
@@ -371,8 +352,6 @@ CONFIG_NETFILTER_NETLINK=m | |||
371 | CONFIG_NETFILTER_NETLINK_QUEUE=m | 352 | CONFIG_NETFILTER_NETLINK_QUEUE=m |
372 | CONFIG_NETFILTER_NETLINK_LOG=m | 353 | CONFIG_NETFILTER_NETLINK_LOG=m |
373 | CONFIG_NF_CONNTRACK_ENABLED=m | 354 | CONFIG_NF_CONNTRACK_ENABLED=m |
374 | CONFIG_NF_CONNTRACK_SUPPORT=y | ||
375 | # CONFIG_IP_NF_CONNTRACK_SUPPORT is not set | ||
376 | CONFIG_NF_CONNTRACK=m | 355 | CONFIG_NF_CONNTRACK=m |
377 | CONFIG_NF_CT_ACCT=y | 356 | CONFIG_NF_CT_ACCT=y |
378 | CONFIG_NF_CONNTRACK_MARK=y | 357 | CONFIG_NF_CONNTRACK_MARK=y |
@@ -380,6 +359,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y | |||
380 | CONFIG_NF_CONNTRACK_EVENTS=y | 359 | CONFIG_NF_CONNTRACK_EVENTS=y |
381 | CONFIG_NF_CT_PROTO_GRE=m | 360 | CONFIG_NF_CT_PROTO_GRE=m |
382 | CONFIG_NF_CT_PROTO_SCTP=m | 361 | CONFIG_NF_CT_PROTO_SCTP=m |
362 | CONFIG_NF_CT_PROTO_UDPLITE=m | ||
383 | CONFIG_NF_CONNTRACK_AMANDA=m | 363 | CONFIG_NF_CONNTRACK_AMANDA=m |
384 | CONFIG_NF_CONNTRACK_FTP=m | 364 | CONFIG_NF_CONNTRACK_FTP=m |
385 | CONFIG_NF_CONNTRACK_H323=m | 365 | CONFIG_NF_CONNTRACK_H323=m |
@@ -398,11 +378,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m | |||
398 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 378 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
399 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 379 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
400 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 380 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
381 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | ||
401 | CONFIG_NETFILTER_XT_TARGET_SECMARK=m | 382 | CONFIG_NETFILTER_XT_TARGET_SECMARK=m |
402 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m | 383 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m |
403 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 384 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
404 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 385 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
405 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 386 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
387 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | ||
406 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 388 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
407 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 389 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
408 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 390 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
@@ -423,6 +405,7 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m | |||
423 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 405 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
424 | CONFIG_NETFILTER_XT_MATCH_STRING=m | 406 | CONFIG_NETFILTER_XT_MATCH_STRING=m |
425 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 407 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
408 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
426 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 409 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
427 | 410 | ||
428 | # | 411 | # |
@@ -490,25 +473,13 @@ CONFIG_IP6_NF_TARGET_REJECT=m | |||
490 | CONFIG_IP6_NF_MANGLE=m | 473 | CONFIG_IP6_NF_MANGLE=m |
491 | CONFIG_IP6_NF_TARGET_HL=m | 474 | CONFIG_IP6_NF_TARGET_HL=m |
492 | CONFIG_IP6_NF_RAW=m | 475 | CONFIG_IP6_NF_RAW=m |
493 | |||
494 | # | ||
495 | # DCCP Configuration (EXPERIMENTAL) | ||
496 | # | ||
497 | # CONFIG_IP_DCCP is not set | 476 | # CONFIG_IP_DCCP is not set |
498 | |||
499 | # | ||
500 | # SCTP Configuration (EXPERIMENTAL) | ||
501 | # | ||
502 | CONFIG_IP_SCTP=m | 477 | CONFIG_IP_SCTP=m |
503 | # CONFIG_SCTP_DBG_MSG is not set | 478 | # CONFIG_SCTP_DBG_MSG is not set |
504 | # CONFIG_SCTP_DBG_OBJCNT is not set | 479 | # CONFIG_SCTP_DBG_OBJCNT is not set |
505 | # CONFIG_SCTP_HMAC_NONE is not set | 480 | # CONFIG_SCTP_HMAC_NONE is not set |
506 | # CONFIG_SCTP_HMAC_SHA1 is not set | 481 | # CONFIG_SCTP_HMAC_SHA1 is not set |
507 | CONFIG_SCTP_HMAC_MD5=y | 482 | CONFIG_SCTP_HMAC_MD5=y |
508 | |||
509 | # | ||
510 | # TIPC Configuration (EXPERIMENTAL) | ||
511 | # | ||
512 | # CONFIG_TIPC is not set | 483 | # CONFIG_TIPC is not set |
513 | # CONFIG_ATM is not set | 484 | # CONFIG_ATM is not set |
514 | # CONFIG_BRIDGE is not set | 485 | # CONFIG_BRIDGE is not set |
@@ -527,9 +498,6 @@ CONFIG_SCTP_HMAC_MD5=y | |||
527 | # | 498 | # |
528 | CONFIG_NET_SCHED=y | 499 | CONFIG_NET_SCHED=y |
529 | CONFIG_NET_SCH_FIFO=y | 500 | CONFIG_NET_SCH_FIFO=y |
530 | # CONFIG_NET_SCH_CLK_JIFFIES is not set | ||
531 | CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y | ||
532 | # CONFIG_NET_SCH_CLK_CPU is not set | ||
533 | 501 | ||
534 | # | 502 | # |
535 | # Queueing/Scheduling | 503 | # Queueing/Scheduling |
@@ -538,6 +506,7 @@ CONFIG_NET_SCH_CBQ=m | |||
538 | CONFIG_NET_SCH_HTB=m | 506 | CONFIG_NET_SCH_HTB=m |
539 | CONFIG_NET_SCH_HFSC=m | 507 | CONFIG_NET_SCH_HFSC=m |
540 | CONFIG_NET_SCH_PRIO=m | 508 | CONFIG_NET_SCH_PRIO=m |
509 | CONFIG_NET_SCH_RR=m | ||
541 | CONFIG_NET_SCH_RED=m | 510 | CONFIG_NET_SCH_RED=m |
542 | CONFIG_NET_SCH_SFQ=m | 511 | CONFIG_NET_SCH_SFQ=m |
543 | CONFIG_NET_SCH_TEQL=m | 512 | CONFIG_NET_SCH_TEQL=m |
@@ -562,10 +531,16 @@ CONFIG_NET_CLS_U32=m | |||
562 | CONFIG_NET_CLS_RSVP=m | 531 | CONFIG_NET_CLS_RSVP=m |
563 | CONFIG_NET_CLS_RSVP6=m | 532 | CONFIG_NET_CLS_RSVP6=m |
564 | # CONFIG_NET_EMATCH is not set | 533 | # CONFIG_NET_EMATCH is not set |
565 | # CONFIG_NET_CLS_ACT is not set | 534 | CONFIG_NET_CLS_ACT=y |
535 | CONFIG_NET_ACT_POLICE=y | ||
536 | CONFIG_NET_ACT_GACT=m | ||
537 | CONFIG_GACT_PROB=y | ||
538 | CONFIG_NET_ACT_MIRRED=m | ||
539 | CONFIG_NET_ACT_IPT=m | ||
540 | CONFIG_NET_ACT_PEDIT=m | ||
541 | CONFIG_NET_ACT_SIMP=m | ||
566 | CONFIG_NET_CLS_POLICE=y | 542 | CONFIG_NET_CLS_POLICE=y |
567 | # CONFIG_NET_CLS_IND is not set | 543 | # CONFIG_NET_CLS_IND is not set |
568 | CONFIG_NET_ESTIMATOR=y | ||
569 | 544 | ||
570 | # | 545 | # |
571 | # Network testing | 546 | # Network testing |
@@ -574,14 +549,26 @@ CONFIG_NET_ESTIMATOR=y | |||
574 | # CONFIG_HAMRADIO is not set | 549 | # CONFIG_HAMRADIO is not set |
575 | # CONFIG_IRDA is not set | 550 | # CONFIG_IRDA is not set |
576 | # CONFIG_BT is not set | 551 | # CONFIG_BT is not set |
552 | # CONFIG_AF_RXRPC is not set | ||
553 | CONFIG_FIB_RULES=y | ||
554 | |||
555 | # | ||
556 | # Wireless | ||
557 | # | ||
558 | CONFIG_CFG80211=m | ||
559 | CONFIG_WIRELESS_EXT=y | ||
560 | CONFIG_MAC80211=m | ||
561 | # CONFIG_MAC80211_DEBUG is not set | ||
577 | CONFIG_IEEE80211=m | 562 | CONFIG_IEEE80211=m |
578 | # CONFIG_IEEE80211_DEBUG is not set | 563 | # CONFIG_IEEE80211_DEBUG is not set |
579 | CONFIG_IEEE80211_CRYPT_WEP=m | 564 | CONFIG_IEEE80211_CRYPT_WEP=m |
580 | CONFIG_IEEE80211_CRYPT_CCMP=m | 565 | CONFIG_IEEE80211_CRYPT_CCMP=m |
566 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
581 | CONFIG_IEEE80211_SOFTMAC=m | 567 | CONFIG_IEEE80211_SOFTMAC=m |
582 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | 568 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set |
583 | CONFIG_WIRELESS_EXT=y | 569 | CONFIG_RFKILL=m |
584 | CONFIG_FIB_RULES=y | 570 | CONFIG_RFKILL_INPUT=m |
571 | # CONFIG_NET_9P is not set | ||
585 | 572 | ||
586 | # | 573 | # |
587 | # Device Drivers | 574 | # Device Drivers |
@@ -593,47 +580,19 @@ CONFIG_FIB_RULES=y | |||
593 | CONFIG_STANDALONE=y | 580 | CONFIG_STANDALONE=y |
594 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 581 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
595 | # CONFIG_SYS_HYPERVISOR is not set | 582 | # CONFIG_SYS_HYPERVISOR is not set |
596 | |||
597 | # | ||
598 | # Connector - unified userspace <-> kernelspace linker | ||
599 | # | ||
600 | CONFIG_CONNECTOR=m | 583 | CONFIG_CONNECTOR=m |
601 | |||
602 | # | ||
603 | # Memory Technology Devices (MTD) | ||
604 | # | ||
605 | # CONFIG_MTD is not set | 584 | # CONFIG_MTD is not set |
606 | |||
607 | # | ||
608 | # Parallel port support | ||
609 | # | ||
610 | # CONFIG_PARPORT is not set | 585 | # CONFIG_PARPORT is not set |
611 | 586 | CONFIG_BLK_DEV=y | |
612 | # | ||
613 | # Plug and Play support | ||
614 | # | ||
615 | # CONFIG_PNPACPI is not set | ||
616 | |||
617 | # | ||
618 | # Block devices | ||
619 | # | ||
620 | # CONFIG_BLK_DEV_COW_COMMON is not set | 587 | # CONFIG_BLK_DEV_COW_COMMON is not set |
621 | # CONFIG_BLK_DEV_LOOP is not set | 588 | # CONFIG_BLK_DEV_LOOP is not set |
622 | # CONFIG_BLK_DEV_NBD is not set | 589 | # CONFIG_BLK_DEV_NBD is not set |
623 | # CONFIG_BLK_DEV_RAM is not set | 590 | # CONFIG_BLK_DEV_RAM is not set |
624 | # CONFIG_BLK_DEV_INITRD is not set | ||
625 | CONFIG_CDROM_PKTCDVD=m | 591 | CONFIG_CDROM_PKTCDVD=m |
626 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 592 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
627 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 593 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
628 | CONFIG_ATA_OVER_ETH=m | 594 | CONFIG_ATA_OVER_ETH=m |
629 | 595 | # CONFIG_MISC_DEVICES is not set | |
630 | # | ||
631 | # Misc devices | ||
632 | # | ||
633 | |||
634 | # | ||
635 | # ATA/ATAPI/MFM/RLL support | ||
636 | # | ||
637 | # CONFIG_IDE is not set | 596 | # CONFIG_IDE is not set |
638 | 597 | ||
639 | # | 598 | # |
@@ -641,6 +600,7 @@ CONFIG_ATA_OVER_ETH=m | |||
641 | # | 600 | # |
642 | CONFIG_RAID_ATTRS=m | 601 | CONFIG_RAID_ATTRS=m |
643 | CONFIG_SCSI=y | 602 | CONFIG_SCSI=y |
603 | CONFIG_SCSI_DMA=y | ||
644 | CONFIG_SCSI_TGT=m | 604 | CONFIG_SCSI_TGT=m |
645 | # CONFIG_SCSI_NETLINK is not set | 605 | # CONFIG_SCSI_NETLINK is not set |
646 | CONFIG_SCSI_PROC_FS=y | 606 | CONFIG_SCSI_PROC_FS=y |
@@ -663,6 +623,7 @@ CONFIG_CHR_DEV_SCH=m | |||
663 | CONFIG_SCSI_CONSTANTS=y | 623 | CONFIG_SCSI_CONSTANTS=y |
664 | # CONFIG_SCSI_LOGGING is not set | 624 | # CONFIG_SCSI_LOGGING is not set |
665 | CONFIG_SCSI_SCAN_ASYNC=y | 625 | CONFIG_SCSI_SCAN_ASYNC=y |
626 | CONFIG_SCSI_WAIT_SCAN=m | ||
666 | 627 | ||
667 | # | 628 | # |
668 | # SCSI Transports | 629 | # SCSI Transports |
@@ -670,51 +631,21 @@ CONFIG_SCSI_SCAN_ASYNC=y | |||
670 | CONFIG_SCSI_SPI_ATTRS=m | 631 | CONFIG_SCSI_SPI_ATTRS=m |
671 | # CONFIG_SCSI_FC_ATTRS is not set | 632 | # CONFIG_SCSI_FC_ATTRS is not set |
672 | CONFIG_SCSI_ISCSI_ATTRS=m | 633 | CONFIG_SCSI_ISCSI_ATTRS=m |
673 | CONFIG_SCSI_SAS_ATTRS=m | ||
674 | # CONFIG_SCSI_SAS_LIBSAS is not set | 634 | # CONFIG_SCSI_SAS_LIBSAS is not set |
675 | 635 | CONFIG_SCSI_LOWLEVEL=y | |
676 | # | ||
677 | # SCSI low-level drivers | ||
678 | # | ||
679 | CONFIG_ISCSI_TCP=m | 636 | CONFIG_ISCSI_TCP=m |
680 | CONFIG_SGIWD93_SCSI=y | 637 | CONFIG_SGIWD93_SCSI=y |
681 | # CONFIG_SCSI_DEBUG is not set | 638 | # CONFIG_SCSI_DEBUG is not set |
682 | |||
683 | # | ||
684 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
685 | # | ||
686 | # CONFIG_ATA is not set | 639 | # CONFIG_ATA is not set |
687 | |||
688 | # | ||
689 | # Multi-device support (RAID and LVM) | ||
690 | # | ||
691 | # CONFIG_MD is not set | 640 | # CONFIG_MD is not set |
692 | |||
693 | # | ||
694 | # Fusion MPT device support | ||
695 | # | ||
696 | # CONFIG_FUSION is not set | ||
697 | |||
698 | # | ||
699 | # IEEE 1394 (FireWire) support | ||
700 | # | ||
701 | |||
702 | # | ||
703 | # I2O device support | ||
704 | # | ||
705 | |||
706 | # | ||
707 | # Network device support | ||
708 | # | ||
709 | CONFIG_NETDEVICES=y | 641 | CONFIG_NETDEVICES=y |
642 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
643 | # CONFIG_IFB is not set | ||
710 | CONFIG_DUMMY=m | 644 | CONFIG_DUMMY=m |
711 | CONFIG_BONDING=m | 645 | CONFIG_BONDING=m |
646 | CONFIG_MACVLAN=m | ||
712 | CONFIG_EQUALIZER=m | 647 | CONFIG_EQUALIZER=m |
713 | CONFIG_TUN=m | 648 | CONFIG_TUN=m |
714 | |||
715 | # | ||
716 | # PHY device support | ||
717 | # | ||
718 | CONFIG_PHYLIB=m | 649 | CONFIG_PHYLIB=m |
719 | 650 | ||
720 | # | 651 | # |
@@ -728,36 +659,25 @@ CONFIG_CICADA_PHY=m | |||
728 | # CONFIG_VITESSE_PHY is not set | 659 | # CONFIG_VITESSE_PHY is not set |
729 | # CONFIG_SMSC_PHY is not set | 660 | # CONFIG_SMSC_PHY is not set |
730 | # CONFIG_BROADCOM_PHY is not set | 661 | # CONFIG_BROADCOM_PHY is not set |
662 | # CONFIG_ICPLUS_PHY is not set | ||
731 | # CONFIG_FIXED_PHY is not set | 663 | # CONFIG_FIXED_PHY is not set |
732 | |||
733 | # | ||
734 | # Ethernet (10 or 100Mbit) | ||
735 | # | ||
736 | CONFIG_NET_ETHERNET=y | 664 | CONFIG_NET_ETHERNET=y |
737 | # CONFIG_MII is not set | 665 | # CONFIG_MII is not set |
666 | # CONFIG_AX88796 is not set | ||
738 | # CONFIG_DM9000 is not set | 667 | # CONFIG_DM9000 is not set |
739 | CONFIG_SGISEEQ=y | 668 | CONFIG_SGISEEQ=y |
669 | # CONFIG_NETDEV_1000 is not set | ||
670 | # CONFIG_NETDEV_10000 is not set | ||
740 | 671 | ||
741 | # | 672 | # |
742 | # Ethernet (1000 Mbit) | 673 | # Wireless LAN |
743 | # | ||
744 | |||
745 | # | ||
746 | # Ethernet (10000 Mbit) | ||
747 | # | ||
748 | |||
749 | # | ||
750 | # Token Ring devices | ||
751 | # | ||
752 | |||
753 | # | ||
754 | # Wireless LAN (non-hamradio) | ||
755 | # | ||
756 | # CONFIG_NET_RADIO is not set | ||
757 | |||
758 | # | ||
759 | # Wan interfaces | ||
760 | # | 674 | # |
675 | CONFIG_WLAN_PRE80211=y | ||
676 | CONFIG_STRIP=m | ||
677 | CONFIG_WLAN_80211=y | ||
678 | # CONFIG_LIBERTAS is not set | ||
679 | CONFIG_HOSTAP=m | ||
680 | # CONFIG_HOSTAP_FIRMWARE is not set | ||
761 | # CONFIG_WAN is not set | 681 | # CONFIG_WAN is not set |
762 | # CONFIG_PPP is not set | 682 | # CONFIG_PPP is not set |
763 | # CONFIG_SLIP is not set | 683 | # CONFIG_SLIP is not set |
@@ -765,15 +685,7 @@ CONFIG_SGISEEQ=y | |||
765 | # CONFIG_NETCONSOLE is not set | 685 | # CONFIG_NETCONSOLE is not set |
766 | # CONFIG_NETPOLL is not set | 686 | # CONFIG_NETPOLL is not set |
767 | # CONFIG_NET_POLL_CONTROLLER is not set | 687 | # CONFIG_NET_POLL_CONTROLLER is not set |
768 | |||
769 | # | ||
770 | # ISDN subsystem | ||
771 | # | ||
772 | # CONFIG_ISDN is not set | 688 | # CONFIG_ISDN is not set |
773 | |||
774 | # | ||
775 | # Telephony Support | ||
776 | # | ||
777 | # CONFIG_PHONE is not set | 689 | # CONFIG_PHONE is not set |
778 | 690 | ||
779 | # | 691 | # |
@@ -781,6 +693,7 @@ CONFIG_SGISEEQ=y | |||
781 | # | 693 | # |
782 | CONFIG_INPUT=y | 694 | CONFIG_INPUT=y |
783 | # CONFIG_INPUT_FF_MEMLESS is not set | 695 | # CONFIG_INPUT_FF_MEMLESS is not set |
696 | # CONFIG_INPUT_POLLDEV is not set | ||
784 | 697 | ||
785 | # | 698 | # |
786 | # Userland interfaces | 699 | # Userland interfaces |
@@ -806,9 +719,16 @@ CONFIG_KEYBOARD_ATKBD=y | |||
806 | # CONFIG_KEYBOARD_STOWAWAY is not set | 719 | # CONFIG_KEYBOARD_STOWAWAY is not set |
807 | CONFIG_INPUT_MOUSE=y | 720 | CONFIG_INPUT_MOUSE=y |
808 | CONFIG_MOUSE_PS2=m | 721 | CONFIG_MOUSE_PS2=m |
722 | # CONFIG_MOUSE_PS2_ALPS is not set | ||
723 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
724 | # CONFIG_MOUSE_PS2_SYNAPTICS is not set | ||
725 | # CONFIG_MOUSE_PS2_LIFEBOOK is not set | ||
726 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
727 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
809 | CONFIG_MOUSE_SERIAL=m | 728 | CONFIG_MOUSE_SERIAL=m |
810 | # CONFIG_MOUSE_VSXXXAA is not set | 729 | # CONFIG_MOUSE_VSXXXAA is not set |
811 | # CONFIG_INPUT_JOYSTICK is not set | 730 | # CONFIG_INPUT_JOYSTICK is not set |
731 | # CONFIG_INPUT_TABLET is not set | ||
812 | # CONFIG_INPUT_TOUCHSCREEN is not set | 732 | # CONFIG_INPUT_TOUCHSCREEN is not set |
813 | # CONFIG_INPUT_MISC is not set | 733 | # CONFIG_INPUT_MISC is not set |
814 | 734 | ||
@@ -844,15 +764,7 @@ CONFIG_SERIAL_CORE=m | |||
844 | CONFIG_UNIX98_PTYS=y | 764 | CONFIG_UNIX98_PTYS=y |
845 | CONFIG_LEGACY_PTYS=y | 765 | CONFIG_LEGACY_PTYS=y |
846 | CONFIG_LEGACY_PTY_COUNT=256 | 766 | CONFIG_LEGACY_PTY_COUNT=256 |
847 | |||
848 | # | ||
849 | # IPMI | ||
850 | # | ||
851 | # CONFIG_IPMI_HANDLER is not set | 767 | # CONFIG_IPMI_HANDLER is not set |
852 | |||
853 | # | ||
854 | # Watchdog Cards | ||
855 | # | ||
856 | CONFIG_WATCHDOG=y | 768 | CONFIG_WATCHDOG=y |
857 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 769 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
858 | 770 | ||
@@ -864,20 +776,10 @@ CONFIG_INDYDOG=m | |||
864 | # CONFIG_HW_RANDOM is not set | 776 | # CONFIG_HW_RANDOM is not set |
865 | # CONFIG_RTC is not set | 777 | # CONFIG_RTC is not set |
866 | CONFIG_SGI_DS1286=m | 778 | CONFIG_SGI_DS1286=m |
867 | # CONFIG_GEN_RTC is not set | ||
868 | # CONFIG_DTLK is not set | ||
869 | # CONFIG_R3964 is not set | 779 | # CONFIG_R3964 is not set |
870 | CONFIG_RAW_DRIVER=m | 780 | CONFIG_RAW_DRIVER=m |
871 | CONFIG_MAX_RAW_DEVS=256 | 781 | CONFIG_MAX_RAW_DEVS=256 |
872 | |||
873 | # | ||
874 | # TPM devices | ||
875 | # | ||
876 | # CONFIG_TCG_TPM is not set | 782 | # CONFIG_TCG_TPM is not set |
877 | |||
878 | # | ||
879 | # I2C support | ||
880 | # | ||
881 | # CONFIG_I2C is not set | 783 | # CONFIG_I2C is not set |
882 | 784 | ||
883 | # | 785 | # |
@@ -885,32 +787,33 @@ CONFIG_MAX_RAW_DEVS=256 | |||
885 | # | 787 | # |
886 | # CONFIG_SPI is not set | 788 | # CONFIG_SPI is not set |
887 | # CONFIG_SPI_MASTER is not set | 789 | # CONFIG_SPI_MASTER is not set |
888 | |||
889 | # | ||
890 | # Dallas's 1-wire bus | ||
891 | # | ||
892 | # CONFIG_W1 is not set | 790 | # CONFIG_W1 is not set |
791 | # CONFIG_POWER_SUPPLY is not set | ||
792 | # CONFIG_HWMON is not set | ||
893 | 793 | ||
894 | # | 794 | # |
895 | # Hardware Monitoring support | 795 | # Multifunction device drivers |
896 | # | 796 | # |
897 | # CONFIG_HWMON is not set | 797 | # CONFIG_MFD_SM501 is not set |
898 | # CONFIG_HWMON_VID is not set | ||
899 | 798 | ||
900 | # | 799 | # |
901 | # Multimedia devices | 800 | # Multimedia devices |
902 | # | 801 | # |
903 | # CONFIG_VIDEO_DEV is not set | 802 | # CONFIG_VIDEO_DEV is not set |
803 | # CONFIG_DVB_CORE is not set | ||
804 | # CONFIG_DAB is not set | ||
904 | 805 | ||
905 | # | 806 | # |
906 | # Digital Video Broadcasting Devices | 807 | # Graphics support |
907 | # | 808 | # |
908 | # CONFIG_DVB is not set | 809 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
909 | 810 | ||
910 | # | 811 | # |
911 | # Graphics support | 812 | # Display device support |
912 | # | 813 | # |
913 | CONFIG_FIRMWARE_EDID=y | 814 | # CONFIG_DISPLAY_SUPPORT is not set |
815 | # CONFIG_VGASTATE is not set | ||
816 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
914 | # CONFIG_FB is not set | 817 | # CONFIG_FB is not set |
915 | 818 | ||
916 | # | 819 | # |
@@ -920,31 +823,20 @@ CONFIG_FIRMWARE_EDID=y | |||
920 | CONFIG_SGI_NEWPORT_CONSOLE=y | 823 | CONFIG_SGI_NEWPORT_CONSOLE=y |
921 | CONFIG_DUMMY_CONSOLE=y | 824 | CONFIG_DUMMY_CONSOLE=y |
922 | CONFIG_FONT_8x16=y | 825 | CONFIG_FONT_8x16=y |
923 | |||
924 | # | ||
925 | # Logo configuration | ||
926 | # | ||
927 | CONFIG_LOGO=y | 826 | CONFIG_LOGO=y |
928 | # CONFIG_LOGO_LINUX_MONO is not set | 827 | # CONFIG_LOGO_LINUX_MONO is not set |
929 | # CONFIG_LOGO_LINUX_VGA16 is not set | 828 | # CONFIG_LOGO_LINUX_VGA16 is not set |
930 | # CONFIG_LOGO_LINUX_CLUT224 is not set | 829 | # CONFIG_LOGO_LINUX_CLUT224 is not set |
931 | CONFIG_LOGO_SGI_CLUT224=y | 830 | CONFIG_LOGO_SGI_CLUT224=y |
932 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
933 | 831 | ||
934 | # | 832 | # |
935 | # Sound | 833 | # Sound |
936 | # | 834 | # |
937 | # CONFIG_SOUND is not set | 835 | # CONFIG_SOUND is not set |
938 | 836 | CONFIG_HID_SUPPORT=y | |
939 | # | ||
940 | # HID Devices | ||
941 | # | ||
942 | CONFIG_HID=y | 837 | CONFIG_HID=y |
943 | # CONFIG_HID_DEBUG is not set | 838 | # CONFIG_HID_DEBUG is not set |
944 | 839 | CONFIG_USB_SUPPORT=y | |
945 | # | ||
946 | # USB support | ||
947 | # | ||
948 | # CONFIG_USB_ARCH_HAS_HCD is not set | 840 | # CONFIG_USB_ARCH_HAS_HCD is not set |
949 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 841 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
950 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 842 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
@@ -957,36 +849,8 @@ CONFIG_HID=y | |||
957 | # USB Gadget Support | 849 | # USB Gadget Support |
958 | # | 850 | # |
959 | # CONFIG_USB_GADGET is not set | 851 | # CONFIG_USB_GADGET is not set |
960 | |||
961 | # | ||
962 | # MMC/SD Card support | ||
963 | # | ||
964 | # CONFIG_MMC is not set | 852 | # CONFIG_MMC is not set |
965 | |||
966 | # | ||
967 | # LED devices | ||
968 | # | ||
969 | # CONFIG_NEW_LEDS is not set | 853 | # CONFIG_NEW_LEDS is not set |
970 | |||
971 | # | ||
972 | # LED drivers | ||
973 | # | ||
974 | |||
975 | # | ||
976 | # LED Triggers | ||
977 | # | ||
978 | |||
979 | # | ||
980 | # InfiniBand support | ||
981 | # | ||
982 | |||
983 | # | ||
984 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
985 | # | ||
986 | |||
987 | # | ||
988 | # Real Time Clock | ||
989 | # | ||
990 | # CONFIG_RTC_CLASS is not set | 854 | # CONFIG_RTC_CLASS is not set |
991 | 855 | ||
992 | # | 856 | # |
@@ -1003,12 +867,9 @@ CONFIG_HID=y | |||
1003 | # | 867 | # |
1004 | 868 | ||
1005 | # | 869 | # |
1006 | # Auxiliary Display support | 870 | # Userspace I/O |
1007 | # | ||
1008 | |||
1009 | # | ||
1010 | # Virtualization | ||
1011 | # | 871 | # |
872 | # CONFIG_UIO is not set | ||
1012 | 873 | ||
1013 | # | 874 | # |
1014 | # File systems | 875 | # File systems |
@@ -1121,6 +982,7 @@ CONFIG_NFS_ACL_SUPPORT=m | |||
1121 | CONFIG_NFS_COMMON=y | 982 | CONFIG_NFS_COMMON=y |
1122 | CONFIG_SUNRPC=m | 983 | CONFIG_SUNRPC=m |
1123 | CONFIG_SUNRPC_GSS=m | 984 | CONFIG_SUNRPC_GSS=m |
985 | # CONFIG_SUNRPC_BIND34 is not set | ||
1124 | CONFIG_RPCSEC_GSS_KRB5=m | 986 | CONFIG_RPCSEC_GSS_KRB5=m |
1125 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 987 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1126 | CONFIG_SMB_FS=m | 988 | CONFIG_SMB_FS=m |
@@ -1136,7 +998,6 @@ CONFIG_CIFS=m | |||
1136 | CONFIG_CODA_FS=m | 998 | CONFIG_CODA_FS=m |
1137 | # CONFIG_CODA_FS_OLD_API is not set | 999 | # CONFIG_CODA_FS_OLD_API is not set |
1138 | # CONFIG_AFS_FS is not set | 1000 | # CONFIG_AFS_FS is not set |
1139 | # CONFIG_9P_FS is not set | ||
1140 | 1001 | ||
1141 | # | 1002 | # |
1142 | # Partition Types | 1003 | # Partition Types |
@@ -1158,6 +1019,7 @@ CONFIG_SGI_PARTITION=y | |||
1158 | # CONFIG_SUN_PARTITION is not set | 1019 | # CONFIG_SUN_PARTITION is not set |
1159 | # CONFIG_KARMA_PARTITION is not set | 1020 | # CONFIG_KARMA_PARTITION is not set |
1160 | # CONFIG_EFI_PARTITION is not set | 1021 | # CONFIG_EFI_PARTITION is not set |
1022 | # CONFIG_SYSV68_PARTITION is not set | ||
1161 | 1023 | ||
1162 | # | 1024 | # |
1163 | # Native Language Support | 1025 | # Native Language Support |
@@ -1207,8 +1069,6 @@ CONFIG_NLS_UTF8=m | |||
1207 | # Distributed Lock Manager | 1069 | # Distributed Lock Manager |
1208 | # | 1070 | # |
1209 | CONFIG_DLM=m | 1071 | CONFIG_DLM=m |
1210 | CONFIG_DLM_TCP=y | ||
1211 | # CONFIG_DLM_SCTP is not set | ||
1212 | # CONFIG_DLM_DEBUG is not set | 1072 | # CONFIG_DLM_DEBUG is not set |
1213 | 1073 | ||
1214 | # | 1074 | # |
@@ -1227,7 +1087,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1227 | # CONFIG_DEBUG_FS is not set | 1087 | # CONFIG_DEBUG_FS is not set |
1228 | # CONFIG_HEADERS_CHECK is not set | 1088 | # CONFIG_HEADERS_CHECK is not set |
1229 | # CONFIG_DEBUG_KERNEL is not set | 1089 | # CONFIG_DEBUG_KERNEL is not set |
1230 | CONFIG_LOG_BUF_SHIFT=14 | ||
1231 | CONFIG_CROSSCOMPILE=y | 1090 | CONFIG_CROSSCOMPILE=y |
1232 | CONFIG_CMDLINE="" | 1091 | CONFIG_CMDLINE="" |
1233 | 1092 | ||
@@ -1237,12 +1096,9 @@ CONFIG_CMDLINE="" | |||
1237 | CONFIG_KEYS=y | 1096 | CONFIG_KEYS=y |
1238 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | 1097 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
1239 | # CONFIG_SECURITY is not set | 1098 | # CONFIG_SECURITY is not set |
1240 | |||
1241 | # | ||
1242 | # Cryptographic options | ||
1243 | # | ||
1244 | CONFIG_CRYPTO=y | 1099 | CONFIG_CRYPTO=y |
1245 | CONFIG_CRYPTO_ALGAPI=y | 1100 | CONFIG_CRYPTO_ALGAPI=y |
1101 | CONFIG_CRYPTO_ABLKCIPHER=m | ||
1246 | CONFIG_CRYPTO_BLKCIPHER=m | 1102 | CONFIG_CRYPTO_BLKCIPHER=m |
1247 | CONFIG_CRYPTO_HASH=y | 1103 | CONFIG_CRYPTO_HASH=y |
1248 | CONFIG_CRYPTO_MANAGER=y | 1104 | CONFIG_CRYPTO_MANAGER=y |
@@ -1261,6 +1117,7 @@ CONFIG_CRYPTO_ECB=m | |||
1261 | CONFIG_CRYPTO_CBC=m | 1117 | CONFIG_CRYPTO_CBC=m |
1262 | CONFIG_CRYPTO_PCBC=m | 1118 | CONFIG_CRYPTO_PCBC=m |
1263 | CONFIG_CRYPTO_LRW=m | 1119 | CONFIG_CRYPTO_LRW=m |
1120 | CONFIG_CRYPTO_CRYPTD=m | ||
1264 | CONFIG_CRYPTO_DES=m | 1121 | CONFIG_CRYPTO_DES=m |
1265 | CONFIG_CRYPTO_FCRYPT=m | 1122 | CONFIG_CRYPTO_FCRYPT=m |
1266 | CONFIG_CRYPTO_BLOWFISH=m | 1123 | CONFIG_CRYPTO_BLOWFISH=m |
@@ -1279,10 +1136,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=m | |||
1279 | CONFIG_CRYPTO_CRC32C=m | 1136 | CONFIG_CRYPTO_CRC32C=m |
1280 | CONFIG_CRYPTO_CAMELLIA=m | 1137 | CONFIG_CRYPTO_CAMELLIA=m |
1281 | # CONFIG_CRYPTO_TEST is not set | 1138 | # CONFIG_CRYPTO_TEST is not set |
1282 | 1139 | # CONFIG_CRYPTO_HW is not set | |
1283 | # | ||
1284 | # Hardware crypto devices | ||
1285 | # | ||
1286 | 1140 | ||
1287 | # | 1141 | # |
1288 | # Library routines | 1142 | # Library routines |
@@ -1290,7 +1144,9 @@ CONFIG_CRYPTO_CAMELLIA=m | |||
1290 | CONFIG_BITREVERSE=m | 1144 | CONFIG_BITREVERSE=m |
1291 | # CONFIG_CRC_CCITT is not set | 1145 | # CONFIG_CRC_CCITT is not set |
1292 | CONFIG_CRC16=m | 1146 | CONFIG_CRC16=m |
1147 | # CONFIG_CRC_ITU_T is not set | ||
1293 | CONFIG_CRC32=m | 1148 | CONFIG_CRC32=m |
1149 | # CONFIG_CRC7 is not set | ||
1294 | CONFIG_LIBCRC32C=m | 1150 | CONFIG_LIBCRC32C=m |
1295 | CONFIG_ZLIB_INFLATE=m | 1151 | CONFIG_ZLIB_INFLATE=m |
1296 | CONFIG_ZLIB_DEFLATE=m | 1152 | CONFIG_ZLIB_DEFLATE=m |
@@ -1301,3 +1157,4 @@ CONFIG_TEXTSEARCH_FSM=m | |||
1301 | CONFIG_PLIST=y | 1157 | CONFIG_PLIST=y |
1302 | CONFIG_HAS_IOMEM=y | 1158 | CONFIG_HAS_IOMEM=y |
1303 | CONFIG_HAS_IOPORT=y | 1159 | CONFIG_HAS_IOPORT=y |
1160 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig index eb35f7518d06..49bcc58929ba 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig | |||
@@ -1,66 +1,52 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.20 | 3 | # Linux kernel version: 2.6.23-rc2 |
4 | # Tue Feb 20 21:47:32 2007 | 4 | # Tue Aug 7 13:04:24 2007 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
8 | # | 8 | # |
9 | # Machine selection | 9 | # Machine selection |
10 | # | 10 | # |
11 | CONFIG_ZONE_DMA=y | 11 | # CONFIG_MACH_ALCHEMY is not set |
12 | # CONFIG_MIPS_MTX1 is not set | ||
13 | # CONFIG_MIPS_BOSPORUS is not set | ||
14 | # CONFIG_MIPS_PB1000 is not set | ||
15 | # CONFIG_MIPS_PB1100 is not set | ||
16 | # CONFIG_MIPS_PB1500 is not set | ||
17 | # CONFIG_MIPS_PB1550 is not set | ||
18 | # CONFIG_MIPS_PB1200 is not set | ||
19 | # CONFIG_MIPS_DB1000 is not set | ||
20 | # CONFIG_MIPS_DB1100 is not set | ||
21 | # CONFIG_MIPS_DB1500 is not set | ||
22 | # CONFIG_MIPS_DB1550 is not set | ||
23 | # CONFIG_MIPS_DB1200 is not set | ||
24 | # CONFIG_MIPS_MIRAGE is not set | ||
25 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
26 | # CONFIG_MIPS_COBALT is not set | 13 | # CONFIG_MIPS_COBALT is not set |
27 | # CONFIG_MACH_DECSTATION is not set | 14 | # CONFIG_MACH_DECSTATION is not set |
28 | # CONFIG_MACH_JAZZ is not set | 15 | # CONFIG_MACH_JAZZ is not set |
16 | # CONFIG_LEMOTE_FULONG is not set | ||
29 | # CONFIG_MIPS_ATLAS is not set | 17 | # CONFIG_MIPS_ATLAS is not set |
30 | # CONFIG_MIPS_MALTA is not set | 18 | # CONFIG_MIPS_MALTA is not set |
31 | # CONFIG_MIPS_SEAD is not set | 19 | # CONFIG_MIPS_SEAD is not set |
32 | # CONFIG_WR_PPMC is not set | ||
33 | # CONFIG_MIPS_SIM is not set | 20 | # CONFIG_MIPS_SIM is not set |
34 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 21 | # CONFIG_MARKEINS is not set |
35 | # CONFIG_MIPS_XXS1500 is not set | 22 | # CONFIG_MACH_VR41XX is not set |
36 | # CONFIG_PNX8550_JBS is not set | 23 | # CONFIG_PNX8550_JBS is not set |
37 | # CONFIG_PNX8550_STB810 is not set | 24 | # CONFIG_PNX8550_STB810 is not set |
38 | # CONFIG_MACH_VR41XX is not set | 25 | # CONFIG_PMC_MSP is not set |
39 | # CONFIG_PMC_YOSEMITE is not set | 26 | # CONFIG_PMC_YOSEMITE is not set |
40 | # CONFIG_QEMU is not set | 27 | # CONFIG_QEMU is not set |
41 | # CONFIG_MARKEINS is not set | ||
42 | # CONFIG_SGI_IP22 is not set | 28 | # CONFIG_SGI_IP22 is not set |
43 | CONFIG_SGI_IP27=y | 29 | CONFIG_SGI_IP27=y |
44 | # CONFIG_SGI_IP32 is not set | 30 | # CONFIG_SGI_IP32 is not set |
45 | # CONFIG_SIBYTE_BIGSUR is not set | 31 | # CONFIG_SIBYTE_CRHINE is not set |
32 | # CONFIG_SIBYTE_CARMEL is not set | ||
33 | # CONFIG_SIBYTE_CRHONE is not set | ||
34 | # CONFIG_SIBYTE_RHONE is not set | ||
46 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | ||
49 | # CONFIG_SIBYTE_CARMEL is not set | ||
50 | # CONFIG_SIBYTE_PTSWARM is not set | 38 | # CONFIG_SIBYTE_PTSWARM is not set |
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 39 | # CONFIG_SIBYTE_BIGSUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | ||
53 | # CONFIG_SIBYTE_CRHONE is not set | ||
54 | # CONFIG_SNI_RM is not set | 40 | # CONFIG_SNI_RM is not set |
55 | # CONFIG_TOSHIBA_JMR3927 is not set | 41 | # CONFIG_TOSHIBA_JMR3927 is not set |
56 | # CONFIG_TOSHIBA_RBTX4927 is not set | 42 | # CONFIG_TOSHIBA_RBTX4927 is not set |
57 | # CONFIG_TOSHIBA_RBTX4938 is not set | 43 | # CONFIG_TOSHIBA_RBTX4938 is not set |
44 | # CONFIG_WR_PPMC is not set | ||
58 | CONFIG_SGI_SN_M_MODE=y | 45 | CONFIG_SGI_SN_M_MODE=y |
59 | # CONFIG_SGI_SN_N_MODE is not set | 46 | # CONFIG_SGI_SN_N_MODE is not set |
60 | # CONFIG_MAPPED_KERNEL is not set | 47 | # CONFIG_MAPPED_KERNEL is not set |
61 | # CONFIG_REPLICATE_KTEXT is not set | 48 | # CONFIG_REPLICATE_KTEXT is not set |
62 | # CONFIG_REPLICATE_EXHANDLERS is not set | 49 | # CONFIG_REPLICATE_EXHANDLERS is not set |
63 | CONFIG_EARLY_PRINTK=y | ||
64 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 50 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
65 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 51 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
66 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 52 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
@@ -72,6 +58,9 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
72 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 58 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
73 | CONFIG_ARC=y | 59 | CONFIG_ARC=y |
74 | CONFIG_DMA_IP27=y | 60 | CONFIG_DMA_IP27=y |
61 | CONFIG_EARLY_PRINTK=y | ||
62 | CONFIG_SYS_HAS_EARLY_PRINTK=y | ||
63 | # CONFIG_NO_IOPORT is not set | ||
75 | CONFIG_CPU_BIG_ENDIAN=y | 64 | CONFIG_CPU_BIG_ENDIAN=y |
76 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 65 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
77 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 66 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y |
@@ -82,6 +71,7 @@ CONFIG_BOOT_ELF64=y | |||
82 | # | 71 | # |
83 | # CPU selection | 72 | # CPU selection |
84 | # | 73 | # |
74 | # CONFIG_CPU_LOONGSON2 is not set | ||
85 | # CONFIG_CPU_MIPS32_R1 is not set | 75 | # CONFIG_CPU_MIPS32_R1 is not set |
86 | # CONFIG_CPU_MIPS32_R2 is not set | 76 | # CONFIG_CPU_MIPS32_R2 is not set |
87 | # CONFIG_CPU_MIPS64_R1 is not set | 77 | # CONFIG_CPU_MIPS64_R1 is not set |
@@ -119,7 +109,6 @@ CONFIG_CPU_HAS_PREFETCH=y | |||
119 | CONFIG_MIPS_MT_DISABLED=y | 109 | CONFIG_MIPS_MT_DISABLED=y |
120 | # CONFIG_MIPS_MT_SMP is not set | 110 | # CONFIG_MIPS_MT_SMP is not set |
121 | # CONFIG_MIPS_MT_SMTC is not set | 111 | # CONFIG_MIPS_MT_SMTC is not set |
122 | # CONFIG_MIPS_VPE_LOADER is not set | ||
123 | CONFIG_CPU_HAS_LLSC=y | 112 | CONFIG_CPU_HAS_LLSC=y |
124 | CONFIG_CPU_HAS_SYNC=y | 113 | CONFIG_CPU_HAS_SYNC=y |
125 | CONFIG_GENERIC_HARDIRQS=y | 114 | CONFIG_GENERIC_HARDIRQS=y |
@@ -141,7 +130,8 @@ CONFIG_NEED_MULTIPLE_NODES=y | |||
141 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 130 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
142 | CONFIG_MIGRATION=y | 131 | CONFIG_MIGRATION=y |
143 | CONFIG_RESOURCES_64BIT=y | 132 | CONFIG_RESOURCES_64BIT=y |
144 | CONFIG_ZONE_DMA_FLAG=1 | 133 | CONFIG_ZONE_DMA_FLAG=0 |
134 | CONFIG_VIRT_TO_BUS=y | ||
145 | CONFIG_SMP=y | 135 | CONFIG_SMP=y |
146 | CONFIG_SYS_SUPPORTS_SMP=y | 136 | CONFIG_SYS_SUPPORTS_SMP=y |
147 | CONFIG_NR_CPUS_DEFAULT_64=y | 137 | CONFIG_NR_CPUS_DEFAULT_64=y |
@@ -161,36 +151,34 @@ CONFIG_PREEMPT_NONE=y | |||
161 | CONFIG_PREEMPT_BKL=y | 151 | CONFIG_PREEMPT_BKL=y |
162 | # CONFIG_MIPS_INSANE_LARGE is not set | 152 | # CONFIG_MIPS_INSANE_LARGE is not set |
163 | # CONFIG_KEXEC is not set | 153 | # CONFIG_KEXEC is not set |
154 | CONFIG_SECCOMP=y | ||
164 | CONFIG_LOCKDEP_SUPPORT=y | 155 | CONFIG_LOCKDEP_SUPPORT=y |
165 | CONFIG_STACKTRACE_SUPPORT=y | 156 | CONFIG_STACKTRACE_SUPPORT=y |
166 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 157 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
167 | 158 | ||
168 | # | 159 | # |
169 | # Code maturity level options | 160 | # General setup |
170 | # | 161 | # |
171 | CONFIG_EXPERIMENTAL=y | 162 | CONFIG_EXPERIMENTAL=y |
172 | CONFIG_LOCK_KERNEL=y | 163 | CONFIG_LOCK_KERNEL=y |
173 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 164 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
174 | |||
175 | # | ||
176 | # General setup | ||
177 | # | ||
178 | CONFIG_LOCALVERSION="" | 165 | CONFIG_LOCALVERSION="" |
179 | CONFIG_LOCALVERSION_AUTO=y | 166 | CONFIG_LOCALVERSION_AUTO=y |
180 | CONFIG_SWAP=y | 167 | CONFIG_SWAP=y |
181 | CONFIG_SYSVIPC=y | 168 | CONFIG_SYSVIPC=y |
182 | # CONFIG_IPC_NS is not set | ||
183 | CONFIG_SYSVIPC_SYSCTL=y | 169 | CONFIG_SYSVIPC_SYSCTL=y |
184 | CONFIG_POSIX_MQUEUE=y | 170 | CONFIG_POSIX_MQUEUE=y |
185 | # CONFIG_BSD_PROCESS_ACCT is not set | 171 | # CONFIG_BSD_PROCESS_ACCT is not set |
186 | # CONFIG_TASKSTATS is not set | 172 | # CONFIG_TASKSTATS is not set |
187 | # CONFIG_UTS_NS is not set | 173 | # CONFIG_USER_NS is not set |
188 | # CONFIG_AUDIT is not set | 174 | # CONFIG_AUDIT is not set |
189 | CONFIG_IKCONFIG=y | 175 | CONFIG_IKCONFIG=y |
190 | CONFIG_IKCONFIG_PROC=y | 176 | CONFIG_IKCONFIG_PROC=y |
177 | CONFIG_LOG_BUF_SHIFT=15 | ||
191 | CONFIG_CPUSETS=y | 178 | CONFIG_CPUSETS=y |
192 | CONFIG_SYSFS_DEPRECATED=y | 179 | CONFIG_SYSFS_DEPRECATED=y |
193 | CONFIG_RELAY=y | 180 | CONFIG_RELAY=y |
181 | # CONFIG_BLK_DEV_INITRD is not set | ||
194 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 182 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
195 | CONFIG_SYSCTL=y | 183 | CONFIG_SYSCTL=y |
196 | CONFIG_EMBEDDED=y | 184 | CONFIG_EMBEDDED=y |
@@ -203,18 +191,19 @@ CONFIG_BUG=y | |||
203 | CONFIG_ELF_CORE=y | 191 | CONFIG_ELF_CORE=y |
204 | CONFIG_BASE_FULL=y | 192 | CONFIG_BASE_FULL=y |
205 | CONFIG_FUTEX=y | 193 | CONFIG_FUTEX=y |
194 | CONFIG_ANON_INODES=y | ||
206 | CONFIG_EPOLL=y | 195 | CONFIG_EPOLL=y |
196 | CONFIG_SIGNALFD=y | ||
197 | CONFIG_TIMERFD=y | ||
198 | CONFIG_EVENTFD=y | ||
207 | CONFIG_SHMEM=y | 199 | CONFIG_SHMEM=y |
208 | CONFIG_SLAB=y | ||
209 | CONFIG_VM_EVENT_COUNTERS=y | 200 | CONFIG_VM_EVENT_COUNTERS=y |
201 | CONFIG_SLAB=y | ||
202 | # CONFIG_SLUB is not set | ||
203 | # CONFIG_SLOB is not set | ||
210 | CONFIG_RT_MUTEXES=y | 204 | CONFIG_RT_MUTEXES=y |
211 | # CONFIG_TINY_SHMEM is not set | 205 | # CONFIG_TINY_SHMEM is not set |
212 | CONFIG_BASE_SMALL=0 | 206 | CONFIG_BASE_SMALL=0 |
213 | # CONFIG_SLOB is not set | ||
214 | |||
215 | # | ||
216 | # Loadable module support | ||
217 | # | ||
218 | CONFIG_MODULES=y | 207 | CONFIG_MODULES=y |
219 | CONFIG_MODULE_UNLOAD=y | 208 | CONFIG_MODULE_UNLOAD=y |
220 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 209 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
@@ -222,12 +211,9 @@ CONFIG_MODULE_UNLOAD=y | |||
222 | CONFIG_MODULE_SRCVERSION_ALL=y | 211 | CONFIG_MODULE_SRCVERSION_ALL=y |
223 | CONFIG_KMOD=y | 212 | CONFIG_KMOD=y |
224 | CONFIG_STOP_MACHINE=y | 213 | CONFIG_STOP_MACHINE=y |
225 | |||
226 | # | ||
227 | # Block layer | ||
228 | # | ||
229 | CONFIG_BLOCK=y | 214 | CONFIG_BLOCK=y |
230 | # CONFIG_BLK_DEV_IO_TRACE is not set | 215 | # CONFIG_BLK_DEV_IO_TRACE is not set |
216 | # CONFIG_BLK_DEV_BSG is not set | ||
231 | 217 | ||
232 | # | 218 | # |
233 | # IO Schedulers | 219 | # IO Schedulers |
@@ -248,16 +234,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
248 | CONFIG_HW_HAS_PCI=y | 234 | CONFIG_HW_HAS_PCI=y |
249 | CONFIG_PCI=y | 235 | CONFIG_PCI=y |
250 | CONFIG_PCI_DOMAINS=y | 236 | CONFIG_PCI_DOMAINS=y |
237 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
251 | CONFIG_MMU=y | 238 | CONFIG_MMU=y |
252 | 239 | ||
253 | # | 240 | # |
254 | # PCCARD (PCMCIA/CardBus) support | 241 | # PCCARD (PCMCIA/CardBus) support |
255 | # | 242 | # |
256 | # CONFIG_PCCARD is not set | 243 | # CONFIG_PCCARD is not set |
257 | |||
258 | # | ||
259 | # PCI Hotplug Support | ||
260 | # | ||
261 | # CONFIG_HOTPLUG_PCI is not set | 244 | # CONFIG_HOTPLUG_PCI is not set |
262 | 245 | ||
263 | # | 246 | # |
@@ -279,7 +262,6 @@ CONFIG_BINFMT_ELF32=y | |||
279 | CONFIG_PM=y | 262 | CONFIG_PM=y |
280 | # CONFIG_PM_LEGACY is not set | 263 | # CONFIG_PM_LEGACY is not set |
281 | # CONFIG_PM_DEBUG is not set | 264 | # CONFIG_PM_DEBUG is not set |
282 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
283 | 265 | ||
284 | # | 266 | # |
285 | # Networking | 267 | # Networking |
@@ -289,7 +271,6 @@ CONFIG_NET=y | |||
289 | # | 271 | # |
290 | # Networking options | 272 | # Networking options |
291 | # | 273 | # |
292 | # CONFIG_NETDEBUG is not set | ||
293 | CONFIG_PACKET=y | 274 | CONFIG_PACKET=y |
294 | CONFIG_PACKET_MMAP=y | 275 | CONFIG_PACKET_MMAP=y |
295 | CONFIG_UNIX=y | 276 | CONFIG_UNIX=y |
@@ -331,20 +312,13 @@ CONFIG_TCP_MD5SIG=y | |||
331 | # CONFIG_INET6_TUNNEL is not set | 312 | # CONFIG_INET6_TUNNEL is not set |
332 | CONFIG_NETWORK_SECMARK=y | 313 | CONFIG_NETWORK_SECMARK=y |
333 | # CONFIG_NETFILTER is not set | 314 | # CONFIG_NETFILTER is not set |
334 | |||
335 | # | ||
336 | # DCCP Configuration (EXPERIMENTAL) | ||
337 | # | ||
338 | # CONFIG_IP_DCCP is not set | 315 | # CONFIG_IP_DCCP is not set |
339 | 316 | CONFIG_IP_SCTP=m | |
340 | # | 317 | # CONFIG_SCTP_DBG_MSG is not set |
341 | # SCTP Configuration (EXPERIMENTAL) | 318 | # CONFIG_SCTP_DBG_OBJCNT is not set |
342 | # | 319 | # CONFIG_SCTP_HMAC_NONE is not set |
343 | # CONFIG_IP_SCTP is not set | 320 | # CONFIG_SCTP_HMAC_SHA1 is not set |
344 | 321 | CONFIG_SCTP_HMAC_MD5=y | |
345 | # | ||
346 | # TIPC Configuration (EXPERIMENTAL) | ||
347 | # | ||
348 | # CONFIG_TIPC is not set | 322 | # CONFIG_TIPC is not set |
349 | # CONFIG_ATM is not set | 323 | # CONFIG_ATM is not set |
350 | # CONFIG_BRIDGE is not set | 324 | # CONFIG_BRIDGE is not set |
@@ -363,9 +337,6 @@ CONFIG_NETWORK_SECMARK=y | |||
363 | # | 337 | # |
364 | CONFIG_NET_SCHED=y | 338 | CONFIG_NET_SCHED=y |
365 | CONFIG_NET_SCH_FIFO=y | 339 | CONFIG_NET_SCH_FIFO=y |
366 | # CONFIG_NET_SCH_CLK_JIFFIES is not set | ||
367 | CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y | ||
368 | # CONFIG_NET_SCH_CLK_CPU is not set | ||
369 | 340 | ||
370 | # | 341 | # |
371 | # Queueing/Scheduling | 342 | # Queueing/Scheduling |
@@ -374,6 +345,7 @@ CONFIG_NET_SCH_CBQ=m | |||
374 | CONFIG_NET_SCH_HTB=m | 345 | CONFIG_NET_SCH_HTB=m |
375 | CONFIG_NET_SCH_HFSC=m | 346 | CONFIG_NET_SCH_HFSC=m |
376 | CONFIG_NET_SCH_PRIO=m | 347 | CONFIG_NET_SCH_PRIO=m |
348 | CONFIG_NET_SCH_RR=m | ||
377 | CONFIG_NET_SCH_RED=m | 349 | CONFIG_NET_SCH_RED=m |
378 | CONFIG_NET_SCH_SFQ=m | 350 | CONFIG_NET_SCH_SFQ=m |
379 | CONFIG_NET_SCH_TEQL=m | 351 | CONFIG_NET_SCH_TEQL=m |
@@ -398,10 +370,15 @@ CONFIG_CLS_U32_MARK=y | |||
398 | CONFIG_NET_CLS_RSVP=m | 370 | CONFIG_NET_CLS_RSVP=m |
399 | CONFIG_NET_CLS_RSVP6=m | 371 | CONFIG_NET_CLS_RSVP6=m |
400 | # CONFIG_NET_EMATCH is not set | 372 | # CONFIG_NET_EMATCH is not set |
401 | # CONFIG_NET_CLS_ACT is not set | 373 | CONFIG_NET_CLS_ACT=y |
374 | CONFIG_NET_ACT_POLICE=y | ||
375 | CONFIG_NET_ACT_GACT=m | ||
376 | CONFIG_GACT_PROB=y | ||
377 | CONFIG_NET_ACT_MIRRED=m | ||
378 | CONFIG_NET_ACT_PEDIT=m | ||
379 | # CONFIG_NET_ACT_SIMP is not set | ||
402 | CONFIG_NET_CLS_POLICE=y | 380 | CONFIG_NET_CLS_POLICE=y |
403 | # CONFIG_NET_CLS_IND is not set | 381 | # CONFIG_NET_CLS_IND is not set |
404 | CONFIG_NET_ESTIMATOR=y | ||
405 | 382 | ||
406 | # | 383 | # |
407 | # Network testing | 384 | # Network testing |
@@ -410,13 +387,24 @@ CONFIG_NET_ESTIMATOR=y | |||
410 | # CONFIG_HAMRADIO is not set | 387 | # CONFIG_HAMRADIO is not set |
411 | # CONFIG_IRDA is not set | 388 | # CONFIG_IRDA is not set |
412 | # CONFIG_BT is not set | 389 | # CONFIG_BT is not set |
390 | # CONFIG_AF_RXRPC is not set | ||
391 | |||
392 | # | ||
393 | # Wireless | ||
394 | # | ||
395 | CONFIG_CFG80211=m | ||
396 | CONFIG_WIRELESS_EXT=y | ||
397 | CONFIG_MAC80211=m | ||
398 | # CONFIG_MAC80211_DEBUG is not set | ||
413 | CONFIG_IEEE80211=m | 399 | CONFIG_IEEE80211=m |
414 | # CONFIG_IEEE80211_DEBUG is not set | 400 | # CONFIG_IEEE80211_DEBUG is not set |
415 | CONFIG_IEEE80211_CRYPT_WEP=m | 401 | CONFIG_IEEE80211_CRYPT_WEP=m |
416 | CONFIG_IEEE80211_CRYPT_CCMP=m | 402 | CONFIG_IEEE80211_CRYPT_CCMP=m |
403 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
417 | CONFIG_IEEE80211_SOFTMAC=m | 404 | CONFIG_IEEE80211_SOFTMAC=m |
418 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | 405 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set |
419 | CONFIG_WIRELESS_EXT=y | 406 | CONFIG_RFKILL=m |
407 | # CONFIG_NET_9P is not set | ||
420 | 408 | ||
421 | # | 409 | # |
422 | # Device Drivers | 410 | # Device Drivers |
@@ -429,30 +417,10 @@ CONFIG_STANDALONE=y | |||
429 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 417 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
430 | CONFIG_FW_LOADER=y | 418 | CONFIG_FW_LOADER=y |
431 | # CONFIG_SYS_HYPERVISOR is not set | 419 | # CONFIG_SYS_HYPERVISOR is not set |
432 | |||
433 | # | ||
434 | # Connector - unified userspace <-> kernelspace linker | ||
435 | # | ||
436 | CONFIG_CONNECTOR=m | 420 | CONFIG_CONNECTOR=m |
437 | |||
438 | # | ||
439 | # Memory Technology Devices (MTD) | ||
440 | # | ||
441 | # CONFIG_MTD is not set | 421 | # CONFIG_MTD is not set |
442 | |||
443 | # | ||
444 | # Parallel port support | ||
445 | # | ||
446 | # CONFIG_PARPORT is not set | 422 | # CONFIG_PARPORT is not set |
447 | 423 | CONFIG_BLK_DEV=y | |
448 | # | ||
449 | # Plug and Play support | ||
450 | # | ||
451 | # CONFIG_PNPACPI is not set | ||
452 | |||
453 | # | ||
454 | # Block devices | ||
455 | # | ||
456 | # CONFIG_BLK_CPQ_DA is not set | 424 | # CONFIG_BLK_CPQ_DA is not set |
457 | # CONFIG_BLK_CPQ_CISS_DA is not set | 425 | # CONFIG_BLK_CPQ_CISS_DA is not set |
458 | # CONFIG_BLK_DEV_DAC960 is not set | 426 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -463,21 +431,11 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m | |||
463 | # CONFIG_BLK_DEV_NBD is not set | 431 | # CONFIG_BLK_DEV_NBD is not set |
464 | # CONFIG_BLK_DEV_SX8 is not set | 432 | # CONFIG_BLK_DEV_SX8 is not set |
465 | # CONFIG_BLK_DEV_RAM is not set | 433 | # CONFIG_BLK_DEV_RAM is not set |
466 | # CONFIG_BLK_DEV_INITRD is not set | ||
467 | CONFIG_CDROM_PKTCDVD=m | 434 | CONFIG_CDROM_PKTCDVD=m |
468 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 435 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
469 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 436 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
470 | CONFIG_ATA_OVER_ETH=m | 437 | CONFIG_ATA_OVER_ETH=m |
471 | 438 | # CONFIG_MISC_DEVICES is not set | |
472 | # | ||
473 | # Misc devices | ||
474 | # | ||
475 | CONFIG_SGI_IOC4=m | ||
476 | # CONFIG_TIFM_CORE is not set | ||
477 | |||
478 | # | ||
479 | # ATA/ATAPI/MFM/RLL support | ||
480 | # | ||
481 | # CONFIG_IDE is not set | 439 | # CONFIG_IDE is not set |
482 | 440 | ||
483 | # | 441 | # |
@@ -485,6 +443,7 @@ CONFIG_SGI_IOC4=m | |||
485 | # | 443 | # |
486 | CONFIG_RAID_ATTRS=m | 444 | CONFIG_RAID_ATTRS=m |
487 | CONFIG_SCSI=y | 445 | CONFIG_SCSI=y |
446 | CONFIG_SCSI_DMA=y | ||
488 | CONFIG_SCSI_TGT=m | 447 | CONFIG_SCSI_TGT=m |
489 | CONFIG_SCSI_NETLINK=y | 448 | CONFIG_SCSI_NETLINK=y |
490 | CONFIG_SCSI_PROC_FS=y | 449 | CONFIG_SCSI_PROC_FS=y |
@@ -507,6 +466,7 @@ CONFIG_CHR_DEV_SCH=m | |||
507 | CONFIG_SCSI_CONSTANTS=y | 466 | CONFIG_SCSI_CONSTANTS=y |
508 | CONFIG_SCSI_LOGGING=y | 467 | CONFIG_SCSI_LOGGING=y |
509 | CONFIG_SCSI_SCAN_ASYNC=y | 468 | CONFIG_SCSI_SCAN_ASYNC=y |
469 | CONFIG_SCSI_WAIT_SCAN=m | ||
510 | 470 | ||
511 | # | 471 | # |
512 | # SCSI Transports | 472 | # SCSI Transports |
@@ -517,10 +477,7 @@ CONFIG_SCSI_ISCSI_ATTRS=m | |||
517 | CONFIG_SCSI_SAS_ATTRS=m | 477 | CONFIG_SCSI_SAS_ATTRS=m |
518 | CONFIG_SCSI_SAS_LIBSAS=m | 478 | CONFIG_SCSI_SAS_LIBSAS=m |
519 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | 479 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set |
520 | 480 | CONFIG_SCSI_LOWLEVEL=y | |
521 | # | ||
522 | # SCSI low-level drivers | ||
523 | # | ||
524 | # CONFIG_ISCSI_TCP is not set | 481 | # CONFIG_ISCSI_TCP is not set |
525 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 482 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
526 | # CONFIG_SCSI_3W_9XXX is not set | 483 | # CONFIG_SCSI_3W_9XXX is not set |
@@ -551,15 +508,7 @@ CONFIG_SCSI_QLOGIC_1280=y | |||
551 | # CONFIG_SCSI_DC390T is not set | 508 | # CONFIG_SCSI_DC390T is not set |
552 | # CONFIG_SCSI_DEBUG is not set | 509 | # CONFIG_SCSI_DEBUG is not set |
553 | # CONFIG_SCSI_SRP is not set | 510 | # CONFIG_SCSI_SRP is not set |
554 | |||
555 | # | ||
556 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
557 | # | ||
558 | # CONFIG_ATA is not set | 511 | # CONFIG_ATA is not set |
559 | |||
560 | # | ||
561 | # Multi-device support (RAID and LVM) | ||
562 | # | ||
563 | CONFIG_MD=y | 512 | CONFIG_MD=y |
564 | CONFIG_BLK_DEV_MD=y | 513 | CONFIG_BLK_DEV_MD=y |
565 | CONFIG_MD_LINEAR=m | 514 | CONFIG_MD_LINEAR=m |
@@ -578,6 +527,8 @@ CONFIG_DM_MIRROR=m | |||
578 | CONFIG_DM_ZERO=m | 527 | CONFIG_DM_ZERO=m |
579 | CONFIG_DM_MULTIPATH=m | 528 | CONFIG_DM_MULTIPATH=m |
580 | CONFIG_DM_MULTIPATH_EMC=m | 529 | CONFIG_DM_MULTIPATH_EMC=m |
530 | CONFIG_DM_MULTIPATH_RDAC=m | ||
531 | # CONFIG_DM_DELAY is not set | ||
581 | 532 | ||
582 | # | 533 | # |
583 | # Fusion MPT device support | 534 | # Fusion MPT device support |
@@ -590,30 +541,18 @@ CONFIG_DM_MULTIPATH_EMC=m | |||
590 | # | 541 | # |
591 | # IEEE 1394 (FireWire) support | 542 | # IEEE 1394 (FireWire) support |
592 | # | 543 | # |
544 | # CONFIG_FIREWIRE is not set | ||
593 | # CONFIG_IEEE1394 is not set | 545 | # CONFIG_IEEE1394 is not set |
594 | |||
595 | # | ||
596 | # I2O device support | ||
597 | # | ||
598 | # CONFIG_I2O is not set | 546 | # CONFIG_I2O is not set |
599 | |||
600 | # | ||
601 | # Network device support | ||
602 | # | ||
603 | CONFIG_NETDEVICES=y | 547 | CONFIG_NETDEVICES=y |
548 | CONFIG_NETDEVICES_MULTIQUEUE=y | ||
549 | CONFIG_IFB=m | ||
604 | # CONFIG_DUMMY is not set | 550 | # CONFIG_DUMMY is not set |
605 | # CONFIG_BONDING is not set | 551 | # CONFIG_BONDING is not set |
552 | CONFIG_MACVLAN=m | ||
606 | # CONFIG_EQUALIZER is not set | 553 | # CONFIG_EQUALIZER is not set |
607 | # CONFIG_TUN is not set | 554 | # CONFIG_TUN is not set |
608 | |||
609 | # | ||
610 | # ARCnet devices | ||
611 | # | ||
612 | # CONFIG_ARCNET is not set | 555 | # CONFIG_ARCNET is not set |
613 | |||
614 | # | ||
615 | # PHY device support | ||
616 | # | ||
617 | CONFIG_PHYLIB=m | 556 | CONFIG_PHYLIB=m |
618 | 557 | ||
619 | # | 558 | # |
@@ -627,30 +566,21 @@ CONFIG_CICADA_PHY=m | |||
627 | CONFIG_VITESSE_PHY=m | 566 | CONFIG_VITESSE_PHY=m |
628 | CONFIG_SMSC_PHY=m | 567 | CONFIG_SMSC_PHY=m |
629 | # CONFIG_BROADCOM_PHY is not set | 568 | # CONFIG_BROADCOM_PHY is not set |
569 | CONFIG_ICPLUS_PHY=m | ||
630 | # CONFIG_FIXED_PHY is not set | 570 | # CONFIG_FIXED_PHY is not set |
631 | |||
632 | # | ||
633 | # Ethernet (10 or 100Mbit) | ||
634 | # | ||
635 | CONFIG_NET_ETHERNET=y | 571 | CONFIG_NET_ETHERNET=y |
636 | CONFIG_MII=y | 572 | CONFIG_MII=y |
573 | CONFIG_AX88796=m | ||
637 | CONFIG_SGI_IOC3_ETH=y | 574 | CONFIG_SGI_IOC3_ETH=y |
638 | # CONFIG_HAPPYMEAL is not set | 575 | # CONFIG_HAPPYMEAL is not set |
639 | # CONFIG_SUNGEM is not set | 576 | # CONFIG_SUNGEM is not set |
640 | # CONFIG_CASSINI is not set | 577 | # CONFIG_CASSINI is not set |
641 | # CONFIG_NET_VENDOR_3COM is not set | 578 | # CONFIG_NET_VENDOR_3COM is not set |
642 | # CONFIG_DM9000 is not set | 579 | # CONFIG_DM9000 is not set |
643 | |||
644 | # | ||
645 | # Tulip family network device support | ||
646 | # | ||
647 | # CONFIG_NET_TULIP is not set | 580 | # CONFIG_NET_TULIP is not set |
648 | # CONFIG_HP100 is not set | 581 | # CONFIG_HP100 is not set |
649 | # CONFIG_NET_PCI is not set | 582 | # CONFIG_NET_PCI is not set |
650 | 583 | CONFIG_NETDEV_1000=y | |
651 | # | ||
652 | # Ethernet (1000 Mbit) | ||
653 | # | ||
654 | # CONFIG_ACENIC is not set | 584 | # CONFIG_ACENIC is not set |
655 | # CONFIG_DL2K is not set | 585 | # CONFIG_DL2K is not set |
656 | # CONFIG_E1000 is not set | 586 | # CONFIG_E1000 is not set |
@@ -661,35 +591,57 @@ CONFIG_SGI_IOC3_ETH=y | |||
661 | # CONFIG_SIS190 is not set | 591 | # CONFIG_SIS190 is not set |
662 | # CONFIG_SKGE is not set | 592 | # CONFIG_SKGE is not set |
663 | # CONFIG_SKY2 is not set | 593 | # CONFIG_SKY2 is not set |
664 | # CONFIG_SK98LIN is not set | 594 | CONFIG_VIA_VELOCITY=m |
665 | # CONFIG_TIGON3 is not set | 595 | # CONFIG_TIGON3 is not set |
666 | # CONFIG_BNX2 is not set | 596 | # CONFIG_BNX2 is not set |
667 | CONFIG_QLA3XXX=m | 597 | CONFIG_QLA3XXX=m |
668 | # CONFIG_ATL1 is not set | 598 | # CONFIG_ATL1 is not set |
669 | 599 | CONFIG_NETDEV_10000=y | |
670 | # | ||
671 | # Ethernet (10000 Mbit) | ||
672 | # | ||
673 | # CONFIG_CHELSIO_T1 is not set | 600 | # CONFIG_CHELSIO_T1 is not set |
674 | CONFIG_CHELSIO_T3=m | 601 | CONFIG_CHELSIO_T3=m |
675 | # CONFIG_IXGB is not set | 602 | # CONFIG_IXGB is not set |
676 | # CONFIG_S2IO is not set | 603 | # CONFIG_S2IO is not set |
677 | # CONFIG_MYRI10GE is not set | 604 | # CONFIG_MYRI10GE is not set |
678 | CONFIG_NETXEN_NIC=m | 605 | CONFIG_NETXEN_NIC=m |
679 | 606 | # CONFIG_MLX4_CORE is not set | |
680 | # | ||
681 | # Token Ring devices | ||
682 | # | ||
683 | # CONFIG_TR is not set | 607 | # CONFIG_TR is not set |
684 | 608 | ||
685 | # | 609 | # |
686 | # Wireless LAN (non-hamradio) | 610 | # Wireless LAN |
687 | # | 611 | # |
688 | # CONFIG_NET_RADIO is not set | 612 | # CONFIG_WLAN_PRE80211 is not set |
689 | 613 | CONFIG_WLAN_80211=y | |
690 | # | 614 | CONFIG_IPW2100=m |
691 | # Wan interfaces | 615 | CONFIG_IPW2100_MONITOR=y |
692 | # | 616 | CONFIG_IPW2100_DEBUG=y |
617 | CONFIG_IPW2200=m | ||
618 | CONFIG_IPW2200_MONITOR=y | ||
619 | CONFIG_IPW2200_RADIOTAP=y | ||
620 | CONFIG_IPW2200_PROMISCUOUS=y | ||
621 | CONFIG_IPW2200_QOS=y | ||
622 | CONFIG_IPW2200_DEBUG=y | ||
623 | CONFIG_LIBERTAS=m | ||
624 | # CONFIG_LIBERTAS_DEBUG is not set | ||
625 | CONFIG_HERMES=m | ||
626 | CONFIG_PLX_HERMES=m | ||
627 | CONFIG_TMD_HERMES=m | ||
628 | CONFIG_NORTEL_HERMES=m | ||
629 | CONFIG_PCI_HERMES=m | ||
630 | CONFIG_ATMEL=m | ||
631 | CONFIG_PCI_ATMEL=m | ||
632 | CONFIG_PRISM54=m | ||
633 | CONFIG_HOSTAP=m | ||
634 | CONFIG_HOSTAP_FIRMWARE=y | ||
635 | CONFIG_HOSTAP_FIRMWARE_NVRAM=y | ||
636 | CONFIG_HOSTAP_PLX=m | ||
637 | CONFIG_HOSTAP_PCI=m | ||
638 | CONFIG_BCM43XX=m | ||
639 | CONFIG_BCM43XX_DEBUG=y | ||
640 | CONFIG_BCM43XX_DMA=y | ||
641 | CONFIG_BCM43XX_PIO=y | ||
642 | CONFIG_BCM43XX_DMA_AND_PIO_MODE=y | ||
643 | # CONFIG_BCM43XX_DMA_MODE is not set | ||
644 | # CONFIG_BCM43XX_PIO_MODE is not set | ||
693 | # CONFIG_WAN is not set | 645 | # CONFIG_WAN is not set |
694 | # CONFIG_FDDI is not set | 646 | # CONFIG_FDDI is not set |
695 | # CONFIG_HIPPI is not set | 647 | # CONFIG_HIPPI is not set |
@@ -700,15 +652,7 @@ CONFIG_NETXEN_NIC=m | |||
700 | # CONFIG_NETCONSOLE is not set | 652 | # CONFIG_NETCONSOLE is not set |
701 | # CONFIG_NETPOLL is not set | 653 | # CONFIG_NETPOLL is not set |
702 | # CONFIG_NET_POLL_CONTROLLER is not set | 654 | # CONFIG_NET_POLL_CONTROLLER is not set |
703 | |||
704 | # | ||
705 | # ISDN subsystem | ||
706 | # | ||
707 | # CONFIG_ISDN is not set | 655 | # CONFIG_ISDN is not set |
708 | |||
709 | # | ||
710 | # Telephony Support | ||
711 | # | ||
712 | # CONFIG_PHONE is not set | 656 | # CONFIG_PHONE is not set |
713 | 657 | ||
714 | # | 658 | # |
@@ -756,34 +700,17 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
756 | CONFIG_UNIX98_PTYS=y | 700 | CONFIG_UNIX98_PTYS=y |
757 | CONFIG_LEGACY_PTYS=y | 701 | CONFIG_LEGACY_PTYS=y |
758 | CONFIG_LEGACY_PTY_COUNT=256 | 702 | CONFIG_LEGACY_PTY_COUNT=256 |
759 | |||
760 | # | ||
761 | # IPMI | ||
762 | # | ||
763 | # CONFIG_IPMI_HANDLER is not set | 703 | # CONFIG_IPMI_HANDLER is not set |
764 | |||
765 | # | ||
766 | # Watchdog Cards | ||
767 | # | ||
768 | # CONFIG_WATCHDOG is not set | 704 | # CONFIG_WATCHDOG is not set |
769 | # CONFIG_HW_RANDOM is not set | 705 | CONFIG_HW_RANDOM=m |
770 | # CONFIG_RTC is not set | 706 | # CONFIG_RTC is not set |
771 | CONFIG_SGI_IP27_RTC=y | 707 | CONFIG_SGI_IP27_RTC=y |
772 | # CONFIG_GEN_RTC is not set | ||
773 | # CONFIG_DTLK is not set | ||
774 | # CONFIG_R3964 is not set | 708 | # CONFIG_R3964 is not set |
775 | # CONFIG_APPLICOM is not set | 709 | # CONFIG_APPLICOM is not set |
776 | # CONFIG_DRM is not set | 710 | # CONFIG_DRM is not set |
777 | # CONFIG_RAW_DRIVER is not set | 711 | # CONFIG_RAW_DRIVER is not set |
778 | |||
779 | # | ||
780 | # TPM devices | ||
781 | # | ||
782 | # CONFIG_TCG_TPM is not set | 712 | # CONFIG_TCG_TPM is not set |
783 | 713 | CONFIG_DEVPORT=y | |
784 | # | ||
785 | # I2C support | ||
786 | # | ||
787 | # CONFIG_I2C is not set | 714 | # CONFIG_I2C is not set |
788 | 715 | ||
789 | # | 716 | # |
@@ -791,43 +718,40 @@ CONFIG_SGI_IP27_RTC=y | |||
791 | # | 718 | # |
792 | # CONFIG_SPI is not set | 719 | # CONFIG_SPI is not set |
793 | # CONFIG_SPI_MASTER is not set | 720 | # CONFIG_SPI_MASTER is not set |
794 | |||
795 | # | ||
796 | # Dallas's 1-wire bus | ||
797 | # | ||
798 | # CONFIG_W1 is not set | 721 | # CONFIG_W1 is not set |
722 | # CONFIG_POWER_SUPPLY is not set | ||
723 | # CONFIG_HWMON is not set | ||
799 | 724 | ||
800 | # | 725 | # |
801 | # Hardware Monitoring support | 726 | # Multifunction device drivers |
802 | # | 727 | # |
803 | # CONFIG_HWMON is not set | 728 | # CONFIG_MFD_SM501 is not set |
804 | # CONFIG_HWMON_VID is not set | ||
805 | 729 | ||
806 | # | 730 | # |
807 | # Multimedia devices | 731 | # Multimedia devices |
808 | # | 732 | # |
809 | # CONFIG_VIDEO_DEV is not set | 733 | # CONFIG_VIDEO_DEV is not set |
734 | # CONFIG_DVB_CORE is not set | ||
735 | # CONFIG_DAB is not set | ||
810 | 736 | ||
811 | # | 737 | # |
812 | # Digital Video Broadcasting Devices | 738 | # Graphics support |
813 | # | 739 | # |
814 | # CONFIG_DVB is not set | 740 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
815 | 741 | ||
816 | # | 742 | # |
817 | # Graphics support | 743 | # Display device support |
818 | # | 744 | # |
819 | # CONFIG_FIRMWARE_EDID is not set | 745 | # CONFIG_DISPLAY_SUPPORT is not set |
746 | # CONFIG_VGASTATE is not set | ||
747 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
820 | # CONFIG_FB is not set | 748 | # CONFIG_FB is not set |
821 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
822 | 749 | ||
823 | # | 750 | # |
824 | # Sound | 751 | # Sound |
825 | # | 752 | # |
826 | # CONFIG_SOUND is not set | 753 | # CONFIG_SOUND is not set |
827 | 754 | CONFIG_USB_SUPPORT=y | |
828 | # | ||
829 | # USB support | ||
830 | # | ||
831 | CONFIG_USB_ARCH_HAS_HCD=y | 755 | CONFIG_USB_ARCH_HAS_HCD=y |
832 | CONFIG_USB_ARCH_HAS_OHCI=y | 756 | CONFIG_USB_ARCH_HAS_OHCI=y |
833 | CONFIG_USB_ARCH_HAS_EHCI=y | 757 | CONFIG_USB_ARCH_HAS_EHCI=y |
@@ -841,37 +765,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
841 | # USB Gadget Support | 765 | # USB Gadget Support |
842 | # | 766 | # |
843 | # CONFIG_USB_GADGET is not set | 767 | # CONFIG_USB_GADGET is not set |
844 | |||
845 | # | ||
846 | # MMC/SD Card support | ||
847 | # | ||
848 | # CONFIG_MMC is not set | 768 | # CONFIG_MMC is not set |
849 | |||
850 | # | ||
851 | # LED devices | ||
852 | # | ||
853 | # CONFIG_NEW_LEDS is not set | 769 | # CONFIG_NEW_LEDS is not set |
854 | |||
855 | # | ||
856 | # LED drivers | ||
857 | # | ||
858 | |||
859 | # | ||
860 | # LED Triggers | ||
861 | # | ||
862 | |||
863 | # | ||
864 | # InfiniBand support | ||
865 | # | ||
866 | # CONFIG_INFINIBAND is not set | 770 | # CONFIG_INFINIBAND is not set |
867 | |||
868 | # | ||
869 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
870 | # | ||
871 | |||
872 | # | ||
873 | # Real Time Clock | ||
874 | # | ||
875 | # CONFIG_RTC_CLASS is not set | 771 | # CONFIG_RTC_CLASS is not set |
876 | 772 | ||
877 | # | 773 | # |
@@ -888,12 +784,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
888 | # | 784 | # |
889 | 785 | ||
890 | # | 786 | # |
891 | # Auxiliary Display support | 787 | # Userspace I/O |
892 | # | ||
893 | |||
894 | # | ||
895 | # Virtualization | ||
896 | # | 788 | # |
789 | CONFIG_UIO=y | ||
790 | # CONFIG_UIO_CIF is not set | ||
897 | 791 | ||
898 | # | 792 | # |
899 | # File systems | 793 | # File systems |
@@ -992,6 +886,7 @@ CONFIG_LOCKD_V4=y | |||
992 | CONFIG_NFS_COMMON=y | 886 | CONFIG_NFS_COMMON=y |
993 | CONFIG_SUNRPC=y | 887 | CONFIG_SUNRPC=y |
994 | CONFIG_SUNRPC_GSS=y | 888 | CONFIG_SUNRPC_GSS=y |
889 | # CONFIG_SUNRPC_BIND34 is not set | ||
995 | CONFIG_RPCSEC_GSS_KRB5=y | 890 | CONFIG_RPCSEC_GSS_KRB5=y |
996 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 891 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
997 | # CONFIG_SMB_FS is not set | 892 | # CONFIG_SMB_FS is not set |
@@ -999,7 +894,6 @@ CONFIG_RPCSEC_GSS_KRB5=y | |||
999 | # CONFIG_NCP_FS is not set | 894 | # CONFIG_NCP_FS is not set |
1000 | # CONFIG_CODA_FS is not set | 895 | # CONFIG_CODA_FS is not set |
1001 | # CONFIG_AFS_FS is not set | 896 | # CONFIG_AFS_FS is not set |
1002 | # CONFIG_9P_FS is not set | ||
1003 | 897 | ||
1004 | # | 898 | # |
1005 | # Partition Types | 899 | # Partition Types |
@@ -1021,6 +915,7 @@ CONFIG_SGI_PARTITION=y | |||
1021 | # CONFIG_SUN_PARTITION is not set | 915 | # CONFIG_SUN_PARTITION is not set |
1022 | # CONFIG_KARMA_PARTITION is not set | 916 | # CONFIG_KARMA_PARTITION is not set |
1023 | # CONFIG_EFI_PARTITION is not set | 917 | # CONFIG_EFI_PARTITION is not set |
918 | # CONFIG_SYSV68_PARTITION is not set | ||
1024 | 919 | ||
1025 | # | 920 | # |
1026 | # Native Language Support | 921 | # Native Language Support |
@@ -1031,8 +926,6 @@ CONFIG_SGI_PARTITION=y | |||
1031 | # Distributed Lock Manager | 926 | # Distributed Lock Manager |
1032 | # | 927 | # |
1033 | CONFIG_DLM=m | 928 | CONFIG_DLM=m |
1034 | CONFIG_DLM_TCP=y | ||
1035 | # CONFIG_DLM_SCTP is not set | ||
1036 | # CONFIG_DLM_DEBUG is not set | 929 | # CONFIG_DLM_DEBUG is not set |
1037 | 930 | ||
1038 | # | 931 | # |
@@ -1051,7 +944,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1051 | # CONFIG_DEBUG_FS is not set | 944 | # CONFIG_DEBUG_FS is not set |
1052 | # CONFIG_HEADERS_CHECK is not set | 945 | # CONFIG_HEADERS_CHECK is not set |
1053 | # CONFIG_DEBUG_KERNEL is not set | 946 | # CONFIG_DEBUG_KERNEL is not set |
1054 | CONFIG_LOG_BUF_SHIFT=15 | ||
1055 | CONFIG_CROSSCOMPILE=y | 947 | CONFIG_CROSSCOMPILE=y |
1056 | CONFIG_CMDLINE="" | 948 | CONFIG_CMDLINE="" |
1057 | CONFIG_SYS_SUPPORTS_KGDB=y | 949 | CONFIG_SYS_SUPPORTS_KGDB=y |
@@ -1062,12 +954,13 @@ CONFIG_SYS_SUPPORTS_KGDB=y | |||
1062 | CONFIG_KEYS=y | 954 | CONFIG_KEYS=y |
1063 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | 955 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
1064 | # CONFIG_SECURITY is not set | 956 | # CONFIG_SECURITY is not set |
1065 | 957 | CONFIG_XOR_BLOCKS=m | |
1066 | # | 958 | CONFIG_ASYNC_CORE=m |
1067 | # Cryptographic options | 959 | CONFIG_ASYNC_MEMCPY=m |
1068 | # | 960 | CONFIG_ASYNC_XOR=m |
1069 | CONFIG_CRYPTO=y | 961 | CONFIG_CRYPTO=y |
1070 | CONFIG_CRYPTO_ALGAPI=y | 962 | CONFIG_CRYPTO_ALGAPI=y |
963 | CONFIG_CRYPTO_ABLKCIPHER=m | ||
1071 | CONFIG_CRYPTO_BLKCIPHER=y | 964 | CONFIG_CRYPTO_BLKCIPHER=y |
1072 | CONFIG_CRYPTO_HASH=y | 965 | CONFIG_CRYPTO_HASH=y |
1073 | CONFIG_CRYPTO_MANAGER=y | 966 | CONFIG_CRYPTO_MANAGER=y |
@@ -1086,6 +979,7 @@ CONFIG_CRYPTO_ECB=m | |||
1086 | CONFIG_CRYPTO_CBC=y | 979 | CONFIG_CRYPTO_CBC=y |
1087 | CONFIG_CRYPTO_PCBC=m | 980 | CONFIG_CRYPTO_PCBC=m |
1088 | CONFIG_CRYPTO_LRW=m | 981 | CONFIG_CRYPTO_LRW=m |
982 | CONFIG_CRYPTO_CRYPTD=m | ||
1089 | CONFIG_CRYPTO_DES=y | 983 | CONFIG_CRYPTO_DES=y |
1090 | CONFIG_CRYPTO_FCRYPT=m | 984 | CONFIG_CRYPTO_FCRYPT=m |
1091 | CONFIG_CRYPTO_BLOWFISH=m | 985 | CONFIG_CRYPTO_BLOWFISH=m |
@@ -1104,21 +998,21 @@ CONFIG_CRYPTO_MICHAEL_MIC=m | |||
1104 | CONFIG_CRYPTO_CRC32C=m | 998 | CONFIG_CRYPTO_CRC32C=m |
1105 | CONFIG_CRYPTO_CAMELLIA=m | 999 | CONFIG_CRYPTO_CAMELLIA=m |
1106 | # CONFIG_CRYPTO_TEST is not set | 1000 | # CONFIG_CRYPTO_TEST is not set |
1107 | 1001 | CONFIG_CRYPTO_HW=y | |
1108 | # | ||
1109 | # Hardware crypto devices | ||
1110 | # | ||
1111 | 1002 | ||
1112 | # | 1003 | # |
1113 | # Library routines | 1004 | # Library routines |
1114 | # | 1005 | # |
1115 | CONFIG_BITREVERSE=y | 1006 | CONFIG_BITREVERSE=y |
1116 | # CONFIG_CRC_CCITT is not set | 1007 | CONFIG_CRC_CCITT=m |
1117 | CONFIG_CRC16=m | 1008 | # CONFIG_CRC16 is not set |
1009 | # CONFIG_CRC_ITU_T is not set | ||
1118 | CONFIG_CRC32=y | 1010 | CONFIG_CRC32=y |
1011 | # CONFIG_CRC7 is not set | ||
1119 | CONFIG_LIBCRC32C=m | 1012 | CONFIG_LIBCRC32C=m |
1120 | CONFIG_ZLIB_INFLATE=m | 1013 | CONFIG_ZLIB_INFLATE=m |
1121 | CONFIG_ZLIB_DEFLATE=m | 1014 | CONFIG_ZLIB_DEFLATE=m |
1122 | CONFIG_PLIST=y | 1015 | CONFIG_PLIST=y |
1123 | CONFIG_HAS_IOMEM=y | 1016 | CONFIG_HAS_IOMEM=y |
1124 | CONFIG_HAS_IOPORT=y | 1017 | CONFIG_HAS_IOPORT=y |
1018 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig index 95a72d2750ef..eb96791c33ea 100644 --- a/arch/mips/configs/jmr3927_defconfig +++ b/arch/mips/configs/jmr3927_defconfig | |||
@@ -1,60 +1,47 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.21-rc3 | 3 | # Linux kernel version: 2.6.23-rc1 |
4 | # Thu Mar 15 00:40:40 2007 | 4 | # Thu Aug 2 23:07:36 2007 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
8 | # | 8 | # |
9 | # Machine selection | 9 | # Machine selection |
10 | # | 10 | # |
11 | CONFIG_ZONE_DMA=y | 11 | # CONFIG_MACH_ALCHEMY is not set |
12 | # CONFIG_MIPS_MTX1 is not set | ||
13 | # CONFIG_MIPS_BOSPORUS is not set | ||
14 | # CONFIG_MIPS_PB1000 is not set | ||
15 | # CONFIG_MIPS_PB1100 is not set | ||
16 | # CONFIG_MIPS_PB1500 is not set | ||
17 | # CONFIG_MIPS_PB1550 is not set | ||
18 | # CONFIG_MIPS_PB1200 is not set | ||
19 | # CONFIG_MIPS_DB1000 is not set | ||
20 | # CONFIG_MIPS_DB1100 is not set | ||
21 | # CONFIG_MIPS_DB1500 is not set | ||
22 | # CONFIG_MIPS_DB1550 is not set | ||
23 | # CONFIG_MIPS_DB1200 is not set | ||
24 | # CONFIG_MIPS_MIRAGE is not set | ||
25 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
26 | # CONFIG_MIPS_COBALT is not set | 13 | # CONFIG_MIPS_COBALT is not set |
27 | # CONFIG_MACH_DECSTATION is not set | 14 | # CONFIG_MACH_DECSTATION is not set |
28 | # CONFIG_MACH_JAZZ is not set | 15 | # CONFIG_MACH_JAZZ is not set |
16 | # CONFIG_LEMOTE_FULONG is not set | ||
29 | # CONFIG_MIPS_ATLAS is not set | 17 | # CONFIG_MIPS_ATLAS is not set |
30 | # CONFIG_MIPS_MALTA is not set | 18 | # CONFIG_MIPS_MALTA is not set |
31 | # CONFIG_MIPS_SEAD is not set | 19 | # CONFIG_MIPS_SEAD is not set |
32 | # CONFIG_WR_PPMC is not set | ||
33 | # CONFIG_MIPS_SIM is not set | 20 | # CONFIG_MIPS_SIM is not set |
34 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 21 | # CONFIG_MARKEINS is not set |
35 | # CONFIG_MIPS_XXS1500 is not set | 22 | # CONFIG_MACH_VR41XX is not set |
36 | # CONFIG_PNX8550_JBS is not set | 23 | # CONFIG_PNX8550_JBS is not set |
37 | # CONFIG_PNX8550_STB810 is not set | 24 | # CONFIG_PNX8550_STB810 is not set |
38 | # CONFIG_MACH_VR41XX is not set | 25 | # CONFIG_PMC_MSP is not set |
39 | # CONFIG_PMC_YOSEMITE is not set | 26 | # CONFIG_PMC_YOSEMITE is not set |
40 | # CONFIG_QEMU is not set | 27 | # CONFIG_QEMU is not set |
41 | # CONFIG_MARKEINS is not set | ||
42 | # CONFIG_SGI_IP22 is not set | 28 | # CONFIG_SGI_IP22 is not set |
43 | # CONFIG_SGI_IP27 is not set | 29 | # CONFIG_SGI_IP27 is not set |
44 | # CONFIG_SGI_IP32 is not set | 30 | # CONFIG_SGI_IP32 is not set |
45 | # CONFIG_SIBYTE_BIGSUR is not set | 31 | # CONFIG_SIBYTE_CRHINE is not set |
32 | # CONFIG_SIBYTE_CARMEL is not set | ||
33 | # CONFIG_SIBYTE_CRHONE is not set | ||
34 | # CONFIG_SIBYTE_RHONE is not set | ||
46 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | ||
49 | # CONFIG_SIBYTE_CARMEL is not set | ||
50 | # CONFIG_SIBYTE_PTSWARM is not set | 38 | # CONFIG_SIBYTE_PTSWARM is not set |
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 39 | # CONFIG_SIBYTE_BIGSUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | ||
53 | # CONFIG_SIBYTE_CRHONE is not set | ||
54 | # CONFIG_SNI_RM is not set | 40 | # CONFIG_SNI_RM is not set |
55 | CONFIG_TOSHIBA_JMR3927=y | 41 | CONFIG_TOSHIBA_JMR3927=y |
56 | # CONFIG_TOSHIBA_RBTX4927 is not set | 42 | # CONFIG_TOSHIBA_RBTX4927 is not set |
57 | # CONFIG_TOSHIBA_RBTX4938 is not set | 43 | # CONFIG_TOSHIBA_RBTX4938 is not set |
44 | # CONFIG_WR_PPMC is not set | ||
58 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 45 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
59 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 46 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
60 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 47 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
@@ -66,10 +53,12 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
66 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 53 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
67 | CONFIG_DMA_NONCOHERENT=y | 54 | CONFIG_DMA_NONCOHERENT=y |
68 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 55 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
56 | # CONFIG_NO_IOPORT is not set | ||
69 | CONFIG_CPU_BIG_ENDIAN=y | 57 | CONFIG_CPU_BIG_ENDIAN=y |
70 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 58 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
71 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 59 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y |
72 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 60 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
61 | CONFIG_IRQ_TXX9=y | ||
73 | CONFIG_MIPS_TX3927=y | 62 | CONFIG_MIPS_TX3927=y |
74 | CONFIG_SWAP_IO_SPACE=y | 63 | CONFIG_SWAP_IO_SPACE=y |
75 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 64 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
@@ -77,6 +66,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
77 | # | 66 | # |
78 | # CPU selection | 67 | # CPU selection |
79 | # | 68 | # |
69 | # CONFIG_CPU_LOONGSON2 is not set | ||
80 | # CONFIG_CPU_MIPS32_R1 is not set | 70 | # CONFIG_CPU_MIPS32_R1 is not set |
81 | # CONFIG_CPU_MIPS32_R2 is not set | 71 | # CONFIG_CPU_MIPS32_R2 is not set |
82 | # CONFIG_CPU_MIPS64_R1 is not set | 72 | # CONFIG_CPU_MIPS64_R1 is not set |
@@ -112,21 +102,17 @@ CONFIG_PAGE_SIZE_4KB=y | |||
112 | CONFIG_MIPS_MT_DISABLED=y | 102 | CONFIG_MIPS_MT_DISABLED=y |
113 | # CONFIG_MIPS_MT_SMP is not set | 103 | # CONFIG_MIPS_MT_SMP is not set |
114 | # CONFIG_MIPS_MT_SMTC is not set | 104 | # CONFIG_MIPS_MT_SMTC is not set |
115 | # CONFIG_MIPS_VPE_LOADER is not set | ||
116 | CONFIG_CPU_HAS_SYNC=y | 105 | CONFIG_CPU_HAS_SYNC=y |
117 | CONFIG_GENERIC_HARDIRQS=y | 106 | CONFIG_GENERIC_HARDIRQS=y |
118 | CONFIG_GENERIC_IRQ_PROBE=y | 107 | CONFIG_GENERIC_IRQ_PROBE=y |
119 | CONFIG_ARCH_FLATMEM_ENABLE=y | 108 | CONFIG_ARCH_FLATMEM_ENABLE=y |
120 | CONFIG_SELECT_MEMORY_MODEL=y | ||
121 | CONFIG_FLATMEM_MANUAL=y | ||
122 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
123 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
124 | CONFIG_FLATMEM=y | 109 | CONFIG_FLATMEM=y |
125 | CONFIG_FLAT_NODE_MEM_MAP=y | 110 | CONFIG_FLAT_NODE_MEM_MAP=y |
126 | # CONFIG_SPARSEMEM_STATIC is not set | 111 | # CONFIG_SPARSEMEM_STATIC is not set |
127 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 112 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
128 | # CONFIG_RESOURCES_64BIT is not set | 113 | # CONFIG_RESOURCES_64BIT is not set |
129 | CONFIG_ZONE_DMA_FLAG=1 | 114 | CONFIG_ZONE_DMA_FLAG=0 |
115 | CONFIG_VIRT_TO_BUS=y | ||
130 | # CONFIG_HZ_48 is not set | 116 | # CONFIG_HZ_48 is not set |
131 | # CONFIG_HZ_100 is not set | 117 | # CONFIG_HZ_100 is not set |
132 | # CONFIG_HZ_128 is not set | 118 | # CONFIG_HZ_128 is not set |
@@ -139,37 +125,30 @@ CONFIG_HZ=250 | |||
139 | CONFIG_PREEMPT_NONE=y | 125 | CONFIG_PREEMPT_NONE=y |
140 | # CONFIG_PREEMPT_VOLUNTARY is not set | 126 | # CONFIG_PREEMPT_VOLUNTARY is not set |
141 | # CONFIG_PREEMPT is not set | 127 | # CONFIG_PREEMPT is not set |
142 | # CONFIG_KEXEC is not set | 128 | # CONFIG_SECCOMP is not set |
143 | CONFIG_LOCKDEP_SUPPORT=y | 129 | CONFIG_LOCKDEP_SUPPORT=y |
144 | CONFIG_STACKTRACE_SUPPORT=y | 130 | CONFIG_STACKTRACE_SUPPORT=y |
145 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 131 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
146 | 132 | ||
147 | # | 133 | # |
148 | # Code maturity level options | 134 | # General setup |
149 | # | 135 | # |
150 | CONFIG_EXPERIMENTAL=y | 136 | # CONFIG_EXPERIMENTAL is not set |
151 | CONFIG_BROKEN_ON_SMP=y | 137 | CONFIG_BROKEN_ON_SMP=y |
152 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 138 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
153 | |||
154 | # | ||
155 | # General setup | ||
156 | # | ||
157 | CONFIG_LOCALVERSION="" | 139 | CONFIG_LOCALVERSION="" |
158 | CONFIG_LOCALVERSION_AUTO=y | 140 | CONFIG_LOCALVERSION_AUTO=y |
159 | CONFIG_SWAP=y | 141 | CONFIG_SWAP=y |
160 | CONFIG_SYSVIPC=y | 142 | CONFIG_SYSVIPC=y |
161 | # CONFIG_IPC_NS is not set | ||
162 | CONFIG_SYSVIPC_SYSCTL=y | 143 | CONFIG_SYSVIPC_SYSCTL=y |
163 | # CONFIG_POSIX_MQUEUE is not set | ||
164 | # CONFIG_BSD_PROCESS_ACCT is not set | 144 | # CONFIG_BSD_PROCESS_ACCT is not set |
165 | # CONFIG_TASKSTATS is not set | 145 | # CONFIG_TASKSTATS is not set |
166 | # CONFIG_UTS_NS is not set | ||
167 | # CONFIG_AUDIT is not set | 146 | # CONFIG_AUDIT is not set |
168 | # CONFIG_IKCONFIG is not set | 147 | # CONFIG_IKCONFIG is not set |
148 | CONFIG_LOG_BUF_SHIFT=14 | ||
169 | CONFIG_SYSFS_DEPRECATED=y | 149 | CONFIG_SYSFS_DEPRECATED=y |
170 | # CONFIG_RELAY is not set | 150 | # CONFIG_RELAY is not set |
171 | # CONFIG_BLK_DEV_INITRD is not set | 151 | # CONFIG_BLK_DEV_INITRD is not set |
172 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
173 | CONFIG_SYSCTL=y | 152 | CONFIG_SYSCTL=y |
174 | CONFIG_EMBEDDED=y | 153 | CONFIG_EMBEDDED=y |
175 | CONFIG_SYSCTL_SYSCALL=y | 154 | CONFIG_SYSCTL_SYSCALL=y |
@@ -181,23 +160,20 @@ CONFIG_BUG=y | |||
181 | CONFIG_ELF_CORE=y | 160 | CONFIG_ELF_CORE=y |
182 | CONFIG_BASE_FULL=y | 161 | CONFIG_BASE_FULL=y |
183 | CONFIG_FUTEX=y | 162 | CONFIG_FUTEX=y |
163 | CONFIG_ANON_INODES=y | ||
184 | CONFIG_EPOLL=y | 164 | CONFIG_EPOLL=y |
165 | CONFIG_SIGNALFD=y | ||
166 | CONFIG_TIMERFD=y | ||
167 | CONFIG_EVENTFD=y | ||
185 | CONFIG_SHMEM=y | 168 | CONFIG_SHMEM=y |
186 | CONFIG_SLAB=y | ||
187 | CONFIG_VM_EVENT_COUNTERS=y | 169 | CONFIG_VM_EVENT_COUNTERS=y |
170 | CONFIG_SLAB=y | ||
171 | # CONFIG_SLUB is not set | ||
172 | # CONFIG_SLOB is not set | ||
188 | CONFIG_RT_MUTEXES=y | 173 | CONFIG_RT_MUTEXES=y |
189 | # CONFIG_TINY_SHMEM is not set | 174 | # CONFIG_TINY_SHMEM is not set |
190 | CONFIG_BASE_SMALL=0 | 175 | CONFIG_BASE_SMALL=0 |
191 | # CONFIG_SLOB is not set | ||
192 | |||
193 | # | ||
194 | # Loadable module support | ||
195 | # | ||
196 | # CONFIG_MODULES is not set | 176 | # CONFIG_MODULES is not set |
197 | |||
198 | # | ||
199 | # Block layer | ||
200 | # | ||
201 | CONFIG_BLOCK=y | 177 | CONFIG_BLOCK=y |
202 | # CONFIG_LBD is not set | 178 | # CONFIG_LBD is not set |
203 | # CONFIG_BLK_DEV_IO_TRACE is not set | 179 | # CONFIG_BLK_DEV_IO_TRACE is not set |
@@ -221,6 +197,7 @@ CONFIG_DEFAULT_IOSCHED="cfq" | |||
221 | # | 197 | # |
222 | CONFIG_HW_HAS_PCI=y | 198 | CONFIG_HW_HAS_PCI=y |
223 | CONFIG_PCI=y | 199 | CONFIG_PCI=y |
200 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
224 | CONFIG_MMU=y | 201 | CONFIG_MMU=y |
225 | 202 | ||
226 | # | 203 | # |
@@ -228,10 +205,6 @@ CONFIG_MMU=y | |||
228 | # | 205 | # |
229 | 206 | ||
230 | # | 207 | # |
231 | # PCI Hotplug Support | ||
232 | # | ||
233 | |||
234 | # | ||
235 | # Executable file formats | 208 | # Executable file formats |
236 | # | 209 | # |
237 | CONFIG_BINFMT_ELF=y | 210 | CONFIG_BINFMT_ELF=y |
@@ -251,7 +224,6 @@ CONFIG_NET=y | |||
251 | # | 224 | # |
252 | # Networking options | 225 | # Networking options |
253 | # | 226 | # |
254 | # CONFIG_NETDEBUG is not set | ||
255 | CONFIG_PACKET=y | 227 | CONFIG_PACKET=y |
256 | # CONFIG_PACKET_MMAP is not set | 228 | # CONFIG_PACKET_MMAP is not set |
257 | CONFIG_UNIX=y | 229 | CONFIG_UNIX=y |
@@ -266,7 +238,6 @@ CONFIG_IP_PNP_BOOTP=y | |||
266 | # CONFIG_IP_PNP_RARP is not set | 238 | # CONFIG_IP_PNP_RARP is not set |
267 | # CONFIG_NET_IPIP is not set | 239 | # CONFIG_NET_IPIP is not set |
268 | # CONFIG_NET_IPGRE is not set | 240 | # CONFIG_NET_IPGRE is not set |
269 | # CONFIG_ARPD is not set | ||
270 | # CONFIG_SYN_COOKIES is not set | 241 | # CONFIG_SYN_COOKIES is not set |
271 | # CONFIG_INET_AH is not set | 242 | # CONFIG_INET_AH is not set |
272 | # CONFIG_INET_ESP is not set | 243 | # CONFIG_INET_ESP is not set |
@@ -280,38 +251,17 @@ CONFIG_IP_PNP_BOOTP=y | |||
280 | # CONFIG_TCP_CONG_ADVANCED is not set | 251 | # CONFIG_TCP_CONG_ADVANCED is not set |
281 | CONFIG_TCP_CONG_CUBIC=y | 252 | CONFIG_TCP_CONG_CUBIC=y |
282 | CONFIG_DEFAULT_TCP_CONG="cubic" | 253 | CONFIG_DEFAULT_TCP_CONG="cubic" |
283 | # CONFIG_TCP_MD5SIG is not set | ||
284 | # CONFIG_IPV6 is not set | 254 | # CONFIG_IPV6 is not set |
285 | # CONFIG_INET6_XFRM_TUNNEL is not set | 255 | # CONFIG_INET6_XFRM_TUNNEL is not set |
286 | # CONFIG_INET6_TUNNEL is not set | 256 | # CONFIG_INET6_TUNNEL is not set |
287 | # CONFIG_NETWORK_SECMARK is not set | 257 | # CONFIG_NETWORK_SECMARK is not set |
288 | # CONFIG_NETFILTER is not set | 258 | # CONFIG_NETFILTER is not set |
289 | |||
290 | # | ||
291 | # DCCP Configuration (EXPERIMENTAL) | ||
292 | # | ||
293 | # CONFIG_IP_DCCP is not set | ||
294 | |||
295 | # | ||
296 | # SCTP Configuration (EXPERIMENTAL) | ||
297 | # | ||
298 | # CONFIG_IP_SCTP is not set | ||
299 | |||
300 | # | ||
301 | # TIPC Configuration (EXPERIMENTAL) | ||
302 | # | ||
303 | # CONFIG_TIPC is not set | ||
304 | # CONFIG_ATM is not set | ||
305 | # CONFIG_BRIDGE is not set | 259 | # CONFIG_BRIDGE is not set |
306 | # CONFIG_VLAN_8021Q is not set | 260 | # CONFIG_VLAN_8021Q is not set |
307 | # CONFIG_DECNET is not set | 261 | # CONFIG_DECNET is not set |
308 | # CONFIG_LLC2 is not set | 262 | # CONFIG_LLC2 is not set |
309 | # CONFIG_IPX is not set | 263 | # CONFIG_IPX is not set |
310 | # CONFIG_ATALK is not set | 264 | # CONFIG_ATALK is not set |
311 | # CONFIG_X25 is not set | ||
312 | # CONFIG_LAPB is not set | ||
313 | # CONFIG_ECONET is not set | ||
314 | # CONFIG_WAN_ROUTER is not set | ||
315 | 265 | ||
316 | # | 266 | # |
317 | # QoS and/or fair queueing | 267 | # QoS and/or fair queueing |
@@ -325,7 +275,14 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
325 | # CONFIG_HAMRADIO is not set | 275 | # CONFIG_HAMRADIO is not set |
326 | # CONFIG_IRDA is not set | 276 | # CONFIG_IRDA is not set |
327 | # CONFIG_BT is not set | 277 | # CONFIG_BT is not set |
278 | |||
279 | # | ||
280 | # Wireless | ||
281 | # | ||
282 | # CONFIG_CFG80211 is not set | ||
283 | # CONFIG_WIRELESS_EXT is not set | ||
328 | # CONFIG_IEEE80211 is not set | 284 | # CONFIG_IEEE80211 is not set |
285 | # CONFIG_RFKILL is not set | ||
329 | 286 | ||
330 | # | 287 | # |
331 | # Device Drivers | 288 | # Device Drivers |
@@ -337,34 +294,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
337 | CONFIG_STANDALONE=y | 294 | CONFIG_STANDALONE=y |
338 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 295 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
339 | # CONFIG_SYS_HYPERVISOR is not set | 296 | # CONFIG_SYS_HYPERVISOR is not set |
340 | |||
341 | # | ||
342 | # Connector - unified userspace <-> kernelspace linker | ||
343 | # | ||
344 | # CONFIG_CONNECTOR is not set | 297 | # CONFIG_CONNECTOR is not set |
345 | |||
346 | # | ||
347 | # Memory Technology Devices (MTD) | ||
348 | # | ||
349 | # CONFIG_MTD is not set | 298 | # CONFIG_MTD is not set |
350 | |||
351 | # | ||
352 | # Parallel port support | ||
353 | # | ||
354 | # CONFIG_PARPORT is not set | 299 | # CONFIG_PARPORT is not set |
355 | 300 | CONFIG_BLK_DEV=y | |
356 | # | ||
357 | # Plug and Play support | ||
358 | # | ||
359 | # CONFIG_PNPACPI is not set | ||
360 | |||
361 | # | ||
362 | # Block devices | ||
363 | # | ||
364 | # CONFIG_BLK_CPQ_DA is not set | 301 | # CONFIG_BLK_CPQ_DA is not set |
365 | # CONFIG_BLK_CPQ_CISS_DA is not set | 302 | # CONFIG_BLK_CPQ_CISS_DA is not set |
366 | # CONFIG_BLK_DEV_DAC960 is not set | 303 | # CONFIG_BLK_DEV_DAC960 is not set |
367 | # CONFIG_BLK_DEV_UMEM is not set | ||
368 | # CONFIG_BLK_DEV_COW_COMMON is not set | 304 | # CONFIG_BLK_DEV_COW_COMMON is not set |
369 | # CONFIG_BLK_DEV_LOOP is not set | 305 | # CONFIG_BLK_DEV_LOOP is not set |
370 | # CONFIG_BLK_DEV_NBD is not set | 306 | # CONFIG_BLK_DEV_NBD is not set |
@@ -372,16 +308,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
372 | # CONFIG_BLK_DEV_RAM is not set | 308 | # CONFIG_BLK_DEV_RAM is not set |
373 | # CONFIG_CDROM_PKTCDVD is not set | 309 | # CONFIG_CDROM_PKTCDVD is not set |
374 | # CONFIG_ATA_OVER_ETH is not set | 310 | # CONFIG_ATA_OVER_ETH is not set |
375 | 311 | # CONFIG_MISC_DEVICES is not set | |
376 | # | ||
377 | # Misc devices | ||
378 | # | ||
379 | # CONFIG_SGI_IOC4 is not set | ||
380 | # CONFIG_TIFM_CORE is not set | ||
381 | |||
382 | # | ||
383 | # ATA/ATAPI/MFM/RLL support | ||
384 | # | ||
385 | # CONFIG_IDE is not set | 312 | # CONFIG_IDE is not set |
386 | 313 | ||
387 | # | 314 | # |
@@ -389,16 +316,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
389 | # | 316 | # |
390 | # CONFIG_RAID_ATTRS is not set | 317 | # CONFIG_RAID_ATTRS is not set |
391 | # CONFIG_SCSI is not set | 318 | # CONFIG_SCSI is not set |
319 | # CONFIG_SCSI_DMA is not set | ||
392 | # CONFIG_SCSI_NETLINK is not set | 320 | # CONFIG_SCSI_NETLINK is not set |
393 | |||
394 | # | ||
395 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
396 | # | ||
397 | # CONFIG_ATA is not set | 321 | # CONFIG_ATA is not set |
398 | |||
399 | # | ||
400 | # Multi-device support (RAID and LVM) | ||
401 | # | ||
402 | # CONFIG_MD is not set | 322 | # CONFIG_MD is not set |
403 | 323 | ||
404 | # | 324 | # |
@@ -409,46 +329,28 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
409 | # | 329 | # |
410 | # IEEE 1394 (FireWire) support | 330 | # IEEE 1394 (FireWire) support |
411 | # | 331 | # |
412 | # CONFIG_IEEE1394 is not set | ||
413 | 332 | ||
414 | # | 333 | # |
415 | # I2O device support | 334 | # An alternative FireWire stack is available with EXPERIMENTAL=y |
416 | # | 335 | # |
336 | # CONFIG_IEEE1394 is not set | ||
417 | # CONFIG_I2O is not set | 337 | # CONFIG_I2O is not set |
418 | |||
419 | # | ||
420 | # Network device support | ||
421 | # | ||
422 | CONFIG_NETDEVICES=y | 338 | CONFIG_NETDEVICES=y |
339 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
423 | # CONFIG_DUMMY is not set | 340 | # CONFIG_DUMMY is not set |
424 | # CONFIG_BONDING is not set | 341 | # CONFIG_BONDING is not set |
425 | # CONFIG_EQUALIZER is not set | 342 | # CONFIG_EQUALIZER is not set |
426 | # CONFIG_TUN is not set | 343 | # CONFIG_TUN is not set |
427 | |||
428 | # | ||
429 | # ARCnet devices | ||
430 | # | ||
431 | # CONFIG_ARCNET is not set | 344 | # CONFIG_ARCNET is not set |
432 | |||
433 | # | ||
434 | # PHY device support | ||
435 | # | ||
436 | # CONFIG_PHYLIB is not set | 345 | # CONFIG_PHYLIB is not set |
437 | |||
438 | # | ||
439 | # Ethernet (10 or 100Mbit) | ||
440 | # | ||
441 | CONFIG_NET_ETHERNET=y | 346 | CONFIG_NET_ETHERNET=y |
442 | CONFIG_MII=y | 347 | CONFIG_MII=y |
348 | # CONFIG_AX88796 is not set | ||
443 | # CONFIG_HAPPYMEAL is not set | 349 | # CONFIG_HAPPYMEAL is not set |
444 | # CONFIG_SUNGEM is not set | 350 | # CONFIG_SUNGEM is not set |
445 | # CONFIG_CASSINI is not set | 351 | # CONFIG_CASSINI is not set |
446 | # CONFIG_NET_VENDOR_3COM is not set | 352 | # CONFIG_NET_VENDOR_3COM is not set |
447 | # CONFIG_DM9000 is not set | 353 | # CONFIG_DM9000 is not set |
448 | |||
449 | # | ||
450 | # Tulip family network device support | ||
451 | # | ||
452 | # CONFIG_NET_TULIP is not set | 354 | # CONFIG_NET_TULIP is not set |
453 | # CONFIG_HP100 is not set | 355 | # CONFIG_HP100 is not set |
454 | CONFIG_NET_PCI=y | 356 | CONFIG_NET_PCI=y |
@@ -464,76 +366,28 @@ CONFIG_TC35815=y | |||
464 | # CONFIG_FEALNX is not set | 366 | # CONFIG_FEALNX is not set |
465 | # CONFIG_NATSEMI is not set | 367 | # CONFIG_NATSEMI is not set |
466 | # CONFIG_NE2K_PCI is not set | 368 | # CONFIG_NE2K_PCI is not set |
467 | # CONFIG_8139CP is not set | ||
468 | # CONFIG_8139TOO is not set | 369 | # CONFIG_8139TOO is not set |
469 | # CONFIG_SIS900 is not set | 370 | # CONFIG_SIS900 is not set |
470 | # CONFIG_EPIC100 is not set | 371 | # CONFIG_EPIC100 is not set |
471 | # CONFIG_SUNDANCE is not set | 372 | # CONFIG_SUNDANCE is not set |
472 | # CONFIG_TLAN is not set | 373 | # CONFIG_TLAN is not set |
473 | # CONFIG_VIA_RHINE is not set | 374 | # CONFIG_VIA_RHINE is not set |
474 | # CONFIG_SC92031 is not set | 375 | # CONFIG_NETDEV_1000 is not set |
475 | 376 | # CONFIG_NETDEV_10000 is not set | |
476 | # | ||
477 | # Ethernet (1000 Mbit) | ||
478 | # | ||
479 | # CONFIG_ACENIC is not set | ||
480 | # CONFIG_DL2K is not set | ||
481 | # CONFIG_E1000 is not set | ||
482 | # CONFIG_NS83820 is not set | ||
483 | # CONFIG_HAMACHI is not set | ||
484 | # CONFIG_YELLOWFIN is not set | ||
485 | # CONFIG_R8169 is not set | ||
486 | # CONFIG_SIS190 is not set | ||
487 | # CONFIG_SKGE is not set | ||
488 | # CONFIG_SKY2 is not set | ||
489 | # CONFIG_SK98LIN is not set | ||
490 | # CONFIG_VIA_VELOCITY is not set | ||
491 | # CONFIG_TIGON3 is not set | ||
492 | # CONFIG_BNX2 is not set | ||
493 | # CONFIG_QLA3XXX is not set | ||
494 | # CONFIG_ATL1 is not set | ||
495 | |||
496 | # | ||
497 | # Ethernet (10000 Mbit) | ||
498 | # | ||
499 | # CONFIG_CHELSIO_T1 is not set | ||
500 | # CONFIG_CHELSIO_T3 is not set | ||
501 | # CONFIG_IXGB is not set | ||
502 | # CONFIG_S2IO is not set | ||
503 | # CONFIG_MYRI10GE is not set | ||
504 | # CONFIG_NETXEN_NIC is not set | ||
505 | |||
506 | # | ||
507 | # Token Ring devices | ||
508 | # | ||
509 | # CONFIG_TR is not set | 377 | # CONFIG_TR is not set |
510 | 378 | ||
511 | # | 379 | # |
512 | # Wireless LAN (non-hamradio) | 380 | # Wireless LAN |
513 | # | ||
514 | # CONFIG_NET_RADIO is not set | ||
515 | |||
516 | # | ||
517 | # Wan interfaces | ||
518 | # | 381 | # |
382 | # CONFIG_WLAN_PRE80211 is not set | ||
383 | # CONFIG_WLAN_80211 is not set | ||
519 | # CONFIG_WAN is not set | 384 | # CONFIG_WAN is not set |
520 | # CONFIG_FDDI is not set | 385 | # CONFIG_FDDI is not set |
521 | # CONFIG_HIPPI is not set | ||
522 | # CONFIG_PPP is not set | 386 | # CONFIG_PPP is not set |
523 | # CONFIG_SLIP is not set | 387 | # CONFIG_SLIP is not set |
524 | # CONFIG_SHAPER is not set | ||
525 | # CONFIG_NETCONSOLE is not set | ||
526 | # CONFIG_NETPOLL is not set | 388 | # CONFIG_NETPOLL is not set |
527 | # CONFIG_NET_POLL_CONTROLLER is not set | 389 | # CONFIG_NET_POLL_CONTROLLER is not set |
528 | |||
529 | # | ||
530 | # ISDN subsystem | ||
531 | # | ||
532 | # CONFIG_ISDN is not set | 390 | # CONFIG_ISDN is not set |
533 | |||
534 | # | ||
535 | # Telephony Support | ||
536 | # | ||
537 | # CONFIG_PHONE is not set | 391 | # CONFIG_PHONE is not set |
538 | 392 | ||
539 | # | 393 | # |
@@ -541,6 +395,7 @@ CONFIG_TC35815=y | |||
541 | # | 395 | # |
542 | CONFIG_INPUT=y | 396 | CONFIG_INPUT=y |
543 | # CONFIG_INPUT_FF_MEMLESS is not set | 397 | # CONFIG_INPUT_FF_MEMLESS is not set |
398 | # CONFIG_INPUT_POLLDEV is not set | ||
544 | 399 | ||
545 | # | 400 | # |
546 | # Userland interfaces | 401 | # Userland interfaces |
@@ -557,6 +412,7 @@ CONFIG_INPUT=y | |||
557 | # CONFIG_INPUT_KEYBOARD is not set | 412 | # CONFIG_INPUT_KEYBOARD is not set |
558 | # CONFIG_INPUT_MOUSE is not set | 413 | # CONFIG_INPUT_MOUSE is not set |
559 | # CONFIG_INPUT_JOYSTICK is not set | 414 | # CONFIG_INPUT_JOYSTICK is not set |
415 | # CONFIG_INPUT_TABLET is not set | ||
560 | # CONFIG_INPUT_TOUCHSCREEN is not set | 416 | # CONFIG_INPUT_TOUCHSCREEN is not set |
561 | # CONFIG_INPUT_MISC is not set | 417 | # CONFIG_INPUT_MISC is not set |
562 | 418 | ||
@@ -607,33 +463,15 @@ CONFIG_SERIAL_TXX9_STDSERIAL=y | |||
607 | # CONFIG_UNIX98_PTYS is not set | 463 | # CONFIG_UNIX98_PTYS is not set |
608 | CONFIG_LEGACY_PTYS=y | 464 | CONFIG_LEGACY_PTYS=y |
609 | CONFIG_LEGACY_PTY_COUNT=256 | 465 | CONFIG_LEGACY_PTY_COUNT=256 |
610 | |||
611 | # | ||
612 | # IPMI | ||
613 | # | ||
614 | # CONFIG_IPMI_HANDLER is not set | 466 | # CONFIG_IPMI_HANDLER is not set |
615 | |||
616 | # | ||
617 | # Watchdog Cards | ||
618 | # | ||
619 | # CONFIG_WATCHDOG is not set | 467 | # CONFIG_WATCHDOG is not set |
620 | # CONFIG_HW_RANDOM is not set | 468 | # CONFIG_HW_RANDOM is not set |
621 | # CONFIG_RTC is not set | 469 | # CONFIG_RTC is not set |
622 | # CONFIG_GEN_RTC is not set | ||
623 | # CONFIG_DTLK is not set | ||
624 | # CONFIG_R3964 is not set | 470 | # CONFIG_R3964 is not set |
625 | # CONFIG_APPLICOM is not set | 471 | # CONFIG_APPLICOM is not set |
626 | # CONFIG_DRM is not set | 472 | # CONFIG_DRM is not set |
627 | # CONFIG_RAW_DRIVER is not set | 473 | # CONFIG_RAW_DRIVER is not set |
628 | 474 | CONFIG_DEVPORT=y | |
629 | # | ||
630 | # TPM devices | ||
631 | # | ||
632 | # CONFIG_TCG_TPM is not set | ||
633 | |||
634 | # | ||
635 | # I2C support | ||
636 | # | ||
637 | # CONFIG_I2C is not set | 475 | # CONFIG_I2C is not set |
638 | 476 | ||
639 | # | 477 | # |
@@ -641,17 +479,9 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
641 | # | 479 | # |
642 | # CONFIG_SPI is not set | 480 | # CONFIG_SPI is not set |
643 | # CONFIG_SPI_MASTER is not set | 481 | # CONFIG_SPI_MASTER is not set |
644 | |||
645 | # | ||
646 | # Dallas's 1-wire bus | ||
647 | # | ||
648 | # CONFIG_W1 is not set | 482 | # CONFIG_W1 is not set |
649 | 483 | # CONFIG_POWER_SUPPLY is not set | |
650 | # | ||
651 | # Hardware Monitoring support | ||
652 | # | ||
653 | # CONFIG_HWMON is not set | 484 | # CONFIG_HWMON is not set |
654 | # CONFIG_HWMON_VID is not set | ||
655 | 485 | ||
656 | # | 486 | # |
657 | # Multifunction device drivers | 487 | # Multifunction device drivers |
@@ -662,75 +492,31 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
662 | # Multimedia devices | 492 | # Multimedia devices |
663 | # | 493 | # |
664 | # CONFIG_VIDEO_DEV is not set | 494 | # CONFIG_VIDEO_DEV is not set |
495 | # CONFIG_DVB_CORE is not set | ||
496 | # CONFIG_DAB is not set | ||
665 | 497 | ||
666 | # | 498 | # |
667 | # Digital Video Broadcasting Devices | 499 | # Graphics support |
668 | # | 500 | # |
669 | # CONFIG_DVB is not set | 501 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
670 | 502 | ||
671 | # | 503 | # |
672 | # Graphics support | 504 | # Display device support |
673 | # | 505 | # |
674 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 506 | # CONFIG_DISPLAY_SUPPORT is not set |
507 | # CONFIG_VGASTATE is not set | ||
508 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
675 | # CONFIG_FB is not set | 509 | # CONFIG_FB is not set |
676 | 510 | ||
677 | # | 511 | # |
678 | # Sound | 512 | # Sound |
679 | # | 513 | # |
680 | # CONFIG_SOUND is not set | 514 | # CONFIG_SOUND is not set |
681 | 515 | # CONFIG_HID_SUPPORT is not set | |
682 | # | 516 | # CONFIG_USB_SUPPORT is not set |
683 | # HID Devices | ||
684 | # | ||
685 | # CONFIG_HID is not set | ||
686 | |||
687 | # | ||
688 | # USB support | ||
689 | # | ||
690 | CONFIG_USB_ARCH_HAS_HCD=y | ||
691 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
692 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
693 | # CONFIG_USB is not set | ||
694 | |||
695 | # | ||
696 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
697 | # | ||
698 | |||
699 | # | ||
700 | # USB Gadget Support | ||
701 | # | ||
702 | # CONFIG_USB_GADGET is not set | ||
703 | |||
704 | # | ||
705 | # MMC/SD Card support | ||
706 | # | ||
707 | # CONFIG_MMC is not set | 517 | # CONFIG_MMC is not set |
708 | |||
709 | # | ||
710 | # LED devices | ||
711 | # | ||
712 | # CONFIG_NEW_LEDS is not set | 518 | # CONFIG_NEW_LEDS is not set |
713 | |||
714 | # | ||
715 | # LED drivers | ||
716 | # | ||
717 | |||
718 | # | ||
719 | # LED Triggers | ||
720 | # | ||
721 | |||
722 | # | ||
723 | # InfiniBand support | ||
724 | # | ||
725 | # CONFIG_INFINIBAND is not set | 519 | # CONFIG_INFINIBAND is not set |
726 | |||
727 | # | ||
728 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
729 | # | ||
730 | |||
731 | # | ||
732 | # Real Time Clock | ||
733 | # | ||
734 | CONFIG_RTC_LIB=y | 520 | CONFIG_RTC_LIB=y |
735 | CONFIG_RTC_CLASS=y | 521 | CONFIG_RTC_CLASS=y |
736 | CONFIG_RTC_HCTOSYS=y | 522 | CONFIG_RTC_HCTOSYS=y |
@@ -744,17 +530,28 @@ CONFIG_RTC_INTF_SYSFS=y | |||
744 | CONFIG_RTC_INTF_PROC=y | 530 | CONFIG_RTC_INTF_PROC=y |
745 | CONFIG_RTC_INTF_DEV=y | 531 | CONFIG_RTC_INTF_DEV=y |
746 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | 532 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set |
533 | # CONFIG_RTC_DRV_TEST is not set | ||
534 | |||
535 | # | ||
536 | # SPI RTC drivers | ||
537 | # | ||
747 | 538 | ||
748 | # | 539 | # |
749 | # RTC drivers | 540 | # Platform RTC drivers |
750 | # | 541 | # |
542 | # CONFIG_RTC_DRV_CMOS is not set | ||
751 | # CONFIG_RTC_DRV_DS1553 is not set | 543 | # CONFIG_RTC_DRV_DS1553 is not set |
544 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
752 | CONFIG_RTC_DRV_DS1742=y | 545 | CONFIG_RTC_DRV_DS1742=y |
753 | # CONFIG_RTC_DRV_M48T86 is not set | 546 | # CONFIG_RTC_DRV_M48T86 is not set |
754 | # CONFIG_RTC_DRV_TEST is not set | 547 | # CONFIG_RTC_DRV_M48T59 is not set |
755 | # CONFIG_RTC_DRV_V3020 is not set | 548 | # CONFIG_RTC_DRV_V3020 is not set |
756 | 549 | ||
757 | # | 550 | # |
551 | # on-CPU RTC drivers | ||
552 | # | ||
553 | |||
554 | # | ||
758 | # DMA Engine support | 555 | # DMA Engine support |
759 | # | 556 | # |
760 | # CONFIG_DMA_ENGINE is not set | 557 | # CONFIG_DMA_ENGINE is not set |
@@ -768,24 +565,19 @@ CONFIG_RTC_DRV_DS1742=y | |||
768 | # | 565 | # |
769 | 566 | ||
770 | # | 567 | # |
771 | # Auxiliary Display support | 568 | # Userspace I/O |
772 | # | ||
773 | |||
774 | # | ||
775 | # Virtualization | ||
776 | # | 569 | # |
570 | # CONFIG_UIO is not set | ||
777 | 571 | ||
778 | # | 572 | # |
779 | # File systems | 573 | # File systems |
780 | # | 574 | # |
781 | # CONFIG_EXT2_FS is not set | 575 | # CONFIG_EXT2_FS is not set |
782 | # CONFIG_EXT3_FS is not set | 576 | # CONFIG_EXT3_FS is not set |
783 | # CONFIG_EXT4DEV_FS is not set | ||
784 | # CONFIG_REISERFS_FS is not set | 577 | # CONFIG_REISERFS_FS is not set |
785 | # CONFIG_JFS_FS is not set | 578 | # CONFIG_JFS_FS is not set |
786 | # CONFIG_FS_POSIX_ACL is not set | 579 | # CONFIG_FS_POSIX_ACL is not set |
787 | # CONFIG_XFS_FS is not set | 580 | # CONFIG_XFS_FS is not set |
788 | # CONFIG_GFS2_FS is not set | ||
789 | # CONFIG_OCFS2_FS is not set | 581 | # CONFIG_OCFS2_FS is not set |
790 | # CONFIG_MINIX_FS is not set | 582 | # CONFIG_MINIX_FS is not set |
791 | # CONFIG_ROMFS_FS is not set | 583 | # CONFIG_ROMFS_FS is not set |
@@ -820,18 +612,11 @@ CONFIG_SYSFS=y | |||
820 | # CONFIG_TMPFS is not set | 612 | # CONFIG_TMPFS is not set |
821 | # CONFIG_HUGETLB_PAGE is not set | 613 | # CONFIG_HUGETLB_PAGE is not set |
822 | CONFIG_RAMFS=y | 614 | CONFIG_RAMFS=y |
823 | # CONFIG_CONFIGFS_FS is not set | ||
824 | 615 | ||
825 | # | 616 | # |
826 | # Miscellaneous filesystems | 617 | # Miscellaneous filesystems |
827 | # | 618 | # |
828 | # CONFIG_ADFS_FS is not set | ||
829 | # CONFIG_AFFS_FS is not set | ||
830 | # CONFIG_HFS_FS is not set | ||
831 | # CONFIG_HFSPLUS_FS is not set | 619 | # CONFIG_HFSPLUS_FS is not set |
832 | # CONFIG_BEFS_FS is not set | ||
833 | # CONFIG_BFS_FS is not set | ||
834 | # CONFIG_EFS_FS is not set | ||
835 | # CONFIG_CRAMFS is not set | 620 | # CONFIG_CRAMFS is not set |
836 | # CONFIG_VXFS_FS is not set | 621 | # CONFIG_VXFS_FS is not set |
837 | # CONFIG_HPFS_FS is not set | 622 | # CONFIG_HPFS_FS is not set |
@@ -844,21 +629,16 @@ CONFIG_RAMFS=y | |||
844 | # | 629 | # |
845 | CONFIG_NFS_FS=y | 630 | CONFIG_NFS_FS=y |
846 | # CONFIG_NFS_V3 is not set | 631 | # CONFIG_NFS_V3 is not set |
847 | # CONFIG_NFS_V4 is not set | ||
848 | # CONFIG_NFS_DIRECTIO is not set | 632 | # CONFIG_NFS_DIRECTIO is not set |
849 | # CONFIG_NFSD is not set | 633 | # CONFIG_NFSD is not set |
850 | CONFIG_ROOT_NFS=y | 634 | CONFIG_ROOT_NFS=y |
851 | CONFIG_LOCKD=y | 635 | CONFIG_LOCKD=y |
852 | CONFIG_NFS_COMMON=y | 636 | CONFIG_NFS_COMMON=y |
853 | CONFIG_SUNRPC=y | 637 | CONFIG_SUNRPC=y |
854 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
855 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
856 | # CONFIG_SMB_FS is not set | 638 | # CONFIG_SMB_FS is not set |
857 | # CONFIG_CIFS is not set | 639 | # CONFIG_CIFS is not set |
858 | # CONFIG_NCP_FS is not set | 640 | # CONFIG_NCP_FS is not set |
859 | # CONFIG_CODA_FS is not set | 641 | # CONFIG_CODA_FS is not set |
860 | # CONFIG_AFS_FS is not set | ||
861 | # CONFIG_9P_FS is not set | ||
862 | 642 | ||
863 | # | 643 | # |
864 | # Partition Types | 644 | # Partition Types |
@@ -872,16 +652,6 @@ CONFIG_MSDOS_PARTITION=y | |||
872 | # CONFIG_NLS is not set | 652 | # CONFIG_NLS is not set |
873 | 653 | ||
874 | # | 654 | # |
875 | # Distributed Lock Manager | ||
876 | # | ||
877 | # CONFIG_DLM is not set | ||
878 | |||
879 | # | ||
880 | # Profiling support | ||
881 | # | ||
882 | # CONFIG_PROFILING is not set | ||
883 | |||
884 | # | ||
885 | # Kernel hacking | 655 | # Kernel hacking |
886 | # | 656 | # |
887 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 657 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
@@ -892,7 +662,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
892 | # CONFIG_DEBUG_FS is not set | 662 | # CONFIG_DEBUG_FS is not set |
893 | # CONFIG_HEADERS_CHECK is not set | 663 | # CONFIG_HEADERS_CHECK is not set |
894 | # CONFIG_DEBUG_KERNEL is not set | 664 | # CONFIG_DEBUG_KERNEL is not set |
895 | CONFIG_LOG_BUF_SHIFT=14 | ||
896 | CONFIG_CROSSCOMPILE=y | 665 | CONFIG_CROSSCOMPILE=y |
897 | CONFIG_CMDLINE="" | 666 | CONFIG_CMDLINE="" |
898 | 667 | ||
@@ -901,10 +670,6 @@ CONFIG_CMDLINE="" | |||
901 | # | 670 | # |
902 | # CONFIG_KEYS is not set | 671 | # CONFIG_KEYS is not set |
903 | # CONFIG_SECURITY is not set | 672 | # CONFIG_SECURITY is not set |
904 | |||
905 | # | ||
906 | # Cryptographic options | ||
907 | # | ||
908 | # CONFIG_CRYPTO is not set | 673 | # CONFIG_CRYPTO is not set |
909 | 674 | ||
910 | # | 675 | # |
@@ -913,8 +678,11 @@ CONFIG_CMDLINE="" | |||
913 | CONFIG_BITREVERSE=y | 678 | CONFIG_BITREVERSE=y |
914 | # CONFIG_CRC_CCITT is not set | 679 | # CONFIG_CRC_CCITT is not set |
915 | # CONFIG_CRC16 is not set | 680 | # CONFIG_CRC16 is not set |
681 | # CONFIG_CRC_ITU_T is not set | ||
916 | CONFIG_CRC32=y | 682 | CONFIG_CRC32=y |
683 | # CONFIG_CRC7 is not set | ||
917 | # CONFIG_LIBCRC32C is not set | 684 | # CONFIG_LIBCRC32C is not set |
918 | CONFIG_PLIST=y | 685 | CONFIG_PLIST=y |
919 | CONFIG_HAS_IOMEM=y | 686 | CONFIG_HAS_IOMEM=y |
920 | CONFIG_HAS_IOPORT=y | 687 | CONFIG_HAS_IOPORT=y |
688 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index fbfa5685887c..fbd2d802fdfd 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.20 | 3 | # Linux kernel version: 2.6.23-rc2 |
4 | # Sun Feb 18 21:27:55 2007 | 4 | # Tue Aug 7 12:59:29 2007 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
@@ -9,52 +9,40 @@ CONFIG_MIPS=y | |||
9 | # Machine selection | 9 | # Machine selection |
10 | # | 10 | # |
11 | CONFIG_ZONE_DMA=y | 11 | CONFIG_ZONE_DMA=y |
12 | # CONFIG_MIPS_MTX1 is not set | 12 | # CONFIG_MACH_ALCHEMY is not set |
13 | # CONFIG_MIPS_BOSPORUS is not set | ||
14 | # CONFIG_MIPS_PB1000 is not set | ||
15 | # CONFIG_MIPS_PB1100 is not set | ||
16 | # CONFIG_MIPS_PB1500 is not set | ||
17 | # CONFIG_MIPS_PB1550 is not set | ||
18 | # CONFIG_MIPS_PB1200 is not set | ||
19 | # CONFIG_MIPS_DB1000 is not set | ||
20 | # CONFIG_MIPS_DB1100 is not set | ||
21 | # CONFIG_MIPS_DB1500 is not set | ||
22 | # CONFIG_MIPS_DB1550 is not set | ||
23 | # CONFIG_MIPS_DB1200 is not set | ||
24 | # CONFIG_MIPS_MIRAGE is not set | ||
25 | # CONFIG_BASLER_EXCITE is not set | 13 | # CONFIG_BASLER_EXCITE is not set |
26 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
27 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
28 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
17 | # CONFIG_LEMOTE_FULONG is not set | ||
29 | # CONFIG_MIPS_ATLAS is not set | 18 | # CONFIG_MIPS_ATLAS is not set |
30 | CONFIG_MIPS_MALTA=y | 19 | CONFIG_MIPS_MALTA=y |
31 | # CONFIG_MIPS_SEAD is not set | 20 | # CONFIG_MIPS_SEAD is not set |
32 | # CONFIG_WR_PPMC is not set | ||
33 | # CONFIG_MIPS_SIM is not set | 21 | # CONFIG_MIPS_SIM is not set |
34 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 22 | # CONFIG_MARKEINS is not set |
35 | # CONFIG_MIPS_XXS1500 is not set | 23 | # CONFIG_MACH_VR41XX is not set |
36 | # CONFIG_PNX8550_JBS is not set | 24 | # CONFIG_PNX8550_JBS is not set |
37 | # CONFIG_PNX8550_STB810 is not set | 25 | # CONFIG_PNX8550_STB810 is not set |
38 | # CONFIG_MACH_VR41XX is not set | 26 | # CONFIG_PMC_MSP is not set |
39 | # CONFIG_PMC_YOSEMITE is not set | 27 | # CONFIG_PMC_YOSEMITE is not set |
40 | # CONFIG_QEMU is not set | 28 | # CONFIG_QEMU is not set |
41 | # CONFIG_MARKEINS is not set | ||
42 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
43 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
44 | # CONFIG_SGI_IP32 is not set | 31 | # CONFIG_SGI_IP32 is not set |
45 | # CONFIG_SIBYTE_BIGSUR is not set | 32 | # CONFIG_SIBYTE_CRHINE is not set |
33 | # CONFIG_SIBYTE_CARMEL is not set | ||
34 | # CONFIG_SIBYTE_CRHONE is not set | ||
35 | # CONFIG_SIBYTE_RHONE is not set | ||
46 | # CONFIG_SIBYTE_SWARM is not set | 36 | # CONFIG_SIBYTE_SWARM is not set |
37 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 38 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | ||
49 | # CONFIG_SIBYTE_CARMEL is not set | ||
50 | # CONFIG_SIBYTE_PTSWARM is not set | 39 | # CONFIG_SIBYTE_PTSWARM is not set |
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 40 | # CONFIG_SIBYTE_BIGSUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | ||
53 | # CONFIG_SIBYTE_CRHONE is not set | ||
54 | # CONFIG_SNI_RM is not set | 41 | # CONFIG_SNI_RM is not set |
55 | # CONFIG_TOSHIBA_JMR3927 is not set | 42 | # CONFIG_TOSHIBA_JMR3927 is not set |
56 | # CONFIG_TOSHIBA_RBTX4927 is not set | 43 | # CONFIG_TOSHIBA_RBTX4927 is not set |
57 | # CONFIG_TOSHIBA_RBTX4938 is not set | 44 | # CONFIG_TOSHIBA_RBTX4938 is not set |
45 | # CONFIG_WR_PPMC is not set | ||
58 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 46 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
59 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 47 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
60 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 48 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
@@ -67,25 +55,28 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
67 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 55 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
68 | CONFIG_DMA_NONCOHERENT=y | 56 | CONFIG_DMA_NONCOHERENT=y |
69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 57 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
58 | CONFIG_EARLY_PRINTK=y | ||
59 | CONFIG_SYS_HAS_EARLY_PRINTK=y | ||
70 | CONFIG_GENERIC_ISA_DMA=y | 60 | CONFIG_GENERIC_ISA_DMA=y |
71 | CONFIG_I8259=y | 61 | CONFIG_I8259=y |
72 | CONFIG_MIPS_BONITO64=y | 62 | CONFIG_MIPS_BONITO64=y |
73 | CONFIG_MIPS_MSC=y | 63 | CONFIG_MIPS_MSC=y |
64 | # CONFIG_NO_IOPORT is not set | ||
74 | # CONFIG_CPU_BIG_ENDIAN is not set | 65 | # CONFIG_CPU_BIG_ENDIAN is not set |
75 | CONFIG_CPU_LITTLE_ENDIAN=y | 66 | CONFIG_CPU_LITTLE_ENDIAN=y |
76 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 67 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y |
77 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 68 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
78 | CONFIG_IRQ_CPU=y | 69 | CONFIG_IRQ_CPU=y |
79 | CONFIG_MIPS_BOARDS_GEN=y | 70 | CONFIG_MIPS_BOARDS_GEN=y |
80 | CONFIG_MIPS_GT64120=y | 71 | CONFIG_PCI_GT64XXX_PCI0=y |
81 | CONFIG_SWAP_IO_SPACE=y | 72 | CONFIG_SWAP_IO_SPACE=y |
82 | CONFIG_BOOT_ELF32=y | 73 | CONFIG_BOOT_ELF32=y |
83 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 74 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
84 | CONFIG_HAVE_STD_PC_SERIAL_PORT=y | ||
85 | 75 | ||
86 | # | 76 | # |
87 | # CPU selection | 77 | # CPU selection |
88 | # | 78 | # |
79 | # CONFIG_CPU_LOONGSON2 is not set | ||
89 | # CONFIG_CPU_MIPS32_R1 is not set | 80 | # CONFIG_CPU_MIPS32_R1 is not set |
90 | CONFIG_CPU_MIPS32_R2=y | 81 | CONFIG_CPU_MIPS32_R2=y |
91 | # CONFIG_CPU_MIPS64_R1 is not set | 82 | # CONFIG_CPU_MIPS64_R1 is not set |
@@ -131,14 +122,14 @@ CONFIG_CPU_HAS_PREFETCH=y | |||
131 | # CONFIG_MIPS_MT_DISABLED is not set | 122 | # CONFIG_MIPS_MT_DISABLED is not set |
132 | CONFIG_MIPS_MT_SMP=y | 123 | CONFIG_MIPS_MT_SMP=y |
133 | # CONFIG_MIPS_MT_SMTC is not set | 124 | # CONFIG_MIPS_MT_SMTC is not set |
134 | # CONFIG_MIPS_VPE_LOADER is not set | ||
135 | CONFIG_MIPS_MT=y | 125 | CONFIG_MIPS_MT=y |
136 | CONFIG_SYS_SUPPORTS_MULTITHREADING=y | 126 | CONFIG_SYS_SUPPORTS_MULTITHREADING=y |
137 | CONFIG_MIPS_MT_FPAFF=y | 127 | CONFIG_MIPS_MT_FPAFF=y |
138 | # CONFIG_64BIT_PHYS_ADDR is not set | 128 | # CONFIG_MIPS_VPE_LOADER is not set |
139 | CONFIG_CPU_HAS_LLSC=y | 129 | CONFIG_CPU_HAS_LLSC=y |
140 | # CONFIG_CPU_HAS_SMARTMIPS is not set | 130 | # CONFIG_CPU_HAS_SMARTMIPS is not set |
141 | CONFIG_CPU_MIPSR2_IRQ_VI=y | 131 | CONFIG_CPU_MIPSR2_IRQ_VI=y |
132 | CONFIG_CPU_MIPSR2_IRQ_EI=y | ||
142 | CONFIG_CPU_MIPSR2_SRS=y | 133 | CONFIG_CPU_MIPSR2_SRS=y |
143 | CONFIG_CPU_HAS_SYNC=y | 134 | CONFIG_CPU_HAS_SYNC=y |
144 | CONFIG_GENERIC_HARDIRQS=y | 135 | CONFIG_GENERIC_HARDIRQS=y |
@@ -157,8 +148,11 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
157 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 148 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
158 | # CONFIG_RESOURCES_64BIT is not set | 149 | # CONFIG_RESOURCES_64BIT is not set |
159 | CONFIG_ZONE_DMA_FLAG=1 | 150 | CONFIG_ZONE_DMA_FLAG=1 |
151 | CONFIG_BOUNCE=y | ||
152 | CONFIG_VIRT_TO_BUS=y | ||
160 | CONFIG_SMP=y | 153 | CONFIG_SMP=y |
161 | CONFIG_SYS_SUPPORTS_SMP=y | 154 | CONFIG_SYS_SUPPORTS_SMP=y |
155 | CONFIG_NR_CPUS_DEFAULT_2=y | ||
162 | CONFIG_NR_CPUS=2 | 156 | CONFIG_NR_CPUS=2 |
163 | # CONFIG_HZ_48 is not set | 157 | # CONFIG_HZ_48 is not set |
164 | CONFIG_HZ_100=y | 158 | CONFIG_HZ_100=y |
@@ -174,35 +168,33 @@ CONFIG_PREEMPT_NONE=y | |||
174 | # CONFIG_PREEMPT is not set | 168 | # CONFIG_PREEMPT is not set |
175 | CONFIG_PREEMPT_BKL=y | 169 | CONFIG_PREEMPT_BKL=y |
176 | # CONFIG_KEXEC is not set | 170 | # CONFIG_KEXEC is not set |
171 | CONFIG_SECCOMP=y | ||
177 | CONFIG_LOCKDEP_SUPPORT=y | 172 | CONFIG_LOCKDEP_SUPPORT=y |
178 | CONFIG_STACKTRACE_SUPPORT=y | 173 | CONFIG_STACKTRACE_SUPPORT=y |
179 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 174 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
180 | 175 | ||
181 | # | 176 | # |
182 | # Code maturity level options | 177 | # General setup |
183 | # | 178 | # |
184 | CONFIG_EXPERIMENTAL=y | 179 | CONFIG_EXPERIMENTAL=y |
185 | CONFIG_LOCK_KERNEL=y | 180 | CONFIG_LOCK_KERNEL=y |
186 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 181 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
187 | |||
188 | # | ||
189 | # General setup | ||
190 | # | ||
191 | CONFIG_LOCALVERSION="" | 182 | CONFIG_LOCALVERSION="" |
192 | CONFIG_LOCALVERSION_AUTO=y | 183 | CONFIG_LOCALVERSION_AUTO=y |
193 | CONFIG_SWAP=y | 184 | CONFIG_SWAP=y |
194 | CONFIG_SYSVIPC=y | 185 | CONFIG_SYSVIPC=y |
195 | # CONFIG_IPC_NS is not set | ||
196 | CONFIG_SYSVIPC_SYSCTL=y | 186 | CONFIG_SYSVIPC_SYSCTL=y |
197 | # CONFIG_POSIX_MQUEUE is not set | 187 | # CONFIG_POSIX_MQUEUE is not set |
198 | # CONFIG_BSD_PROCESS_ACCT is not set | 188 | # CONFIG_BSD_PROCESS_ACCT is not set |
199 | # CONFIG_TASKSTATS is not set | 189 | # CONFIG_TASKSTATS is not set |
200 | # CONFIG_UTS_NS is not set | 190 | # CONFIG_USER_NS is not set |
201 | # CONFIG_AUDIT is not set | 191 | # CONFIG_AUDIT is not set |
202 | # CONFIG_IKCONFIG is not set | 192 | # CONFIG_IKCONFIG is not set |
193 | CONFIG_LOG_BUF_SHIFT=15 | ||
203 | # CONFIG_CPUSETS is not set | 194 | # CONFIG_CPUSETS is not set |
204 | CONFIG_SYSFS_DEPRECATED=y | 195 | CONFIG_SYSFS_DEPRECATED=y |
205 | CONFIG_RELAY=y | 196 | CONFIG_RELAY=y |
197 | # CONFIG_BLK_DEV_INITRD is not set | ||
206 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 198 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
207 | CONFIG_SYSCTL=y | 199 | CONFIG_SYSCTL=y |
208 | CONFIG_EMBEDDED=y | 200 | CONFIG_EMBEDDED=y |
@@ -215,18 +207,19 @@ CONFIG_BUG=y | |||
215 | CONFIG_ELF_CORE=y | 207 | CONFIG_ELF_CORE=y |
216 | CONFIG_BASE_FULL=y | 208 | CONFIG_BASE_FULL=y |
217 | CONFIG_FUTEX=y | 209 | CONFIG_FUTEX=y |
210 | CONFIG_ANON_INODES=y | ||
218 | CONFIG_EPOLL=y | 211 | CONFIG_EPOLL=y |
212 | CONFIG_SIGNALFD=y | ||
213 | CONFIG_TIMERFD=y | ||
214 | CONFIG_EVENTFD=y | ||
219 | CONFIG_SHMEM=y | 215 | CONFIG_SHMEM=y |
220 | CONFIG_SLAB=y | ||
221 | CONFIG_VM_EVENT_COUNTERS=y | 216 | CONFIG_VM_EVENT_COUNTERS=y |
217 | CONFIG_SLAB=y | ||
218 | # CONFIG_SLUB is not set | ||
219 | # CONFIG_SLOB is not set | ||
222 | CONFIG_RT_MUTEXES=y | 220 | CONFIG_RT_MUTEXES=y |
223 | # CONFIG_TINY_SHMEM is not set | 221 | # CONFIG_TINY_SHMEM is not set |
224 | CONFIG_BASE_SMALL=0 | 222 | CONFIG_BASE_SMALL=0 |
225 | # CONFIG_SLOB is not set | ||
226 | |||
227 | # | ||
228 | # Loadable module support | ||
229 | # | ||
230 | CONFIG_MODULES=y | 223 | CONFIG_MODULES=y |
231 | CONFIG_MODULE_UNLOAD=y | 224 | CONFIG_MODULE_UNLOAD=y |
232 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 225 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
@@ -234,14 +227,11 @@ CONFIG_MODVERSIONS=y | |||
234 | CONFIG_MODULE_SRCVERSION_ALL=y | 227 | CONFIG_MODULE_SRCVERSION_ALL=y |
235 | CONFIG_KMOD=y | 228 | CONFIG_KMOD=y |
236 | CONFIG_STOP_MACHINE=y | 229 | CONFIG_STOP_MACHINE=y |
237 | |||
238 | # | ||
239 | # Block layer | ||
240 | # | ||
241 | CONFIG_BLOCK=y | 230 | CONFIG_BLOCK=y |
242 | # CONFIG_LBD is not set | 231 | # CONFIG_LBD is not set |
243 | # CONFIG_BLK_DEV_IO_TRACE is not set | 232 | # CONFIG_BLK_DEV_IO_TRACE is not set |
244 | # CONFIG_LSF is not set | 233 | # CONFIG_LSF is not set |
234 | # CONFIG_BLK_DEV_BSG is not set | ||
245 | 235 | ||
246 | # | 236 | # |
247 | # IO Schedulers | 237 | # IO Schedulers |
@@ -261,16 +251,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
261 | # | 251 | # |
262 | CONFIG_HW_HAS_PCI=y | 252 | CONFIG_HW_HAS_PCI=y |
263 | CONFIG_PCI=y | 253 | CONFIG_PCI=y |
254 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
264 | CONFIG_MMU=y | 255 | CONFIG_MMU=y |
265 | 256 | ||
266 | # | 257 | # |
267 | # PCCARD (PCMCIA/CardBus) support | 258 | # PCCARD (PCMCIA/CardBus) support |
268 | # | 259 | # |
269 | # CONFIG_PCCARD is not set | 260 | # CONFIG_PCCARD is not set |
270 | |||
271 | # | ||
272 | # PCI Hotplug Support | ||
273 | # | ||
274 | # CONFIG_HOTPLUG_PCI is not set | 261 | # CONFIG_HOTPLUG_PCI is not set |
275 | 262 | ||
276 | # | 263 | # |
@@ -286,7 +273,6 @@ CONFIG_TRAD_SIGNALS=y | |||
286 | CONFIG_PM=y | 273 | CONFIG_PM=y |
287 | # CONFIG_PM_LEGACY is not set | 274 | # CONFIG_PM_LEGACY is not set |
288 | # CONFIG_PM_DEBUG is not set | 275 | # CONFIG_PM_DEBUG is not set |
289 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
290 | 276 | ||
291 | # | 277 | # |
292 | # Networking | 278 | # Networking |
@@ -296,7 +282,6 @@ CONFIG_NET=y | |||
296 | # | 282 | # |
297 | # Networking options | 283 | # Networking options |
298 | # | 284 | # |
299 | # CONFIG_NETDEBUG is not set | ||
300 | CONFIG_PACKET=y | 285 | CONFIG_PACKET=y |
301 | CONFIG_PACKET_MMAP=y | 286 | CONFIG_PACKET_MMAP=y |
302 | CONFIG_UNIX=y | 287 | CONFIG_UNIX=y |
@@ -314,7 +299,6 @@ CONFIG_ASK_IP_FIB_HASH=y | |||
314 | CONFIG_IP_FIB_HASH=y | 299 | CONFIG_IP_FIB_HASH=y |
315 | CONFIG_IP_MULTIPLE_TABLES=y | 300 | CONFIG_IP_MULTIPLE_TABLES=y |
316 | CONFIG_IP_ROUTE_MULTIPATH=y | 301 | CONFIG_IP_ROUTE_MULTIPATH=y |
317 | # CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set | ||
318 | CONFIG_IP_ROUTE_VERBOSE=y | 302 | CONFIG_IP_ROUTE_VERBOSE=y |
319 | CONFIG_IP_PNP=y | 303 | CONFIG_IP_PNP=y |
320 | CONFIG_IP_PNP_DHCP=y | 304 | CONFIG_IP_PNP_DHCP=y |
@@ -342,10 +326,6 @@ CONFIG_INET_TCP_DIAG=y | |||
342 | CONFIG_TCP_CONG_CUBIC=y | 326 | CONFIG_TCP_CONG_CUBIC=y |
343 | CONFIG_DEFAULT_TCP_CONG="cubic" | 327 | CONFIG_DEFAULT_TCP_CONG="cubic" |
344 | CONFIG_TCP_MD5SIG=y | 328 | CONFIG_TCP_MD5SIG=y |
345 | |||
346 | # | ||
347 | # IP: Virtual Server Configuration | ||
348 | # | ||
349 | CONFIG_IP_VS=m | 329 | CONFIG_IP_VS=m |
350 | # CONFIG_IP_VS_DEBUG is not set | 330 | # CONFIG_IP_VS_DEBUG is not set |
351 | CONFIG_IP_VS_TAB_BITS=12 | 331 | CONFIG_IP_VS_TAB_BITS=12 |
@@ -380,6 +360,7 @@ CONFIG_IPV6=m | |||
380 | CONFIG_IPV6_PRIVACY=y | 360 | CONFIG_IPV6_PRIVACY=y |
381 | CONFIG_IPV6_ROUTER_PREF=y | 361 | CONFIG_IPV6_ROUTER_PREF=y |
382 | CONFIG_IPV6_ROUTE_INFO=y | 362 | CONFIG_IPV6_ROUTE_INFO=y |
363 | CONFIG_IPV6_OPTIMISTIC_DAD=y | ||
383 | CONFIG_INET6_AH=m | 364 | CONFIG_INET6_AH=m |
384 | CONFIG_INET6_ESP=m | 365 | CONFIG_INET6_ESP=m |
385 | CONFIG_INET6_IPCOMP=m | 366 | CONFIG_INET6_IPCOMP=m |
@@ -405,8 +386,6 @@ CONFIG_NETFILTER_NETLINK=m | |||
405 | CONFIG_NETFILTER_NETLINK_QUEUE=m | 386 | CONFIG_NETFILTER_NETLINK_QUEUE=m |
406 | CONFIG_NETFILTER_NETLINK_LOG=m | 387 | CONFIG_NETFILTER_NETLINK_LOG=m |
407 | CONFIG_NF_CONNTRACK_ENABLED=m | 388 | CONFIG_NF_CONNTRACK_ENABLED=m |
408 | CONFIG_NF_CONNTRACK_SUPPORT=y | ||
409 | # CONFIG_IP_NF_CONNTRACK_SUPPORT is not set | ||
410 | CONFIG_NF_CONNTRACK=m | 389 | CONFIG_NF_CONNTRACK=m |
411 | CONFIG_NF_CT_ACCT=y | 390 | CONFIG_NF_CT_ACCT=y |
412 | CONFIG_NF_CONNTRACK_MARK=y | 391 | CONFIG_NF_CONNTRACK_MARK=y |
@@ -414,6 +393,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y | |||
414 | CONFIG_NF_CONNTRACK_EVENTS=y | 393 | CONFIG_NF_CONNTRACK_EVENTS=y |
415 | CONFIG_NF_CT_PROTO_GRE=m | 394 | CONFIG_NF_CT_PROTO_GRE=m |
416 | CONFIG_NF_CT_PROTO_SCTP=m | 395 | CONFIG_NF_CT_PROTO_SCTP=m |
396 | CONFIG_NF_CT_PROTO_UDPLITE=m | ||
417 | CONFIG_NF_CONNTRACK_AMANDA=m | 397 | CONFIG_NF_CONNTRACK_AMANDA=m |
418 | CONFIG_NF_CONNTRACK_FTP=m | 398 | CONFIG_NF_CONNTRACK_FTP=m |
419 | CONFIG_NF_CONNTRACK_H323=m | 399 | CONFIG_NF_CONNTRACK_H323=m |
@@ -432,11 +412,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m | |||
432 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 412 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
433 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 413 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
434 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 414 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
415 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | ||
435 | CONFIG_NETFILTER_XT_TARGET_SECMARK=m | 416 | CONFIG_NETFILTER_XT_TARGET_SECMARK=m |
436 | # CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set | 417 | # CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set |
437 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 418 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
438 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 419 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
439 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 420 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
421 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | ||
440 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 422 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
441 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 423 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
442 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 424 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
@@ -458,6 +440,7 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m | |||
458 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 440 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
459 | CONFIG_NETFILTER_XT_MATCH_STRING=m | 441 | CONFIG_NETFILTER_XT_MATCH_STRING=m |
460 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 442 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
443 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
461 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 444 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
462 | 445 | ||
463 | # | 446 | # |
@@ -549,25 +532,13 @@ CONFIG_BRIDGE_EBT_REDIRECT=m | |||
549 | CONFIG_BRIDGE_EBT_SNAT=m | 532 | CONFIG_BRIDGE_EBT_SNAT=m |
550 | CONFIG_BRIDGE_EBT_LOG=m | 533 | CONFIG_BRIDGE_EBT_LOG=m |
551 | CONFIG_BRIDGE_EBT_ULOG=m | 534 | CONFIG_BRIDGE_EBT_ULOG=m |
552 | |||
553 | # | ||
554 | # DCCP Configuration (EXPERIMENTAL) | ||
555 | # | ||
556 | # CONFIG_IP_DCCP is not set | 535 | # CONFIG_IP_DCCP is not set |
557 | |||
558 | # | ||
559 | # SCTP Configuration (EXPERIMENTAL) | ||
560 | # | ||
561 | CONFIG_IP_SCTP=m | 536 | CONFIG_IP_SCTP=m |
562 | # CONFIG_SCTP_DBG_MSG is not set | 537 | # CONFIG_SCTP_DBG_MSG is not set |
563 | # CONFIG_SCTP_DBG_OBJCNT is not set | 538 | # CONFIG_SCTP_DBG_OBJCNT is not set |
564 | # CONFIG_SCTP_HMAC_NONE is not set | 539 | # CONFIG_SCTP_HMAC_NONE is not set |
565 | # CONFIG_SCTP_HMAC_SHA1 is not set | 540 | # CONFIG_SCTP_HMAC_SHA1 is not set |
566 | CONFIG_SCTP_HMAC_MD5=y | 541 | CONFIG_SCTP_HMAC_MD5=y |
567 | |||
568 | # | ||
569 | # TIPC Configuration (EXPERIMENTAL) | ||
570 | # | ||
571 | # CONFIG_TIPC is not set | 542 | # CONFIG_TIPC is not set |
572 | # CONFIG_ATM is not set | 543 | # CONFIG_ATM is not set |
573 | CONFIG_BRIDGE=m | 544 | CONFIG_BRIDGE=m |
@@ -591,9 +562,6 @@ CONFIG_IPDDP_DECAP=y | |||
591 | # | 562 | # |
592 | CONFIG_NET_SCHED=y | 563 | CONFIG_NET_SCHED=y |
593 | CONFIG_NET_SCH_FIFO=y | 564 | CONFIG_NET_SCH_FIFO=y |
594 | CONFIG_NET_SCH_CLK_JIFFIES=y | ||
595 | # CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set | ||
596 | # CONFIG_NET_SCH_CLK_CPU is not set | ||
597 | 565 | ||
598 | # | 566 | # |
599 | # Queueing/Scheduling | 567 | # Queueing/Scheduling |
@@ -602,6 +570,7 @@ CONFIG_NET_SCH_CBQ=m | |||
602 | CONFIG_NET_SCH_HTB=m | 570 | CONFIG_NET_SCH_HTB=m |
603 | CONFIG_NET_SCH_HFSC=m | 571 | CONFIG_NET_SCH_HFSC=m |
604 | CONFIG_NET_SCH_PRIO=m | 572 | CONFIG_NET_SCH_PRIO=m |
573 | CONFIG_NET_SCH_RR=m | ||
605 | CONFIG_NET_SCH_RED=m | 574 | CONFIG_NET_SCH_RED=m |
606 | CONFIG_NET_SCH_SFQ=m | 575 | CONFIG_NET_SCH_SFQ=m |
607 | CONFIG_NET_SCH_TEQL=m | 576 | CONFIG_NET_SCH_TEQL=m |
@@ -626,10 +595,16 @@ CONFIG_NET_CLS_U32=m | |||
626 | CONFIG_NET_CLS_RSVP=m | 595 | CONFIG_NET_CLS_RSVP=m |
627 | CONFIG_NET_CLS_RSVP6=m | 596 | CONFIG_NET_CLS_RSVP6=m |
628 | # CONFIG_NET_EMATCH is not set | 597 | # CONFIG_NET_EMATCH is not set |
629 | # CONFIG_NET_CLS_ACT is not set | 598 | CONFIG_NET_CLS_ACT=y |
599 | CONFIG_NET_ACT_POLICE=y | ||
600 | CONFIG_NET_ACT_GACT=m | ||
601 | CONFIG_GACT_PROB=y | ||
602 | CONFIG_NET_ACT_MIRRED=m | ||
603 | CONFIG_NET_ACT_IPT=m | ||
604 | CONFIG_NET_ACT_PEDIT=m | ||
605 | CONFIG_NET_ACT_SIMP=m | ||
630 | CONFIG_NET_CLS_POLICE=y | 606 | CONFIG_NET_CLS_POLICE=y |
631 | CONFIG_NET_CLS_IND=y | 607 | CONFIG_NET_CLS_IND=y |
632 | CONFIG_NET_ESTIMATOR=y | ||
633 | 608 | ||
634 | # | 609 | # |
635 | # Network testing | 610 | # Network testing |
@@ -638,14 +613,26 @@ CONFIG_NET_ESTIMATOR=y | |||
638 | # CONFIG_HAMRADIO is not set | 613 | # CONFIG_HAMRADIO is not set |
639 | # CONFIG_IRDA is not set | 614 | # CONFIG_IRDA is not set |
640 | # CONFIG_BT is not set | 615 | # CONFIG_BT is not set |
616 | # CONFIG_AF_RXRPC is not set | ||
617 | CONFIG_FIB_RULES=y | ||
618 | |||
619 | # | ||
620 | # Wireless | ||
621 | # | ||
622 | CONFIG_CFG80211=m | ||
623 | CONFIG_WIRELESS_EXT=y | ||
624 | CONFIG_MAC80211=m | ||
625 | # CONFIG_MAC80211_DEBUG is not set | ||
641 | CONFIG_IEEE80211=m | 626 | CONFIG_IEEE80211=m |
642 | # CONFIG_IEEE80211_DEBUG is not set | 627 | # CONFIG_IEEE80211_DEBUG is not set |
643 | CONFIG_IEEE80211_CRYPT_WEP=m | 628 | CONFIG_IEEE80211_CRYPT_WEP=m |
644 | CONFIG_IEEE80211_CRYPT_CCMP=m | 629 | CONFIG_IEEE80211_CRYPT_CCMP=m |
630 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
645 | CONFIG_IEEE80211_SOFTMAC=m | 631 | CONFIG_IEEE80211_SOFTMAC=m |
646 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | 632 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set |
647 | CONFIG_WIRELESS_EXT=y | 633 | CONFIG_RFKILL=m |
648 | CONFIG_FIB_RULES=y | 634 | CONFIG_RFKILL_INPUT=m |
635 | # CONFIG_NET_9P is not set | ||
649 | 636 | ||
650 | # | 637 | # |
651 | # Device Drivers | 638 | # Device Drivers |
@@ -658,15 +645,7 @@ CONFIG_STANDALONE=y | |||
658 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 645 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
659 | CONFIG_FW_LOADER=y | 646 | CONFIG_FW_LOADER=y |
660 | # CONFIG_SYS_HYPERVISOR is not set | 647 | # CONFIG_SYS_HYPERVISOR is not set |
661 | |||
662 | # | ||
663 | # Connector - unified userspace <-> kernelspace linker | ||
664 | # | ||
665 | CONFIG_CONNECTOR=m | 648 | CONFIG_CONNECTOR=m |
666 | |||
667 | # | ||
668 | # Memory Technology Devices (MTD) | ||
669 | # | ||
670 | CONFIG_MTD=y | 649 | CONFIG_MTD=y |
671 | # CONFIG_MTD_DEBUG is not set | 650 | # CONFIG_MTD_DEBUG is not set |
672 | # CONFIG_MTD_CONCAT is not set | 651 | # CONFIG_MTD_CONCAT is not set |
@@ -710,7 +689,6 @@ CONFIG_MTD_CFI_UTIL=y | |||
710 | # CONFIG_MTD_RAM is not set | 689 | # CONFIG_MTD_RAM is not set |
711 | # CONFIG_MTD_ROM is not set | 690 | # CONFIG_MTD_ROM is not set |
712 | # CONFIG_MTD_ABSENT is not set | 691 | # CONFIG_MTD_ABSENT is not set |
713 | # CONFIG_MTD_OBSOLETE_CHIPS is not set | ||
714 | 692 | ||
715 | # | 693 | # |
716 | # Mapping drivers for chip access | 694 | # Mapping drivers for chip access |
@@ -737,30 +715,23 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=0 | |||
737 | # CONFIG_MTD_DOC2000 is not set | 715 | # CONFIG_MTD_DOC2000 is not set |
738 | # CONFIG_MTD_DOC2001 is not set | 716 | # CONFIG_MTD_DOC2001 is not set |
739 | # CONFIG_MTD_DOC2001PLUS is not set | 717 | # CONFIG_MTD_DOC2001PLUS is not set |
740 | |||
741 | # | ||
742 | # NAND Flash Device Drivers | ||
743 | # | ||
744 | # CONFIG_MTD_NAND is not set | 718 | # CONFIG_MTD_NAND is not set |
745 | # CONFIG_MTD_NAND_CAFE is not set | ||
746 | |||
747 | # | ||
748 | # OneNAND Flash Device Drivers | ||
749 | # | ||
750 | # CONFIG_MTD_ONENAND is not set | 719 | # CONFIG_MTD_ONENAND is not set |
751 | 720 | ||
752 | # | 721 | # |
753 | # Parallel port support | 722 | # UBI - Unsorted block images |
754 | # | ||
755 | # CONFIG_PARPORT is not set | ||
756 | |||
757 | # | ||
758 | # Plug and Play support | ||
759 | # | 723 | # |
724 | CONFIG_MTD_UBI=m | ||
725 | CONFIG_MTD_UBI_WL_THRESHOLD=4096 | ||
726 | CONFIG_MTD_UBI_BEB_RESERVE=1 | ||
727 | CONFIG_MTD_UBI_GLUEBI=y | ||
760 | 728 | ||
761 | # | 729 | # |
762 | # Block devices | 730 | # UBI debugging options |
763 | # | 731 | # |
732 | # CONFIG_MTD_UBI_DEBUG is not set | ||
733 | # CONFIG_PARPORT is not set | ||
734 | CONFIG_BLK_DEV=y | ||
764 | CONFIG_BLK_DEV_FD=m | 735 | CONFIG_BLK_DEV_FD=m |
765 | # CONFIG_BLK_CPQ_DA is not set | 736 | # CONFIG_BLK_CPQ_DA is not set |
766 | # CONFIG_BLK_CPQ_CISS_DA is not set | 737 | # CONFIG_BLK_CPQ_CISS_DA is not set |
@@ -775,21 +746,11 @@ CONFIG_BLK_DEV_RAM=y | |||
775 | CONFIG_BLK_DEV_RAM_COUNT=16 | 746 | CONFIG_BLK_DEV_RAM_COUNT=16 |
776 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 747 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
777 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 748 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
778 | # CONFIG_BLK_DEV_INITRD is not set | ||
779 | CONFIG_CDROM_PKTCDVD=m | 749 | CONFIG_CDROM_PKTCDVD=m |
780 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 750 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
781 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 751 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
782 | CONFIG_ATA_OVER_ETH=m | 752 | CONFIG_ATA_OVER_ETH=m |
783 | 753 | # CONFIG_MISC_DEVICES is not set | |
784 | # | ||
785 | # Misc devices | ||
786 | # | ||
787 | CONFIG_SGI_IOC4=m | ||
788 | # CONFIG_TIFM_CORE is not set | ||
789 | |||
790 | # | ||
791 | # ATA/ATAPI/MFM/RLL support | ||
792 | # | ||
793 | CONFIG_IDE=y | 754 | CONFIG_IDE=y |
794 | CONFIG_IDE_MAX_HWIFS=4 | 755 | CONFIG_IDE_MAX_HWIFS=4 |
795 | CONFIG_BLK_DEV_IDE=y | 756 | CONFIG_BLK_DEV_IDE=y |
@@ -805,6 +766,7 @@ CONFIG_BLK_DEV_IDECD=y | |||
805 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | 766 | # CONFIG_BLK_DEV_IDEFLOPPY is not set |
806 | # CONFIG_BLK_DEV_IDESCSI is not set | 767 | # CONFIG_BLK_DEV_IDESCSI is not set |
807 | # CONFIG_IDE_TASK_IOCTL is not set | 768 | # CONFIG_IDE_TASK_IOCTL is not set |
769 | CONFIG_IDE_PROC_FS=y | ||
808 | 770 | ||
809 | # | 771 | # |
810 | # IDE chipset support/bugfixes | 772 | # IDE chipset support/bugfixes |
@@ -812,12 +774,12 @@ CONFIG_BLK_DEV_IDECD=y | |||
812 | CONFIG_IDE_GENERIC=y | 774 | CONFIG_IDE_GENERIC=y |
813 | CONFIG_BLK_DEV_IDEPCI=y | 775 | CONFIG_BLK_DEV_IDEPCI=y |
814 | # CONFIG_IDEPCI_SHARE_IRQ is not set | 776 | # CONFIG_IDEPCI_SHARE_IRQ is not set |
777 | CONFIG_IDEPCI_PCIBUS_ORDER=y | ||
815 | # CONFIG_BLK_DEV_OFFBOARD is not set | 778 | # CONFIG_BLK_DEV_OFFBOARD is not set |
816 | CONFIG_BLK_DEV_GENERIC=y | 779 | CONFIG_BLK_DEV_GENERIC=y |
817 | # CONFIG_BLK_DEV_OPTI621 is not set | 780 | # CONFIG_BLK_DEV_OPTI621 is not set |
818 | CONFIG_BLK_DEV_IDEDMA_PCI=y | 781 | CONFIG_BLK_DEV_IDEDMA_PCI=y |
819 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | 782 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set |
820 | CONFIG_IDEDMA_PCI_AUTO=y | ||
821 | # CONFIG_IDEDMA_ONLYDISK is not set | 783 | # CONFIG_IDEDMA_ONLYDISK is not set |
822 | # CONFIG_BLK_DEV_AEC62XX is not set | 784 | # CONFIG_BLK_DEV_AEC62XX is not set |
823 | # CONFIG_BLK_DEV_ALI15X3 is not set | 785 | # CONFIG_BLK_DEV_ALI15X3 is not set |
@@ -846,7 +808,6 @@ CONFIG_BLK_DEV_TC86C001=m | |||
846 | # CONFIG_IDE_ARM is not set | 808 | # CONFIG_IDE_ARM is not set |
847 | CONFIG_BLK_DEV_IDEDMA=y | 809 | CONFIG_BLK_DEV_IDEDMA=y |
848 | # CONFIG_IDEDMA_IVB is not set | 810 | # CONFIG_IDEDMA_IVB is not set |
849 | CONFIG_IDEDMA_AUTO=y | ||
850 | # CONFIG_BLK_DEV_HD is not set | 811 | # CONFIG_BLK_DEV_HD is not set |
851 | 812 | ||
852 | # | 813 | # |
@@ -854,6 +815,7 @@ CONFIG_IDEDMA_AUTO=y | |||
854 | # | 815 | # |
855 | CONFIG_RAID_ATTRS=m | 816 | CONFIG_RAID_ATTRS=m |
856 | CONFIG_SCSI=m | 817 | CONFIG_SCSI=m |
818 | CONFIG_SCSI_DMA=y | ||
857 | CONFIG_SCSI_TGT=m | 819 | CONFIG_SCSI_TGT=m |
858 | CONFIG_SCSI_NETLINK=y | 820 | CONFIG_SCSI_NETLINK=y |
859 | CONFIG_SCSI_PROC_FS=y | 821 | CONFIG_SCSI_PROC_FS=y |
@@ -876,6 +838,7 @@ CONFIG_SCSI_MULTI_LUN=y | |||
876 | CONFIG_SCSI_CONSTANTS=y | 838 | CONFIG_SCSI_CONSTANTS=y |
877 | CONFIG_SCSI_LOGGING=y | 839 | CONFIG_SCSI_LOGGING=y |
878 | CONFIG_SCSI_SCAN_ASYNC=y | 840 | CONFIG_SCSI_SCAN_ASYNC=y |
841 | CONFIG_SCSI_WAIT_SCAN=m | ||
879 | 842 | ||
880 | # | 843 | # |
881 | # SCSI Transports | 844 | # SCSI Transports |
@@ -883,12 +846,8 @@ CONFIG_SCSI_SCAN_ASYNC=y | |||
883 | CONFIG_SCSI_SPI_ATTRS=m | 846 | CONFIG_SCSI_SPI_ATTRS=m |
884 | CONFIG_SCSI_FC_ATTRS=m | 847 | CONFIG_SCSI_FC_ATTRS=m |
885 | CONFIG_SCSI_ISCSI_ATTRS=m | 848 | CONFIG_SCSI_ISCSI_ATTRS=m |
886 | CONFIG_SCSI_SAS_ATTRS=m | ||
887 | # CONFIG_SCSI_SAS_LIBSAS is not set | 849 | # CONFIG_SCSI_SAS_LIBSAS is not set |
888 | 850 | CONFIG_SCSI_LOWLEVEL=y | |
889 | # | ||
890 | # SCSI low-level drivers | ||
891 | # | ||
892 | CONFIG_ISCSI_TCP=m | 851 | CONFIG_ISCSI_TCP=m |
893 | CONFIG_BLK_DEV_3W_XXXX_RAID=m | 852 | CONFIG_BLK_DEV_3W_XXXX_RAID=m |
894 | CONFIG_SCSI_3W_9XXX=m | 853 | CONFIG_SCSI_3W_9XXX=m |
@@ -925,15 +884,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y | |||
925 | # CONFIG_SCSI_NSP32 is not set | 884 | # CONFIG_SCSI_NSP32 is not set |
926 | # CONFIG_SCSI_DEBUG is not set | 885 | # CONFIG_SCSI_DEBUG is not set |
927 | # CONFIG_SCSI_SRP is not set | 886 | # CONFIG_SCSI_SRP is not set |
928 | |||
929 | # | ||
930 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
931 | # | ||
932 | # CONFIG_ATA is not set | 887 | # CONFIG_ATA is not set |
933 | |||
934 | # | ||
935 | # Multi-device support (RAID and LVM) | ||
936 | # | ||
937 | CONFIG_MD=y | 888 | CONFIG_MD=y |
938 | CONFIG_BLK_DEV_MD=m | 889 | CONFIG_BLK_DEV_MD=m |
939 | CONFIG_MD_LINEAR=m | 890 | CONFIG_MD_LINEAR=m |
@@ -952,6 +903,8 @@ CONFIG_DM_MIRROR=m | |||
952 | CONFIG_DM_ZERO=m | 903 | CONFIG_DM_ZERO=m |
953 | CONFIG_DM_MULTIPATH=m | 904 | CONFIG_DM_MULTIPATH=m |
954 | CONFIG_DM_MULTIPATH_EMC=m | 905 | CONFIG_DM_MULTIPATH_EMC=m |
906 | CONFIG_DM_MULTIPATH_RDAC=m | ||
907 | # CONFIG_DM_DELAY is not set | ||
955 | 908 | ||
956 | # | 909 | # |
957 | # Fusion MPT device support | 910 | # Fusion MPT device support |
@@ -964,30 +917,18 @@ CONFIG_DM_MULTIPATH_EMC=m | |||
964 | # | 917 | # |
965 | # IEEE 1394 (FireWire) support | 918 | # IEEE 1394 (FireWire) support |
966 | # | 919 | # |
920 | # CONFIG_FIREWIRE is not set | ||
967 | # CONFIG_IEEE1394 is not set | 921 | # CONFIG_IEEE1394 is not set |
968 | |||
969 | # | ||
970 | # I2O device support | ||
971 | # | ||
972 | # CONFIG_I2O is not set | 922 | # CONFIG_I2O is not set |
973 | |||
974 | # | ||
975 | # Network device support | ||
976 | # | ||
977 | CONFIG_NETDEVICES=y | 923 | CONFIG_NETDEVICES=y |
924 | CONFIG_NETDEVICES_MULTIQUEUE=y | ||
925 | CONFIG_IFB=m | ||
978 | CONFIG_DUMMY=m | 926 | CONFIG_DUMMY=m |
979 | CONFIG_BONDING=m | 927 | CONFIG_BONDING=m |
928 | CONFIG_MACVLAN=m | ||
980 | CONFIG_EQUALIZER=m | 929 | CONFIG_EQUALIZER=m |
981 | CONFIG_TUN=m | 930 | CONFIG_TUN=m |
982 | |||
983 | # | ||
984 | # ARCnet devices | ||
985 | # | ||
986 | # CONFIG_ARCNET is not set | 931 | # CONFIG_ARCNET is not set |
987 | |||
988 | # | ||
989 | # PHY device support | ||
990 | # | ||
991 | CONFIG_PHYLIB=m | 932 | CONFIG_PHYLIB=m |
992 | 933 | ||
993 | # | 934 | # |
@@ -1000,23 +941,17 @@ CONFIG_LXT_PHY=m | |||
1000 | CONFIG_CICADA_PHY=m | 941 | CONFIG_CICADA_PHY=m |
1001 | CONFIG_VITESSE_PHY=m | 942 | CONFIG_VITESSE_PHY=m |
1002 | CONFIG_SMSC_PHY=m | 943 | CONFIG_SMSC_PHY=m |
1003 | # CONFIG_BROADCOM_PHY is not set | 944 | CONFIG_BROADCOM_PHY=m |
945 | CONFIG_ICPLUS_PHY=m | ||
1004 | # CONFIG_FIXED_PHY is not set | 946 | # CONFIG_FIXED_PHY is not set |
1005 | |||
1006 | # | ||
1007 | # Ethernet (10 or 100Mbit) | ||
1008 | # | ||
1009 | CONFIG_NET_ETHERNET=y | 947 | CONFIG_NET_ETHERNET=y |
1010 | CONFIG_MII=y | 948 | CONFIG_MII=y |
949 | CONFIG_AX88796=m | ||
1011 | # CONFIG_HAPPYMEAL is not set | 950 | # CONFIG_HAPPYMEAL is not set |
1012 | # CONFIG_SUNGEM is not set | 951 | # CONFIG_SUNGEM is not set |
1013 | # CONFIG_CASSINI is not set | 952 | # CONFIG_CASSINI is not set |
1014 | # CONFIG_NET_VENDOR_3COM is not set | 953 | # CONFIG_NET_VENDOR_3COM is not set |
1015 | # CONFIG_DM9000 is not set | 954 | # CONFIG_DM9000 is not set |
1016 | |||
1017 | # | ||
1018 | # Tulip family network device support | ||
1019 | # | ||
1020 | # CONFIG_NET_TULIP is not set | 955 | # CONFIG_NET_TULIP is not set |
1021 | # CONFIG_HP100 is not set | 956 | # CONFIG_HP100 is not set |
1022 | CONFIG_NET_PCI=y | 957 | CONFIG_NET_PCI=y |
@@ -1026,6 +961,7 @@ CONFIG_PCNET32=y | |||
1026 | # CONFIG_ADAPTEC_STARFIRE is not set | 961 | # CONFIG_ADAPTEC_STARFIRE is not set |
1027 | # CONFIG_B44 is not set | 962 | # CONFIG_B44 is not set |
1028 | # CONFIG_FORCEDETH is not set | 963 | # CONFIG_FORCEDETH is not set |
964 | CONFIG_TC35815=m | ||
1029 | # CONFIG_DGRS is not set | 965 | # CONFIG_DGRS is not set |
1030 | # CONFIG_EEPRO100 is not set | 966 | # CONFIG_EEPRO100 is not set |
1031 | # CONFIG_E100 is not set | 967 | # CONFIG_E100 is not set |
@@ -1040,10 +976,7 @@ CONFIG_PCNET32=y | |||
1040 | # CONFIG_TLAN is not set | 976 | # CONFIG_TLAN is not set |
1041 | # CONFIG_VIA_RHINE is not set | 977 | # CONFIG_VIA_RHINE is not set |
1042 | # CONFIG_SC92031 is not set | 978 | # CONFIG_SC92031 is not set |
1043 | 979 | CONFIG_NETDEV_1000=y | |
1044 | # | ||
1045 | # Ethernet (1000 Mbit) | ||
1046 | # | ||
1047 | # CONFIG_ACENIC is not set | 980 | # CONFIG_ACENIC is not set |
1048 | # CONFIG_DL2K is not set | 981 | # CONFIG_DL2K is not set |
1049 | # CONFIG_E1000 is not set | 982 | # CONFIG_E1000 is not set |
@@ -1054,36 +987,58 @@ CONFIG_PCNET32=y | |||
1054 | # CONFIG_SIS190 is not set | 987 | # CONFIG_SIS190 is not set |
1055 | # CONFIG_SKGE is not set | 988 | # CONFIG_SKGE is not set |
1056 | # CONFIG_SKY2 is not set | 989 | # CONFIG_SKY2 is not set |
1057 | # CONFIG_SK98LIN is not set | ||
1058 | # CONFIG_VIA_VELOCITY is not set | 990 | # CONFIG_VIA_VELOCITY is not set |
1059 | # CONFIG_TIGON3 is not set | 991 | # CONFIG_TIGON3 is not set |
1060 | # CONFIG_BNX2 is not set | 992 | # CONFIG_BNX2 is not set |
1061 | # CONFIG_QLA3XXX is not set | 993 | # CONFIG_QLA3XXX is not set |
1062 | # CONFIG_ATL1 is not set | 994 | # CONFIG_ATL1 is not set |
1063 | 995 | CONFIG_NETDEV_10000=y | |
1064 | # | ||
1065 | # Ethernet (10000 Mbit) | ||
1066 | # | ||
1067 | # CONFIG_CHELSIO_T1 is not set | 996 | # CONFIG_CHELSIO_T1 is not set |
1068 | CONFIG_CHELSIO_T3=m | 997 | CONFIG_CHELSIO_T3=m |
1069 | # CONFIG_IXGB is not set | 998 | # CONFIG_IXGB is not set |
1070 | # CONFIG_S2IO is not set | 999 | # CONFIG_S2IO is not set |
1071 | # CONFIG_MYRI10GE is not set | 1000 | # CONFIG_MYRI10GE is not set |
1072 | CONFIG_NETXEN_NIC=m | 1001 | CONFIG_NETXEN_NIC=m |
1073 | 1002 | # CONFIG_MLX4_CORE is not set | |
1074 | # | ||
1075 | # Token Ring devices | ||
1076 | # | ||
1077 | # CONFIG_TR is not set | 1003 | # CONFIG_TR is not set |
1078 | 1004 | ||
1079 | # | 1005 | # |
1080 | # Wireless LAN (non-hamradio) | 1006 | # Wireless LAN |
1081 | # | 1007 | # |
1082 | # CONFIG_NET_RADIO is not set | 1008 | CONFIG_WLAN_PRE80211=y |
1083 | 1009 | CONFIG_STRIP=m | |
1084 | # | 1010 | CONFIG_WLAN_80211=y |
1085 | # Wan interfaces | 1011 | CONFIG_IPW2100=m |
1086 | # | 1012 | CONFIG_IPW2100_MONITOR=y |
1013 | # CONFIG_IPW2100_DEBUG is not set | ||
1014 | CONFIG_IPW2200=m | ||
1015 | CONFIG_IPW2200_MONITOR=y | ||
1016 | CONFIG_IPW2200_RADIOTAP=y | ||
1017 | CONFIG_IPW2200_PROMISCUOUS=y | ||
1018 | CONFIG_IPW2200_QOS=y | ||
1019 | # CONFIG_IPW2200_DEBUG is not set | ||
1020 | CONFIG_LIBERTAS=m | ||
1021 | # CONFIG_LIBERTAS_DEBUG is not set | ||
1022 | CONFIG_HERMES=m | ||
1023 | CONFIG_PLX_HERMES=m | ||
1024 | CONFIG_TMD_HERMES=m | ||
1025 | CONFIG_NORTEL_HERMES=m | ||
1026 | CONFIG_PCI_HERMES=m | ||
1027 | CONFIG_ATMEL=m | ||
1028 | CONFIG_PCI_ATMEL=m | ||
1029 | CONFIG_PRISM54=m | ||
1030 | CONFIG_HOSTAP=m | ||
1031 | CONFIG_HOSTAP_FIRMWARE=y | ||
1032 | CONFIG_HOSTAP_FIRMWARE_NVRAM=y | ||
1033 | CONFIG_HOSTAP_PLX=m | ||
1034 | CONFIG_HOSTAP_PCI=m | ||
1035 | CONFIG_BCM43XX=m | ||
1036 | CONFIG_BCM43XX_DEBUG=y | ||
1037 | CONFIG_BCM43XX_DMA=y | ||
1038 | CONFIG_BCM43XX_PIO=y | ||
1039 | CONFIG_BCM43XX_DMA_AND_PIO_MODE=y | ||
1040 | # CONFIG_BCM43XX_DMA_MODE is not set | ||
1041 | # CONFIG_BCM43XX_PIO_MODE is not set | ||
1087 | # CONFIG_WAN is not set | 1042 | # CONFIG_WAN is not set |
1088 | # CONFIG_FDDI is not set | 1043 | # CONFIG_FDDI is not set |
1089 | # CONFIG_HIPPI is not set | 1044 | # CONFIG_HIPPI is not set |
@@ -1094,15 +1049,7 @@ CONFIG_NETXEN_NIC=m | |||
1094 | # CONFIG_NETCONSOLE is not set | 1049 | # CONFIG_NETCONSOLE is not set |
1095 | # CONFIG_NETPOLL is not set | 1050 | # CONFIG_NETPOLL is not set |
1096 | # CONFIG_NET_POLL_CONTROLLER is not set | 1051 | # CONFIG_NET_POLL_CONTROLLER is not set |
1097 | |||
1098 | # | ||
1099 | # ISDN subsystem | ||
1100 | # | ||
1101 | # CONFIG_ISDN is not set | 1052 | # CONFIG_ISDN is not set |
1102 | |||
1103 | # | ||
1104 | # Telephony Support | ||
1105 | # | ||
1106 | # CONFIG_PHONE is not set | 1053 | # CONFIG_PHONE is not set |
1107 | 1054 | ||
1108 | # | 1055 | # |
@@ -1110,6 +1057,7 @@ CONFIG_NETXEN_NIC=m | |||
1110 | # | 1057 | # |
1111 | CONFIG_INPUT=y | 1058 | CONFIG_INPUT=y |
1112 | # CONFIG_INPUT_FF_MEMLESS is not set | 1059 | # CONFIG_INPUT_FF_MEMLESS is not set |
1060 | # CONFIG_INPUT_POLLDEV is not set | ||
1113 | 1061 | ||
1114 | # | 1062 | # |
1115 | # Userland interfaces | 1063 | # Userland interfaces |
@@ -1129,6 +1077,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
1129 | # CONFIG_INPUT_KEYBOARD is not set | 1077 | # CONFIG_INPUT_KEYBOARD is not set |
1130 | # CONFIG_INPUT_MOUSE is not set | 1078 | # CONFIG_INPUT_MOUSE is not set |
1131 | # CONFIG_INPUT_JOYSTICK is not set | 1079 | # CONFIG_INPUT_JOYSTICK is not set |
1080 | # CONFIG_INPUT_TABLET is not set | ||
1132 | # CONFIG_INPUT_TOUCHSCREEN is not set | 1081 | # CONFIG_INPUT_TOUCHSCREEN is not set |
1133 | # CONFIG_INPUT_MISC is not set | 1082 | # CONFIG_INPUT_MISC is not set |
1134 | 1083 | ||
@@ -1171,32 +1120,16 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
1171 | CONFIG_UNIX98_PTYS=y | 1120 | CONFIG_UNIX98_PTYS=y |
1172 | CONFIG_LEGACY_PTYS=y | 1121 | CONFIG_LEGACY_PTYS=y |
1173 | CONFIG_LEGACY_PTY_COUNT=256 | 1122 | CONFIG_LEGACY_PTY_COUNT=256 |
1174 | |||
1175 | # | ||
1176 | # IPMI | ||
1177 | # | ||
1178 | # CONFIG_IPMI_HANDLER is not set | 1123 | # CONFIG_IPMI_HANDLER is not set |
1179 | |||
1180 | # | ||
1181 | # Watchdog Cards | ||
1182 | # | ||
1183 | # CONFIG_WATCHDOG is not set | 1124 | # CONFIG_WATCHDOG is not set |
1184 | # CONFIG_HW_RANDOM is not set | 1125 | CONFIG_HW_RANDOM=m |
1185 | CONFIG_RTC=y | 1126 | CONFIG_RTC=y |
1186 | # CONFIG_DTLK is not set | ||
1187 | # CONFIG_R3964 is not set | 1127 | # CONFIG_R3964 is not set |
1188 | # CONFIG_APPLICOM is not set | 1128 | # CONFIG_APPLICOM is not set |
1189 | # CONFIG_DRM is not set | 1129 | # CONFIG_DRM is not set |
1190 | # CONFIG_RAW_DRIVER is not set | 1130 | # CONFIG_RAW_DRIVER is not set |
1191 | |||
1192 | # | ||
1193 | # TPM devices | ||
1194 | # | ||
1195 | # CONFIG_TCG_TPM is not set | 1131 | # CONFIG_TCG_TPM is not set |
1196 | 1132 | CONFIG_DEVPORT=y | |
1197 | # | ||
1198 | # I2C support | ||
1199 | # | ||
1200 | # CONFIG_I2C is not set | 1133 | # CONFIG_I2C is not set |
1201 | 1134 | ||
1202 | # | 1135 | # |
@@ -1204,32 +1137,33 @@ CONFIG_RTC=y | |||
1204 | # | 1137 | # |
1205 | # CONFIG_SPI is not set | 1138 | # CONFIG_SPI is not set |
1206 | # CONFIG_SPI_MASTER is not set | 1139 | # CONFIG_SPI_MASTER is not set |
1207 | |||
1208 | # | ||
1209 | # Dallas's 1-wire bus | ||
1210 | # | ||
1211 | # CONFIG_W1 is not set | 1140 | # CONFIG_W1 is not set |
1141 | # CONFIG_POWER_SUPPLY is not set | ||
1142 | # CONFIG_HWMON is not set | ||
1212 | 1143 | ||
1213 | # | 1144 | # |
1214 | # Hardware Monitoring support | 1145 | # Multifunction device drivers |
1215 | # | 1146 | # |
1216 | # CONFIG_HWMON is not set | 1147 | # CONFIG_MFD_SM501 is not set |
1217 | # CONFIG_HWMON_VID is not set | ||
1218 | 1148 | ||
1219 | # | 1149 | # |
1220 | # Multimedia devices | 1150 | # Multimedia devices |
1221 | # | 1151 | # |
1222 | # CONFIG_VIDEO_DEV is not set | 1152 | # CONFIG_VIDEO_DEV is not set |
1153 | # CONFIG_DVB_CORE is not set | ||
1154 | # CONFIG_DAB is not set | ||
1223 | 1155 | ||
1224 | # | 1156 | # |
1225 | # Digital Video Broadcasting Devices | 1157 | # Graphics support |
1226 | # | 1158 | # |
1227 | # CONFIG_DVB is not set | 1159 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
1228 | 1160 | ||
1229 | # | 1161 | # |
1230 | # Graphics support | 1162 | # Display device support |
1231 | # | 1163 | # |
1232 | # CONFIG_FIRMWARE_EDID is not set | 1164 | # CONFIG_DISPLAY_SUPPORT is not set |
1165 | # CONFIG_VGASTATE is not set | ||
1166 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
1233 | # CONFIG_FB is not set | 1167 | # CONFIG_FB is not set |
1234 | 1168 | ||
1235 | # | 1169 | # |
@@ -1237,22 +1171,15 @@ CONFIG_RTC=y | |||
1237 | # | 1171 | # |
1238 | # CONFIG_VGA_CONSOLE is not set | 1172 | # CONFIG_VGA_CONSOLE is not set |
1239 | CONFIG_DUMMY_CONSOLE=y | 1173 | CONFIG_DUMMY_CONSOLE=y |
1240 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
1241 | 1174 | ||
1242 | # | 1175 | # |
1243 | # Sound | 1176 | # Sound |
1244 | # | 1177 | # |
1245 | # CONFIG_SOUND is not set | 1178 | # CONFIG_SOUND is not set |
1246 | 1179 | CONFIG_HID_SUPPORT=y | |
1247 | # | ||
1248 | # HID Devices | ||
1249 | # | ||
1250 | CONFIG_HID=m | 1180 | CONFIG_HID=m |
1251 | # CONFIG_HID_DEBUG is not set | 1181 | # CONFIG_HID_DEBUG is not set |
1252 | 1182 | CONFIG_USB_SUPPORT=y | |
1253 | # | ||
1254 | # USB support | ||
1255 | # | ||
1256 | CONFIG_USB_ARCH_HAS_HCD=y | 1183 | CONFIG_USB_ARCH_HAS_HCD=y |
1257 | CONFIG_USB_ARCH_HAS_OHCI=y | 1184 | CONFIG_USB_ARCH_HAS_OHCI=y |
1258 | CONFIG_USB_ARCH_HAS_EHCI=y | 1185 | CONFIG_USB_ARCH_HAS_EHCI=y |
@@ -1266,37 +1193,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
1266 | # USB Gadget Support | 1193 | # USB Gadget Support |
1267 | # | 1194 | # |
1268 | # CONFIG_USB_GADGET is not set | 1195 | # CONFIG_USB_GADGET is not set |
1269 | |||
1270 | # | ||
1271 | # MMC/SD Card support | ||
1272 | # | ||
1273 | # CONFIG_MMC is not set | 1196 | # CONFIG_MMC is not set |
1274 | |||
1275 | # | ||
1276 | # LED devices | ||
1277 | # | ||
1278 | # CONFIG_NEW_LEDS is not set | 1197 | # CONFIG_NEW_LEDS is not set |
1279 | |||
1280 | # | ||
1281 | # LED drivers | ||
1282 | # | ||
1283 | |||
1284 | # | ||
1285 | # LED Triggers | ||
1286 | # | ||
1287 | |||
1288 | # | ||
1289 | # InfiniBand support | ||
1290 | # | ||
1291 | # CONFIG_INFINIBAND is not set | 1198 | # CONFIG_INFINIBAND is not set |
1292 | |||
1293 | # | ||
1294 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
1295 | # | ||
1296 | |||
1297 | # | ||
1298 | # Real Time Clock | ||
1299 | # | ||
1300 | # CONFIG_RTC_CLASS is not set | 1199 | # CONFIG_RTC_CLASS is not set |
1301 | 1200 | ||
1302 | # | 1201 | # |
@@ -1313,12 +1212,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
1313 | # | 1212 | # |
1314 | 1213 | ||
1315 | # | 1214 | # |
1316 | # Auxiliary Display support | 1215 | # Userspace I/O |
1317 | # | ||
1318 | |||
1319 | # | ||
1320 | # Virtualization | ||
1321 | # | 1216 | # |
1217 | CONFIG_UIO=m | ||
1218 | CONFIG_UIO_CIF=m | ||
1322 | 1219 | ||
1323 | # | 1220 | # |
1324 | # File systems | 1221 | # File systems |
@@ -1451,6 +1348,7 @@ CONFIG_LOCKD_V4=y | |||
1451 | CONFIG_EXPORTFS=y | 1348 | CONFIG_EXPORTFS=y |
1452 | CONFIG_NFS_COMMON=y | 1349 | CONFIG_NFS_COMMON=y |
1453 | CONFIG_SUNRPC=y | 1350 | CONFIG_SUNRPC=y |
1351 | # CONFIG_SUNRPC_BIND34 is not set | ||
1454 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1352 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1455 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1353 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1456 | # CONFIG_SMB_FS is not set | 1354 | # CONFIG_SMB_FS is not set |
@@ -1458,7 +1356,6 @@ CONFIG_SUNRPC=y | |||
1458 | # CONFIG_NCP_FS is not set | 1356 | # CONFIG_NCP_FS is not set |
1459 | # CONFIG_CODA_FS is not set | 1357 | # CONFIG_CODA_FS is not set |
1460 | # CONFIG_AFS_FS is not set | 1358 | # CONFIG_AFS_FS is not set |
1461 | # CONFIG_9P_FS is not set | ||
1462 | 1359 | ||
1463 | # | 1360 | # |
1464 | # Partition Types | 1361 | # Partition Types |
@@ -1531,7 +1428,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1531 | # CONFIG_DEBUG_FS is not set | 1428 | # CONFIG_DEBUG_FS is not set |
1532 | # CONFIG_HEADERS_CHECK is not set | 1429 | # CONFIG_HEADERS_CHECK is not set |
1533 | # CONFIG_DEBUG_KERNEL is not set | 1430 | # CONFIG_DEBUG_KERNEL is not set |
1534 | CONFIG_LOG_BUF_SHIFT=15 | ||
1535 | CONFIG_CROSSCOMPILE=y | 1431 | CONFIG_CROSSCOMPILE=y |
1536 | CONFIG_CMDLINE="" | 1432 | CONFIG_CMDLINE="" |
1537 | 1433 | ||
@@ -1540,12 +1436,13 @@ CONFIG_CMDLINE="" | |||
1540 | # | 1436 | # |
1541 | # CONFIG_KEYS is not set | 1437 | # CONFIG_KEYS is not set |
1542 | # CONFIG_SECURITY is not set | 1438 | # CONFIG_SECURITY is not set |
1543 | 1439 | CONFIG_XOR_BLOCKS=m | |
1544 | # | 1440 | CONFIG_ASYNC_CORE=m |
1545 | # Cryptographic options | 1441 | CONFIG_ASYNC_MEMCPY=m |
1546 | # | 1442 | CONFIG_ASYNC_XOR=m |
1547 | CONFIG_CRYPTO=y | 1443 | CONFIG_CRYPTO=y |
1548 | CONFIG_CRYPTO_ALGAPI=y | 1444 | CONFIG_CRYPTO_ALGAPI=y |
1445 | CONFIG_CRYPTO_ABLKCIPHER=m | ||
1549 | CONFIG_CRYPTO_BLKCIPHER=m | 1446 | CONFIG_CRYPTO_BLKCIPHER=m |
1550 | CONFIG_CRYPTO_HASH=y | 1447 | CONFIG_CRYPTO_HASH=y |
1551 | CONFIG_CRYPTO_MANAGER=y | 1448 | CONFIG_CRYPTO_MANAGER=y |
@@ -1564,6 +1461,7 @@ CONFIG_CRYPTO_ECB=m | |||
1564 | CONFIG_CRYPTO_CBC=m | 1461 | CONFIG_CRYPTO_CBC=m |
1565 | CONFIG_CRYPTO_PCBC=m | 1462 | CONFIG_CRYPTO_PCBC=m |
1566 | CONFIG_CRYPTO_LRW=m | 1463 | CONFIG_CRYPTO_LRW=m |
1464 | CONFIG_CRYPTO_CRYPTD=m | ||
1567 | CONFIG_CRYPTO_DES=m | 1465 | CONFIG_CRYPTO_DES=m |
1568 | CONFIG_CRYPTO_FCRYPT=m | 1466 | CONFIG_CRYPTO_FCRYPT=m |
1569 | CONFIG_CRYPTO_BLOWFISH=m | 1467 | CONFIG_CRYPTO_BLOWFISH=m |
@@ -1582,10 +1480,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=m | |||
1582 | CONFIG_CRYPTO_CRC32C=m | 1480 | CONFIG_CRYPTO_CRC32C=m |
1583 | CONFIG_CRYPTO_CAMELLIA=m | 1481 | CONFIG_CRYPTO_CAMELLIA=m |
1584 | # CONFIG_CRYPTO_TEST is not set | 1482 | # CONFIG_CRYPTO_TEST is not set |
1585 | 1483 | CONFIG_CRYPTO_HW=y | |
1586 | # | ||
1587 | # Hardware crypto devices | ||
1588 | # | ||
1589 | 1484 | ||
1590 | # | 1485 | # |
1591 | # Library routines | 1486 | # Library routines |
@@ -1593,7 +1488,9 @@ CONFIG_CRYPTO_CAMELLIA=m | |||
1593 | CONFIG_BITREVERSE=y | 1488 | CONFIG_BITREVERSE=y |
1594 | # CONFIG_CRC_CCITT is not set | 1489 | # CONFIG_CRC_CCITT is not set |
1595 | CONFIG_CRC16=m | 1490 | CONFIG_CRC16=m |
1491 | # CONFIG_CRC_ITU_T is not set | ||
1596 | CONFIG_CRC32=y | 1492 | CONFIG_CRC32=y |
1493 | # CONFIG_CRC7 is not set | ||
1597 | CONFIG_LIBCRC32C=m | 1494 | CONFIG_LIBCRC32C=m |
1598 | CONFIG_ZLIB_INFLATE=m | 1495 | CONFIG_ZLIB_INFLATE=m |
1599 | CONFIG_ZLIB_DEFLATE=m | 1496 | CONFIG_ZLIB_DEFLATE=m |
@@ -1604,3 +1501,4 @@ CONFIG_TEXTSEARCH_FSM=m | |||
1604 | CONFIG_PLIST=y | 1501 | CONFIG_PLIST=y |
1605 | CONFIG_HAS_IOMEM=y | 1502 | CONFIG_HAS_IOMEM=y |
1606 | CONFIG_HAS_IOPORT=y | 1503 | CONFIG_HAS_IOPORT=y |
1504 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig index 239810b6c88d..8334350d7229 100644 --- a/arch/mips/configs/mpc30x_defconfig +++ b/arch/mips/configs/mpc30x_defconfig | |||
@@ -1,60 +1,47 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.20 | 3 | # Linux kernel version: 2.6.23-rc2 |
4 | # Tue Feb 20 21:47:35 2007 | 4 | # Wed Aug 8 15:09:51 2007 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
8 | # | 8 | # |
9 | # Machine selection | 9 | # Machine selection |
10 | # | 10 | # |
11 | CONFIG_ZONE_DMA=y | 11 | # CONFIG_MACH_ALCHEMY is not set |
12 | # CONFIG_MIPS_MTX1 is not set | ||
13 | # CONFIG_MIPS_BOSPORUS is not set | ||
14 | # CONFIG_MIPS_PB1000 is not set | ||
15 | # CONFIG_MIPS_PB1100 is not set | ||
16 | # CONFIG_MIPS_PB1500 is not set | ||
17 | # CONFIG_MIPS_PB1550 is not set | ||
18 | # CONFIG_MIPS_PB1200 is not set | ||
19 | # CONFIG_MIPS_DB1000 is not set | ||
20 | # CONFIG_MIPS_DB1100 is not set | ||
21 | # CONFIG_MIPS_DB1500 is not set | ||
22 | # CONFIG_MIPS_DB1550 is not set | ||
23 | # CONFIG_MIPS_DB1200 is not set | ||
24 | # CONFIG_MIPS_MIRAGE is not set | ||
25 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
26 | # CONFIG_MIPS_COBALT is not set | 13 | # CONFIG_MIPS_COBALT is not set |
27 | # CONFIG_MACH_DECSTATION is not set | 14 | # CONFIG_MACH_DECSTATION is not set |
28 | # CONFIG_MACH_JAZZ is not set | 15 | # CONFIG_MACH_JAZZ is not set |
16 | # CONFIG_LEMOTE_FULONG is not set | ||
29 | # CONFIG_MIPS_ATLAS is not set | 17 | # CONFIG_MIPS_ATLAS is not set |
30 | # CONFIG_MIPS_MALTA is not set | 18 | # CONFIG_MIPS_MALTA is not set |
31 | # CONFIG_MIPS_SEAD is not set | 19 | # CONFIG_MIPS_SEAD is not set |
32 | # CONFIG_WR_PPMC is not set | ||
33 | # CONFIG_MIPS_SIM is not set | 20 | # CONFIG_MIPS_SIM is not set |
34 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 21 | # CONFIG_MARKEINS is not set |
35 | # CONFIG_MIPS_XXS1500 is not set | 22 | CONFIG_MACH_VR41XX=y |
36 | # CONFIG_PNX8550_JBS is not set | 23 | # CONFIG_PNX8550_JBS is not set |
37 | # CONFIG_PNX8550_STB810 is not set | 24 | # CONFIG_PNX8550_STB810 is not set |
38 | CONFIG_MACH_VR41XX=y | 25 | # CONFIG_PMC_MSP is not set |
39 | # CONFIG_PMC_YOSEMITE is not set | 26 | # CONFIG_PMC_YOSEMITE is not set |
40 | # CONFIG_QEMU is not set | 27 | # CONFIG_QEMU is not set |
41 | # CONFIG_MARKEINS is not set | ||
42 | # CONFIG_SGI_IP22 is not set | 28 | # CONFIG_SGI_IP22 is not set |
43 | # CONFIG_SGI_IP27 is not set | 29 | # CONFIG_SGI_IP27 is not set |
44 | # CONFIG_SGI_IP32 is not set | 30 | # CONFIG_SGI_IP32 is not set |
45 | # CONFIG_SIBYTE_BIGSUR is not set | 31 | # CONFIG_SIBYTE_CRHINE is not set |
32 | # CONFIG_SIBYTE_CARMEL is not set | ||
33 | # CONFIG_SIBYTE_CRHONE is not set | ||
34 | # CONFIG_SIBYTE_RHONE is not set | ||
46 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | ||
49 | # CONFIG_SIBYTE_CARMEL is not set | ||
50 | # CONFIG_SIBYTE_PTSWARM is not set | 38 | # CONFIG_SIBYTE_PTSWARM is not set |
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 39 | # CONFIG_SIBYTE_BIGSUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | ||
53 | # CONFIG_SIBYTE_CRHONE is not set | ||
54 | # CONFIG_SNI_RM is not set | 40 | # CONFIG_SNI_RM is not set |
55 | # CONFIG_TOSHIBA_JMR3927 is not set | 41 | # CONFIG_TOSHIBA_JMR3927 is not set |
56 | # CONFIG_TOSHIBA_RBTX4927 is not set | 42 | # CONFIG_TOSHIBA_RBTX4927 is not set |
57 | # CONFIG_TOSHIBA_RBTX4938 is not set | 43 | # CONFIG_TOSHIBA_RBTX4938 is not set |
44 | # CONFIG_WR_PPMC is not set | ||
58 | # CONFIG_CASIO_E55 is not set | 45 | # CONFIG_CASIO_E55 is not set |
59 | # CONFIG_IBM_WORKPAD is not set | 46 | # CONFIG_IBM_WORKPAD is not set |
60 | # CONFIG_NEC_CMBVR4133 is not set | 47 | # CONFIG_NEC_CMBVR4133 is not set |
@@ -73,6 +60,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
73 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 60 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
74 | CONFIG_DMA_NONCOHERENT=y | 61 | CONFIG_DMA_NONCOHERENT=y |
75 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 62 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
63 | # CONFIG_HOTPLUG_CPU is not set | ||
64 | # CONFIG_NO_IOPORT is not set | ||
76 | # CONFIG_CPU_BIG_ENDIAN is not set | 65 | # CONFIG_CPU_BIG_ENDIAN is not set |
77 | CONFIG_CPU_LITTLE_ENDIAN=y | 66 | CONFIG_CPU_LITTLE_ENDIAN=y |
78 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 67 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
@@ -82,6 +71,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
82 | # | 71 | # |
83 | # CPU selection | 72 | # CPU selection |
84 | # | 73 | # |
74 | # CONFIG_CPU_LOONGSON2 is not set | ||
85 | # CONFIG_CPU_MIPS32_R1 is not set | 75 | # CONFIG_CPU_MIPS32_R1 is not set |
86 | # CONFIG_CPU_MIPS32_R2 is not set | 76 | # CONFIG_CPU_MIPS32_R2 is not set |
87 | # CONFIG_CPU_MIPS64_R1 is not set | 77 | # CONFIG_CPU_MIPS64_R1 is not set |
@@ -103,7 +93,6 @@ CONFIG_CPU_VR41XX=y | |||
103 | # CONFIG_CPU_SB1 is not set | 93 | # CONFIG_CPU_SB1 is not set |
104 | CONFIG_SYS_HAS_CPU_VR41XX=y | 94 | CONFIG_SYS_HAS_CPU_VR41XX=y |
105 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y | 95 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y |
106 | CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y | ||
107 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y | 96 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y |
108 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y | 97 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y |
109 | 98 | ||
@@ -119,7 +108,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
119 | CONFIG_MIPS_MT_DISABLED=y | 108 | CONFIG_MIPS_MT_DISABLED=y |
120 | # CONFIG_MIPS_MT_SMP is not set | 109 | # CONFIG_MIPS_MT_SMP is not set |
121 | # CONFIG_MIPS_MT_SMTC is not set | 110 | # CONFIG_MIPS_MT_SMTC is not set |
122 | # CONFIG_MIPS_VPE_LOADER is not set | ||
123 | CONFIG_CPU_HAS_SYNC=y | 111 | CONFIG_CPU_HAS_SYNC=y |
124 | CONFIG_GENERIC_HARDIRQS=y | 112 | CONFIG_GENERIC_HARDIRQS=y |
125 | CONFIG_GENERIC_IRQ_PROBE=y | 113 | CONFIG_GENERIC_IRQ_PROBE=y |
@@ -133,48 +121,47 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
133 | # CONFIG_SPARSEMEM_STATIC is not set | 121 | # CONFIG_SPARSEMEM_STATIC is not set |
134 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 122 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
135 | # CONFIG_RESOURCES_64BIT is not set | 123 | # CONFIG_RESOURCES_64BIT is not set |
136 | CONFIG_ZONE_DMA_FLAG=1 | 124 | CONFIG_ZONE_DMA_FLAG=0 |
125 | CONFIG_VIRT_TO_BUS=y | ||
137 | # CONFIG_HZ_48 is not set | 126 | # CONFIG_HZ_48 is not set |
138 | # CONFIG_HZ_100 is not set | 127 | # CONFIG_HZ_100 is not set |
139 | # CONFIG_HZ_128 is not set | 128 | # CONFIG_HZ_128 is not set |
140 | # CONFIG_HZ_250 is not set | 129 | CONFIG_HZ_250=y |
141 | # CONFIG_HZ_256 is not set | 130 | # CONFIG_HZ_256 is not set |
142 | CONFIG_HZ_1000=y | 131 | # CONFIG_HZ_1000 is not set |
143 | # CONFIG_HZ_1024 is not set | 132 | # CONFIG_HZ_1024 is not set |
144 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y | 133 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y |
145 | CONFIG_HZ=1000 | 134 | CONFIG_HZ=250 |
146 | CONFIG_PREEMPT_NONE=y | 135 | CONFIG_PREEMPT_NONE=y |
147 | # CONFIG_PREEMPT_VOLUNTARY is not set | 136 | # CONFIG_PREEMPT_VOLUNTARY is not set |
148 | # CONFIG_PREEMPT is not set | 137 | # CONFIG_PREEMPT is not set |
149 | # CONFIG_KEXEC is not set | 138 | # CONFIG_KEXEC is not set |
139 | CONFIG_SECCOMP=y | ||
150 | CONFIG_LOCKDEP_SUPPORT=y | 140 | CONFIG_LOCKDEP_SUPPORT=y |
151 | CONFIG_STACKTRACE_SUPPORT=y | 141 | CONFIG_STACKTRACE_SUPPORT=y |
152 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 142 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
153 | 143 | ||
154 | # | 144 | # |
155 | # Code maturity level options | 145 | # General setup |
156 | # | 146 | # |
157 | CONFIG_EXPERIMENTAL=y | 147 | CONFIG_EXPERIMENTAL=y |
158 | CONFIG_BROKEN_ON_SMP=y | 148 | CONFIG_BROKEN_ON_SMP=y |
159 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 149 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
160 | |||
161 | # | ||
162 | # General setup | ||
163 | # | ||
164 | CONFIG_LOCALVERSION="" | 150 | CONFIG_LOCALVERSION="" |
165 | CONFIG_LOCALVERSION_AUTO=y | 151 | CONFIG_LOCALVERSION_AUTO=y |
166 | CONFIG_SWAP=y | 152 | CONFIG_SWAP=y |
167 | CONFIG_SYSVIPC=y | 153 | CONFIG_SYSVIPC=y |
168 | # CONFIG_IPC_NS is not set | ||
169 | CONFIG_SYSVIPC_SYSCTL=y | 154 | CONFIG_SYSVIPC_SYSCTL=y |
170 | # CONFIG_POSIX_MQUEUE is not set | 155 | # CONFIG_POSIX_MQUEUE is not set |
171 | # CONFIG_BSD_PROCESS_ACCT is not set | 156 | # CONFIG_BSD_PROCESS_ACCT is not set |
172 | # CONFIG_TASKSTATS is not set | 157 | # CONFIG_TASKSTATS is not set |
173 | # CONFIG_UTS_NS is not set | 158 | # CONFIG_USER_NS is not set |
174 | # CONFIG_AUDIT is not set | 159 | # CONFIG_AUDIT is not set |
175 | # CONFIG_IKCONFIG is not set | 160 | # CONFIG_IKCONFIG is not set |
161 | CONFIG_LOG_BUF_SHIFT=14 | ||
176 | CONFIG_SYSFS_DEPRECATED=y | 162 | CONFIG_SYSFS_DEPRECATED=y |
177 | CONFIG_RELAY=y | 163 | CONFIG_RELAY=y |
164 | # CONFIG_BLK_DEV_INITRD is not set | ||
178 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 165 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
179 | CONFIG_SYSCTL=y | 166 | CONFIG_SYSCTL=y |
180 | CONFIG_EMBEDDED=y | 167 | CONFIG_EMBEDDED=y |
@@ -187,32 +174,30 @@ CONFIG_BUG=y | |||
187 | CONFIG_ELF_CORE=y | 174 | CONFIG_ELF_CORE=y |
188 | CONFIG_BASE_FULL=y | 175 | CONFIG_BASE_FULL=y |
189 | CONFIG_FUTEX=y | 176 | CONFIG_FUTEX=y |
177 | CONFIG_ANON_INODES=y | ||
190 | CONFIG_EPOLL=y | 178 | CONFIG_EPOLL=y |
179 | CONFIG_SIGNALFD=y | ||
180 | CONFIG_TIMERFD=y | ||
181 | CONFIG_EVENTFD=y | ||
191 | CONFIG_SHMEM=y | 182 | CONFIG_SHMEM=y |
192 | CONFIG_SLAB=y | ||
193 | CONFIG_VM_EVENT_COUNTERS=y | 183 | CONFIG_VM_EVENT_COUNTERS=y |
184 | CONFIG_SLAB=y | ||
185 | # CONFIG_SLUB is not set | ||
186 | # CONFIG_SLOB is not set | ||
194 | CONFIG_RT_MUTEXES=y | 187 | CONFIG_RT_MUTEXES=y |
195 | # CONFIG_TINY_SHMEM is not set | 188 | # CONFIG_TINY_SHMEM is not set |
196 | CONFIG_BASE_SMALL=0 | 189 | CONFIG_BASE_SMALL=0 |
197 | # CONFIG_SLOB is not set | ||
198 | |||
199 | # | ||
200 | # Loadable module support | ||
201 | # | ||
202 | CONFIG_MODULES=y | 190 | CONFIG_MODULES=y |
203 | CONFIG_MODULE_UNLOAD=y | 191 | CONFIG_MODULE_UNLOAD=y |
204 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 192 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
205 | CONFIG_MODVERSIONS=y | 193 | CONFIG_MODVERSIONS=y |
206 | CONFIG_MODULE_SRCVERSION_ALL=y | 194 | CONFIG_MODULE_SRCVERSION_ALL=y |
207 | CONFIG_KMOD=y | 195 | CONFIG_KMOD=y |
208 | |||
209 | # | ||
210 | # Block layer | ||
211 | # | ||
212 | CONFIG_BLOCK=y | 196 | CONFIG_BLOCK=y |
213 | # CONFIG_LBD is not set | 197 | # CONFIG_LBD is not set |
214 | # CONFIG_BLK_DEV_IO_TRACE is not set | 198 | # CONFIG_BLK_DEV_IO_TRACE is not set |
215 | # CONFIG_LSF is not set | 199 | # CONFIG_LSF is not set |
200 | # CONFIG_BLK_DEV_BSG is not set | ||
216 | 201 | ||
217 | # | 202 | # |
218 | # IO Schedulers | 203 | # IO Schedulers |
@@ -232,29 +217,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
232 | # | 217 | # |
233 | CONFIG_HW_HAS_PCI=y | 218 | CONFIG_HW_HAS_PCI=y |
234 | CONFIG_PCI=y | 219 | CONFIG_PCI=y |
220 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
235 | CONFIG_MMU=y | 221 | CONFIG_MMU=y |
236 | 222 | ||
237 | # | 223 | # |
238 | # PCCARD (PCMCIA/CardBus) support | 224 | # PCCARD (PCMCIA/CardBus) support |
239 | # | 225 | # |
240 | CONFIG_PCCARD=y | 226 | # CONFIG_PCCARD is not set |
241 | # CONFIG_PCMCIA_DEBUG is not set | ||
242 | CONFIG_PCMCIA=y | ||
243 | CONFIG_PCMCIA_LOAD_CIS=y | ||
244 | CONFIG_PCMCIA_IOCTL=y | ||
245 | # CONFIG_CARDBUS is not set | ||
246 | |||
247 | # | ||
248 | # PC-card bridges | ||
249 | # | ||
250 | # CONFIG_YENTA is not set | ||
251 | # CONFIG_PD6729 is not set | ||
252 | # CONFIG_I82092 is not set | ||
253 | # CONFIG_PCMCIA_VRC4173 is not set | ||
254 | |||
255 | # | ||
256 | # PCI Hotplug Support | ||
257 | # | ||
258 | # CONFIG_HOTPLUG_PCI is not set | 227 | # CONFIG_HOTPLUG_PCI is not set |
259 | 228 | ||
260 | # | 229 | # |
@@ -267,10 +236,7 @@ CONFIG_TRAD_SIGNALS=y | |||
267 | # | 236 | # |
268 | # Power management options | 237 | # Power management options |
269 | # | 238 | # |
270 | CONFIG_PM=y | 239 | # CONFIG_PM is not set |
271 | # CONFIG_PM_LEGACY is not set | ||
272 | # CONFIG_PM_DEBUG is not set | ||
273 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
274 | 240 | ||
275 | # | 241 | # |
276 | # Networking | 242 | # Networking |
@@ -280,7 +246,6 @@ CONFIG_NET=y | |||
280 | # | 246 | # |
281 | # Networking options | 247 | # Networking options |
282 | # | 248 | # |
283 | # CONFIG_NETDEBUG is not set | ||
284 | CONFIG_PACKET=y | 249 | CONFIG_PACKET=y |
285 | CONFIG_PACKET_MMAP=y | 250 | CONFIG_PACKET_MMAP=y |
286 | CONFIG_UNIX=y | 251 | CONFIG_UNIX=y |
@@ -313,26 +278,17 @@ CONFIG_INET_TCP_DIAG=y | |||
313 | # CONFIG_TCP_CONG_ADVANCED is not set | 278 | # CONFIG_TCP_CONG_ADVANCED is not set |
314 | CONFIG_TCP_CONG_CUBIC=y | 279 | CONFIG_TCP_CONG_CUBIC=y |
315 | CONFIG_DEFAULT_TCP_CONG="cubic" | 280 | CONFIG_DEFAULT_TCP_CONG="cubic" |
316 | CONFIG_TCP_MD5SIG=y | 281 | # CONFIG_TCP_MD5SIG is not set |
317 | # CONFIG_IPV6 is not set | 282 | # CONFIG_IPV6 is not set |
318 | # CONFIG_INET6_XFRM_TUNNEL is not set | 283 | # CONFIG_INET6_XFRM_TUNNEL is not set |
319 | # CONFIG_INET6_TUNNEL is not set | 284 | # CONFIG_INET6_TUNNEL is not set |
320 | CONFIG_NETWORK_SECMARK=y | 285 | CONFIG_NETWORK_SECMARK=y |
321 | # CONFIG_NETFILTER is not set | 286 | # CONFIG_NETFILTER is not set |
322 | |||
323 | # | ||
324 | # DCCP Configuration (EXPERIMENTAL) | ||
325 | # | ||
326 | # CONFIG_IP_DCCP is not set | 287 | # CONFIG_IP_DCCP is not set |
327 | |||
328 | # | ||
329 | # SCTP Configuration (EXPERIMENTAL) | ||
330 | # | ||
331 | # CONFIG_IP_SCTP is not set | 288 | # CONFIG_IP_SCTP is not set |
332 | 289 | # CONFIG_SCTP_HMAC_NONE is not set | |
333 | # | 290 | # CONFIG_SCTP_HMAC_SHA1 is not set |
334 | # TIPC Configuration (EXPERIMENTAL) | 291 | # CONFIG_SCTP_HMAC_MD5 is not set |
335 | # | ||
336 | # CONFIG_TIPC is not set | 292 | # CONFIG_TIPC is not set |
337 | # CONFIG_ATM is not set | 293 | # CONFIG_ATM is not set |
338 | # CONFIG_BRIDGE is not set | 294 | # CONFIG_BRIDGE is not set |
@@ -358,14 +314,17 @@ CONFIG_NETWORK_SECMARK=y | |||
358 | # CONFIG_HAMRADIO is not set | 314 | # CONFIG_HAMRADIO is not set |
359 | # CONFIG_IRDA is not set | 315 | # CONFIG_IRDA is not set |
360 | # CONFIG_BT is not set | 316 | # CONFIG_BT is not set |
361 | CONFIG_IEEE80211=m | 317 | # CONFIG_AF_RXRPC is not set |
362 | # CONFIG_IEEE80211_DEBUG is not set | 318 | |
363 | CONFIG_IEEE80211_CRYPT_WEP=m | 319 | # |
364 | CONFIG_IEEE80211_CRYPT_CCMP=m | 320 | # Wireless |
365 | CONFIG_IEEE80211_CRYPT_TKIP=m | 321 | # |
366 | CONFIG_IEEE80211_SOFTMAC=m | 322 | # CONFIG_CFG80211 is not set |
367 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | 323 | # CONFIG_WIRELESS_EXT is not set |
368 | CONFIG_WIRELESS_EXT=y | 324 | # CONFIG_MAC80211 is not set |
325 | # CONFIG_IEEE80211 is not set | ||
326 | # CONFIG_RFKILL is not set | ||
327 | # CONFIG_NET_9P is not set | ||
369 | 328 | ||
370 | # | 329 | # |
371 | # Device Drivers | 330 | # Device Drivers |
@@ -378,30 +337,10 @@ CONFIG_STANDALONE=y | |||
378 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 337 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
379 | CONFIG_FW_LOADER=y | 338 | CONFIG_FW_LOADER=y |
380 | # CONFIG_SYS_HYPERVISOR is not set | 339 | # CONFIG_SYS_HYPERVISOR is not set |
381 | |||
382 | # | ||
383 | # Connector - unified userspace <-> kernelspace linker | ||
384 | # | ||
385 | CONFIG_CONNECTOR=m | 340 | CONFIG_CONNECTOR=m |
386 | |||
387 | # | ||
388 | # Memory Technology Devices (MTD) | ||
389 | # | ||
390 | # CONFIG_MTD is not set | 341 | # CONFIG_MTD is not set |
391 | |||
392 | # | ||
393 | # Parallel port support | ||
394 | # | ||
395 | # CONFIG_PARPORT is not set | 342 | # CONFIG_PARPORT is not set |
396 | 343 | CONFIG_BLK_DEV=y | |
397 | # | ||
398 | # Plug and Play support | ||
399 | # | ||
400 | # CONFIG_PNPACPI is not set | ||
401 | |||
402 | # | ||
403 | # Block devices | ||
404 | # | ||
405 | # CONFIG_BLK_CPQ_DA is not set | 344 | # CONFIG_BLK_CPQ_DA is not set |
406 | # CONFIG_BLK_CPQ_CISS_DA is not set | 345 | # CONFIG_BLK_CPQ_CISS_DA is not set |
407 | # CONFIG_BLK_DEV_DAC960 is not set | 346 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -412,19 +351,9 @@ CONFIG_CONNECTOR=m | |||
412 | # CONFIG_BLK_DEV_SX8 is not set | 351 | # CONFIG_BLK_DEV_SX8 is not set |
413 | # CONFIG_BLK_DEV_UB is not set | 352 | # CONFIG_BLK_DEV_UB is not set |
414 | # CONFIG_BLK_DEV_RAM is not set | 353 | # CONFIG_BLK_DEV_RAM is not set |
415 | # CONFIG_BLK_DEV_INITRD is not set | ||
416 | # CONFIG_CDROM_PKTCDVD is not set | 354 | # CONFIG_CDROM_PKTCDVD is not set |
417 | CONFIG_ATA_OVER_ETH=m | 355 | CONFIG_ATA_OVER_ETH=m |
418 | 356 | # CONFIG_MISC_DEVICES is not set | |
419 | # | ||
420 | # Misc devices | ||
421 | # | ||
422 | CONFIG_SGI_IOC4=m | ||
423 | # CONFIG_TIFM_CORE is not set | ||
424 | |||
425 | # | ||
426 | # ATA/ATAPI/MFM/RLL support | ||
427 | # | ||
428 | CONFIG_IDE=y | 357 | CONFIG_IDE=y |
429 | CONFIG_IDE_MAX_HWIFS=4 | 358 | CONFIG_IDE_MAX_HWIFS=4 |
430 | CONFIG_BLK_DEV_IDE=y | 359 | CONFIG_BLK_DEV_IDE=y |
@@ -435,20 +364,20 @@ CONFIG_BLK_DEV_IDE=y | |||
435 | # CONFIG_BLK_DEV_IDE_SATA is not set | 364 | # CONFIG_BLK_DEV_IDE_SATA is not set |
436 | CONFIG_BLK_DEV_IDEDISK=y | 365 | CONFIG_BLK_DEV_IDEDISK=y |
437 | # CONFIG_IDEDISK_MULTI_MODE is not set | 366 | # CONFIG_IDEDISK_MULTI_MODE is not set |
438 | CONFIG_BLK_DEV_IDECS=m | ||
439 | # CONFIG_BLK_DEV_IDECD is not set | 367 | # CONFIG_BLK_DEV_IDECD is not set |
440 | # CONFIG_BLK_DEV_IDETAPE is not set | 368 | # CONFIG_BLK_DEV_IDETAPE is not set |
441 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | 369 | # CONFIG_BLK_DEV_IDEFLOPPY is not set |
442 | # CONFIG_IDE_TASK_IOCTL is not set | 370 | # CONFIG_IDE_TASK_IOCTL is not set |
371 | CONFIG_IDE_PROC_FS=y | ||
443 | 372 | ||
444 | # | 373 | # |
445 | # IDE chipset support/bugfixes | 374 | # IDE chipset support/bugfixes |
446 | # | 375 | # |
447 | CONFIG_IDE_GENERIC=y | 376 | CONFIG_IDE_GENERIC=y |
448 | # CONFIG_BLK_DEV_IDEPCI is not set | 377 | # CONFIG_BLK_DEV_IDEPCI is not set |
378 | # CONFIG_IDEPCI_PCIBUS_ORDER is not set | ||
449 | # CONFIG_IDE_ARM is not set | 379 | # CONFIG_IDE_ARM is not set |
450 | # CONFIG_BLK_DEV_IDEDMA is not set | 380 | # CONFIG_BLK_DEV_IDEDMA is not set |
451 | # CONFIG_IDEDMA_AUTO is not set | ||
452 | # CONFIG_BLK_DEV_HD is not set | 381 | # CONFIG_BLK_DEV_HD is not set |
453 | 382 | ||
454 | # | 383 | # |
@@ -456,16 +385,9 @@ CONFIG_IDE_GENERIC=y | |||
456 | # | 385 | # |
457 | # CONFIG_RAID_ATTRS is not set | 386 | # CONFIG_RAID_ATTRS is not set |
458 | # CONFIG_SCSI is not set | 387 | # CONFIG_SCSI is not set |
388 | # CONFIG_SCSI_DMA is not set | ||
459 | # CONFIG_SCSI_NETLINK is not set | 389 | # CONFIG_SCSI_NETLINK is not set |
460 | |||
461 | # | ||
462 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
463 | # | ||
464 | # CONFIG_ATA is not set | 390 | # CONFIG_ATA is not set |
465 | |||
466 | # | ||
467 | # Multi-device support (RAID and LVM) | ||
468 | # | ||
469 | # CONFIG_MD is not set | 391 | # CONFIG_MD is not set |
470 | 392 | ||
471 | # | 393 | # |
@@ -476,135 +398,38 @@ CONFIG_IDE_GENERIC=y | |||
476 | # | 398 | # |
477 | # IEEE 1394 (FireWire) support | 399 | # IEEE 1394 (FireWire) support |
478 | # | 400 | # |
401 | # CONFIG_FIREWIRE is not set | ||
479 | # CONFIG_IEEE1394 is not set | 402 | # CONFIG_IEEE1394 is not set |
480 | |||
481 | # | ||
482 | # I2O device support | ||
483 | # | ||
484 | # CONFIG_I2O is not set | 403 | # CONFIG_I2O is not set |
485 | |||
486 | # | ||
487 | # Network device support | ||
488 | # | ||
489 | CONFIG_NETDEVICES=y | 404 | CONFIG_NETDEVICES=y |
405 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
490 | # CONFIG_DUMMY is not set | 406 | # CONFIG_DUMMY is not set |
491 | # CONFIG_BONDING is not set | 407 | # CONFIG_BONDING is not set |
408 | # CONFIG_MACVLAN is not set | ||
492 | # CONFIG_EQUALIZER is not set | 409 | # CONFIG_EQUALIZER is not set |
493 | # CONFIG_TUN is not set | 410 | # CONFIG_TUN is not set |
494 | |||
495 | # | ||
496 | # ARCnet devices | ||
497 | # | ||
498 | # CONFIG_ARCNET is not set | 411 | # CONFIG_ARCNET is not set |
499 | |||
500 | # | ||
501 | # PHY device support | ||
502 | # | ||
503 | |||
504 | # | ||
505 | # Ethernet (10 or 100Mbit) | ||
506 | # | ||
507 | # CONFIG_NET_ETHERNET is not set | 412 | # CONFIG_NET_ETHERNET is not set |
508 | CONFIG_MII=m | 413 | CONFIG_MII=m |
509 | 414 | # CONFIG_NETDEV_1000 is not set | |
510 | # | 415 | # CONFIG_NETDEV_10000 is not set |
511 | # Ethernet (1000 Mbit) | ||
512 | # | ||
513 | # CONFIG_ACENIC is not set | ||
514 | # CONFIG_DL2K is not set | ||
515 | # CONFIG_E1000 is not set | ||
516 | # CONFIG_NS83820 is not set | ||
517 | # CONFIG_HAMACHI is not set | ||
518 | # CONFIG_YELLOWFIN is not set | ||
519 | # CONFIG_R8169 is not set | ||
520 | # CONFIG_SIS190 is not set | ||
521 | # CONFIG_SKGE is not set | ||
522 | # CONFIG_SKY2 is not set | ||
523 | # CONFIG_SK98LIN is not set | ||
524 | # CONFIG_TIGON3 is not set | ||
525 | # CONFIG_BNX2 is not set | ||
526 | CONFIG_QLA3XXX=m | ||
527 | # CONFIG_ATL1 is not set | ||
528 | |||
529 | # | ||
530 | # Ethernet (10000 Mbit) | ||
531 | # | ||
532 | # CONFIG_CHELSIO_T1 is not set | ||
533 | CONFIG_CHELSIO_T3=m | ||
534 | # CONFIG_IXGB is not set | ||
535 | # CONFIG_S2IO is not set | ||
536 | # CONFIG_MYRI10GE is not set | ||
537 | CONFIG_NETXEN_NIC=m | ||
538 | |||
539 | # | ||
540 | # Token Ring devices | ||
541 | # | ||
542 | # CONFIG_TR is not set | 416 | # CONFIG_TR is not set |
543 | 417 | ||
544 | # | 418 | # |
545 | # Wireless LAN (non-hamradio) | 419 | # Wireless LAN |
546 | # | 420 | # |
547 | CONFIG_NET_RADIO=y | 421 | # CONFIG_WLAN_PRE80211 is not set |
548 | # CONFIG_NET_WIRELESS_RTNETLINK is not set | 422 | # CONFIG_WLAN_80211 is not set |
549 | 423 | ||
550 | # | 424 | # |
551 | # Obsolete Wireless cards support (pre-802.11) | 425 | # USB Network Adapters |
552 | # | ||
553 | # CONFIG_STRIP is not set | ||
554 | # CONFIG_PCMCIA_WAVELAN is not set | ||
555 | # CONFIG_PCMCIA_NETWAVE is not set | ||
556 | |||
557 | # | ||
558 | # Wireless 802.11 Frequency Hopping cards support | ||
559 | # | ||
560 | # CONFIG_PCMCIA_RAYCS is not set | ||
561 | |||
562 | # | ||
563 | # Wireless 802.11b ISA/PCI cards support | ||
564 | # | ||
565 | # CONFIG_IPW2100 is not set | ||
566 | # CONFIG_IPW2200 is not set | ||
567 | CONFIG_HERMES=m | ||
568 | # CONFIG_PLX_HERMES is not set | ||
569 | # CONFIG_TMD_HERMES is not set | ||
570 | # CONFIG_NORTEL_HERMES is not set | ||
571 | # CONFIG_PCI_HERMES is not set | ||
572 | # CONFIG_ATMEL is not set | ||
573 | |||
574 | # | ||
575 | # Wireless 802.11b Pcmcia/Cardbus cards support | ||
576 | # | ||
577 | CONFIG_PCMCIA_HERMES=m | ||
578 | # CONFIG_PCMCIA_SPECTRUM is not set | ||
579 | # CONFIG_AIRO_CS is not set | ||
580 | # CONFIG_PCMCIA_WL3501 is not set | ||
581 | |||
582 | # | ||
583 | # Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support | ||
584 | # | ||
585 | # CONFIG_PRISM54 is not set | ||
586 | # CONFIG_USB_ZD1201 is not set | ||
587 | # CONFIG_HOSTAP is not set | ||
588 | # CONFIG_BCM43XX is not set | ||
589 | # CONFIG_ZD1211RW is not set | ||
590 | CONFIG_NET_WIRELESS=y | ||
591 | |||
592 | # | ||
593 | # PCMCIA network device support | ||
594 | # | ||
595 | CONFIG_NET_PCMCIA=y | ||
596 | CONFIG_PCMCIA_3C589=m | ||
597 | CONFIG_PCMCIA_3C574=m | ||
598 | CONFIG_PCMCIA_FMVJ18X=m | ||
599 | CONFIG_PCMCIA_PCNET=m | ||
600 | CONFIG_PCMCIA_NMCLAN=m | ||
601 | CONFIG_PCMCIA_SMC91C92=m | ||
602 | CONFIG_PCMCIA_XIRC2PS=m | ||
603 | CONFIG_PCMCIA_AXNET=m | ||
604 | |||
605 | # | ||
606 | # Wan interfaces | ||
607 | # | 426 | # |
427 | # CONFIG_USB_CATC is not set | ||
428 | # CONFIG_USB_KAWETH is not set | ||
429 | CONFIG_USB_PEGASUS=m | ||
430 | # CONFIG_USB_RTL8150 is not set | ||
431 | # CONFIG_USB_USBNET_MII is not set | ||
432 | # CONFIG_USB_USBNET is not set | ||
608 | # CONFIG_WAN is not set | 433 | # CONFIG_WAN is not set |
609 | # CONFIG_FDDI is not set | 434 | # CONFIG_FDDI is not set |
610 | # CONFIG_HIPPI is not set | 435 | # CONFIG_HIPPI is not set |
@@ -614,15 +439,7 @@ CONFIG_PCMCIA_AXNET=m | |||
614 | # CONFIG_NETCONSOLE is not set | 439 | # CONFIG_NETCONSOLE is not set |
615 | # CONFIG_NETPOLL is not set | 440 | # CONFIG_NETPOLL is not set |
616 | # CONFIG_NET_POLL_CONTROLLER is not set | 441 | # CONFIG_NET_POLL_CONTROLLER is not set |
617 | |||
618 | # | ||
619 | # ISDN subsystem | ||
620 | # | ||
621 | # CONFIG_ISDN is not set | 442 | # CONFIG_ISDN is not set |
622 | |||
623 | # | ||
624 | # Telephony Support | ||
625 | # | ||
626 | # CONFIG_PHONE is not set | 443 | # CONFIG_PHONE is not set |
627 | 444 | ||
628 | # | 445 | # |
@@ -630,14 +447,12 @@ CONFIG_PCMCIA_AXNET=m | |||
630 | # | 447 | # |
631 | CONFIG_INPUT=y | 448 | CONFIG_INPUT=y |
632 | # CONFIG_INPUT_FF_MEMLESS is not set | 449 | # CONFIG_INPUT_FF_MEMLESS is not set |
450 | # CONFIG_INPUT_POLLDEV is not set | ||
633 | 451 | ||
634 | # | 452 | # |
635 | # Userland interfaces | 453 | # Userland interfaces |
636 | # | 454 | # |
637 | CONFIG_INPUT_MOUSEDEV=y | 455 | # CONFIG_INPUT_MOUSEDEV is not set |
638 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
639 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
640 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
641 | # CONFIG_INPUT_JOYDEV is not set | 456 | # CONFIG_INPUT_JOYDEV is not set |
642 | # CONFIG_INPUT_TSDEV is not set | 457 | # CONFIG_INPUT_TSDEV is not set |
643 | # CONFIG_INPUT_EVDEV is not set | 458 | # CONFIG_INPUT_EVDEV is not set |
@@ -649,18 +464,14 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
649 | # CONFIG_INPUT_KEYBOARD is not set | 464 | # CONFIG_INPUT_KEYBOARD is not set |
650 | # CONFIG_INPUT_MOUSE is not set | 465 | # CONFIG_INPUT_MOUSE is not set |
651 | # CONFIG_INPUT_JOYSTICK is not set | 466 | # CONFIG_INPUT_JOYSTICK is not set |
467 | # CONFIG_INPUT_TABLET is not set | ||
652 | # CONFIG_INPUT_TOUCHSCREEN is not set | 468 | # CONFIG_INPUT_TOUCHSCREEN is not set |
653 | # CONFIG_INPUT_MISC is not set | 469 | # CONFIG_INPUT_MISC is not set |
654 | 470 | ||
655 | # | 471 | # |
656 | # Hardware I/O ports | 472 | # Hardware I/O ports |
657 | # | 473 | # |
658 | CONFIG_SERIO=y | 474 | # CONFIG_SERIO is not set |
659 | # CONFIG_SERIO_I8042 is not set | ||
660 | CONFIG_SERIO_SERPORT=y | ||
661 | # CONFIG_SERIO_PCIPS2 is not set | ||
662 | # CONFIG_SERIO_LIBPS2 is not set | ||
663 | CONFIG_SERIO_RAW=m | ||
664 | # CONFIG_GAMEPORT is not set | 475 | # CONFIG_GAMEPORT is not set |
665 | 476 | ||
666 | # | 477 | # |
@@ -680,46 +491,25 @@ CONFIG_VT_HW_CONSOLE_BINDING=y | |||
680 | # | 491 | # |
681 | # Non-8250 serial port support | 492 | # Non-8250 serial port support |
682 | # | 493 | # |
683 | # CONFIG_SERIAL_VR41XX is not set | 494 | CONFIG_SERIAL_CORE=y |
495 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
496 | CONFIG_SERIAL_VR41XX=y | ||
497 | CONFIG_SERIAL_VR41XX_CONSOLE=y | ||
684 | # CONFIG_SERIAL_JSM is not set | 498 | # CONFIG_SERIAL_JSM is not set |
685 | CONFIG_UNIX98_PTYS=y | 499 | CONFIG_UNIX98_PTYS=y |
686 | CONFIG_LEGACY_PTYS=y | 500 | CONFIG_LEGACY_PTYS=y |
687 | CONFIG_LEGACY_PTY_COUNT=256 | 501 | CONFIG_LEGACY_PTY_COUNT=256 |
688 | |||
689 | # | ||
690 | # IPMI | ||
691 | # | ||
692 | # CONFIG_IPMI_HANDLER is not set | 502 | # CONFIG_IPMI_HANDLER is not set |
693 | |||
694 | # | ||
695 | # Watchdog Cards | ||
696 | # | ||
697 | # CONFIG_WATCHDOG is not set | 503 | # CONFIG_WATCHDOG is not set |
698 | # CONFIG_HW_RANDOM is not set | 504 | # CONFIG_HW_RANDOM is not set |
699 | # CONFIG_RTC is not set | 505 | # CONFIG_RTC is not set |
700 | # CONFIG_GEN_RTC is not set | ||
701 | # CONFIG_DTLK is not set | ||
702 | # CONFIG_R3964 is not set | 506 | # CONFIG_R3964 is not set |
703 | # CONFIG_APPLICOM is not set | 507 | # CONFIG_APPLICOM is not set |
704 | # CONFIG_DRM is not set | 508 | # CONFIG_DRM is not set |
705 | 509 | CONFIG_GPIO_VR41XX=y | |
706 | # | ||
707 | # PCMCIA character devices | ||
708 | # | ||
709 | # CONFIG_SYNCLINK_CS is not set | ||
710 | # CONFIG_CARDMAN_4000 is not set | ||
711 | # CONFIG_CARDMAN_4040 is not set | ||
712 | # CONFIG_GPIO_VR41XX is not set | ||
713 | # CONFIG_RAW_DRIVER is not set | 510 | # CONFIG_RAW_DRIVER is not set |
714 | |||
715 | # | ||
716 | # TPM devices | ||
717 | # | ||
718 | # CONFIG_TCG_TPM is not set | 511 | # CONFIG_TCG_TPM is not set |
719 | 512 | CONFIG_DEVPORT=y | |
720 | # | ||
721 | # I2C support | ||
722 | # | ||
723 | # CONFIG_I2C is not set | 513 | # CONFIG_I2C is not set |
724 | 514 | ||
725 | # | 515 | # |
@@ -727,33 +517,33 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
727 | # | 517 | # |
728 | # CONFIG_SPI is not set | 518 | # CONFIG_SPI is not set |
729 | # CONFIG_SPI_MASTER is not set | 519 | # CONFIG_SPI_MASTER is not set |
730 | |||
731 | # | ||
732 | # Dallas's 1-wire bus | ||
733 | # | ||
734 | # CONFIG_W1 is not set | 520 | # CONFIG_W1 is not set |
521 | # CONFIG_POWER_SUPPLY is not set | ||
522 | # CONFIG_HWMON is not set | ||
735 | 523 | ||
736 | # | 524 | # |
737 | # Hardware Monitoring support | 525 | # Multifunction device drivers |
738 | # | 526 | # |
739 | # CONFIG_HWMON is not set | 527 | # CONFIG_MFD_SM501 is not set |
740 | # CONFIG_HWMON_VID is not set | ||
741 | 528 | ||
742 | # | 529 | # |
743 | # Multimedia devices | 530 | # Multimedia devices |
744 | # | 531 | # |
745 | # CONFIG_VIDEO_DEV is not set | 532 | # CONFIG_VIDEO_DEV is not set |
533 | # CONFIG_DVB_CORE is not set | ||
534 | # CONFIG_DAB is not set | ||
746 | 535 | ||
747 | # | 536 | # |
748 | # Digital Video Broadcasting Devices | 537 | # Graphics support |
749 | # | 538 | # |
750 | # CONFIG_DVB is not set | 539 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
751 | # CONFIG_USB_DABUSB is not set | ||
752 | 540 | ||
753 | # | 541 | # |
754 | # Graphics support | 542 | # Display device support |
755 | # | 543 | # |
756 | # CONFIG_FIRMWARE_EDID is not set | 544 | # CONFIG_DISPLAY_SUPPORT is not set |
545 | # CONFIG_VGASTATE is not set | ||
546 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
757 | # CONFIG_FB is not set | 547 | # CONFIG_FB is not set |
758 | 548 | ||
759 | # | 549 | # |
@@ -761,22 +551,13 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
761 | # | 551 | # |
762 | # CONFIG_VGA_CONSOLE is not set | 552 | # CONFIG_VGA_CONSOLE is not set |
763 | CONFIG_DUMMY_CONSOLE=y | 553 | CONFIG_DUMMY_CONSOLE=y |
764 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
765 | 554 | ||
766 | # | 555 | # |
767 | # Sound | 556 | # Sound |
768 | # | 557 | # |
769 | # CONFIG_SOUND is not set | 558 | # CONFIG_SOUND is not set |
770 | 559 | # CONFIG_HID_SUPPORT is not set | |
771 | # | 560 | CONFIG_USB_SUPPORT=y |
772 | # HID Devices | ||
773 | # | ||
774 | CONFIG_HID=y | ||
775 | # CONFIG_HID_DEBUG is not set | ||
776 | |||
777 | # | ||
778 | # USB support | ||
779 | # | ||
780 | CONFIG_USB_ARCH_HAS_HCD=y | 561 | CONFIG_USB_ARCH_HAS_HCD=y |
781 | CONFIG_USB_ARCH_HAS_OHCI=y | 562 | CONFIG_USB_ARCH_HAS_OHCI=y |
782 | CONFIG_USB_ARCH_HAS_EHCI=y | 563 | CONFIG_USB_ARCH_HAS_EHCI=y |
@@ -787,8 +568,8 @@ CONFIG_USB=m | |||
787 | # Miscellaneous USB options | 568 | # Miscellaneous USB options |
788 | # | 569 | # |
789 | CONFIG_USB_DEVICEFS=y | 570 | CONFIG_USB_DEVICEFS=y |
571 | CONFIG_USB_DEVICE_CLASS=y | ||
790 | # CONFIG_USB_DYNAMIC_MINORS is not set | 572 | # CONFIG_USB_DYNAMIC_MINORS is not set |
791 | # CONFIG_USB_SUSPEND is not set | ||
792 | # CONFIG_USB_OTG is not set | 573 | # CONFIG_USB_OTG is not set |
793 | 574 | ||
794 | # | 575 | # |
@@ -802,6 +583,7 @@ CONFIG_USB_OHCI_HCD=m | |||
802 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 583 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
803 | # CONFIG_USB_UHCI_HCD is not set | 584 | # CONFIG_USB_UHCI_HCD is not set |
804 | # CONFIG_USB_SL811_HCD is not set | 585 | # CONFIG_USB_SL811_HCD is not set |
586 | # CONFIG_USB_R8A66597_HCD is not set | ||
805 | 587 | ||
806 | # | 588 | # |
807 | # USB Device Class drivers | 589 | # USB Device Class drivers |
@@ -819,43 +601,9 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
819 | # CONFIG_USB_LIBUSUAL is not set | 601 | # CONFIG_USB_LIBUSUAL is not set |
820 | 602 | ||
821 | # | 603 | # |
822 | # USB Input Devices | ||
823 | # | ||
824 | # CONFIG_USB_HID is not set | ||
825 | |||
826 | # | ||
827 | # USB HID Boot Protocol drivers | ||
828 | # | ||
829 | # CONFIG_USB_KBD is not set | ||
830 | # CONFIG_USB_MOUSE is not set | ||
831 | # CONFIG_USB_AIPTEK is not set | ||
832 | # CONFIG_USB_WACOM is not set | ||
833 | # CONFIG_USB_ACECAD is not set | ||
834 | # CONFIG_USB_KBTAB is not set | ||
835 | # CONFIG_USB_POWERMATE is not set | ||
836 | # CONFIG_USB_TOUCHSCREEN is not set | ||
837 | # CONFIG_USB_YEALINK is not set | ||
838 | # CONFIG_USB_XPAD is not set | ||
839 | # CONFIG_USB_ATI_REMOTE is not set | ||
840 | # CONFIG_USB_ATI_REMOTE2 is not set | ||
841 | # CONFIG_USB_KEYSPAN_REMOTE is not set | ||
842 | # CONFIG_USB_APPLETOUCH is not set | ||
843 | # CONFIG_USB_GTCO is not set | ||
844 | |||
845 | # | ||
846 | # USB Imaging devices | 604 | # USB Imaging devices |
847 | # | 605 | # |
848 | # CONFIG_USB_MDC800 is not set | 606 | # CONFIG_USB_MDC800 is not set |
849 | |||
850 | # | ||
851 | # USB Network Adapters | ||
852 | # | ||
853 | # CONFIG_USB_CATC is not set | ||
854 | # CONFIG_USB_KAWETH is not set | ||
855 | CONFIG_USB_PEGASUS=m | ||
856 | # CONFIG_USB_RTL8150 is not set | ||
857 | # CONFIG_USB_USBNET_MII is not set | ||
858 | # CONFIG_USB_USBNET is not set | ||
859 | # CONFIG_USB_MON is not set | 607 | # CONFIG_USB_MON is not set |
860 | 608 | ||
861 | # | 609 | # |
@@ -887,6 +635,7 @@ CONFIG_USB_PEGASUS=m | |||
887 | # CONFIG_USB_APPLEDISPLAY is not set | 635 | # CONFIG_USB_APPLEDISPLAY is not set |
888 | # CONFIG_USB_LD is not set | 636 | # CONFIG_USB_LD is not set |
889 | # CONFIG_USB_TRANCEVIBRATOR is not set | 637 | # CONFIG_USB_TRANCEVIBRATOR is not set |
638 | # CONFIG_USB_IOWARRIOR is not set | ||
890 | # CONFIG_USB_TEST is not set | 639 | # CONFIG_USB_TEST is not set |
891 | 640 | ||
892 | # | 641 | # |
@@ -897,38 +646,43 @@ CONFIG_USB_PEGASUS=m | |||
897 | # USB Gadget Support | 646 | # USB Gadget Support |
898 | # | 647 | # |
899 | # CONFIG_USB_GADGET is not set | 648 | # CONFIG_USB_GADGET is not set |
900 | |||
901 | # | ||
902 | # MMC/SD Card support | ||
903 | # | ||
904 | # CONFIG_MMC is not set | 649 | # CONFIG_MMC is not set |
905 | |||
906 | # | ||
907 | # LED devices | ||
908 | # | ||
909 | # CONFIG_NEW_LEDS is not set | 650 | # CONFIG_NEW_LEDS is not set |
651 | # CONFIG_INFINIBAND is not set | ||
652 | CONFIG_RTC_LIB=y | ||
653 | CONFIG_RTC_CLASS=y | ||
654 | CONFIG_RTC_HCTOSYS=y | ||
655 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
656 | # CONFIG_RTC_DEBUG is not set | ||
910 | 657 | ||
911 | # | 658 | # |
912 | # LED drivers | 659 | # RTC interfaces |
913 | # | ||
914 | |||
915 | # | ||
916 | # LED Triggers | ||
917 | # | 660 | # |
661 | CONFIG_RTC_INTF_SYSFS=y | ||
662 | CONFIG_RTC_INTF_PROC=y | ||
663 | CONFIG_RTC_INTF_DEV=y | ||
664 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
665 | # CONFIG_RTC_DRV_TEST is not set | ||
918 | 666 | ||
919 | # | 667 | # |
920 | # InfiniBand support | 668 | # SPI RTC drivers |
921 | # | 669 | # |
922 | # CONFIG_INFINIBAND is not set | ||
923 | 670 | ||
924 | # | 671 | # |
925 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 672 | # Platform RTC drivers |
926 | # | 673 | # |
674 | # CONFIG_RTC_DRV_CMOS is not set | ||
675 | # CONFIG_RTC_DRV_DS1553 is not set | ||
676 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
677 | # CONFIG_RTC_DRV_DS1742 is not set | ||
678 | # CONFIG_RTC_DRV_M48T86 is not set | ||
679 | # CONFIG_RTC_DRV_M48T59 is not set | ||
680 | # CONFIG_RTC_DRV_V3020 is not set | ||
927 | 681 | ||
928 | # | 682 | # |
929 | # Real Time Clock | 683 | # on-CPU RTC drivers |
930 | # | 684 | # |
931 | # CONFIG_RTC_CLASS is not set | 685 | CONFIG_RTC_DRV_VR41XX=y |
932 | 686 | ||
933 | # | 687 | # |
934 | # DMA Engine support | 688 | # DMA Engine support |
@@ -944,12 +698,9 @@ CONFIG_USB_PEGASUS=m | |||
944 | # | 698 | # |
945 | 699 | ||
946 | # | 700 | # |
947 | # Auxiliary Display support | 701 | # Userspace I/O |
948 | # | ||
949 | |||
950 | # | ||
951 | # Virtualization | ||
952 | # | 702 | # |
703 | # CONFIG_UIO is not set | ||
953 | 704 | ||
954 | # | 705 | # |
955 | # File systems | 706 | # File systems |
@@ -973,7 +724,7 @@ CONFIG_INOTIFY_USER=y | |||
973 | CONFIG_DNOTIFY=y | 724 | CONFIG_DNOTIFY=y |
974 | CONFIG_AUTOFS_FS=y | 725 | CONFIG_AUTOFS_FS=y |
975 | CONFIG_AUTOFS4_FS=y | 726 | CONFIG_AUTOFS4_FS=y |
976 | CONFIG_FUSE_FS=m | 727 | # CONFIG_FUSE_FS is not set |
977 | 728 | ||
978 | # | 729 | # |
979 | # CD-ROM/DVD Filesystems | 730 | # CD-ROM/DVD Filesystems |
@@ -1005,7 +756,6 @@ CONFIG_CONFIGFS_FS=m | |||
1005 | # | 756 | # |
1006 | # CONFIG_ADFS_FS is not set | 757 | # CONFIG_ADFS_FS is not set |
1007 | # CONFIG_AFFS_FS is not set | 758 | # CONFIG_AFFS_FS is not set |
1008 | # CONFIG_ECRYPT_FS is not set | ||
1009 | # CONFIG_HFS_FS is not set | 759 | # CONFIG_HFS_FS is not set |
1010 | # CONFIG_HFSPLUS_FS is not set | 760 | # CONFIG_HFSPLUS_FS is not set |
1011 | # CONFIG_BEFS_FS is not set | 761 | # CONFIG_BEFS_FS is not set |
@@ -1029,6 +779,7 @@ CONFIG_NFS_FS=y | |||
1029 | CONFIG_LOCKD=y | 779 | CONFIG_LOCKD=y |
1030 | CONFIG_NFS_COMMON=y | 780 | CONFIG_NFS_COMMON=y |
1031 | CONFIG_SUNRPC=y | 781 | CONFIG_SUNRPC=y |
782 | # CONFIG_SUNRPC_BIND34 is not set | ||
1032 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 783 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1033 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 784 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1034 | # CONFIG_SMB_FS is not set | 785 | # CONFIG_SMB_FS is not set |
@@ -1036,7 +787,6 @@ CONFIG_SUNRPC=y | |||
1036 | # CONFIG_NCP_FS is not set | 787 | # CONFIG_NCP_FS is not set |
1037 | # CONFIG_CODA_FS is not set | 788 | # CONFIG_CODA_FS is not set |
1038 | # CONFIG_AFS_FS is not set | 789 | # CONFIG_AFS_FS is not set |
1039 | # CONFIG_9P_FS is not set | ||
1040 | 790 | ||
1041 | # | 791 | # |
1042 | # Partition Types | 792 | # Partition Types |
@@ -1052,10 +802,7 @@ CONFIG_MSDOS_PARTITION=y | |||
1052 | # | 802 | # |
1053 | # Distributed Lock Manager | 803 | # Distributed Lock Manager |
1054 | # | 804 | # |
1055 | CONFIG_DLM=m | 805 | # CONFIG_DLM is not set |
1056 | CONFIG_DLM_TCP=y | ||
1057 | # CONFIG_DLM_SCTP is not set | ||
1058 | # CONFIG_DLM_DEBUG is not set | ||
1059 | 806 | ||
1060 | # | 807 | # |
1061 | # Profiling support | 808 | # Profiling support |
@@ -1073,73 +820,26 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1073 | # CONFIG_DEBUG_FS is not set | 820 | # CONFIG_DEBUG_FS is not set |
1074 | # CONFIG_HEADERS_CHECK is not set | 821 | # CONFIG_HEADERS_CHECK is not set |
1075 | # CONFIG_DEBUG_KERNEL is not set | 822 | # CONFIG_DEBUG_KERNEL is not set |
1076 | CONFIG_LOG_BUF_SHIFT=14 | ||
1077 | CONFIG_CROSSCOMPILE=y | 823 | CONFIG_CROSSCOMPILE=y |
1078 | CONFIG_CMDLINE="mem=32M console=ttyVR0,19200 ide0=0x170,0x376,73" | 824 | CONFIG_CMDLINE="mem=32M console=ttyVR0,19200 ide0=0x170,0x376,73" |
1079 | 825 | ||
1080 | # | 826 | # |
1081 | # Security options | 827 | # Security options |
1082 | # | 828 | # |
1083 | CONFIG_KEYS=y | 829 | # CONFIG_KEYS is not set |
1084 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | ||
1085 | # CONFIG_SECURITY is not set | 830 | # CONFIG_SECURITY is not set |
1086 | 831 | # CONFIG_CRYPTO is not set | |
1087 | # | ||
1088 | # Cryptographic options | ||
1089 | # | ||
1090 | CONFIG_CRYPTO=y | ||
1091 | CONFIG_CRYPTO_ALGAPI=y | ||
1092 | CONFIG_CRYPTO_BLKCIPHER=m | ||
1093 | CONFIG_CRYPTO_HASH=y | ||
1094 | CONFIG_CRYPTO_MANAGER=y | ||
1095 | CONFIG_CRYPTO_HMAC=y | ||
1096 | CONFIG_CRYPTO_XCBC=m | ||
1097 | CONFIG_CRYPTO_NULL=m | ||
1098 | CONFIG_CRYPTO_MD4=m | ||
1099 | CONFIG_CRYPTO_MD5=y | ||
1100 | CONFIG_CRYPTO_SHA1=m | ||
1101 | CONFIG_CRYPTO_SHA256=m | ||
1102 | CONFIG_CRYPTO_SHA512=m | ||
1103 | CONFIG_CRYPTO_WP512=m | ||
1104 | CONFIG_CRYPTO_TGR192=m | ||
1105 | CONFIG_CRYPTO_GF128MUL=m | ||
1106 | CONFIG_CRYPTO_ECB=m | ||
1107 | CONFIG_CRYPTO_CBC=m | ||
1108 | CONFIG_CRYPTO_PCBC=m | ||
1109 | CONFIG_CRYPTO_LRW=m | ||
1110 | CONFIG_CRYPTO_DES=m | ||
1111 | CONFIG_CRYPTO_FCRYPT=m | ||
1112 | CONFIG_CRYPTO_BLOWFISH=m | ||
1113 | CONFIG_CRYPTO_TWOFISH=m | ||
1114 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1115 | CONFIG_CRYPTO_SERPENT=m | ||
1116 | CONFIG_CRYPTO_AES=m | ||
1117 | CONFIG_CRYPTO_CAST5=m | ||
1118 | CONFIG_CRYPTO_CAST6=m | ||
1119 | CONFIG_CRYPTO_TEA=m | ||
1120 | CONFIG_CRYPTO_ARC4=m | ||
1121 | CONFIG_CRYPTO_KHAZAD=m | ||
1122 | CONFIG_CRYPTO_ANUBIS=m | ||
1123 | CONFIG_CRYPTO_DEFLATE=m | ||
1124 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1125 | CONFIG_CRYPTO_CRC32C=m | ||
1126 | CONFIG_CRYPTO_CAMELLIA=m | ||
1127 | # CONFIG_CRYPTO_TEST is not set | ||
1128 | |||
1129 | # | ||
1130 | # Hardware crypto devices | ||
1131 | # | ||
1132 | 832 | ||
1133 | # | 833 | # |
1134 | # Library routines | 834 | # Library routines |
1135 | # | 835 | # |
1136 | CONFIG_BITREVERSE=y | ||
1137 | # CONFIG_CRC_CCITT is not set | 836 | # CONFIG_CRC_CCITT is not set |
1138 | CONFIG_CRC16=m | 837 | # CONFIG_CRC16 is not set |
1139 | CONFIG_CRC32=y | 838 | # CONFIG_CRC_ITU_T is not set |
1140 | CONFIG_LIBCRC32C=m | 839 | # CONFIG_CRC32 is not set |
1141 | CONFIG_ZLIB_INFLATE=m | 840 | # CONFIG_CRC7 is not set |
1142 | CONFIG_ZLIB_DEFLATE=m | 841 | # CONFIG_LIBCRC32C is not set |
1143 | CONFIG_PLIST=y | 842 | CONFIG_PLIST=y |
1144 | CONFIG_HAS_IOMEM=y | 843 | CONFIG_HAS_IOMEM=y |
1145 | CONFIG_HAS_IOPORT=y | 844 | CONFIG_HAS_IOPORT=y |
845 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/mips/configs/rbhma4200_defconfig b/arch/mips/configs/rbhma4200_defconfig index 9913980add21..9383a598094b 100644 --- a/arch/mips/configs/rbhma4200_defconfig +++ b/arch/mips/configs/rbhma4200_defconfig | |||
@@ -1,58 +1,47 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.21 | 3 | # Linux kernel version: 2.6.23-rc1 |
4 | # Wed May 9 23:44:19 2007 | 4 | # Thu Aug 2 22:55:57 2007 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
8 | # | 8 | # |
9 | # Machine selection | 9 | # Machine selection |
10 | # | 10 | # |
11 | # CONFIG_MIPS_MTX1 is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
12 | # CONFIG_MIPS_BOSPORUS is not set | ||
13 | # CONFIG_MIPS_PB1000 is not set | ||
14 | # CONFIG_MIPS_PB1100 is not set | ||
15 | # CONFIG_MIPS_PB1500 is not set | ||
16 | # CONFIG_MIPS_PB1550 is not set | ||
17 | # CONFIG_MIPS_PB1200 is not set | ||
18 | # CONFIG_MIPS_DB1000 is not set | ||
19 | # CONFIG_MIPS_DB1100 is not set | ||
20 | # CONFIG_MIPS_DB1500 is not set | ||
21 | # CONFIG_MIPS_DB1550 is not set | ||
22 | # CONFIG_MIPS_DB1200 is not set | ||
23 | # CONFIG_MIPS_MIRAGE is not set | ||
24 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
25 | # CONFIG_MIPS_COBALT is not set | 13 | # CONFIG_MIPS_COBALT is not set |
26 | # CONFIG_MACH_DECSTATION is not set | 14 | # CONFIG_MACH_DECSTATION is not set |
27 | # CONFIG_MACH_JAZZ is not set | 15 | # CONFIG_MACH_JAZZ is not set |
16 | # CONFIG_LEMOTE_FULONG is not set | ||
28 | # CONFIG_MIPS_ATLAS is not set | 17 | # CONFIG_MIPS_ATLAS is not set |
29 | # CONFIG_MIPS_MALTA is not set | 18 | # CONFIG_MIPS_MALTA is not set |
30 | # CONFIG_MIPS_SEAD is not set | 19 | # CONFIG_MIPS_SEAD is not set |
31 | # CONFIG_WR_PPMC is not set | ||
32 | # CONFIG_MIPS_SIM is not set | 20 | # CONFIG_MIPS_SIM is not set |
33 | # CONFIG_MIPS_XXS1500 is not set | 21 | # CONFIG_MARKEINS is not set |
22 | # CONFIG_MACH_VR41XX is not set | ||
34 | # CONFIG_PNX8550_JBS is not set | 23 | # CONFIG_PNX8550_JBS is not set |
35 | # CONFIG_PNX8550_STB810 is not set | 24 | # CONFIG_PNX8550_STB810 is not set |
36 | # CONFIG_MACH_VR41XX is not set | 25 | # CONFIG_PMC_MSP is not set |
37 | # CONFIG_PMC_YOSEMITE is not set | 26 | # CONFIG_PMC_YOSEMITE is not set |
38 | # CONFIG_QEMU is not set | 27 | # CONFIG_QEMU is not set |
39 | # CONFIG_MARKEINS is not set | ||
40 | # CONFIG_SGI_IP22 is not set | 28 | # CONFIG_SGI_IP22 is not set |
41 | # CONFIG_SGI_IP27 is not set | 29 | # CONFIG_SGI_IP27 is not set |
42 | # CONFIG_SGI_IP32 is not set | 30 | # CONFIG_SGI_IP32 is not set |
43 | # CONFIG_SIBYTE_BIGSUR is not set | 31 | # CONFIG_SIBYTE_CRHINE is not set |
32 | # CONFIG_SIBYTE_CARMEL is not set | ||
33 | # CONFIG_SIBYTE_CRHONE is not set | ||
34 | # CONFIG_SIBYTE_RHONE is not set | ||
44 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
45 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
46 | # CONFIG_SIBYTE_RHONE is not set | ||
47 | # CONFIG_SIBYTE_CARMEL is not set | ||
48 | # CONFIG_SIBYTE_PTSWARM is not set | 38 | # CONFIG_SIBYTE_PTSWARM is not set |
49 | # CONFIG_SIBYTE_LITTLESUR is not set | 39 | # CONFIG_SIBYTE_BIGSUR is not set |
50 | # CONFIG_SIBYTE_CRHINE is not set | ||
51 | # CONFIG_SIBYTE_CRHONE is not set | ||
52 | # CONFIG_SNI_RM is not set | 40 | # CONFIG_SNI_RM is not set |
53 | # CONFIG_TOSHIBA_JMR3927 is not set | 41 | # CONFIG_TOSHIBA_JMR3927 is not set |
54 | CONFIG_TOSHIBA_RBTX4927=y | 42 | CONFIG_TOSHIBA_RBTX4927=y |
55 | # CONFIG_TOSHIBA_RBTX4938 is not set | 43 | # CONFIG_TOSHIBA_RBTX4938 is not set |
44 | # CONFIG_WR_PPMC is not set | ||
56 | # CONFIG_TOSHIBA_FPCIB0 is not set | 45 | # CONFIG_TOSHIBA_FPCIB0 is not set |
57 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 46 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
58 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 47 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
@@ -65,17 +54,20 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
65 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 54 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
66 | CONFIG_DMA_NONCOHERENT=y | 55 | CONFIG_DMA_NONCOHERENT=y |
67 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 56 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
68 | CONFIG_I8259=y | 57 | # CONFIG_NO_IOPORT is not set |
69 | CONFIG_CPU_BIG_ENDIAN=y | 58 | CONFIG_CPU_BIG_ENDIAN=y |
70 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 59 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
71 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 60 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y |
72 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 61 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
62 | CONFIG_IRQ_CPU=y | ||
63 | CONFIG_IRQ_TXX9=y | ||
73 | CONFIG_SWAP_IO_SPACE=y | 64 | CONFIG_SWAP_IO_SPACE=y |
74 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 65 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
75 | 66 | ||
76 | # | 67 | # |
77 | # CPU selection | 68 | # CPU selection |
78 | # | 69 | # |
70 | # CONFIG_CPU_LOONGSON2 is not set | ||
79 | # CONFIG_CPU_MIPS32_R1 is not set | 71 | # CONFIG_CPU_MIPS32_R1 is not set |
80 | # CONFIG_CPU_MIPS32_R2 is not set | 72 | # CONFIG_CPU_MIPS32_R2 is not set |
81 | # CONFIG_CPU_MIPS64_R1 is not set | 73 | # CONFIG_CPU_MIPS64_R1 is not set |
@@ -114,22 +106,18 @@ CONFIG_CPU_HAS_PREFETCH=y | |||
114 | CONFIG_MIPS_MT_DISABLED=y | 106 | CONFIG_MIPS_MT_DISABLED=y |
115 | # CONFIG_MIPS_MT_SMP is not set | 107 | # CONFIG_MIPS_MT_SMP is not set |
116 | # CONFIG_MIPS_MT_SMTC is not set | 108 | # CONFIG_MIPS_MT_SMTC is not set |
117 | # CONFIG_MIPS_VPE_LOADER is not set | ||
118 | CONFIG_CPU_HAS_LLSC=y | 109 | CONFIG_CPU_HAS_LLSC=y |
119 | CONFIG_CPU_HAS_SYNC=y | 110 | CONFIG_CPU_HAS_SYNC=y |
120 | CONFIG_GENERIC_HARDIRQS=y | 111 | CONFIG_GENERIC_HARDIRQS=y |
121 | CONFIG_GENERIC_IRQ_PROBE=y | 112 | CONFIG_GENERIC_IRQ_PROBE=y |
122 | CONFIG_ARCH_FLATMEM_ENABLE=y | 113 | CONFIG_ARCH_FLATMEM_ENABLE=y |
123 | CONFIG_SELECT_MEMORY_MODEL=y | ||
124 | CONFIG_FLATMEM_MANUAL=y | ||
125 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
126 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
127 | CONFIG_FLATMEM=y | 114 | CONFIG_FLATMEM=y |
128 | CONFIG_FLAT_NODE_MEM_MAP=y | 115 | CONFIG_FLAT_NODE_MEM_MAP=y |
129 | # CONFIG_SPARSEMEM_STATIC is not set | 116 | # CONFIG_SPARSEMEM_STATIC is not set |
130 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 117 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
131 | # CONFIG_RESOURCES_64BIT is not set | 118 | # CONFIG_RESOURCES_64BIT is not set |
132 | CONFIG_ZONE_DMA_FLAG=0 | 119 | CONFIG_ZONE_DMA_FLAG=0 |
120 | CONFIG_VIRT_TO_BUS=y | ||
133 | # CONFIG_HZ_48 is not set | 121 | # CONFIG_HZ_48 is not set |
134 | # CONFIG_HZ_100 is not set | 122 | # CONFIG_HZ_100 is not set |
135 | # CONFIG_HZ_128 is not set | 123 | # CONFIG_HZ_128 is not set |
@@ -142,31 +130,24 @@ CONFIG_HZ=250 | |||
142 | CONFIG_PREEMPT_NONE=y | 130 | CONFIG_PREEMPT_NONE=y |
143 | # CONFIG_PREEMPT_VOLUNTARY is not set | 131 | # CONFIG_PREEMPT_VOLUNTARY is not set |
144 | # CONFIG_PREEMPT is not set | 132 | # CONFIG_PREEMPT is not set |
145 | # CONFIG_KEXEC is not set | 133 | # CONFIG_SECCOMP is not set |
146 | CONFIG_LOCKDEP_SUPPORT=y | 134 | CONFIG_LOCKDEP_SUPPORT=y |
147 | CONFIG_STACKTRACE_SUPPORT=y | 135 | CONFIG_STACKTRACE_SUPPORT=y |
148 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 136 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
149 | 137 | ||
150 | # | 138 | # |
151 | # Code maturity level options | 139 | # General setup |
152 | # | 140 | # |
153 | CONFIG_EXPERIMENTAL=y | 141 | # CONFIG_EXPERIMENTAL is not set |
154 | CONFIG_BROKEN_ON_SMP=y | 142 | CONFIG_BROKEN_ON_SMP=y |
155 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 143 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
156 | |||
157 | # | ||
158 | # General setup | ||
159 | # | ||
160 | CONFIG_LOCALVERSION="" | 144 | CONFIG_LOCALVERSION="" |
161 | CONFIG_LOCALVERSION_AUTO=y | 145 | CONFIG_LOCALVERSION_AUTO=y |
162 | CONFIG_SWAP=y | 146 | CONFIG_SWAP=y |
163 | CONFIG_SYSVIPC=y | 147 | CONFIG_SYSVIPC=y |
164 | # CONFIG_IPC_NS is not set | ||
165 | CONFIG_SYSVIPC_SYSCTL=y | 148 | CONFIG_SYSVIPC_SYSCTL=y |
166 | # CONFIG_POSIX_MQUEUE is not set | ||
167 | # CONFIG_BSD_PROCESS_ACCT is not set | 149 | # CONFIG_BSD_PROCESS_ACCT is not set |
168 | # CONFIG_TASKSTATS is not set | 150 | # CONFIG_TASKSTATS is not set |
169 | # CONFIG_UTS_NS is not set | ||
170 | # CONFIG_AUDIT is not set | 151 | # CONFIG_AUDIT is not set |
171 | CONFIG_IKCONFIG=y | 152 | CONFIG_IKCONFIG=y |
172 | CONFIG_IKCONFIG_PROC=y | 153 | CONFIG_IKCONFIG_PROC=y |
@@ -175,7 +156,6 @@ CONFIG_SYSFS_DEPRECATED=y | |||
175 | # CONFIG_RELAY is not set | 156 | # CONFIG_RELAY is not set |
176 | CONFIG_BLK_DEV_INITRD=y | 157 | CONFIG_BLK_DEV_INITRD=y |
177 | CONFIG_INITRAMFS_SOURCE="" | 158 | CONFIG_INITRAMFS_SOURCE="" |
178 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
179 | CONFIG_SYSCTL=y | 159 | CONFIG_SYSCTL=y |
180 | CONFIG_EMBEDDED=y | 160 | CONFIG_EMBEDDED=y |
181 | CONFIG_SYSCTL_SYSCALL=y | 161 | CONFIG_SYSCTL_SYSCALL=y |
@@ -187,7 +167,11 @@ CONFIG_BUG=y | |||
187 | CONFIG_ELF_CORE=y | 167 | CONFIG_ELF_CORE=y |
188 | CONFIG_BASE_FULL=y | 168 | CONFIG_BASE_FULL=y |
189 | # CONFIG_FUTEX is not set | 169 | # CONFIG_FUTEX is not set |
170 | CONFIG_ANON_INODES=y | ||
190 | # CONFIG_EPOLL is not set | 171 | # CONFIG_EPOLL is not set |
172 | CONFIG_SIGNALFD=y | ||
173 | CONFIG_TIMERFD=y | ||
174 | CONFIG_EVENTFD=y | ||
191 | CONFIG_SHMEM=y | 175 | CONFIG_SHMEM=y |
192 | CONFIG_VM_EVENT_COUNTERS=y | 176 | CONFIG_VM_EVENT_COUNTERS=y |
193 | CONFIG_SLAB=y | 177 | CONFIG_SLAB=y |
@@ -195,19 +179,11 @@ CONFIG_SLAB=y | |||
195 | # CONFIG_SLOB is not set | 179 | # CONFIG_SLOB is not set |
196 | # CONFIG_TINY_SHMEM is not set | 180 | # CONFIG_TINY_SHMEM is not set |
197 | CONFIG_BASE_SMALL=0 | 181 | CONFIG_BASE_SMALL=0 |
198 | |||
199 | # | ||
200 | # Loadable module support | ||
201 | # | ||
202 | CONFIG_MODULES=y | 182 | CONFIG_MODULES=y |
203 | # CONFIG_MODULE_UNLOAD is not set | 183 | # CONFIG_MODULE_UNLOAD is not set |
204 | # CONFIG_MODVERSIONS is not set | 184 | # CONFIG_MODVERSIONS is not set |
205 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 185 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
206 | CONFIG_KMOD=y | 186 | CONFIG_KMOD=y |
207 | |||
208 | # | ||
209 | # Block layer | ||
210 | # | ||
211 | CONFIG_BLOCK=y | 187 | CONFIG_BLOCK=y |
212 | # CONFIG_LBD is not set | 188 | # CONFIG_LBD is not set |
213 | # CONFIG_BLK_DEV_IO_TRACE is not set | 189 | # CONFIG_BLK_DEV_IO_TRACE is not set |
@@ -273,7 +249,6 @@ CONFIG_IP_PNP=y | |||
273 | # CONFIG_NET_IPIP is not set | 249 | # CONFIG_NET_IPIP is not set |
274 | # CONFIG_NET_IPGRE is not set | 250 | # CONFIG_NET_IPGRE is not set |
275 | # CONFIG_IP_MROUTE is not set | 251 | # CONFIG_IP_MROUTE is not set |
276 | # CONFIG_ARPD is not set | ||
277 | # CONFIG_SYN_COOKIES is not set | 252 | # CONFIG_SYN_COOKIES is not set |
278 | # CONFIG_INET_AH is not set | 253 | # CONFIG_INET_AH is not set |
279 | # CONFIG_INET_ESP is not set | 254 | # CONFIG_INET_ESP is not set |
@@ -288,38 +263,17 @@ CONFIG_INET_TCP_DIAG=y | |||
288 | # CONFIG_TCP_CONG_ADVANCED is not set | 263 | # CONFIG_TCP_CONG_ADVANCED is not set |
289 | CONFIG_TCP_CONG_CUBIC=y | 264 | CONFIG_TCP_CONG_CUBIC=y |
290 | CONFIG_DEFAULT_TCP_CONG="cubic" | 265 | CONFIG_DEFAULT_TCP_CONG="cubic" |
291 | # CONFIG_TCP_MD5SIG is not set | ||
292 | # CONFIG_IPV6 is not set | 266 | # CONFIG_IPV6 is not set |
293 | # CONFIG_INET6_XFRM_TUNNEL is not set | 267 | # CONFIG_INET6_XFRM_TUNNEL is not set |
294 | # CONFIG_INET6_TUNNEL is not set | 268 | # CONFIG_INET6_TUNNEL is not set |
295 | # CONFIG_NETWORK_SECMARK is not set | 269 | # CONFIG_NETWORK_SECMARK is not set |
296 | # CONFIG_NETFILTER is not set | 270 | # CONFIG_NETFILTER is not set |
297 | |||
298 | # | ||
299 | # DCCP Configuration (EXPERIMENTAL) | ||
300 | # | ||
301 | # CONFIG_IP_DCCP is not set | ||
302 | |||
303 | # | ||
304 | # SCTP Configuration (EXPERIMENTAL) | ||
305 | # | ||
306 | # CONFIG_IP_SCTP is not set | ||
307 | |||
308 | # | ||
309 | # TIPC Configuration (EXPERIMENTAL) | ||
310 | # | ||
311 | # CONFIG_TIPC is not set | ||
312 | # CONFIG_ATM is not set | ||
313 | # CONFIG_BRIDGE is not set | 271 | # CONFIG_BRIDGE is not set |
314 | # CONFIG_VLAN_8021Q is not set | 272 | # CONFIG_VLAN_8021Q is not set |
315 | # CONFIG_DECNET is not set | 273 | # CONFIG_DECNET is not set |
316 | # CONFIG_LLC2 is not set | 274 | # CONFIG_LLC2 is not set |
317 | # CONFIG_IPX is not set | 275 | # CONFIG_IPX is not set |
318 | # CONFIG_ATALK is not set | 276 | # CONFIG_ATALK is not set |
319 | # CONFIG_X25 is not set | ||
320 | # CONFIG_LAPB is not set | ||
321 | # CONFIG_ECONET is not set | ||
322 | # CONFIG_WAN_ROUTER is not set | ||
323 | 277 | ||
324 | # | 278 | # |
325 | # QoS and/or fair queueing | 279 | # QoS and/or fair queueing |
@@ -333,14 +287,12 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
333 | # CONFIG_HAMRADIO is not set | 287 | # CONFIG_HAMRADIO is not set |
334 | # CONFIG_IRDA is not set | 288 | # CONFIG_IRDA is not set |
335 | # CONFIG_BT is not set | 289 | # CONFIG_BT is not set |
336 | # CONFIG_AF_RXRPC is not set | ||
337 | 290 | ||
338 | # | 291 | # |
339 | # Wireless | 292 | # Wireless |
340 | # | 293 | # |
341 | # CONFIG_CFG80211 is not set | 294 | # CONFIG_CFG80211 is not set |
342 | # CONFIG_WIRELESS_EXT is not set | 295 | # CONFIG_WIRELESS_EXT is not set |
343 | # CONFIG_MAC80211 is not set | ||
344 | # CONFIG_IEEE80211 is not set | 296 | # CONFIG_IEEE80211 is not set |
345 | # CONFIG_RFKILL is not set | 297 | # CONFIG_RFKILL is not set |
346 | 298 | ||
@@ -354,30 +306,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
354 | CONFIG_STANDALONE=y | 306 | CONFIG_STANDALONE=y |
355 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 307 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
356 | # CONFIG_SYS_HYPERVISOR is not set | 308 | # CONFIG_SYS_HYPERVISOR is not set |
357 | |||
358 | # | ||
359 | # Connector - unified userspace <-> kernelspace linker | ||
360 | # | ||
361 | # CONFIG_CONNECTOR is not set | 309 | # CONFIG_CONNECTOR is not set |
362 | # CONFIG_MTD is not set | 310 | # CONFIG_MTD is not set |
363 | |||
364 | # | ||
365 | # Parallel port support | ||
366 | # | ||
367 | # CONFIG_PARPORT is not set | 311 | # CONFIG_PARPORT is not set |
368 | 312 | CONFIG_BLK_DEV=y | |
369 | # | ||
370 | # Plug and Play support | ||
371 | # | ||
372 | # CONFIG_PNPACPI is not set | ||
373 | |||
374 | # | ||
375 | # Block devices | ||
376 | # | ||
377 | # CONFIG_BLK_CPQ_DA is not set | 313 | # CONFIG_BLK_CPQ_DA is not set |
378 | # CONFIG_BLK_CPQ_CISS_DA is not set | 314 | # CONFIG_BLK_CPQ_CISS_DA is not set |
379 | # CONFIG_BLK_DEV_DAC960 is not set | 315 | # CONFIG_BLK_DEV_DAC960 is not set |
380 | # CONFIG_BLK_DEV_UMEM is not set | ||
381 | # CONFIG_BLK_DEV_COW_COMMON is not set | 316 | # CONFIG_BLK_DEV_COW_COMMON is not set |
382 | CONFIG_BLK_DEV_LOOP=y | 317 | CONFIG_BLK_DEV_LOOP=y |
383 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 318 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
@@ -389,18 +324,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 | |||
389 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 324 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
390 | # CONFIG_CDROM_PKTCDVD is not set | 325 | # CONFIG_CDROM_PKTCDVD is not set |
391 | # CONFIG_ATA_OVER_ETH is not set | 326 | # CONFIG_ATA_OVER_ETH is not set |
392 | 327 | # CONFIG_MISC_DEVICES is not set | |
393 | # | ||
394 | # Misc devices | ||
395 | # | ||
396 | # CONFIG_PHANTOM is not set | ||
397 | # CONFIG_SGI_IOC4 is not set | ||
398 | # CONFIG_TIFM_CORE is not set | ||
399 | # CONFIG_BLINK is not set | ||
400 | |||
401 | # | ||
402 | # ATA/ATAPI/MFM/RLL support | ||
403 | # | ||
404 | # CONFIG_IDE is not set | 328 | # CONFIG_IDE is not set |
405 | 329 | ||
406 | # | 330 | # |
@@ -408,16 +332,9 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
408 | # | 332 | # |
409 | # CONFIG_RAID_ATTRS is not set | 333 | # CONFIG_RAID_ATTRS is not set |
410 | # CONFIG_SCSI is not set | 334 | # CONFIG_SCSI is not set |
335 | # CONFIG_SCSI_DMA is not set | ||
411 | # CONFIG_SCSI_NETLINK is not set | 336 | # CONFIG_SCSI_NETLINK is not set |
412 | |||
413 | # | ||
414 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
415 | # | ||
416 | # CONFIG_ATA is not set | 337 | # CONFIG_ATA is not set |
417 | |||
418 | # | ||
419 | # Multi-device support (RAID and LVM) | ||
420 | # | ||
421 | # CONFIG_MD is not set | 338 | # CONFIG_MD is not set |
422 | 339 | ||
423 | # | 340 | # |
@@ -428,83 +345,34 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
428 | # | 345 | # |
429 | # IEEE 1394 (FireWire) support | 346 | # IEEE 1394 (FireWire) support |
430 | # | 347 | # |
431 | # CONFIG_IEEE1394 is not set | ||
432 | 348 | ||
433 | # | 349 | # |
434 | # I2O device support | 350 | # An alternative FireWire stack is available with EXPERIMENTAL=y |
435 | # | 351 | # |
352 | # CONFIG_IEEE1394 is not set | ||
436 | # CONFIG_I2O is not set | 353 | # CONFIG_I2O is not set |
437 | |||
438 | # | ||
439 | # Network device support | ||
440 | # | ||
441 | CONFIG_NETDEVICES=y | 354 | CONFIG_NETDEVICES=y |
355 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
442 | # CONFIG_DUMMY is not set | 356 | # CONFIG_DUMMY is not set |
443 | # CONFIG_BONDING is not set | 357 | # CONFIG_BONDING is not set |
444 | # CONFIG_EQUALIZER is not set | 358 | # CONFIG_EQUALIZER is not set |
445 | # CONFIG_TUN is not set | 359 | # CONFIG_TUN is not set |
446 | |||
447 | # | ||
448 | # ARCnet devices | ||
449 | # | ||
450 | # CONFIG_ARCNET is not set | 360 | # CONFIG_ARCNET is not set |
451 | |||
452 | # | ||
453 | # PHY device support | ||
454 | # | ||
455 | # CONFIG_PHYLIB is not set | 361 | # CONFIG_PHYLIB is not set |
456 | |||
457 | # | ||
458 | # Ethernet (10 or 100Mbit) | ||
459 | # | ||
460 | CONFIG_NET_ETHERNET=y | 362 | CONFIG_NET_ETHERNET=y |
461 | # CONFIG_MII is not set | 363 | # CONFIG_MII is not set |
364 | # CONFIG_AX88796 is not set | ||
462 | # CONFIG_HAPPYMEAL is not set | 365 | # CONFIG_HAPPYMEAL is not set |
463 | # CONFIG_SUNGEM is not set | 366 | # CONFIG_SUNGEM is not set |
464 | # CONFIG_CASSINI is not set | 367 | # CONFIG_CASSINI is not set |
465 | # CONFIG_NET_VENDOR_3COM is not set | 368 | # CONFIG_NET_VENDOR_3COM is not set |
466 | # CONFIG_DM9000 is not set | 369 | # CONFIG_DM9000 is not set |
467 | |||
468 | # | ||
469 | # Tulip family network device support | ||
470 | # | ||
471 | # CONFIG_NET_TULIP is not set | 370 | # CONFIG_NET_TULIP is not set |
472 | # CONFIG_HP100 is not set | 371 | # CONFIG_HP100 is not set |
473 | CONFIG_NE2000=y | 372 | CONFIG_NE2000=y |
474 | # CONFIG_NET_PCI is not set | 373 | # CONFIG_NET_PCI is not set |
475 | 374 | # CONFIG_NETDEV_1000 is not set | |
476 | # | 375 | # CONFIG_NETDEV_10000 is not set |
477 | # Ethernet (1000 Mbit) | ||
478 | # | ||
479 | # CONFIG_ACENIC is not set | ||
480 | # CONFIG_DL2K is not set | ||
481 | # CONFIG_E1000 is not set | ||
482 | # CONFIG_NS83820 is not set | ||
483 | # CONFIG_HAMACHI is not set | ||
484 | # CONFIG_YELLOWFIN is not set | ||
485 | # CONFIG_R8169 is not set | ||
486 | # CONFIG_SIS190 is not set | ||
487 | # CONFIG_SKGE is not set | ||
488 | # CONFIG_SKY2 is not set | ||
489 | # CONFIG_SK98LIN is not set | ||
490 | # CONFIG_TIGON3 is not set | ||
491 | # CONFIG_BNX2 is not set | ||
492 | # CONFIG_QLA3XXX is not set | ||
493 | # CONFIG_ATL1 is not set | ||
494 | |||
495 | # | ||
496 | # Ethernet (10000 Mbit) | ||
497 | # | ||
498 | # CONFIG_CHELSIO_T1 is not set | ||
499 | # CONFIG_CHELSIO_T3 is not set | ||
500 | # CONFIG_IXGB is not set | ||
501 | # CONFIG_S2IO is not set | ||
502 | # CONFIG_MYRI10GE is not set | ||
503 | # CONFIG_NETXEN_NIC is not set | ||
504 | |||
505 | # | ||
506 | # Token Ring devices | ||
507 | # | ||
508 | # CONFIG_TR is not set | 376 | # CONFIG_TR is not set |
509 | 377 | ||
510 | # | 378 | # |
@@ -512,28 +380,13 @@ CONFIG_NE2000=y | |||
512 | # | 380 | # |
513 | # CONFIG_WLAN_PRE80211 is not set | 381 | # CONFIG_WLAN_PRE80211 is not set |
514 | # CONFIG_WLAN_80211 is not set | 382 | # CONFIG_WLAN_80211 is not set |
515 | |||
516 | # | ||
517 | # Wan interfaces | ||
518 | # | ||
519 | # CONFIG_WAN is not set | 383 | # CONFIG_WAN is not set |
520 | # CONFIG_FDDI is not set | 384 | # CONFIG_FDDI is not set |
521 | # CONFIG_HIPPI is not set | ||
522 | # CONFIG_PPP is not set | 385 | # CONFIG_PPP is not set |
523 | # CONFIG_SLIP is not set | 386 | # CONFIG_SLIP is not set |
524 | # CONFIG_SHAPER is not set | ||
525 | # CONFIG_NETCONSOLE is not set | ||
526 | # CONFIG_NETPOLL is not set | 387 | # CONFIG_NETPOLL is not set |
527 | # CONFIG_NET_POLL_CONTROLLER is not set | 388 | # CONFIG_NET_POLL_CONTROLLER is not set |
528 | |||
529 | # | ||
530 | # ISDN subsystem | ||
531 | # | ||
532 | # CONFIG_ISDN is not set | 389 | # CONFIG_ISDN is not set |
533 | |||
534 | # | ||
535 | # Telephony Support | ||
536 | # | ||
537 | # CONFIG_PHONE is not set | 390 | # CONFIG_PHONE is not set |
538 | 391 | ||
539 | # | 392 | # |
@@ -577,29 +430,14 @@ CONFIG_SERIAL_TXX9_STDSERIAL=y | |||
577 | CONFIG_UNIX98_PTYS=y | 430 | CONFIG_UNIX98_PTYS=y |
578 | CONFIG_LEGACY_PTYS=y | 431 | CONFIG_LEGACY_PTYS=y |
579 | CONFIG_LEGACY_PTY_COUNT=256 | 432 | CONFIG_LEGACY_PTY_COUNT=256 |
580 | |||
581 | # | ||
582 | # IPMI | ||
583 | # | ||
584 | # CONFIG_IPMI_HANDLER is not set | 433 | # CONFIG_IPMI_HANDLER is not set |
585 | |||
586 | # | ||
587 | # Watchdog Cards | ||
588 | # | ||
589 | # CONFIG_WATCHDOG is not set | 434 | # CONFIG_WATCHDOG is not set |
590 | # CONFIG_HW_RANDOM is not set | 435 | # CONFIG_HW_RANDOM is not set |
591 | # CONFIG_RTC is not set | 436 | # CONFIG_RTC is not set |
592 | # CONFIG_GEN_RTC is not set | ||
593 | # CONFIG_DTLK is not set | ||
594 | # CONFIG_R3964 is not set | 437 | # CONFIG_R3964 is not set |
595 | # CONFIG_APPLICOM is not set | 438 | # CONFIG_APPLICOM is not set |
596 | # CONFIG_DRM is not set | 439 | # CONFIG_DRM is not set |
597 | # CONFIG_RAW_DRIVER is not set | 440 | # CONFIG_RAW_DRIVER is not set |
598 | |||
599 | # | ||
600 | # TPM devices | ||
601 | # | ||
602 | # CONFIG_TCG_TPM is not set | ||
603 | CONFIG_DEVPORT=y | 441 | CONFIG_DEVPORT=y |
604 | # CONFIG_I2C is not set | 442 | # CONFIG_I2C is not set |
605 | 443 | ||
@@ -608,11 +446,8 @@ CONFIG_DEVPORT=y | |||
608 | # | 446 | # |
609 | # CONFIG_SPI is not set | 447 | # CONFIG_SPI is not set |
610 | # CONFIG_SPI_MASTER is not set | 448 | # CONFIG_SPI_MASTER is not set |
611 | |||
612 | # | ||
613 | # Dallas's 1-wire bus | ||
614 | # | ||
615 | # CONFIG_W1 is not set | 449 | # CONFIG_W1 is not set |
450 | # CONFIG_POWER_SUPPLY is not set | ||
616 | # CONFIG_HWMON is not set | 451 | # CONFIG_HWMON is not set |
617 | 452 | ||
618 | # | 453 | # |
@@ -624,11 +459,8 @@ CONFIG_DEVPORT=y | |||
624 | # Multimedia devices | 459 | # Multimedia devices |
625 | # | 460 | # |
626 | # CONFIG_VIDEO_DEV is not set | 461 | # CONFIG_VIDEO_DEV is not set |
627 | 462 | # CONFIG_DVB_CORE is not set | |
628 | # | 463 | # CONFIG_DAB is not set |
629 | # Digital Video Broadcasting Devices | ||
630 | # | ||
631 | # CONFIG_DVB is not set | ||
632 | 464 | ||
633 | # | 465 | # |
634 | # Graphics support | 466 | # Graphics support |
@@ -640,56 +472,17 @@ CONFIG_DEVPORT=y | |||
640 | # | 472 | # |
641 | # CONFIG_DISPLAY_SUPPORT is not set | 473 | # CONFIG_DISPLAY_SUPPORT is not set |
642 | # CONFIG_VGASTATE is not set | 474 | # CONFIG_VGASTATE is not set |
475 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
643 | # CONFIG_FB is not set | 476 | # CONFIG_FB is not set |
644 | 477 | ||
645 | # | 478 | # |
646 | # Sound | 479 | # Sound |
647 | # | 480 | # |
648 | # CONFIG_SOUND is not set | 481 | # CONFIG_SOUND is not set |
649 | 482 | # CONFIG_USB_SUPPORT is not set | |
650 | # | ||
651 | # USB support | ||
652 | # | ||
653 | CONFIG_USB_ARCH_HAS_HCD=y | ||
654 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
655 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
656 | # CONFIG_USB is not set | ||
657 | |||
658 | # | ||
659 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
660 | # | ||
661 | |||
662 | # | ||
663 | # USB Gadget Support | ||
664 | # | ||
665 | # CONFIG_USB_GADGET is not set | ||
666 | # CONFIG_MMC is not set | 483 | # CONFIG_MMC is not set |
667 | |||
668 | # | ||
669 | # LED devices | ||
670 | # | ||
671 | # CONFIG_NEW_LEDS is not set | 484 | # CONFIG_NEW_LEDS is not set |
672 | |||
673 | # | ||
674 | # LED drivers | ||
675 | # | ||
676 | |||
677 | # | ||
678 | # LED Triggers | ||
679 | # | ||
680 | |||
681 | # | ||
682 | # InfiniBand support | ||
683 | # | ||
684 | # CONFIG_INFINIBAND is not set | 485 | # CONFIG_INFINIBAND is not set |
685 | |||
686 | # | ||
687 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
688 | # | ||
689 | |||
690 | # | ||
691 | # Real Time Clock | ||
692 | # | ||
693 | CONFIG_RTC_LIB=y | 486 | CONFIG_RTC_LIB=y |
694 | CONFIG_RTC_CLASS=y | 487 | CONFIG_RTC_CLASS=y |
695 | CONFIG_RTC_HCTOSYS=y | 488 | CONFIG_RTC_HCTOSYS=y |
@@ -706,19 +499,18 @@ CONFIG_RTC_INTF_DEV=y | |||
706 | # CONFIG_RTC_DRV_TEST is not set | 499 | # CONFIG_RTC_DRV_TEST is not set |
707 | 500 | ||
708 | # | 501 | # |
709 | # I2C RTC drivers | ||
710 | # | ||
711 | |||
712 | # | ||
713 | # SPI RTC drivers | 502 | # SPI RTC drivers |
714 | # | 503 | # |
715 | 504 | ||
716 | # | 505 | # |
717 | # Platform RTC drivers | 506 | # Platform RTC drivers |
718 | # | 507 | # |
508 | # CONFIG_RTC_DRV_CMOS is not set | ||
719 | # CONFIG_RTC_DRV_DS1553 is not set | 509 | # CONFIG_RTC_DRV_DS1553 is not set |
510 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
720 | CONFIG_RTC_DRV_DS1742=y | 511 | CONFIG_RTC_DRV_DS1742=y |
721 | # CONFIG_RTC_DRV_M48T86 is not set | 512 | # CONFIG_RTC_DRV_M48T86 is not set |
513 | # CONFIG_RTC_DRV_M48T59 is not set | ||
722 | # CONFIG_RTC_DRV_V3020 is not set | 514 | # CONFIG_RTC_DRV_V3020 is not set |
723 | 515 | ||
724 | # | 516 | # |
@@ -739,24 +531,19 @@ CONFIG_RTC_DRV_DS1742=y | |||
739 | # | 531 | # |
740 | 532 | ||
741 | # | 533 | # |
742 | # Auxiliary Display support | 534 | # Userspace I/O |
743 | # | ||
744 | |||
745 | # | ||
746 | # Virtualization | ||
747 | # | 535 | # |
536 | # CONFIG_UIO is not set | ||
748 | 537 | ||
749 | # | 538 | # |
750 | # File systems | 539 | # File systems |
751 | # | 540 | # |
752 | # CONFIG_EXT2_FS is not set | 541 | # CONFIG_EXT2_FS is not set |
753 | # CONFIG_EXT3_FS is not set | 542 | # CONFIG_EXT3_FS is not set |
754 | # CONFIG_EXT4DEV_FS is not set | ||
755 | # CONFIG_REISERFS_FS is not set | 543 | # CONFIG_REISERFS_FS is not set |
756 | # CONFIG_JFS_FS is not set | 544 | # CONFIG_JFS_FS is not set |
757 | CONFIG_FS_POSIX_ACL=y | 545 | CONFIG_FS_POSIX_ACL=y |
758 | # CONFIG_XFS_FS is not set | 546 | # CONFIG_XFS_FS is not set |
759 | # CONFIG_GFS2_FS is not set | ||
760 | # CONFIG_OCFS2_FS is not set | 547 | # CONFIG_OCFS2_FS is not set |
761 | # CONFIG_MINIX_FS is not set | 548 | # CONFIG_MINIX_FS is not set |
762 | # CONFIG_ROMFS_FS is not set | 549 | # CONFIG_ROMFS_FS is not set |
@@ -793,18 +580,11 @@ CONFIG_TMPFS=y | |||
793 | CONFIG_TMPFS_POSIX_ACL=y | 580 | CONFIG_TMPFS_POSIX_ACL=y |
794 | # CONFIG_HUGETLB_PAGE is not set | 581 | # CONFIG_HUGETLB_PAGE is not set |
795 | CONFIG_RAMFS=y | 582 | CONFIG_RAMFS=y |
796 | # CONFIG_CONFIGFS_FS is not set | ||
797 | 583 | ||
798 | # | 584 | # |
799 | # Miscellaneous filesystems | 585 | # Miscellaneous filesystems |
800 | # | 586 | # |
801 | # CONFIG_ADFS_FS is not set | ||
802 | # CONFIG_AFFS_FS is not set | ||
803 | # CONFIG_HFS_FS is not set | ||
804 | # CONFIG_HFSPLUS_FS is not set | 587 | # CONFIG_HFSPLUS_FS is not set |
805 | # CONFIG_BEFS_FS is not set | ||
806 | # CONFIG_BFS_FS is not set | ||
807 | # CONFIG_EFS_FS is not set | ||
808 | # CONFIG_CRAMFS is not set | 588 | # CONFIG_CRAMFS is not set |
809 | # CONFIG_VXFS_FS is not set | 589 | # CONFIG_VXFS_FS is not set |
810 | # CONFIG_HPFS_FS is not set | 590 | # CONFIG_HPFS_FS is not set |
@@ -818,7 +598,6 @@ CONFIG_RAMFS=y | |||
818 | CONFIG_NFS_FS=y | 598 | CONFIG_NFS_FS=y |
819 | CONFIG_NFS_V3=y | 599 | CONFIG_NFS_V3=y |
820 | # CONFIG_NFS_V3_ACL is not set | 600 | # CONFIG_NFS_V3_ACL is not set |
821 | # CONFIG_NFS_V4 is not set | ||
822 | # CONFIG_NFS_DIRECTIO is not set | 601 | # CONFIG_NFS_DIRECTIO is not set |
823 | # CONFIG_NFSD is not set | 602 | # CONFIG_NFSD is not set |
824 | CONFIG_ROOT_NFS=y | 603 | CONFIG_ROOT_NFS=y |
@@ -826,15 +605,10 @@ CONFIG_LOCKD=y | |||
826 | CONFIG_LOCKD_V4=y | 605 | CONFIG_LOCKD_V4=y |
827 | CONFIG_NFS_COMMON=y | 606 | CONFIG_NFS_COMMON=y |
828 | CONFIG_SUNRPC=y | 607 | CONFIG_SUNRPC=y |
829 | # CONFIG_SUNRPC_BIND34 is not set | ||
830 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
831 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
832 | # CONFIG_SMB_FS is not set | 608 | # CONFIG_SMB_FS is not set |
833 | # CONFIG_CIFS is not set | 609 | # CONFIG_CIFS is not set |
834 | # CONFIG_NCP_FS is not set | 610 | # CONFIG_NCP_FS is not set |
835 | # CONFIG_CODA_FS is not set | 611 | # CONFIG_CODA_FS is not set |
836 | # CONFIG_AFS_FS is not set | ||
837 | # CONFIG_9P_FS is not set | ||
838 | 612 | ||
839 | # | 613 | # |
840 | # Partition Types | 614 | # Partition Types |
@@ -848,16 +622,6 @@ CONFIG_MSDOS_PARTITION=y | |||
848 | # CONFIG_NLS is not set | 622 | # CONFIG_NLS is not set |
849 | 623 | ||
850 | # | 624 | # |
851 | # Distributed Lock Manager | ||
852 | # | ||
853 | # CONFIG_DLM is not set | ||
854 | |||
855 | # | ||
856 | # Profiling support | ||
857 | # | ||
858 | # CONFIG_PROFILING is not set | ||
859 | |||
860 | # | ||
861 | # Kernel hacking | 625 | # Kernel hacking |
862 | # | 626 | # |
863 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 627 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
@@ -877,10 +641,6 @@ CONFIG_SYS_SUPPORTS_KGDB=y | |||
877 | # | 641 | # |
878 | # CONFIG_KEYS is not set | 642 | # CONFIG_KEYS is not set |
879 | # CONFIG_SECURITY is not set | 643 | # CONFIG_SECURITY is not set |
880 | |||
881 | # | ||
882 | # Cryptographic options | ||
883 | # | ||
884 | # CONFIG_CRYPTO is not set | 644 | # CONFIG_CRYPTO is not set |
885 | 645 | ||
886 | # | 646 | # |
@@ -889,7 +649,9 @@ CONFIG_SYS_SUPPORTS_KGDB=y | |||
889 | CONFIG_BITREVERSE=y | 649 | CONFIG_BITREVERSE=y |
890 | # CONFIG_CRC_CCITT is not set | 650 | # CONFIG_CRC_CCITT is not set |
891 | # CONFIG_CRC16 is not set | 651 | # CONFIG_CRC16 is not set |
652 | # CONFIG_CRC_ITU_T is not set | ||
892 | CONFIG_CRC32=y | 653 | CONFIG_CRC32=y |
654 | # CONFIG_CRC7 is not set | ||
893 | # CONFIG_LIBCRC32C is not set | 655 | # CONFIG_LIBCRC32C is not set |
894 | CONFIG_HAS_IOMEM=y | 656 | CONFIG_HAS_IOMEM=y |
895 | CONFIG_HAS_IOPORT=y | 657 | CONFIG_HAS_IOPORT=y |
diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig index 40453cd7c70e..d1b56cc0fd7c 100644 --- a/arch/mips/configs/rbhma4500_defconfig +++ b/arch/mips/configs/rbhma4500_defconfig | |||
@@ -1,48 +1,47 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.22-rc5 | 3 | # Linux kernel version: 2.6.23-rc1 |
4 | # Fri Jun 22 21:39:45 2007 | 4 | # Thu Aug 2 22:59:53 2007 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
8 | # | 8 | # |
9 | # Machine selection | 9 | # Machine selection |
10 | # | 10 | # |
11 | CONFIG_ZONE_DMA=y | ||
12 | # CONFIG_LEMOTE_FULONG is not set | ||
13 | # CONFIG_MACH_ALCHEMY is not set | 11 | # CONFIG_MACH_ALCHEMY is not set |
14 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
15 | # CONFIG_MIPS_COBALT is not set | 13 | # CONFIG_MIPS_COBALT is not set |
16 | # CONFIG_MACH_DECSTATION is not set | 14 | # CONFIG_MACH_DECSTATION is not set |
17 | # CONFIG_MACH_JAZZ is not set | 15 | # CONFIG_MACH_JAZZ is not set |
16 | # CONFIG_LEMOTE_FULONG is not set | ||
18 | # CONFIG_MIPS_ATLAS is not set | 17 | # CONFIG_MIPS_ATLAS is not set |
19 | # CONFIG_MIPS_MALTA is not set | 18 | # CONFIG_MIPS_MALTA is not set |
20 | # CONFIG_MIPS_SEAD is not set | 19 | # CONFIG_MIPS_SEAD is not set |
21 | # CONFIG_WR_PPMC is not set | ||
22 | # CONFIG_MIPS_SIM is not set | 20 | # CONFIG_MIPS_SIM is not set |
21 | # CONFIG_MARKEINS is not set | ||
22 | # CONFIG_MACH_VR41XX is not set | ||
23 | # CONFIG_PNX8550_JBS is not set | 23 | # CONFIG_PNX8550_JBS is not set |
24 | # CONFIG_PNX8550_STB810 is not set | 24 | # CONFIG_PNX8550_STB810 is not set |
25 | # CONFIG_MACH_VR41XX is not set | ||
26 | # CONFIG_PMC_MSP is not set | 25 | # CONFIG_PMC_MSP is not set |
27 | # CONFIG_PMC_YOSEMITE is not set | 26 | # CONFIG_PMC_YOSEMITE is not set |
28 | # CONFIG_QEMU is not set | 27 | # CONFIG_QEMU is not set |
29 | # CONFIG_MARKEINS is not set | ||
30 | # CONFIG_SGI_IP22 is not set | 28 | # CONFIG_SGI_IP22 is not set |
31 | # CONFIG_SGI_IP27 is not set | 29 | # CONFIG_SGI_IP27 is not set |
32 | # CONFIG_SGI_IP32 is not set | 30 | # CONFIG_SGI_IP32 is not set |
33 | # CONFIG_SIBYTE_BIGSUR is not set | 31 | # CONFIG_SIBYTE_CRHINE is not set |
32 | # CONFIG_SIBYTE_CARMEL is not set | ||
33 | # CONFIG_SIBYTE_CRHONE is not set | ||
34 | # CONFIG_SIBYTE_RHONE is not set | ||
34 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
35 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
36 | # CONFIG_SIBYTE_RHONE is not set | ||
37 | # CONFIG_SIBYTE_CARMEL is not set | ||
38 | # CONFIG_SIBYTE_PTSWARM is not set | 38 | # CONFIG_SIBYTE_PTSWARM is not set |
39 | # CONFIG_SIBYTE_LITTLESUR is not set | 39 | # CONFIG_SIBYTE_BIGSUR is not set |
40 | # CONFIG_SIBYTE_CRHINE is not set | ||
41 | # CONFIG_SIBYTE_CRHONE is not set | ||
42 | # CONFIG_SNI_RM is not set | 40 | # CONFIG_SNI_RM is not set |
43 | # CONFIG_TOSHIBA_JMR3927 is not set | 41 | # CONFIG_TOSHIBA_JMR3927 is not set |
44 | # CONFIG_TOSHIBA_RBTX4927 is not set | 42 | # CONFIG_TOSHIBA_RBTX4927 is not set |
45 | CONFIG_TOSHIBA_RBTX4938=y | 43 | CONFIG_TOSHIBA_RBTX4938=y |
44 | # CONFIG_WR_PPMC is not set | ||
46 | 45 | ||
47 | # | 46 | # |
48 | # Multiplex Pin Select | 47 | # Multiplex Pin Select |
@@ -61,17 +60,16 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
61 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 60 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
62 | CONFIG_DMA_NONCOHERENT=y | 61 | CONFIG_DMA_NONCOHERENT=y |
63 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 62 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
64 | CONFIG_GENERIC_ISA_DMA=y | ||
65 | CONFIG_I8259=y | ||
66 | # CONFIG_NO_IOPORT is not set | 63 | # CONFIG_NO_IOPORT is not set |
67 | CONFIG_GENERIC_GPIO=y | 64 | CONFIG_GENERIC_GPIO=y |
68 | # CONFIG_CPU_BIG_ENDIAN is not set | 65 | # CONFIG_CPU_BIG_ENDIAN is not set |
69 | CONFIG_CPU_LITTLE_ENDIAN=y | 66 | CONFIG_CPU_LITTLE_ENDIAN=y |
70 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 67 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y |
71 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 68 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
69 | CONFIG_IRQ_CPU=y | ||
70 | CONFIG_IRQ_TXX9=y | ||
72 | CONFIG_SWAP_IO_SPACE=y | 71 | CONFIG_SWAP_IO_SPACE=y |
73 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 72 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
74 | CONFIG_HAVE_STD_PC_SERIAL_PORT=y | ||
75 | 73 | ||
76 | # | 74 | # |
77 | # CPU selection | 75 | # CPU selection |
@@ -114,22 +112,18 @@ CONFIG_CPU_HAS_PREFETCH=y | |||
114 | CONFIG_MIPS_MT_DISABLED=y | 112 | CONFIG_MIPS_MT_DISABLED=y |
115 | # CONFIG_MIPS_MT_SMP is not set | 113 | # CONFIG_MIPS_MT_SMP is not set |
116 | # CONFIG_MIPS_MT_SMTC is not set | 114 | # CONFIG_MIPS_MT_SMTC is not set |
117 | # CONFIG_MIPS_VPE_LOADER is not set | ||
118 | CONFIG_CPU_HAS_LLSC=y | 115 | CONFIG_CPU_HAS_LLSC=y |
119 | CONFIG_CPU_HAS_SYNC=y | 116 | CONFIG_CPU_HAS_SYNC=y |
120 | CONFIG_GENERIC_HARDIRQS=y | 117 | CONFIG_GENERIC_HARDIRQS=y |
121 | CONFIG_GENERIC_IRQ_PROBE=y | 118 | CONFIG_GENERIC_IRQ_PROBE=y |
122 | CONFIG_ARCH_FLATMEM_ENABLE=y | 119 | CONFIG_ARCH_FLATMEM_ENABLE=y |
123 | CONFIG_SELECT_MEMORY_MODEL=y | ||
124 | CONFIG_FLATMEM_MANUAL=y | ||
125 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
126 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
127 | CONFIG_FLATMEM=y | 120 | CONFIG_FLATMEM=y |
128 | CONFIG_FLAT_NODE_MEM_MAP=y | 121 | CONFIG_FLAT_NODE_MEM_MAP=y |
129 | # CONFIG_SPARSEMEM_STATIC is not set | 122 | # CONFIG_SPARSEMEM_STATIC is not set |
130 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 123 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
131 | # CONFIG_RESOURCES_64BIT is not set | 124 | # CONFIG_RESOURCES_64BIT is not set |
132 | CONFIG_ZONE_DMA_FLAG=1 | 125 | CONFIG_ZONE_DMA_FLAG=0 |
126 | CONFIG_VIRT_TO_BUS=y | ||
133 | # CONFIG_HZ_48 is not set | 127 | # CONFIG_HZ_48 is not set |
134 | # CONFIG_HZ_100 is not set | 128 | # CONFIG_HZ_100 is not set |
135 | # CONFIG_HZ_128 is not set | 129 | # CONFIG_HZ_128 is not set |
@@ -142,31 +136,24 @@ CONFIG_HZ=250 | |||
142 | CONFIG_PREEMPT_NONE=y | 136 | CONFIG_PREEMPT_NONE=y |
143 | # CONFIG_PREEMPT_VOLUNTARY is not set | 137 | # CONFIG_PREEMPT_VOLUNTARY is not set |
144 | # CONFIG_PREEMPT is not set | 138 | # CONFIG_PREEMPT is not set |
145 | # CONFIG_KEXEC is not set | 139 | # CONFIG_SECCOMP is not set |
146 | CONFIG_LOCKDEP_SUPPORT=y | 140 | CONFIG_LOCKDEP_SUPPORT=y |
147 | CONFIG_STACKTRACE_SUPPORT=y | 141 | CONFIG_STACKTRACE_SUPPORT=y |
148 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 142 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
149 | 143 | ||
150 | # | 144 | # |
151 | # Code maturity level options | 145 | # General setup |
152 | # | 146 | # |
153 | CONFIG_EXPERIMENTAL=y | 147 | # CONFIG_EXPERIMENTAL is not set |
154 | CONFIG_BROKEN_ON_SMP=y | 148 | CONFIG_BROKEN_ON_SMP=y |
155 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 149 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
156 | |||
157 | # | ||
158 | # General setup | ||
159 | # | ||
160 | CONFIG_LOCALVERSION="" | 150 | CONFIG_LOCALVERSION="" |
161 | CONFIG_LOCALVERSION_AUTO=y | 151 | CONFIG_LOCALVERSION_AUTO=y |
162 | CONFIG_SWAP=y | 152 | CONFIG_SWAP=y |
163 | CONFIG_SYSVIPC=y | 153 | CONFIG_SYSVIPC=y |
164 | # CONFIG_IPC_NS is not set | ||
165 | CONFIG_SYSVIPC_SYSCTL=y | 154 | CONFIG_SYSVIPC_SYSCTL=y |
166 | # CONFIG_POSIX_MQUEUE is not set | ||
167 | # CONFIG_BSD_PROCESS_ACCT is not set | 155 | # CONFIG_BSD_PROCESS_ACCT is not set |
168 | # CONFIG_TASKSTATS is not set | 156 | # CONFIG_TASKSTATS is not set |
169 | # CONFIG_UTS_NS is not set | ||
170 | # CONFIG_AUDIT is not set | 157 | # CONFIG_AUDIT is not set |
171 | CONFIG_IKCONFIG=y | 158 | CONFIG_IKCONFIG=y |
172 | CONFIG_IKCONFIG_PROC=y | 159 | CONFIG_IKCONFIG_PROC=y |
@@ -175,7 +162,6 @@ CONFIG_SYSFS_DEPRECATED=y | |||
175 | # CONFIG_RELAY is not set | 162 | # CONFIG_RELAY is not set |
176 | CONFIG_BLK_DEV_INITRD=y | 163 | CONFIG_BLK_DEV_INITRD=y |
177 | CONFIG_INITRAMFS_SOURCE="" | 164 | CONFIG_INITRAMFS_SOURCE="" |
178 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
179 | CONFIG_SYSCTL=y | 165 | CONFIG_SYSCTL=y |
180 | CONFIG_EMBEDDED=y | 166 | CONFIG_EMBEDDED=y |
181 | CONFIG_SYSCTL_SYSCALL=y | 167 | CONFIG_SYSCTL_SYSCALL=y |
@@ -199,19 +185,11 @@ CONFIG_SLAB=y | |||
199 | # CONFIG_SLOB is not set | 185 | # CONFIG_SLOB is not set |
200 | # CONFIG_TINY_SHMEM is not set | 186 | # CONFIG_TINY_SHMEM is not set |
201 | CONFIG_BASE_SMALL=0 | 187 | CONFIG_BASE_SMALL=0 |
202 | |||
203 | # | ||
204 | # Loadable module support | ||
205 | # | ||
206 | CONFIG_MODULES=y | 188 | CONFIG_MODULES=y |
207 | # CONFIG_MODULE_UNLOAD is not set | 189 | # CONFIG_MODULE_UNLOAD is not set |
208 | # CONFIG_MODVERSIONS is not set | 190 | # CONFIG_MODVERSIONS is not set |
209 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 191 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
210 | CONFIG_KMOD=y | 192 | CONFIG_KMOD=y |
211 | |||
212 | # | ||
213 | # Block layer | ||
214 | # | ||
215 | CONFIG_BLOCK=y | 193 | CONFIG_BLOCK=y |
216 | # CONFIG_LBD is not set | 194 | # CONFIG_LBD is not set |
217 | # CONFIG_BLK_DEV_IO_TRACE is not set | 195 | # CONFIG_BLK_DEV_IO_TRACE is not set |
@@ -277,7 +255,6 @@ CONFIG_IP_PNP=y | |||
277 | # CONFIG_NET_IPIP is not set | 255 | # CONFIG_NET_IPIP is not set |
278 | # CONFIG_NET_IPGRE is not set | 256 | # CONFIG_NET_IPGRE is not set |
279 | # CONFIG_IP_MROUTE is not set | 257 | # CONFIG_IP_MROUTE is not set |
280 | # CONFIG_ARPD is not set | ||
281 | # CONFIG_SYN_COOKIES is not set | 258 | # CONFIG_SYN_COOKIES is not set |
282 | # CONFIG_INET_AH is not set | 259 | # CONFIG_INET_AH is not set |
283 | # CONFIG_INET_ESP is not set | 260 | # CONFIG_INET_ESP is not set |
@@ -292,26 +269,17 @@ CONFIG_INET_TCP_DIAG=y | |||
292 | # CONFIG_TCP_CONG_ADVANCED is not set | 269 | # CONFIG_TCP_CONG_ADVANCED is not set |
293 | CONFIG_TCP_CONG_CUBIC=y | 270 | CONFIG_TCP_CONG_CUBIC=y |
294 | CONFIG_DEFAULT_TCP_CONG="cubic" | 271 | CONFIG_DEFAULT_TCP_CONG="cubic" |
295 | # CONFIG_TCP_MD5SIG is not set | ||
296 | # CONFIG_IPV6 is not set | 272 | # CONFIG_IPV6 is not set |
297 | # CONFIG_INET6_XFRM_TUNNEL is not set | 273 | # CONFIG_INET6_XFRM_TUNNEL is not set |
298 | # CONFIG_INET6_TUNNEL is not set | 274 | # CONFIG_INET6_TUNNEL is not set |
299 | # CONFIG_NETWORK_SECMARK is not set | 275 | # CONFIG_NETWORK_SECMARK is not set |
300 | # CONFIG_NETFILTER is not set | 276 | # CONFIG_NETFILTER is not set |
301 | # CONFIG_IP_DCCP is not set | ||
302 | # CONFIG_IP_SCTP is not set | ||
303 | # CONFIG_TIPC is not set | ||
304 | # CONFIG_ATM is not set | ||
305 | # CONFIG_BRIDGE is not set | 277 | # CONFIG_BRIDGE is not set |
306 | # CONFIG_VLAN_8021Q is not set | 278 | # CONFIG_VLAN_8021Q is not set |
307 | # CONFIG_DECNET is not set | 279 | # CONFIG_DECNET is not set |
308 | # CONFIG_LLC2 is not set | 280 | # CONFIG_LLC2 is not set |
309 | # CONFIG_IPX is not set | 281 | # CONFIG_IPX is not set |
310 | # CONFIG_ATALK is not set | 282 | # CONFIG_ATALK is not set |
311 | # CONFIG_X25 is not set | ||
312 | # CONFIG_LAPB is not set | ||
313 | # CONFIG_ECONET is not set | ||
314 | # CONFIG_WAN_ROUTER is not set | ||
315 | 283 | ||
316 | # | 284 | # |
317 | # QoS and/or fair queueing | 285 | # QoS and/or fair queueing |
@@ -325,14 +293,12 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
325 | # CONFIG_HAMRADIO is not set | 293 | # CONFIG_HAMRADIO is not set |
326 | # CONFIG_IRDA is not set | 294 | # CONFIG_IRDA is not set |
327 | # CONFIG_BT is not set | 295 | # CONFIG_BT is not set |
328 | # CONFIG_AF_RXRPC is not set | ||
329 | 296 | ||
330 | # | 297 | # |
331 | # Wireless | 298 | # Wireless |
332 | # | 299 | # |
333 | # CONFIG_CFG80211 is not set | 300 | # CONFIG_CFG80211 is not set |
334 | # CONFIG_WIRELESS_EXT is not set | 301 | # CONFIG_WIRELESS_EXT is not set |
335 | # CONFIG_MAC80211 is not set | ||
336 | # CONFIG_IEEE80211 is not set | 302 | # CONFIG_IEEE80211 is not set |
337 | # CONFIG_RFKILL is not set | 303 | # CONFIG_RFKILL is not set |
338 | 304 | ||
@@ -346,30 +312,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
346 | CONFIG_STANDALONE=y | 312 | CONFIG_STANDALONE=y |
347 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 313 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
348 | # CONFIG_SYS_HYPERVISOR is not set | 314 | # CONFIG_SYS_HYPERVISOR is not set |
349 | |||
350 | # | ||
351 | # Connector - unified userspace <-> kernelspace linker | ||
352 | # | ||
353 | # CONFIG_CONNECTOR is not set | 315 | # CONFIG_CONNECTOR is not set |
354 | # CONFIG_MTD is not set | 316 | # CONFIG_MTD is not set |
355 | |||
356 | # | ||
357 | # Parallel port support | ||
358 | # | ||
359 | # CONFIG_PARPORT is not set | 317 | # CONFIG_PARPORT is not set |
360 | 318 | CONFIG_BLK_DEV=y | |
361 | # | ||
362 | # Plug and Play support | ||
363 | # | ||
364 | # CONFIG_PNPACPI is not set | ||
365 | |||
366 | # | ||
367 | # Block devices | ||
368 | # | ||
369 | # CONFIG_BLK_CPQ_DA is not set | 319 | # CONFIG_BLK_CPQ_DA is not set |
370 | # CONFIG_BLK_CPQ_CISS_DA is not set | 320 | # CONFIG_BLK_CPQ_CISS_DA is not set |
371 | # CONFIG_BLK_DEV_DAC960 is not set | 321 | # CONFIG_BLK_DEV_DAC960 is not set |
372 | # CONFIG_BLK_DEV_UMEM is not set | ||
373 | # CONFIG_BLK_DEV_COW_COMMON is not set | 322 | # CONFIG_BLK_DEV_COW_COMMON is not set |
374 | CONFIG_BLK_DEV_LOOP=y | 323 | CONFIG_BLK_DEV_LOOP=y |
375 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 324 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
@@ -381,14 +330,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 | |||
381 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 330 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
382 | # CONFIG_CDROM_PKTCDVD is not set | 331 | # CONFIG_CDROM_PKTCDVD is not set |
383 | # CONFIG_ATA_OVER_ETH is not set | 332 | # CONFIG_ATA_OVER_ETH is not set |
384 | 333 | # CONFIG_MISC_DEVICES is not set | |
385 | # | ||
386 | # Misc devices | ||
387 | # | ||
388 | # CONFIG_PHANTOM is not set | ||
389 | # CONFIG_SGI_IOC4 is not set | ||
390 | # CONFIG_TIFM_CORE is not set | ||
391 | # CONFIG_BLINK is not set | ||
392 | # CONFIG_IDE is not set | 334 | # CONFIG_IDE is not set |
393 | 335 | ||
394 | # | 336 | # |
@@ -396,12 +338,9 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
396 | # | 338 | # |
397 | # CONFIG_RAID_ATTRS is not set | 339 | # CONFIG_RAID_ATTRS is not set |
398 | # CONFIG_SCSI is not set | 340 | # CONFIG_SCSI is not set |
341 | # CONFIG_SCSI_DMA is not set | ||
399 | # CONFIG_SCSI_NETLINK is not set | 342 | # CONFIG_SCSI_NETLINK is not set |
400 | # CONFIG_ATA is not set | 343 | # CONFIG_ATA is not set |
401 | |||
402 | # | ||
403 | # Multi-device support (RAID and LVM) | ||
404 | # | ||
405 | # CONFIG_MD is not set | 344 | # CONFIG_MD is not set |
406 | 345 | ||
407 | # | 346 | # |
@@ -412,39 +351,28 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | |||
412 | # | 351 | # |
413 | # IEEE 1394 (FireWire) support | 352 | # IEEE 1394 (FireWire) support |
414 | # | 353 | # |
415 | # CONFIG_FIREWIRE is not set | ||
416 | # CONFIG_IEEE1394 is not set | ||
417 | 354 | ||
418 | # | 355 | # |
419 | # I2O device support | 356 | # An alternative FireWire stack is available with EXPERIMENTAL=y |
420 | # | 357 | # |
358 | # CONFIG_IEEE1394 is not set | ||
421 | # CONFIG_I2O is not set | 359 | # CONFIG_I2O is not set |
422 | |||
423 | # | ||
424 | # Network device support | ||
425 | # | ||
426 | CONFIG_NETDEVICES=y | 360 | CONFIG_NETDEVICES=y |
361 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
427 | # CONFIG_DUMMY is not set | 362 | # CONFIG_DUMMY is not set |
428 | # CONFIG_BONDING is not set | 363 | # CONFIG_BONDING is not set |
429 | # CONFIG_EQUALIZER is not set | 364 | # CONFIG_EQUALIZER is not set |
430 | # CONFIG_TUN is not set | 365 | # CONFIG_TUN is not set |
431 | # CONFIG_ARCNET is not set | 366 | # CONFIG_ARCNET is not set |
432 | # CONFIG_PHYLIB is not set | 367 | # CONFIG_PHYLIB is not set |
433 | |||
434 | # | ||
435 | # Ethernet (10 or 100Mbit) | ||
436 | # | ||
437 | CONFIG_NET_ETHERNET=y | 368 | CONFIG_NET_ETHERNET=y |
438 | CONFIG_MII=y | 369 | CONFIG_MII=y |
370 | # CONFIG_AX88796 is not set | ||
439 | # CONFIG_HAPPYMEAL is not set | 371 | # CONFIG_HAPPYMEAL is not set |
440 | # CONFIG_SUNGEM is not set | 372 | # CONFIG_SUNGEM is not set |
441 | # CONFIG_CASSINI is not set | 373 | # CONFIG_CASSINI is not set |
442 | # CONFIG_NET_VENDOR_3COM is not set | 374 | # CONFIG_NET_VENDOR_3COM is not set |
443 | # CONFIG_DM9000 is not set | 375 | # CONFIG_DM9000 is not set |
444 | |||
445 | # | ||
446 | # Tulip family network device support | ||
447 | # | ||
448 | # CONFIG_NET_TULIP is not set | 376 | # CONFIG_NET_TULIP is not set |
449 | # CONFIG_HP100 is not set | 377 | # CONFIG_HP100 is not set |
450 | CONFIG_NE2000=y | 378 | CONFIG_NE2000=y |
@@ -461,14 +389,12 @@ CONFIG_TC35815=y | |||
461 | # CONFIG_FEALNX is not set | 389 | # CONFIG_FEALNX is not set |
462 | # CONFIG_NATSEMI is not set | 390 | # CONFIG_NATSEMI is not set |
463 | # CONFIG_NE2K_PCI is not set | 391 | # CONFIG_NE2K_PCI is not set |
464 | # CONFIG_8139CP is not set | ||
465 | # CONFIG_8139TOO is not set | 392 | # CONFIG_8139TOO is not set |
466 | # CONFIG_SIS900 is not set | 393 | # CONFIG_SIS900 is not set |
467 | # CONFIG_EPIC100 is not set | 394 | # CONFIG_EPIC100 is not set |
468 | # CONFIG_SUNDANCE is not set | 395 | # CONFIG_SUNDANCE is not set |
469 | # CONFIG_TLAN is not set | 396 | # CONFIG_TLAN is not set |
470 | # CONFIG_VIA_RHINE is not set | 397 | # CONFIG_VIA_RHINE is not set |
471 | # CONFIG_SC92031 is not set | ||
472 | # CONFIG_NETDEV_1000 is not set | 398 | # CONFIG_NETDEV_1000 is not set |
473 | # CONFIG_NETDEV_10000 is not set | 399 | # CONFIG_NETDEV_10000 is not set |
474 | # CONFIG_TR is not set | 400 | # CONFIG_TR is not set |
@@ -480,22 +406,11 @@ CONFIG_TC35815=y | |||
480 | # CONFIG_WLAN_80211 is not set | 406 | # CONFIG_WLAN_80211 is not set |
481 | # CONFIG_WAN is not set | 407 | # CONFIG_WAN is not set |
482 | # CONFIG_FDDI is not set | 408 | # CONFIG_FDDI is not set |
483 | # CONFIG_HIPPI is not set | ||
484 | # CONFIG_PPP is not set | 409 | # CONFIG_PPP is not set |
485 | # CONFIG_SLIP is not set | 410 | # CONFIG_SLIP is not set |
486 | # CONFIG_SHAPER is not set | ||
487 | # CONFIG_NETCONSOLE is not set | ||
488 | # CONFIG_NETPOLL is not set | 411 | # CONFIG_NETPOLL is not set |
489 | # CONFIG_NET_POLL_CONTROLLER is not set | 412 | # CONFIG_NET_POLL_CONTROLLER is not set |
490 | |||
491 | # | ||
492 | # ISDN subsystem | ||
493 | # | ||
494 | # CONFIG_ISDN is not set | 413 | # CONFIG_ISDN is not set |
495 | |||
496 | # | ||
497 | # Telephony Support | ||
498 | # | ||
499 | # CONFIG_PHONE is not set | 414 | # CONFIG_PHONE is not set |
500 | 415 | ||
501 | # | 416 | # |
@@ -534,24 +449,14 @@ CONFIG_SERIAL_TXX9_STDSERIAL=y | |||
534 | CONFIG_UNIX98_PTYS=y | 449 | CONFIG_UNIX98_PTYS=y |
535 | CONFIG_LEGACY_PTYS=y | 450 | CONFIG_LEGACY_PTYS=y |
536 | CONFIG_LEGACY_PTY_COUNT=256 | 451 | CONFIG_LEGACY_PTY_COUNT=256 |
537 | |||
538 | # | ||
539 | # IPMI | ||
540 | # | ||
541 | # CONFIG_IPMI_HANDLER is not set | 452 | # CONFIG_IPMI_HANDLER is not set |
542 | # CONFIG_WATCHDOG is not set | 453 | # CONFIG_WATCHDOG is not set |
543 | # CONFIG_HW_RANDOM is not set | 454 | # CONFIG_HW_RANDOM is not set |
544 | # CONFIG_RTC is not set | 455 | # CONFIG_RTC is not set |
545 | # CONFIG_GEN_RTC is not set | ||
546 | # CONFIG_R3964 is not set | 456 | # CONFIG_R3964 is not set |
547 | # CONFIG_APPLICOM is not set | 457 | # CONFIG_APPLICOM is not set |
548 | # CONFIG_DRM is not set | 458 | # CONFIG_DRM is not set |
549 | # CONFIG_RAW_DRIVER is not set | 459 | # CONFIG_RAW_DRIVER is not set |
550 | |||
551 | # | ||
552 | # TPM devices | ||
553 | # | ||
554 | # CONFIG_TCG_TPM is not set | ||
555 | CONFIG_DEVPORT=y | 460 | CONFIG_DEVPORT=y |
556 | # CONFIG_I2C is not set | 461 | # CONFIG_I2C is not set |
557 | 462 | ||
@@ -564,19 +469,15 @@ CONFIG_SPI_MASTER=y | |||
564 | # | 469 | # |
565 | # SPI Master Controller Drivers | 470 | # SPI Master Controller Drivers |
566 | # | 471 | # |
567 | # CONFIG_SPI_BITBANG is not set | ||
568 | CONFIG_SPI_TXX9=y | 472 | CONFIG_SPI_TXX9=y |
569 | 473 | ||
570 | # | 474 | # |
571 | # SPI Protocol Masters | 475 | # SPI Protocol Masters |
572 | # | 476 | # |
573 | CONFIG_SPI_AT25=y | 477 | CONFIG_SPI_AT25=y |
574 | # CONFIG_SPI_SPIDEV is not set | 478 | # CONFIG_SPI_TLE62X0 is not set |
575 | |||
576 | # | ||
577 | # Dallas's 1-wire bus | ||
578 | # | ||
579 | # CONFIG_W1 is not set | 479 | # CONFIG_W1 is not set |
480 | # CONFIG_POWER_SUPPLY is not set | ||
580 | # CONFIG_HWMON is not set | 481 | # CONFIG_HWMON is not set |
581 | 482 | ||
582 | # | 483 | # |
@@ -601,56 +502,17 @@ CONFIG_SPI_AT25=y | |||
601 | # | 502 | # |
602 | # CONFIG_DISPLAY_SUPPORT is not set | 503 | # CONFIG_DISPLAY_SUPPORT is not set |
603 | # CONFIG_VGASTATE is not set | 504 | # CONFIG_VGASTATE is not set |
505 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
604 | # CONFIG_FB is not set | 506 | # CONFIG_FB is not set |
605 | 507 | ||
606 | # | 508 | # |
607 | # Sound | 509 | # Sound |
608 | # | 510 | # |
609 | # CONFIG_SOUND is not set | 511 | # CONFIG_SOUND is not set |
610 | 512 | # CONFIG_USB_SUPPORT is not set | |
611 | # | ||
612 | # USB support | ||
613 | # | ||
614 | CONFIG_USB_ARCH_HAS_HCD=y | ||
615 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
616 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
617 | # CONFIG_USB is not set | ||
618 | |||
619 | # | ||
620 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
621 | # | ||
622 | |||
623 | # | ||
624 | # USB Gadget Support | ||
625 | # | ||
626 | # CONFIG_USB_GADGET is not set | ||
627 | # CONFIG_MMC is not set | 513 | # CONFIG_MMC is not set |
628 | |||
629 | # | ||
630 | # LED devices | ||
631 | # | ||
632 | # CONFIG_NEW_LEDS is not set | 514 | # CONFIG_NEW_LEDS is not set |
633 | |||
634 | # | ||
635 | # LED drivers | ||
636 | # | ||
637 | |||
638 | # | ||
639 | # LED Triggers | ||
640 | # | ||
641 | |||
642 | # | ||
643 | # InfiniBand support | ||
644 | # | ||
645 | # CONFIG_INFINIBAND is not set | 515 | # CONFIG_INFINIBAND is not set |
646 | |||
647 | # | ||
648 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
649 | # | ||
650 | |||
651 | # | ||
652 | # Real Time Clock | ||
653 | # | ||
654 | CONFIG_RTC_LIB=y | 516 | CONFIG_RTC_LIB=y |
655 | CONFIG_RTC_CLASS=y | 517 | CONFIG_RTC_CLASS=y |
656 | CONFIG_RTC_HCTOSYS=y | 518 | CONFIG_RTC_HCTOSYS=y |
@@ -667,10 +529,6 @@ CONFIG_RTC_INTF_DEV_UIE_EMUL=y | |||
667 | # CONFIG_RTC_DRV_TEST is not set | 529 | # CONFIG_RTC_DRV_TEST is not set |
668 | 530 | ||
669 | # | 531 | # |
670 | # I2C RTC drivers | ||
671 | # | ||
672 | |||
673 | # | ||
674 | # SPI RTC drivers | 532 | # SPI RTC drivers |
675 | # | 533 | # |
676 | CONFIG_RTC_DRV_RS5C348=y | 534 | CONFIG_RTC_DRV_RS5C348=y |
@@ -681,8 +539,10 @@ CONFIG_RTC_DRV_RS5C348=y | |||
681 | # | 539 | # |
682 | # CONFIG_RTC_DRV_CMOS is not set | 540 | # CONFIG_RTC_DRV_CMOS is not set |
683 | # CONFIG_RTC_DRV_DS1553 is not set | 541 | # CONFIG_RTC_DRV_DS1553 is not set |
542 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
684 | # CONFIG_RTC_DRV_DS1742 is not set | 543 | # CONFIG_RTC_DRV_DS1742 is not set |
685 | # CONFIG_RTC_DRV_M48T86 is not set | 544 | # CONFIG_RTC_DRV_M48T86 is not set |
545 | # CONFIG_RTC_DRV_M48T59 is not set | ||
686 | # CONFIG_RTC_DRV_V3020 is not set | 546 | # CONFIG_RTC_DRV_V3020 is not set |
687 | 547 | ||
688 | # | 548 | # |
@@ -703,16 +563,19 @@ CONFIG_RTC_DRV_RS5C348=y | |||
703 | # | 563 | # |
704 | 564 | ||
705 | # | 565 | # |
566 | # Userspace I/O | ||
567 | # | ||
568 | # CONFIG_UIO is not set | ||
569 | |||
570 | # | ||
706 | # File systems | 571 | # File systems |
707 | # | 572 | # |
708 | # CONFIG_EXT2_FS is not set | 573 | # CONFIG_EXT2_FS is not set |
709 | # CONFIG_EXT3_FS is not set | 574 | # CONFIG_EXT3_FS is not set |
710 | # CONFIG_EXT4DEV_FS is not set | ||
711 | # CONFIG_REISERFS_FS is not set | 575 | # CONFIG_REISERFS_FS is not set |
712 | # CONFIG_JFS_FS is not set | 576 | # CONFIG_JFS_FS is not set |
713 | CONFIG_FS_POSIX_ACL=y | 577 | CONFIG_FS_POSIX_ACL=y |
714 | # CONFIG_XFS_FS is not set | 578 | # CONFIG_XFS_FS is not set |
715 | # CONFIG_GFS2_FS is not set | ||
716 | # CONFIG_OCFS2_FS is not set | 579 | # CONFIG_OCFS2_FS is not set |
717 | # CONFIG_MINIX_FS is not set | 580 | # CONFIG_MINIX_FS is not set |
718 | # CONFIG_ROMFS_FS is not set | 581 | # CONFIG_ROMFS_FS is not set |
@@ -749,18 +612,11 @@ CONFIG_TMPFS=y | |||
749 | CONFIG_TMPFS_POSIX_ACL=y | 612 | CONFIG_TMPFS_POSIX_ACL=y |
750 | # CONFIG_HUGETLB_PAGE is not set | 613 | # CONFIG_HUGETLB_PAGE is not set |
751 | CONFIG_RAMFS=y | 614 | CONFIG_RAMFS=y |
752 | # CONFIG_CONFIGFS_FS is not set | ||
753 | 615 | ||
754 | # | 616 | # |
755 | # Miscellaneous filesystems | 617 | # Miscellaneous filesystems |
756 | # | 618 | # |
757 | # CONFIG_ADFS_FS is not set | ||
758 | # CONFIG_AFFS_FS is not set | ||
759 | # CONFIG_HFS_FS is not set | ||
760 | # CONFIG_HFSPLUS_FS is not set | 619 | # CONFIG_HFSPLUS_FS is not set |
761 | # CONFIG_BEFS_FS is not set | ||
762 | # CONFIG_BFS_FS is not set | ||
763 | # CONFIG_EFS_FS is not set | ||
764 | # CONFIG_CRAMFS is not set | 620 | # CONFIG_CRAMFS is not set |
765 | # CONFIG_VXFS_FS is not set | 621 | # CONFIG_VXFS_FS is not set |
766 | # CONFIG_HPFS_FS is not set | 622 | # CONFIG_HPFS_FS is not set |
@@ -774,7 +630,6 @@ CONFIG_RAMFS=y | |||
774 | CONFIG_NFS_FS=y | 630 | CONFIG_NFS_FS=y |
775 | CONFIG_NFS_V3=y | 631 | CONFIG_NFS_V3=y |
776 | # CONFIG_NFS_V3_ACL is not set | 632 | # CONFIG_NFS_V3_ACL is not set |
777 | # CONFIG_NFS_V4 is not set | ||
778 | # CONFIG_NFS_DIRECTIO is not set | 633 | # CONFIG_NFS_DIRECTIO is not set |
779 | # CONFIG_NFSD is not set | 634 | # CONFIG_NFSD is not set |
780 | CONFIG_ROOT_NFS=y | 635 | CONFIG_ROOT_NFS=y |
@@ -782,15 +637,10 @@ CONFIG_LOCKD=y | |||
782 | CONFIG_LOCKD_V4=y | 637 | CONFIG_LOCKD_V4=y |
783 | CONFIG_NFS_COMMON=y | 638 | CONFIG_NFS_COMMON=y |
784 | CONFIG_SUNRPC=y | 639 | CONFIG_SUNRPC=y |
785 | # CONFIG_SUNRPC_BIND34 is not set | ||
786 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
787 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
788 | # CONFIG_SMB_FS is not set | 640 | # CONFIG_SMB_FS is not set |
789 | # CONFIG_CIFS is not set | 641 | # CONFIG_CIFS is not set |
790 | # CONFIG_NCP_FS is not set | 642 | # CONFIG_NCP_FS is not set |
791 | # CONFIG_CODA_FS is not set | 643 | # CONFIG_CODA_FS is not set |
792 | # CONFIG_AFS_FS is not set | ||
793 | # CONFIG_9P_FS is not set | ||
794 | 644 | ||
795 | # | 645 | # |
796 | # Partition Types | 646 | # Partition Types |
@@ -804,16 +654,6 @@ CONFIG_MSDOS_PARTITION=y | |||
804 | # CONFIG_NLS is not set | 654 | # CONFIG_NLS is not set |
805 | 655 | ||
806 | # | 656 | # |
807 | # Distributed Lock Manager | ||
808 | # | ||
809 | # CONFIG_DLM is not set | ||
810 | |||
811 | # | ||
812 | # Profiling support | ||
813 | # | ||
814 | # CONFIG_PROFILING is not set | ||
815 | |||
816 | # | ||
817 | # Kernel hacking | 657 | # Kernel hacking |
818 | # | 658 | # |
819 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 659 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
@@ -833,10 +673,6 @@ CONFIG_SYS_SUPPORTS_KGDB=y | |||
833 | # | 673 | # |
834 | # CONFIG_KEYS is not set | 674 | # CONFIG_KEYS is not set |
835 | # CONFIG_SECURITY is not set | 675 | # CONFIG_SECURITY is not set |
836 | |||
837 | # | ||
838 | # Cryptographic options | ||
839 | # | ||
840 | # CONFIG_CRYPTO is not set | 676 | # CONFIG_CRYPTO is not set |
841 | 677 | ||
842 | # | 678 | # |
@@ -847,6 +683,7 @@ CONFIG_BITREVERSE=y | |||
847 | # CONFIG_CRC16 is not set | 683 | # CONFIG_CRC16 is not set |
848 | # CONFIG_CRC_ITU_T is not set | 684 | # CONFIG_CRC_ITU_T is not set |
849 | CONFIG_CRC32=y | 685 | CONFIG_CRC32=y |
686 | # CONFIG_CRC7 is not set | ||
850 | # CONFIG_LIBCRC32C is not set | 687 | # CONFIG_LIBCRC32C is not set |
851 | CONFIG_HAS_IOMEM=y | 688 | CONFIG_HAS_IOMEM=y |
852 | CONFIG_HAS_IOPORT=y | 689 | CONFIG_HAS_IOPORT=y |
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig index e72fdf36b3fe..93f9e8331ad7 100644 --- a/arch/mips/configs/sb1250-swarm_defconfig +++ b/arch/mips/configs/sb1250-swarm_defconfig | |||
@@ -655,8 +655,8 @@ CONFIG_MOXA_SMARTIO_NEW=m | |||
655 | # CONFIG_SX is not set | 655 | # CONFIG_SX is not set |
656 | # CONFIG_RIO is not set | 656 | # CONFIG_RIO is not set |
657 | # CONFIG_STALDRV is not set | 657 | # CONFIG_STALDRV is not set |
658 | CONFIG_SIBYTE_SB1250_DUART=y | 658 | CONFIG_SERIAL_SB1250_DUART=y |
659 | CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y | 659 | CONFIG_SERIAL_SB1250_DUART_CONSOLE=y |
660 | 660 | ||
661 | # | 661 | # |
662 | # Serial drivers | 662 | # Serial drivers |
diff --git a/arch/mips/configs/tb0219_defconfig b/arch/mips/configs/tb0219_defconfig index e9f2cef4c716..326aa7aa40ea 100644 --- a/arch/mips/configs/tb0219_defconfig +++ b/arch/mips/configs/tb0219_defconfig | |||
@@ -1,60 +1,47 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.21-rc6 | 3 | # Linux kernel version: 2.6.23-rc2 |
4 | # Sun Apr 15 01:06:01 2007 | 4 | # Wed Aug 8 16:11:47 2007 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
8 | # | 8 | # |
9 | # Machine selection | 9 | # Machine selection |
10 | # | 10 | # |
11 | CONFIG_ZONE_DMA=y | 11 | # CONFIG_MACH_ALCHEMY is not set |
12 | # CONFIG_MIPS_MTX1 is not set | ||
13 | # CONFIG_MIPS_BOSPORUS is not set | ||
14 | # CONFIG_MIPS_PB1000 is not set | ||
15 | # CONFIG_MIPS_PB1100 is not set | ||
16 | # CONFIG_MIPS_PB1500 is not set | ||
17 | # CONFIG_MIPS_PB1550 is not set | ||
18 | # CONFIG_MIPS_PB1200 is not set | ||
19 | # CONFIG_MIPS_DB1000 is not set | ||
20 | # CONFIG_MIPS_DB1100 is not set | ||
21 | # CONFIG_MIPS_DB1500 is not set | ||
22 | # CONFIG_MIPS_DB1550 is not set | ||
23 | # CONFIG_MIPS_DB1200 is not set | ||
24 | # CONFIG_MIPS_MIRAGE is not set | ||
25 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
26 | # CONFIG_MIPS_COBALT is not set | 13 | # CONFIG_MIPS_COBALT is not set |
27 | # CONFIG_MACH_DECSTATION is not set | 14 | # CONFIG_MACH_DECSTATION is not set |
28 | # CONFIG_MACH_JAZZ is not set | 15 | # CONFIG_MACH_JAZZ is not set |
16 | # CONFIG_LEMOTE_FULONG is not set | ||
29 | # CONFIG_MIPS_ATLAS is not set | 17 | # CONFIG_MIPS_ATLAS is not set |
30 | # CONFIG_MIPS_MALTA is not set | 18 | # CONFIG_MIPS_MALTA is not set |
31 | # CONFIG_MIPS_SEAD is not set | 19 | # CONFIG_MIPS_SEAD is not set |
32 | # CONFIG_WR_PPMC is not set | ||
33 | # CONFIG_MIPS_SIM is not set | 20 | # CONFIG_MIPS_SIM is not set |
34 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 21 | # CONFIG_MARKEINS is not set |
35 | # CONFIG_MIPS_XXS1500 is not set | 22 | CONFIG_MACH_VR41XX=y |
36 | # CONFIG_PNX8550_JBS is not set | 23 | # CONFIG_PNX8550_JBS is not set |
37 | # CONFIG_PNX8550_STB810 is not set | 24 | # CONFIG_PNX8550_STB810 is not set |
38 | CONFIG_MACH_VR41XX=y | 25 | # CONFIG_PMC_MSP is not set |
39 | # CONFIG_PMC_YOSEMITE is not set | 26 | # CONFIG_PMC_YOSEMITE is not set |
40 | # CONFIG_QEMU is not set | 27 | # CONFIG_QEMU is not set |
41 | # CONFIG_MARKEINS is not set | ||
42 | # CONFIG_SGI_IP22 is not set | 28 | # CONFIG_SGI_IP22 is not set |
43 | # CONFIG_SGI_IP27 is not set | 29 | # CONFIG_SGI_IP27 is not set |
44 | # CONFIG_SGI_IP32 is not set | 30 | # CONFIG_SGI_IP32 is not set |
45 | # CONFIG_SIBYTE_BIGSUR is not set | 31 | # CONFIG_SIBYTE_CRHINE is not set |
32 | # CONFIG_SIBYTE_CARMEL is not set | ||
33 | # CONFIG_SIBYTE_CRHONE is not set | ||
34 | # CONFIG_SIBYTE_RHONE is not set | ||
46 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | ||
49 | # CONFIG_SIBYTE_CARMEL is not set | ||
50 | # CONFIG_SIBYTE_PTSWARM is not set | 38 | # CONFIG_SIBYTE_PTSWARM is not set |
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 39 | # CONFIG_SIBYTE_BIGSUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | ||
53 | # CONFIG_SIBYTE_CRHONE is not set | ||
54 | # CONFIG_SNI_RM is not set | 40 | # CONFIG_SNI_RM is not set |
55 | # CONFIG_TOSHIBA_JMR3927 is not set | 41 | # CONFIG_TOSHIBA_JMR3927 is not set |
56 | # CONFIG_TOSHIBA_RBTX4927 is not set | 42 | # CONFIG_TOSHIBA_RBTX4927 is not set |
57 | # CONFIG_TOSHIBA_RBTX4938 is not set | 43 | # CONFIG_TOSHIBA_RBTX4938 is not set |
44 | # CONFIG_WR_PPMC is not set | ||
58 | # CONFIG_CASIO_E55 is not set | 45 | # CONFIG_CASIO_E55 is not set |
59 | # CONFIG_IBM_WORKPAD is not set | 46 | # CONFIG_IBM_WORKPAD is not set |
60 | # CONFIG_NEC_CMBVR4133 is not set | 47 | # CONFIG_NEC_CMBVR4133 is not set |
@@ -76,6 +63,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
76 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 63 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
77 | CONFIG_DMA_NONCOHERENT=y | 64 | CONFIG_DMA_NONCOHERENT=y |
78 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 65 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
66 | # CONFIG_HOTPLUG_CPU is not set | ||
67 | # CONFIG_NO_IOPORT is not set | ||
79 | # CONFIG_CPU_BIG_ENDIAN is not set | 68 | # CONFIG_CPU_BIG_ENDIAN is not set |
80 | CONFIG_CPU_LITTLE_ENDIAN=y | 69 | CONFIG_CPU_LITTLE_ENDIAN=y |
81 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 70 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
@@ -85,6 +74,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
85 | # | 74 | # |
86 | # CPU selection | 75 | # CPU selection |
87 | # | 76 | # |
77 | # CONFIG_CPU_LOONGSON2 is not set | ||
88 | # CONFIG_CPU_MIPS32_R1 is not set | 78 | # CONFIG_CPU_MIPS32_R1 is not set |
89 | # CONFIG_CPU_MIPS32_R2 is not set | 79 | # CONFIG_CPU_MIPS32_R2 is not set |
90 | # CONFIG_CPU_MIPS64_R1 is not set | 80 | # CONFIG_CPU_MIPS64_R1 is not set |
@@ -106,7 +96,6 @@ CONFIG_CPU_VR41XX=y | |||
106 | # CONFIG_CPU_SB1 is not set | 96 | # CONFIG_CPU_SB1 is not set |
107 | CONFIG_SYS_HAS_CPU_VR41XX=y | 97 | CONFIG_SYS_HAS_CPU_VR41XX=y |
108 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y | 98 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y |
109 | CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y | ||
110 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y | 99 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y |
111 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y | 100 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y |
112 | 101 | ||
@@ -122,7 +111,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
122 | CONFIG_MIPS_MT_DISABLED=y | 111 | CONFIG_MIPS_MT_DISABLED=y |
123 | # CONFIG_MIPS_MT_SMP is not set | 112 | # CONFIG_MIPS_MT_SMP is not set |
124 | # CONFIG_MIPS_MT_SMTC is not set | 113 | # CONFIG_MIPS_MT_SMTC is not set |
125 | # CONFIG_MIPS_VPE_LOADER is not set | ||
126 | CONFIG_CPU_HAS_SYNC=y | 114 | CONFIG_CPU_HAS_SYNC=y |
127 | CONFIG_GENERIC_HARDIRQS=y | 115 | CONFIG_GENERIC_HARDIRQS=y |
128 | CONFIG_GENERIC_IRQ_PROBE=y | 116 | CONFIG_GENERIC_IRQ_PROBE=y |
@@ -136,46 +124,44 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
136 | # CONFIG_SPARSEMEM_STATIC is not set | 124 | # CONFIG_SPARSEMEM_STATIC is not set |
137 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 125 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
138 | # CONFIG_RESOURCES_64BIT is not set | 126 | # CONFIG_RESOURCES_64BIT is not set |
139 | CONFIG_ZONE_DMA_FLAG=1 | 127 | CONFIG_ZONE_DMA_FLAG=0 |
128 | CONFIG_VIRT_TO_BUS=y | ||
140 | # CONFIG_HZ_48 is not set | 129 | # CONFIG_HZ_48 is not set |
141 | # CONFIG_HZ_100 is not set | 130 | # CONFIG_HZ_100 is not set |
142 | # CONFIG_HZ_128 is not set | 131 | # CONFIG_HZ_128 is not set |
143 | # CONFIG_HZ_250 is not set | 132 | CONFIG_HZ_250=y |
144 | # CONFIG_HZ_256 is not set | 133 | # CONFIG_HZ_256 is not set |
145 | CONFIG_HZ_1000=y | 134 | # CONFIG_HZ_1000 is not set |
146 | # CONFIG_HZ_1024 is not set | 135 | # CONFIG_HZ_1024 is not set |
147 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y | 136 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y |
148 | CONFIG_HZ=1000 | 137 | CONFIG_HZ=250 |
149 | CONFIG_PREEMPT_NONE=y | 138 | CONFIG_PREEMPT_NONE=y |
150 | # CONFIG_PREEMPT_VOLUNTARY is not set | 139 | # CONFIG_PREEMPT_VOLUNTARY is not set |
151 | # CONFIG_PREEMPT is not set | 140 | # CONFIG_PREEMPT is not set |
152 | # CONFIG_KEXEC is not set | 141 | # CONFIG_KEXEC is not set |
142 | CONFIG_SECCOMP=y | ||
153 | CONFIG_LOCKDEP_SUPPORT=y | 143 | CONFIG_LOCKDEP_SUPPORT=y |
154 | CONFIG_STACKTRACE_SUPPORT=y | 144 | CONFIG_STACKTRACE_SUPPORT=y |
155 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 145 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
156 | 146 | ||
157 | # | 147 | # |
158 | # Code maturity level options | 148 | # General setup |
159 | # | 149 | # |
160 | CONFIG_EXPERIMENTAL=y | 150 | CONFIG_EXPERIMENTAL=y |
161 | CONFIG_BROKEN_ON_SMP=y | 151 | CONFIG_BROKEN_ON_SMP=y |
162 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 152 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
163 | |||
164 | # | ||
165 | # General setup | ||
166 | # | ||
167 | CONFIG_LOCALVERSION="" | 153 | CONFIG_LOCALVERSION="" |
168 | CONFIG_LOCALVERSION_AUTO=y | 154 | CONFIG_LOCALVERSION_AUTO=y |
169 | CONFIG_SWAP=y | 155 | CONFIG_SWAP=y |
170 | CONFIG_SYSVIPC=y | 156 | CONFIG_SYSVIPC=y |
171 | # CONFIG_IPC_NS is not set | ||
172 | CONFIG_SYSVIPC_SYSCTL=y | 157 | CONFIG_SYSVIPC_SYSCTL=y |
173 | # CONFIG_POSIX_MQUEUE is not set | 158 | # CONFIG_POSIX_MQUEUE is not set |
174 | # CONFIG_BSD_PROCESS_ACCT is not set | 159 | # CONFIG_BSD_PROCESS_ACCT is not set |
175 | # CONFIG_TASKSTATS is not set | 160 | # CONFIG_TASKSTATS is not set |
176 | # CONFIG_UTS_NS is not set | 161 | # CONFIG_USER_NS is not set |
177 | # CONFIG_AUDIT is not set | 162 | # CONFIG_AUDIT is not set |
178 | # CONFIG_IKCONFIG is not set | 163 | # CONFIG_IKCONFIG is not set |
164 | CONFIG_LOG_BUF_SHIFT=14 | ||
179 | CONFIG_SYSFS_DEPRECATED=y | 165 | CONFIG_SYSFS_DEPRECATED=y |
180 | # CONFIG_RELAY is not set | 166 | # CONFIG_RELAY is not set |
181 | # CONFIG_BLK_DEV_INITRD is not set | 167 | # CONFIG_BLK_DEV_INITRD is not set |
@@ -191,32 +177,30 @@ CONFIG_BUG=y | |||
191 | CONFIG_ELF_CORE=y | 177 | CONFIG_ELF_CORE=y |
192 | CONFIG_BASE_FULL=y | 178 | CONFIG_BASE_FULL=y |
193 | CONFIG_FUTEX=y | 179 | CONFIG_FUTEX=y |
180 | CONFIG_ANON_INODES=y | ||
194 | CONFIG_EPOLL=y | 181 | CONFIG_EPOLL=y |
182 | CONFIG_SIGNALFD=y | ||
183 | CONFIG_TIMERFD=y | ||
184 | CONFIG_EVENTFD=y | ||
195 | CONFIG_SHMEM=y | 185 | CONFIG_SHMEM=y |
196 | CONFIG_SLAB=y | ||
197 | CONFIG_VM_EVENT_COUNTERS=y | 186 | CONFIG_VM_EVENT_COUNTERS=y |
187 | CONFIG_SLAB=y | ||
188 | # CONFIG_SLUB is not set | ||
189 | # CONFIG_SLOB is not set | ||
198 | CONFIG_RT_MUTEXES=y | 190 | CONFIG_RT_MUTEXES=y |
199 | # CONFIG_TINY_SHMEM is not set | 191 | # CONFIG_TINY_SHMEM is not set |
200 | CONFIG_BASE_SMALL=0 | 192 | CONFIG_BASE_SMALL=0 |
201 | # CONFIG_SLOB is not set | ||
202 | |||
203 | # | ||
204 | # Loadable module support | ||
205 | # | ||
206 | CONFIG_MODULES=y | 193 | CONFIG_MODULES=y |
207 | CONFIG_MODULE_UNLOAD=y | 194 | CONFIG_MODULE_UNLOAD=y |
208 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 195 | CONFIG_MODULE_FORCE_UNLOAD=y |
209 | CONFIG_MODVERSIONS=y | 196 | CONFIG_MODVERSIONS=y |
210 | CONFIG_MODULE_SRCVERSION_ALL=y | 197 | CONFIG_MODULE_SRCVERSION_ALL=y |
211 | CONFIG_KMOD=y | 198 | CONFIG_KMOD=y |
212 | |||
213 | # | ||
214 | # Block layer | ||
215 | # | ||
216 | CONFIG_BLOCK=y | 199 | CONFIG_BLOCK=y |
217 | # CONFIG_LBD is not set | 200 | # CONFIG_LBD is not set |
218 | # CONFIG_BLK_DEV_IO_TRACE is not set | 201 | # CONFIG_BLK_DEV_IO_TRACE is not set |
219 | # CONFIG_LSF is not set | 202 | # CONFIG_LSF is not set |
203 | # CONFIG_BLK_DEV_BSG is not set | ||
220 | 204 | ||
221 | # | 205 | # |
222 | # IO Schedulers | 206 | # IO Schedulers |
@@ -236,16 +220,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
236 | # | 220 | # |
237 | CONFIG_HW_HAS_PCI=y | 221 | CONFIG_HW_HAS_PCI=y |
238 | CONFIG_PCI=y | 222 | CONFIG_PCI=y |
223 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
239 | CONFIG_MMU=y | 224 | CONFIG_MMU=y |
240 | 225 | ||
241 | # | 226 | # |
242 | # PCCARD (PCMCIA/CardBus) support | 227 | # PCCARD (PCMCIA/CardBus) support |
243 | # | 228 | # |
244 | # CONFIG_PCCARD is not set | 229 | # CONFIG_PCCARD is not set |
245 | |||
246 | # | ||
247 | # PCI Hotplug Support | ||
248 | # | ||
249 | # CONFIG_HOTPLUG_PCI is not set | 230 | # CONFIG_HOTPLUG_PCI is not set |
250 | 231 | ||
251 | # | 232 | # |
@@ -258,10 +239,7 @@ CONFIG_TRAD_SIGNALS=y | |||
258 | # | 239 | # |
259 | # Power management options | 240 | # Power management options |
260 | # | 241 | # |
261 | CONFIG_PM=y | 242 | # CONFIG_PM is not set |
262 | # CONFIG_PM_LEGACY is not set | ||
263 | # CONFIG_PM_DEBUG is not set | ||
264 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
265 | 243 | ||
266 | # | 244 | # |
267 | # Networking | 245 | # Networking |
@@ -271,14 +249,9 @@ CONFIG_NET=y | |||
271 | # | 249 | # |
272 | # Networking options | 250 | # Networking options |
273 | # | 251 | # |
274 | # CONFIG_NETDEBUG is not set | ||
275 | CONFIG_PACKET=y | 252 | CONFIG_PACKET=y |
276 | # CONFIG_PACKET_MMAP is not set | 253 | # CONFIG_PACKET_MMAP is not set |
277 | CONFIG_UNIX=y | 254 | CONFIG_UNIX=y |
278 | CONFIG_XFRM=y | ||
279 | # CONFIG_XFRM_USER is not set | ||
280 | # CONFIG_XFRM_SUB_POLICY is not set | ||
281 | CONFIG_XFRM_MIGRATE=y | ||
282 | # CONFIG_NET_KEY is not set | 255 | # CONFIG_NET_KEY is not set |
283 | CONFIG_INET=y | 256 | CONFIG_INET=y |
284 | CONFIG_IP_MULTICAST=y | 257 | CONFIG_IP_MULTICAST=y |
@@ -288,7 +261,6 @@ CONFIG_ASK_IP_FIB_HASH=y | |||
288 | CONFIG_IP_FIB_HASH=y | 261 | CONFIG_IP_FIB_HASH=y |
289 | CONFIG_IP_MULTIPLE_TABLES=y | 262 | CONFIG_IP_MULTIPLE_TABLES=y |
290 | CONFIG_IP_ROUTE_MULTIPATH=y | 263 | CONFIG_IP_ROUTE_MULTIPATH=y |
291 | # CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set | ||
292 | CONFIG_IP_ROUTE_VERBOSE=y | 264 | CONFIG_IP_ROUTE_VERBOSE=y |
293 | CONFIG_IP_PNP=y | 265 | CONFIG_IP_PNP=y |
294 | # CONFIG_IP_PNP_DHCP is not set | 266 | # CONFIG_IP_PNP_DHCP is not set |
@@ -305,34 +277,25 @@ CONFIG_SYN_COOKIES=y | |||
305 | # CONFIG_INET_IPCOMP is not set | 277 | # CONFIG_INET_IPCOMP is not set |
306 | # CONFIG_INET_XFRM_TUNNEL is not set | 278 | # CONFIG_INET_XFRM_TUNNEL is not set |
307 | CONFIG_INET_TUNNEL=m | 279 | CONFIG_INET_TUNNEL=m |
308 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 280 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
309 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 281 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
310 | CONFIG_INET_XFRM_MODE_BEET=m | 282 | # CONFIG_INET_XFRM_MODE_BEET is not set |
311 | CONFIG_INET_DIAG=y | 283 | CONFIG_INET_DIAG=y |
312 | CONFIG_INET_TCP_DIAG=y | 284 | CONFIG_INET_TCP_DIAG=y |
313 | # CONFIG_TCP_CONG_ADVANCED is not set | 285 | # CONFIG_TCP_CONG_ADVANCED is not set |
314 | CONFIG_TCP_CONG_CUBIC=y | 286 | CONFIG_TCP_CONG_CUBIC=y |
315 | CONFIG_DEFAULT_TCP_CONG="cubic" | 287 | CONFIG_DEFAULT_TCP_CONG="cubic" |
316 | CONFIG_TCP_MD5SIG=y | 288 | # CONFIG_TCP_MD5SIG is not set |
317 | # CONFIG_IPV6 is not set | 289 | # CONFIG_IPV6 is not set |
318 | # CONFIG_INET6_XFRM_TUNNEL is not set | 290 | # CONFIG_INET6_XFRM_TUNNEL is not set |
319 | # CONFIG_INET6_TUNNEL is not set | 291 | # CONFIG_INET6_TUNNEL is not set |
320 | CONFIG_NETWORK_SECMARK=y | 292 | CONFIG_NETWORK_SECMARK=y |
321 | # CONFIG_NETFILTER is not set | 293 | # CONFIG_NETFILTER is not set |
322 | |||
323 | # | ||
324 | # DCCP Configuration (EXPERIMENTAL) | ||
325 | # | ||
326 | # CONFIG_IP_DCCP is not set | 294 | # CONFIG_IP_DCCP is not set |
327 | |||
328 | # | ||
329 | # SCTP Configuration (EXPERIMENTAL) | ||
330 | # | ||
331 | # CONFIG_IP_SCTP is not set | 295 | # CONFIG_IP_SCTP is not set |
332 | 296 | # CONFIG_SCTP_HMAC_NONE is not set | |
333 | # | 297 | # CONFIG_SCTP_HMAC_SHA1 is not set |
334 | # TIPC Configuration (EXPERIMENTAL) | 298 | # CONFIG_SCTP_HMAC_MD5 is not set |
335 | # | ||
336 | # CONFIG_TIPC is not set | 299 | # CONFIG_TIPC is not set |
337 | # CONFIG_ATM is not set | 300 | # CONFIG_ATM is not set |
338 | # CONFIG_BRIDGE is not set | 301 | # CONFIG_BRIDGE is not set |
@@ -358,10 +321,20 @@ CONFIG_NETWORK_SECMARK=y | |||
358 | # CONFIG_HAMRADIO is not set | 321 | # CONFIG_HAMRADIO is not set |
359 | # CONFIG_IRDA is not set | 322 | # CONFIG_IRDA is not set |
360 | # CONFIG_BT is not set | 323 | # CONFIG_BT is not set |
361 | # CONFIG_IEEE80211 is not set | 324 | # CONFIG_AF_RXRPC is not set |
362 | CONFIG_FIB_RULES=y | 325 | CONFIG_FIB_RULES=y |
363 | 326 | ||
364 | # | 327 | # |
328 | # Wireless | ||
329 | # | ||
330 | # CONFIG_CFG80211 is not set | ||
331 | # CONFIG_WIRELESS_EXT is not set | ||
332 | # CONFIG_MAC80211 is not set | ||
333 | # CONFIG_IEEE80211 is not set | ||
334 | # CONFIG_RFKILL is not set | ||
335 | # CONFIG_NET_9P is not set | ||
336 | |||
337 | # | ||
365 | # Device Drivers | 338 | # Device Drivers |
366 | # | 339 | # |
367 | 340 | ||
@@ -372,30 +345,10 @@ CONFIG_STANDALONE=y | |||
372 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 345 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
373 | CONFIG_FW_LOADER=m | 346 | CONFIG_FW_LOADER=m |
374 | # CONFIG_SYS_HYPERVISOR is not set | 347 | # CONFIG_SYS_HYPERVISOR is not set |
375 | |||
376 | # | ||
377 | # Connector - unified userspace <-> kernelspace linker | ||
378 | # | ||
379 | # CONFIG_CONNECTOR is not set | 348 | # CONFIG_CONNECTOR is not set |
380 | |||
381 | # | ||
382 | # Memory Technology Devices (MTD) | ||
383 | # | ||
384 | # CONFIG_MTD is not set | 349 | # CONFIG_MTD is not set |
385 | |||
386 | # | ||
387 | # Parallel port support | ||
388 | # | ||
389 | # CONFIG_PARPORT is not set | 350 | # CONFIG_PARPORT is not set |
390 | 351 | CONFIG_BLK_DEV=y | |
391 | # | ||
392 | # Plug and Play support | ||
393 | # | ||
394 | # CONFIG_PNPACPI is not set | ||
395 | |||
396 | # | ||
397 | # Block devices | ||
398 | # | ||
399 | # CONFIG_BLK_CPQ_DA is not set | 352 | # CONFIG_BLK_CPQ_DA is not set |
400 | # CONFIG_BLK_CPQ_CISS_DA is not set | 353 | # CONFIG_BLK_CPQ_CISS_DA is not set |
401 | # CONFIG_BLK_DEV_DAC960 is not set | 354 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -412,16 +365,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 | |||
412 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 365 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
413 | # CONFIG_CDROM_PKTCDVD is not set | 366 | # CONFIG_CDROM_PKTCDVD is not set |
414 | # CONFIG_ATA_OVER_ETH is not set | 367 | # CONFIG_ATA_OVER_ETH is not set |
415 | 368 | # CONFIG_MISC_DEVICES is not set | |
416 | # | ||
417 | # Misc devices | ||
418 | # | ||
419 | CONFIG_SGI_IOC4=m | ||
420 | # CONFIG_TIFM_CORE is not set | ||
421 | |||
422 | # | ||
423 | # ATA/ATAPI/MFM/RLL support | ||
424 | # | ||
425 | # CONFIG_IDE is not set | 369 | # CONFIG_IDE is not set |
426 | 370 | ||
427 | # | 371 | # |
@@ -429,16 +373,9 @@ CONFIG_SGI_IOC4=m | |||
429 | # | 373 | # |
430 | # CONFIG_RAID_ATTRS is not set | 374 | # CONFIG_RAID_ATTRS is not set |
431 | # CONFIG_SCSI is not set | 375 | # CONFIG_SCSI is not set |
376 | # CONFIG_SCSI_DMA is not set | ||
432 | # CONFIG_SCSI_NETLINK is not set | 377 | # CONFIG_SCSI_NETLINK is not set |
433 | |||
434 | # | ||
435 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
436 | # | ||
437 | # CONFIG_ATA is not set | 378 | # CONFIG_ATA is not set |
438 | |||
439 | # | ||
440 | # Multi-device support (RAID and LVM) | ||
441 | # | ||
442 | # CONFIG_MD is not set | 379 | # CONFIG_MD is not set |
443 | 380 | ||
444 | # | 381 | # |
@@ -449,30 +386,17 @@ CONFIG_SGI_IOC4=m | |||
449 | # | 386 | # |
450 | # IEEE 1394 (FireWire) support | 387 | # IEEE 1394 (FireWire) support |
451 | # | 388 | # |
389 | # CONFIG_FIREWIRE is not set | ||
452 | # CONFIG_IEEE1394 is not set | 390 | # CONFIG_IEEE1394 is not set |
453 | |||
454 | # | ||
455 | # I2O device support | ||
456 | # | ||
457 | # CONFIG_I2O is not set | 391 | # CONFIG_I2O is not set |
458 | |||
459 | # | ||
460 | # Network device support | ||
461 | # | ||
462 | CONFIG_NETDEVICES=y | 392 | CONFIG_NETDEVICES=y |
463 | CONFIG_DUMMY=m | 393 | # CONFIG_NETDEVICES_MULTIQUEUE is not set |
394 | # CONFIG_DUMMY is not set | ||
464 | # CONFIG_BONDING is not set | 395 | # CONFIG_BONDING is not set |
396 | # CONFIG_MACVLAN is not set | ||
465 | # CONFIG_EQUALIZER is not set | 397 | # CONFIG_EQUALIZER is not set |
466 | # CONFIG_TUN is not set | 398 | # CONFIG_TUN is not set |
467 | |||
468 | # | ||
469 | # ARCnet devices | ||
470 | # | ||
471 | # CONFIG_ARCNET is not set | 399 | # CONFIG_ARCNET is not set |
472 | |||
473 | # | ||
474 | # PHY device support | ||
475 | # | ||
476 | CONFIG_PHYLIB=m | 400 | CONFIG_PHYLIB=m |
477 | 401 | ||
478 | # | 402 | # |
@@ -486,29 +410,46 @@ CONFIG_CICADA_PHY=m | |||
486 | CONFIG_VITESSE_PHY=m | 410 | CONFIG_VITESSE_PHY=m |
487 | CONFIG_SMSC_PHY=m | 411 | CONFIG_SMSC_PHY=m |
488 | # CONFIG_BROADCOM_PHY is not set | 412 | # CONFIG_BROADCOM_PHY is not set |
413 | # CONFIG_ICPLUS_PHY is not set | ||
489 | # CONFIG_FIXED_PHY is not set | 414 | # CONFIG_FIXED_PHY is not set |
490 | |||
491 | # | ||
492 | # Ethernet (10 or 100Mbit) | ||
493 | # | ||
494 | CONFIG_NET_ETHERNET=y | 415 | CONFIG_NET_ETHERNET=y |
495 | CONFIG_MII=y | 416 | CONFIG_MII=y |
417 | # CONFIG_AX88796 is not set | ||
496 | # CONFIG_HAPPYMEAL is not set | 418 | # CONFIG_HAPPYMEAL is not set |
497 | # CONFIG_SUNGEM is not set | 419 | # CONFIG_SUNGEM is not set |
498 | # CONFIG_CASSINI is not set | 420 | # CONFIG_CASSINI is not set |
499 | # CONFIG_NET_VENDOR_3COM is not set | 421 | # CONFIG_NET_VENDOR_3COM is not set |
500 | # CONFIG_DM9000 is not set | 422 | # CONFIG_DM9000 is not set |
501 | |||
502 | # | ||
503 | # Tulip family network device support | ||
504 | # | ||
505 | # CONFIG_NET_TULIP is not set | 423 | # CONFIG_NET_TULIP is not set |
506 | # CONFIG_HP100 is not set | 424 | # CONFIG_HP100 is not set |
507 | # CONFIG_NET_PCI is not set | 425 | CONFIG_NET_PCI=y |
508 | 426 | # CONFIG_PCNET32 is not set | |
509 | # | 427 | # CONFIG_AMD8111_ETH is not set |
510 | # Ethernet (1000 Mbit) | 428 | # CONFIG_ADAPTEC_STARFIRE is not set |
511 | # | 429 | # CONFIG_B44 is not set |
430 | # CONFIG_FORCEDETH is not set | ||
431 | # CONFIG_TC35815 is not set | ||
432 | # CONFIG_DGRS is not set | ||
433 | # CONFIG_EEPRO100 is not set | ||
434 | # CONFIG_E100 is not set | ||
435 | # CONFIG_FEALNX is not set | ||
436 | # CONFIG_NATSEMI is not set | ||
437 | # CONFIG_NE2K_PCI is not set | ||
438 | # CONFIG_8139CP is not set | ||
439 | CONFIG_8139TOO=y | ||
440 | CONFIG_8139TOO_PIO=y | ||
441 | # CONFIG_8139TOO_TUNE_TWISTER is not set | ||
442 | # CONFIG_8139TOO_8129 is not set | ||
443 | # CONFIG_8139_OLD_RX_RESET is not set | ||
444 | # CONFIG_SIS900 is not set | ||
445 | # CONFIG_EPIC100 is not set | ||
446 | # CONFIG_SUNDANCE is not set | ||
447 | # CONFIG_TLAN is not set | ||
448 | CONFIG_VIA_RHINE=y | ||
449 | CONFIG_VIA_RHINE_MMIO=y | ||
450 | # CONFIG_VIA_RHINE_NAPI is not set | ||
451 | # CONFIG_SC92031 is not set | ||
452 | CONFIG_NETDEV_1000=y | ||
512 | # CONFIG_ACENIC is not set | 453 | # CONFIG_ACENIC is not set |
513 | # CONFIG_DL2K is not set | 454 | # CONFIG_DL2K is not set |
514 | # CONFIG_E1000 is not set | 455 | # CONFIG_E1000 is not set |
@@ -520,35 +461,29 @@ CONFIG_R8169=y | |||
520 | # CONFIG_SIS190 is not set | 461 | # CONFIG_SIS190 is not set |
521 | # CONFIG_SKGE is not set | 462 | # CONFIG_SKGE is not set |
522 | # CONFIG_SKY2 is not set | 463 | # CONFIG_SKY2 is not set |
523 | # CONFIG_SK98LIN is not set | 464 | CONFIG_VIA_VELOCITY=y |
524 | # CONFIG_TIGON3 is not set | 465 | # CONFIG_TIGON3 is not set |
525 | # CONFIG_BNX2 is not set | 466 | # CONFIG_BNX2 is not set |
526 | CONFIG_QLA3XXX=m | 467 | # CONFIG_QLA3XXX is not set |
527 | # CONFIG_ATL1 is not set | 468 | # CONFIG_ATL1 is not set |
528 | 469 | # CONFIG_NETDEV_10000 is not set | |
529 | # | ||
530 | # Ethernet (10000 Mbit) | ||
531 | # | ||
532 | # CONFIG_CHELSIO_T1 is not set | ||
533 | CONFIG_CHELSIO_T3=m | ||
534 | # CONFIG_IXGB is not set | ||
535 | # CONFIG_S2IO is not set | ||
536 | # CONFIG_MYRI10GE is not set | ||
537 | CONFIG_NETXEN_NIC=m | ||
538 | |||
539 | # | ||
540 | # Token Ring devices | ||
541 | # | ||
542 | # CONFIG_TR is not set | 470 | # CONFIG_TR is not set |
543 | 471 | ||
544 | # | 472 | # |
545 | # Wireless LAN (non-hamradio) | 473 | # Wireless LAN |
546 | # | 474 | # |
547 | # CONFIG_NET_RADIO is not set | 475 | # CONFIG_WLAN_PRE80211 is not set |
476 | # CONFIG_WLAN_80211 is not set | ||
548 | 477 | ||
549 | # | 478 | # |
550 | # Wan interfaces | 479 | # USB Network Adapters |
551 | # | 480 | # |
481 | # CONFIG_USB_CATC is not set | ||
482 | # CONFIG_USB_KAWETH is not set | ||
483 | # CONFIG_USB_PEGASUS is not set | ||
484 | # CONFIG_USB_RTL8150 is not set | ||
485 | # CONFIG_USB_USBNET_MII is not set | ||
486 | # CONFIG_USB_USBNET is not set | ||
552 | # CONFIG_WAN is not set | 487 | # CONFIG_WAN is not set |
553 | # CONFIG_FDDI is not set | 488 | # CONFIG_FDDI is not set |
554 | # CONFIG_HIPPI is not set | 489 | # CONFIG_HIPPI is not set |
@@ -558,15 +493,7 @@ CONFIG_NETXEN_NIC=m | |||
558 | # CONFIG_NETCONSOLE is not set | 493 | # CONFIG_NETCONSOLE is not set |
559 | # CONFIG_NETPOLL is not set | 494 | # CONFIG_NETPOLL is not set |
560 | # CONFIG_NET_POLL_CONTROLLER is not set | 495 | # CONFIG_NET_POLL_CONTROLLER is not set |
561 | |||
562 | # | ||
563 | # ISDN subsystem | ||
564 | # | ||
565 | # CONFIG_ISDN is not set | 496 | # CONFIG_ISDN is not set |
566 | |||
567 | # | ||
568 | # Telephony Support | ||
569 | # | ||
570 | # CONFIG_PHONE is not set | 497 | # CONFIG_PHONE is not set |
571 | 498 | ||
572 | # | 499 | # |
@@ -574,6 +501,7 @@ CONFIG_NETXEN_NIC=m | |||
574 | # | 501 | # |
575 | CONFIG_INPUT=y | 502 | CONFIG_INPUT=y |
576 | # CONFIG_INPUT_FF_MEMLESS is not set | 503 | # CONFIG_INPUT_FF_MEMLESS is not set |
504 | # CONFIG_INPUT_POLLDEV is not set | ||
577 | 505 | ||
578 | # | 506 | # |
579 | # Userland interfaces | 507 | # Userland interfaces |
@@ -590,6 +518,7 @@ CONFIG_INPUT=y | |||
590 | # CONFIG_INPUT_KEYBOARD is not set | 518 | # CONFIG_INPUT_KEYBOARD is not set |
591 | # CONFIG_INPUT_MOUSE is not set | 519 | # CONFIG_INPUT_MOUSE is not set |
592 | # CONFIG_INPUT_JOYSTICK is not set | 520 | # CONFIG_INPUT_JOYSTICK is not set |
521 | # CONFIG_INPUT_TABLET is not set | ||
593 | # CONFIG_INPUT_TOUCHSCREEN is not set | 522 | # CONFIG_INPUT_TOUCHSCREEN is not set |
594 | # CONFIG_INPUT_MISC is not set | 523 | # CONFIG_INPUT_MISC is not set |
595 | 524 | ||
@@ -624,35 +553,18 @@ CONFIG_SERIAL_VR41XX_CONSOLE=y | |||
624 | CONFIG_UNIX98_PTYS=y | 553 | CONFIG_UNIX98_PTYS=y |
625 | CONFIG_LEGACY_PTYS=y | 554 | CONFIG_LEGACY_PTYS=y |
626 | CONFIG_LEGACY_PTY_COUNT=256 | 555 | CONFIG_LEGACY_PTY_COUNT=256 |
627 | |||
628 | # | ||
629 | # IPMI | ||
630 | # | ||
631 | # CONFIG_IPMI_HANDLER is not set | 556 | # CONFIG_IPMI_HANDLER is not set |
632 | |||
633 | # | ||
634 | # Watchdog Cards | ||
635 | # | ||
636 | # CONFIG_WATCHDOG is not set | 557 | # CONFIG_WATCHDOG is not set |
637 | # CONFIG_HW_RANDOM is not set | 558 | # CONFIG_HW_RANDOM is not set |
638 | # CONFIG_RTC is not set | 559 | # CONFIG_RTC is not set |
639 | # CONFIG_GEN_RTC is not set | ||
640 | # CONFIG_DTLK is not set | ||
641 | # CONFIG_R3964 is not set | 560 | # CONFIG_R3964 is not set |
642 | # CONFIG_APPLICOM is not set | 561 | # CONFIG_APPLICOM is not set |
643 | CONFIG_GPIO_TB0219=y | 562 | CONFIG_GPIO_TB0219=y |
644 | # CONFIG_DRM is not set | 563 | # CONFIG_DRM is not set |
645 | CONFIG_GPIO_VR41XX=y | 564 | CONFIG_GPIO_VR41XX=y |
646 | # CONFIG_RAW_DRIVER is not set | 565 | # CONFIG_RAW_DRIVER is not set |
647 | |||
648 | # | ||
649 | # TPM devices | ||
650 | # | ||
651 | # CONFIG_TCG_TPM is not set | 566 | # CONFIG_TCG_TPM is not set |
652 | 567 | CONFIG_DEVPORT=y | |
653 | # | ||
654 | # I2C support | ||
655 | # | ||
656 | # CONFIG_I2C is not set | 568 | # CONFIG_I2C is not set |
657 | 569 | ||
658 | # | 570 | # |
@@ -660,17 +572,9 @@ CONFIG_GPIO_VR41XX=y | |||
660 | # | 572 | # |
661 | # CONFIG_SPI is not set | 573 | # CONFIG_SPI is not set |
662 | # CONFIG_SPI_MASTER is not set | 574 | # CONFIG_SPI_MASTER is not set |
663 | |||
664 | # | ||
665 | # Dallas's 1-wire bus | ||
666 | # | ||
667 | # CONFIG_W1 is not set | 575 | # CONFIG_W1 is not set |
668 | 576 | # CONFIG_POWER_SUPPLY is not set | |
669 | # | ||
670 | # Hardware Monitoring support | ||
671 | # | ||
672 | # CONFIG_HWMON is not set | 577 | # CONFIG_HWMON is not set |
673 | # CONFIG_HWMON_VID is not set | ||
674 | 578 | ||
675 | # | 579 | # |
676 | # Multifunction device drivers | 580 | # Multifunction device drivers |
@@ -681,17 +585,20 @@ CONFIG_GPIO_VR41XX=y | |||
681 | # Multimedia devices | 585 | # Multimedia devices |
682 | # | 586 | # |
683 | # CONFIG_VIDEO_DEV is not set | 587 | # CONFIG_VIDEO_DEV is not set |
588 | # CONFIG_DVB_CORE is not set | ||
589 | # CONFIG_DAB is not set | ||
684 | 590 | ||
685 | # | 591 | # |
686 | # Digital Video Broadcasting Devices | 592 | # Graphics support |
687 | # | 593 | # |
688 | # CONFIG_DVB is not set | 594 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
689 | # CONFIG_USB_DABUSB is not set | ||
690 | 595 | ||
691 | # | 596 | # |
692 | # Graphics support | 597 | # Display device support |
693 | # | 598 | # |
694 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 599 | # CONFIG_DISPLAY_SUPPORT is not set |
600 | # CONFIG_VGASTATE is not set | ||
601 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
695 | # CONFIG_FB is not set | 602 | # CONFIG_FB is not set |
696 | 603 | ||
697 | # | 604 | # |
@@ -704,16 +611,8 @@ CONFIG_DUMMY_CONSOLE=y | |||
704 | # Sound | 611 | # Sound |
705 | # | 612 | # |
706 | # CONFIG_SOUND is not set | 613 | # CONFIG_SOUND is not set |
707 | 614 | # CONFIG_HID_SUPPORT is not set | |
708 | # | 615 | CONFIG_USB_SUPPORT=y |
709 | # HID Devices | ||
710 | # | ||
711 | CONFIG_HID=y | ||
712 | # CONFIG_HID_DEBUG is not set | ||
713 | |||
714 | # | ||
715 | # USB support | ||
716 | # | ||
717 | CONFIG_USB_ARCH_HAS_HCD=y | 616 | CONFIG_USB_ARCH_HAS_HCD=y |
718 | CONFIG_USB_ARCH_HAS_OHCI=y | 617 | CONFIG_USB_ARCH_HAS_OHCI=y |
719 | CONFIG_USB_ARCH_HAS_EHCI=y | 618 | CONFIG_USB_ARCH_HAS_EHCI=y |
@@ -724,8 +623,8 @@ CONFIG_USB=m | |||
724 | # Miscellaneous USB options | 623 | # Miscellaneous USB options |
725 | # | 624 | # |
726 | CONFIG_USB_DEVICEFS=y | 625 | CONFIG_USB_DEVICEFS=y |
626 | CONFIG_USB_DEVICE_CLASS=y | ||
727 | # CONFIG_USB_DYNAMIC_MINORS is not set | 627 | # CONFIG_USB_DYNAMIC_MINORS is not set |
728 | # CONFIG_USB_SUSPEND is not set | ||
729 | # CONFIG_USB_OTG is not set | 628 | # CONFIG_USB_OTG is not set |
730 | 629 | ||
731 | # | 630 | # |
@@ -735,7 +634,6 @@ CONFIG_USB_EHCI_HCD=m | |||
735 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | 634 | # CONFIG_USB_EHCI_SPLIT_ISO is not set |
736 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 635 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
737 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 636 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
738 | # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set | ||
739 | # CONFIG_USB_ISP116X_HCD is not set | 637 | # CONFIG_USB_ISP116X_HCD is not set |
740 | CONFIG_USB_OHCI_HCD=m | 638 | CONFIG_USB_OHCI_HCD=m |
741 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 639 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
@@ -743,6 +641,7 @@ CONFIG_USB_OHCI_HCD=m | |||
743 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 641 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
744 | # CONFIG_USB_UHCI_HCD is not set | 642 | # CONFIG_USB_UHCI_HCD is not set |
745 | # CONFIG_USB_SL811_HCD is not set | 643 | # CONFIG_USB_SL811_HCD is not set |
644 | # CONFIG_USB_R8A66597_HCD is not set | ||
746 | 645 | ||
747 | # | 646 | # |
748 | # USB Device Class drivers | 647 | # USB Device Class drivers |
@@ -760,43 +659,9 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
760 | # CONFIG_USB_LIBUSUAL is not set | 659 | # CONFIG_USB_LIBUSUAL is not set |
761 | 660 | ||
762 | # | 661 | # |
763 | # USB Input Devices | ||
764 | # | ||
765 | # CONFIG_USB_HID is not set | ||
766 | |||
767 | # | ||
768 | # USB HID Boot Protocol drivers | ||
769 | # | ||
770 | # CONFIG_USB_KBD is not set | ||
771 | # CONFIG_USB_MOUSE is not set | ||
772 | # CONFIG_USB_AIPTEK is not set | ||
773 | # CONFIG_USB_WACOM is not set | ||
774 | # CONFIG_USB_ACECAD is not set | ||
775 | # CONFIG_USB_KBTAB is not set | ||
776 | # CONFIG_USB_POWERMATE is not set | ||
777 | # CONFIG_USB_TOUCHSCREEN is not set | ||
778 | # CONFIG_USB_YEALINK is not set | ||
779 | # CONFIG_USB_XPAD is not set | ||
780 | # CONFIG_USB_ATI_REMOTE is not set | ||
781 | # CONFIG_USB_ATI_REMOTE2 is not set | ||
782 | # CONFIG_USB_KEYSPAN_REMOTE is not set | ||
783 | # CONFIG_USB_APPLETOUCH is not set | ||
784 | # CONFIG_USB_GTCO is not set | ||
785 | |||
786 | # | ||
787 | # USB Imaging devices | 662 | # USB Imaging devices |
788 | # | 663 | # |
789 | # CONFIG_USB_MDC800 is not set | 664 | # CONFIG_USB_MDC800 is not set |
790 | |||
791 | # | ||
792 | # USB Network Adapters | ||
793 | # | ||
794 | # CONFIG_USB_CATC is not set | ||
795 | # CONFIG_USB_KAWETH is not set | ||
796 | # CONFIG_USB_PEGASUS is not set | ||
797 | # CONFIG_USB_RTL8150 is not set | ||
798 | # CONFIG_USB_USBNET_MII is not set | ||
799 | # CONFIG_USB_USBNET is not set | ||
800 | CONFIG_USB_MON=y | 665 | CONFIG_USB_MON=y |
801 | 666 | ||
802 | # | 667 | # |
@@ -840,37 +705,9 @@ CONFIG_USB_MON=y | |||
840 | # USB Gadget Support | 705 | # USB Gadget Support |
841 | # | 706 | # |
842 | # CONFIG_USB_GADGET is not set | 707 | # CONFIG_USB_GADGET is not set |
843 | |||
844 | # | ||
845 | # MMC/SD Card support | ||
846 | # | ||
847 | # CONFIG_MMC is not set | 708 | # CONFIG_MMC is not set |
848 | |||
849 | # | ||
850 | # LED devices | ||
851 | # | ||
852 | # CONFIG_NEW_LEDS is not set | 709 | # CONFIG_NEW_LEDS is not set |
853 | |||
854 | # | ||
855 | # LED drivers | ||
856 | # | ||
857 | |||
858 | # | ||
859 | # LED Triggers | ||
860 | # | ||
861 | |||
862 | # | ||
863 | # InfiniBand support | ||
864 | # | ||
865 | # CONFIG_INFINIBAND is not set | 710 | # CONFIG_INFINIBAND is not set |
866 | |||
867 | # | ||
868 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
869 | # | ||
870 | |||
871 | # | ||
872 | # Real Time Clock | ||
873 | # | ||
874 | CONFIG_RTC_LIB=y | 711 | CONFIG_RTC_LIB=y |
875 | CONFIG_RTC_CLASS=y | 712 | CONFIG_RTC_CLASS=y |
876 | CONFIG_RTC_HCTOSYS=y | 713 | CONFIG_RTC_HCTOSYS=y |
@@ -884,18 +721,29 @@ CONFIG_RTC_INTF_SYSFS=y | |||
884 | CONFIG_RTC_INTF_PROC=y | 721 | CONFIG_RTC_INTF_PROC=y |
885 | CONFIG_RTC_INTF_DEV=y | 722 | CONFIG_RTC_INTF_DEV=y |
886 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | 723 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set |
724 | # CONFIG_RTC_DRV_TEST is not set | ||
725 | |||
726 | # | ||
727 | # SPI RTC drivers | ||
728 | # | ||
887 | 729 | ||
888 | # | 730 | # |
889 | # RTC drivers | 731 | # Platform RTC drivers |
890 | # | 732 | # |
733 | # CONFIG_RTC_DRV_CMOS is not set | ||
891 | # CONFIG_RTC_DRV_DS1553 is not set | 734 | # CONFIG_RTC_DRV_DS1553 is not set |
735 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
892 | # CONFIG_RTC_DRV_DS1742 is not set | 736 | # CONFIG_RTC_DRV_DS1742 is not set |
893 | # CONFIG_RTC_DRV_M48T86 is not set | 737 | # CONFIG_RTC_DRV_M48T86 is not set |
894 | CONFIG_RTC_DRV_VR41XX=y | 738 | # CONFIG_RTC_DRV_M48T59 is not set |
895 | # CONFIG_RTC_DRV_TEST is not set | ||
896 | # CONFIG_RTC_DRV_V3020 is not set | 739 | # CONFIG_RTC_DRV_V3020 is not set |
897 | 740 | ||
898 | # | 741 | # |
742 | # on-CPU RTC drivers | ||
743 | # | ||
744 | CONFIG_RTC_DRV_VR41XX=y | ||
745 | |||
746 | # | ||
899 | # DMA Engine support | 747 | # DMA Engine support |
900 | # | 748 | # |
901 | # CONFIG_DMA_ENGINE is not set | 749 | # CONFIG_DMA_ENGINE is not set |
@@ -909,12 +757,9 @@ CONFIG_RTC_DRV_VR41XX=y | |||
909 | # | 757 | # |
910 | 758 | ||
911 | # | 759 | # |
912 | # Auxiliary Display support | 760 | # Userspace I/O |
913 | # | ||
914 | |||
915 | # | ||
916 | # Virtualization | ||
917 | # | 761 | # |
762 | # CONFIG_UIO is not set | ||
918 | 763 | ||
919 | # | 764 | # |
920 | # File systems | 765 | # File systems |
@@ -922,8 +767,14 @@ CONFIG_RTC_DRV_VR41XX=y | |||
922 | CONFIG_EXT2_FS=y | 767 | CONFIG_EXT2_FS=y |
923 | # CONFIG_EXT2_FS_XATTR is not set | 768 | # CONFIG_EXT2_FS_XATTR is not set |
924 | # CONFIG_EXT2_FS_XIP is not set | 769 | # CONFIG_EXT2_FS_XIP is not set |
925 | # CONFIG_EXT3_FS is not set | 770 | CONFIG_EXT3_FS=y |
771 | CONFIG_EXT3_FS_XATTR=y | ||
772 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
773 | # CONFIG_EXT3_FS_SECURITY is not set | ||
926 | # CONFIG_EXT4DEV_FS is not set | 774 | # CONFIG_EXT4DEV_FS is not set |
775 | CONFIG_JBD=y | ||
776 | # CONFIG_JBD_DEBUG is not set | ||
777 | CONFIG_FS_MBCACHE=y | ||
927 | # CONFIG_REISERFS_FS is not set | 778 | # CONFIG_REISERFS_FS is not set |
928 | # CONFIG_JFS_FS is not set | 779 | # CONFIG_JFS_FS is not set |
929 | CONFIG_FS_POSIX_ACL=y | 780 | CONFIG_FS_POSIX_ACL=y |
@@ -938,7 +789,7 @@ CONFIG_INOTIFY_USER=y | |||
938 | CONFIG_DNOTIFY=y | 789 | CONFIG_DNOTIFY=y |
939 | # CONFIG_AUTOFS_FS is not set | 790 | # CONFIG_AUTOFS_FS is not set |
940 | CONFIG_AUTOFS4_FS=y | 791 | CONFIG_AUTOFS4_FS=y |
941 | CONFIG_FUSE_FS=m | 792 | # CONFIG_FUSE_FS is not set |
942 | CONFIG_GENERIC_ACL=y | 793 | CONFIG_GENERIC_ACL=y |
943 | 794 | ||
944 | # | 795 | # |
@@ -965,7 +816,7 @@ CONFIG_TMPFS=y | |||
965 | CONFIG_TMPFS_POSIX_ACL=y | 816 | CONFIG_TMPFS_POSIX_ACL=y |
966 | # CONFIG_HUGETLB_PAGE is not set | 817 | # CONFIG_HUGETLB_PAGE is not set |
967 | CONFIG_RAMFS=y | 818 | CONFIG_RAMFS=y |
968 | CONFIG_CONFIGFS_FS=m | 819 | # CONFIG_CONFIGFS_FS is not set |
969 | 820 | ||
970 | # | 821 | # |
971 | # Miscellaneous filesystems | 822 | # Miscellaneous filesystems |
@@ -1003,6 +854,7 @@ CONFIG_LOCKD_V4=y | |||
1003 | CONFIG_EXPORTFS=y | 854 | CONFIG_EXPORTFS=y |
1004 | CONFIG_NFS_COMMON=y | 855 | CONFIG_NFS_COMMON=y |
1005 | CONFIG_SUNRPC=y | 856 | CONFIG_SUNRPC=y |
857 | # CONFIG_SUNRPC_BIND34 is not set | ||
1006 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 858 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1007 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 859 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1008 | # CONFIG_SMB_FS is not set | 860 | # CONFIG_SMB_FS is not set |
@@ -1010,7 +862,6 @@ CONFIG_SUNRPC=y | |||
1010 | # CONFIG_NCP_FS is not set | 862 | # CONFIG_NCP_FS is not set |
1011 | # CONFIG_CODA_FS is not set | 863 | # CONFIG_CODA_FS is not set |
1012 | # CONFIG_AFS_FS is not set | 864 | # CONFIG_AFS_FS is not set |
1013 | # CONFIG_9P_FS is not set | ||
1014 | 865 | ||
1015 | # | 866 | # |
1016 | # Partition Types | 867 | # Partition Types |
@@ -1026,10 +877,7 @@ CONFIG_MSDOS_PARTITION=y | |||
1026 | # | 877 | # |
1027 | # Distributed Lock Manager | 878 | # Distributed Lock Manager |
1028 | # | 879 | # |
1029 | CONFIG_DLM=m | 880 | # CONFIG_DLM is not set |
1030 | CONFIG_DLM_TCP=y | ||
1031 | # CONFIG_DLM_SCTP is not set | ||
1032 | # CONFIG_DLM_DEBUG is not set | ||
1033 | 881 | ||
1034 | # | 882 | # |
1035 | # Profiling support | 883 | # Profiling support |
@@ -1047,7 +895,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1047 | # CONFIG_DEBUG_FS is not set | 895 | # CONFIG_DEBUG_FS is not set |
1048 | # CONFIG_HEADERS_CHECK is not set | 896 | # CONFIG_HEADERS_CHECK is not set |
1049 | # CONFIG_DEBUG_KERNEL is not set | 897 | # CONFIG_DEBUG_KERNEL is not set |
1050 | CONFIG_LOG_BUF_SHIFT=14 | ||
1051 | CONFIG_CROSSCOMPILE=y | 898 | CONFIG_CROSSCOMPILE=y |
1052 | CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" | 899 | CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" |
1053 | 900 | ||
@@ -1056,63 +903,20 @@ CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" | |||
1056 | # | 903 | # |
1057 | # CONFIG_KEYS is not set | 904 | # CONFIG_KEYS is not set |
1058 | # CONFIG_SECURITY is not set | 905 | # CONFIG_SECURITY is not set |
1059 | 906 | # CONFIG_CRYPTO is not set | |
1060 | # | ||
1061 | # Cryptographic options | ||
1062 | # | ||
1063 | CONFIG_CRYPTO=y | ||
1064 | CONFIG_CRYPTO_ALGAPI=y | ||
1065 | CONFIG_CRYPTO_BLKCIPHER=m | ||
1066 | CONFIG_CRYPTO_HASH=m | ||
1067 | CONFIG_CRYPTO_MANAGER=m | ||
1068 | CONFIG_CRYPTO_HMAC=m | ||
1069 | CONFIG_CRYPTO_XCBC=m | ||
1070 | CONFIG_CRYPTO_NULL=m | ||
1071 | CONFIG_CRYPTO_MD4=m | ||
1072 | CONFIG_CRYPTO_MD5=y | ||
1073 | CONFIG_CRYPTO_SHA1=m | ||
1074 | CONFIG_CRYPTO_SHA256=m | ||
1075 | CONFIG_CRYPTO_SHA512=m | ||
1076 | CONFIG_CRYPTO_WP512=m | ||
1077 | CONFIG_CRYPTO_TGR192=m | ||
1078 | CONFIG_CRYPTO_GF128MUL=m | ||
1079 | CONFIG_CRYPTO_ECB=m | ||
1080 | CONFIG_CRYPTO_CBC=m | ||
1081 | CONFIG_CRYPTO_PCBC=m | ||
1082 | CONFIG_CRYPTO_LRW=m | ||
1083 | CONFIG_CRYPTO_DES=m | ||
1084 | CONFIG_CRYPTO_FCRYPT=m | ||
1085 | CONFIG_CRYPTO_BLOWFISH=m | ||
1086 | CONFIG_CRYPTO_TWOFISH=m | ||
1087 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1088 | CONFIG_CRYPTO_SERPENT=m | ||
1089 | CONFIG_CRYPTO_AES=m | ||
1090 | CONFIG_CRYPTO_CAST5=m | ||
1091 | CONFIG_CRYPTO_CAST6=m | ||
1092 | CONFIG_CRYPTO_TEA=m | ||
1093 | CONFIG_CRYPTO_ARC4=m | ||
1094 | CONFIG_CRYPTO_KHAZAD=m | ||
1095 | CONFIG_CRYPTO_ANUBIS=m | ||
1096 | CONFIG_CRYPTO_DEFLATE=m | ||
1097 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1098 | CONFIG_CRYPTO_CRC32C=m | ||
1099 | CONFIG_CRYPTO_CAMELLIA=m | ||
1100 | # CONFIG_CRYPTO_TEST is not set | ||
1101 | |||
1102 | # | ||
1103 | # Hardware crypto devices | ||
1104 | # | ||
1105 | 907 | ||
1106 | # | 908 | # |
1107 | # Library routines | 909 | # Library routines |
1108 | # | 910 | # |
1109 | CONFIG_BITREVERSE=y | 911 | CONFIG_BITREVERSE=y |
1110 | # CONFIG_CRC_CCITT is not set | 912 | CONFIG_CRC_CCITT=y |
1111 | # CONFIG_CRC16 is not set | 913 | # CONFIG_CRC16 is not set |
914 | # CONFIG_CRC_ITU_T is not set | ||
1112 | CONFIG_CRC32=y | 915 | CONFIG_CRC32=y |
1113 | CONFIG_LIBCRC32C=m | 916 | # CONFIG_CRC7 is not set |
917 | # CONFIG_LIBCRC32C is not set | ||
1114 | CONFIG_ZLIB_INFLATE=m | 918 | CONFIG_ZLIB_INFLATE=m |
1115 | CONFIG_ZLIB_DEFLATE=m | ||
1116 | CONFIG_PLIST=y | 919 | CONFIG_PLIST=y |
1117 | CONFIG_HAS_IOMEM=y | 920 | CONFIG_HAS_IOMEM=y |
1118 | CONFIG_HAS_IOPORT=y | 921 | CONFIG_HAS_IOPORT=y |
922 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig index aea67568842a..9fd0faeacf53 100644 --- a/arch/mips/configs/tb0226_defconfig +++ b/arch/mips/configs/tb0226_defconfig | |||
@@ -1,68 +1,56 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.20 | 3 | # Linux kernel version: 2.6.23-rc2 |
4 | # Tue Feb 20 21:47:41 2007 | 4 | # Thu Aug 9 11:16:55 2007 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
8 | # | 8 | # |
9 | # Machine selection | 9 | # Machine selection |
10 | # | 10 | # |
11 | CONFIG_ZONE_DMA=y | 11 | # CONFIG_MACH_ALCHEMY is not set |
12 | # CONFIG_MIPS_MTX1 is not set | ||
13 | # CONFIG_MIPS_BOSPORUS is not set | ||
14 | # CONFIG_MIPS_PB1000 is not set | ||
15 | # CONFIG_MIPS_PB1100 is not set | ||
16 | # CONFIG_MIPS_PB1500 is not set | ||
17 | # CONFIG_MIPS_PB1550 is not set | ||
18 | # CONFIG_MIPS_PB1200 is not set | ||
19 | # CONFIG_MIPS_DB1000 is not set | ||
20 | # CONFIG_MIPS_DB1100 is not set | ||
21 | # CONFIG_MIPS_DB1500 is not set | ||
22 | # CONFIG_MIPS_DB1550 is not set | ||
23 | # CONFIG_MIPS_DB1200 is not set | ||
24 | # CONFIG_MIPS_MIRAGE is not set | ||
25 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
26 | # CONFIG_MIPS_COBALT is not set | 13 | # CONFIG_MIPS_COBALT is not set |
27 | # CONFIG_MACH_DECSTATION is not set | 14 | # CONFIG_MACH_DECSTATION is not set |
28 | # CONFIG_MACH_JAZZ is not set | 15 | # CONFIG_MACH_JAZZ is not set |
16 | # CONFIG_LEMOTE_FULONG is not set | ||
29 | # CONFIG_MIPS_ATLAS is not set | 17 | # CONFIG_MIPS_ATLAS is not set |
30 | # CONFIG_MIPS_MALTA is not set | 18 | # CONFIG_MIPS_MALTA is not set |
31 | # CONFIG_MIPS_SEAD is not set | 19 | # CONFIG_MIPS_SEAD is not set |
32 | # CONFIG_WR_PPMC is not set | ||
33 | # CONFIG_MIPS_SIM is not set | 20 | # CONFIG_MIPS_SIM is not set |
34 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 21 | # CONFIG_MARKEINS is not set |
35 | # CONFIG_MIPS_XXS1500 is not set | 22 | CONFIG_MACH_VR41XX=y |
36 | # CONFIG_PNX8550_JBS is not set | 23 | # CONFIG_PNX8550_JBS is not set |
37 | # CONFIG_PNX8550_STB810 is not set | 24 | # CONFIG_PNX8550_STB810 is not set |
38 | CONFIG_MACH_VR41XX=y | 25 | # CONFIG_PMC_MSP is not set |
39 | # CONFIG_PMC_YOSEMITE is not set | 26 | # CONFIG_PMC_YOSEMITE is not set |
40 | # CONFIG_QEMU is not set | 27 | # CONFIG_QEMU is not set |
41 | # CONFIG_MARKEINS is not set | ||
42 | # CONFIG_SGI_IP22 is not set | 28 | # CONFIG_SGI_IP22 is not set |
43 | # CONFIG_SGI_IP27 is not set | 29 | # CONFIG_SGI_IP27 is not set |
44 | # CONFIG_SGI_IP32 is not set | 30 | # CONFIG_SGI_IP32 is not set |
45 | # CONFIG_SIBYTE_BIGSUR is not set | 31 | # CONFIG_SIBYTE_CRHINE is not set |
32 | # CONFIG_SIBYTE_CARMEL is not set | ||
33 | # CONFIG_SIBYTE_CRHONE is not set | ||
34 | # CONFIG_SIBYTE_RHONE is not set | ||
46 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | ||
49 | # CONFIG_SIBYTE_CARMEL is not set | ||
50 | # CONFIG_SIBYTE_PTSWARM is not set | 38 | # CONFIG_SIBYTE_PTSWARM is not set |
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 39 | # CONFIG_SIBYTE_BIGSUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | ||
53 | # CONFIG_SIBYTE_CRHONE is not set | ||
54 | # CONFIG_SNI_RM is not set | 40 | # CONFIG_SNI_RM is not set |
55 | # CONFIG_TOSHIBA_JMR3927 is not set | 41 | # CONFIG_TOSHIBA_JMR3927 is not set |
56 | # CONFIG_TOSHIBA_RBTX4927 is not set | 42 | # CONFIG_TOSHIBA_RBTX4927 is not set |
57 | # CONFIG_TOSHIBA_RBTX4938 is not set | 43 | # CONFIG_TOSHIBA_RBTX4938 is not set |
44 | # CONFIG_WR_PPMC is not set | ||
58 | # CONFIG_CASIO_E55 is not set | 45 | # CONFIG_CASIO_E55 is not set |
59 | # CONFIG_IBM_WORKPAD is not set | 46 | # CONFIG_IBM_WORKPAD is not set |
60 | # CONFIG_NEC_CMBVR4133 is not set | 47 | # CONFIG_NEC_CMBVR4133 is not set |
61 | CONFIG_TANBAC_TB022X=y | 48 | CONFIG_TANBAC_TB022X=y |
62 | CONFIG_TANBAC_TB0226=y | ||
63 | # CONFIG_TANBAC_TB0287 is not set | ||
64 | # CONFIG_VICTOR_MPC30X is not set | 49 | # CONFIG_VICTOR_MPC30X is not set |
65 | # CONFIG_ZAO_CAPCELLA is not set | 50 | # CONFIG_ZAO_CAPCELLA is not set |
51 | # CONFIG_TANBAC_TB0219 is not set | ||
52 | CONFIG_TANBAC_TB0226=y | ||
53 | # CONFIG_TANBAC_TB0287 is not set | ||
66 | CONFIG_PCI_VR41XX=y | 54 | CONFIG_PCI_VR41XX=y |
67 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 55 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
68 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 56 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
@@ -75,6 +63,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
75 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 63 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
76 | CONFIG_DMA_NONCOHERENT=y | 64 | CONFIG_DMA_NONCOHERENT=y |
77 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 65 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
66 | # CONFIG_HOTPLUG_CPU is not set | ||
67 | # CONFIG_NO_IOPORT is not set | ||
78 | # CONFIG_CPU_BIG_ENDIAN is not set | 68 | # CONFIG_CPU_BIG_ENDIAN is not set |
79 | CONFIG_CPU_LITTLE_ENDIAN=y | 69 | CONFIG_CPU_LITTLE_ENDIAN=y |
80 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 70 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
@@ -84,6 +74,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
84 | # | 74 | # |
85 | # CPU selection | 75 | # CPU selection |
86 | # | 76 | # |
77 | # CONFIG_CPU_LOONGSON2 is not set | ||
87 | # CONFIG_CPU_MIPS32_R1 is not set | 78 | # CONFIG_CPU_MIPS32_R1 is not set |
88 | # CONFIG_CPU_MIPS32_R2 is not set | 79 | # CONFIG_CPU_MIPS32_R2 is not set |
89 | # CONFIG_CPU_MIPS64_R1 is not set | 80 | # CONFIG_CPU_MIPS64_R1 is not set |
@@ -105,7 +96,6 @@ CONFIG_CPU_VR41XX=y | |||
105 | # CONFIG_CPU_SB1 is not set | 96 | # CONFIG_CPU_SB1 is not set |
106 | CONFIG_SYS_HAS_CPU_VR41XX=y | 97 | CONFIG_SYS_HAS_CPU_VR41XX=y |
107 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y | 98 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y |
108 | CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y | ||
109 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y | 99 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y |
110 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y | 100 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y |
111 | 101 | ||
@@ -121,7 +111,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
121 | CONFIG_MIPS_MT_DISABLED=y | 111 | CONFIG_MIPS_MT_DISABLED=y |
122 | # CONFIG_MIPS_MT_SMP is not set | 112 | # CONFIG_MIPS_MT_SMP is not set |
123 | # CONFIG_MIPS_MT_SMTC is not set | 113 | # CONFIG_MIPS_MT_SMTC is not set |
124 | # CONFIG_MIPS_VPE_LOADER is not set | ||
125 | CONFIG_CPU_HAS_SYNC=y | 114 | CONFIG_CPU_HAS_SYNC=y |
126 | CONFIG_GENERIC_HARDIRQS=y | 115 | CONFIG_GENERIC_HARDIRQS=y |
127 | CONFIG_GENERIC_IRQ_PROBE=y | 116 | CONFIG_GENERIC_IRQ_PROBE=y |
@@ -135,48 +124,47 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
135 | # CONFIG_SPARSEMEM_STATIC is not set | 124 | # CONFIG_SPARSEMEM_STATIC is not set |
136 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 125 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
137 | # CONFIG_RESOURCES_64BIT is not set | 126 | # CONFIG_RESOURCES_64BIT is not set |
138 | CONFIG_ZONE_DMA_FLAG=1 | 127 | CONFIG_ZONE_DMA_FLAG=0 |
128 | CONFIG_VIRT_TO_BUS=y | ||
139 | # CONFIG_HZ_48 is not set | 129 | # CONFIG_HZ_48 is not set |
140 | # CONFIG_HZ_100 is not set | 130 | # CONFIG_HZ_100 is not set |
141 | # CONFIG_HZ_128 is not set | 131 | # CONFIG_HZ_128 is not set |
142 | # CONFIG_HZ_250 is not set | 132 | CONFIG_HZ_250=y |
143 | # CONFIG_HZ_256 is not set | 133 | # CONFIG_HZ_256 is not set |
144 | CONFIG_HZ_1000=y | 134 | # CONFIG_HZ_1000 is not set |
145 | # CONFIG_HZ_1024 is not set | 135 | # CONFIG_HZ_1024 is not set |
146 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y | 136 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y |
147 | CONFIG_HZ=1000 | 137 | CONFIG_HZ=250 |
148 | CONFIG_PREEMPT_NONE=y | 138 | CONFIG_PREEMPT_NONE=y |
149 | # CONFIG_PREEMPT_VOLUNTARY is not set | 139 | # CONFIG_PREEMPT_VOLUNTARY is not set |
150 | # CONFIG_PREEMPT is not set | 140 | # CONFIG_PREEMPT is not set |
151 | # CONFIG_KEXEC is not set | 141 | # CONFIG_KEXEC is not set |
142 | CONFIG_SECCOMP=y | ||
152 | CONFIG_LOCKDEP_SUPPORT=y | 143 | CONFIG_LOCKDEP_SUPPORT=y |
153 | CONFIG_STACKTRACE_SUPPORT=y | 144 | CONFIG_STACKTRACE_SUPPORT=y |
154 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 145 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
155 | 146 | ||
156 | # | 147 | # |
157 | # Code maturity level options | 148 | # General setup |
158 | # | 149 | # |
159 | CONFIG_EXPERIMENTAL=y | 150 | CONFIG_EXPERIMENTAL=y |
160 | CONFIG_BROKEN_ON_SMP=y | 151 | CONFIG_BROKEN_ON_SMP=y |
161 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 152 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
162 | |||
163 | # | ||
164 | # General setup | ||
165 | # | ||
166 | CONFIG_LOCALVERSION="" | 153 | CONFIG_LOCALVERSION="" |
167 | CONFIG_LOCALVERSION_AUTO=y | 154 | CONFIG_LOCALVERSION_AUTO=y |
168 | CONFIG_SWAP=y | 155 | CONFIG_SWAP=y |
169 | CONFIG_SYSVIPC=y | 156 | CONFIG_SYSVIPC=y |
170 | # CONFIG_IPC_NS is not set | ||
171 | CONFIG_SYSVIPC_SYSCTL=y | 157 | CONFIG_SYSVIPC_SYSCTL=y |
172 | # CONFIG_POSIX_MQUEUE is not set | 158 | # CONFIG_POSIX_MQUEUE is not set |
173 | # CONFIG_BSD_PROCESS_ACCT is not set | 159 | # CONFIG_BSD_PROCESS_ACCT is not set |
174 | # CONFIG_TASKSTATS is not set | 160 | # CONFIG_TASKSTATS is not set |
175 | # CONFIG_UTS_NS is not set | 161 | # CONFIG_USER_NS is not set |
176 | # CONFIG_AUDIT is not set | 162 | # CONFIG_AUDIT is not set |
177 | # CONFIG_IKCONFIG is not set | 163 | # CONFIG_IKCONFIG is not set |
164 | CONFIG_LOG_BUF_SHIFT=14 | ||
178 | CONFIG_SYSFS_DEPRECATED=y | 165 | CONFIG_SYSFS_DEPRECATED=y |
179 | # CONFIG_RELAY is not set | 166 | # CONFIG_RELAY is not set |
167 | # CONFIG_BLK_DEV_INITRD is not set | ||
180 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 168 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
181 | CONFIG_SYSCTL=y | 169 | CONFIG_SYSCTL=y |
182 | CONFIG_EMBEDDED=y | 170 | CONFIG_EMBEDDED=y |
@@ -189,32 +177,30 @@ CONFIG_BUG=y | |||
189 | CONFIG_ELF_CORE=y | 177 | CONFIG_ELF_CORE=y |
190 | CONFIG_BASE_FULL=y | 178 | CONFIG_BASE_FULL=y |
191 | CONFIG_FUTEX=y | 179 | CONFIG_FUTEX=y |
180 | CONFIG_ANON_INODES=y | ||
192 | CONFIG_EPOLL=y | 181 | CONFIG_EPOLL=y |
182 | CONFIG_SIGNALFD=y | ||
183 | CONFIG_TIMERFD=y | ||
184 | CONFIG_EVENTFD=y | ||
193 | CONFIG_SHMEM=y | 185 | CONFIG_SHMEM=y |
194 | CONFIG_SLAB=y | ||
195 | CONFIG_VM_EVENT_COUNTERS=y | 186 | CONFIG_VM_EVENT_COUNTERS=y |
187 | CONFIG_SLAB=y | ||
188 | # CONFIG_SLUB is not set | ||
189 | # CONFIG_SLOB is not set | ||
196 | CONFIG_RT_MUTEXES=y | 190 | CONFIG_RT_MUTEXES=y |
197 | # CONFIG_TINY_SHMEM is not set | 191 | # CONFIG_TINY_SHMEM is not set |
198 | CONFIG_BASE_SMALL=0 | 192 | CONFIG_BASE_SMALL=0 |
199 | # CONFIG_SLOB is not set | ||
200 | |||
201 | # | ||
202 | # Loadable module support | ||
203 | # | ||
204 | CONFIG_MODULES=y | 193 | CONFIG_MODULES=y |
205 | CONFIG_MODULE_UNLOAD=y | 194 | CONFIG_MODULE_UNLOAD=y |
206 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 195 | CONFIG_MODULE_FORCE_UNLOAD=y |
207 | CONFIG_MODVERSIONS=y | 196 | CONFIG_MODVERSIONS=y |
208 | CONFIG_MODULE_SRCVERSION_ALL=y | 197 | CONFIG_MODULE_SRCVERSION_ALL=y |
209 | CONFIG_KMOD=y | 198 | CONFIG_KMOD=y |
210 | |||
211 | # | ||
212 | # Block layer | ||
213 | # | ||
214 | CONFIG_BLOCK=y | 199 | CONFIG_BLOCK=y |
215 | # CONFIG_LBD is not set | 200 | # CONFIG_LBD is not set |
216 | # CONFIG_BLK_DEV_IO_TRACE is not set | 201 | # CONFIG_BLK_DEV_IO_TRACE is not set |
217 | # CONFIG_LSF is not set | 202 | # CONFIG_LSF is not set |
203 | # CONFIG_BLK_DEV_BSG is not set | ||
218 | 204 | ||
219 | # | 205 | # |
220 | # IO Schedulers | 206 | # IO Schedulers |
@@ -234,16 +220,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
234 | # | 220 | # |
235 | CONFIG_HW_HAS_PCI=y | 221 | CONFIG_HW_HAS_PCI=y |
236 | CONFIG_PCI=y | 222 | CONFIG_PCI=y |
223 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
237 | CONFIG_MMU=y | 224 | CONFIG_MMU=y |
238 | 225 | ||
239 | # | 226 | # |
240 | # PCCARD (PCMCIA/CardBus) support | 227 | # PCCARD (PCMCIA/CardBus) support |
241 | # | 228 | # |
242 | # CONFIG_PCCARD is not set | 229 | # CONFIG_PCCARD is not set |
243 | |||
244 | # | ||
245 | # PCI Hotplug Support | ||
246 | # | ||
247 | # CONFIG_HOTPLUG_PCI is not set | 230 | # CONFIG_HOTPLUG_PCI is not set |
248 | 231 | ||
249 | # | 232 | # |
@@ -256,10 +239,7 @@ CONFIG_TRAD_SIGNALS=y | |||
256 | # | 239 | # |
257 | # Power management options | 240 | # Power management options |
258 | # | 241 | # |
259 | CONFIG_PM=y | 242 | # CONFIG_PM is not set |
260 | # CONFIG_PM_LEGACY is not set | ||
261 | # CONFIG_PM_DEBUG is not set | ||
262 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
263 | 243 | ||
264 | # | 244 | # |
265 | # Networking | 245 | # Networking |
@@ -269,14 +249,9 @@ CONFIG_NET=y | |||
269 | # | 249 | # |
270 | # Networking options | 250 | # Networking options |
271 | # | 251 | # |
272 | # CONFIG_NETDEBUG is not set | ||
273 | CONFIG_PACKET=y | 252 | CONFIG_PACKET=y |
274 | # CONFIG_PACKET_MMAP is not set | 253 | # CONFIG_PACKET_MMAP is not set |
275 | CONFIG_UNIX=y | 254 | CONFIG_UNIX=y |
276 | CONFIG_XFRM=y | ||
277 | # CONFIG_XFRM_USER is not set | ||
278 | # CONFIG_XFRM_SUB_POLICY is not set | ||
279 | CONFIG_XFRM_MIGRATE=y | ||
280 | # CONFIG_NET_KEY is not set | 255 | # CONFIG_NET_KEY is not set |
281 | CONFIG_INET=y | 256 | CONFIG_INET=y |
282 | CONFIG_IP_MULTICAST=y | 257 | CONFIG_IP_MULTICAST=y |
@@ -286,7 +261,6 @@ CONFIG_ASK_IP_FIB_HASH=y | |||
286 | CONFIG_IP_FIB_HASH=y | 261 | CONFIG_IP_FIB_HASH=y |
287 | CONFIG_IP_MULTIPLE_TABLES=y | 262 | CONFIG_IP_MULTIPLE_TABLES=y |
288 | CONFIG_IP_ROUTE_MULTIPATH=y | 263 | CONFIG_IP_ROUTE_MULTIPATH=y |
289 | # CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set | ||
290 | CONFIG_IP_ROUTE_VERBOSE=y | 264 | CONFIG_IP_ROUTE_VERBOSE=y |
291 | CONFIG_IP_PNP=y | 265 | CONFIG_IP_PNP=y |
292 | # CONFIG_IP_PNP_DHCP is not set | 266 | # CONFIG_IP_PNP_DHCP is not set |
@@ -302,34 +276,25 @@ CONFIG_SYN_COOKIES=y | |||
302 | # CONFIG_INET_IPCOMP is not set | 276 | # CONFIG_INET_IPCOMP is not set |
303 | # CONFIG_INET_XFRM_TUNNEL is not set | 277 | # CONFIG_INET_XFRM_TUNNEL is not set |
304 | # CONFIG_INET_TUNNEL is not set | 278 | # CONFIG_INET_TUNNEL is not set |
305 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 279 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
306 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 280 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
307 | CONFIG_INET_XFRM_MODE_BEET=m | 281 | # CONFIG_INET_XFRM_MODE_BEET is not set |
308 | CONFIG_INET_DIAG=y | 282 | CONFIG_INET_DIAG=y |
309 | CONFIG_INET_TCP_DIAG=y | 283 | CONFIG_INET_TCP_DIAG=y |
310 | # CONFIG_TCP_CONG_ADVANCED is not set | 284 | # CONFIG_TCP_CONG_ADVANCED is not set |
311 | CONFIG_TCP_CONG_CUBIC=y | 285 | CONFIG_TCP_CONG_CUBIC=y |
312 | CONFIG_DEFAULT_TCP_CONG="cubic" | 286 | CONFIG_DEFAULT_TCP_CONG="cubic" |
313 | CONFIG_TCP_MD5SIG=y | 287 | # CONFIG_TCP_MD5SIG is not set |
314 | # CONFIG_IPV6 is not set | 288 | # CONFIG_IPV6 is not set |
315 | # CONFIG_INET6_XFRM_TUNNEL is not set | 289 | # CONFIG_INET6_XFRM_TUNNEL is not set |
316 | # CONFIG_INET6_TUNNEL is not set | 290 | # CONFIG_INET6_TUNNEL is not set |
317 | CONFIG_NETWORK_SECMARK=y | 291 | CONFIG_NETWORK_SECMARK=y |
318 | # CONFIG_NETFILTER is not set | 292 | # CONFIG_NETFILTER is not set |
319 | |||
320 | # | ||
321 | # DCCP Configuration (EXPERIMENTAL) | ||
322 | # | ||
323 | # CONFIG_IP_DCCP is not set | 293 | # CONFIG_IP_DCCP is not set |
324 | |||
325 | # | ||
326 | # SCTP Configuration (EXPERIMENTAL) | ||
327 | # | ||
328 | # CONFIG_IP_SCTP is not set | 294 | # CONFIG_IP_SCTP is not set |
329 | 295 | # CONFIG_SCTP_HMAC_NONE is not set | |
330 | # | 296 | # CONFIG_SCTP_HMAC_SHA1 is not set |
331 | # TIPC Configuration (EXPERIMENTAL) | 297 | # CONFIG_SCTP_HMAC_MD5 is not set |
332 | # | ||
333 | # CONFIG_TIPC is not set | 298 | # CONFIG_TIPC is not set |
334 | # CONFIG_ATM is not set | 299 | # CONFIG_ATM is not set |
335 | # CONFIG_BRIDGE is not set | 300 | # CONFIG_BRIDGE is not set |
@@ -355,10 +320,20 @@ CONFIG_NETWORK_SECMARK=y | |||
355 | # CONFIG_HAMRADIO is not set | 320 | # CONFIG_HAMRADIO is not set |
356 | # CONFIG_IRDA is not set | 321 | # CONFIG_IRDA is not set |
357 | # CONFIG_BT is not set | 322 | # CONFIG_BT is not set |
358 | # CONFIG_IEEE80211 is not set | 323 | # CONFIG_AF_RXRPC is not set |
359 | CONFIG_FIB_RULES=y | 324 | CONFIG_FIB_RULES=y |
360 | 325 | ||
361 | # | 326 | # |
327 | # Wireless | ||
328 | # | ||
329 | # CONFIG_CFG80211 is not set | ||
330 | # CONFIG_WIRELESS_EXT is not set | ||
331 | # CONFIG_MAC80211 is not set | ||
332 | # CONFIG_IEEE80211 is not set | ||
333 | # CONFIG_RFKILL is not set | ||
334 | # CONFIG_NET_9P is not set | ||
335 | |||
336 | # | ||
362 | # Device Drivers | 337 | # Device Drivers |
363 | # | 338 | # |
364 | 339 | ||
@@ -369,30 +344,10 @@ CONFIG_STANDALONE=y | |||
369 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 344 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
370 | CONFIG_FW_LOADER=y | 345 | CONFIG_FW_LOADER=y |
371 | # CONFIG_SYS_HYPERVISOR is not set | 346 | # CONFIG_SYS_HYPERVISOR is not set |
372 | 347 | # CONFIG_CONNECTOR is not set | |
373 | # | ||
374 | # Connector - unified userspace <-> kernelspace linker | ||
375 | # | ||
376 | CONFIG_CONNECTOR=m | ||
377 | |||
378 | # | ||
379 | # Memory Technology Devices (MTD) | ||
380 | # | ||
381 | # CONFIG_MTD is not set | 348 | # CONFIG_MTD is not set |
382 | |||
383 | # | ||
384 | # Parallel port support | ||
385 | # | ||
386 | # CONFIG_PARPORT is not set | 349 | # CONFIG_PARPORT is not set |
387 | 350 | CONFIG_BLK_DEV=y | |
388 | # | ||
389 | # Plug and Play support | ||
390 | # | ||
391 | # CONFIG_PNPACPI is not set | ||
392 | |||
393 | # | ||
394 | # Block devices | ||
395 | # | ||
396 | # CONFIG_BLK_CPQ_DA is not set | 351 | # CONFIG_BLK_CPQ_DA is not set |
397 | # CONFIG_BLK_CPQ_CISS_DA is not set | 352 | # CONFIG_BLK_CPQ_CISS_DA is not set |
398 | # CONFIG_BLK_DEV_DAC960 is not set | 353 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -407,19 +362,9 @@ CONFIG_BLK_DEV_RAM=y | |||
407 | CONFIG_BLK_DEV_RAM_COUNT=16 | 362 | CONFIG_BLK_DEV_RAM_COUNT=16 |
408 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 363 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
409 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 364 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
410 | # CONFIG_BLK_DEV_INITRD is not set | ||
411 | # CONFIG_CDROM_PKTCDVD is not set | 365 | # CONFIG_CDROM_PKTCDVD is not set |
412 | # CONFIG_ATA_OVER_ETH is not set | 366 | # CONFIG_ATA_OVER_ETH is not set |
413 | 367 | # CONFIG_MISC_DEVICES is not set | |
414 | # | ||
415 | # Misc devices | ||
416 | # | ||
417 | CONFIG_SGI_IOC4=m | ||
418 | # CONFIG_TIFM_CORE is not set | ||
419 | |||
420 | # | ||
421 | # ATA/ATAPI/MFM/RLL support | ||
422 | # | ||
423 | # CONFIG_IDE is not set | 368 | # CONFIG_IDE is not set |
424 | 369 | ||
425 | # | 370 | # |
@@ -427,6 +372,7 @@ CONFIG_SGI_IOC4=m | |||
427 | # | 372 | # |
428 | # CONFIG_RAID_ATTRS is not set | 373 | # CONFIG_RAID_ATTRS is not set |
429 | CONFIG_SCSI=y | 374 | CONFIG_SCSI=y |
375 | CONFIG_SCSI_DMA=y | ||
430 | CONFIG_SCSI_TGT=m | 376 | CONFIG_SCSI_TGT=m |
431 | # CONFIG_SCSI_NETLINK is not set | 377 | # CONFIG_SCSI_NETLINK is not set |
432 | CONFIG_SCSI_PROC_FS=y | 378 | CONFIG_SCSI_PROC_FS=y |
@@ -448,6 +394,7 @@ CONFIG_SCSI_MULTI_LUN=y | |||
448 | # CONFIG_SCSI_CONSTANTS is not set | 394 | # CONFIG_SCSI_CONSTANTS is not set |
449 | # CONFIG_SCSI_LOGGING is not set | 395 | # CONFIG_SCSI_LOGGING is not set |
450 | CONFIG_SCSI_SCAN_ASYNC=y | 396 | CONFIG_SCSI_SCAN_ASYNC=y |
397 | CONFIG_SCSI_WAIT_SCAN=m | ||
451 | 398 | ||
452 | # | 399 | # |
453 | # SCSI Transports | 400 | # SCSI Transports |
@@ -458,51 +405,8 @@ CONFIG_SCSI_SCAN_ASYNC=y | |||
458 | CONFIG_SCSI_SAS_ATTRS=m | 405 | CONFIG_SCSI_SAS_ATTRS=m |
459 | CONFIG_SCSI_SAS_LIBSAS=m | 406 | CONFIG_SCSI_SAS_LIBSAS=m |
460 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set | 407 | # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set |
461 | 408 | # CONFIG_SCSI_LOWLEVEL is not set | |
462 | # | ||
463 | # SCSI low-level drivers | ||
464 | # | ||
465 | # CONFIG_ISCSI_TCP is not set | ||
466 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
467 | # CONFIG_SCSI_3W_9XXX is not set | ||
468 | # CONFIG_SCSI_ACARD is not set | ||
469 | # CONFIG_SCSI_AACRAID is not set | ||
470 | # CONFIG_SCSI_AIC7XXX is not set | ||
471 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
472 | # CONFIG_SCSI_AIC79XX is not set | ||
473 | CONFIG_SCSI_AIC94XX=m | ||
474 | # CONFIG_AIC94XX_DEBUG is not set | ||
475 | # CONFIG_SCSI_DPT_I2O is not set | ||
476 | # CONFIG_SCSI_ARCMSR is not set | ||
477 | # CONFIG_MEGARAID_NEWGEN is not set | ||
478 | # CONFIG_MEGARAID_LEGACY is not set | ||
479 | # CONFIG_MEGARAID_SAS is not set | ||
480 | # CONFIG_SCSI_HPTIOP is not set | ||
481 | # CONFIG_SCSI_DMX3191D is not set | ||
482 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
483 | # CONFIG_SCSI_IPS is not set | ||
484 | # CONFIG_SCSI_INITIO is not set | ||
485 | # CONFIG_SCSI_INIA100 is not set | ||
486 | # CONFIG_SCSI_STEX is not set | ||
487 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
488 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
489 | # CONFIG_SCSI_QLA_FC is not set | ||
490 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
491 | # CONFIG_SCSI_LPFC is not set | ||
492 | # CONFIG_SCSI_DC395x is not set | ||
493 | # CONFIG_SCSI_DC390T is not set | ||
494 | # CONFIG_SCSI_NSP32 is not set | ||
495 | # CONFIG_SCSI_DEBUG is not set | ||
496 | # CONFIG_SCSI_SRP is not set | ||
497 | |||
498 | # | ||
499 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
500 | # | ||
501 | # CONFIG_ATA is not set | 409 | # CONFIG_ATA is not set |
502 | |||
503 | # | ||
504 | # Multi-device support (RAID and LVM) | ||
505 | # | ||
506 | # CONFIG_MD is not set | 410 | # CONFIG_MD is not set |
507 | 411 | ||
508 | # | 412 | # |
@@ -516,59 +420,26 @@ CONFIG_SCSI_AIC94XX=m | |||
516 | # | 420 | # |
517 | # IEEE 1394 (FireWire) support | 421 | # IEEE 1394 (FireWire) support |
518 | # | 422 | # |
423 | # CONFIG_FIREWIRE is not set | ||
519 | # CONFIG_IEEE1394 is not set | 424 | # CONFIG_IEEE1394 is not set |
520 | |||
521 | # | ||
522 | # I2O device support | ||
523 | # | ||
524 | # CONFIG_I2O is not set | 425 | # CONFIG_I2O is not set |
525 | |||
526 | # | ||
527 | # Network device support | ||
528 | # | ||
529 | CONFIG_NETDEVICES=y | 426 | CONFIG_NETDEVICES=y |
427 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
530 | # CONFIG_DUMMY is not set | 428 | # CONFIG_DUMMY is not set |
531 | # CONFIG_BONDING is not set | 429 | # CONFIG_BONDING is not set |
430 | # CONFIG_MACVLAN is not set | ||
532 | # CONFIG_EQUALIZER is not set | 431 | # CONFIG_EQUALIZER is not set |
533 | # CONFIG_TUN is not set | 432 | # CONFIG_TUN is not set |
534 | |||
535 | # | ||
536 | # ARCnet devices | ||
537 | # | ||
538 | # CONFIG_ARCNET is not set | 433 | # CONFIG_ARCNET is not set |
539 | 434 | # CONFIG_PHYLIB is not set | |
540 | # | ||
541 | # PHY device support | ||
542 | # | ||
543 | CONFIG_PHYLIB=m | ||
544 | |||
545 | # | ||
546 | # MII PHY device drivers | ||
547 | # | ||
548 | CONFIG_MARVELL_PHY=m | ||
549 | CONFIG_DAVICOM_PHY=m | ||
550 | CONFIG_QSEMI_PHY=m | ||
551 | CONFIG_LXT_PHY=m | ||
552 | CONFIG_CICADA_PHY=m | ||
553 | CONFIG_VITESSE_PHY=m | ||
554 | CONFIG_SMSC_PHY=m | ||
555 | # CONFIG_BROADCOM_PHY is not set | ||
556 | # CONFIG_FIXED_PHY is not set | ||
557 | |||
558 | # | ||
559 | # Ethernet (10 or 100Mbit) | ||
560 | # | ||
561 | CONFIG_NET_ETHERNET=y | 435 | CONFIG_NET_ETHERNET=y |
562 | CONFIG_MII=y | 436 | CONFIG_MII=y |
437 | # CONFIG_AX88796 is not set | ||
563 | # CONFIG_HAPPYMEAL is not set | 438 | # CONFIG_HAPPYMEAL is not set |
564 | # CONFIG_SUNGEM is not set | 439 | # CONFIG_SUNGEM is not set |
565 | # CONFIG_CASSINI is not set | 440 | # CONFIG_CASSINI is not set |
566 | # CONFIG_NET_VENDOR_3COM is not set | 441 | # CONFIG_NET_VENDOR_3COM is not set |
567 | # CONFIG_DM9000 is not set | 442 | # CONFIG_DM9000 is not set |
568 | |||
569 | # | ||
570 | # Tulip family network device support | ||
571 | # | ||
572 | # CONFIG_NET_TULIP is not set | 443 | # CONFIG_NET_TULIP is not set |
573 | # CONFIG_HP100 is not set | 444 | # CONFIG_HP100 is not set |
574 | CONFIG_NET_PCI=y | 445 | CONFIG_NET_PCI=y |
@@ -577,6 +448,7 @@ CONFIG_NET_PCI=y | |||
577 | # CONFIG_ADAPTEC_STARFIRE is not set | 448 | # CONFIG_ADAPTEC_STARFIRE is not set |
578 | # CONFIG_B44 is not set | 449 | # CONFIG_B44 is not set |
579 | # CONFIG_FORCEDETH is not set | 450 | # CONFIG_FORCEDETH is not set |
451 | # CONFIG_TC35815 is not set | ||
580 | # CONFIG_DGRS is not set | 452 | # CONFIG_DGRS is not set |
581 | # CONFIG_EEPRO100 is not set | 453 | # CONFIG_EEPRO100 is not set |
582 | CONFIG_E100=y | 454 | CONFIG_E100=y |
@@ -591,50 +463,25 @@ CONFIG_E100=y | |||
591 | # CONFIG_TLAN is not set | 463 | # CONFIG_TLAN is not set |
592 | # CONFIG_VIA_RHINE is not set | 464 | # CONFIG_VIA_RHINE is not set |
593 | # CONFIG_SC92031 is not set | 465 | # CONFIG_SC92031 is not set |
594 | 466 | # CONFIG_NETDEV_1000 is not set | |
595 | # | 467 | # CONFIG_NETDEV_10000 is not set |
596 | # Ethernet (1000 Mbit) | ||
597 | # | ||
598 | # CONFIG_ACENIC is not set | ||
599 | # CONFIG_DL2K is not set | ||
600 | # CONFIG_E1000 is not set | ||
601 | # CONFIG_NS83820 is not set | ||
602 | # CONFIG_HAMACHI is not set | ||
603 | # CONFIG_YELLOWFIN is not set | ||
604 | # CONFIG_R8169 is not set | ||
605 | # CONFIG_SIS190 is not set | ||
606 | # CONFIG_SKGE is not set | ||
607 | # CONFIG_SKY2 is not set | ||
608 | # CONFIG_SK98LIN is not set | ||
609 | # CONFIG_VIA_VELOCITY is not set | ||
610 | # CONFIG_TIGON3 is not set | ||
611 | # CONFIG_BNX2 is not set | ||
612 | CONFIG_QLA3XXX=m | ||
613 | # CONFIG_ATL1 is not set | ||
614 | |||
615 | # | ||
616 | # Ethernet (10000 Mbit) | ||
617 | # | ||
618 | # CONFIG_CHELSIO_T1 is not set | ||
619 | CONFIG_CHELSIO_T3=m | ||
620 | # CONFIG_IXGB is not set | ||
621 | # CONFIG_S2IO is not set | ||
622 | # CONFIG_MYRI10GE is not set | ||
623 | CONFIG_NETXEN_NIC=m | ||
624 | |||
625 | # | ||
626 | # Token Ring devices | ||
627 | # | ||
628 | # CONFIG_TR is not set | 468 | # CONFIG_TR is not set |
629 | 469 | ||
630 | # | 470 | # |
631 | # Wireless LAN (non-hamradio) | 471 | # Wireless LAN |
632 | # | 472 | # |
633 | # CONFIG_NET_RADIO is not set | 473 | # CONFIG_WLAN_PRE80211 is not set |
474 | # CONFIG_WLAN_80211 is not set | ||
634 | 475 | ||
635 | # | 476 | # |
636 | # Wan interfaces | 477 | # USB Network Adapters |
637 | # | 478 | # |
479 | CONFIG_USB_CATC=m | ||
480 | CONFIG_USB_KAWETH=m | ||
481 | CONFIG_USB_PEGASUS=m | ||
482 | CONFIG_USB_RTL8150=m | ||
483 | # CONFIG_USB_USBNET_MII is not set | ||
484 | # CONFIG_USB_USBNET is not set | ||
638 | # CONFIG_WAN is not set | 485 | # CONFIG_WAN is not set |
639 | # CONFIG_FDDI is not set | 486 | # CONFIG_FDDI is not set |
640 | # CONFIG_HIPPI is not set | 487 | # CONFIG_HIPPI is not set |
@@ -645,15 +492,7 @@ CONFIG_NETXEN_NIC=m | |||
645 | # CONFIG_NETCONSOLE is not set | 492 | # CONFIG_NETCONSOLE is not set |
646 | # CONFIG_NETPOLL is not set | 493 | # CONFIG_NETPOLL is not set |
647 | # CONFIG_NET_POLL_CONTROLLER is not set | 494 | # CONFIG_NET_POLL_CONTROLLER is not set |
648 | |||
649 | # | ||
650 | # ISDN subsystem | ||
651 | # | ||
652 | # CONFIG_ISDN is not set | 495 | # CONFIG_ISDN is not set |
653 | |||
654 | # | ||
655 | # Telephony Support | ||
656 | # | ||
657 | # CONFIG_PHONE is not set | 496 | # CONFIG_PHONE is not set |
658 | 497 | ||
659 | # | 498 | # |
@@ -661,6 +500,7 @@ CONFIG_NETXEN_NIC=m | |||
661 | # | 500 | # |
662 | CONFIG_INPUT=y | 501 | CONFIG_INPUT=y |
663 | # CONFIG_INPUT_FF_MEMLESS is not set | 502 | # CONFIG_INPUT_FF_MEMLESS is not set |
503 | # CONFIG_INPUT_POLLDEV is not set | ||
664 | 504 | ||
665 | # | 505 | # |
666 | # Userland interfaces | 506 | # Userland interfaces |
@@ -677,6 +517,7 @@ CONFIG_INPUT=y | |||
677 | # CONFIG_INPUT_KEYBOARD is not set | 517 | # CONFIG_INPUT_KEYBOARD is not set |
678 | # CONFIG_INPUT_MOUSE is not set | 518 | # CONFIG_INPUT_MOUSE is not set |
679 | # CONFIG_INPUT_JOYSTICK is not set | 519 | # CONFIG_INPUT_JOYSTICK is not set |
520 | # CONFIG_INPUT_TABLET is not set | ||
680 | # CONFIG_INPUT_TOUCHSCREEN is not set | 521 | # CONFIG_INPUT_TOUCHSCREEN is not set |
681 | # CONFIG_INPUT_MISC is not set | 522 | # CONFIG_INPUT_MISC is not set |
682 | 523 | ||
@@ -711,35 +552,18 @@ CONFIG_SERIAL_VR41XX_CONSOLE=y | |||
711 | CONFIG_UNIX98_PTYS=y | 552 | CONFIG_UNIX98_PTYS=y |
712 | CONFIG_LEGACY_PTYS=y | 553 | CONFIG_LEGACY_PTYS=y |
713 | CONFIG_LEGACY_PTY_COUNT=256 | 554 | CONFIG_LEGACY_PTY_COUNT=256 |
714 | |||
715 | # | ||
716 | # IPMI | ||
717 | # | ||
718 | # CONFIG_IPMI_HANDLER is not set | 555 | # CONFIG_IPMI_HANDLER is not set |
719 | |||
720 | # | ||
721 | # Watchdog Cards | ||
722 | # | ||
723 | # CONFIG_WATCHDOG is not set | 556 | # CONFIG_WATCHDOG is not set |
724 | # CONFIG_HW_RANDOM is not set | 557 | # CONFIG_HW_RANDOM is not set |
725 | # CONFIG_RTC is not set | 558 | # CONFIG_RTC is not set |
726 | # CONFIG_GEN_RTC is not set | ||
727 | # CONFIG_DTLK is not set | ||
728 | # CONFIG_R3964 is not set | 559 | # CONFIG_R3964 is not set |
729 | # CONFIG_APPLICOM is not set | 560 | # CONFIG_APPLICOM is not set |
730 | # CONFIG_TANBAC_TB0219 is not set | 561 | # CONFIG_GPIO_TB0219 is not set |
731 | # CONFIG_DRM is not set | 562 | # CONFIG_DRM is not set |
732 | CONFIG_GPIO_VR41XX=y | 563 | CONFIG_GPIO_VR41XX=y |
733 | # CONFIG_RAW_DRIVER is not set | 564 | # CONFIG_RAW_DRIVER is not set |
734 | |||
735 | # | ||
736 | # TPM devices | ||
737 | # | ||
738 | # CONFIG_TCG_TPM is not set | 565 | # CONFIG_TCG_TPM is not set |
739 | 566 | CONFIG_DEVPORT=y | |
740 | # | ||
741 | # I2C support | ||
742 | # | ||
743 | # CONFIG_I2C is not set | 567 | # CONFIG_I2C is not set |
744 | 568 | ||
745 | # | 569 | # |
@@ -747,33 +571,33 @@ CONFIG_GPIO_VR41XX=y | |||
747 | # | 571 | # |
748 | # CONFIG_SPI is not set | 572 | # CONFIG_SPI is not set |
749 | # CONFIG_SPI_MASTER is not set | 573 | # CONFIG_SPI_MASTER is not set |
750 | |||
751 | # | ||
752 | # Dallas's 1-wire bus | ||
753 | # | ||
754 | # CONFIG_W1 is not set | 574 | # CONFIG_W1 is not set |
575 | # CONFIG_POWER_SUPPLY is not set | ||
576 | # CONFIG_HWMON is not set | ||
755 | 577 | ||
756 | # | 578 | # |
757 | # Hardware Monitoring support | 579 | # Multifunction device drivers |
758 | # | 580 | # |
759 | # CONFIG_HWMON is not set | 581 | # CONFIG_MFD_SM501 is not set |
760 | # CONFIG_HWMON_VID is not set | ||
761 | 582 | ||
762 | # | 583 | # |
763 | # Multimedia devices | 584 | # Multimedia devices |
764 | # | 585 | # |
765 | # CONFIG_VIDEO_DEV is not set | 586 | # CONFIG_VIDEO_DEV is not set |
587 | # CONFIG_DVB_CORE is not set | ||
588 | # CONFIG_DAB is not set | ||
766 | 589 | ||
767 | # | 590 | # |
768 | # Digital Video Broadcasting Devices | 591 | # Graphics support |
769 | # | 592 | # |
770 | # CONFIG_DVB is not set | 593 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
771 | # CONFIG_USB_DABUSB is not set | ||
772 | 594 | ||
773 | # | 595 | # |
774 | # Graphics support | 596 | # Display device support |
775 | # | 597 | # |
776 | # CONFIG_FIRMWARE_EDID is not set | 598 | # CONFIG_DISPLAY_SUPPORT is not set |
599 | # CONFIG_VGASTATE is not set | ||
600 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
777 | # CONFIG_FB is not set | 601 | # CONFIG_FB is not set |
778 | 602 | ||
779 | # | 603 | # |
@@ -781,22 +605,13 @@ CONFIG_GPIO_VR41XX=y | |||
781 | # | 605 | # |
782 | # CONFIG_VGA_CONSOLE is not set | 606 | # CONFIG_VGA_CONSOLE is not set |
783 | CONFIG_DUMMY_CONSOLE=y | 607 | CONFIG_DUMMY_CONSOLE=y |
784 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
785 | 608 | ||
786 | # | 609 | # |
787 | # Sound | 610 | # Sound |
788 | # | 611 | # |
789 | # CONFIG_SOUND is not set | 612 | # CONFIG_SOUND is not set |
790 | 613 | # CONFIG_HID_SUPPORT is not set | |
791 | # | 614 | CONFIG_USB_SUPPORT=y |
792 | # HID Devices | ||
793 | # | ||
794 | CONFIG_HID=y | ||
795 | # CONFIG_HID_DEBUG is not set | ||
796 | |||
797 | # | ||
798 | # USB support | ||
799 | # | ||
800 | CONFIG_USB_ARCH_HAS_HCD=y | 615 | CONFIG_USB_ARCH_HAS_HCD=y |
801 | CONFIG_USB_ARCH_HAS_OHCI=y | 616 | CONFIG_USB_ARCH_HAS_OHCI=y |
802 | CONFIG_USB_ARCH_HAS_EHCI=y | 617 | CONFIG_USB_ARCH_HAS_EHCI=y |
@@ -807,8 +622,8 @@ CONFIG_USB=y | |||
807 | # Miscellaneous USB options | 622 | # Miscellaneous USB options |
808 | # | 623 | # |
809 | CONFIG_USB_DEVICEFS=y | 624 | CONFIG_USB_DEVICEFS=y |
625 | CONFIG_USB_DEVICE_CLASS=y | ||
810 | # CONFIG_USB_DYNAMIC_MINORS is not set | 626 | # CONFIG_USB_DYNAMIC_MINORS is not set |
811 | # CONFIG_USB_SUSPEND is not set | ||
812 | # CONFIG_USB_OTG is not set | 627 | # CONFIG_USB_OTG is not set |
813 | 628 | ||
814 | # | 629 | # |
@@ -818,7 +633,6 @@ CONFIG_USB_EHCI_HCD=y | |||
818 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | 633 | # CONFIG_USB_EHCI_SPLIT_ISO is not set |
819 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 634 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
820 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 635 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
821 | # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set | ||
822 | # CONFIG_USB_ISP116X_HCD is not set | 636 | # CONFIG_USB_ISP116X_HCD is not set |
823 | CONFIG_USB_OHCI_HCD=y | 637 | CONFIG_USB_OHCI_HCD=y |
824 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 638 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
@@ -826,11 +640,12 @@ CONFIG_USB_OHCI_HCD=y | |||
826 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 640 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
827 | # CONFIG_USB_UHCI_HCD is not set | 641 | # CONFIG_USB_UHCI_HCD is not set |
828 | # CONFIG_USB_SL811_HCD is not set | 642 | # CONFIG_USB_SL811_HCD is not set |
643 | # CONFIG_USB_R8A66597_HCD is not set | ||
829 | 644 | ||
830 | # | 645 | # |
831 | # USB Device Class drivers | 646 | # USB Device Class drivers |
832 | # | 647 | # |
833 | # CONFIG_USB_ACM is not set | 648 | CONFIG_USB_ACM=y |
834 | # CONFIG_USB_PRINTER is not set | 649 | # CONFIG_USB_PRINTER is not set |
835 | 650 | ||
836 | # | 651 | # |
@@ -854,44 +669,10 @@ CONFIG_USB_STORAGE=y | |||
854 | # CONFIG_USB_LIBUSUAL is not set | 669 | # CONFIG_USB_LIBUSUAL is not set |
855 | 670 | ||
856 | # | 671 | # |
857 | # USB Input Devices | ||
858 | # | ||
859 | # CONFIG_USB_HID is not set | ||
860 | |||
861 | # | ||
862 | # USB HID Boot Protocol drivers | ||
863 | # | ||
864 | # CONFIG_USB_KBD is not set | ||
865 | # CONFIG_USB_MOUSE is not set | ||
866 | # CONFIG_USB_AIPTEK is not set | ||
867 | # CONFIG_USB_WACOM is not set | ||
868 | # CONFIG_USB_ACECAD is not set | ||
869 | # CONFIG_USB_KBTAB is not set | ||
870 | # CONFIG_USB_POWERMATE is not set | ||
871 | # CONFIG_USB_TOUCHSCREEN is not set | ||
872 | # CONFIG_USB_YEALINK is not set | ||
873 | # CONFIG_USB_XPAD is not set | ||
874 | # CONFIG_USB_ATI_REMOTE is not set | ||
875 | # CONFIG_USB_ATI_REMOTE2 is not set | ||
876 | # CONFIG_USB_KEYSPAN_REMOTE is not set | ||
877 | # CONFIG_USB_APPLETOUCH is not set | ||
878 | # CONFIG_USB_GTCO is not set | ||
879 | |||
880 | # | ||
881 | # USB Imaging devices | 672 | # USB Imaging devices |
882 | # | 673 | # |
883 | # CONFIG_USB_MDC800 is not set | 674 | # CONFIG_USB_MDC800 is not set |
884 | # CONFIG_USB_MICROTEK is not set | 675 | # CONFIG_USB_MICROTEK is not set |
885 | |||
886 | # | ||
887 | # USB Network Adapters | ||
888 | # | ||
889 | # CONFIG_USB_CATC is not set | ||
890 | # CONFIG_USB_KAWETH is not set | ||
891 | # CONFIG_USB_PEGASUS is not set | ||
892 | # CONFIG_USB_RTL8150 is not set | ||
893 | # CONFIG_USB_USBNET_MII is not set | ||
894 | # CONFIG_USB_USBNET is not set | ||
895 | # CONFIG_USB_MON is not set | 676 | # CONFIG_USB_MON is not set |
896 | 677 | ||
897 | # | 678 | # |
@@ -924,6 +705,7 @@ CONFIG_USB_STORAGE=y | |||
924 | # CONFIG_USB_SISUSBVGA is not set | 705 | # CONFIG_USB_SISUSBVGA is not set |
925 | # CONFIG_USB_LD is not set | 706 | # CONFIG_USB_LD is not set |
926 | # CONFIG_USB_TRANCEVIBRATOR is not set | 707 | # CONFIG_USB_TRANCEVIBRATOR is not set |
708 | # CONFIG_USB_IOWARRIOR is not set | ||
927 | # CONFIG_USB_TEST is not set | 709 | # CONFIG_USB_TEST is not set |
928 | 710 | ||
929 | # | 711 | # |
@@ -934,37 +716,9 @@ CONFIG_USB_STORAGE=y | |||
934 | # USB Gadget Support | 716 | # USB Gadget Support |
935 | # | 717 | # |
936 | # CONFIG_USB_GADGET is not set | 718 | # CONFIG_USB_GADGET is not set |
937 | |||
938 | # | ||
939 | # MMC/SD Card support | ||
940 | # | ||
941 | # CONFIG_MMC is not set | 719 | # CONFIG_MMC is not set |
942 | |||
943 | # | ||
944 | # LED devices | ||
945 | # | ||
946 | # CONFIG_NEW_LEDS is not set | 720 | # CONFIG_NEW_LEDS is not set |
947 | |||
948 | # | ||
949 | # LED drivers | ||
950 | # | ||
951 | |||
952 | # | ||
953 | # LED Triggers | ||
954 | # | ||
955 | |||
956 | # | ||
957 | # InfiniBand support | ||
958 | # | ||
959 | # CONFIG_INFINIBAND is not set | 721 | # CONFIG_INFINIBAND is not set |
960 | |||
961 | # | ||
962 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
963 | # | ||
964 | |||
965 | # | ||
966 | # Real Time Clock | ||
967 | # | ||
968 | CONFIG_RTC_LIB=y | 722 | CONFIG_RTC_LIB=y |
969 | CONFIG_RTC_CLASS=y | 723 | CONFIG_RTC_CLASS=y |
970 | CONFIG_RTC_HCTOSYS=y | 724 | CONFIG_RTC_HCTOSYS=y |
@@ -978,18 +732,29 @@ CONFIG_RTC_INTF_SYSFS=y | |||
978 | CONFIG_RTC_INTF_PROC=y | 732 | CONFIG_RTC_INTF_PROC=y |
979 | CONFIG_RTC_INTF_DEV=y | 733 | CONFIG_RTC_INTF_DEV=y |
980 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | 734 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set |
735 | # CONFIG_RTC_DRV_TEST is not set | ||
736 | |||
737 | # | ||
738 | # SPI RTC drivers | ||
739 | # | ||
981 | 740 | ||
982 | # | 741 | # |
983 | # RTC drivers | 742 | # Platform RTC drivers |
984 | # | 743 | # |
744 | # CONFIG_RTC_DRV_CMOS is not set | ||
985 | # CONFIG_RTC_DRV_DS1553 is not set | 745 | # CONFIG_RTC_DRV_DS1553 is not set |
746 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
986 | # CONFIG_RTC_DRV_DS1742 is not set | 747 | # CONFIG_RTC_DRV_DS1742 is not set |
987 | # CONFIG_RTC_DRV_M48T86 is not set | 748 | # CONFIG_RTC_DRV_M48T86 is not set |
988 | CONFIG_RTC_DRV_VR41XX=y | 749 | # CONFIG_RTC_DRV_M48T59 is not set |
989 | # CONFIG_RTC_DRV_TEST is not set | ||
990 | # CONFIG_RTC_DRV_V3020 is not set | 750 | # CONFIG_RTC_DRV_V3020 is not set |
991 | 751 | ||
992 | # | 752 | # |
753 | # on-CPU RTC drivers | ||
754 | # | ||
755 | CONFIG_RTC_DRV_VR41XX=y | ||
756 | |||
757 | # | ||
993 | # DMA Engine support | 758 | # DMA Engine support |
994 | # | 759 | # |
995 | # CONFIG_DMA_ENGINE is not set | 760 | # CONFIG_DMA_ENGINE is not set |
@@ -1003,12 +768,9 @@ CONFIG_RTC_DRV_VR41XX=y | |||
1003 | # | 768 | # |
1004 | 769 | ||
1005 | # | 770 | # |
1006 | # Auxiliary Display support | 771 | # Userspace I/O |
1007 | # | ||
1008 | |||
1009 | # | ||
1010 | # Virtualization | ||
1011 | # | 772 | # |
773 | # CONFIG_UIO is not set | ||
1012 | 774 | ||
1013 | # | 775 | # |
1014 | # File systems | 776 | # File systems |
@@ -1032,7 +794,7 @@ CONFIG_INOTIFY_USER=y | |||
1032 | CONFIG_DNOTIFY=y | 794 | CONFIG_DNOTIFY=y |
1033 | # CONFIG_AUTOFS_FS is not set | 795 | # CONFIG_AUTOFS_FS is not set |
1034 | CONFIG_AUTOFS4_FS=y | 796 | CONFIG_AUTOFS4_FS=y |
1035 | CONFIG_FUSE_FS=m | 797 | # CONFIG_FUSE_FS is not set |
1036 | CONFIG_GENERIC_ACL=y | 798 | CONFIG_GENERIC_ACL=y |
1037 | 799 | ||
1038 | # | 800 | # |
@@ -1059,7 +821,7 @@ CONFIG_TMPFS=y | |||
1059 | CONFIG_TMPFS_POSIX_ACL=y | 821 | CONFIG_TMPFS_POSIX_ACL=y |
1060 | # CONFIG_HUGETLB_PAGE is not set | 822 | # CONFIG_HUGETLB_PAGE is not set |
1061 | CONFIG_RAMFS=y | 823 | CONFIG_RAMFS=y |
1062 | CONFIG_CONFIGFS_FS=m | 824 | # CONFIG_CONFIGFS_FS is not set |
1063 | 825 | ||
1064 | # | 826 | # |
1065 | # Miscellaneous filesystems | 827 | # Miscellaneous filesystems |
@@ -1097,6 +859,7 @@ CONFIG_LOCKD_V4=y | |||
1097 | CONFIG_EXPORTFS=m | 859 | CONFIG_EXPORTFS=m |
1098 | CONFIG_NFS_COMMON=y | 860 | CONFIG_NFS_COMMON=y |
1099 | CONFIG_SUNRPC=y | 861 | CONFIG_SUNRPC=y |
862 | # CONFIG_SUNRPC_BIND34 is not set | ||
1100 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 863 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1101 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 864 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1102 | # CONFIG_SMB_FS is not set | 865 | # CONFIG_SMB_FS is not set |
@@ -1104,7 +867,6 @@ CONFIG_SUNRPC=y | |||
1104 | # CONFIG_NCP_FS is not set | 867 | # CONFIG_NCP_FS is not set |
1105 | # CONFIG_CODA_FS is not set | 868 | # CONFIG_CODA_FS is not set |
1106 | # CONFIG_AFS_FS is not set | 869 | # CONFIG_AFS_FS is not set |
1107 | # CONFIG_9P_FS is not set | ||
1108 | 870 | ||
1109 | # | 871 | # |
1110 | # Partition Types | 872 | # Partition Types |
@@ -1120,10 +882,7 @@ CONFIG_MSDOS_PARTITION=y | |||
1120 | # | 882 | # |
1121 | # Distributed Lock Manager | 883 | # Distributed Lock Manager |
1122 | # | 884 | # |
1123 | CONFIG_DLM=m | 885 | # CONFIG_DLM is not set |
1124 | CONFIG_DLM_TCP=y | ||
1125 | # CONFIG_DLM_SCTP is not set | ||
1126 | # CONFIG_DLM_DEBUG is not set | ||
1127 | 886 | ||
1128 | # | 887 | # |
1129 | # Profiling support | 888 | # Profiling support |
@@ -1141,7 +900,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1141 | # CONFIG_DEBUG_FS is not set | 900 | # CONFIG_DEBUG_FS is not set |
1142 | # CONFIG_HEADERS_CHECK is not set | 901 | # CONFIG_HEADERS_CHECK is not set |
1143 | # CONFIG_DEBUG_KERNEL is not set | 902 | # CONFIG_DEBUG_KERNEL is not set |
1144 | CONFIG_LOG_BUF_SHIFT=14 | ||
1145 | CONFIG_CROSSCOMPILE=y | 903 | CONFIG_CROSSCOMPILE=y |
1146 | CONFIG_CMDLINE="mem=32M console=ttyVR0,115200" | 904 | CONFIG_CMDLINE="mem=32M console=ttyVR0,115200" |
1147 | 905 | ||
@@ -1150,62 +908,20 @@ CONFIG_CMDLINE="mem=32M console=ttyVR0,115200" | |||
1150 | # | 908 | # |
1151 | # CONFIG_KEYS is not set | 909 | # CONFIG_KEYS is not set |
1152 | # CONFIG_SECURITY is not set | 910 | # CONFIG_SECURITY is not set |
1153 | 911 | # CONFIG_CRYPTO is not set | |
1154 | # | ||
1155 | # Cryptographic options | ||
1156 | # | ||
1157 | CONFIG_CRYPTO=y | ||
1158 | CONFIG_CRYPTO_ALGAPI=y | ||
1159 | CONFIG_CRYPTO_BLKCIPHER=m | ||
1160 | CONFIG_CRYPTO_HASH=m | ||
1161 | CONFIG_CRYPTO_MANAGER=m | ||
1162 | CONFIG_CRYPTO_HMAC=m | ||
1163 | CONFIG_CRYPTO_XCBC=m | ||
1164 | CONFIG_CRYPTO_NULL=m | ||
1165 | CONFIG_CRYPTO_MD4=m | ||
1166 | CONFIG_CRYPTO_MD5=y | ||
1167 | CONFIG_CRYPTO_SHA1=m | ||
1168 | CONFIG_CRYPTO_SHA256=m | ||
1169 | CONFIG_CRYPTO_SHA512=m | ||
1170 | CONFIG_CRYPTO_WP512=m | ||
1171 | CONFIG_CRYPTO_TGR192=m | ||
1172 | CONFIG_CRYPTO_GF128MUL=m | ||
1173 | CONFIG_CRYPTO_ECB=m | ||
1174 | CONFIG_CRYPTO_CBC=m | ||
1175 | CONFIG_CRYPTO_PCBC=m | ||
1176 | CONFIG_CRYPTO_LRW=m | ||
1177 | CONFIG_CRYPTO_DES=m | ||
1178 | CONFIG_CRYPTO_FCRYPT=m | ||
1179 | CONFIG_CRYPTO_BLOWFISH=m | ||
1180 | CONFIG_CRYPTO_TWOFISH=m | ||
1181 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1182 | CONFIG_CRYPTO_SERPENT=m | ||
1183 | CONFIG_CRYPTO_AES=m | ||
1184 | CONFIG_CRYPTO_CAST5=m | ||
1185 | CONFIG_CRYPTO_CAST6=m | ||
1186 | CONFIG_CRYPTO_TEA=m | ||
1187 | CONFIG_CRYPTO_ARC4=m | ||
1188 | CONFIG_CRYPTO_KHAZAD=m | ||
1189 | CONFIG_CRYPTO_ANUBIS=m | ||
1190 | CONFIG_CRYPTO_DEFLATE=m | ||
1191 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1192 | CONFIG_CRYPTO_CRC32C=m | ||
1193 | CONFIG_CRYPTO_CAMELLIA=m | ||
1194 | # CONFIG_CRYPTO_TEST is not set | ||
1195 | |||
1196 | # | ||
1197 | # Hardware crypto devices | ||
1198 | # | ||
1199 | 912 | ||
1200 | # | 913 | # |
1201 | # Library routines | 914 | # Library routines |
1202 | # | 915 | # |
916 | CONFIG_BITREVERSE=m | ||
1203 | # CONFIG_CRC_CCITT is not set | 917 | # CONFIG_CRC_CCITT is not set |
1204 | # CONFIG_CRC16 is not set | 918 | # CONFIG_CRC16 is not set |
1205 | # CONFIG_CRC32 is not set | 919 | # CONFIG_CRC_ITU_T is not set |
1206 | CONFIG_LIBCRC32C=m | 920 | CONFIG_CRC32=m |
921 | # CONFIG_CRC7 is not set | ||
922 | # CONFIG_LIBCRC32C is not set | ||
1207 | CONFIG_ZLIB_INFLATE=m | 923 | CONFIG_ZLIB_INFLATE=m |
1208 | CONFIG_ZLIB_DEFLATE=m | ||
1209 | CONFIG_PLIST=y | 924 | CONFIG_PLIST=y |
1210 | CONFIG_HAS_IOMEM=y | 925 | CONFIG_HAS_IOMEM=y |
1211 | CONFIG_HAS_IOPORT=y | 926 | CONFIG_HAS_IOPORT=y |
927 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig index 66383ecff200..499b6bd7ee68 100644 --- a/arch/mips/configs/tb0287_defconfig +++ b/arch/mips/configs/tb0287_defconfig | |||
@@ -1,68 +1,56 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.21-rc1 | 3 | # Linux kernel version: 2.6.23-rc2 |
4 | # Thu Feb 22 10:38:09 2007 | 4 | # Thu Aug 9 14:03:54 2007 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
8 | # | 8 | # |
9 | # Machine selection | 9 | # Machine selection |
10 | # | 10 | # |
11 | CONFIG_ZONE_DMA=y | 11 | # CONFIG_MACH_ALCHEMY is not set |
12 | # CONFIG_MIPS_MTX1 is not set | ||
13 | # CONFIG_MIPS_BOSPORUS is not set | ||
14 | # CONFIG_MIPS_PB1000 is not set | ||
15 | # CONFIG_MIPS_PB1100 is not set | ||
16 | # CONFIG_MIPS_PB1500 is not set | ||
17 | # CONFIG_MIPS_PB1550 is not set | ||
18 | # CONFIG_MIPS_PB1200 is not set | ||
19 | # CONFIG_MIPS_DB1000 is not set | ||
20 | # CONFIG_MIPS_DB1100 is not set | ||
21 | # CONFIG_MIPS_DB1500 is not set | ||
22 | # CONFIG_MIPS_DB1550 is not set | ||
23 | # CONFIG_MIPS_DB1200 is not set | ||
24 | # CONFIG_MIPS_MIRAGE is not set | ||
25 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
26 | # CONFIG_MIPS_COBALT is not set | 13 | # CONFIG_MIPS_COBALT is not set |
27 | # CONFIG_MACH_DECSTATION is not set | 14 | # CONFIG_MACH_DECSTATION is not set |
28 | # CONFIG_MACH_JAZZ is not set | 15 | # CONFIG_MACH_JAZZ is not set |
16 | # CONFIG_LEMOTE_FULONG is not set | ||
29 | # CONFIG_MIPS_ATLAS is not set | 17 | # CONFIG_MIPS_ATLAS is not set |
30 | # CONFIG_MIPS_MALTA is not set | 18 | # CONFIG_MIPS_MALTA is not set |
31 | # CONFIG_MIPS_SEAD is not set | 19 | # CONFIG_MIPS_SEAD is not set |
32 | # CONFIG_WR_PPMC is not set | ||
33 | # CONFIG_MIPS_SIM is not set | 20 | # CONFIG_MIPS_SIM is not set |
34 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 21 | # CONFIG_MARKEINS is not set |
35 | # CONFIG_MIPS_XXS1500 is not set | 22 | CONFIG_MACH_VR41XX=y |
36 | # CONFIG_PNX8550_JBS is not set | 23 | # CONFIG_PNX8550_JBS is not set |
37 | # CONFIG_PNX8550_STB810 is not set | 24 | # CONFIG_PNX8550_STB810 is not set |
38 | CONFIG_MACH_VR41XX=y | 25 | # CONFIG_PMC_MSP is not set |
39 | # CONFIG_PMC_YOSEMITE is not set | 26 | # CONFIG_PMC_YOSEMITE is not set |
40 | # CONFIG_QEMU is not set | 27 | # CONFIG_QEMU is not set |
41 | # CONFIG_MARKEINS is not set | ||
42 | # CONFIG_SGI_IP22 is not set | 28 | # CONFIG_SGI_IP22 is not set |
43 | # CONFIG_SGI_IP27 is not set | 29 | # CONFIG_SGI_IP27 is not set |
44 | # CONFIG_SGI_IP32 is not set | 30 | # CONFIG_SGI_IP32 is not set |
45 | # CONFIG_SIBYTE_BIGSUR is not set | 31 | # CONFIG_SIBYTE_CRHINE is not set |
32 | # CONFIG_SIBYTE_CARMEL is not set | ||
33 | # CONFIG_SIBYTE_CRHONE is not set | ||
34 | # CONFIG_SIBYTE_RHONE is not set | ||
46 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | ||
49 | # CONFIG_SIBYTE_CARMEL is not set | ||
50 | # CONFIG_SIBYTE_PTSWARM is not set | 38 | # CONFIG_SIBYTE_PTSWARM is not set |
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 39 | # CONFIG_SIBYTE_BIGSUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | ||
53 | # CONFIG_SIBYTE_CRHONE is not set | ||
54 | # CONFIG_SNI_RM is not set | 40 | # CONFIG_SNI_RM is not set |
55 | # CONFIG_TOSHIBA_JMR3927 is not set | 41 | # CONFIG_TOSHIBA_JMR3927 is not set |
56 | # CONFIG_TOSHIBA_RBTX4927 is not set | 42 | # CONFIG_TOSHIBA_RBTX4927 is not set |
57 | # CONFIG_TOSHIBA_RBTX4938 is not set | 43 | # CONFIG_TOSHIBA_RBTX4938 is not set |
44 | # CONFIG_WR_PPMC is not set | ||
58 | # CONFIG_CASIO_E55 is not set | 45 | # CONFIG_CASIO_E55 is not set |
59 | # CONFIG_IBM_WORKPAD is not set | 46 | # CONFIG_IBM_WORKPAD is not set |
60 | # CONFIG_NEC_CMBVR4133 is not set | 47 | # CONFIG_NEC_CMBVR4133 is not set |
61 | CONFIG_TANBAC_TB022X=y | 48 | CONFIG_TANBAC_TB022X=y |
62 | # CONFIG_TANBAC_TB0226 is not set | ||
63 | CONFIG_TANBAC_TB0287=y | ||
64 | # CONFIG_VICTOR_MPC30X is not set | 49 | # CONFIG_VICTOR_MPC30X is not set |
65 | # CONFIG_ZAO_CAPCELLA is not set | 50 | # CONFIG_ZAO_CAPCELLA is not set |
51 | # CONFIG_TANBAC_TB0219 is not set | ||
52 | # CONFIG_TANBAC_TB0226 is not set | ||
53 | CONFIG_TANBAC_TB0287=y | ||
66 | CONFIG_PCI_VR41XX=y | 54 | CONFIG_PCI_VR41XX=y |
67 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 55 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
68 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 56 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
@@ -75,6 +63,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
75 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 63 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
76 | CONFIG_DMA_NONCOHERENT=y | 64 | CONFIG_DMA_NONCOHERENT=y |
77 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 65 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
66 | # CONFIG_HOTPLUG_CPU is not set | ||
67 | # CONFIG_NO_IOPORT is not set | ||
78 | # CONFIG_CPU_BIG_ENDIAN is not set | 68 | # CONFIG_CPU_BIG_ENDIAN is not set |
79 | CONFIG_CPU_LITTLE_ENDIAN=y | 69 | CONFIG_CPU_LITTLE_ENDIAN=y |
80 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 70 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
@@ -84,6 +74,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
84 | # | 74 | # |
85 | # CPU selection | 75 | # CPU selection |
86 | # | 76 | # |
77 | # CONFIG_CPU_LOONGSON2 is not set | ||
87 | # CONFIG_CPU_MIPS32_R1 is not set | 78 | # CONFIG_CPU_MIPS32_R1 is not set |
88 | # CONFIG_CPU_MIPS32_R2 is not set | 79 | # CONFIG_CPU_MIPS32_R2 is not set |
89 | # CONFIG_CPU_MIPS64_R1 is not set | 80 | # CONFIG_CPU_MIPS64_R1 is not set |
@@ -105,7 +96,6 @@ CONFIG_CPU_VR41XX=y | |||
105 | # CONFIG_CPU_SB1 is not set | 96 | # CONFIG_CPU_SB1 is not set |
106 | CONFIG_SYS_HAS_CPU_VR41XX=y | 97 | CONFIG_SYS_HAS_CPU_VR41XX=y |
107 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y | 98 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y |
108 | CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y | ||
109 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y | 99 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y |
110 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y | 100 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y |
111 | 101 | ||
@@ -121,7 +111,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
121 | CONFIG_MIPS_MT_DISABLED=y | 111 | CONFIG_MIPS_MT_DISABLED=y |
122 | # CONFIG_MIPS_MT_SMP is not set | 112 | # CONFIG_MIPS_MT_SMP is not set |
123 | # CONFIG_MIPS_MT_SMTC is not set | 113 | # CONFIG_MIPS_MT_SMTC is not set |
124 | # CONFIG_MIPS_VPE_LOADER is not set | ||
125 | CONFIG_CPU_HAS_SYNC=y | 114 | CONFIG_CPU_HAS_SYNC=y |
126 | CONFIG_GENERIC_HARDIRQS=y | 115 | CONFIG_GENERIC_HARDIRQS=y |
127 | CONFIG_GENERIC_IRQ_PROBE=y | 116 | CONFIG_GENERIC_IRQ_PROBE=y |
@@ -135,86 +124,83 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
135 | # CONFIG_SPARSEMEM_STATIC is not set | 124 | # CONFIG_SPARSEMEM_STATIC is not set |
136 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 125 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
137 | # CONFIG_RESOURCES_64BIT is not set | 126 | # CONFIG_RESOURCES_64BIT is not set |
138 | CONFIG_ZONE_DMA_FLAG=1 | 127 | CONFIG_ZONE_DMA_FLAG=0 |
128 | CONFIG_VIRT_TO_BUS=y | ||
139 | # CONFIG_HZ_48 is not set | 129 | # CONFIG_HZ_48 is not set |
140 | # CONFIG_HZ_100 is not set | 130 | # CONFIG_HZ_100 is not set |
141 | # CONFIG_HZ_128 is not set | 131 | # CONFIG_HZ_128 is not set |
142 | # CONFIG_HZ_250 is not set | 132 | CONFIG_HZ_250=y |
143 | # CONFIG_HZ_256 is not set | 133 | # CONFIG_HZ_256 is not set |
144 | CONFIG_HZ_1000=y | 134 | # CONFIG_HZ_1000 is not set |
145 | # CONFIG_HZ_1024 is not set | 135 | # CONFIG_HZ_1024 is not set |
146 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y | 136 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y |
147 | CONFIG_HZ=1000 | 137 | CONFIG_HZ=250 |
148 | CONFIG_PREEMPT_NONE=y | 138 | CONFIG_PREEMPT_NONE=y |
149 | # CONFIG_PREEMPT_VOLUNTARY is not set | 139 | # CONFIG_PREEMPT_VOLUNTARY is not set |
150 | # CONFIG_PREEMPT is not set | 140 | # CONFIG_PREEMPT is not set |
151 | # CONFIG_KEXEC is not set | 141 | # CONFIG_KEXEC is not set |
142 | CONFIG_SECCOMP=y | ||
152 | CONFIG_LOCKDEP_SUPPORT=y | 143 | CONFIG_LOCKDEP_SUPPORT=y |
153 | CONFIG_STACKTRACE_SUPPORT=y | 144 | CONFIG_STACKTRACE_SUPPORT=y |
154 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 145 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
155 | 146 | ||
156 | # | 147 | # |
157 | # Code maturity level options | 148 | # General setup |
158 | # | 149 | # |
159 | CONFIG_EXPERIMENTAL=y | 150 | CONFIG_EXPERIMENTAL=y |
160 | CONFIG_BROKEN_ON_SMP=y | 151 | CONFIG_BROKEN_ON_SMP=y |
161 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 152 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
162 | |||
163 | # | ||
164 | # General setup | ||
165 | # | ||
166 | CONFIG_LOCALVERSION="" | 153 | CONFIG_LOCALVERSION="" |
167 | CONFIG_LOCALVERSION_AUTO=y | 154 | CONFIG_LOCALVERSION_AUTO=y |
168 | CONFIG_SWAP=y | 155 | CONFIG_SWAP=y |
169 | CONFIG_SYSVIPC=y | 156 | CONFIG_SYSVIPC=y |
170 | # CONFIG_IPC_NS is not set | ||
171 | CONFIG_SYSVIPC_SYSCTL=y | 157 | CONFIG_SYSVIPC_SYSCTL=y |
172 | # CONFIG_POSIX_MQUEUE is not set | 158 | # CONFIG_POSIX_MQUEUE is not set |
173 | # CONFIG_BSD_PROCESS_ACCT is not set | 159 | # CONFIG_BSD_PROCESS_ACCT is not set |
174 | # CONFIG_TASKSTATS is not set | 160 | # CONFIG_TASKSTATS is not set |
175 | # CONFIG_UTS_NS is not set | 161 | # CONFIG_USER_NS is not set |
176 | # CONFIG_AUDIT is not set | 162 | # CONFIG_AUDIT is not set |
177 | # CONFIG_IKCONFIG is not set | 163 | # CONFIG_IKCONFIG is not set |
164 | CONFIG_LOG_BUF_SHIFT=14 | ||
178 | CONFIG_SYSFS_DEPRECATED=y | 165 | CONFIG_SYSFS_DEPRECATED=y |
179 | # CONFIG_RELAY is not set | 166 | # CONFIG_RELAY is not set |
167 | # CONFIG_BLK_DEV_INITRD is not set | ||
180 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 168 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
181 | CONFIG_SYSCTL=y | 169 | CONFIG_SYSCTL=y |
182 | CONFIG_EMBEDDED=y | 170 | CONFIG_EMBEDDED=y |
183 | # CONFIG_SYSCTL_SYSCALL is not set | 171 | # CONFIG_SYSCTL_SYSCALL is not set |
184 | CONFIG_KALLSYMS=y | 172 | CONFIG_KALLSYMS=y |
185 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 173 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
186 | # CONFIG_HOTPLUG is not set | 174 | CONFIG_HOTPLUG=y |
187 | CONFIG_PRINTK=y | 175 | CONFIG_PRINTK=y |
188 | CONFIG_BUG=y | 176 | CONFIG_BUG=y |
189 | CONFIG_ELF_CORE=y | 177 | CONFIG_ELF_CORE=y |
190 | CONFIG_BASE_FULL=y | 178 | CONFIG_BASE_FULL=y |
191 | CONFIG_FUTEX=y | 179 | CONFIG_FUTEX=y |
180 | CONFIG_ANON_INODES=y | ||
192 | CONFIG_EPOLL=y | 181 | CONFIG_EPOLL=y |
182 | CONFIG_SIGNALFD=y | ||
183 | CONFIG_TIMERFD=y | ||
184 | CONFIG_EVENTFD=y | ||
193 | CONFIG_SHMEM=y | 185 | CONFIG_SHMEM=y |
194 | CONFIG_SLAB=y | ||
195 | CONFIG_VM_EVENT_COUNTERS=y | 186 | CONFIG_VM_EVENT_COUNTERS=y |
187 | CONFIG_SLAB=y | ||
188 | # CONFIG_SLUB is not set | ||
189 | # CONFIG_SLOB is not set | ||
196 | CONFIG_RT_MUTEXES=y | 190 | CONFIG_RT_MUTEXES=y |
197 | # CONFIG_TINY_SHMEM is not set | 191 | # CONFIG_TINY_SHMEM is not set |
198 | CONFIG_BASE_SMALL=0 | 192 | CONFIG_BASE_SMALL=0 |
199 | # CONFIG_SLOB is not set | ||
200 | |||
201 | # | ||
202 | # Loadable module support | ||
203 | # | ||
204 | CONFIG_MODULES=y | 193 | CONFIG_MODULES=y |
205 | CONFIG_MODULE_UNLOAD=y | 194 | CONFIG_MODULE_UNLOAD=y |
206 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 195 | CONFIG_MODULE_FORCE_UNLOAD=y |
207 | CONFIG_MODVERSIONS=y | 196 | CONFIG_MODVERSIONS=y |
208 | CONFIG_MODULE_SRCVERSION_ALL=y | 197 | CONFIG_MODULE_SRCVERSION_ALL=y |
209 | CONFIG_KMOD=y | 198 | CONFIG_KMOD=y |
210 | |||
211 | # | ||
212 | # Block layer | ||
213 | # | ||
214 | CONFIG_BLOCK=y | 199 | CONFIG_BLOCK=y |
215 | # CONFIG_LBD is not set | 200 | # CONFIG_LBD is not set |
216 | # CONFIG_BLK_DEV_IO_TRACE is not set | 201 | # CONFIG_BLK_DEV_IO_TRACE is not set |
217 | # CONFIG_LSF is not set | 202 | # CONFIG_LSF is not set |
203 | # CONFIG_BLK_DEV_BSG is not set | ||
218 | 204 | ||
219 | # | 205 | # |
220 | # IO Schedulers | 206 | # IO Schedulers |
@@ -234,15 +220,14 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
234 | # | 220 | # |
235 | CONFIG_HW_HAS_PCI=y | 221 | CONFIG_HW_HAS_PCI=y |
236 | CONFIG_PCI=y | 222 | CONFIG_PCI=y |
223 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
237 | CONFIG_MMU=y | 224 | CONFIG_MMU=y |
238 | 225 | ||
239 | # | 226 | # |
240 | # PCCARD (PCMCIA/CardBus) support | 227 | # PCCARD (PCMCIA/CardBus) support |
241 | # | 228 | # |
242 | 229 | # CONFIG_PCCARD is not set | |
243 | # | 230 | # CONFIG_HOTPLUG_PCI is not set |
244 | # PCI Hotplug Support | ||
245 | # | ||
246 | 231 | ||
247 | # | 232 | # |
248 | # Executable file formats | 233 | # Executable file formats |
@@ -254,10 +239,7 @@ CONFIG_TRAD_SIGNALS=y | |||
254 | # | 239 | # |
255 | # Power management options | 240 | # Power management options |
256 | # | 241 | # |
257 | CONFIG_PM=y | 242 | # CONFIG_PM is not set |
258 | # CONFIG_PM_LEGACY is not set | ||
259 | # CONFIG_PM_DEBUG is not set | ||
260 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
261 | 243 | ||
262 | # | 244 | # |
263 | # Networking | 245 | # Networking |
@@ -267,14 +249,9 @@ CONFIG_NET=y | |||
267 | # | 249 | # |
268 | # Networking options | 250 | # Networking options |
269 | # | 251 | # |
270 | # CONFIG_NETDEBUG is not set | ||
271 | CONFIG_PACKET=y | 252 | CONFIG_PACKET=y |
272 | # CONFIG_PACKET_MMAP is not set | 253 | # CONFIG_PACKET_MMAP is not set |
273 | CONFIG_UNIX=y | 254 | CONFIG_UNIX=y |
274 | CONFIG_XFRM=y | ||
275 | # CONFIG_XFRM_USER is not set | ||
276 | # CONFIG_XFRM_SUB_POLICY is not set | ||
277 | CONFIG_XFRM_MIGRATE=y | ||
278 | # CONFIG_NET_KEY is not set | 255 | # CONFIG_NET_KEY is not set |
279 | CONFIG_INET=y | 256 | CONFIG_INET=y |
280 | CONFIG_IP_MULTICAST=y | 257 | CONFIG_IP_MULTICAST=y |
@@ -284,7 +261,6 @@ CONFIG_ASK_IP_FIB_HASH=y | |||
284 | CONFIG_IP_FIB_HASH=y | 261 | CONFIG_IP_FIB_HASH=y |
285 | CONFIG_IP_MULTIPLE_TABLES=y | 262 | CONFIG_IP_MULTIPLE_TABLES=y |
286 | CONFIG_IP_ROUTE_MULTIPATH=y | 263 | CONFIG_IP_ROUTE_MULTIPATH=y |
287 | # CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set | ||
288 | CONFIG_IP_ROUTE_VERBOSE=y | 264 | CONFIG_IP_ROUTE_VERBOSE=y |
289 | CONFIG_IP_PNP=y | 265 | CONFIG_IP_PNP=y |
290 | # CONFIG_IP_PNP_DHCP is not set | 266 | # CONFIG_IP_PNP_DHCP is not set |
@@ -301,9 +277,9 @@ CONFIG_SYN_COOKIES=y | |||
301 | # CONFIG_INET_IPCOMP is not set | 277 | # CONFIG_INET_IPCOMP is not set |
302 | # CONFIG_INET_XFRM_TUNNEL is not set | 278 | # CONFIG_INET_XFRM_TUNNEL is not set |
303 | CONFIG_INET_TUNNEL=m | 279 | CONFIG_INET_TUNNEL=m |
304 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 280 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
305 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 281 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
306 | CONFIG_INET_XFRM_MODE_BEET=y | 282 | # CONFIG_INET_XFRM_MODE_BEET is not set |
307 | CONFIG_INET_DIAG=y | 283 | CONFIG_INET_DIAG=y |
308 | CONFIG_INET_TCP_DIAG=y | 284 | CONFIG_INET_TCP_DIAG=y |
309 | CONFIG_TCP_CONG_ADVANCED=y | 285 | CONFIG_TCP_CONG_ADVANCED=y |
@@ -317,6 +293,8 @@ CONFIG_TCP_CONG_HTCP=m | |||
317 | # CONFIG_TCP_CONG_SCALABLE is not set | 293 | # CONFIG_TCP_CONG_SCALABLE is not set |
318 | # CONFIG_TCP_CONG_LP is not set | 294 | # CONFIG_TCP_CONG_LP is not set |
319 | # CONFIG_TCP_CONG_VENO is not set | 295 | # CONFIG_TCP_CONG_VENO is not set |
296 | # CONFIG_TCP_CONG_YEAH is not set | ||
297 | # CONFIG_TCP_CONG_ILLINOIS is not set | ||
320 | CONFIG_DEFAULT_BIC=y | 298 | CONFIG_DEFAULT_BIC=y |
321 | # CONFIG_DEFAULT_CUBIC is not set | 299 | # CONFIG_DEFAULT_CUBIC is not set |
322 | # CONFIG_DEFAULT_HTCP is not set | 300 | # CONFIG_DEFAULT_HTCP is not set |
@@ -324,26 +302,14 @@ CONFIG_DEFAULT_BIC=y | |||
324 | # CONFIG_DEFAULT_WESTWOOD is not set | 302 | # CONFIG_DEFAULT_WESTWOOD is not set |
325 | # CONFIG_DEFAULT_RENO is not set | 303 | # CONFIG_DEFAULT_RENO is not set |
326 | CONFIG_DEFAULT_TCP_CONG="bic" | 304 | CONFIG_DEFAULT_TCP_CONG="bic" |
327 | CONFIG_TCP_MD5SIG=y | 305 | # CONFIG_TCP_MD5SIG is not set |
328 | # CONFIG_IPV6 is not set | 306 | # CONFIG_IPV6 is not set |
329 | # CONFIG_INET6_XFRM_TUNNEL is not set | 307 | # CONFIG_INET6_XFRM_TUNNEL is not set |
330 | # CONFIG_INET6_TUNNEL is not set | 308 | # CONFIG_INET6_TUNNEL is not set |
331 | CONFIG_NETWORK_SECMARK=y | 309 | CONFIG_NETWORK_SECMARK=y |
332 | # CONFIG_NETFILTER is not set | 310 | # CONFIG_NETFILTER is not set |
333 | |||
334 | # | ||
335 | # DCCP Configuration (EXPERIMENTAL) | ||
336 | # | ||
337 | # CONFIG_IP_DCCP is not set | 311 | # CONFIG_IP_DCCP is not set |
338 | |||
339 | # | ||
340 | # SCTP Configuration (EXPERIMENTAL) | ||
341 | # | ||
342 | # CONFIG_IP_SCTP is not set | 312 | # CONFIG_IP_SCTP is not set |
343 | |||
344 | # | ||
345 | # TIPC Configuration (EXPERIMENTAL) | ||
346 | # | ||
347 | # CONFIG_TIPC is not set | 313 | # CONFIG_TIPC is not set |
348 | # CONFIG_ATM is not set | 314 | # CONFIG_ATM is not set |
349 | # CONFIG_BRIDGE is not set | 315 | # CONFIG_BRIDGE is not set |
@@ -369,10 +335,20 @@ CONFIG_NETWORK_SECMARK=y | |||
369 | # CONFIG_HAMRADIO is not set | 335 | # CONFIG_HAMRADIO is not set |
370 | # CONFIG_IRDA is not set | 336 | # CONFIG_IRDA is not set |
371 | # CONFIG_BT is not set | 337 | # CONFIG_BT is not set |
372 | # CONFIG_IEEE80211 is not set | 338 | # CONFIG_AF_RXRPC is not set |
373 | CONFIG_FIB_RULES=y | 339 | CONFIG_FIB_RULES=y |
374 | 340 | ||
375 | # | 341 | # |
342 | # Wireless | ||
343 | # | ||
344 | # CONFIG_CFG80211 is not set | ||
345 | # CONFIG_WIRELESS_EXT is not set | ||
346 | # CONFIG_MAC80211 is not set | ||
347 | # CONFIG_IEEE80211 is not set | ||
348 | # CONFIG_RFKILL is not set | ||
349 | # CONFIG_NET_9P is not set | ||
350 | |||
351 | # | ||
376 | # Device Drivers | 352 | # Device Drivers |
377 | # | 353 | # |
378 | 354 | ||
@@ -381,31 +357,12 @@ CONFIG_FIB_RULES=y | |||
381 | # | 357 | # |
382 | CONFIG_STANDALONE=y | 358 | CONFIG_STANDALONE=y |
383 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 359 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
360 | CONFIG_FW_LOADER=m | ||
384 | # CONFIG_SYS_HYPERVISOR is not set | 361 | # CONFIG_SYS_HYPERVISOR is not set |
385 | |||
386 | # | ||
387 | # Connector - unified userspace <-> kernelspace linker | ||
388 | # | ||
389 | # CONFIG_CONNECTOR is not set | 362 | # CONFIG_CONNECTOR is not set |
390 | |||
391 | # | ||
392 | # Memory Technology Devices (MTD) | ||
393 | # | ||
394 | # CONFIG_MTD is not set | 363 | # CONFIG_MTD is not set |
395 | |||
396 | # | ||
397 | # Parallel port support | ||
398 | # | ||
399 | # CONFIG_PARPORT is not set | 364 | # CONFIG_PARPORT is not set |
400 | 365 | CONFIG_BLK_DEV=y | |
401 | # | ||
402 | # Plug and Play support | ||
403 | # | ||
404 | # CONFIG_PNPACPI is not set | ||
405 | |||
406 | # | ||
407 | # Block devices | ||
408 | # | ||
409 | # CONFIG_BLK_CPQ_DA is not set | 366 | # CONFIG_BLK_CPQ_DA is not set |
410 | # CONFIG_BLK_CPQ_CISS_DA is not set | 367 | # CONFIG_BLK_CPQ_CISS_DA is not set |
411 | # CONFIG_BLK_DEV_DAC960 is not set | 368 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -420,19 +377,9 @@ CONFIG_BLK_DEV_RAM=y | |||
420 | CONFIG_BLK_DEV_RAM_COUNT=16 | 377 | CONFIG_BLK_DEV_RAM_COUNT=16 |
421 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 378 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
422 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 379 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
423 | # CONFIG_BLK_DEV_INITRD is not set | ||
424 | # CONFIG_CDROM_PKTCDVD is not set | 380 | # CONFIG_CDROM_PKTCDVD is not set |
425 | # CONFIG_ATA_OVER_ETH is not set | 381 | # CONFIG_ATA_OVER_ETH is not set |
426 | 382 | # CONFIG_MISC_DEVICES is not set | |
427 | # | ||
428 | # Misc devices | ||
429 | # | ||
430 | CONFIG_SGI_IOC4=m | ||
431 | # CONFIG_TIFM_CORE is not set | ||
432 | |||
433 | # | ||
434 | # ATA/ATAPI/MFM/RLL support | ||
435 | # | ||
436 | # CONFIG_IDE is not set | 383 | # CONFIG_IDE is not set |
437 | 384 | ||
438 | # | 385 | # |
@@ -440,6 +387,7 @@ CONFIG_SGI_IOC4=m | |||
440 | # | 387 | # |
441 | # CONFIG_RAID_ATTRS is not set | 388 | # CONFIG_RAID_ATTRS is not set |
442 | CONFIG_SCSI=y | 389 | CONFIG_SCSI=y |
390 | CONFIG_SCSI_DMA=y | ||
443 | CONFIG_SCSI_TGT=m | 391 | CONFIG_SCSI_TGT=m |
444 | # CONFIG_SCSI_NETLINK is not set | 392 | # CONFIG_SCSI_NETLINK is not set |
445 | CONFIG_SCSI_PROC_FS=y | 393 | CONFIG_SCSI_PROC_FS=y |
@@ -461,6 +409,7 @@ CONFIG_BLK_DEV_SD=y | |||
461 | # CONFIG_SCSI_CONSTANTS is not set | 409 | # CONFIG_SCSI_CONSTANTS is not set |
462 | # CONFIG_SCSI_LOGGING is not set | 410 | # CONFIG_SCSI_LOGGING is not set |
463 | CONFIG_SCSI_SCAN_ASYNC=y | 411 | CONFIG_SCSI_SCAN_ASYNC=y |
412 | CONFIG_SCSI_WAIT_SCAN=m | ||
464 | 413 | ||
465 | # | 414 | # |
466 | # SCSI Transports | 415 | # SCSI Transports |
@@ -468,48 +417,8 @@ CONFIG_SCSI_SCAN_ASYNC=y | |||
468 | # CONFIG_SCSI_SPI_ATTRS is not set | 417 | # CONFIG_SCSI_SPI_ATTRS is not set |
469 | # CONFIG_SCSI_FC_ATTRS is not set | 418 | # CONFIG_SCSI_FC_ATTRS is not set |
470 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 419 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
471 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
472 | # CONFIG_SCSI_SAS_LIBSAS is not set | 420 | # CONFIG_SCSI_SAS_LIBSAS is not set |
473 | 421 | # CONFIG_SCSI_LOWLEVEL is not set | |
474 | # | ||
475 | # SCSI low-level drivers | ||
476 | # | ||
477 | # CONFIG_ISCSI_TCP is not set | ||
478 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
479 | # CONFIG_SCSI_3W_9XXX is not set | ||
480 | # CONFIG_SCSI_ACARD is not set | ||
481 | # CONFIG_SCSI_AACRAID is not set | ||
482 | # CONFIG_SCSI_AIC7XXX is not set | ||
483 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
484 | # CONFIG_SCSI_AIC79XX is not set | ||
485 | # CONFIG_SCSI_AIC94XX is not set | ||
486 | # CONFIG_SCSI_DPT_I2O is not set | ||
487 | # CONFIG_SCSI_ARCMSR is not set | ||
488 | # CONFIG_MEGARAID_NEWGEN is not set | ||
489 | # CONFIG_MEGARAID_LEGACY is not set | ||
490 | # CONFIG_MEGARAID_SAS is not set | ||
491 | # CONFIG_SCSI_HPTIOP is not set | ||
492 | # CONFIG_SCSI_DMX3191D is not set | ||
493 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
494 | # CONFIG_SCSI_IPS is not set | ||
495 | # CONFIG_SCSI_INITIO is not set | ||
496 | # CONFIG_SCSI_INIA100 is not set | ||
497 | # CONFIG_SCSI_STEX is not set | ||
498 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
499 | # CONFIG_SCSI_IPR is not set | ||
500 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
501 | # CONFIG_SCSI_QLA_FC is not set | ||
502 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
503 | # CONFIG_SCSI_LPFC is not set | ||
504 | # CONFIG_SCSI_DC395x is not set | ||
505 | # CONFIG_SCSI_DC390T is not set | ||
506 | # CONFIG_SCSI_NSP32 is not set | ||
507 | # CONFIG_SCSI_DEBUG is not set | ||
508 | # CONFIG_SCSI_SRP is not set | ||
509 | |||
510 | # | ||
511 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
512 | # | ||
513 | CONFIG_ATA=y | 422 | CONFIG_ATA=y |
514 | # CONFIG_ATA_NONSTANDARD is not set | 423 | # CONFIG_ATA_NONSTANDARD is not set |
515 | # CONFIG_SATA_AHCI is not set | 424 | # CONFIG_SATA_AHCI is not set |
@@ -532,6 +441,7 @@ CONFIG_ATA=y | |||
532 | # CONFIG_PATA_AMD is not set | 441 | # CONFIG_PATA_AMD is not set |
533 | # CONFIG_PATA_ARTOP is not set | 442 | # CONFIG_PATA_ARTOP is not set |
534 | # CONFIG_PATA_ATIIXP is not set | 443 | # CONFIG_PATA_ATIIXP is not set |
444 | # CONFIG_PATA_CMD640_PCI is not set | ||
535 | # CONFIG_PATA_CMD64X is not set | 445 | # CONFIG_PATA_CMD64X is not set |
536 | # CONFIG_PATA_CS5520 is not set | 446 | # CONFIG_PATA_CS5520 is not set |
537 | # CONFIG_PATA_CS5530 is not set | 447 | # CONFIG_PATA_CS5530 is not set |
@@ -564,10 +474,6 @@ CONFIG_PATA_SIL680=y | |||
564 | # CONFIG_PATA_VIA is not set | 474 | # CONFIG_PATA_VIA is not set |
565 | # CONFIG_PATA_WINBOND is not set | 475 | # CONFIG_PATA_WINBOND is not set |
566 | # CONFIG_PATA_PLATFORM is not set | 476 | # CONFIG_PATA_PLATFORM is not set |
567 | |||
568 | # | ||
569 | # Multi-device support (RAID and LVM) | ||
570 | # | ||
571 | # CONFIG_MD is not set | 477 | # CONFIG_MD is not set |
572 | 478 | ||
573 | # | 479 | # |
@@ -581,17 +487,16 @@ CONFIG_PATA_SIL680=y | |||
581 | # | 487 | # |
582 | # IEEE 1394 (FireWire) support | 488 | # IEEE 1394 (FireWire) support |
583 | # | 489 | # |
490 | # CONFIG_FIREWIRE is not set | ||
584 | CONFIG_IEEE1394=m | 491 | CONFIG_IEEE1394=m |
585 | 492 | ||
586 | # | 493 | # |
587 | # Subsystem Options | 494 | # Subsystem Options |
588 | # | 495 | # |
589 | # CONFIG_IEEE1394_VERBOSEDEBUG is not set | 496 | # CONFIG_IEEE1394_VERBOSEDEBUG is not set |
590 | CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y | ||
591 | CONFIG_IEEE1394_CONFIG_ROM_IP1394=y | ||
592 | 497 | ||
593 | # | 498 | # |
594 | # Device Drivers | 499 | # Controllers |
595 | # | 500 | # |
596 | 501 | ||
597 | # | 502 | # |
@@ -600,59 +505,63 @@ CONFIG_IEEE1394_CONFIG_ROM_IP1394=y | |||
600 | CONFIG_IEEE1394_OHCI1394=m | 505 | CONFIG_IEEE1394_OHCI1394=m |
601 | 506 | ||
602 | # | 507 | # |
603 | # Protocol Drivers | 508 | # Protocols |
604 | # | 509 | # |
605 | CONFIG_IEEE1394_VIDEO1394=m | 510 | CONFIG_IEEE1394_VIDEO1394=m |
606 | CONFIG_IEEE1394_SBP2=m | 511 | CONFIG_IEEE1394_SBP2=m |
512 | # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set | ||
513 | CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y | ||
607 | CONFIG_IEEE1394_ETH1394=m | 514 | CONFIG_IEEE1394_ETH1394=m |
608 | CONFIG_IEEE1394_DV1394=m | 515 | CONFIG_IEEE1394_DV1394=m |
609 | CONFIG_IEEE1394_RAWIO=m | 516 | CONFIG_IEEE1394_RAWIO=m |
610 | |||
611 | # | ||
612 | # I2O device support | ||
613 | # | ||
614 | # CONFIG_I2O is not set | 517 | # CONFIG_I2O is not set |
615 | |||
616 | # | ||
617 | # Network device support | ||
618 | # | ||
619 | CONFIG_NETDEVICES=y | 518 | CONFIG_NETDEVICES=y |
620 | CONFIG_DUMMY=m | 519 | # CONFIG_NETDEVICES_MULTIQUEUE is not set |
520 | # CONFIG_DUMMY is not set | ||
621 | # CONFIG_BONDING is not set | 521 | # CONFIG_BONDING is not set |
522 | # CONFIG_MACVLAN is not set | ||
622 | # CONFIG_EQUALIZER is not set | 523 | # CONFIG_EQUALIZER is not set |
623 | # CONFIG_TUN is not set | 524 | # CONFIG_TUN is not set |
624 | |||
625 | # | ||
626 | # ARCnet devices | ||
627 | # | ||
628 | # CONFIG_ARCNET is not set | 525 | # CONFIG_ARCNET is not set |
629 | |||
630 | # | ||
631 | # PHY device support | ||
632 | # | ||
633 | # CONFIG_PHYLIB is not set | 526 | # CONFIG_PHYLIB is not set |
634 | |||
635 | # | ||
636 | # Ethernet (10 or 100Mbit) | ||
637 | # | ||
638 | CONFIG_NET_ETHERNET=y | 527 | CONFIG_NET_ETHERNET=y |
639 | CONFIG_MII=y | 528 | CONFIG_MII=y |
529 | # CONFIG_AX88796 is not set | ||
640 | # CONFIG_HAPPYMEAL is not set | 530 | # CONFIG_HAPPYMEAL is not set |
641 | # CONFIG_SUNGEM is not set | 531 | # CONFIG_SUNGEM is not set |
642 | # CONFIG_CASSINI is not set | 532 | # CONFIG_CASSINI is not set |
643 | # CONFIG_NET_VENDOR_3COM is not set | 533 | # CONFIG_NET_VENDOR_3COM is not set |
644 | # CONFIG_DM9000 is not set | 534 | # CONFIG_DM9000 is not set |
645 | |||
646 | # | ||
647 | # Tulip family network device support | ||
648 | # | ||
649 | # CONFIG_NET_TULIP is not set | 535 | # CONFIG_NET_TULIP is not set |
650 | # CONFIG_HP100 is not set | 536 | # CONFIG_HP100 is not set |
651 | # CONFIG_NET_PCI is not set | 537 | CONFIG_NET_PCI=y |
652 | 538 | # CONFIG_PCNET32 is not set | |
653 | # | 539 | # CONFIG_AMD8111_ETH is not set |
654 | # Ethernet (1000 Mbit) | 540 | # CONFIG_ADAPTEC_STARFIRE is not set |
655 | # | 541 | # CONFIG_B44 is not set |
542 | # CONFIG_FORCEDETH is not set | ||
543 | # CONFIG_TC35815 is not set | ||
544 | # CONFIG_DGRS is not set | ||
545 | # CONFIG_EEPRO100 is not set | ||
546 | # CONFIG_E100 is not set | ||
547 | # CONFIG_FEALNX is not set | ||
548 | # CONFIG_NATSEMI is not set | ||
549 | # CONFIG_NE2K_PCI is not set | ||
550 | # CONFIG_8139CP is not set | ||
551 | CONFIG_8139TOO=y | ||
552 | CONFIG_8139TOO_PIO=y | ||
553 | # CONFIG_8139TOO_TUNE_TWISTER is not set | ||
554 | # CONFIG_8139TOO_8129 is not set | ||
555 | # CONFIG_8139_OLD_RX_RESET is not set | ||
556 | # CONFIG_SIS900 is not set | ||
557 | # CONFIG_EPIC100 is not set | ||
558 | # CONFIG_SUNDANCE is not set | ||
559 | # CONFIG_TLAN is not set | ||
560 | CONFIG_VIA_RHINE=y | ||
561 | CONFIG_VIA_RHINE_MMIO=y | ||
562 | # CONFIG_VIA_RHINE_NAPI is not set | ||
563 | # CONFIG_SC92031 is not set | ||
564 | CONFIG_NETDEV_1000=y | ||
656 | # CONFIG_ACENIC is not set | 565 | # CONFIG_ACENIC is not set |
657 | # CONFIG_DL2K is not set | 566 | # CONFIG_DL2K is not set |
658 | # CONFIG_E1000 is not set | 567 | # CONFIG_E1000 is not set |
@@ -664,35 +573,29 @@ CONFIG_R8169=y | |||
664 | # CONFIG_SIS190 is not set | 573 | # CONFIG_SIS190 is not set |
665 | # CONFIG_SKGE is not set | 574 | # CONFIG_SKGE is not set |
666 | # CONFIG_SKY2 is not set | 575 | # CONFIG_SKY2 is not set |
667 | # CONFIG_SK98LIN is not set | 576 | CONFIG_VIA_VELOCITY=y |
668 | # CONFIG_TIGON3 is not set | 577 | # CONFIG_TIGON3 is not set |
669 | # CONFIG_BNX2 is not set | 578 | # CONFIG_BNX2 is not set |
670 | # CONFIG_QLA3XXX is not set | 579 | # CONFIG_QLA3XXX is not set |
671 | # CONFIG_ATL1 is not set | 580 | # CONFIG_ATL1 is not set |
672 | 581 | # CONFIG_NETDEV_10000 is not set | |
673 | # | ||
674 | # Ethernet (10000 Mbit) | ||
675 | # | ||
676 | # CONFIG_CHELSIO_T1 is not set | ||
677 | CONFIG_CHELSIO_T3=m | ||
678 | # CONFIG_IXGB is not set | ||
679 | # CONFIG_S2IO is not set | ||
680 | # CONFIG_MYRI10GE is not set | ||
681 | CONFIG_NETXEN_NIC=m | ||
682 | |||
683 | # | ||
684 | # Token Ring devices | ||
685 | # | ||
686 | # CONFIG_TR is not set | 582 | # CONFIG_TR is not set |
687 | 583 | ||
688 | # | 584 | # |
689 | # Wireless LAN (non-hamradio) | 585 | # Wireless LAN |
690 | # | 586 | # |
691 | # CONFIG_NET_RADIO is not set | 587 | # CONFIG_WLAN_PRE80211 is not set |
588 | # CONFIG_WLAN_80211 is not set | ||
692 | 589 | ||
693 | # | 590 | # |
694 | # Wan interfaces | 591 | # USB Network Adapters |
695 | # | 592 | # |
593 | # CONFIG_USB_CATC is not set | ||
594 | # CONFIG_USB_KAWETH is not set | ||
595 | # CONFIG_USB_PEGASUS is not set | ||
596 | # CONFIG_USB_RTL8150 is not set | ||
597 | # CONFIG_USB_USBNET_MII is not set | ||
598 | # CONFIG_USB_USBNET is not set | ||
696 | # CONFIG_WAN is not set | 599 | # CONFIG_WAN is not set |
697 | # CONFIG_FDDI is not set | 600 | # CONFIG_FDDI is not set |
698 | # CONFIG_HIPPI is not set | 601 | # CONFIG_HIPPI is not set |
@@ -703,15 +606,7 @@ CONFIG_NETXEN_NIC=m | |||
703 | # CONFIG_NETCONSOLE is not set | 606 | # CONFIG_NETCONSOLE is not set |
704 | # CONFIG_NETPOLL is not set | 607 | # CONFIG_NETPOLL is not set |
705 | # CONFIG_NET_POLL_CONTROLLER is not set | 608 | # CONFIG_NET_POLL_CONTROLLER is not set |
706 | |||
707 | # | ||
708 | # ISDN subsystem | ||
709 | # | ||
710 | # CONFIG_ISDN is not set | 609 | # CONFIG_ISDN is not set |
711 | |||
712 | # | ||
713 | # Telephony Support | ||
714 | # | ||
715 | # CONFIG_PHONE is not set | 610 | # CONFIG_PHONE is not set |
716 | 611 | ||
717 | # | 612 | # |
@@ -719,11 +614,15 @@ CONFIG_NETXEN_NIC=m | |||
719 | # | 614 | # |
720 | CONFIG_INPUT=y | 615 | CONFIG_INPUT=y |
721 | # CONFIG_INPUT_FF_MEMLESS is not set | 616 | # CONFIG_INPUT_FF_MEMLESS is not set |
617 | # CONFIG_INPUT_POLLDEV is not set | ||
722 | 618 | ||
723 | # | 619 | # |
724 | # Userland interfaces | 620 | # Userland interfaces |
725 | # | 621 | # |
726 | # CONFIG_INPUT_MOUSEDEV is not set | 622 | CONFIG_INPUT_MOUSEDEV=y |
623 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
624 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
625 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
727 | # CONFIG_INPUT_JOYDEV is not set | 626 | # CONFIG_INPUT_JOYDEV is not set |
728 | # CONFIG_INPUT_TSDEV is not set | 627 | # CONFIG_INPUT_TSDEV is not set |
729 | # CONFIG_INPUT_EVDEV is not set | 628 | # CONFIG_INPUT_EVDEV is not set |
@@ -735,6 +634,7 @@ CONFIG_INPUT=y | |||
735 | # CONFIG_INPUT_KEYBOARD is not set | 634 | # CONFIG_INPUT_KEYBOARD is not set |
736 | # CONFIG_INPUT_MOUSE is not set | 635 | # CONFIG_INPUT_MOUSE is not set |
737 | # CONFIG_INPUT_JOYSTICK is not set | 636 | # CONFIG_INPUT_JOYSTICK is not set |
637 | # CONFIG_INPUT_TABLET is not set | ||
738 | # CONFIG_INPUT_TOUCHSCREEN is not set | 638 | # CONFIG_INPUT_TOUCHSCREEN is not set |
739 | # CONFIG_INPUT_MISC is not set | 639 | # CONFIG_INPUT_MISC is not set |
740 | 640 | ||
@@ -769,35 +669,18 @@ CONFIG_SERIAL_VR41XX_CONSOLE=y | |||
769 | CONFIG_UNIX98_PTYS=y | 669 | CONFIG_UNIX98_PTYS=y |
770 | CONFIG_LEGACY_PTYS=y | 670 | CONFIG_LEGACY_PTYS=y |
771 | CONFIG_LEGACY_PTY_COUNT=256 | 671 | CONFIG_LEGACY_PTY_COUNT=256 |
772 | |||
773 | # | ||
774 | # IPMI | ||
775 | # | ||
776 | # CONFIG_IPMI_HANDLER is not set | 672 | # CONFIG_IPMI_HANDLER is not set |
777 | |||
778 | # | ||
779 | # Watchdog Cards | ||
780 | # | ||
781 | # CONFIG_WATCHDOG is not set | 673 | # CONFIG_WATCHDOG is not set |
782 | # CONFIG_HW_RANDOM is not set | 674 | # CONFIG_HW_RANDOM is not set |
783 | # CONFIG_RTC is not set | 675 | # CONFIG_RTC is not set |
784 | # CONFIG_GEN_RTC is not set | ||
785 | # CONFIG_DTLK is not set | ||
786 | # CONFIG_R3964 is not set | 676 | # CONFIG_R3964 is not set |
787 | # CONFIG_APPLICOM is not set | 677 | # CONFIG_APPLICOM is not set |
788 | # CONFIG_TANBAC_TB0219 is not set | 678 | # CONFIG_GPIO_TB0219 is not set |
789 | # CONFIG_DRM is not set | 679 | # CONFIG_DRM is not set |
790 | CONFIG_GPIO_VR41XX=y | 680 | CONFIG_GPIO_VR41XX=y |
791 | # CONFIG_RAW_DRIVER is not set | 681 | # CONFIG_RAW_DRIVER is not set |
792 | |||
793 | # | ||
794 | # TPM devices | ||
795 | # | ||
796 | # CONFIG_TCG_TPM is not set | 682 | # CONFIG_TCG_TPM is not set |
797 | 683 | CONFIG_DEVPORT=y | |
798 | # | ||
799 | # I2C support | ||
800 | # | ||
801 | # CONFIG_I2C is not set | 684 | # CONFIG_I2C is not set |
802 | 685 | ||
803 | # | 686 | # |
@@ -805,17 +688,9 @@ CONFIG_GPIO_VR41XX=y | |||
805 | # | 688 | # |
806 | # CONFIG_SPI is not set | 689 | # CONFIG_SPI is not set |
807 | # CONFIG_SPI_MASTER is not set | 690 | # CONFIG_SPI_MASTER is not set |
808 | |||
809 | # | ||
810 | # Dallas's 1-wire bus | ||
811 | # | ||
812 | # CONFIG_W1 is not set | 691 | # CONFIG_W1 is not set |
813 | 692 | # CONFIG_POWER_SUPPLY is not set | |
814 | # | ||
815 | # Hardware Monitoring support | ||
816 | # | ||
817 | # CONFIG_HWMON is not set | 693 | # CONFIG_HWMON is not set |
818 | # CONFIG_HWMON_VID is not set | ||
819 | 694 | ||
820 | # | 695 | # |
821 | # Multifunction device drivers | 696 | # Multifunction device drivers |
@@ -826,23 +701,31 @@ CONFIG_MFD_SM501=y | |||
826 | # Multimedia devices | 701 | # Multimedia devices |
827 | # | 702 | # |
828 | # CONFIG_VIDEO_DEV is not set | 703 | # CONFIG_VIDEO_DEV is not set |
704 | # CONFIG_DVB_CORE is not set | ||
705 | # CONFIG_DAB is not set | ||
829 | 706 | ||
830 | # | 707 | # |
831 | # Digital Video Broadcasting Devices | 708 | # Graphics support |
832 | # | 709 | # |
833 | # CONFIG_DVB is not set | 710 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
834 | # CONFIG_USB_DABUSB is not set | ||
835 | 711 | ||
836 | # | 712 | # |
837 | # Graphics support | 713 | # Display device support |
838 | # | 714 | # |
839 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 715 | # CONFIG_DISPLAY_SUPPORT is not set |
716 | # CONFIG_VGASTATE is not set | ||
717 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
840 | CONFIG_FB=y | 718 | CONFIG_FB=y |
841 | # CONFIG_FIRMWARE_EDID is not set | 719 | # CONFIG_FIRMWARE_EDID is not set |
842 | # CONFIG_FB_DDC is not set | 720 | # CONFIG_FB_DDC is not set |
843 | CONFIG_FB_CFB_FILLRECT=y | 721 | CONFIG_FB_CFB_FILLRECT=y |
844 | CONFIG_FB_CFB_COPYAREA=y | 722 | CONFIG_FB_CFB_COPYAREA=y |
845 | CONFIG_FB_CFB_IMAGEBLIT=y | 723 | CONFIG_FB_CFB_IMAGEBLIT=y |
724 | # CONFIG_FB_SYS_FILLRECT is not set | ||
725 | # CONFIG_FB_SYS_COPYAREA is not set | ||
726 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
727 | # CONFIG_FB_SYS_FOPS is not set | ||
728 | CONFIG_FB_DEFERRED_IO=y | ||
846 | # CONFIG_FB_SVGALIB is not set | 729 | # CONFIG_FB_SVGALIB is not set |
847 | # CONFIG_FB_MACMODES is not set | 730 | # CONFIG_FB_MACMODES is not set |
848 | # CONFIG_FB_BACKLIGHT is not set | 731 | # CONFIG_FB_BACKLIGHT is not set |
@@ -850,7 +733,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
850 | # CONFIG_FB_TILEBLITTING is not set | 733 | # CONFIG_FB_TILEBLITTING is not set |
851 | 734 | ||
852 | # | 735 | # |
853 | # Frambuffer hardware drivers | 736 | # Frame buffer hardware drivers |
854 | # | 737 | # |
855 | # CONFIG_FB_CIRRUS is not set | 738 | # CONFIG_FB_CIRRUS is not set |
856 | # CONFIG_FB_PM2 is not set | 739 | # CONFIG_FB_PM2 is not set |
@@ -871,8 +754,10 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
871 | # CONFIG_FB_KYRO is not set | 754 | # CONFIG_FB_KYRO is not set |
872 | # CONFIG_FB_3DFX is not set | 755 | # CONFIG_FB_3DFX is not set |
873 | # CONFIG_FB_VOODOO1 is not set | 756 | # CONFIG_FB_VOODOO1 is not set |
874 | # CONFIG_FB_SMIVGX is not set | 757 | # CONFIG_FB_VT8623 is not set |
875 | # CONFIG_FB_TRIDENT is not set | 758 | # CONFIG_FB_TRIDENT is not set |
759 | # CONFIG_FB_ARK is not set | ||
760 | # CONFIG_FB_PM3 is not set | ||
876 | CONFIG_FB_SM501=y | 761 | CONFIG_FB_SM501=y |
877 | # CONFIG_FB_VIRTUAL is not set | 762 | # CONFIG_FB_VIRTUAL is not set |
878 | 763 | ||
@@ -881,27 +766,44 @@ CONFIG_FB_SM501=y | |||
881 | # | 766 | # |
882 | # CONFIG_VGA_CONSOLE is not set | 767 | # CONFIG_VGA_CONSOLE is not set |
883 | CONFIG_DUMMY_CONSOLE=y | 768 | CONFIG_DUMMY_CONSOLE=y |
884 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | 769 | CONFIG_FRAMEBUFFER_CONSOLE=y |
885 | 770 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | |
886 | # | 771 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
887 | # Logo configuration | 772 | CONFIG_FONTS=y |
888 | # | 773 | CONFIG_FONT_8x8=y |
774 | CONFIG_FONT_8x16=y | ||
775 | # CONFIG_FONT_6x11 is not set | ||
776 | # CONFIG_FONT_7x14 is not set | ||
777 | # CONFIG_FONT_PEARL_8x8 is not set | ||
778 | # CONFIG_FONT_ACORN_8x8 is not set | ||
779 | # CONFIG_FONT_MINI_4x6 is not set | ||
780 | # CONFIG_FONT_SUN8x16 is not set | ||
781 | # CONFIG_FONT_SUN12x22 is not set | ||
782 | # CONFIG_FONT_10x18 is not set | ||
889 | # CONFIG_LOGO is not set | 783 | # CONFIG_LOGO is not set |
890 | 784 | ||
891 | # | 785 | # |
892 | # Sound | 786 | # Sound |
893 | # | 787 | # |
894 | # CONFIG_SOUND is not set | 788 | # CONFIG_SOUND is not set |
789 | CONFIG_HID_SUPPORT=y | ||
790 | CONFIG_HID=y | ||
791 | # CONFIG_HID_DEBUG is not set | ||
895 | 792 | ||
896 | # | 793 | # |
897 | # HID Devices | 794 | # USB Input Devices |
898 | # | 795 | # |
899 | CONFIG_HID=y | 796 | CONFIG_USB_HID=m |
900 | # CONFIG_HID_DEBUG is not set | 797 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set |
798 | # CONFIG_HID_FF is not set | ||
799 | # CONFIG_USB_HIDDEV is not set | ||
901 | 800 | ||
902 | # | 801 | # |
903 | # USB support | 802 | # USB HID Boot Protocol drivers |
904 | # | 803 | # |
804 | # CONFIG_USB_KBD is not set | ||
805 | # CONFIG_USB_MOUSE is not set | ||
806 | CONFIG_USB_SUPPORT=y | ||
905 | CONFIG_USB_ARCH_HAS_HCD=y | 807 | CONFIG_USB_ARCH_HAS_HCD=y |
906 | CONFIG_USB_ARCH_HAS_OHCI=y | 808 | CONFIG_USB_ARCH_HAS_OHCI=y |
907 | CONFIG_USB_ARCH_HAS_EHCI=y | 809 | CONFIG_USB_ARCH_HAS_EHCI=y |
@@ -912,8 +814,8 @@ CONFIG_USB=m | |||
912 | # Miscellaneous USB options | 814 | # Miscellaneous USB options |
913 | # | 815 | # |
914 | # CONFIG_USB_DEVICEFS is not set | 816 | # CONFIG_USB_DEVICEFS is not set |
817 | CONFIG_USB_DEVICE_CLASS=y | ||
915 | # CONFIG_USB_DYNAMIC_MINORS is not set | 818 | # CONFIG_USB_DYNAMIC_MINORS is not set |
916 | # CONFIG_USB_SUSPEND is not set | ||
917 | # CONFIG_USB_OTG is not set | 819 | # CONFIG_USB_OTG is not set |
918 | 820 | ||
919 | # | 821 | # |
@@ -923,7 +825,6 @@ CONFIG_USB_EHCI_HCD=m | |||
923 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | 825 | # CONFIG_USB_EHCI_SPLIT_ISO is not set |
924 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 826 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
925 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 827 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
926 | # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set | ||
927 | # CONFIG_USB_ISP116X_HCD is not set | 828 | # CONFIG_USB_ISP116X_HCD is not set |
928 | CONFIG_USB_OHCI_HCD=m | 829 | CONFIG_USB_OHCI_HCD=m |
929 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 830 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
@@ -931,6 +832,7 @@ CONFIG_USB_OHCI_HCD=m | |||
931 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 832 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
932 | # CONFIG_USB_UHCI_HCD is not set | 833 | # CONFIG_USB_UHCI_HCD is not set |
933 | # CONFIG_USB_SL811_HCD is not set | 834 | # CONFIG_USB_SL811_HCD is not set |
835 | # CONFIG_USB_R8A66597_HCD is not set | ||
934 | 836 | ||
935 | # | 837 | # |
936 | # USB Device Class drivers | 838 | # USB Device Class drivers |
@@ -959,47 +861,10 @@ CONFIG_USB_STORAGE=m | |||
959 | # CONFIG_USB_LIBUSUAL is not set | 861 | # CONFIG_USB_LIBUSUAL is not set |
960 | 862 | ||
961 | # | 863 | # |
962 | # USB Input Devices | ||
963 | # | ||
964 | CONFIG_USB_HID=m | ||
965 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
966 | # CONFIG_HID_FF is not set | ||
967 | # CONFIG_USB_HIDDEV is not set | ||
968 | |||
969 | # | ||
970 | # USB HID Boot Protocol drivers | ||
971 | # | ||
972 | # CONFIG_USB_KBD is not set | ||
973 | # CONFIG_USB_MOUSE is not set | ||
974 | # CONFIG_USB_AIPTEK is not set | ||
975 | # CONFIG_USB_WACOM is not set | ||
976 | # CONFIG_USB_ACECAD is not set | ||
977 | # CONFIG_USB_KBTAB is not set | ||
978 | # CONFIG_USB_POWERMATE is not set | ||
979 | # CONFIG_USB_TOUCHSCREEN is not set | ||
980 | # CONFIG_USB_YEALINK is not set | ||
981 | # CONFIG_USB_XPAD is not set | ||
982 | # CONFIG_USB_ATI_REMOTE is not set | ||
983 | # CONFIG_USB_ATI_REMOTE2 is not set | ||
984 | # CONFIG_USB_KEYSPAN_REMOTE is not set | ||
985 | # CONFIG_USB_APPLETOUCH is not set | ||
986 | # CONFIG_USB_GTCO is not set | ||
987 | |||
988 | # | ||
989 | # USB Imaging devices | 864 | # USB Imaging devices |
990 | # | 865 | # |
991 | # CONFIG_USB_MDC800 is not set | 866 | # CONFIG_USB_MDC800 is not set |
992 | # CONFIG_USB_MICROTEK is not set | 867 | # CONFIG_USB_MICROTEK is not set |
993 | |||
994 | # | ||
995 | # USB Network Adapters | ||
996 | # | ||
997 | # CONFIG_USB_CATC is not set | ||
998 | # CONFIG_USB_KAWETH is not set | ||
999 | # CONFIG_USB_PEGASUS is not set | ||
1000 | # CONFIG_USB_RTL8150 is not set | ||
1001 | # CONFIG_USB_USBNET_MII is not set | ||
1002 | # CONFIG_USB_USBNET is not set | ||
1003 | CONFIG_USB_MON=y | 868 | CONFIG_USB_MON=y |
1004 | 869 | ||
1005 | # | 870 | # |
@@ -1032,6 +897,7 @@ CONFIG_USB_MON=y | |||
1032 | # CONFIG_USB_SISUSBVGA is not set | 897 | # CONFIG_USB_SISUSBVGA is not set |
1033 | # CONFIG_USB_LD is not set | 898 | # CONFIG_USB_LD is not set |
1034 | # CONFIG_USB_TRANCEVIBRATOR is not set | 899 | # CONFIG_USB_TRANCEVIBRATOR is not set |
900 | # CONFIG_USB_IOWARRIOR is not set | ||
1035 | 901 | ||
1036 | # | 902 | # |
1037 | # USB DSL modem support | 903 | # USB DSL modem support |
@@ -1041,37 +907,9 @@ CONFIG_USB_MON=y | |||
1041 | # USB Gadget Support | 907 | # USB Gadget Support |
1042 | # | 908 | # |
1043 | # CONFIG_USB_GADGET is not set | 909 | # CONFIG_USB_GADGET is not set |
1044 | |||
1045 | # | ||
1046 | # MMC/SD Card support | ||
1047 | # | ||
1048 | # CONFIG_MMC is not set | 910 | # CONFIG_MMC is not set |
1049 | |||
1050 | # | ||
1051 | # LED devices | ||
1052 | # | ||
1053 | # CONFIG_NEW_LEDS is not set | 911 | # CONFIG_NEW_LEDS is not set |
1054 | |||
1055 | # | ||
1056 | # LED drivers | ||
1057 | # | ||
1058 | |||
1059 | # | ||
1060 | # LED Triggers | ||
1061 | # | ||
1062 | |||
1063 | # | ||
1064 | # InfiniBand support | ||
1065 | # | ||
1066 | # CONFIG_INFINIBAND is not set | 912 | # CONFIG_INFINIBAND is not set |
1067 | |||
1068 | # | ||
1069 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
1070 | # | ||
1071 | |||
1072 | # | ||
1073 | # Real Time Clock | ||
1074 | # | ||
1075 | # CONFIG_RTC_CLASS is not set | 913 | # CONFIG_RTC_CLASS is not set |
1076 | 914 | ||
1077 | # | 915 | # |
@@ -1088,12 +926,9 @@ CONFIG_USB_MON=y | |||
1088 | # | 926 | # |
1089 | 927 | ||
1090 | # | 928 | # |
1091 | # Auxiliary Display support | 929 | # Userspace I/O |
1092 | # | ||
1093 | |||
1094 | # | ||
1095 | # Virtualization | ||
1096 | # | 930 | # |
931 | # CONFIG_UIO is not set | ||
1097 | 932 | ||
1098 | # | 933 | # |
1099 | # File systems | 934 | # File systems |
@@ -1111,7 +946,7 @@ CONFIG_JBD=y | |||
1111 | CONFIG_FS_MBCACHE=y | 946 | CONFIG_FS_MBCACHE=y |
1112 | # CONFIG_REISERFS_FS is not set | 947 | # CONFIG_REISERFS_FS is not set |
1113 | # CONFIG_JFS_FS is not set | 948 | # CONFIG_JFS_FS is not set |
1114 | # CONFIG_FS_POSIX_ACL is not set | 949 | CONFIG_FS_POSIX_ACL=y |
1115 | CONFIG_XFS_FS=y | 950 | CONFIG_XFS_FS=y |
1116 | CONFIG_XFS_QUOTA=y | 951 | CONFIG_XFS_QUOTA=y |
1117 | # CONFIG_XFS_SECURITY is not set | 952 | # CONFIG_XFS_SECURITY is not set |
@@ -1125,10 +960,11 @@ CONFIG_INOTIFY=y | |||
1125 | CONFIG_INOTIFY_USER=y | 960 | CONFIG_INOTIFY_USER=y |
1126 | # CONFIG_QUOTA is not set | 961 | # CONFIG_QUOTA is not set |
1127 | CONFIG_QUOTACTL=y | 962 | CONFIG_QUOTACTL=y |
1128 | # CONFIG_DNOTIFY is not set | 963 | CONFIG_DNOTIFY=y |
1129 | # CONFIG_AUTOFS_FS is not set | 964 | # CONFIG_AUTOFS_FS is not set |
1130 | CONFIG_AUTOFS4_FS=y | 965 | CONFIG_AUTOFS4_FS=y |
1131 | # CONFIG_FUSE_FS is not set | 966 | # CONFIG_FUSE_FS is not set |
967 | CONFIG_GENERIC_ACL=y | ||
1132 | 968 | ||
1133 | # | 969 | # |
1134 | # CD-ROM/DVD Filesystems | 970 | # CD-ROM/DVD Filesystems |
@@ -1151,10 +987,10 @@ CONFIG_PROC_KCORE=y | |||
1151 | CONFIG_PROC_SYSCTL=y | 987 | CONFIG_PROC_SYSCTL=y |
1152 | CONFIG_SYSFS=y | 988 | CONFIG_SYSFS=y |
1153 | CONFIG_TMPFS=y | 989 | CONFIG_TMPFS=y |
1154 | # CONFIG_TMPFS_POSIX_ACL is not set | 990 | CONFIG_TMPFS_POSIX_ACL=y |
1155 | # CONFIG_HUGETLB_PAGE is not set | 991 | # CONFIG_HUGETLB_PAGE is not set |
1156 | CONFIG_RAMFS=y | 992 | CONFIG_RAMFS=y |
1157 | CONFIG_CONFIGFS_FS=m | 993 | # CONFIG_CONFIGFS_FS is not set |
1158 | 994 | ||
1159 | # | 995 | # |
1160 | # Miscellaneous filesystems | 996 | # Miscellaneous filesystems |
@@ -1181,12 +1017,18 @@ CONFIG_NFS_V3=y | |||
1181 | # CONFIG_NFS_V3_ACL is not set | 1017 | # CONFIG_NFS_V3_ACL is not set |
1182 | # CONFIG_NFS_V4 is not set | 1018 | # CONFIG_NFS_V4 is not set |
1183 | # CONFIG_NFS_DIRECTIO is not set | 1019 | # CONFIG_NFS_DIRECTIO is not set |
1184 | # CONFIG_NFSD is not set | 1020 | CONFIG_NFSD=m |
1021 | CONFIG_NFSD_V3=y | ||
1022 | # CONFIG_NFSD_V3_ACL is not set | ||
1023 | # CONFIG_NFSD_V4 is not set | ||
1024 | CONFIG_NFSD_TCP=y | ||
1185 | CONFIG_ROOT_NFS=y | 1025 | CONFIG_ROOT_NFS=y |
1186 | CONFIG_LOCKD=y | 1026 | CONFIG_LOCKD=y |
1187 | CONFIG_LOCKD_V4=y | 1027 | CONFIG_LOCKD_V4=y |
1028 | CONFIG_EXPORTFS=m | ||
1188 | CONFIG_NFS_COMMON=y | 1029 | CONFIG_NFS_COMMON=y |
1189 | CONFIG_SUNRPC=y | 1030 | CONFIG_SUNRPC=y |
1031 | # CONFIG_SUNRPC_BIND34 is not set | ||
1190 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1032 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1191 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1033 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1192 | # CONFIG_SMB_FS is not set | 1034 | # CONFIG_SMB_FS is not set |
@@ -1194,7 +1036,6 @@ CONFIG_SUNRPC=y | |||
1194 | # CONFIG_NCP_FS is not set | 1036 | # CONFIG_NCP_FS is not set |
1195 | # CONFIG_CODA_FS is not set | 1037 | # CONFIG_CODA_FS is not set |
1196 | # CONFIG_AFS_FS is not set | 1038 | # CONFIG_AFS_FS is not set |
1197 | # CONFIG_9P_FS is not set | ||
1198 | 1039 | ||
1199 | # | 1040 | # |
1200 | # Partition Types | 1041 | # Partition Types |
@@ -1210,10 +1051,7 @@ CONFIG_MSDOS_PARTITION=y | |||
1210 | # | 1051 | # |
1211 | # Distributed Lock Manager | 1052 | # Distributed Lock Manager |
1212 | # | 1053 | # |
1213 | CONFIG_DLM=m | 1054 | # CONFIG_DLM is not set |
1214 | CONFIG_DLM_TCP=y | ||
1215 | # CONFIG_DLM_SCTP is not set | ||
1216 | # CONFIG_DLM_DEBUG is not set | ||
1217 | 1055 | ||
1218 | # | 1056 | # |
1219 | # Profiling support | 1057 | # Profiling support |
@@ -1231,7 +1069,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1231 | # CONFIG_DEBUG_FS is not set | 1069 | # CONFIG_DEBUG_FS is not set |
1232 | # CONFIG_HEADERS_CHECK is not set | 1070 | # CONFIG_HEADERS_CHECK is not set |
1233 | # CONFIG_DEBUG_KERNEL is not set | 1071 | # CONFIG_DEBUG_KERNEL is not set |
1234 | CONFIG_LOG_BUF_SHIFT=14 | ||
1235 | CONFIG_CROSSCOMPILE=y | 1072 | CONFIG_CROSSCOMPILE=y |
1236 | CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" | 1073 | CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" |
1237 | 1074 | ||
@@ -1240,63 +1077,20 @@ CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" | |||
1240 | # | 1077 | # |
1241 | # CONFIG_KEYS is not set | 1078 | # CONFIG_KEYS is not set |
1242 | # CONFIG_SECURITY is not set | 1079 | # CONFIG_SECURITY is not set |
1243 | 1080 | # CONFIG_CRYPTO is not set | |
1244 | # | ||
1245 | # Cryptographic options | ||
1246 | # | ||
1247 | CONFIG_CRYPTO=y | ||
1248 | CONFIG_CRYPTO_ALGAPI=y | ||
1249 | CONFIG_CRYPTO_BLKCIPHER=m | ||
1250 | CONFIG_CRYPTO_HASH=m | ||
1251 | CONFIG_CRYPTO_MANAGER=m | ||
1252 | CONFIG_CRYPTO_HMAC=m | ||
1253 | CONFIG_CRYPTO_XCBC=m | ||
1254 | CONFIG_CRYPTO_NULL=m | ||
1255 | CONFIG_CRYPTO_MD4=m | ||
1256 | CONFIG_CRYPTO_MD5=y | ||
1257 | CONFIG_CRYPTO_SHA1=m | ||
1258 | CONFIG_CRYPTO_SHA256=m | ||
1259 | CONFIG_CRYPTO_SHA512=m | ||
1260 | CONFIG_CRYPTO_WP512=m | ||
1261 | CONFIG_CRYPTO_TGR192=m | ||
1262 | CONFIG_CRYPTO_GF128MUL=m | ||
1263 | CONFIG_CRYPTO_ECB=m | ||
1264 | CONFIG_CRYPTO_CBC=m | ||
1265 | CONFIG_CRYPTO_PCBC=m | ||
1266 | CONFIG_CRYPTO_LRW=m | ||
1267 | CONFIG_CRYPTO_DES=m | ||
1268 | CONFIG_CRYPTO_FCRYPT=m | ||
1269 | CONFIG_CRYPTO_BLOWFISH=m | ||
1270 | CONFIG_CRYPTO_TWOFISH=m | ||
1271 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
1272 | CONFIG_CRYPTO_SERPENT=m | ||
1273 | CONFIG_CRYPTO_AES=m | ||
1274 | CONFIG_CRYPTO_CAST5=m | ||
1275 | CONFIG_CRYPTO_CAST6=m | ||
1276 | CONFIG_CRYPTO_TEA=m | ||
1277 | CONFIG_CRYPTO_ARC4=m | ||
1278 | CONFIG_CRYPTO_KHAZAD=m | ||
1279 | CONFIG_CRYPTO_ANUBIS=m | ||
1280 | CONFIG_CRYPTO_DEFLATE=m | ||
1281 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1282 | CONFIG_CRYPTO_CRC32C=m | ||
1283 | CONFIG_CRYPTO_CAMELLIA=m | ||
1284 | # CONFIG_CRYPTO_TEST is not set | ||
1285 | |||
1286 | # | ||
1287 | # Hardware crypto devices | ||
1288 | # | ||
1289 | 1081 | ||
1290 | # | 1082 | # |
1291 | # Library routines | 1083 | # Library routines |
1292 | # | 1084 | # |
1293 | CONFIG_BITREVERSE=y | 1085 | CONFIG_BITREVERSE=y |
1294 | # CONFIG_CRC_CCITT is not set | 1086 | CONFIG_CRC_CCITT=y |
1295 | # CONFIG_CRC16 is not set | 1087 | # CONFIG_CRC16 is not set |
1088 | # CONFIG_CRC_ITU_T is not set | ||
1296 | CONFIG_CRC32=y | 1089 | CONFIG_CRC32=y |
1297 | CONFIG_LIBCRC32C=m | 1090 | # CONFIG_CRC7 is not set |
1091 | # CONFIG_LIBCRC32C is not set | ||
1298 | CONFIG_ZLIB_INFLATE=m | 1092 | CONFIG_ZLIB_INFLATE=m |
1299 | CONFIG_ZLIB_DEFLATE=m | ||
1300 | CONFIG_PLIST=y | 1093 | CONFIG_PLIST=y |
1301 | CONFIG_HAS_IOMEM=y | 1094 | CONFIG_HAS_IOMEM=y |
1302 | CONFIG_HAS_IOPORT=y | 1095 | CONFIG_HAS_IOPORT=y |
1096 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig index db6fd4f15719..b52256ca0b53 100644 --- a/arch/mips/configs/workpad_defconfig +++ b/arch/mips/configs/workpad_defconfig | |||
@@ -1,60 +1,47 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.20 | 3 | # Linux kernel version: 2.6.23-rc2 |
4 | # Tue Feb 20 21:47:42 2007 | 4 | # Thu Aug 9 14:33:57 2007 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
8 | # | 8 | # |
9 | # Machine selection | 9 | # Machine selection |
10 | # | 10 | # |
11 | CONFIG_ZONE_DMA=y | 11 | # CONFIG_MACH_ALCHEMY is not set |
12 | # CONFIG_MIPS_MTX1 is not set | ||
13 | # CONFIG_MIPS_BOSPORUS is not set | ||
14 | # CONFIG_MIPS_PB1000 is not set | ||
15 | # CONFIG_MIPS_PB1100 is not set | ||
16 | # CONFIG_MIPS_PB1500 is not set | ||
17 | # CONFIG_MIPS_PB1550 is not set | ||
18 | # CONFIG_MIPS_PB1200 is not set | ||
19 | # CONFIG_MIPS_DB1000 is not set | ||
20 | # CONFIG_MIPS_DB1100 is not set | ||
21 | # CONFIG_MIPS_DB1500 is not set | ||
22 | # CONFIG_MIPS_DB1550 is not set | ||
23 | # CONFIG_MIPS_DB1200 is not set | ||
24 | # CONFIG_MIPS_MIRAGE is not set | ||
25 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
26 | # CONFIG_MIPS_COBALT is not set | 13 | # CONFIG_MIPS_COBALT is not set |
27 | # CONFIG_MACH_DECSTATION is not set | 14 | # CONFIG_MACH_DECSTATION is not set |
28 | # CONFIG_MACH_JAZZ is not set | 15 | # CONFIG_MACH_JAZZ is not set |
16 | # CONFIG_LEMOTE_FULONG is not set | ||
29 | # CONFIG_MIPS_ATLAS is not set | 17 | # CONFIG_MIPS_ATLAS is not set |
30 | # CONFIG_MIPS_MALTA is not set | 18 | # CONFIG_MIPS_MALTA is not set |
31 | # CONFIG_MIPS_SEAD is not set | 19 | # CONFIG_MIPS_SEAD is not set |
32 | # CONFIG_WR_PPMC is not set | ||
33 | # CONFIG_MIPS_SIM is not set | 20 | # CONFIG_MIPS_SIM is not set |
34 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 21 | # CONFIG_MARKEINS is not set |
35 | # CONFIG_MIPS_XXS1500 is not set | 22 | CONFIG_MACH_VR41XX=y |
36 | # CONFIG_PNX8550_JBS is not set | 23 | # CONFIG_PNX8550_JBS is not set |
37 | # CONFIG_PNX8550_STB810 is not set | 24 | # CONFIG_PNX8550_STB810 is not set |
38 | CONFIG_MACH_VR41XX=y | 25 | # CONFIG_PMC_MSP is not set |
39 | # CONFIG_PMC_YOSEMITE is not set | 26 | # CONFIG_PMC_YOSEMITE is not set |
40 | # CONFIG_QEMU is not set | 27 | # CONFIG_QEMU is not set |
41 | # CONFIG_MARKEINS is not set | ||
42 | # CONFIG_SGI_IP22 is not set | 28 | # CONFIG_SGI_IP22 is not set |
43 | # CONFIG_SGI_IP27 is not set | 29 | # CONFIG_SGI_IP27 is not set |
44 | # CONFIG_SGI_IP32 is not set | 30 | # CONFIG_SGI_IP32 is not set |
45 | # CONFIG_SIBYTE_BIGSUR is not set | 31 | # CONFIG_SIBYTE_CRHINE is not set |
32 | # CONFIG_SIBYTE_CARMEL is not set | ||
33 | # CONFIG_SIBYTE_CRHONE is not set | ||
34 | # CONFIG_SIBYTE_RHONE is not set | ||
46 | # CONFIG_SIBYTE_SWARM is not set | 35 | # CONFIG_SIBYTE_SWARM is not set |
36 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 37 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | ||
49 | # CONFIG_SIBYTE_CARMEL is not set | ||
50 | # CONFIG_SIBYTE_PTSWARM is not set | 38 | # CONFIG_SIBYTE_PTSWARM is not set |
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 39 | # CONFIG_SIBYTE_BIGSUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | ||
53 | # CONFIG_SIBYTE_CRHONE is not set | ||
54 | # CONFIG_SNI_RM is not set | 40 | # CONFIG_SNI_RM is not set |
55 | # CONFIG_TOSHIBA_JMR3927 is not set | 41 | # CONFIG_TOSHIBA_JMR3927 is not set |
56 | # CONFIG_TOSHIBA_RBTX4927 is not set | 42 | # CONFIG_TOSHIBA_RBTX4927 is not set |
57 | # CONFIG_TOSHIBA_RBTX4938 is not set | 43 | # CONFIG_TOSHIBA_RBTX4938 is not set |
44 | # CONFIG_WR_PPMC is not set | ||
58 | # CONFIG_CASIO_E55 is not set | 45 | # CONFIG_CASIO_E55 is not set |
59 | CONFIG_IBM_WORKPAD=y | 46 | CONFIG_IBM_WORKPAD=y |
60 | # CONFIG_NEC_CMBVR4133 is not set | 47 | # CONFIG_NEC_CMBVR4133 is not set |
@@ -72,6 +59,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
72 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 59 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
73 | CONFIG_DMA_NONCOHERENT=y | 60 | CONFIG_DMA_NONCOHERENT=y |
74 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 61 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
62 | # CONFIG_HOTPLUG_CPU is not set | ||
63 | # CONFIG_NO_IOPORT is not set | ||
75 | # CONFIG_CPU_BIG_ENDIAN is not set | 64 | # CONFIG_CPU_BIG_ENDIAN is not set |
76 | CONFIG_CPU_LITTLE_ENDIAN=y | 65 | CONFIG_CPU_LITTLE_ENDIAN=y |
77 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 66 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
@@ -81,6 +70,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
81 | # | 70 | # |
82 | # CPU selection | 71 | # CPU selection |
83 | # | 72 | # |
73 | # CONFIG_CPU_LOONGSON2 is not set | ||
84 | # CONFIG_CPU_MIPS32_R1 is not set | 74 | # CONFIG_CPU_MIPS32_R1 is not set |
85 | # CONFIG_CPU_MIPS32_R2 is not set | 75 | # CONFIG_CPU_MIPS32_R2 is not set |
86 | # CONFIG_CPU_MIPS64_R1 is not set | 76 | # CONFIG_CPU_MIPS64_R1 is not set |
@@ -102,7 +92,6 @@ CONFIG_CPU_VR41XX=y | |||
102 | # CONFIG_CPU_SB1 is not set | 92 | # CONFIG_CPU_SB1 is not set |
103 | CONFIG_SYS_HAS_CPU_VR41XX=y | 93 | CONFIG_SYS_HAS_CPU_VR41XX=y |
104 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y | 94 | CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y |
105 | CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y | ||
106 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y | 95 | CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y |
107 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y | 96 | CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y |
108 | 97 | ||
@@ -118,7 +107,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
118 | CONFIG_MIPS_MT_DISABLED=y | 107 | CONFIG_MIPS_MT_DISABLED=y |
119 | # CONFIG_MIPS_MT_SMP is not set | 108 | # CONFIG_MIPS_MT_SMP is not set |
120 | # CONFIG_MIPS_MT_SMTC is not set | 109 | # CONFIG_MIPS_MT_SMTC is not set |
121 | # CONFIG_MIPS_VPE_LOADER is not set | ||
122 | CONFIG_CPU_HAS_SYNC=y | 110 | CONFIG_CPU_HAS_SYNC=y |
123 | CONFIG_GENERIC_HARDIRQS=y | 111 | CONFIG_GENERIC_HARDIRQS=y |
124 | CONFIG_GENERIC_IRQ_PROBE=y | 112 | CONFIG_GENERIC_IRQ_PROBE=y |
@@ -132,48 +120,47 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
132 | # CONFIG_SPARSEMEM_STATIC is not set | 120 | # CONFIG_SPARSEMEM_STATIC is not set |
133 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 121 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
134 | # CONFIG_RESOURCES_64BIT is not set | 122 | # CONFIG_RESOURCES_64BIT is not set |
135 | CONFIG_ZONE_DMA_FLAG=1 | 123 | CONFIG_ZONE_DMA_FLAG=0 |
124 | CONFIG_VIRT_TO_BUS=y | ||
136 | # CONFIG_HZ_48 is not set | 125 | # CONFIG_HZ_48 is not set |
137 | # CONFIG_HZ_100 is not set | 126 | # CONFIG_HZ_100 is not set |
138 | # CONFIG_HZ_128 is not set | 127 | # CONFIG_HZ_128 is not set |
139 | # CONFIG_HZ_250 is not set | 128 | CONFIG_HZ_250=y |
140 | # CONFIG_HZ_256 is not set | 129 | # CONFIG_HZ_256 is not set |
141 | CONFIG_HZ_1000=y | 130 | # CONFIG_HZ_1000 is not set |
142 | # CONFIG_HZ_1024 is not set | 131 | # CONFIG_HZ_1024 is not set |
143 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y | 132 | CONFIG_SYS_SUPPORTS_ARBIT_HZ=y |
144 | CONFIG_HZ=1000 | 133 | CONFIG_HZ=250 |
145 | CONFIG_PREEMPT_NONE=y | 134 | CONFIG_PREEMPT_NONE=y |
146 | # CONFIG_PREEMPT_VOLUNTARY is not set | 135 | # CONFIG_PREEMPT_VOLUNTARY is not set |
147 | # CONFIG_PREEMPT is not set | 136 | # CONFIG_PREEMPT is not set |
148 | # CONFIG_KEXEC is not set | 137 | # CONFIG_KEXEC is not set |
138 | CONFIG_SECCOMP=y | ||
149 | CONFIG_LOCKDEP_SUPPORT=y | 139 | CONFIG_LOCKDEP_SUPPORT=y |
150 | CONFIG_STACKTRACE_SUPPORT=y | 140 | CONFIG_STACKTRACE_SUPPORT=y |
151 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 141 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
152 | 142 | ||
153 | # | 143 | # |
154 | # Code maturity level options | 144 | # General setup |
155 | # | 145 | # |
156 | CONFIG_EXPERIMENTAL=y | 146 | CONFIG_EXPERIMENTAL=y |
157 | CONFIG_BROKEN_ON_SMP=y | 147 | CONFIG_BROKEN_ON_SMP=y |
158 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 148 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
159 | |||
160 | # | ||
161 | # General setup | ||
162 | # | ||
163 | CONFIG_LOCALVERSION="" | 149 | CONFIG_LOCALVERSION="" |
164 | CONFIG_LOCALVERSION_AUTO=y | 150 | CONFIG_LOCALVERSION_AUTO=y |
165 | CONFIG_SWAP=y | 151 | CONFIG_SWAP=y |
166 | CONFIG_SYSVIPC=y | 152 | CONFIG_SYSVIPC=y |
167 | # CONFIG_IPC_NS is not set | ||
168 | CONFIG_SYSVIPC_SYSCTL=y | 153 | CONFIG_SYSVIPC_SYSCTL=y |
169 | # CONFIG_POSIX_MQUEUE is not set | 154 | # CONFIG_POSIX_MQUEUE is not set |
170 | # CONFIG_BSD_PROCESS_ACCT is not set | 155 | # CONFIG_BSD_PROCESS_ACCT is not set |
171 | # CONFIG_TASKSTATS is not set | 156 | # CONFIG_TASKSTATS is not set |
172 | # CONFIG_UTS_NS is not set | 157 | # CONFIG_USER_NS is not set |
173 | # CONFIG_AUDIT is not set | 158 | # CONFIG_AUDIT is not set |
174 | # CONFIG_IKCONFIG is not set | 159 | # CONFIG_IKCONFIG is not set |
160 | CONFIG_LOG_BUF_SHIFT=14 | ||
175 | CONFIG_SYSFS_DEPRECATED=y | 161 | CONFIG_SYSFS_DEPRECATED=y |
176 | # CONFIG_RELAY is not set | 162 | # CONFIG_RELAY is not set |
163 | # CONFIG_BLK_DEV_INITRD is not set | ||
177 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 164 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
178 | CONFIG_SYSCTL=y | 165 | CONFIG_SYSCTL=y |
179 | CONFIG_EMBEDDED=y | 166 | CONFIG_EMBEDDED=y |
@@ -186,32 +173,30 @@ CONFIG_BUG=y | |||
186 | CONFIG_ELF_CORE=y | 173 | CONFIG_ELF_CORE=y |
187 | CONFIG_BASE_FULL=y | 174 | CONFIG_BASE_FULL=y |
188 | CONFIG_FUTEX=y | 175 | CONFIG_FUTEX=y |
176 | CONFIG_ANON_INODES=y | ||
189 | CONFIG_EPOLL=y | 177 | CONFIG_EPOLL=y |
178 | CONFIG_SIGNALFD=y | ||
179 | CONFIG_TIMERFD=y | ||
180 | CONFIG_EVENTFD=y | ||
190 | CONFIG_SHMEM=y | 181 | CONFIG_SHMEM=y |
191 | CONFIG_SLAB=y | ||
192 | CONFIG_VM_EVENT_COUNTERS=y | 182 | CONFIG_VM_EVENT_COUNTERS=y |
183 | CONFIG_SLAB=y | ||
184 | # CONFIG_SLUB is not set | ||
185 | # CONFIG_SLOB is not set | ||
193 | CONFIG_RT_MUTEXES=y | 186 | CONFIG_RT_MUTEXES=y |
194 | # CONFIG_TINY_SHMEM is not set | 187 | # CONFIG_TINY_SHMEM is not set |
195 | CONFIG_BASE_SMALL=0 | 188 | CONFIG_BASE_SMALL=0 |
196 | # CONFIG_SLOB is not set | ||
197 | |||
198 | # | ||
199 | # Loadable module support | ||
200 | # | ||
201 | CONFIG_MODULES=y | 189 | CONFIG_MODULES=y |
202 | CONFIG_MODULE_UNLOAD=y | 190 | CONFIG_MODULE_UNLOAD=y |
203 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 191 | CONFIG_MODULE_FORCE_UNLOAD=y |
204 | CONFIG_MODVERSIONS=y | 192 | CONFIG_MODVERSIONS=y |
205 | CONFIG_MODULE_SRCVERSION_ALL=y | 193 | CONFIG_MODULE_SRCVERSION_ALL=y |
206 | CONFIG_KMOD=y | 194 | CONFIG_KMOD=y |
207 | |||
208 | # | ||
209 | # Block layer | ||
210 | # | ||
211 | CONFIG_BLOCK=y | 195 | CONFIG_BLOCK=y |
212 | # CONFIG_LBD is not set | 196 | # CONFIG_LBD is not set |
213 | # CONFIG_BLK_DEV_IO_TRACE is not set | 197 | # CONFIG_BLK_DEV_IO_TRACE is not set |
214 | # CONFIG_LSF is not set | 198 | # CONFIG_LSF is not set |
199 | # CONFIG_BLK_DEV_BSG is not set | ||
215 | 200 | ||
216 | # | 201 | # |
217 | # IO Schedulers | 202 | # IO Schedulers |
@@ -229,6 +214,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
229 | # | 214 | # |
230 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 215 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
231 | # | 216 | # |
217 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
232 | CONFIG_ISA=y | 218 | CONFIG_ISA=y |
233 | CONFIG_MMU=y | 219 | CONFIG_MMU=y |
234 | 220 | ||
@@ -250,10 +236,6 @@ CONFIG_PCMCIA_PROBE=y | |||
250 | CONFIG_PCMCIA_VRC4171=y | 236 | CONFIG_PCMCIA_VRC4171=y |
251 | 237 | ||
252 | # | 238 | # |
253 | # PCI Hotplug Support | ||
254 | # | ||
255 | |||
256 | # | ||
257 | # Executable file formats | 239 | # Executable file formats |
258 | # | 240 | # |
259 | CONFIG_BINFMT_ELF=y | 241 | CONFIG_BINFMT_ELF=y |
@@ -263,10 +245,7 @@ CONFIG_TRAD_SIGNALS=y | |||
263 | # | 245 | # |
264 | # Power management options | 246 | # Power management options |
265 | # | 247 | # |
266 | CONFIG_PM=y | 248 | # CONFIG_PM is not set |
267 | # CONFIG_PM_LEGACY is not set | ||
268 | # CONFIG_PM_DEBUG is not set | ||
269 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
270 | 249 | ||
271 | # | 250 | # |
272 | # Networking | 251 | # Networking |
@@ -276,7 +255,6 @@ CONFIG_NET=y | |||
276 | # | 255 | # |
277 | # Networking options | 256 | # Networking options |
278 | # | 257 | # |
279 | # CONFIG_NETDEBUG is not set | ||
280 | CONFIG_PACKET=y | 258 | CONFIG_PACKET=y |
281 | CONFIG_PACKET_MMAP=y | 259 | CONFIG_PACKET_MMAP=y |
282 | CONFIG_UNIX=y | 260 | CONFIG_UNIX=y |
@@ -301,34 +279,25 @@ CONFIG_IP_FIB_HASH=y | |||
301 | # CONFIG_INET_IPCOMP is not set | 279 | # CONFIG_INET_IPCOMP is not set |
302 | # CONFIG_INET_XFRM_TUNNEL is not set | 280 | # CONFIG_INET_XFRM_TUNNEL is not set |
303 | # CONFIG_INET_TUNNEL is not set | 281 | # CONFIG_INET_TUNNEL is not set |
304 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 282 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
305 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 283 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
306 | CONFIG_INET_XFRM_MODE_BEET=m | 284 | # CONFIG_INET_XFRM_MODE_BEET is not set |
307 | CONFIG_INET_DIAG=y | 285 | CONFIG_INET_DIAG=y |
308 | CONFIG_INET_TCP_DIAG=y | 286 | CONFIG_INET_TCP_DIAG=y |
309 | # CONFIG_TCP_CONG_ADVANCED is not set | 287 | # CONFIG_TCP_CONG_ADVANCED is not set |
310 | CONFIG_TCP_CONG_CUBIC=y | 288 | CONFIG_TCP_CONG_CUBIC=y |
311 | CONFIG_DEFAULT_TCP_CONG="cubic" | 289 | CONFIG_DEFAULT_TCP_CONG="cubic" |
312 | CONFIG_TCP_MD5SIG=y | 290 | # CONFIG_TCP_MD5SIG is not set |
313 | # CONFIG_IPV6 is not set | 291 | # CONFIG_IPV6 is not set |
314 | # CONFIG_INET6_XFRM_TUNNEL is not set | 292 | # CONFIG_INET6_XFRM_TUNNEL is not set |
315 | # CONFIG_INET6_TUNNEL is not set | 293 | # CONFIG_INET6_TUNNEL is not set |
316 | CONFIG_NETWORK_SECMARK=y | 294 | CONFIG_NETWORK_SECMARK=y |
317 | # CONFIG_NETFILTER is not set | 295 | # CONFIG_NETFILTER is not set |
318 | |||
319 | # | ||
320 | # DCCP Configuration (EXPERIMENTAL) | ||
321 | # | ||
322 | # CONFIG_IP_DCCP is not set | 296 | # CONFIG_IP_DCCP is not set |
323 | |||
324 | # | ||
325 | # SCTP Configuration (EXPERIMENTAL) | ||
326 | # | ||
327 | # CONFIG_IP_SCTP is not set | 297 | # CONFIG_IP_SCTP is not set |
328 | 298 | # CONFIG_SCTP_HMAC_NONE is not set | |
329 | # | 299 | # CONFIG_SCTP_HMAC_SHA1 is not set |
330 | # TIPC Configuration (EXPERIMENTAL) | 300 | # CONFIG_SCTP_HMAC_MD5 is not set |
331 | # | ||
332 | # CONFIG_TIPC is not set | 301 | # CONFIG_TIPC is not set |
333 | # CONFIG_ATM is not set | 302 | # CONFIG_ATM is not set |
334 | # CONFIG_BRIDGE is not set | 303 | # CONFIG_BRIDGE is not set |
@@ -354,8 +323,17 @@ CONFIG_NETWORK_SECMARK=y | |||
354 | # CONFIG_HAMRADIO is not set | 323 | # CONFIG_HAMRADIO is not set |
355 | # CONFIG_IRDA is not set | 324 | # CONFIG_IRDA is not set |
356 | # CONFIG_BT is not set | 325 | # CONFIG_BT is not set |
357 | # CONFIG_IEEE80211 is not set | 326 | # CONFIG_AF_RXRPC is not set |
327 | |||
328 | # | ||
329 | # Wireless | ||
330 | # | ||
331 | # CONFIG_CFG80211 is not set | ||
358 | CONFIG_WIRELESS_EXT=y | 332 | CONFIG_WIRELESS_EXT=y |
333 | # CONFIG_MAC80211 is not set | ||
334 | # CONFIG_IEEE80211 is not set | ||
335 | # CONFIG_RFKILL is not set | ||
336 | # CONFIG_NET_9P is not set | ||
359 | 337 | ||
360 | # | 338 | # |
361 | # Device Drivers | 339 | # Device Drivers |
@@ -368,31 +346,11 @@ CONFIG_STANDALONE=y | |||
368 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 346 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
369 | CONFIG_FW_LOADER=y | 347 | CONFIG_FW_LOADER=y |
370 | # CONFIG_SYS_HYPERVISOR is not set | 348 | # CONFIG_SYS_HYPERVISOR is not set |
371 | 349 | # CONFIG_CONNECTOR is not set | |
372 | # | ||
373 | # Connector - unified userspace <-> kernelspace linker | ||
374 | # | ||
375 | CONFIG_CONNECTOR=m | ||
376 | |||
377 | # | ||
378 | # Memory Technology Devices (MTD) | ||
379 | # | ||
380 | # CONFIG_MTD is not set | 350 | # CONFIG_MTD is not set |
381 | |||
382 | # | ||
383 | # Parallel port support | ||
384 | # | ||
385 | # CONFIG_PARPORT is not set | 351 | # CONFIG_PARPORT is not set |
386 | |||
387 | # | ||
388 | # Plug and Play support | ||
389 | # | ||
390 | # CONFIG_PNP is not set | 352 | # CONFIG_PNP is not set |
391 | # CONFIG_PNPACPI is not set | 353 | CONFIG_BLK_DEV=y |
392 | |||
393 | # | ||
394 | # Block devices | ||
395 | # | ||
396 | # CONFIG_BLK_DEV_COW_COMMON is not set | 354 | # CONFIG_BLK_DEV_COW_COMMON is not set |
397 | # CONFIG_BLK_DEV_LOOP is not set | 355 | # CONFIG_BLK_DEV_LOOP is not set |
398 | # CONFIG_BLK_DEV_NBD is not set | 356 | # CONFIG_BLK_DEV_NBD is not set |
@@ -400,17 +358,9 @@ CONFIG_BLK_DEV_RAM=m | |||
400 | CONFIG_BLK_DEV_RAM_COUNT=16 | 358 | CONFIG_BLK_DEV_RAM_COUNT=16 |
401 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 359 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
402 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 360 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
403 | # CONFIG_BLK_DEV_INITRD is not set | ||
404 | # CONFIG_CDROM_PKTCDVD is not set | 361 | # CONFIG_CDROM_PKTCDVD is not set |
405 | # CONFIG_ATA_OVER_ETH is not set | 362 | # CONFIG_ATA_OVER_ETH is not set |
406 | 363 | # CONFIG_MISC_DEVICES is not set | |
407 | # | ||
408 | # Misc devices | ||
409 | # | ||
410 | |||
411 | # | ||
412 | # ATA/ATAPI/MFM/RLL support | ||
413 | # | ||
414 | CONFIG_IDE=y | 364 | CONFIG_IDE=y |
415 | CONFIG_IDE_MAX_HWIFS=4 | 365 | CONFIG_IDE_MAX_HWIFS=4 |
416 | CONFIG_BLK_DEV_IDE=y | 366 | CONFIG_BLK_DEV_IDE=y |
@@ -426,15 +376,16 @@ CONFIG_BLK_DEV_IDECS=m | |||
426 | # CONFIG_BLK_DEV_IDETAPE is not set | 376 | # CONFIG_BLK_DEV_IDETAPE is not set |
427 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | 377 | # CONFIG_BLK_DEV_IDEFLOPPY is not set |
428 | # CONFIG_IDE_TASK_IOCTL is not set | 378 | # CONFIG_IDE_TASK_IOCTL is not set |
379 | CONFIG_IDE_PROC_FS=y | ||
429 | 380 | ||
430 | # | 381 | # |
431 | # IDE chipset support/bugfixes | 382 | # IDE chipset support/bugfixes |
432 | # | 383 | # |
433 | CONFIG_IDE_GENERIC=y | 384 | CONFIG_IDE_GENERIC=y |
385 | # CONFIG_IDEPCI_PCIBUS_ORDER is not set | ||
434 | # CONFIG_IDE_ARM is not set | 386 | # CONFIG_IDE_ARM is not set |
435 | # CONFIG_IDE_CHIPSETS is not set | 387 | # CONFIG_IDE_CHIPSETS is not set |
436 | # CONFIG_BLK_DEV_IDEDMA is not set | 388 | # CONFIG_BLK_DEV_IDEDMA is not set |
437 | # CONFIG_IDEDMA_AUTO is not set | ||
438 | # CONFIG_BLK_DEV_HD is not set | 389 | # CONFIG_BLK_DEV_HD is not set |
439 | 390 | ||
440 | # | 391 | # |
@@ -442,135 +393,38 @@ CONFIG_IDE_GENERIC=y | |||
442 | # | 393 | # |
443 | # CONFIG_RAID_ATTRS is not set | 394 | # CONFIG_RAID_ATTRS is not set |
444 | # CONFIG_SCSI is not set | 395 | # CONFIG_SCSI is not set |
396 | # CONFIG_SCSI_DMA is not set | ||
445 | # CONFIG_SCSI_NETLINK is not set | 397 | # CONFIG_SCSI_NETLINK is not set |
446 | |||
447 | # | ||
448 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
449 | # | ||
450 | # CONFIG_ATA is not set | 398 | # CONFIG_ATA is not set |
451 | |||
452 | # | ||
453 | # Old CD-ROM drivers (not SCSI, not IDE) | ||
454 | # | ||
455 | # CONFIG_CD_NO_IDESCSI is not set | ||
456 | |||
457 | # | ||
458 | # Multi-device support (RAID and LVM) | ||
459 | # | ||
460 | # CONFIG_MD is not set | 399 | # CONFIG_MD is not set |
461 | |||
462 | # | ||
463 | # Fusion MPT device support | ||
464 | # | ||
465 | # CONFIG_FUSION is not set | ||
466 | |||
467 | # | ||
468 | # IEEE 1394 (FireWire) support | ||
469 | # | ||
470 | |||
471 | # | ||
472 | # I2O device support | ||
473 | # | ||
474 | |||
475 | # | ||
476 | # Network device support | ||
477 | # | ||
478 | CONFIG_NETDEVICES=y | 400 | CONFIG_NETDEVICES=y |
401 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
479 | # CONFIG_DUMMY is not set | 402 | # CONFIG_DUMMY is not set |
480 | # CONFIG_BONDING is not set | 403 | # CONFIG_BONDING is not set |
404 | # CONFIG_MACVLAN is not set | ||
481 | # CONFIG_EQUALIZER is not set | 405 | # CONFIG_EQUALIZER is not set |
482 | # CONFIG_TUN is not set | 406 | # CONFIG_TUN is not set |
483 | |||
484 | # | ||
485 | # ARCnet devices | ||
486 | # | ||
487 | # CONFIG_ARCNET is not set | 407 | # CONFIG_ARCNET is not set |
488 | 408 | # CONFIG_NET_ETHERNET is not set | |
489 | # | ||
490 | # PHY device support | ||
491 | # | ||
492 | CONFIG_PHYLIB=m | ||
493 | |||
494 | # | ||
495 | # MII PHY device drivers | ||
496 | # | ||
497 | CONFIG_MARVELL_PHY=m | ||
498 | CONFIG_DAVICOM_PHY=m | ||
499 | CONFIG_QSEMI_PHY=m | ||
500 | CONFIG_LXT_PHY=m | ||
501 | CONFIG_CICADA_PHY=m | ||
502 | CONFIG_VITESSE_PHY=m | ||
503 | CONFIG_SMSC_PHY=m | ||
504 | # CONFIG_BROADCOM_PHY is not set | ||
505 | # CONFIG_FIXED_PHY is not set | ||
506 | |||
507 | # | ||
508 | # Ethernet (10 or 100Mbit) | ||
509 | # | ||
510 | CONFIG_NET_ETHERNET=y | ||
511 | CONFIG_MII=m | 409 | CONFIG_MII=m |
512 | # CONFIG_NET_VENDOR_3COM is not set | 410 | # CONFIG_NETDEV_1000 is not set |
513 | # CONFIG_NET_VENDOR_SMC is not set | 411 | # CONFIG_NETDEV_10000 is not set |
514 | # CONFIG_DM9000 is not set | ||
515 | # CONFIG_NET_VENDOR_RACAL is not set | ||
516 | # CONFIG_AT1700 is not set | ||
517 | # CONFIG_DEPCA is not set | ||
518 | # CONFIG_HP100 is not set | ||
519 | # CONFIG_NET_ISA is not set | ||
520 | # CONFIG_NET_PCI is not set | ||
521 | |||
522 | # | ||
523 | # Ethernet (1000 Mbit) | ||
524 | # | ||
525 | |||
526 | # | ||
527 | # Ethernet (10000 Mbit) | ||
528 | # | ||
529 | |||
530 | # | ||
531 | # Token Ring devices | ||
532 | # | ||
533 | # CONFIG_TR is not set | 412 | # CONFIG_TR is not set |
534 | 413 | ||
535 | # | 414 | # |
536 | # Wireless LAN (non-hamradio) | 415 | # Wireless LAN |
537 | # | ||
538 | CONFIG_NET_RADIO=y | ||
539 | # CONFIG_NET_WIRELESS_RTNETLINK is not set | ||
540 | |||
541 | # | ||
542 | # Obsolete Wireless cards support (pre-802.11) | ||
543 | # | ||
544 | # CONFIG_STRIP is not set | ||
545 | # CONFIG_ARLAN is not set | ||
546 | # CONFIG_WAVELAN is not set | ||
547 | # CONFIG_PCMCIA_WAVELAN is not set | ||
548 | # CONFIG_PCMCIA_NETWAVE is not set | ||
549 | |||
550 | # | ||
551 | # Wireless 802.11 Frequency Hopping cards support | ||
552 | # | 416 | # |
417 | # CONFIG_WLAN_PRE80211 is not set | ||
418 | CONFIG_WLAN_80211=y | ||
553 | # CONFIG_PCMCIA_RAYCS is not set | 419 | # CONFIG_PCMCIA_RAYCS is not set |
554 | 420 | # CONFIG_LIBERTAS is not set | |
555 | # | ||
556 | # Wireless 802.11b ISA/PCI cards support | ||
557 | # | ||
558 | CONFIG_HERMES=m | 421 | CONFIG_HERMES=m |
559 | # CONFIG_ATMEL is not set | 422 | # CONFIG_ATMEL is not set |
560 | |||
561 | # | ||
562 | # Wireless 802.11b Pcmcia/Cardbus cards support | ||
563 | # | ||
564 | CONFIG_PCMCIA_HERMES=m | 423 | CONFIG_PCMCIA_HERMES=m |
565 | # CONFIG_PCMCIA_SPECTRUM is not set | 424 | # CONFIG_PCMCIA_SPECTRUM is not set |
566 | # CONFIG_AIRO_CS is not set | 425 | # CONFIG_AIRO_CS is not set |
567 | # CONFIG_PCMCIA_WL3501 is not set | 426 | # CONFIG_PCMCIA_WL3501 is not set |
568 | # CONFIG_HOSTAP is not set | 427 | # CONFIG_HOSTAP is not set |
569 | CONFIG_NET_WIRELESS=y | ||
570 | |||
571 | # | ||
572 | # PCMCIA network device support | ||
573 | # | ||
574 | CONFIG_NET_PCMCIA=y | 428 | CONFIG_NET_PCMCIA=y |
575 | CONFIG_PCMCIA_3C589=m | 429 | CONFIG_PCMCIA_3C589=m |
576 | CONFIG_PCMCIA_3C574=m | 430 | CONFIG_PCMCIA_3C574=m |
@@ -580,10 +434,6 @@ CONFIG_PCMCIA_NMCLAN=m | |||
580 | CONFIG_PCMCIA_SMC91C92=m | 434 | CONFIG_PCMCIA_SMC91C92=m |
581 | CONFIG_PCMCIA_XIRC2PS=m | 435 | CONFIG_PCMCIA_XIRC2PS=m |
582 | CONFIG_PCMCIA_AXNET=m | 436 | CONFIG_PCMCIA_AXNET=m |
583 | |||
584 | # | ||
585 | # Wan interfaces | ||
586 | # | ||
587 | # CONFIG_WAN is not set | 437 | # CONFIG_WAN is not set |
588 | # CONFIG_PPP is not set | 438 | # CONFIG_PPP is not set |
589 | # CONFIG_SLIP is not set | 439 | # CONFIG_SLIP is not set |
@@ -591,15 +441,7 @@ CONFIG_PCMCIA_AXNET=m | |||
591 | # CONFIG_NETCONSOLE is not set | 441 | # CONFIG_NETCONSOLE is not set |
592 | # CONFIG_NETPOLL is not set | 442 | # CONFIG_NETPOLL is not set |
593 | # CONFIG_NET_POLL_CONTROLLER is not set | 443 | # CONFIG_NET_POLL_CONTROLLER is not set |
594 | |||
595 | # | ||
596 | # ISDN subsystem | ||
597 | # | ||
598 | # CONFIG_ISDN is not set | 444 | # CONFIG_ISDN is not set |
599 | |||
600 | # | ||
601 | # Telephony Support | ||
602 | # | ||
603 | # CONFIG_PHONE is not set | 445 | # CONFIG_PHONE is not set |
604 | 446 | ||
605 | # | 447 | # |
@@ -607,6 +449,7 @@ CONFIG_PCMCIA_AXNET=m | |||
607 | # | 449 | # |
608 | CONFIG_INPUT=y | 450 | CONFIG_INPUT=y |
609 | # CONFIG_INPUT_FF_MEMLESS is not set | 451 | # CONFIG_INPUT_FF_MEMLESS is not set |
452 | # CONFIG_INPUT_POLLDEV is not set | ||
610 | 453 | ||
611 | # | 454 | # |
612 | # Userland interfaces | 455 | # Userland interfaces |
@@ -623,6 +466,7 @@ CONFIG_INPUT=y | |||
623 | # CONFIG_INPUT_KEYBOARD is not set | 466 | # CONFIG_INPUT_KEYBOARD is not set |
624 | # CONFIG_INPUT_MOUSE is not set | 467 | # CONFIG_INPUT_MOUSE is not set |
625 | # CONFIG_INPUT_JOYSTICK is not set | 468 | # CONFIG_INPUT_JOYSTICK is not set |
469 | # CONFIG_INPUT_TABLET is not set | ||
626 | # CONFIG_INPUT_TOUCHSCREEN is not set | 470 | # CONFIG_INPUT_TOUCHSCREEN is not set |
627 | # CONFIG_INPUT_MISC is not set | 471 | # CONFIG_INPUT_MISC is not set |
628 | 472 | ||
@@ -656,19 +500,10 @@ CONFIG_SERIAL_VR41XX_CONSOLE=y | |||
656 | CONFIG_UNIX98_PTYS=y | 500 | CONFIG_UNIX98_PTYS=y |
657 | CONFIG_LEGACY_PTYS=y | 501 | CONFIG_LEGACY_PTYS=y |
658 | CONFIG_LEGACY_PTY_COUNT=256 | 502 | CONFIG_LEGACY_PTY_COUNT=256 |
659 | |||
660 | # | ||
661 | # IPMI | ||
662 | # | ||
663 | # CONFIG_IPMI_HANDLER is not set | 503 | # CONFIG_IPMI_HANDLER is not set |
664 | |||
665 | # | ||
666 | # Watchdog Cards | ||
667 | # | ||
668 | # CONFIG_WATCHDOG is not set | 504 | # CONFIG_WATCHDOG is not set |
669 | # CONFIG_HW_RANDOM is not set | 505 | # CONFIG_HW_RANDOM is not set |
670 | # CONFIG_RTC is not set | 506 | # CONFIG_RTC is not set |
671 | # CONFIG_GEN_RTC is not set | ||
672 | # CONFIG_DTLK is not set | 507 | # CONFIG_DTLK is not set |
673 | # CONFIG_R3964 is not set | 508 | # CONFIG_R3964 is not set |
674 | 509 | ||
@@ -678,17 +513,10 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
678 | # CONFIG_SYNCLINK_CS is not set | 513 | # CONFIG_SYNCLINK_CS is not set |
679 | # CONFIG_CARDMAN_4000 is not set | 514 | # CONFIG_CARDMAN_4000 is not set |
680 | # CONFIG_CARDMAN_4040 is not set | 515 | # CONFIG_CARDMAN_4040 is not set |
681 | # CONFIG_GPIO_VR41XX is not set | 516 | CONFIG_GPIO_VR41XX=y |
682 | # CONFIG_RAW_DRIVER is not set | 517 | # CONFIG_RAW_DRIVER is not set |
683 | |||
684 | # | ||
685 | # TPM devices | ||
686 | # | ||
687 | # CONFIG_TCG_TPM is not set | 518 | # CONFIG_TCG_TPM is not set |
688 | 519 | CONFIG_DEVPORT=y | |
689 | # | ||
690 | # I2C support | ||
691 | # | ||
692 | # CONFIG_I2C is not set | 520 | # CONFIG_I2C is not set |
693 | 521 | ||
694 | # | 522 | # |
@@ -696,32 +524,33 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
696 | # | 524 | # |
697 | # CONFIG_SPI is not set | 525 | # CONFIG_SPI is not set |
698 | # CONFIG_SPI_MASTER is not set | 526 | # CONFIG_SPI_MASTER is not set |
699 | |||
700 | # | ||
701 | # Dallas's 1-wire bus | ||
702 | # | ||
703 | # CONFIG_W1 is not set | 527 | # CONFIG_W1 is not set |
528 | # CONFIG_POWER_SUPPLY is not set | ||
529 | # CONFIG_HWMON is not set | ||
704 | 530 | ||
705 | # | 531 | # |
706 | # Hardware Monitoring support | 532 | # Multifunction device drivers |
707 | # | 533 | # |
708 | # CONFIG_HWMON is not set | 534 | # CONFIG_MFD_SM501 is not set |
709 | # CONFIG_HWMON_VID is not set | ||
710 | 535 | ||
711 | # | 536 | # |
712 | # Multimedia devices | 537 | # Multimedia devices |
713 | # | 538 | # |
714 | # CONFIG_VIDEO_DEV is not set | 539 | # CONFIG_VIDEO_DEV is not set |
540 | # CONFIG_DVB_CORE is not set | ||
541 | # CONFIG_DAB is not set | ||
715 | 542 | ||
716 | # | 543 | # |
717 | # Digital Video Broadcasting Devices | 544 | # Graphics support |
718 | # | 545 | # |
719 | # CONFIG_DVB is not set | 546 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
720 | 547 | ||
721 | # | 548 | # |
722 | # Graphics support | 549 | # Display device support |
723 | # | 550 | # |
724 | # CONFIG_FIRMWARE_EDID is not set | 551 | # CONFIG_DISPLAY_SUPPORT is not set |
552 | # CONFIG_VGASTATE is not set | ||
553 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
725 | # CONFIG_FB is not set | 554 | # CONFIG_FB is not set |
726 | 555 | ||
727 | # | 556 | # |
@@ -730,65 +559,51 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
730 | # CONFIG_VGA_CONSOLE is not set | 559 | # CONFIG_VGA_CONSOLE is not set |
731 | # CONFIG_MDA_CONSOLE is not set | 560 | # CONFIG_MDA_CONSOLE is not set |
732 | CONFIG_DUMMY_CONSOLE=y | 561 | CONFIG_DUMMY_CONSOLE=y |
733 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
734 | 562 | ||
735 | # | 563 | # |
736 | # Sound | 564 | # Sound |
737 | # | 565 | # |
738 | # CONFIG_SOUND is not set | 566 | # CONFIG_SOUND is not set |
739 | 567 | CONFIG_HID_SUPPORT=y | |
740 | # | ||
741 | # HID Devices | ||
742 | # | ||
743 | CONFIG_HID=y | 568 | CONFIG_HID=y |
744 | # CONFIG_HID_DEBUG is not set | 569 | # CONFIG_HID_DEBUG is not set |
745 | 570 | # CONFIG_USB_SUPPORT is not set | |
746 | # | ||
747 | # USB support | ||
748 | # | ||
749 | # CONFIG_USB_ARCH_HAS_HCD is not set | ||
750 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
751 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
752 | |||
753 | # | ||
754 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
755 | # | ||
756 | |||
757 | # | ||
758 | # USB Gadget Support | ||
759 | # | ||
760 | # CONFIG_USB_GADGET is not set | ||
761 | |||
762 | # | ||
763 | # MMC/SD Card support | ||
764 | # | ||
765 | # CONFIG_MMC is not set | 571 | # CONFIG_MMC is not set |
766 | |||
767 | # | ||
768 | # LED devices | ||
769 | # | ||
770 | # CONFIG_NEW_LEDS is not set | 572 | # CONFIG_NEW_LEDS is not set |
573 | CONFIG_RTC_LIB=y | ||
574 | CONFIG_RTC_CLASS=y | ||
575 | CONFIG_RTC_HCTOSYS=y | ||
576 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
577 | # CONFIG_RTC_DEBUG is not set | ||
771 | 578 | ||
772 | # | 579 | # |
773 | # LED drivers | 580 | # RTC interfaces |
774 | # | ||
775 | |||
776 | # | ||
777 | # LED Triggers | ||
778 | # | 581 | # |
582 | CONFIG_RTC_INTF_SYSFS=y | ||
583 | CONFIG_RTC_INTF_PROC=y | ||
584 | CONFIG_RTC_INTF_DEV=y | ||
585 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
586 | # CONFIG_RTC_DRV_TEST is not set | ||
779 | 587 | ||
780 | # | 588 | # |
781 | # InfiniBand support | 589 | # SPI RTC drivers |
782 | # | 590 | # |
783 | 591 | ||
784 | # | 592 | # |
785 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 593 | # Platform RTC drivers |
786 | # | 594 | # |
595 | # CONFIG_RTC_DRV_CMOS is not set | ||
596 | # CONFIG_RTC_DRV_DS1553 is not set | ||
597 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
598 | # CONFIG_RTC_DRV_DS1742 is not set | ||
599 | # CONFIG_RTC_DRV_M48T86 is not set | ||
600 | # CONFIG_RTC_DRV_M48T59 is not set | ||
601 | # CONFIG_RTC_DRV_V3020 is not set | ||
787 | 602 | ||
788 | # | 603 | # |
789 | # Real Time Clock | 604 | # on-CPU RTC drivers |
790 | # | 605 | # |
791 | # CONFIG_RTC_CLASS is not set | 606 | CONFIG_RTC_DRV_VR41XX=y |
792 | 607 | ||
793 | # | 608 | # |
794 | # DMA Engine support | 609 | # DMA Engine support |
@@ -804,23 +619,25 @@ CONFIG_HID=y | |||
804 | # | 619 | # |
805 | 620 | ||
806 | # | 621 | # |
807 | # Auxiliary Display support | 622 | # Userspace I/O |
808 | # | ||
809 | |||
810 | # | ||
811 | # Virtualization | ||
812 | # | 623 | # |
624 | # CONFIG_UIO is not set | ||
813 | 625 | ||
814 | # | 626 | # |
815 | # File systems | 627 | # File systems |
816 | # | 628 | # |
817 | CONFIG_EXT2_FS=y | 629 | CONFIG_EXT2_FS=y |
818 | CONFIG_EXT2_FS_XATTR=y | 630 | CONFIG_EXT2_FS_XATTR=y |
819 | CONFIG_EXT2_FS_POSIX_ACL=y | 631 | # CONFIG_EXT2_FS_POSIX_ACL is not set |
820 | CONFIG_EXT2_FS_SECURITY=y | 632 | # CONFIG_EXT2_FS_SECURITY is not set |
821 | # CONFIG_EXT2_FS_XIP is not set | 633 | # CONFIG_EXT2_FS_XIP is not set |
822 | # CONFIG_EXT3_FS is not set | 634 | CONFIG_EXT3_FS=y |
635 | CONFIG_EXT3_FS_XATTR=y | ||
636 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
637 | # CONFIG_EXT3_FS_SECURITY is not set | ||
823 | # CONFIG_EXT4DEV_FS is not set | 638 | # CONFIG_EXT4DEV_FS is not set |
639 | CONFIG_JBD=y | ||
640 | # CONFIG_JBD_DEBUG is not set | ||
824 | CONFIG_FS_MBCACHE=y | 641 | CONFIG_FS_MBCACHE=y |
825 | # CONFIG_REISERFS_FS is not set | 642 | # CONFIG_REISERFS_FS is not set |
826 | # CONFIG_JFS_FS is not set | 643 | # CONFIG_JFS_FS is not set |
@@ -836,7 +653,7 @@ CONFIG_INOTIFY_USER=y | |||
836 | CONFIG_DNOTIFY=y | 653 | CONFIG_DNOTIFY=y |
837 | # CONFIG_AUTOFS_FS is not set | 654 | # CONFIG_AUTOFS_FS is not set |
838 | CONFIG_AUTOFS4_FS=y | 655 | CONFIG_AUTOFS4_FS=y |
839 | CONFIG_FUSE_FS=m | 656 | # CONFIG_FUSE_FS is not set |
840 | CONFIG_GENERIC_ACL=y | 657 | CONFIG_GENERIC_ACL=y |
841 | 658 | ||
842 | # | 659 | # |
@@ -863,7 +680,7 @@ CONFIG_TMPFS=y | |||
863 | CONFIG_TMPFS_POSIX_ACL=y | 680 | CONFIG_TMPFS_POSIX_ACL=y |
864 | # CONFIG_HUGETLB_PAGE is not set | 681 | # CONFIG_HUGETLB_PAGE is not set |
865 | CONFIG_RAMFS=y | 682 | CONFIG_RAMFS=y |
866 | CONFIG_CONFIGFS_FS=m | 683 | # CONFIG_CONFIGFS_FS is not set |
867 | 684 | ||
868 | # | 685 | # |
869 | # Miscellaneous filesystems | 686 | # Miscellaneous filesystems |
@@ -885,17 +702,22 @@ CONFIG_CONFIGFS_FS=m | |||
885 | # | 702 | # |
886 | # Network File Systems | 703 | # Network File Systems |
887 | # | 704 | # |
888 | CONFIG_NFS_FS=y | 705 | CONFIG_NFS_FS=m |
889 | # CONFIG_NFS_V3 is not set | 706 | CONFIG_NFS_V3=y |
707 | # CONFIG_NFS_V3_ACL is not set | ||
890 | # CONFIG_NFS_V4 is not set | 708 | # CONFIG_NFS_V4 is not set |
891 | # CONFIG_NFS_DIRECTIO is not set | 709 | # CONFIG_NFS_DIRECTIO is not set |
892 | CONFIG_NFSD=y | 710 | CONFIG_NFSD=m |
893 | # CONFIG_NFSD_V3 is not set | 711 | CONFIG_NFSD_V3=y |
712 | # CONFIG_NFSD_V3_ACL is not set | ||
713 | # CONFIG_NFSD_V4 is not set | ||
894 | # CONFIG_NFSD_TCP is not set | 714 | # CONFIG_NFSD_TCP is not set |
895 | CONFIG_LOCKD=y | 715 | CONFIG_LOCKD=m |
896 | CONFIG_EXPORTFS=y | 716 | CONFIG_LOCKD_V4=y |
717 | CONFIG_EXPORTFS=m | ||
897 | CONFIG_NFS_COMMON=y | 718 | CONFIG_NFS_COMMON=y |
898 | CONFIG_SUNRPC=y | 719 | CONFIG_SUNRPC=m |
720 | # CONFIG_SUNRPC_BIND34 is not set | ||
899 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 721 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
900 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 722 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
901 | # CONFIG_SMB_FS is not set | 723 | # CONFIG_SMB_FS is not set |
@@ -903,7 +725,6 @@ CONFIG_SUNRPC=y | |||
903 | # CONFIG_NCP_FS is not set | 725 | # CONFIG_NCP_FS is not set |
904 | # CONFIG_CODA_FS is not set | 726 | # CONFIG_CODA_FS is not set |
905 | # CONFIG_AFS_FS is not set | 727 | # CONFIG_AFS_FS is not set |
906 | # CONFIG_9P_FS is not set | ||
907 | 728 | ||
908 | # | 729 | # |
909 | # Partition Types | 730 | # Partition Types |
@@ -919,10 +740,7 @@ CONFIG_MSDOS_PARTITION=y | |||
919 | # | 740 | # |
920 | # Distributed Lock Manager | 741 | # Distributed Lock Manager |
921 | # | 742 | # |
922 | CONFIG_DLM=m | 743 | # CONFIG_DLM is not set |
923 | CONFIG_DLM_TCP=y | ||
924 | # CONFIG_DLM_SCTP is not set | ||
925 | # CONFIG_DLM_DEBUG is not set | ||
926 | 744 | ||
927 | # | 745 | # |
928 | # Profiling support | 746 | # Profiling support |
@@ -940,7 +758,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
940 | # CONFIG_DEBUG_FS is not set | 758 | # CONFIG_DEBUG_FS is not set |
941 | # CONFIG_HEADERS_CHECK is not set | 759 | # CONFIG_HEADERS_CHECK is not set |
942 | # CONFIG_DEBUG_KERNEL is not set | 760 | # CONFIG_DEBUG_KERNEL is not set |
943 | CONFIG_LOG_BUF_SHIFT=14 | ||
944 | CONFIG_CROSSCOMPILE=y | 761 | CONFIG_CROSSCOMPILE=y |
945 | CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x170,0x376,49 mem=16M" | 762 | CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x170,0x376,49 mem=16M" |
946 | 763 | ||
@@ -949,52 +766,7 @@ CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x170,0x376,49 mem=16M" | |||
949 | # | 766 | # |
950 | # CONFIG_KEYS is not set | 767 | # CONFIG_KEYS is not set |
951 | # CONFIG_SECURITY is not set | 768 | # CONFIG_SECURITY is not set |
952 | 769 | # CONFIG_CRYPTO is not set | |
953 | # | ||
954 | # Cryptographic options | ||
955 | # | ||
956 | CONFIG_CRYPTO=y | ||
957 | CONFIG_CRYPTO_ALGAPI=y | ||
958 | CONFIG_CRYPTO_BLKCIPHER=m | ||
959 | CONFIG_CRYPTO_HASH=m | ||
960 | CONFIG_CRYPTO_MANAGER=m | ||
961 | CONFIG_CRYPTO_HMAC=m | ||
962 | CONFIG_CRYPTO_XCBC=m | ||
963 | CONFIG_CRYPTO_NULL=m | ||
964 | CONFIG_CRYPTO_MD4=m | ||
965 | CONFIG_CRYPTO_MD5=y | ||
966 | CONFIG_CRYPTO_SHA1=m | ||
967 | CONFIG_CRYPTO_SHA256=m | ||
968 | CONFIG_CRYPTO_SHA512=m | ||
969 | CONFIG_CRYPTO_WP512=m | ||
970 | CONFIG_CRYPTO_TGR192=m | ||
971 | CONFIG_CRYPTO_GF128MUL=m | ||
972 | CONFIG_CRYPTO_ECB=m | ||
973 | CONFIG_CRYPTO_CBC=m | ||
974 | CONFIG_CRYPTO_PCBC=m | ||
975 | CONFIG_CRYPTO_LRW=m | ||
976 | CONFIG_CRYPTO_DES=m | ||
977 | CONFIG_CRYPTO_FCRYPT=m | ||
978 | CONFIG_CRYPTO_BLOWFISH=m | ||
979 | CONFIG_CRYPTO_TWOFISH=m | ||
980 | CONFIG_CRYPTO_TWOFISH_COMMON=m | ||
981 | CONFIG_CRYPTO_SERPENT=m | ||
982 | CONFIG_CRYPTO_AES=m | ||
983 | CONFIG_CRYPTO_CAST5=m | ||
984 | CONFIG_CRYPTO_CAST6=m | ||
985 | CONFIG_CRYPTO_TEA=m | ||
986 | CONFIG_CRYPTO_ARC4=m | ||
987 | CONFIG_CRYPTO_KHAZAD=m | ||
988 | CONFIG_CRYPTO_ANUBIS=m | ||
989 | CONFIG_CRYPTO_DEFLATE=m | ||
990 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
991 | CONFIG_CRYPTO_CRC32C=m | ||
992 | CONFIG_CRYPTO_CAMELLIA=m | ||
993 | # CONFIG_CRYPTO_TEST is not set | ||
994 | |||
995 | # | ||
996 | # Hardware crypto devices | ||
997 | # | ||
998 | 770 | ||
999 | # | 771 | # |
1000 | # Library routines | 772 | # Library routines |
@@ -1002,10 +774,11 @@ CONFIG_CRYPTO_CAMELLIA=m | |||
1002 | CONFIG_BITREVERSE=y | 774 | CONFIG_BITREVERSE=y |
1003 | # CONFIG_CRC_CCITT is not set | 775 | # CONFIG_CRC_CCITT is not set |
1004 | # CONFIG_CRC16 is not set | 776 | # CONFIG_CRC16 is not set |
777 | # CONFIG_CRC_ITU_T is not set | ||
1005 | CONFIG_CRC32=y | 778 | CONFIG_CRC32=y |
1006 | CONFIG_LIBCRC32C=m | 779 | # CONFIG_CRC7 is not set |
1007 | CONFIG_ZLIB_INFLATE=m | 780 | # CONFIG_LIBCRC32C is not set |
1008 | CONFIG_ZLIB_DEFLATE=m | ||
1009 | CONFIG_PLIST=y | 781 | CONFIG_PLIST=y |
1010 | CONFIG_HAS_IOMEM=y | 782 | CONFIG_HAS_IOMEM=y |
1011 | CONFIG_HAS_IOPORT=y | 783 | CONFIG_HAS_IOPORT=y |
784 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/mips/defconfig b/arch/mips/defconfig index d3d81fb2765a..670039bb1a7c 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.20 | 3 | # Linux kernel version: 2.6.23-rc2 |
4 | # Tue Feb 20 21:47:14 2007 | 4 | # Tue Aug 7 12:39:49 2007 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
@@ -9,52 +9,40 @@ CONFIG_MIPS=y | |||
9 | # Machine selection | 9 | # Machine selection |
10 | # | 10 | # |
11 | CONFIG_ZONE_DMA=y | 11 | CONFIG_ZONE_DMA=y |
12 | # CONFIG_MIPS_MTX1 is not set | 12 | # CONFIG_MACH_ALCHEMY is not set |
13 | # CONFIG_MIPS_BOSPORUS is not set | ||
14 | # CONFIG_MIPS_PB1000 is not set | ||
15 | # CONFIG_MIPS_PB1100 is not set | ||
16 | # CONFIG_MIPS_PB1500 is not set | ||
17 | # CONFIG_MIPS_PB1550 is not set | ||
18 | # CONFIG_MIPS_PB1200 is not set | ||
19 | # CONFIG_MIPS_DB1000 is not set | ||
20 | # CONFIG_MIPS_DB1100 is not set | ||
21 | # CONFIG_MIPS_DB1500 is not set | ||
22 | # CONFIG_MIPS_DB1550 is not set | ||
23 | # CONFIG_MIPS_DB1200 is not set | ||
24 | # CONFIG_MIPS_MIRAGE is not set | ||
25 | # CONFIG_BASLER_EXCITE is not set | 13 | # CONFIG_BASLER_EXCITE is not set |
26 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
27 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
28 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
17 | # CONFIG_LEMOTE_FULONG is not set | ||
29 | # CONFIG_MIPS_ATLAS is not set | 18 | # CONFIG_MIPS_ATLAS is not set |
30 | # CONFIG_MIPS_MALTA is not set | 19 | # CONFIG_MIPS_MALTA is not set |
31 | # CONFIG_MIPS_SEAD is not set | 20 | # CONFIG_MIPS_SEAD is not set |
32 | # CONFIG_WR_PPMC is not set | ||
33 | # CONFIG_MIPS_SIM is not set | 21 | # CONFIG_MIPS_SIM is not set |
34 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 22 | # CONFIG_MARKEINS is not set |
35 | # CONFIG_MIPS_XXS1500 is not set | 23 | # CONFIG_MACH_VR41XX is not set |
36 | # CONFIG_PNX8550_JBS is not set | 24 | # CONFIG_PNX8550_JBS is not set |
37 | # CONFIG_PNX8550_STB810 is not set | 25 | # CONFIG_PNX8550_STB810 is not set |
38 | # CONFIG_MACH_VR41XX is not set | 26 | # CONFIG_PMC_MSP is not set |
39 | # CONFIG_PMC_YOSEMITE is not set | 27 | # CONFIG_PMC_YOSEMITE is not set |
40 | # CONFIG_QEMU is not set | 28 | # CONFIG_QEMU is not set |
41 | # CONFIG_MARKEINS is not set | ||
42 | CONFIG_SGI_IP22=y | 29 | CONFIG_SGI_IP22=y |
43 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
44 | # CONFIG_SGI_IP32 is not set | 31 | # CONFIG_SGI_IP32 is not set |
45 | # CONFIG_SIBYTE_BIGSUR is not set | 32 | # CONFIG_SIBYTE_CRHINE is not set |
33 | # CONFIG_SIBYTE_CARMEL is not set | ||
34 | # CONFIG_SIBYTE_CRHONE is not set | ||
35 | # CONFIG_SIBYTE_RHONE is not set | ||
46 | # CONFIG_SIBYTE_SWARM is not set | 36 | # CONFIG_SIBYTE_SWARM is not set |
37 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
47 | # CONFIG_SIBYTE_SENTOSA is not set | 38 | # CONFIG_SIBYTE_SENTOSA is not set |
48 | # CONFIG_SIBYTE_RHONE is not set | ||
49 | # CONFIG_SIBYTE_CARMEL is not set | ||
50 | # CONFIG_SIBYTE_PTSWARM is not set | 39 | # CONFIG_SIBYTE_PTSWARM is not set |
51 | # CONFIG_SIBYTE_LITTLESUR is not set | 40 | # CONFIG_SIBYTE_BIGSUR is not set |
52 | # CONFIG_SIBYTE_CRHINE is not set | ||
53 | # CONFIG_SIBYTE_CRHONE is not set | ||
54 | # CONFIG_SNI_RM is not set | 41 | # CONFIG_SNI_RM is not set |
55 | # CONFIG_TOSHIBA_JMR3927 is not set | 42 | # CONFIG_TOSHIBA_JMR3927 is not set |
56 | # CONFIG_TOSHIBA_RBTX4927 is not set | 43 | # CONFIG_TOSHIBA_RBTX4927 is not set |
57 | # CONFIG_TOSHIBA_RBTX4938 is not set | 44 | # CONFIG_TOSHIBA_RBTX4938 is not set |
45 | # CONFIG_WR_PPMC is not set | ||
58 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 46 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
59 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 47 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
60 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 48 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
@@ -67,6 +55,9 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
67 | CONFIG_ARC=y | 55 | CONFIG_ARC=y |
68 | CONFIG_DMA_NONCOHERENT=y | 56 | CONFIG_DMA_NONCOHERENT=y |
69 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | 57 | CONFIG_DMA_NEED_PCI_MAP_STATE=y |
58 | CONFIG_EARLY_PRINTK=y | ||
59 | CONFIG_SYS_HAS_EARLY_PRINTK=y | ||
60 | # CONFIG_NO_IOPORT is not set | ||
70 | CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y | 61 | CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y |
71 | CONFIG_CPU_BIG_ENDIAN=y | 62 | CONFIG_CPU_BIG_ENDIAN=y |
72 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 63 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
@@ -82,6 +73,7 @@ CONFIG_ARC_PROMLIB=y | |||
82 | # | 73 | # |
83 | # CPU selection | 74 | # CPU selection |
84 | # | 75 | # |
76 | # CONFIG_CPU_LOONGSON2 is not set | ||
85 | # CONFIG_CPU_MIPS32_R1 is not set | 77 | # CONFIG_CPU_MIPS32_R1 is not set |
86 | # CONFIG_CPU_MIPS32_R2 is not set | 78 | # CONFIG_CPU_MIPS32_R2 is not set |
87 | # CONFIG_CPU_MIPS64_R1 is not set | 79 | # CONFIG_CPU_MIPS64_R1 is not set |
@@ -122,8 +114,6 @@ CONFIG_IP22_CPU_SCACHE=y | |||
122 | CONFIG_MIPS_MT_DISABLED=y | 114 | CONFIG_MIPS_MT_DISABLED=y |
123 | # CONFIG_MIPS_MT_SMP is not set | 115 | # CONFIG_MIPS_MT_SMP is not set |
124 | # CONFIG_MIPS_MT_SMTC is not set | 116 | # CONFIG_MIPS_MT_SMTC is not set |
125 | # CONFIG_MIPS_VPE_LOADER is not set | ||
126 | # CONFIG_64BIT_PHYS_ADDR is not set | ||
127 | CONFIG_CPU_HAS_LLSC=y | 117 | CONFIG_CPU_HAS_LLSC=y |
128 | CONFIG_CPU_HAS_SYNC=y | 118 | CONFIG_CPU_HAS_SYNC=y |
129 | CONFIG_GENERIC_HARDIRQS=y | 119 | CONFIG_GENERIC_HARDIRQS=y |
@@ -139,6 +129,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
139 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 129 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
140 | # CONFIG_RESOURCES_64BIT is not set | 130 | # CONFIG_RESOURCES_64BIT is not set |
141 | CONFIG_ZONE_DMA_FLAG=1 | 131 | CONFIG_ZONE_DMA_FLAG=1 |
132 | CONFIG_BOUNCE=y | ||
133 | CONFIG_VIRT_TO_BUS=y | ||
142 | # CONFIG_HZ_48 is not set | 134 | # CONFIG_HZ_48 is not set |
143 | # CONFIG_HZ_100 is not set | 135 | # CONFIG_HZ_100 is not set |
144 | # CONFIG_HZ_128 is not set | 136 | # CONFIG_HZ_128 is not set |
@@ -152,35 +144,33 @@ CONFIG_HZ=1000 | |||
152 | CONFIG_PREEMPT_VOLUNTARY=y | 144 | CONFIG_PREEMPT_VOLUNTARY=y |
153 | # CONFIG_PREEMPT is not set | 145 | # CONFIG_PREEMPT is not set |
154 | # CONFIG_KEXEC is not set | 146 | # CONFIG_KEXEC is not set |
147 | CONFIG_SECCOMP=y | ||
155 | CONFIG_LOCKDEP_SUPPORT=y | 148 | CONFIG_LOCKDEP_SUPPORT=y |
156 | CONFIG_STACKTRACE_SUPPORT=y | 149 | CONFIG_STACKTRACE_SUPPORT=y |
157 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 150 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
158 | 151 | ||
159 | # | 152 | # |
160 | # Code maturity level options | 153 | # General setup |
161 | # | 154 | # |
162 | CONFIG_EXPERIMENTAL=y | 155 | CONFIG_EXPERIMENTAL=y |
163 | CONFIG_BROKEN_ON_SMP=y | 156 | CONFIG_BROKEN_ON_SMP=y |
164 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 157 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
165 | |||
166 | # | ||
167 | # General setup | ||
168 | # | ||
169 | CONFIG_LOCALVERSION="" | 158 | CONFIG_LOCALVERSION="" |
170 | CONFIG_LOCALVERSION_AUTO=y | 159 | CONFIG_LOCALVERSION_AUTO=y |
171 | CONFIG_SWAP=y | 160 | CONFIG_SWAP=y |
172 | CONFIG_SYSVIPC=y | 161 | CONFIG_SYSVIPC=y |
173 | # CONFIG_IPC_NS is not set | ||
174 | CONFIG_SYSVIPC_SYSCTL=y | 162 | CONFIG_SYSVIPC_SYSCTL=y |
175 | # CONFIG_POSIX_MQUEUE is not set | 163 | # CONFIG_POSIX_MQUEUE is not set |
176 | # CONFIG_BSD_PROCESS_ACCT is not set | 164 | # CONFIG_BSD_PROCESS_ACCT is not set |
177 | # CONFIG_TASKSTATS is not set | 165 | # CONFIG_TASKSTATS is not set |
178 | # CONFIG_UTS_NS is not set | 166 | # CONFIG_USER_NS is not set |
179 | # CONFIG_AUDIT is not set | 167 | # CONFIG_AUDIT is not set |
180 | CONFIG_IKCONFIG=y | 168 | CONFIG_IKCONFIG=y |
181 | CONFIG_IKCONFIG_PROC=y | 169 | CONFIG_IKCONFIG_PROC=y |
170 | CONFIG_LOG_BUF_SHIFT=14 | ||
182 | CONFIG_SYSFS_DEPRECATED=y | 171 | CONFIG_SYSFS_DEPRECATED=y |
183 | CONFIG_RELAY=y | 172 | CONFIG_RELAY=y |
173 | # CONFIG_BLK_DEV_INITRD is not set | ||
184 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 174 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
185 | CONFIG_SYSCTL=y | 175 | CONFIG_SYSCTL=y |
186 | CONFIG_EMBEDDED=y | 176 | CONFIG_EMBEDDED=y |
@@ -193,32 +183,30 @@ CONFIG_BUG=y | |||
193 | CONFIG_ELF_CORE=y | 183 | CONFIG_ELF_CORE=y |
194 | CONFIG_BASE_FULL=y | 184 | CONFIG_BASE_FULL=y |
195 | CONFIG_FUTEX=y | 185 | CONFIG_FUTEX=y |
186 | CONFIG_ANON_INODES=y | ||
196 | CONFIG_EPOLL=y | 187 | CONFIG_EPOLL=y |
188 | CONFIG_SIGNALFD=y | ||
189 | CONFIG_TIMERFD=y | ||
190 | CONFIG_EVENTFD=y | ||
197 | CONFIG_SHMEM=y | 191 | CONFIG_SHMEM=y |
198 | CONFIG_SLAB=y | ||
199 | CONFIG_VM_EVENT_COUNTERS=y | 192 | CONFIG_VM_EVENT_COUNTERS=y |
193 | CONFIG_SLAB=y | ||
194 | # CONFIG_SLUB is not set | ||
195 | # CONFIG_SLOB is not set | ||
200 | CONFIG_RT_MUTEXES=y | 196 | CONFIG_RT_MUTEXES=y |
201 | # CONFIG_TINY_SHMEM is not set | 197 | # CONFIG_TINY_SHMEM is not set |
202 | CONFIG_BASE_SMALL=0 | 198 | CONFIG_BASE_SMALL=0 |
203 | # CONFIG_SLOB is not set | ||
204 | |||
205 | # | ||
206 | # Loadable module support | ||
207 | # | ||
208 | CONFIG_MODULES=y | 199 | CONFIG_MODULES=y |
209 | CONFIG_MODULE_UNLOAD=y | 200 | CONFIG_MODULE_UNLOAD=y |
210 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 201 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
211 | CONFIG_MODVERSIONS=y | 202 | CONFIG_MODVERSIONS=y |
212 | CONFIG_MODULE_SRCVERSION_ALL=y | 203 | CONFIG_MODULE_SRCVERSION_ALL=y |
213 | CONFIG_KMOD=y | 204 | CONFIG_KMOD=y |
214 | |||
215 | # | ||
216 | # Block layer | ||
217 | # | ||
218 | CONFIG_BLOCK=y | 205 | CONFIG_BLOCK=y |
219 | # CONFIG_LBD is not set | 206 | # CONFIG_LBD is not set |
220 | # CONFIG_BLK_DEV_IO_TRACE is not set | 207 | # CONFIG_BLK_DEV_IO_TRACE is not set |
221 | # CONFIG_LSF is not set | 208 | # CONFIG_LSF is not set |
209 | # CONFIG_BLK_DEV_BSG is not set | ||
222 | 210 | ||
223 | # | 211 | # |
224 | # IO Schedulers | 212 | # IO Schedulers |
@@ -237,6 +225,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
237 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 225 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
238 | # | 226 | # |
239 | CONFIG_HW_HAS_EISA=y | 227 | CONFIG_HW_HAS_EISA=y |
228 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
240 | # CONFIG_EISA is not set | 229 | # CONFIG_EISA is not set |
241 | CONFIG_MMU=y | 230 | CONFIG_MMU=y |
242 | 231 | ||
@@ -245,10 +234,6 @@ CONFIG_MMU=y | |||
245 | # | 234 | # |
246 | 235 | ||
247 | # | 236 | # |
248 | # PCI Hotplug Support | ||
249 | # | ||
250 | |||
251 | # | ||
252 | # Executable file formats | 237 | # Executable file formats |
253 | # | 238 | # |
254 | CONFIG_BINFMT_ELF=y | 239 | CONFIG_BINFMT_ELF=y |
@@ -261,7 +246,7 @@ CONFIG_TRAD_SIGNALS=y | |||
261 | CONFIG_PM=y | 246 | CONFIG_PM=y |
262 | # CONFIG_PM_LEGACY is not set | 247 | # CONFIG_PM_LEGACY is not set |
263 | # CONFIG_PM_DEBUG is not set | 248 | # CONFIG_PM_DEBUG is not set |
264 | # CONFIG_PM_SYSFS_DEPRECATED is not set | 249 | # CONFIG_SUSPEND is not set |
265 | 250 | ||
266 | # | 251 | # |
267 | # Networking | 252 | # Networking |
@@ -271,7 +256,6 @@ CONFIG_NET=y | |||
271 | # | 256 | # |
272 | # Networking options | 257 | # Networking options |
273 | # | 258 | # |
274 | # CONFIG_NETDEBUG is not set | ||
275 | CONFIG_PACKET=y | 259 | CONFIG_PACKET=y |
276 | CONFIG_PACKET_MMAP=y | 260 | CONFIG_PACKET_MMAP=y |
277 | CONFIG_UNIX=y | 261 | CONFIG_UNIX=y |
@@ -308,10 +292,6 @@ CONFIG_INET_TCP_DIAG=y | |||
308 | CONFIG_TCP_CONG_CUBIC=y | 292 | CONFIG_TCP_CONG_CUBIC=y |
309 | CONFIG_DEFAULT_TCP_CONG="cubic" | 293 | CONFIG_DEFAULT_TCP_CONG="cubic" |
310 | CONFIG_TCP_MD5SIG=y | 294 | CONFIG_TCP_MD5SIG=y |
311 | |||
312 | # | ||
313 | # IP: Virtual Server Configuration | ||
314 | # | ||
315 | CONFIG_IP_VS=m | 295 | CONFIG_IP_VS=m |
316 | # CONFIG_IP_VS_DEBUG is not set | 296 | # CONFIG_IP_VS_DEBUG is not set |
317 | CONFIG_IP_VS_TAB_BITS=12 | 297 | CONFIG_IP_VS_TAB_BITS=12 |
@@ -346,10 +326,11 @@ CONFIG_IPV6=m | |||
346 | CONFIG_IPV6_PRIVACY=y | 326 | CONFIG_IPV6_PRIVACY=y |
347 | CONFIG_IPV6_ROUTER_PREF=y | 327 | CONFIG_IPV6_ROUTER_PREF=y |
348 | CONFIG_IPV6_ROUTE_INFO=y | 328 | CONFIG_IPV6_ROUTE_INFO=y |
329 | CONFIG_IPV6_OPTIMISTIC_DAD=y | ||
349 | CONFIG_INET6_AH=m | 330 | CONFIG_INET6_AH=m |
350 | CONFIG_INET6_ESP=m | 331 | CONFIG_INET6_ESP=m |
351 | CONFIG_INET6_IPCOMP=m | 332 | CONFIG_INET6_IPCOMP=m |
352 | CONFIG_IPV6_MIP6=y | 333 | CONFIG_IPV6_MIP6=m |
353 | CONFIG_INET6_XFRM_TUNNEL=m | 334 | CONFIG_INET6_XFRM_TUNNEL=m |
354 | CONFIG_INET6_TUNNEL=m | 335 | CONFIG_INET6_TUNNEL=m |
355 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | 336 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m |
@@ -371,8 +352,6 @@ CONFIG_NETFILTER_NETLINK=m | |||
371 | CONFIG_NETFILTER_NETLINK_QUEUE=m | 352 | CONFIG_NETFILTER_NETLINK_QUEUE=m |
372 | CONFIG_NETFILTER_NETLINK_LOG=m | 353 | CONFIG_NETFILTER_NETLINK_LOG=m |
373 | CONFIG_NF_CONNTRACK_ENABLED=m | 354 | CONFIG_NF_CONNTRACK_ENABLED=m |
374 | CONFIG_NF_CONNTRACK_SUPPORT=y | ||
375 | # CONFIG_IP_NF_CONNTRACK_SUPPORT is not set | ||
376 | CONFIG_NF_CONNTRACK=m | 355 | CONFIG_NF_CONNTRACK=m |
377 | CONFIG_NF_CT_ACCT=y | 356 | CONFIG_NF_CT_ACCT=y |
378 | CONFIG_NF_CONNTRACK_MARK=y | 357 | CONFIG_NF_CONNTRACK_MARK=y |
@@ -380,6 +359,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y | |||
380 | CONFIG_NF_CONNTRACK_EVENTS=y | 359 | CONFIG_NF_CONNTRACK_EVENTS=y |
381 | CONFIG_NF_CT_PROTO_GRE=m | 360 | CONFIG_NF_CT_PROTO_GRE=m |
382 | CONFIG_NF_CT_PROTO_SCTP=m | 361 | CONFIG_NF_CT_PROTO_SCTP=m |
362 | CONFIG_NF_CT_PROTO_UDPLITE=m | ||
383 | CONFIG_NF_CONNTRACK_AMANDA=m | 363 | CONFIG_NF_CONNTRACK_AMANDA=m |
384 | CONFIG_NF_CONNTRACK_FTP=m | 364 | CONFIG_NF_CONNTRACK_FTP=m |
385 | CONFIG_NF_CONNTRACK_H323=m | 365 | CONFIG_NF_CONNTRACK_H323=m |
@@ -398,11 +378,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m | |||
398 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 378 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
399 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 379 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
400 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | 380 | CONFIG_NETFILTER_XT_TARGET_NOTRACK=m |
381 | CONFIG_NETFILTER_XT_TARGET_TRACE=m | ||
401 | CONFIG_NETFILTER_XT_TARGET_SECMARK=m | 382 | CONFIG_NETFILTER_XT_TARGET_SECMARK=m |
402 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m | 383 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m |
403 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 384 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
404 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 385 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
405 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m | 386 | CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m |
387 | CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m | ||
406 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m | 388 | CONFIG_NETFILTER_XT_MATCH_CONNMARK=m |
407 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | 389 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m |
408 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 390 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
@@ -423,6 +405,7 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m | |||
423 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 405 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
424 | CONFIG_NETFILTER_XT_MATCH_STRING=m | 406 | CONFIG_NETFILTER_XT_MATCH_STRING=m |
425 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 407 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
408 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
426 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 409 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
427 | 410 | ||
428 | # | 411 | # |
@@ -490,25 +473,13 @@ CONFIG_IP6_NF_TARGET_REJECT=m | |||
490 | CONFIG_IP6_NF_MANGLE=m | 473 | CONFIG_IP6_NF_MANGLE=m |
491 | CONFIG_IP6_NF_TARGET_HL=m | 474 | CONFIG_IP6_NF_TARGET_HL=m |
492 | CONFIG_IP6_NF_RAW=m | 475 | CONFIG_IP6_NF_RAW=m |
493 | |||
494 | # | ||
495 | # DCCP Configuration (EXPERIMENTAL) | ||
496 | # | ||
497 | # CONFIG_IP_DCCP is not set | 476 | # CONFIG_IP_DCCP is not set |
498 | |||
499 | # | ||
500 | # SCTP Configuration (EXPERIMENTAL) | ||
501 | # | ||
502 | CONFIG_IP_SCTP=m | 477 | CONFIG_IP_SCTP=m |
503 | # CONFIG_SCTP_DBG_MSG is not set | 478 | # CONFIG_SCTP_DBG_MSG is not set |
504 | # CONFIG_SCTP_DBG_OBJCNT is not set | 479 | # CONFIG_SCTP_DBG_OBJCNT is not set |
505 | # CONFIG_SCTP_HMAC_NONE is not set | 480 | # CONFIG_SCTP_HMAC_NONE is not set |
506 | # CONFIG_SCTP_HMAC_SHA1 is not set | 481 | # CONFIG_SCTP_HMAC_SHA1 is not set |
507 | CONFIG_SCTP_HMAC_MD5=y | 482 | CONFIG_SCTP_HMAC_MD5=y |
508 | |||
509 | # | ||
510 | # TIPC Configuration (EXPERIMENTAL) | ||
511 | # | ||
512 | # CONFIG_TIPC is not set | 483 | # CONFIG_TIPC is not set |
513 | # CONFIG_ATM is not set | 484 | # CONFIG_ATM is not set |
514 | # CONFIG_BRIDGE is not set | 485 | # CONFIG_BRIDGE is not set |
@@ -527,9 +498,6 @@ CONFIG_SCTP_HMAC_MD5=y | |||
527 | # | 498 | # |
528 | CONFIG_NET_SCHED=y | 499 | CONFIG_NET_SCHED=y |
529 | CONFIG_NET_SCH_FIFO=y | 500 | CONFIG_NET_SCH_FIFO=y |
530 | # CONFIG_NET_SCH_CLK_JIFFIES is not set | ||
531 | CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y | ||
532 | # CONFIG_NET_SCH_CLK_CPU is not set | ||
533 | 501 | ||
534 | # | 502 | # |
535 | # Queueing/Scheduling | 503 | # Queueing/Scheduling |
@@ -538,6 +506,7 @@ CONFIG_NET_SCH_CBQ=m | |||
538 | CONFIG_NET_SCH_HTB=m | 506 | CONFIG_NET_SCH_HTB=m |
539 | CONFIG_NET_SCH_HFSC=m | 507 | CONFIG_NET_SCH_HFSC=m |
540 | CONFIG_NET_SCH_PRIO=m | 508 | CONFIG_NET_SCH_PRIO=m |
509 | CONFIG_NET_SCH_RR=m | ||
541 | CONFIG_NET_SCH_RED=m | 510 | CONFIG_NET_SCH_RED=m |
542 | CONFIG_NET_SCH_SFQ=m | 511 | CONFIG_NET_SCH_SFQ=m |
543 | CONFIG_NET_SCH_TEQL=m | 512 | CONFIG_NET_SCH_TEQL=m |
@@ -562,10 +531,16 @@ CONFIG_NET_CLS_U32=m | |||
562 | CONFIG_NET_CLS_RSVP=m | 531 | CONFIG_NET_CLS_RSVP=m |
563 | CONFIG_NET_CLS_RSVP6=m | 532 | CONFIG_NET_CLS_RSVP6=m |
564 | # CONFIG_NET_EMATCH is not set | 533 | # CONFIG_NET_EMATCH is not set |
565 | # CONFIG_NET_CLS_ACT is not set | 534 | CONFIG_NET_CLS_ACT=y |
535 | CONFIG_NET_ACT_POLICE=y | ||
536 | CONFIG_NET_ACT_GACT=m | ||
537 | CONFIG_GACT_PROB=y | ||
538 | CONFIG_NET_ACT_MIRRED=m | ||
539 | CONFIG_NET_ACT_IPT=m | ||
540 | CONFIG_NET_ACT_PEDIT=m | ||
541 | CONFIG_NET_ACT_SIMP=m | ||
566 | CONFIG_NET_CLS_POLICE=y | 542 | CONFIG_NET_CLS_POLICE=y |
567 | # CONFIG_NET_CLS_IND is not set | 543 | # CONFIG_NET_CLS_IND is not set |
568 | CONFIG_NET_ESTIMATOR=y | ||
569 | 544 | ||
570 | # | 545 | # |
571 | # Network testing | 546 | # Network testing |
@@ -574,14 +549,26 @@ CONFIG_NET_ESTIMATOR=y | |||
574 | # CONFIG_HAMRADIO is not set | 549 | # CONFIG_HAMRADIO is not set |
575 | # CONFIG_IRDA is not set | 550 | # CONFIG_IRDA is not set |
576 | # CONFIG_BT is not set | 551 | # CONFIG_BT is not set |
552 | # CONFIG_AF_RXRPC is not set | ||
553 | CONFIG_FIB_RULES=y | ||
554 | |||
555 | # | ||
556 | # Wireless | ||
557 | # | ||
558 | CONFIG_CFG80211=m | ||
559 | CONFIG_WIRELESS_EXT=y | ||
560 | CONFIG_MAC80211=m | ||
561 | # CONFIG_MAC80211_DEBUG is not set | ||
577 | CONFIG_IEEE80211=m | 562 | CONFIG_IEEE80211=m |
578 | # CONFIG_IEEE80211_DEBUG is not set | 563 | # CONFIG_IEEE80211_DEBUG is not set |
579 | CONFIG_IEEE80211_CRYPT_WEP=m | 564 | CONFIG_IEEE80211_CRYPT_WEP=m |
580 | CONFIG_IEEE80211_CRYPT_CCMP=m | 565 | CONFIG_IEEE80211_CRYPT_CCMP=m |
566 | CONFIG_IEEE80211_CRYPT_TKIP=m | ||
581 | CONFIG_IEEE80211_SOFTMAC=m | 567 | CONFIG_IEEE80211_SOFTMAC=m |
582 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set | 568 | # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set |
583 | CONFIG_WIRELESS_EXT=y | 569 | CONFIG_RFKILL=m |
584 | CONFIG_FIB_RULES=y | 570 | CONFIG_RFKILL_INPUT=m |
571 | # CONFIG_NET_9P is not set | ||
585 | 572 | ||
586 | # | 573 | # |
587 | # Device Drivers | 574 | # Device Drivers |
@@ -593,47 +580,19 @@ CONFIG_FIB_RULES=y | |||
593 | CONFIG_STANDALONE=y | 580 | CONFIG_STANDALONE=y |
594 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 581 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
595 | # CONFIG_SYS_HYPERVISOR is not set | 582 | # CONFIG_SYS_HYPERVISOR is not set |
596 | |||
597 | # | ||
598 | # Connector - unified userspace <-> kernelspace linker | ||
599 | # | ||
600 | CONFIG_CONNECTOR=m | 583 | CONFIG_CONNECTOR=m |
601 | |||
602 | # | ||
603 | # Memory Technology Devices (MTD) | ||
604 | # | ||
605 | # CONFIG_MTD is not set | 584 | # CONFIG_MTD is not set |
606 | |||
607 | # | ||
608 | # Parallel port support | ||
609 | # | ||
610 | # CONFIG_PARPORT is not set | 585 | # CONFIG_PARPORT is not set |
611 | 586 | CONFIG_BLK_DEV=y | |
612 | # | ||
613 | # Plug and Play support | ||
614 | # | ||
615 | # CONFIG_PNPACPI is not set | ||
616 | |||
617 | # | ||
618 | # Block devices | ||
619 | # | ||
620 | # CONFIG_BLK_DEV_COW_COMMON is not set | 587 | # CONFIG_BLK_DEV_COW_COMMON is not set |
621 | # CONFIG_BLK_DEV_LOOP is not set | 588 | # CONFIG_BLK_DEV_LOOP is not set |
622 | # CONFIG_BLK_DEV_NBD is not set | 589 | # CONFIG_BLK_DEV_NBD is not set |
623 | # CONFIG_BLK_DEV_RAM is not set | 590 | # CONFIG_BLK_DEV_RAM is not set |
624 | # CONFIG_BLK_DEV_INITRD is not set | ||
625 | CONFIG_CDROM_PKTCDVD=m | 591 | CONFIG_CDROM_PKTCDVD=m |
626 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 592 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
627 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 593 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
628 | CONFIG_ATA_OVER_ETH=m | 594 | CONFIG_ATA_OVER_ETH=m |
629 | 595 | # CONFIG_MISC_DEVICES is not set | |
630 | # | ||
631 | # Misc devices | ||
632 | # | ||
633 | |||
634 | # | ||
635 | # ATA/ATAPI/MFM/RLL support | ||
636 | # | ||
637 | # CONFIG_IDE is not set | 596 | # CONFIG_IDE is not set |
638 | 597 | ||
639 | # | 598 | # |
@@ -641,6 +600,7 @@ CONFIG_ATA_OVER_ETH=m | |||
641 | # | 600 | # |
642 | CONFIG_RAID_ATTRS=m | 601 | CONFIG_RAID_ATTRS=m |
643 | CONFIG_SCSI=y | 602 | CONFIG_SCSI=y |
603 | CONFIG_SCSI_DMA=y | ||
644 | CONFIG_SCSI_TGT=m | 604 | CONFIG_SCSI_TGT=m |
645 | # CONFIG_SCSI_NETLINK is not set | 605 | # CONFIG_SCSI_NETLINK is not set |
646 | CONFIG_SCSI_PROC_FS=y | 606 | CONFIG_SCSI_PROC_FS=y |
@@ -663,6 +623,7 @@ CONFIG_CHR_DEV_SCH=m | |||
663 | CONFIG_SCSI_CONSTANTS=y | 623 | CONFIG_SCSI_CONSTANTS=y |
664 | # CONFIG_SCSI_LOGGING is not set | 624 | # CONFIG_SCSI_LOGGING is not set |
665 | CONFIG_SCSI_SCAN_ASYNC=y | 625 | CONFIG_SCSI_SCAN_ASYNC=y |
626 | CONFIG_SCSI_WAIT_SCAN=m | ||
666 | 627 | ||
667 | # | 628 | # |
668 | # SCSI Transports | 629 | # SCSI Transports |
@@ -670,51 +631,21 @@ CONFIG_SCSI_SCAN_ASYNC=y | |||
670 | CONFIG_SCSI_SPI_ATTRS=m | 631 | CONFIG_SCSI_SPI_ATTRS=m |
671 | # CONFIG_SCSI_FC_ATTRS is not set | 632 | # CONFIG_SCSI_FC_ATTRS is not set |
672 | CONFIG_SCSI_ISCSI_ATTRS=m | 633 | CONFIG_SCSI_ISCSI_ATTRS=m |
673 | CONFIG_SCSI_SAS_ATTRS=m | ||
674 | # CONFIG_SCSI_SAS_LIBSAS is not set | 634 | # CONFIG_SCSI_SAS_LIBSAS is not set |
675 | 635 | CONFIG_SCSI_LOWLEVEL=y | |
676 | # | ||
677 | # SCSI low-level drivers | ||
678 | # | ||
679 | CONFIG_ISCSI_TCP=m | 636 | CONFIG_ISCSI_TCP=m |
680 | CONFIG_SGIWD93_SCSI=y | 637 | CONFIG_SGIWD93_SCSI=y |
681 | # CONFIG_SCSI_DEBUG is not set | 638 | # CONFIG_SCSI_DEBUG is not set |
682 | |||
683 | # | ||
684 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
685 | # | ||
686 | # CONFIG_ATA is not set | 639 | # CONFIG_ATA is not set |
687 | |||
688 | # | ||
689 | # Multi-device support (RAID and LVM) | ||
690 | # | ||
691 | # CONFIG_MD is not set | 640 | # CONFIG_MD is not set |
692 | |||
693 | # | ||
694 | # Fusion MPT device support | ||
695 | # | ||
696 | # CONFIG_FUSION is not set | ||
697 | |||
698 | # | ||
699 | # IEEE 1394 (FireWire) support | ||
700 | # | ||
701 | |||
702 | # | ||
703 | # I2O device support | ||
704 | # | ||
705 | |||
706 | # | ||
707 | # Network device support | ||
708 | # | ||
709 | CONFIG_NETDEVICES=y | 641 | CONFIG_NETDEVICES=y |
642 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
643 | # CONFIG_IFB is not set | ||
710 | CONFIG_DUMMY=m | 644 | CONFIG_DUMMY=m |
711 | CONFIG_BONDING=m | 645 | CONFIG_BONDING=m |
646 | CONFIG_MACVLAN=m | ||
712 | CONFIG_EQUALIZER=m | 647 | CONFIG_EQUALIZER=m |
713 | CONFIG_TUN=m | 648 | CONFIG_TUN=m |
714 | |||
715 | # | ||
716 | # PHY device support | ||
717 | # | ||
718 | CONFIG_PHYLIB=m | 649 | CONFIG_PHYLIB=m |
719 | 650 | ||
720 | # | 651 | # |
@@ -728,36 +659,25 @@ CONFIG_CICADA_PHY=m | |||
728 | # CONFIG_VITESSE_PHY is not set | 659 | # CONFIG_VITESSE_PHY is not set |
729 | # CONFIG_SMSC_PHY is not set | 660 | # CONFIG_SMSC_PHY is not set |
730 | # CONFIG_BROADCOM_PHY is not set | 661 | # CONFIG_BROADCOM_PHY is not set |
662 | # CONFIG_ICPLUS_PHY is not set | ||
731 | # CONFIG_FIXED_PHY is not set | 663 | # CONFIG_FIXED_PHY is not set |
732 | |||
733 | # | ||
734 | # Ethernet (10 or 100Mbit) | ||
735 | # | ||
736 | CONFIG_NET_ETHERNET=y | 664 | CONFIG_NET_ETHERNET=y |
737 | # CONFIG_MII is not set | 665 | # CONFIG_MII is not set |
666 | # CONFIG_AX88796 is not set | ||
738 | # CONFIG_DM9000 is not set | 667 | # CONFIG_DM9000 is not set |
739 | CONFIG_SGISEEQ=y | 668 | CONFIG_SGISEEQ=y |
669 | # CONFIG_NETDEV_1000 is not set | ||
670 | # CONFIG_NETDEV_10000 is not set | ||
740 | 671 | ||
741 | # | 672 | # |
742 | # Ethernet (1000 Mbit) | 673 | # Wireless LAN |
743 | # | ||
744 | |||
745 | # | ||
746 | # Ethernet (10000 Mbit) | ||
747 | # | ||
748 | |||
749 | # | ||
750 | # Token Ring devices | ||
751 | # | ||
752 | |||
753 | # | ||
754 | # Wireless LAN (non-hamradio) | ||
755 | # | ||
756 | # CONFIG_NET_RADIO is not set | ||
757 | |||
758 | # | ||
759 | # Wan interfaces | ||
760 | # | 674 | # |
675 | CONFIG_WLAN_PRE80211=y | ||
676 | CONFIG_STRIP=m | ||
677 | CONFIG_WLAN_80211=y | ||
678 | # CONFIG_LIBERTAS is not set | ||
679 | CONFIG_HOSTAP=m | ||
680 | # CONFIG_HOSTAP_FIRMWARE is not set | ||
761 | # CONFIG_WAN is not set | 681 | # CONFIG_WAN is not set |
762 | # CONFIG_PPP is not set | 682 | # CONFIG_PPP is not set |
763 | # CONFIG_SLIP is not set | 683 | # CONFIG_SLIP is not set |
@@ -765,15 +685,7 @@ CONFIG_SGISEEQ=y | |||
765 | # CONFIG_NETCONSOLE is not set | 685 | # CONFIG_NETCONSOLE is not set |
766 | # CONFIG_NETPOLL is not set | 686 | # CONFIG_NETPOLL is not set |
767 | # CONFIG_NET_POLL_CONTROLLER is not set | 687 | # CONFIG_NET_POLL_CONTROLLER is not set |
768 | |||
769 | # | ||
770 | # ISDN subsystem | ||
771 | # | ||
772 | # CONFIG_ISDN is not set | 688 | # CONFIG_ISDN is not set |
773 | |||
774 | # | ||
775 | # Telephony Support | ||
776 | # | ||
777 | # CONFIG_PHONE is not set | 689 | # CONFIG_PHONE is not set |
778 | 690 | ||
779 | # | 691 | # |
@@ -781,6 +693,7 @@ CONFIG_SGISEEQ=y | |||
781 | # | 693 | # |
782 | CONFIG_INPUT=y | 694 | CONFIG_INPUT=y |
783 | # CONFIG_INPUT_FF_MEMLESS is not set | 695 | # CONFIG_INPUT_FF_MEMLESS is not set |
696 | # CONFIG_INPUT_POLLDEV is not set | ||
784 | 697 | ||
785 | # | 698 | # |
786 | # Userland interfaces | 699 | # Userland interfaces |
@@ -806,9 +719,16 @@ CONFIG_KEYBOARD_ATKBD=y | |||
806 | # CONFIG_KEYBOARD_STOWAWAY is not set | 719 | # CONFIG_KEYBOARD_STOWAWAY is not set |
807 | CONFIG_INPUT_MOUSE=y | 720 | CONFIG_INPUT_MOUSE=y |
808 | CONFIG_MOUSE_PS2=m | 721 | CONFIG_MOUSE_PS2=m |
722 | # CONFIG_MOUSE_PS2_ALPS is not set | ||
723 | CONFIG_MOUSE_PS2_LOGIPS2PP=y | ||
724 | # CONFIG_MOUSE_PS2_SYNAPTICS is not set | ||
725 | # CONFIG_MOUSE_PS2_LIFEBOOK is not set | ||
726 | CONFIG_MOUSE_PS2_TRACKPOINT=y | ||
727 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||
809 | CONFIG_MOUSE_SERIAL=m | 728 | CONFIG_MOUSE_SERIAL=m |
810 | # CONFIG_MOUSE_VSXXXAA is not set | 729 | # CONFIG_MOUSE_VSXXXAA is not set |
811 | # CONFIG_INPUT_JOYSTICK is not set | 730 | # CONFIG_INPUT_JOYSTICK is not set |
731 | # CONFIG_INPUT_TABLET is not set | ||
812 | # CONFIG_INPUT_TOUCHSCREEN is not set | 732 | # CONFIG_INPUT_TOUCHSCREEN is not set |
813 | # CONFIG_INPUT_MISC is not set | 733 | # CONFIG_INPUT_MISC is not set |
814 | 734 | ||
@@ -844,15 +764,7 @@ CONFIG_SERIAL_CORE=m | |||
844 | CONFIG_UNIX98_PTYS=y | 764 | CONFIG_UNIX98_PTYS=y |
845 | CONFIG_LEGACY_PTYS=y | 765 | CONFIG_LEGACY_PTYS=y |
846 | CONFIG_LEGACY_PTY_COUNT=256 | 766 | CONFIG_LEGACY_PTY_COUNT=256 |
847 | |||
848 | # | ||
849 | # IPMI | ||
850 | # | ||
851 | # CONFIG_IPMI_HANDLER is not set | 767 | # CONFIG_IPMI_HANDLER is not set |
852 | |||
853 | # | ||
854 | # Watchdog Cards | ||
855 | # | ||
856 | CONFIG_WATCHDOG=y | 768 | CONFIG_WATCHDOG=y |
857 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 769 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
858 | 770 | ||
@@ -864,20 +776,10 @@ CONFIG_INDYDOG=m | |||
864 | # CONFIG_HW_RANDOM is not set | 776 | # CONFIG_HW_RANDOM is not set |
865 | # CONFIG_RTC is not set | 777 | # CONFIG_RTC is not set |
866 | CONFIG_SGI_DS1286=m | 778 | CONFIG_SGI_DS1286=m |
867 | # CONFIG_GEN_RTC is not set | ||
868 | # CONFIG_DTLK is not set | ||
869 | # CONFIG_R3964 is not set | 779 | # CONFIG_R3964 is not set |
870 | CONFIG_RAW_DRIVER=m | 780 | CONFIG_RAW_DRIVER=m |
871 | CONFIG_MAX_RAW_DEVS=256 | 781 | CONFIG_MAX_RAW_DEVS=256 |
872 | |||
873 | # | ||
874 | # TPM devices | ||
875 | # | ||
876 | # CONFIG_TCG_TPM is not set | 782 | # CONFIG_TCG_TPM is not set |
877 | |||
878 | # | ||
879 | # I2C support | ||
880 | # | ||
881 | # CONFIG_I2C is not set | 783 | # CONFIG_I2C is not set |
882 | 784 | ||
883 | # | 785 | # |
@@ -885,32 +787,33 @@ CONFIG_MAX_RAW_DEVS=256 | |||
885 | # | 787 | # |
886 | # CONFIG_SPI is not set | 788 | # CONFIG_SPI is not set |
887 | # CONFIG_SPI_MASTER is not set | 789 | # CONFIG_SPI_MASTER is not set |
888 | |||
889 | # | ||
890 | # Dallas's 1-wire bus | ||
891 | # | ||
892 | # CONFIG_W1 is not set | 790 | # CONFIG_W1 is not set |
791 | # CONFIG_POWER_SUPPLY is not set | ||
792 | # CONFIG_HWMON is not set | ||
893 | 793 | ||
894 | # | 794 | # |
895 | # Hardware Monitoring support | 795 | # Multifunction device drivers |
896 | # | 796 | # |
897 | # CONFIG_HWMON is not set | 797 | # CONFIG_MFD_SM501 is not set |
898 | # CONFIG_HWMON_VID is not set | ||
899 | 798 | ||
900 | # | 799 | # |
901 | # Multimedia devices | 800 | # Multimedia devices |
902 | # | 801 | # |
903 | # CONFIG_VIDEO_DEV is not set | 802 | # CONFIG_VIDEO_DEV is not set |
803 | # CONFIG_DVB_CORE is not set | ||
804 | # CONFIG_DAB is not set | ||
904 | 805 | ||
905 | # | 806 | # |
906 | # Digital Video Broadcasting Devices | 807 | # Graphics support |
907 | # | 808 | # |
908 | # CONFIG_DVB is not set | 809 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
909 | 810 | ||
910 | # | 811 | # |
911 | # Graphics support | 812 | # Display device support |
912 | # | 813 | # |
913 | CONFIG_FIRMWARE_EDID=y | 814 | # CONFIG_DISPLAY_SUPPORT is not set |
815 | # CONFIG_VGASTATE is not set | ||
816 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
914 | # CONFIG_FB is not set | 817 | # CONFIG_FB is not set |
915 | 818 | ||
916 | # | 819 | # |
@@ -920,31 +823,20 @@ CONFIG_FIRMWARE_EDID=y | |||
920 | CONFIG_SGI_NEWPORT_CONSOLE=y | 823 | CONFIG_SGI_NEWPORT_CONSOLE=y |
921 | CONFIG_DUMMY_CONSOLE=y | 824 | CONFIG_DUMMY_CONSOLE=y |
922 | CONFIG_FONT_8x16=y | 825 | CONFIG_FONT_8x16=y |
923 | |||
924 | # | ||
925 | # Logo configuration | ||
926 | # | ||
927 | CONFIG_LOGO=y | 826 | CONFIG_LOGO=y |
928 | # CONFIG_LOGO_LINUX_MONO is not set | 827 | # CONFIG_LOGO_LINUX_MONO is not set |
929 | # CONFIG_LOGO_LINUX_VGA16 is not set | 828 | # CONFIG_LOGO_LINUX_VGA16 is not set |
930 | # CONFIG_LOGO_LINUX_CLUT224 is not set | 829 | # CONFIG_LOGO_LINUX_CLUT224 is not set |
931 | CONFIG_LOGO_SGI_CLUT224=y | 830 | CONFIG_LOGO_SGI_CLUT224=y |
932 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
933 | 831 | ||
934 | # | 832 | # |
935 | # Sound | 833 | # Sound |
936 | # | 834 | # |
937 | # CONFIG_SOUND is not set | 835 | # CONFIG_SOUND is not set |
938 | 836 | CONFIG_HID_SUPPORT=y | |
939 | # | ||
940 | # HID Devices | ||
941 | # | ||
942 | CONFIG_HID=y | 837 | CONFIG_HID=y |
943 | # CONFIG_HID_DEBUG is not set | 838 | # CONFIG_HID_DEBUG is not set |
944 | 839 | CONFIG_USB_SUPPORT=y | |
945 | # | ||
946 | # USB support | ||
947 | # | ||
948 | # CONFIG_USB_ARCH_HAS_HCD is not set | 840 | # CONFIG_USB_ARCH_HAS_HCD is not set |
949 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 841 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
950 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 842 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
@@ -957,36 +849,8 @@ CONFIG_HID=y | |||
957 | # USB Gadget Support | 849 | # USB Gadget Support |
958 | # | 850 | # |
959 | # CONFIG_USB_GADGET is not set | 851 | # CONFIG_USB_GADGET is not set |
960 | |||
961 | # | ||
962 | # MMC/SD Card support | ||
963 | # | ||
964 | # CONFIG_MMC is not set | 852 | # CONFIG_MMC is not set |
965 | |||
966 | # | ||
967 | # LED devices | ||
968 | # | ||
969 | # CONFIG_NEW_LEDS is not set | 853 | # CONFIG_NEW_LEDS is not set |
970 | |||
971 | # | ||
972 | # LED drivers | ||
973 | # | ||
974 | |||
975 | # | ||
976 | # LED Triggers | ||
977 | # | ||
978 | |||
979 | # | ||
980 | # InfiniBand support | ||
981 | # | ||
982 | |||
983 | # | ||
984 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
985 | # | ||
986 | |||
987 | # | ||
988 | # Real Time Clock | ||
989 | # | ||
990 | # CONFIG_RTC_CLASS is not set | 854 | # CONFIG_RTC_CLASS is not set |
991 | 855 | ||
992 | # | 856 | # |
@@ -1003,12 +867,9 @@ CONFIG_HID=y | |||
1003 | # | 867 | # |
1004 | 868 | ||
1005 | # | 869 | # |
1006 | # Auxiliary Display support | 870 | # Userspace I/O |
1007 | # | ||
1008 | |||
1009 | # | ||
1010 | # Virtualization | ||
1011 | # | 871 | # |
872 | # CONFIG_UIO is not set | ||
1012 | 873 | ||
1013 | # | 874 | # |
1014 | # File systems | 875 | # File systems |
@@ -1121,6 +982,7 @@ CONFIG_NFS_ACL_SUPPORT=m | |||
1121 | CONFIG_NFS_COMMON=y | 982 | CONFIG_NFS_COMMON=y |
1122 | CONFIG_SUNRPC=m | 983 | CONFIG_SUNRPC=m |
1123 | CONFIG_SUNRPC_GSS=m | 984 | CONFIG_SUNRPC_GSS=m |
985 | # CONFIG_SUNRPC_BIND34 is not set | ||
1124 | CONFIG_RPCSEC_GSS_KRB5=m | 986 | CONFIG_RPCSEC_GSS_KRB5=m |
1125 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 987 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1126 | CONFIG_SMB_FS=m | 988 | CONFIG_SMB_FS=m |
@@ -1136,7 +998,6 @@ CONFIG_CIFS=m | |||
1136 | CONFIG_CODA_FS=m | 998 | CONFIG_CODA_FS=m |
1137 | # CONFIG_CODA_FS_OLD_API is not set | 999 | # CONFIG_CODA_FS_OLD_API is not set |
1138 | # CONFIG_AFS_FS is not set | 1000 | # CONFIG_AFS_FS is not set |
1139 | # CONFIG_9P_FS is not set | ||
1140 | 1001 | ||
1141 | # | 1002 | # |
1142 | # Partition Types | 1003 | # Partition Types |
@@ -1158,6 +1019,7 @@ CONFIG_SGI_PARTITION=y | |||
1158 | # CONFIG_SUN_PARTITION is not set | 1019 | # CONFIG_SUN_PARTITION is not set |
1159 | # CONFIG_KARMA_PARTITION is not set | 1020 | # CONFIG_KARMA_PARTITION is not set |
1160 | # CONFIG_EFI_PARTITION is not set | 1021 | # CONFIG_EFI_PARTITION is not set |
1022 | # CONFIG_SYSV68_PARTITION is not set | ||
1161 | 1023 | ||
1162 | # | 1024 | # |
1163 | # Native Language Support | 1025 | # Native Language Support |
@@ -1207,8 +1069,6 @@ CONFIG_NLS_UTF8=m | |||
1207 | # Distributed Lock Manager | 1069 | # Distributed Lock Manager |
1208 | # | 1070 | # |
1209 | CONFIG_DLM=m | 1071 | CONFIG_DLM=m |
1210 | CONFIG_DLM_TCP=y | ||
1211 | # CONFIG_DLM_SCTP is not set | ||
1212 | # CONFIG_DLM_DEBUG is not set | 1072 | # CONFIG_DLM_DEBUG is not set |
1213 | 1073 | ||
1214 | # | 1074 | # |
@@ -1227,7 +1087,6 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1227 | # CONFIG_DEBUG_FS is not set | 1087 | # CONFIG_DEBUG_FS is not set |
1228 | # CONFIG_HEADERS_CHECK is not set | 1088 | # CONFIG_HEADERS_CHECK is not set |
1229 | # CONFIG_DEBUG_KERNEL is not set | 1089 | # CONFIG_DEBUG_KERNEL is not set |
1230 | CONFIG_LOG_BUF_SHIFT=14 | ||
1231 | CONFIG_CROSSCOMPILE=y | 1090 | CONFIG_CROSSCOMPILE=y |
1232 | CONFIG_CMDLINE="" | 1091 | CONFIG_CMDLINE="" |
1233 | 1092 | ||
@@ -1237,12 +1096,9 @@ CONFIG_CMDLINE="" | |||
1237 | CONFIG_KEYS=y | 1096 | CONFIG_KEYS=y |
1238 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | 1097 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
1239 | # CONFIG_SECURITY is not set | 1098 | # CONFIG_SECURITY is not set |
1240 | |||
1241 | # | ||
1242 | # Cryptographic options | ||
1243 | # | ||
1244 | CONFIG_CRYPTO=y | 1099 | CONFIG_CRYPTO=y |
1245 | CONFIG_CRYPTO_ALGAPI=y | 1100 | CONFIG_CRYPTO_ALGAPI=y |
1101 | CONFIG_CRYPTO_ABLKCIPHER=m | ||
1246 | CONFIG_CRYPTO_BLKCIPHER=m | 1102 | CONFIG_CRYPTO_BLKCIPHER=m |
1247 | CONFIG_CRYPTO_HASH=y | 1103 | CONFIG_CRYPTO_HASH=y |
1248 | CONFIG_CRYPTO_MANAGER=y | 1104 | CONFIG_CRYPTO_MANAGER=y |
@@ -1261,6 +1117,7 @@ CONFIG_CRYPTO_ECB=m | |||
1261 | CONFIG_CRYPTO_CBC=m | 1117 | CONFIG_CRYPTO_CBC=m |
1262 | CONFIG_CRYPTO_PCBC=m | 1118 | CONFIG_CRYPTO_PCBC=m |
1263 | CONFIG_CRYPTO_LRW=m | 1119 | CONFIG_CRYPTO_LRW=m |
1120 | CONFIG_CRYPTO_CRYPTD=m | ||
1264 | CONFIG_CRYPTO_DES=m | 1121 | CONFIG_CRYPTO_DES=m |
1265 | CONFIG_CRYPTO_FCRYPT=m | 1122 | CONFIG_CRYPTO_FCRYPT=m |
1266 | CONFIG_CRYPTO_BLOWFISH=m | 1123 | CONFIG_CRYPTO_BLOWFISH=m |
@@ -1279,10 +1136,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=m | |||
1279 | CONFIG_CRYPTO_CRC32C=m | 1136 | CONFIG_CRYPTO_CRC32C=m |
1280 | CONFIG_CRYPTO_CAMELLIA=m | 1137 | CONFIG_CRYPTO_CAMELLIA=m |
1281 | # CONFIG_CRYPTO_TEST is not set | 1138 | # CONFIG_CRYPTO_TEST is not set |
1282 | 1139 | # CONFIG_CRYPTO_HW is not set | |
1283 | # | ||
1284 | # Hardware crypto devices | ||
1285 | # | ||
1286 | 1140 | ||
1287 | # | 1141 | # |
1288 | # Library routines | 1142 | # Library routines |
@@ -1290,7 +1144,9 @@ CONFIG_CRYPTO_CAMELLIA=m | |||
1290 | CONFIG_BITREVERSE=m | 1144 | CONFIG_BITREVERSE=m |
1291 | # CONFIG_CRC_CCITT is not set | 1145 | # CONFIG_CRC_CCITT is not set |
1292 | CONFIG_CRC16=m | 1146 | CONFIG_CRC16=m |
1147 | # CONFIG_CRC_ITU_T is not set | ||
1293 | CONFIG_CRC32=m | 1148 | CONFIG_CRC32=m |
1149 | # CONFIG_CRC7 is not set | ||
1294 | CONFIG_LIBCRC32C=m | 1150 | CONFIG_LIBCRC32C=m |
1295 | CONFIG_ZLIB_INFLATE=m | 1151 | CONFIG_ZLIB_INFLATE=m |
1296 | CONFIG_ZLIB_DEFLATE=m | 1152 | CONFIG_ZLIB_DEFLATE=m |
@@ -1301,3 +1157,4 @@ CONFIG_TEXTSEARCH_FSM=m | |||
1301 | CONFIG_PLIST=y | 1157 | CONFIG_PLIST=y |
1302 | CONFIG_HAS_IOMEM=y | 1158 | CONFIG_HAS_IOMEM=y |
1303 | CONFIG_HAS_IOPORT=y | 1159 | CONFIG_HAS_IOPORT=y |
1160 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/mips/jmr3927/rbhma3100/irq.c b/arch/mips/jmr3927/rbhma3100/irq.c index 1187b44a3dd4..d9efe692e551 100644 --- a/arch/mips/jmr3927/rbhma3100/irq.c +++ b/arch/mips/jmr3927/rbhma3100/irq.c | |||
@@ -45,9 +45,6 @@ | |||
45 | #error JMR3927_IRQ_END > NR_IRQS | 45 | #error JMR3927_IRQ_END > NR_IRQS |
46 | #endif | 46 | #endif |
47 | 47 | ||
48 | #define irc_dlevel 0 | ||
49 | #define irc_elevel 1 | ||
50 | |||
51 | static unsigned char irc_level[TX3927_NUM_IR] = { | 48 | static unsigned char irc_level[TX3927_NUM_IR] = { |
52 | 5, 5, 5, 5, 5, 5, /* INT[5:0] */ | 49 | 5, 5, 5, 5, 5, 5, /* INT[5:0] */ |
53 | 7, 7, /* SIO */ | 50 | 7, 7, /* SIO */ |
@@ -80,34 +77,6 @@ static void unmask_irq_ioc(unsigned int irq) | |||
80 | (void)jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR); | 77 | (void)jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR); |
81 | } | 78 | } |
82 | 79 | ||
83 | static void mask_irq_irc(unsigned int irq) | ||
84 | { | ||
85 | unsigned int irq_nr = irq - JMR3927_IRQ_IRC; | ||
86 | volatile unsigned long *ilrp = &tx3927_ircptr->ilr[irq_nr / 2]; | ||
87 | if (irq_nr & 1) | ||
88 | *ilrp = (*ilrp & 0x00ff) | (irc_dlevel << 8); | ||
89 | else | ||
90 | *ilrp = (*ilrp & 0xff00) | irc_dlevel; | ||
91 | /* update IRCSR */ | ||
92 | tx3927_ircptr->imr = 0; | ||
93 | tx3927_ircptr->imr = irc_elevel; | ||
94 | /* flush write buffer */ | ||
95 | (void)tx3927_ircptr->ssr; | ||
96 | } | ||
97 | |||
98 | static void unmask_irq_irc(unsigned int irq) | ||
99 | { | ||
100 | unsigned int irq_nr = irq - JMR3927_IRQ_IRC; | ||
101 | volatile unsigned long *ilrp = &tx3927_ircptr->ilr[irq_nr / 2]; | ||
102 | if (irq_nr & 1) | ||
103 | *ilrp = (*ilrp & 0x00ff) | (irc_level[irq_nr] << 8); | ||
104 | else | ||
105 | *ilrp = (*ilrp & 0xff00) | irc_level[irq_nr]; | ||
106 | /* update IRCSR */ | ||
107 | tx3927_ircptr->imr = 0; | ||
108 | tx3927_ircptr->imr = irc_elevel; | ||
109 | } | ||
110 | |||
111 | asmlinkage void plat_irq_dispatch(void) | 80 | asmlinkage void plat_irq_dispatch(void) |
112 | { | 81 | { |
113 | unsigned long cp0_cause = read_c0_cause(); | 82 | unsigned long cp0_cause = read_c0_cause(); |
@@ -168,10 +137,6 @@ void __init arch_init_irq(void) | |||
168 | /* clear PCI Reset interrupts */ | 137 | /* clear PCI Reset interrupts */ |
169 | jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR); | 138 | jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR); |
170 | 139 | ||
171 | /* enable interrupt control */ | ||
172 | tx3927_ircptr->cer = TX3927_IRCER_ICE; | ||
173 | tx3927_ircptr->imr = irc_elevel; | ||
174 | |||
175 | jmr3927_irq_init(); | 140 | jmr3927_irq_init(); |
176 | 141 | ||
177 | /* setup IOC interrupt 1 (PCI, MODEM) */ | 142 | /* setup IOC interrupt 1 (PCI, MODEM) */ |
@@ -193,20 +158,13 @@ static struct irq_chip jmr3927_irq_ioc = { | |||
193 | .unmask = unmask_irq_ioc, | 158 | .unmask = unmask_irq_ioc, |
194 | }; | 159 | }; |
195 | 160 | ||
196 | static struct irq_chip jmr3927_irq_irc = { | ||
197 | .name = "jmr3927_irc", | ||
198 | .ack = mask_irq_irc, | ||
199 | .mask = mask_irq_irc, | ||
200 | .mask_ack = mask_irq_irc, | ||
201 | .unmask = unmask_irq_irc, | ||
202 | }; | ||
203 | |||
204 | static void __init jmr3927_irq_init(void) | 161 | static void __init jmr3927_irq_init(void) |
205 | { | 162 | { |
206 | u32 i; | 163 | u32 i; |
207 | 164 | ||
208 | for (i = JMR3927_IRQ_IRC; i < JMR3927_IRQ_IRC + JMR3927_NR_IRQ_IRC; i++) | 165 | txx9_irq_init(TX3927_IRC_REG); |
209 | set_irq_chip_and_handler(i, &jmr3927_irq_irc, handle_level_irq); | 166 | for (i = 0; i < TXx9_MAX_IR; i++) |
167 | txx9_irq_set_pri(i, irc_level[i]); | ||
210 | for (i = JMR3927_IRQ_IOC; i < JMR3927_IRQ_IOC + JMR3927_NR_IRQ_IOC; i++) | 168 | for (i = JMR3927_IRQ_IOC; i < JMR3927_IRQ_IOC + JMR3927_NR_IRQ_IOC; i++) |
211 | set_irq_chip_and_handler(i, &jmr3927_irq_ioc, handle_level_irq); | 169 | set_irq_chip_and_handler(i, &jmr3927_irq_ioc, handle_level_irq); |
212 | } | 170 | } |
diff --git a/arch/mips/jmr3927/rbhma3100/setup.c b/arch/mips/jmr3927/rbhma3100/setup.c index 8303001516d2..fde56e86c2ab 100644 --- a/arch/mips/jmr3927/rbhma3100/setup.c +++ b/arch/mips/jmr3927/rbhma3100/setup.c | |||
@@ -290,19 +290,6 @@ static void __init tx3927_setup(void) | |||
290 | tx3927_ccfgptr->crir, | 290 | tx3927_ccfgptr->crir, |
291 | tx3927_ccfgptr->ccfg, tx3927_ccfgptr->pcfg); | 291 | tx3927_ccfgptr->ccfg, tx3927_ccfgptr->pcfg); |
292 | 292 | ||
293 | /* IRC */ | ||
294 | /* disable interrupt control */ | ||
295 | tx3927_ircptr->cer = 0; | ||
296 | /* mask all IRC interrupts */ | ||
297 | tx3927_ircptr->imr = 0; | ||
298 | for (i = 0; i < TX3927_NUM_IR / 2; i++) { | ||
299 | tx3927_ircptr->ilr[i] = 0; | ||
300 | } | ||
301 | /* setup IRC interrupt mode (Low Active) */ | ||
302 | for (i = 0; i < TX3927_NUM_IR / 8; i++) { | ||
303 | tx3927_ircptr->cr[i] = 0; | ||
304 | } | ||
305 | |||
306 | /* TMR */ | 293 | /* TMR */ |
307 | /* disable all timers */ | 294 | /* disable all timers */ |
308 | for (i = 0; i < TX3927_NR_TMR; i++) { | 295 | for (i = 0; i < TX3927_NR_TMR; i++) { |
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index 07344cb37596..2fd96d95a39c 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile | |||
@@ -50,6 +50,7 @@ obj-$(CONFIG_IRQ_CPU) += irq_cpu.o | |||
50 | obj-$(CONFIG_IRQ_CPU_RM7K) += irq-rm7000.o | 50 | obj-$(CONFIG_IRQ_CPU_RM7K) += irq-rm7000.o |
51 | obj-$(CONFIG_IRQ_CPU_RM9K) += irq-rm9000.o | 51 | obj-$(CONFIG_IRQ_CPU_RM9K) += irq-rm9000.o |
52 | obj-$(CONFIG_MIPS_BOARDS_GEN) += irq-msc01.o | 52 | obj-$(CONFIG_MIPS_BOARDS_GEN) += irq-msc01.o |
53 | obj-$(CONFIG_IRQ_TXX9) += irq_txx9.o | ||
53 | 54 | ||
54 | obj-$(CONFIG_32BIT) += scall32-o32.o | 55 | obj-$(CONFIG_32BIT) += scall32-o32.o |
55 | obj-$(CONFIG_64BIT) += scall64-64.o | 56 | obj-$(CONFIG_64BIT) += scall64-64.o |
diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c index 013327286c26..ca136298acdc 100644 --- a/arch/mips/kernel/asm-offsets.c +++ b/arch/mips/kernel/asm-offsets.c | |||
@@ -232,6 +232,10 @@ void output_mm_defines(void) | |||
232 | constant("#define _PMD_T_LOG2 ", PMD_T_LOG2); | 232 | constant("#define _PMD_T_LOG2 ", PMD_T_LOG2); |
233 | constant("#define _PTE_T_LOG2 ", PTE_T_LOG2); | 233 | constant("#define _PTE_T_LOG2 ", PTE_T_LOG2); |
234 | linefeed; | 234 | linefeed; |
235 | constant("#define _PGD_ORDER ", PGD_ORDER); | ||
236 | constant("#define _PMD_ORDER ", PMD_ORDER); | ||
237 | constant("#define _PTE_ORDER ", PTE_ORDER); | ||
238 | linefeed; | ||
235 | constant("#define _PMD_SHIFT ", PMD_SHIFT); | 239 | constant("#define _PMD_SHIFT ", PMD_SHIFT); |
236 | constant("#define _PGDIR_SHIFT ", PGDIR_SHIFT); | 240 | constant("#define _PGDIR_SHIFT ", PGDIR_SHIFT); |
237 | linefeed; | 241 | linefeed; |
diff --git a/arch/mips/kernel/cpu-bugs64.c b/arch/mips/kernel/cpu-bugs64.c index c09337b947b9..ac04f0adc408 100644 --- a/arch/mips/kernel/cpu-bugs64.c +++ b/arch/mips/kernel/cpu-bugs64.c | |||
@@ -29,7 +29,7 @@ static inline void align_mod(const int align, const int mod) | |||
29 | ".endr\n\t" | 29 | ".endr\n\t" |
30 | ".set pop" | 30 | ".set pop" |
31 | : | 31 | : |
32 | : "n" (align), "n" (mod)); | 32 | : "rn" (align), "rn" (mod)); |
33 | } | 33 | } |
34 | 34 | ||
35 | static inline void mult_sh_align_mod(long *v1, long *v2, long *w, | 35 | static inline void mult_sh_align_mod(long *v1, long *v2, long *w, |
diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c index 6980deb6dced..28b2a8f00911 100644 --- a/arch/mips/kernel/irixsig.c +++ b/arch/mips/kernel/irixsig.c | |||
@@ -725,7 +725,7 @@ asmlinkage int irix_getcontext(struct pt_regs *regs) | |||
725 | current->comm, current->pid, ctx); | 725 | current->comm, current->pid, ctx); |
726 | #endif | 726 | #endif |
727 | 727 | ||
728 | if (!access_ok(VERIFY_WRITE, ctx, sizeof(*ctx))); | 728 | if (!access_ok(VERIFY_WRITE, ctx, sizeof(*ctx))) |
729 | return -EFAULT; | 729 | return -EFAULT; |
730 | 730 | ||
731 | error = __put_user(current->thread.irix_oldctx, &ctx->link); | 731 | error = __put_user(current->thread.irix_oldctx, &ctx->link); |
diff --git a/arch/mips/kernel/irq_txx9.c b/arch/mips/kernel/irq_txx9.c new file mode 100644 index 000000000000..a4d1462c27f7 --- /dev/null +++ b/arch/mips/kernel/irq_txx9.c | |||
@@ -0,0 +1,192 @@ | |||
1 | /* | ||
2 | * linux/arch/mips/kernel/irq_txx9.c | ||
3 | * | ||
4 | * Based on linux/arch/mips/jmr3927/rbhma3100/irq.c, | ||
5 | * linux/arch/mips/tx4927/common/tx4927_irq.c, | ||
6 | * linux/arch/mips/tx4938/common/irq.c | ||
7 | * | ||
8 | * Copyright 2001, 2003-2005 MontaVista Software Inc. | ||
9 | * Author: MontaVista Software, Inc. | ||
10 | * ahennessy@mvista.com | ||
11 | * source@mvista.com | ||
12 | * Copyright (C) 2000-2001 Toshiba Corporation | ||
13 | * | ||
14 | * This file is subject to the terms and conditions of the GNU General Public | ||
15 | * License. See the file "COPYING" in the main directory of this archive | ||
16 | * for more details. | ||
17 | */ | ||
18 | #include <linux/init.h> | ||
19 | #include <linux/interrupt.h> | ||
20 | #include <linux/types.h> | ||
21 | #include <asm/txx9irq.h> | ||
22 | |||
23 | struct txx9_irc_reg { | ||
24 | u32 cer; | ||
25 | u32 cr[2]; | ||
26 | u32 unused0; | ||
27 | u32 ilr[8]; | ||
28 | u32 unused1[4]; | ||
29 | u32 imr; | ||
30 | u32 unused2[7]; | ||
31 | u32 scr; | ||
32 | u32 unused3[7]; | ||
33 | u32 ssr; | ||
34 | u32 unused4[7]; | ||
35 | u32 csr; | ||
36 | }; | ||
37 | |||
38 | /* IRCER : Int. Control Enable */ | ||
39 | #define TXx9_IRCER_ICE 0x00000001 | ||
40 | |||
41 | /* IRCR : Int. Control */ | ||
42 | #define TXx9_IRCR_LOW 0x00000000 | ||
43 | #define TXx9_IRCR_HIGH 0x00000001 | ||
44 | #define TXx9_IRCR_DOWN 0x00000002 | ||
45 | #define TXx9_IRCR_UP 0x00000003 | ||
46 | #define TXx9_IRCR_EDGE(cr) ((cr) & 0x00000002) | ||
47 | |||
48 | /* IRSCR : Int. Status Control */ | ||
49 | #define TXx9_IRSCR_EIClrE 0x00000100 | ||
50 | #define TXx9_IRSCR_EIClr_MASK 0x0000000f | ||
51 | |||
52 | /* IRCSR : Int. Current Status */ | ||
53 | #define TXx9_IRCSR_IF 0x00010000 | ||
54 | #define TXx9_IRCSR_ILV_MASK 0x00000700 | ||
55 | #define TXx9_IRCSR_IVL_MASK 0x0000001f | ||
56 | |||
57 | #define irc_dlevel 0 | ||
58 | #define irc_elevel 1 | ||
59 | |||
60 | static struct txx9_irc_reg __iomem *txx9_ircptr __read_mostly; | ||
61 | |||
62 | static struct { | ||
63 | unsigned char level; | ||
64 | unsigned char mode; | ||
65 | } txx9irq[TXx9_MAX_IR] __read_mostly; | ||
66 | |||
67 | static void txx9_irq_unmask(unsigned int irq) | ||
68 | { | ||
69 | unsigned int irq_nr = irq - TXX9_IRQ_BASE; | ||
70 | u32 __iomem *ilrp = &txx9_ircptr->ilr[(irq_nr % 16 ) / 2]; | ||
71 | int ofs = irq_nr / 16 * 16 + (irq_nr & 1) * 8; | ||
72 | |||
73 | __raw_writel((__raw_readl(ilrp) & ~(0xff << ofs)) | ||
74 | | (txx9irq[irq_nr].level << ofs), | ||
75 | ilrp); | ||
76 | #ifdef CONFIG_CPU_TX39XX | ||
77 | /* update IRCSR */ | ||
78 | __raw_writel(0, &txx9_ircptr->imr); | ||
79 | __raw_writel(irc_elevel, &txx9_ircptr->imr); | ||
80 | #endif | ||
81 | } | ||
82 | |||
83 | static inline void txx9_irq_mask(unsigned int irq) | ||
84 | { | ||
85 | unsigned int irq_nr = irq - TXX9_IRQ_BASE; | ||
86 | u32 __iomem *ilrp = &txx9_ircptr->ilr[(irq_nr % 16) / 2]; | ||
87 | int ofs = irq_nr / 16 * 16 + (irq_nr & 1) * 8; | ||
88 | |||
89 | __raw_writel((__raw_readl(ilrp) & ~(0xff << ofs)) | ||
90 | | (irc_dlevel << ofs), | ||
91 | ilrp); | ||
92 | #ifdef CONFIG_CPU_TX39XX | ||
93 | /* update IRCSR */ | ||
94 | __raw_writel(0, &txx9_ircptr->imr); | ||
95 | __raw_writel(irc_elevel, &txx9_ircptr->imr); | ||
96 | /* flush write buffer */ | ||
97 | __raw_readl(&txx9_ircptr->ssr); | ||
98 | #else | ||
99 | mmiowb(); | ||
100 | #endif | ||
101 | } | ||
102 | |||
103 | static void txx9_irq_mask_ack(unsigned int irq) | ||
104 | { | ||
105 | unsigned int irq_nr = irq - TXX9_IRQ_BASE; | ||
106 | |||
107 | txx9_irq_mask(irq); | ||
108 | /* clear edge detection */ | ||
109 | if (unlikely(TXx9_IRCR_EDGE(txx9irq[irq_nr].mode))) | ||
110 | __raw_writel(TXx9_IRSCR_EIClrE | irq_nr, &txx9_ircptr->scr); | ||
111 | } | ||
112 | |||
113 | static int txx9_irq_set_type(unsigned int irq, unsigned int flow_type) | ||
114 | { | ||
115 | unsigned int irq_nr = irq - TXX9_IRQ_BASE; | ||
116 | u32 cr; | ||
117 | u32 __iomem *crp; | ||
118 | int ofs; | ||
119 | int mode; | ||
120 | |||
121 | if (flow_type & IRQF_TRIGGER_PROBE) | ||
122 | return 0; | ||
123 | switch (flow_type & IRQF_TRIGGER_MASK) { | ||
124 | case IRQF_TRIGGER_RISING: mode = TXx9_IRCR_UP; break; | ||
125 | case IRQF_TRIGGER_FALLING: mode = TXx9_IRCR_DOWN; break; | ||
126 | case IRQF_TRIGGER_HIGH: mode = TXx9_IRCR_HIGH; break; | ||
127 | case IRQF_TRIGGER_LOW: mode = TXx9_IRCR_LOW; break; | ||
128 | default: | ||
129 | return -EINVAL; | ||
130 | } | ||
131 | crp = &txx9_ircptr->cr[(unsigned int)irq_nr / 8]; | ||
132 | cr = __raw_readl(crp); | ||
133 | ofs = (irq_nr & (8 - 1)) * 2; | ||
134 | cr &= ~(0x3 << ofs); | ||
135 | cr |= (mode & 0x3) << ofs; | ||
136 | __raw_writel(cr, crp); | ||
137 | txx9irq[irq_nr].mode = mode; | ||
138 | return 0; | ||
139 | } | ||
140 | |||
141 | static struct irq_chip txx9_irq_chip = { | ||
142 | .name = "TXX9", | ||
143 | .ack = txx9_irq_mask_ack, | ||
144 | .mask = txx9_irq_mask, | ||
145 | .mask_ack = txx9_irq_mask_ack, | ||
146 | .unmask = txx9_irq_unmask, | ||
147 | .set_type = txx9_irq_set_type, | ||
148 | }; | ||
149 | |||
150 | void __init txx9_irq_init(unsigned long baseaddr) | ||
151 | { | ||
152 | int i; | ||
153 | |||
154 | txx9_ircptr = ioremap(baseaddr, sizeof(struct txx9_irc_reg)); | ||
155 | for (i = 0; i < TXx9_MAX_IR; i++) { | ||
156 | txx9irq[i].level = 4; /* middle level */ | ||
157 | txx9irq[i].mode = TXx9_IRCR_LOW; | ||
158 | set_irq_chip_and_handler(TXX9_IRQ_BASE + i, | ||
159 | &txx9_irq_chip, handle_level_irq); | ||
160 | } | ||
161 | |||
162 | /* mask all IRC interrupts */ | ||
163 | __raw_writel(0, &txx9_ircptr->imr); | ||
164 | for (i = 0; i < 8; i++) | ||
165 | __raw_writel(0, &txx9_ircptr->ilr[i]); | ||
166 | /* setup IRC interrupt mode (Low Active) */ | ||
167 | for (i = 0; i < 2; i++) | ||
168 | __raw_writel(0, &txx9_ircptr->cr[i]); | ||
169 | /* enable interrupt control */ | ||
170 | __raw_writel(TXx9_IRCER_ICE, &txx9_ircptr->cer); | ||
171 | __raw_writel(irc_elevel, &txx9_ircptr->imr); | ||
172 | } | ||
173 | |||
174 | int __init txx9_irq_set_pri(int irc_irq, int new_pri) | ||
175 | { | ||
176 | int old_pri; | ||
177 | |||
178 | if ((unsigned int)irc_irq >= TXx9_MAX_IR) | ||
179 | return 0; | ||
180 | old_pri = txx9irq[irc_irq].level; | ||
181 | txx9irq[irc_irq].level = new_pri; | ||
182 | return old_pri; | ||
183 | } | ||
184 | |||
185 | int txx9_irq(void) | ||
186 | { | ||
187 | u32 csr = __raw_readl(&txx9_ircptr->csr); | ||
188 | |||
189 | if (likely(!(csr & TXx9_IRCSR_IF))) | ||
190 | return TXX9_IRQ_BASE + (csr & (TXx9_MAX_IR - 1)); | ||
191 | return -1; | ||
192 | } | ||
diff --git a/arch/mips/kernel/machine_kexec.c b/arch/mips/kernel/machine_kexec.c index 22960d67cf07..85beb9b0b2d0 100644 --- a/arch/mips/kernel/machine_kexec.c +++ b/arch/mips/kernel/machine_kexec.c | |||
@@ -78,11 +78,8 @@ machine_kexec(struct kimage *image) | |||
78 | */ | 78 | */ |
79 | local_irq_disable(); | 79 | local_irq_disable(); |
80 | 80 | ||
81 | flush_icache_range(reboot_code_buffer, | ||
82 | reboot_code_buffer + KEXEC_CONTROL_CODE_SIZE); | ||
83 | |||
84 | printk("Will call new kernel at %08lx\n", image->start); | 81 | printk("Will call new kernel at %08lx\n", image->start); |
85 | printk("Bye ...\n"); | 82 | printk("Bye ...\n"); |
86 | flush_cache_all(); | 83 | __flush_cache_all(); |
87 | ((noretfun_t) reboot_code_buffer)(); | 84 | ((noretfun_t) reboot_code_buffer)(); |
88 | } | 85 | } |
diff --git a/arch/mips/kernel/mips-mt.c b/arch/mips/kernel/mips-mt.c index 7169a4db37b8..56750b02ab40 100644 --- a/arch/mips/kernel/mips-mt.c +++ b/arch/mips/kernel/mips-mt.c | |||
@@ -4,6 +4,7 @@ | |||
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include <linux/device.h> | 6 | #include <linux/device.h> |
7 | #include <linux/kallsyms.h> | ||
7 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
8 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
9 | #include <linux/module.h> | 10 | #include <linux/module.h> |
@@ -84,8 +85,9 @@ void mips_mt_regdump(unsigned long mvpctl) | |||
84 | read_vpe_c0_vpeconf0()); | 85 | read_vpe_c0_vpeconf0()); |
85 | printk(" VPE%d.Status : %08lx\n", | 86 | printk(" VPE%d.Status : %08lx\n", |
86 | i, read_vpe_c0_status()); | 87 | i, read_vpe_c0_status()); |
87 | printk(" VPE%d.EPC : %08lx\n", | 88 | printk(" VPE%d.EPC : %08lx ", |
88 | i, read_vpe_c0_epc()); | 89 | i, read_vpe_c0_epc()); |
90 | print_symbol("%s\n", read_vpe_c0_epc()); | ||
89 | printk(" VPE%d.Cause : %08lx\n", | 91 | printk(" VPE%d.Cause : %08lx\n", |
90 | i, read_vpe_c0_cause()); | 92 | i, read_vpe_c0_cause()); |
91 | printk(" VPE%d.Config7 : %08lx\n", | 93 | printk(" VPE%d.Config7 : %08lx\n", |
@@ -110,7 +112,8 @@ void mips_mt_regdump(unsigned long mvpctl) | |||
110 | } | 112 | } |
111 | printk(" TCStatus : %08lx\n", tcstatval); | 113 | printk(" TCStatus : %08lx\n", tcstatval); |
112 | printk(" TCBind : %08lx\n", read_tc_c0_tcbind()); | 114 | printk(" TCBind : %08lx\n", read_tc_c0_tcbind()); |
113 | printk(" TCRestart : %08lx\n", read_tc_c0_tcrestart()); | 115 | printk(" TCRestart : %08lx ", read_tc_c0_tcrestart()); |
116 | print_symbol("%s\n", read_tc_c0_tcrestart()); | ||
114 | printk(" TCHalt : %08lx\n", haltval); | 117 | printk(" TCHalt : %08lx\n", haltval); |
115 | printk(" TCContext : %08lx\n", read_tc_c0_tccontext()); | 118 | printk(" TCContext : %08lx\n", read_tc_c0_tccontext()); |
116 | if (!haltval) | 119 | if (!haltval) |
diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c index 19b30d6f1727..05dcce416325 100644 --- a/arch/mips/kernel/smp-mt.c +++ b/arch/mips/kernel/smp-mt.c | |||
@@ -287,7 +287,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus) | |||
287 | * (unsigned long)idle->thread_info the gp | 287 | * (unsigned long)idle->thread_info the gp |
288 | * assumes a 1:1 mapping of TC => VPE | 288 | * assumes a 1:1 mapping of TC => VPE |
289 | */ | 289 | */ |
290 | void prom_boot_secondary(int cpu, struct task_struct *idle) | 290 | void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle) |
291 | { | 291 | { |
292 | struct thread_info *gp = task_thread_info(idle); | 292 | struct thread_info *gp = task_thread_info(idle); |
293 | dvpe(); | 293 | dvpe(); |
@@ -321,7 +321,7 @@ void prom_boot_secondary(int cpu, struct task_struct *idle) | |||
321 | evpe(EVPE_ENABLE); | 321 | evpe(EVPE_ENABLE); |
322 | } | 322 | } |
323 | 323 | ||
324 | void prom_init_secondary(void) | 324 | void __cpuinit prom_init_secondary(void) |
325 | { | 325 | { |
326 | /* Enable per-cpu interrupts */ | 326 | /* Enable per-cpu interrupts */ |
327 | 327 | ||
@@ -330,7 +330,7 @@ void prom_init_secondary(void) | |||
330 | (STATUSF_IP0 | STATUSF_IP1 | STATUSF_IP6 | STATUSF_IP7)); | 330 | (STATUSF_IP0 | STATUSF_IP1 | STATUSF_IP6 | STATUSF_IP7)); |
331 | } | 331 | } |
332 | 332 | ||
333 | void prom_smp_finish(void) | 333 | void __cpuinit prom_smp_finish(void) |
334 | { | 334 | { |
335 | write_c0_compare(read_c0_count() + (8* mips_hpt_frequency/HZ)); | 335 | write_c0_compare(read_c0_count() + (8* mips_hpt_frequency/HZ)); |
336 | 336 | ||
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c index 16aa5d37117c..43826c16101d 100644 --- a/arch/mips/kernel/smtc.c +++ b/arch/mips/kernel/smtc.c | |||
@@ -28,8 +28,6 @@ | |||
28 | * This file should be built into the kernel only if CONFIG_MIPS_MT_SMTC is set. | 28 | * This file should be built into the kernel only if CONFIG_MIPS_MT_SMTC is set. |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #define MIPS_CPU_IPI_IRQ 1 | ||
32 | |||
33 | #define LOCK_MT_PRA() \ | 31 | #define LOCK_MT_PRA() \ |
34 | local_irq_save(flags); \ | 32 | local_irq_save(flags); \ |
35 | mtflags = dmt() | 33 | mtflags = dmt() |
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index c8e291c83057..6379003f9d8d 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c | |||
@@ -606,6 +606,8 @@ asmlinkage void do_ov(struct pt_regs *regs) | |||
606 | */ | 606 | */ |
607 | asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31) | 607 | asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31) |
608 | { | 608 | { |
609 | siginfo_t info; | ||
610 | |||
609 | die_if_kernel("FP exception in kernel code", regs); | 611 | die_if_kernel("FP exception in kernel code", regs); |
610 | 612 | ||
611 | if (fcr31 & FPU_CSR_UNI_X) { | 613 | if (fcr31 & FPU_CSR_UNI_X) { |
@@ -641,9 +643,22 @@ asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31) | |||
641 | force_sig(sig, current); | 643 | force_sig(sig, current); |
642 | 644 | ||
643 | return; | 645 | return; |
644 | } | 646 | } else if (fcr31 & FPU_CSR_INV_X) |
645 | 647 | info.si_code = FPE_FLTINV; | |
646 | force_sig(SIGFPE, current); | 648 | else if (fcr31 & FPU_CSR_DIV_X) |
649 | info.si_code = FPE_FLTDIV; | ||
650 | else if (fcr31 & FPU_CSR_OVF_X) | ||
651 | info.si_code = FPE_FLTOVF; | ||
652 | else if (fcr31 & FPU_CSR_UDF_X) | ||
653 | info.si_code = FPE_FLTUND; | ||
654 | else if (fcr31 & FPU_CSR_INE_X) | ||
655 | info.si_code = FPE_FLTRES; | ||
656 | else | ||
657 | info.si_code = __SI_FAULT; | ||
658 | info.si_signo = SIGFPE; | ||
659 | info.si_errno = 0; | ||
660 | info.si_addr = (void __user *) regs->cp0_epc; | ||
661 | force_sig_info(SIGFPE, &info, current); | ||
647 | } | 662 | } |
648 | 663 | ||
649 | asmlinkage void do_bp(struct pt_regs *regs) | 664 | asmlinkage void do_bp(struct pt_regs *regs) |
@@ -1035,19 +1050,11 @@ void ejtag_exception_handler(struct pt_regs *regs) | |||
1035 | /* | 1050 | /* |
1036 | * NMI exception handler. | 1051 | * NMI exception handler. |
1037 | */ | 1052 | */ |
1038 | void nmi_exception_handler(struct pt_regs *regs) | 1053 | NORET_TYPE void ATTRIB_NORET nmi_exception_handler(struct pt_regs *regs) |
1039 | { | 1054 | { |
1040 | #ifdef CONFIG_MIPS_MT_SMTC | ||
1041 | unsigned long dvpret = dvpe(); | ||
1042 | bust_spinlocks(1); | ||
1043 | printk("NMI taken!!!!\n"); | ||
1044 | mips_mt_regdump(dvpret); | ||
1045 | #else | ||
1046 | bust_spinlocks(1); | 1055 | bust_spinlocks(1); |
1047 | printk("NMI taken!!!!\n"); | 1056 | printk("NMI taken!!!!\n"); |
1048 | #endif /* CONFIG_MIPS_MT_SMTC */ | ||
1049 | die("NMI", regs); | 1057 | die("NMI", regs); |
1050 | while(1) ; | ||
1051 | } | 1058 | } |
1052 | 1059 | ||
1053 | #define VECTORSPACING 0x100 /* for EI/VI mode */ | 1060 | #define VECTORSPACING 0x100 /* for EI/VI mode */ |
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S index bc9bae2a73f4..60bbaecde187 100644 --- a/arch/mips/kernel/vmlinux.lds.S +++ b/arch/mips/kernel/vmlinux.lds.S | |||
@@ -142,15 +142,16 @@ SECTIONS | |||
142 | *(.exitcall.exit) | 142 | *(.exitcall.exit) |
143 | 143 | ||
144 | /* ABI crap starts here */ | 144 | /* ABI crap starts here */ |
145 | *(.comment) | ||
146 | *(.MIPS.options) | 145 | *(.MIPS.options) |
147 | *(.note) | ||
148 | *(.options) | 146 | *(.options) |
149 | *(.pdr) | 147 | *(.pdr) |
150 | *(.reginfo) | 148 | *(.reginfo) |
151 | *(.mdebug*) | ||
152 | } | 149 | } |
153 | 150 | ||
151 | /* These mark the ABI of the kernel for debuggers. */ | ||
152 | .mdebug.abi32 : { KEEP(*(.mdebug.abi32)) } | ||
153 | .mdebug.abi64 : { KEEP(*(.mdebug.abi64)) } | ||
154 | |||
154 | /* This is the MIPS specific mdebug section. */ | 155 | /* This is the MIPS specific mdebug section. */ |
155 | .mdebug : { *(.mdebug) } | 156 | .mdebug : { *(.mdebug) } |
156 | 157 | ||
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile index 91ed1eb33102..8810dfb915dd 100644 --- a/arch/mips/lib/Makefile +++ b/arch/mips/lib/Makefile | |||
@@ -28,4 +28,4 @@ obj-$(CONFIG_CPU_TX49XX) += dump_tlb.o | |||
28 | obj-$(CONFIG_CPU_VR41XX) += dump_tlb.o | 28 | obj-$(CONFIG_CPU_VR41XX) += dump_tlb.o |
29 | 29 | ||
30 | # libgcc-style stuff needed in the kernel | 30 | # libgcc-style stuff needed in the kernel |
31 | obj-y += ashldi3.o ashrdi3.o lshrdi3.o ucmpdi2.o | 31 | obj-y += ashldi3.o ashrdi3.o cmpdi2.o lshrdi3.o ucmpdi2.o |
diff --git a/arch/mips/lib/cmpdi2.c b/arch/mips/lib/cmpdi2.c new file mode 100644 index 000000000000..8c1306437ed1 --- /dev/null +++ b/arch/mips/lib/cmpdi2.c | |||
@@ -0,0 +1,27 @@ | |||
1 | #include <linux/module.h> | ||
2 | |||
3 | #include "libgcc.h" | ||
4 | |||
5 | word_type __cmpdi2(long long a, long long b) | ||
6 | { | ||
7 | const DWunion au = { | ||
8 | .ll = a | ||
9 | }; | ||
10 | const DWunion bu = { | ||
11 | .ll = b | ||
12 | }; | ||
13 | |||
14 | if (au.s.high < bu.s.high) | ||
15 | return 0; | ||
16 | else if (au.s.high > bu.s.high) | ||
17 | return 2; | ||
18 | |||
19 | if ((unsigned int) au.s.low < (unsigned int) bu.s.low) | ||
20 | return 0; | ||
21 | else if ((unsigned int) au.s.low > (unsigned int) bu.s.low) | ||
22 | return 2; | ||
23 | |||
24 | return 1; | ||
25 | } | ||
26 | |||
27 | EXPORT_SYMBOL(__cmpdi2); | ||
diff --git a/arch/mips/mips-boards/malta/malta_smtc.c b/arch/mips/mips-boards/malta/malta_smtc.c index 0fb4c269901c..ae05d058cb37 100644 --- a/arch/mips/mips-boards/malta/malta_smtc.c +++ b/arch/mips/mips-boards/malta/malta_smtc.c | |||
@@ -1,6 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Malta Platform-specific hooks for SMP operation | 2 | * Malta Platform-specific hooks for SMP operation |
3 | */ | 3 | */ |
4 | #include <linux/irq.h> | ||
4 | #include <linux/init.h> | 5 | #include <linux/init.h> |
5 | 6 | ||
6 | #include <asm/mipsregs.h> | 7 | #include <asm/mipsregs.h> |
@@ -24,7 +25,7 @@ void core_send_ipi(int cpu, unsigned int action) | |||
24 | * Platform "CPU" startup hook | 25 | * Platform "CPU" startup hook |
25 | */ | 26 | */ |
26 | 27 | ||
27 | void prom_boot_secondary(int cpu, struct task_struct *idle) | 28 | void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle) |
28 | { | 29 | { |
29 | smtc_boot_secondary(cpu, idle); | 30 | smtc_boot_secondary(cpu, idle); |
30 | } | 31 | } |
@@ -33,7 +34,7 @@ void prom_boot_secondary(int cpu, struct task_struct *idle) | |||
33 | * Post-config but pre-boot cleanup entry point | 34 | * Post-config but pre-boot cleanup entry point |
34 | */ | 35 | */ |
35 | 36 | ||
36 | void prom_init_secondary(void) | 37 | void __cpuinit prom_init_secondary(void) |
37 | { | 38 | { |
38 | void smtc_init_secondary(void); | 39 | void smtc_init_secondary(void); |
39 | int myvpe; | 40 | int myvpe; |
@@ -42,10 +43,11 @@ void prom_init_secondary(void) | |||
42 | myvpe = read_c0_tcbind() & TCBIND_CURVPE; | 43 | myvpe = read_c0_tcbind() & TCBIND_CURVPE; |
43 | if (myvpe != 0) { | 44 | if (myvpe != 0) { |
44 | /* Ideally, this should be done only once per VPE, but... */ | 45 | /* Ideally, this should be done only once per VPE, but... */ |
45 | clear_c0_status(STATUSF_IP2); | 46 | clear_c0_status(ST0_IM); |
46 | set_c0_status(STATUSF_IP0 | STATUSF_IP1 | STATUSF_IP3 | 47 | set_c0_status((0x100 << cp0_compare_irq) |
47 | | STATUSF_IP4 | STATUSF_IP5 | STATUSF_IP6 | 48 | | (0x100 << MIPS_CPU_IPI_IRQ)); |
48 | | STATUSF_IP7); | 49 | if (cp0_perfcount_irq >= 0) |
50 | set_c0_status(0x100 << cp0_perfcount_irq); | ||
49 | } | 51 | } |
50 | 52 | ||
51 | smtc_init_secondary(); | 53 | smtc_init_secondary(); |
@@ -74,7 +76,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus) | |||
74 | * SMP initialization finalization entry point | 76 | * SMP initialization finalization entry point |
75 | */ | 77 | */ |
76 | 78 | ||
77 | void prom_smp_finish(void) | 79 | void __cpuinit prom_smp_finish(void) |
78 | { | 80 | { |
79 | smtc_smp_finish(); | 81 | smtc_smp_finish(); |
80 | } | 82 | } |
diff --git a/arch/mips/mips-boards/sim/sim_int.c b/arch/mips/mips-boards/sim/sim_int.c deleted file mode 100644 index 766e0159ee5b..000000000000 --- a/arch/mips/mips-boards/sim/sim_int.c +++ /dev/null | |||
@@ -1,88 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 1999, 2005 MIPS Technologies, Inc. All rights reserved. | ||
3 | * | ||
4 | * This program is free software; you can distribute it and/or modify it | ||
5 | * under the terms of the GNU General Public License (Version 2) as | ||
6 | * published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
9 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
10 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
11 | * for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License along | ||
14 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
15 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | ||
16 | * | ||
17 | */ | ||
18 | #include <linux/init.h> | ||
19 | #include <linux/sched.h> | ||
20 | #include <linux/slab.h> | ||
21 | #include <linux/interrupt.h> | ||
22 | #include <linux/kernel_stat.h> | ||
23 | #include <asm/mips-boards/simint.h> | ||
24 | #include <asm/irq_cpu.h> | ||
25 | |||
26 | static inline int clz(unsigned long x) | ||
27 | { | ||
28 | __asm__ ( | ||
29 | " .set push \n" | ||
30 | " .set mips32 \n" | ||
31 | " clz %0, %1 \n" | ||
32 | " .set pop \n" | ||
33 | : "=r" (x) | ||
34 | : "r" (x)); | ||
35 | |||
36 | return x; | ||
37 | } | ||
38 | |||
39 | /* | ||
40 | * Version of ffs that only looks at bits 12..15. | ||
41 | */ | ||
42 | static inline unsigned int irq_ffs(unsigned int pending) | ||
43 | { | ||
44 | #if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64) | ||
45 | return -clz(pending) + 31 - CAUSEB_IP; | ||
46 | #else | ||
47 | unsigned int a0 = 7; | ||
48 | unsigned int t0; | ||
49 | |||
50 | t0 = s0 & 0xf000; | ||
51 | t0 = t0 < 1; | ||
52 | t0 = t0 << 2; | ||
53 | a0 = a0 - t0; | ||
54 | s0 = s0 << t0; | ||
55 | |||
56 | t0 = s0 & 0xc000; | ||
57 | t0 = t0 < 1; | ||
58 | t0 = t0 << 1; | ||
59 | a0 = a0 - t0; | ||
60 | s0 = s0 << t0; | ||
61 | |||
62 | t0 = s0 & 0x8000; | ||
63 | t0 = t0 < 1; | ||
64 | //t0 = t0 << 2; | ||
65 | a0 = a0 - t0; | ||
66 | //s0 = s0 << t0; | ||
67 | |||
68 | return a0; | ||
69 | #endif | ||
70 | } | ||
71 | |||
72 | asmlinkage void plat_irq_dispatch(void) | ||
73 | { | ||
74 | unsigned int pending = read_c0_cause() & read_c0_status() & ST0_IM; | ||
75 | int irq; | ||
76 | |||
77 | irq = irq_ffs(pending); | ||
78 | |||
79 | if (irq > 0) | ||
80 | do_IRQ(MIPS_CPU_IRQ_BASE + irq); | ||
81 | else | ||
82 | spurious_interrupt(); | ||
83 | } | ||
84 | |||
85 | void __init arch_init_irq(void) | ||
86 | { | ||
87 | mips_cpu_irq_init(); | ||
88 | } | ||
diff --git a/arch/mips/mipssim/sim_smp.c b/arch/mips/mipssim/sim_smp.c index 38fa807b99f9..ccbbccac23ef 100644 --- a/arch/mips/mipssim/sim_smp.c +++ b/arch/mips/mipssim/sim_smp.c | |||
@@ -53,7 +53,7 @@ void core_send_ipi(int cpu, unsigned int action) | |||
53 | * Platform "CPU" startup hook | 53 | * Platform "CPU" startup hook |
54 | */ | 54 | */ |
55 | 55 | ||
56 | void prom_boot_secondary(int cpu, struct task_struct *idle) | 56 | void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle) |
57 | { | 57 | { |
58 | #ifdef CONFIG_MIPS_MT_SMTC | 58 | #ifdef CONFIG_MIPS_MT_SMTC |
59 | smtc_boot_secondary(cpu, idle); | 59 | smtc_boot_secondary(cpu, idle); |
@@ -64,7 +64,7 @@ void prom_boot_secondary(int cpu, struct task_struct *idle) | |||
64 | * Post-config but pre-boot cleanup entry point | 64 | * Post-config but pre-boot cleanup entry point |
65 | */ | 65 | */ |
66 | 66 | ||
67 | void prom_init_secondary(void) | 67 | void __cpuinit prom_init_secondary(void) |
68 | { | 68 | { |
69 | #ifdef CONFIG_MIPS_MT_SMTC | 69 | #ifdef CONFIG_MIPS_MT_SMTC |
70 | void smtc_init_secondary(void); | 70 | void smtc_init_secondary(void); |
@@ -103,7 +103,7 @@ void plat_prepare_cpus(unsigned int max_cpus) | |||
103 | * SMP initialization finalization entry point | 103 | * SMP initialization finalization entry point |
104 | */ | 104 | */ |
105 | 105 | ||
106 | void prom_smp_finish(void) | 106 | void __cpuinit prom_smp_finish(void) |
107 | { | 107 | { |
108 | #ifdef CONFIG_MIPS_MT_SMTC | 108 | #ifdef CONFIG_MIPS_MT_SMTC |
109 | smtc_smp_finish(); | 109 | smtc_smp_finish(); |
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index b8cb0dde3af0..09d91505b90c 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/proc_fs.h> | 26 | #include <linux/proc_fs.h> |
27 | #include <linux/pfn.h> | 27 | #include <linux/pfn.h> |
28 | 28 | ||
29 | #include <asm/asm-offsets.h> | ||
29 | #include <asm/bootinfo.h> | 30 | #include <asm/bootinfo.h> |
30 | #include <asm/cachectl.h> | 31 | #include <asm/cachectl.h> |
31 | #include <asm/cpu.h> | 32 | #include <asm/cpu.h> |
@@ -498,7 +499,13 @@ unsigned long pgd_current[NR_CPUS]; | |||
498 | * different layout ... | 499 | * different layout ... |
499 | */ | 500 | */ |
500 | #define __page_aligned(order) __attribute__((__aligned__(PAGE_SIZE<<order))) | 501 | #define __page_aligned(order) __attribute__((__aligned__(PAGE_SIZE<<order))) |
501 | pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned(PGD_ORDER); | 502 | |
503 | /* | ||
504 | * gcc 3.3 and older have trouble determining that PTRS_PER_PGD and PGD_ORDER | ||
505 | * are constants. So we use the variants from asm-offset.h until that gcc | ||
506 | * will officially be retired. | ||
507 | */ | ||
508 | pgd_t swapper_pg_dir[_PTRS_PER_PGD] __page_aligned(_PGD_ORDER); | ||
502 | #ifdef CONFIG_64BIT | 509 | #ifdef CONFIG_64BIT |
503 | #ifdef MODULE_START | 510 | #ifdef MODULE_START |
504 | pgd_t module_pg_dir[PTRS_PER_PGD] __page_aligned(PGD_ORDER); | 511 | pgd_t module_pg_dir[PTRS_PER_PGD] __page_aligned(PGD_ORDER); |
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c index 99d8f4fd3ff4..6c5c684d1422 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c | |||
@@ -75,7 +75,7 @@ pcibios_align_resource(void *data, struct resource *res, | |||
75 | res->start = start; | 75 | res->start = start; |
76 | } | 76 | } |
77 | 77 | ||
78 | void __init register_pci_controller(struct pci_controller *hose) | 78 | void __devinit register_pci_controller(struct pci_controller *hose) |
79 | { | 79 | { |
80 | if (request_resource(&iomem_resource, hose->mem_resource) < 0) | 80 | if (request_resource(&iomem_resource, hose->mem_resource) < 0) |
81 | goto out; | 81 | goto out; |
@@ -230,7 +230,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) | |||
230 | return pcibios_plat_dev_init(dev); | 230 | return pcibios_plat_dev_init(dev); |
231 | } | 231 | } |
232 | 232 | ||
233 | static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev, | 233 | static void pcibios_fixup_device_resources(struct pci_dev *dev, |
234 | struct pci_bus *bus) | 234 | struct pci_bus *bus) |
235 | { | 235 | { |
236 | /* Update device resources. */ | 236 | /* Update device resources. */ |
@@ -251,7 +251,7 @@ static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev, | |||
251 | } | 251 | } |
252 | } | 252 | } |
253 | 253 | ||
254 | void __devinit pcibios_fixup_bus(struct pci_bus *bus) | 254 | void pcibios_fixup_bus(struct pci_bus *bus) |
255 | { | 255 | { |
256 | /* Propagate hose info into the subordinate devices. */ | 256 | /* Propagate hose info into the subordinate devices. */ |
257 | 257 | ||
@@ -282,8 +282,7 @@ pcibios_update_irq(struct pci_dev *dev, int irq) | |||
282 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); | 282 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); |
283 | } | 283 | } |
284 | 284 | ||
285 | void __devinit | 285 | void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, |
286 | pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, | ||
287 | struct resource *res) | 286 | struct resource *res) |
288 | { | 287 | { |
289 | struct pci_controller *hose = (struct pci_controller *)dev->sysdata; | 288 | struct pci_controller *hose = (struct pci_controller *)dev->sysdata; |
diff --git a/arch/mips/philips/pnx8550/common/Kconfig b/arch/mips/philips/pnx8550/common/Kconfig deleted file mode 100644 index 072572d173cc..000000000000 --- a/arch/mips/philips/pnx8550/common/Kconfig +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | # Place holder | ||
diff --git a/arch/mips/pmc-sierra/yosemite/smp.c b/arch/mips/pmc-sierra/yosemite/smp.c index 1c852d6a7654..b0f12cd2968a 100644 --- a/arch/mips/pmc-sierra/yosemite/smp.c +++ b/arch/mips/pmc-sierra/yosemite/smp.c | |||
@@ -77,7 +77,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus) | |||
77 | * stack so the first thing we do is throw away that stuff and load useful | 77 | * stack so the first thing we do is throw away that stuff and load useful |
78 | * values into the registers ... | 78 | * values into the registers ... |
79 | */ | 79 | */ |
80 | void __init prom_boot_secondary(int cpu, struct task_struct *idle) | 80 | void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle) |
81 | { | 81 | { |
82 | unsigned long gp = (unsigned long) task_thread_info(idle); | 82 | unsigned long gp = (unsigned long) task_thread_info(idle); |
83 | unsigned long sp = __KSTK_TOS(idle); | 83 | unsigned long sp = __KSTK_TOS(idle); |
@@ -97,12 +97,12 @@ void prom_cpus_done(void) | |||
97 | * After we've done initial boot, this function is called to allow the | 97 | * After we've done initial boot, this function is called to allow the |
98 | * board code to clean up state, if needed | 98 | * board code to clean up state, if needed |
99 | */ | 99 | */ |
100 | void prom_init_secondary(void) | 100 | void __cpuinit prom_init_secondary(void) |
101 | { | 101 | { |
102 | set_c0_status(ST0_CO | ST0_IE | ST0_IM); | 102 | set_c0_status(ST0_CO | ST0_IE | ST0_IM); |
103 | } | 103 | } |
104 | 104 | ||
105 | void prom_smp_finish(void) | 105 | void __cpuinit prom_smp_finish(void) |
106 | { | 106 | { |
107 | } | 107 | } |
108 | 108 | ||
diff --git a/arch/mips/qemu/q-smp.c b/arch/mips/qemu/q-smp.c index 786bbfa214d1..4b0178d0df0b 100644 --- a/arch/mips/qemu/q-smp.c +++ b/arch/mips/qemu/q-smp.c | |||
@@ -22,11 +22,11 @@ void core_send_ipi(int cpu, unsigned int action) | |||
22 | * After we've done initial boot, this function is called to allow the | 22 | * After we've done initial boot, this function is called to allow the |
23 | * board code to clean up state, if needed | 23 | * board code to clean up state, if needed |
24 | */ | 24 | */ |
25 | void prom_init_secondary(void) | 25 | void __cpuinit prom_init_secondary(void) |
26 | { | 26 | { |
27 | } | 27 | } |
28 | 28 | ||
29 | void prom_smp_finish(void) | 29 | void __cpuinit prom_smp_finish(void) |
30 | { | 30 | { |
31 | } | 31 | } |
32 | 32 | ||
@@ -43,7 +43,7 @@ void __init prom_prepare_cpus(unsigned int max_cpus) | |||
43 | /* | 43 | /* |
44 | * Firmware CPU startup hook | 44 | * Firmware CPU startup hook |
45 | */ | 45 | */ |
46 | void prom_boot_secondary(int cpu, struct task_struct *idle) | 46 | void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle) |
47 | { | 47 | { |
48 | } | 48 | } |
49 | 49 | ||
diff --git a/arch/mips/sgi-ip22/ip22-mc.c b/arch/mips/sgi-ip22/ip22-mc.c index ddb6506d8341..01a805dcc67c 100644 --- a/arch/mips/sgi-ip22/ip22-mc.c +++ b/arch/mips/sgi-ip22/ip22-mc.c | |||
@@ -47,7 +47,7 @@ struct mem { | |||
47 | /* | 47 | /* |
48 | * Detect installed memory, do some sanity checks and notify kernel about it | 48 | * Detect installed memory, do some sanity checks and notify kernel about it |
49 | */ | 49 | */ |
50 | static void probe_memory(void) | 50 | static void __init probe_memory(void) |
51 | { | 51 | { |
52 | int i, j, found, cnt = 0; | 52 | int i, j, found, cnt = 0; |
53 | struct mem bank[4]; | 53 | struct mem bank[4]; |
diff --git a/arch/mips/sgi-ip22/ip22-setup.c b/arch/mips/sgi-ip22/ip22-setup.c index 25097ecc9baa..e7ce7982db72 100644 --- a/arch/mips/sgi-ip22/ip22-setup.c +++ b/arch/mips/sgi-ip22/ip22-setup.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <asm/sgi/ip22.h> | 29 | #include <asm/sgi/ip22.h> |
30 | 30 | ||
31 | unsigned long sgi_gfxaddr; | 31 | unsigned long sgi_gfxaddr; |
32 | EXPORT_SYMBOL_GPL(sgi_gfxaddr); | ||
32 | 33 | ||
33 | /* | 34 | /* |
34 | * Stop-A is originally a Sun thing that isn't standard on IP22 so to avoid | 35 | * Stop-A is originally a Sun thing that isn't standard on IP22 so to avoid |
diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c index ba8e0794630c..856649cf9f1e 100644 --- a/arch/mips/sgi-ip27/ip27-irq.c +++ b/arch/mips/sgi-ip27/ip27-irq.c | |||
@@ -207,11 +207,9 @@ static int intr_connect_level(int cpu, int bit) | |||
207 | { | 207 | { |
208 | nasid_t nasid = COMPACT_TO_NASID_NODEID(cpu_to_node(cpu)); | 208 | nasid_t nasid = COMPACT_TO_NASID_NODEID(cpu_to_node(cpu)); |
209 | struct slice_data *si = cpu_data[cpu].data; | 209 | struct slice_data *si = cpu_data[cpu].data; |
210 | unsigned long flags; | ||
211 | 210 | ||
212 | set_bit(bit, si->irq_enable_mask); | 211 | set_bit(bit, si->irq_enable_mask); |
213 | 212 | ||
214 | local_irq_save(flags); | ||
215 | if (!cputoslice(cpu)) { | 213 | if (!cputoslice(cpu)) { |
216 | REMOTE_HUB_S(nasid, PI_INT_MASK0_A, si->irq_enable_mask[0]); | 214 | REMOTE_HUB_S(nasid, PI_INT_MASK0_A, si->irq_enable_mask[0]); |
217 | REMOTE_HUB_S(nasid, PI_INT_MASK1_A, si->irq_enable_mask[1]); | 215 | REMOTE_HUB_S(nasid, PI_INT_MASK1_A, si->irq_enable_mask[1]); |
@@ -219,7 +217,6 @@ static int intr_connect_level(int cpu, int bit) | |||
219 | REMOTE_HUB_S(nasid, PI_INT_MASK0_B, si->irq_enable_mask[0]); | 217 | REMOTE_HUB_S(nasid, PI_INT_MASK0_B, si->irq_enable_mask[0]); |
220 | REMOTE_HUB_S(nasid, PI_INT_MASK1_B, si->irq_enable_mask[1]); | 218 | REMOTE_HUB_S(nasid, PI_INT_MASK1_B, si->irq_enable_mask[1]); |
221 | } | 219 | } |
222 | local_irq_restore(flags); | ||
223 | 220 | ||
224 | return 0; | 221 | return 0; |
225 | } | 222 | } |
@@ -285,6 +282,8 @@ static unsigned int startup_bridge_irq(unsigned int irq) | |||
285 | 282 | ||
286 | bridge->b_wid_tflush; | 283 | bridge->b_wid_tflush; |
287 | 284 | ||
285 | intr_connect_level(cpu, swlevel); | ||
286 | |||
288 | return 0; /* Never anything pending. */ | 287 | return 0; /* Never anything pending. */ |
289 | } | 288 | } |
290 | 289 | ||
@@ -292,7 +291,6 @@ static unsigned int startup_bridge_irq(unsigned int irq) | |||
292 | static void shutdown_bridge_irq(unsigned int irq) | 291 | static void shutdown_bridge_irq(unsigned int irq) |
293 | { | 292 | { |
294 | struct bridge_controller *bc = IRQ_TO_BRIDGE(irq); | 293 | struct bridge_controller *bc = IRQ_TO_BRIDGE(irq); |
295 | struct hub_data *hub = hub_data(cpu_to_node(bc->irq_cpu)); | ||
296 | bridge_t *bridge = bc->base; | 294 | bridge_t *bridge = bc->base; |
297 | int pin, swlevel; | 295 | int pin, swlevel; |
298 | cpuid_t cpu; | 296 | cpuid_t cpu; |
@@ -307,8 +305,6 @@ static void shutdown_bridge_irq(unsigned int irq) | |||
307 | swlevel = find_level(&cpu, irq); | 305 | swlevel = find_level(&cpu, irq); |
308 | intr_disconnect_level(cpu, swlevel); | 306 | intr_disconnect_level(cpu, swlevel); |
309 | 307 | ||
310 | __clear_bit(swlevel, hub->irq_alloc_mask); | ||
311 | |||
312 | bridge->b_int_enable &= ~(1 << pin); | 308 | bridge->b_int_enable &= ~(1 << pin); |
313 | bridge->b_wid_tflush; | 309 | bridge->b_wid_tflush; |
314 | } | 310 | } |
diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c index 08e79141b47c..fbb27728a76a 100644 --- a/arch/mips/sgi-ip27/ip27-smp.c +++ b/arch/mips/sgi-ip27/ip27-smp.c | |||
@@ -171,7 +171,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus) | |||
171 | * set sp to the kernel stack of the newly created idle process, gp to the proc | 171 | * set sp to the kernel stack of the newly created idle process, gp to the proc |
172 | * struct so that current_thread_info() will work. | 172 | * struct so that current_thread_info() will work. |
173 | */ | 173 | */ |
174 | void __init prom_boot_secondary(int cpu, struct task_struct *idle) | 174 | void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle) |
175 | { | 175 | { |
176 | unsigned long gp = (unsigned long)task_thread_info(idle); | 176 | unsigned long gp = (unsigned long)task_thread_info(idle); |
177 | unsigned long sp = __KSTK_TOS(idle); | 177 | unsigned long sp = __KSTK_TOS(idle); |
@@ -191,7 +191,7 @@ void __init prom_cpus_done(void) | |||
191 | { | 191 | { |
192 | } | 192 | } |
193 | 193 | ||
194 | void prom_smp_finish(void) | 194 | void __cpuinit prom_smp_finish(void) |
195 | { | 195 | { |
196 | } | 196 | } |
197 | 197 | ||
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c index ba0c4b776c85..79ae6ef979bb 100644 --- a/arch/mips/sibyte/bcm1480/irq.c +++ b/arch/mips/sibyte/bcm1480/irq.c | |||
@@ -76,7 +76,7 @@ __setup("nokgdb", nokgdb); | |||
76 | 76 | ||
77 | /* Default to UART1 */ | 77 | /* Default to UART1 */ |
78 | int kgdb_port = 1; | 78 | int kgdb_port = 1; |
79 | #ifdef CONFIG_SIBYTE_SB1250_DUART | 79 | #ifdef CONFIG_SERIAL_SB1250_DUART |
80 | extern char sb1250_duart_present[]; | 80 | extern char sb1250_duart_present[]; |
81 | #endif | 81 | #endif |
82 | #endif | 82 | #endif |
@@ -404,7 +404,7 @@ void __init arch_init_irq(void) | |||
404 | if (kgdb_flag) { | 404 | if (kgdb_flag) { |
405 | kgdb_irq = K_BCM1480_INT_UART_0 + kgdb_port; | 405 | kgdb_irq = K_BCM1480_INT_UART_0 + kgdb_port; |
406 | 406 | ||
407 | #ifdef CONFIG_SIBYTE_SB1250_DUART | 407 | #ifdef CONFIG_SERIAL_SB1250_DUART |
408 | sb1250_duart_present[kgdb_port] = 0; | 408 | sb1250_duart_present[kgdb_port] = 0; |
409 | #endif | 409 | #endif |
410 | /* Setup uart 1 settings, mapper */ | 410 | /* Setup uart 1 settings, mapper */ |
diff --git a/arch/mips/sibyte/cfe/console.c b/arch/mips/sibyte/cfe/console.c index c6ec748175b0..4cec9d798d2f 100644 --- a/arch/mips/sibyte/cfe/console.c +++ b/arch/mips/sibyte/cfe/console.c | |||
@@ -46,7 +46,7 @@ static int cfe_console_setup(struct console *cons, char *str) | |||
46 | /* XXXKW think about interaction with 'console=' cmdline arg */ | 46 | /* XXXKW think about interaction with 'console=' cmdline arg */ |
47 | /* If none of the console options are configured, the build will break. */ | 47 | /* If none of the console options are configured, the build will break. */ |
48 | if (cfe_getenv("BOOT_CONSOLE", consdev, 32) >= 0) { | 48 | if (cfe_getenv("BOOT_CONSOLE", consdev, 32) >= 0) { |
49 | #ifdef CONFIG_SIBYTE_SB1250_DUART | 49 | #ifdef CONFIG_SERIAL_SB1250_DUART |
50 | if (!strcmp(consdev, "uart0")) { | 50 | if (!strcmp(consdev, "uart0")) { |
51 | setleds("u0cn"); | 51 | setleds("u0cn"); |
52 | } else if (!strcmp(consdev, "uart1")) { | 52 | } else if (!strcmp(consdev, "uart1")) { |
diff --git a/arch/mips/sibyte/cfe/smp.c b/arch/mips/sibyte/cfe/smp.c index eab20e2db323..5de4cff9d14a 100644 --- a/arch/mips/sibyte/cfe/smp.c +++ b/arch/mips/sibyte/cfe/smp.c | |||
@@ -58,7 +58,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus) | |||
58 | * Setup the PC, SP, and GP of a secondary processor and start it | 58 | * Setup the PC, SP, and GP of a secondary processor and start it |
59 | * running! | 59 | * running! |
60 | */ | 60 | */ |
61 | void prom_boot_secondary(int cpu, struct task_struct *idle) | 61 | void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle) |
62 | { | 62 | { |
63 | int retval; | 63 | int retval; |
64 | 64 | ||
@@ -72,7 +72,7 @@ void prom_boot_secondary(int cpu, struct task_struct *idle) | |||
72 | /* | 72 | /* |
73 | * Code to run on secondary just after probing the CPU | 73 | * Code to run on secondary just after probing the CPU |
74 | */ | 74 | */ |
75 | void prom_init_secondary(void) | 75 | void __cpuinit prom_init_secondary(void) |
76 | { | 76 | { |
77 | #if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80) | 77 | #if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80) |
78 | extern void bcm1480_smp_init(void); | 78 | extern void bcm1480_smp_init(void); |
@@ -89,7 +89,7 @@ void prom_init_secondary(void) | |||
89 | * Do any tidying up before marking online and running the idle | 89 | * Do any tidying up before marking online and running the idle |
90 | * loop | 90 | * loop |
91 | */ | 91 | */ |
92 | void prom_smp_finish(void) | 92 | void __cpuinit prom_smp_finish(void) |
93 | { | 93 | { |
94 | #if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80) | 94 | #if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80) |
95 | extern void bcm1480_smp_finish(void); | 95 | extern void bcm1480_smp_finish(void); |
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c index 0e6a13c0bd0e..ad593a6c20be 100644 --- a/arch/mips/sibyte/sb1250/irq.c +++ b/arch/mips/sibyte/sb1250/irq.c | |||
@@ -61,7 +61,7 @@ static int kgdb_irq; | |||
61 | 61 | ||
62 | /* Default to UART1 */ | 62 | /* Default to UART1 */ |
63 | int kgdb_port = 1; | 63 | int kgdb_port = 1; |
64 | #ifdef CONFIG_SIBYTE_SB1250_DUART | 64 | #ifdef CONFIG_SERIAL_SB1250_DUART |
65 | extern char sb1250_duart_present[]; | 65 | extern char sb1250_duart_present[]; |
66 | #endif | 66 | #endif |
67 | #endif | 67 | #endif |
@@ -359,7 +359,7 @@ void __init arch_init_irq(void) | |||
359 | if (kgdb_flag) { | 359 | if (kgdb_flag) { |
360 | kgdb_irq = K_INT_UART_0 + kgdb_port; | 360 | kgdb_irq = K_INT_UART_0 + kgdb_port; |
361 | 361 | ||
362 | #ifdef CONFIG_SIBYTE_SB1250_DUART | 362 | #ifdef CONFIG_SERIAL_SB1250_DUART |
363 | sb1250_duart_present[kgdb_port] = 0; | 363 | sb1250_duart_present[kgdb_port] = 0; |
364 | #endif | 364 | #endif |
365 | /* Setup uart 1 settings, mapper */ | 365 | /* Setup uart 1 settings, mapper */ |
diff --git a/arch/mips/sni/pcimt_scache.c b/arch/mips/sni/pcimt_scache.c deleted file mode 100644 index a59d457fa8b1..000000000000 --- a/arch/mips/sni/pcimt_scache.c +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | /* | ||
2 | * arch/mips/sni/pcimt_scache.c | ||
3 | * | ||
4 | * This file is subject to the terms and conditions of the GNU General Public | ||
5 | * License. See the file "COPYING" in the main directory of this archive | ||
6 | * for more details. | ||
7 | * | ||
8 | * Copyright (c) 1997, 1998 by Ralf Baechle | ||
9 | */ | ||
10 | #include <linux/init.h> | ||
11 | #include <linux/kernel.h> | ||
12 | #include <asm/bcache.h> | ||
13 | #include <asm/sni.h> | ||
14 | |||
15 | #define cacheconf (*(volatile unsigned int *)PCIMT_CACHECONF) | ||
16 | #define invspace (*(volatile unsigned int *)PCIMT_INVSPACE) | ||
17 | |||
18 | void __init sni_pcimt_sc_init(void) | ||
19 | { | ||
20 | unsigned int scsiz, sc_size; | ||
21 | |||
22 | scsiz = cacheconf & 7; | ||
23 | if (scsiz == 0) { | ||
24 | printk("Second level cache is deactived.\n"); | ||
25 | return; | ||
26 | } | ||
27 | if (scsiz >= 6) { | ||
28 | printk("Invalid second level cache size configured, " | ||
29 | "deactivating second level cache.\n"); | ||
30 | cacheconf = 0; | ||
31 | return; | ||
32 | } | ||
33 | |||
34 | sc_size = 128 << scsiz; | ||
35 | printk("%dkb second level cache detected, deactivating.\n", sc_size); | ||
36 | cacheconf = 0; | ||
37 | } | ||
diff --git a/arch/mips/sni/reset.c b/arch/mips/sni/reset.c index 2eada8aea682..38b6a97a31b5 100644 --- a/arch/mips/sni/reset.c +++ b/arch/mips/sni/reset.c | |||
@@ -40,10 +40,6 @@ void sni_machine_restart(char *command) | |||
40 | } | 40 | } |
41 | } | 41 | } |
42 | 42 | ||
43 | void sni_machine_halt(void) | ||
44 | { | ||
45 | } | ||
46 | |||
47 | void sni_machine_power_off(void) | 43 | void sni_machine_power_off(void) |
48 | { | 44 | { |
49 | *(volatile unsigned char *)PCIMT_CSWCSM = 0xfd; | 45 | *(volatile unsigned char *)PCIMT_CSWCSM = 0xfd; |
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c index 4fedfbda0c79..6edbb3051c82 100644 --- a/arch/mips/sni/setup.c +++ b/arch/mips/sni/setup.c | |||
@@ -26,7 +26,6 @@ | |||
26 | unsigned int sni_brd_type; | 26 | unsigned int sni_brd_type; |
27 | 27 | ||
28 | extern void sni_machine_restart(char *command); | 28 | extern void sni_machine_restart(char *command); |
29 | extern void sni_machine_halt(void); | ||
30 | extern void sni_machine_power_off(void); | 29 | extern void sni_machine_power_off(void); |
31 | 30 | ||
32 | static void __init sni_display_setup(void) | 31 | static void __init sni_display_setup(void) |
@@ -87,7 +86,6 @@ void __init plat_mem_setup(void) | |||
87 | } | 86 | } |
88 | 87 | ||
89 | _machine_restart = sni_machine_restart; | 88 | _machine_restart = sni_machine_restart; |
90 | _machine_halt = sni_machine_halt; | ||
91 | pm_power_off = sni_machine_power_off; | 89 | pm_power_off = sni_machine_power_off; |
92 | 90 | ||
93 | sni_display_setup(); | 91 | sni_display_setup(); |
diff --git a/arch/mips/tx4927/common/Makefile b/arch/mips/tx4927/common/Makefile index 9cb9535ebacb..18375787e094 100644 --- a/arch/mips/tx4927/common/Makefile +++ b/arch/mips/tx4927/common/Makefile | |||
@@ -10,3 +10,5 @@ obj-y += tx4927_prom.o tx4927_setup.o tx4927_irq.o | |||
10 | 10 | ||
11 | obj-$(CONFIG_TOSHIBA_FPCIB0) += smsc_fdc37m81x.o | 11 | obj-$(CONFIG_TOSHIBA_FPCIB0) += smsc_fdc37m81x.o |
12 | obj-$(CONFIG_KGDB) += tx4927_dbgio.o | 12 | obj-$(CONFIG_KGDB) += tx4927_dbgio.o |
13 | |||
14 | EXTRA_CFLAGS += -Werror | ||
diff --git a/arch/mips/tx4927/common/tx4927_irq.c b/arch/mips/tx4927/common/tx4927_irq.c index 00b0b975f349..0aabd57fdad2 100644 --- a/arch/mips/tx4927/common/tx4927_irq.c +++ b/arch/mips/tx4927/common/tx4927_irq.c | |||
@@ -23,398 +23,20 @@ | |||
23 | * with this program; if not, write to the Free Software Foundation, Inc., | 23 | * with this program; if not, write to the Free Software Foundation, Inc., |
24 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 24 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
25 | */ | 25 | */ |
26 | #include <linux/errno.h> | ||
27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
28 | #include <linux/kernel_stat.h> | ||
29 | #include <linux/module.h> | ||
30 | #include <linux/signal.h> | ||
31 | #include <linux/sched.h> | ||
32 | #include <linux/types.h> | ||
33 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
34 | #include <linux/ioport.h> | 28 | #include <asm/irq_cpu.h> |
35 | #include <linux/timex.h> | ||
36 | #include <linux/slab.h> | ||
37 | #include <linux/random.h> | ||
38 | #include <linux/irq.h> | ||
39 | #include <linux/bitops.h> | ||
40 | #include <asm/bootinfo.h> | ||
41 | #include <asm/io.h> | ||
42 | #include <asm/irq.h> | ||
43 | #include <asm/mipsregs.h> | 29 | #include <asm/mipsregs.h> |
44 | #include <asm/system.h> | ||
45 | #include <asm/tx4927/tx4927.h> | 30 | #include <asm/tx4927/tx4927.h> |
46 | #ifdef CONFIG_TOSHIBA_RBTX4927 | 31 | #ifdef CONFIG_TOSHIBA_RBTX4927 |
47 | #include <asm/tx4927/toshiba_rbtx4927.h> | 32 | #include <asm/tx4927/toshiba_rbtx4927.h> |
48 | #endif | 33 | #endif |
49 | 34 | ||
50 | /* | ||
51 | * DEBUG | ||
52 | */ | ||
53 | |||
54 | #undef TX4927_IRQ_DEBUG | ||
55 | |||
56 | #ifdef TX4927_IRQ_DEBUG | ||
57 | #define TX4927_IRQ_NONE 0x00000000 | ||
58 | |||
59 | #define TX4927_IRQ_INFO ( 1 << 0 ) | ||
60 | #define TX4927_IRQ_WARN ( 1 << 1 ) | ||
61 | #define TX4927_IRQ_EROR ( 1 << 2 ) | ||
62 | |||
63 | #define TX4927_IRQ_INIT ( 1 << 5 ) | ||
64 | #define TX4927_IRQ_NEST1 ( 1 << 6 ) | ||
65 | #define TX4927_IRQ_NEST2 ( 1 << 7 ) | ||
66 | #define TX4927_IRQ_NEST3 ( 1 << 8 ) | ||
67 | #define TX4927_IRQ_NEST4 ( 1 << 9 ) | ||
68 | |||
69 | #define TX4927_IRQ_CP0_INIT ( 1 << 10 ) | ||
70 | #define TX4927_IRQ_CP0_ENABLE ( 1 << 13 ) | ||
71 | #define TX4927_IRQ_CP0_DISABLE ( 1 << 14 ) | ||
72 | |||
73 | #define TX4927_IRQ_PIC_INIT ( 1 << 20 ) | ||
74 | #define TX4927_IRQ_PIC_ENABLE ( 1 << 23 ) | ||
75 | #define TX4927_IRQ_PIC_DISABLE ( 1 << 24 ) | ||
76 | |||
77 | #define TX4927_IRQ_ALL 0xffffffff | ||
78 | #endif | ||
79 | |||
80 | #ifdef TX4927_IRQ_DEBUG | ||
81 | static const u32 tx4927_irq_debug_flag = (TX4927_IRQ_NONE | ||
82 | | TX4927_IRQ_INFO | ||
83 | | TX4927_IRQ_WARN | TX4927_IRQ_EROR | ||
84 | // | TX4927_IRQ_CP0_INIT | ||
85 | // | TX4927_IRQ_CP0_ENABLE | ||
86 | // | TX4927_IRQ_CP0_ENDIRQ | ||
87 | // | TX4927_IRQ_PIC_INIT | ||
88 | // | TX4927_IRQ_PIC_ENABLE | ||
89 | // | TX4927_IRQ_PIC_DISABLE | ||
90 | // | TX4927_IRQ_INIT | ||
91 | // | TX4927_IRQ_NEST1 | ||
92 | // | TX4927_IRQ_NEST2 | ||
93 | // | TX4927_IRQ_NEST3 | ||
94 | // | TX4927_IRQ_NEST4 | ||
95 | ); | ||
96 | #endif | ||
97 | |||
98 | #ifdef TX4927_IRQ_DEBUG | ||
99 | #define TX4927_IRQ_DPRINTK(flag,str...) \ | ||
100 | if ( (tx4927_irq_debug_flag) & (flag) ) \ | ||
101 | { \ | ||
102 | char tmp[100]; \ | ||
103 | sprintf( tmp, str ); \ | ||
104 | printk( "%s(%s:%u)::%s", __FUNCTION__, __FILE__, __LINE__, tmp ); \ | ||
105 | } | ||
106 | #else | ||
107 | #define TX4927_IRQ_DPRINTK(flag,str...) | ||
108 | #endif | ||
109 | |||
110 | /* | ||
111 | * Forwad definitions for all pic's | ||
112 | */ | ||
113 | |||
114 | static void tx4927_irq_cp0_enable(unsigned int irq); | ||
115 | static void tx4927_irq_cp0_disable(unsigned int irq); | ||
116 | |||
117 | static void tx4927_irq_pic_enable(unsigned int irq); | ||
118 | static void tx4927_irq_pic_disable(unsigned int irq); | ||
119 | |||
120 | /* | ||
121 | * Kernel structs for all pic's | ||
122 | */ | ||
123 | |||
124 | #define TX4927_CP0_NAME "TX4927-CP0" | ||
125 | static struct irq_chip tx4927_irq_cp0_type = { | ||
126 | .name = TX4927_CP0_NAME, | ||
127 | .ack = tx4927_irq_cp0_disable, | ||
128 | .mask = tx4927_irq_cp0_disable, | ||
129 | .mask_ack = tx4927_irq_cp0_disable, | ||
130 | .unmask = tx4927_irq_cp0_enable, | ||
131 | }; | ||
132 | |||
133 | #define TX4927_PIC_NAME "TX4927-PIC" | ||
134 | static struct irq_chip tx4927_irq_pic_type = { | ||
135 | .name = TX4927_PIC_NAME, | ||
136 | .ack = tx4927_irq_pic_disable, | ||
137 | .mask = tx4927_irq_pic_disable, | ||
138 | .mask_ack = tx4927_irq_pic_disable, | ||
139 | .unmask = tx4927_irq_pic_enable, | ||
140 | }; | ||
141 | |||
142 | #define TX4927_PIC_ACTION(s) { no_action, 0, CPU_MASK_NONE, s, NULL, NULL } | ||
143 | static struct irqaction tx4927_irq_pic_action = | ||
144 | TX4927_PIC_ACTION(TX4927_PIC_NAME); | ||
145 | |||
146 | #define CCP0_STATUS 12 | ||
147 | #define CCP0_CAUSE 13 | ||
148 | |||
149 | /* | ||
150 | * Functions for cp0 | ||
151 | */ | ||
152 | |||
153 | #define tx4927_irq_cp0_mask(irq) ( 1 << ( irq-TX4927_IRQ_CP0_BEG+8 ) ) | ||
154 | |||
155 | static void | ||
156 | tx4927_irq_cp0_modify(unsigned cp0_reg, unsigned clr_bits, unsigned set_bits) | ||
157 | { | ||
158 | unsigned long val = 0; | ||
159 | |||
160 | switch (cp0_reg) { | ||
161 | case CCP0_STATUS: | ||
162 | val = read_c0_status(); | ||
163 | break; | ||
164 | |||
165 | case CCP0_CAUSE: | ||
166 | val = read_c0_cause(); | ||
167 | break; | ||
168 | |||
169 | } | ||
170 | |||
171 | val &= (~clr_bits); | ||
172 | val |= (set_bits); | ||
173 | |||
174 | switch (cp0_reg) { | ||
175 | case CCP0_STATUS:{ | ||
176 | write_c0_status(val); | ||
177 | break; | ||
178 | } | ||
179 | case CCP0_CAUSE:{ | ||
180 | write_c0_cause(val); | ||
181 | break; | ||
182 | } | ||
183 | } | ||
184 | } | ||
185 | |||
186 | static void __init tx4927_irq_cp0_init(void) | ||
187 | { | ||
188 | int i; | ||
189 | |||
190 | TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_INIT, "beg=%d end=%d\n", | ||
191 | TX4927_IRQ_CP0_BEG, TX4927_IRQ_CP0_END); | ||
192 | |||
193 | for (i = TX4927_IRQ_CP0_BEG; i <= TX4927_IRQ_CP0_END; i++) | ||
194 | set_irq_chip_and_handler(i, &tx4927_irq_cp0_type, | ||
195 | handle_level_irq); | ||
196 | } | ||
197 | |||
198 | static void tx4927_irq_cp0_enable(unsigned int irq) | ||
199 | { | ||
200 | TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_ENABLE, "irq=%d \n", irq); | ||
201 | |||
202 | tx4927_irq_cp0_modify(CCP0_STATUS, 0, tx4927_irq_cp0_mask(irq)); | ||
203 | } | ||
204 | |||
205 | static void tx4927_irq_cp0_disable(unsigned int irq) | ||
206 | { | ||
207 | TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_DISABLE, "irq=%d \n", irq); | ||
208 | |||
209 | tx4927_irq_cp0_modify(CCP0_STATUS, tx4927_irq_cp0_mask(irq), 0); | ||
210 | } | ||
211 | |||
212 | /* | ||
213 | * Functions for pic | ||
214 | */ | ||
215 | u32 tx4927_irq_pic_addr(int irq) | ||
216 | { | ||
217 | /* MVMCP -- need to formulize this */ | ||
218 | irq -= TX4927_IRQ_PIC_BEG; | ||
219 | switch (irq) { | ||
220 | case 17: | ||
221 | case 16: | ||
222 | case 1: | ||
223 | case 0: | ||
224 | return (0xff1ff610); | ||
225 | |||
226 | case 19: | ||
227 | case 18: | ||
228 | case 3: | ||
229 | case 2: | ||
230 | return (0xff1ff614); | ||
231 | |||
232 | case 21: | ||
233 | case 20: | ||
234 | case 5: | ||
235 | case 4: | ||
236 | return (0xff1ff618); | ||
237 | |||
238 | case 23: | ||
239 | case 22: | ||
240 | case 7: | ||
241 | case 6: | ||
242 | return (0xff1ff61c); | ||
243 | |||
244 | case 25: | ||
245 | case 24: | ||
246 | case 9: | ||
247 | case 8: | ||
248 | return (0xff1ff620); | ||
249 | |||
250 | case 27: | ||
251 | case 26: | ||
252 | case 11: | ||
253 | case 10: | ||
254 | return (0xff1ff624); | ||
255 | |||
256 | case 29: | ||
257 | case 28: | ||
258 | case 13: | ||
259 | case 12: | ||
260 | return (0xff1ff628); | ||
261 | |||
262 | case 31: | ||
263 | case 30: | ||
264 | case 15: | ||
265 | case 14: | ||
266 | return (0xff1ff62c); | ||
267 | |||
268 | } | ||
269 | return (0); | ||
270 | } | ||
271 | |||
272 | u32 tx4927_irq_pic_mask(int irq) | ||
273 | { | ||
274 | /* MVMCP -- need to formulize this */ | ||
275 | irq -= TX4927_IRQ_PIC_BEG; | ||
276 | switch (irq) { | ||
277 | case 31: | ||
278 | case 29: | ||
279 | case 27: | ||
280 | case 25: | ||
281 | case 23: | ||
282 | case 21: | ||
283 | case 19: | ||
284 | case 17:{ | ||
285 | return (0x07000000); | ||
286 | } | ||
287 | case 30: | ||
288 | case 28: | ||
289 | case 26: | ||
290 | case 24: | ||
291 | case 22: | ||
292 | case 20: | ||
293 | case 18: | ||
294 | case 16:{ | ||
295 | return (0x00070000); | ||
296 | } | ||
297 | case 15: | ||
298 | case 13: | ||
299 | case 11: | ||
300 | case 9: | ||
301 | case 7: | ||
302 | case 5: | ||
303 | case 3: | ||
304 | case 1:{ | ||
305 | return (0x00000700); | ||
306 | } | ||
307 | case 14: | ||
308 | case 12: | ||
309 | case 10: | ||
310 | case 8: | ||
311 | case 6: | ||
312 | case 4: | ||
313 | case 2: | ||
314 | case 0:{ | ||
315 | return (0x00000007); | ||
316 | } | ||
317 | } | ||
318 | return (0x00000000); | ||
319 | } | ||
320 | |||
321 | static void tx4927_irq_pic_modify(unsigned pic_reg, unsigned clr_bits, | ||
322 | unsigned set_bits) | ||
323 | { | ||
324 | unsigned long val = 0; | ||
325 | |||
326 | val = TX4927_RD(pic_reg); | ||
327 | val &= (~clr_bits); | ||
328 | val |= (set_bits); | ||
329 | TX4927_WR(pic_reg, val); | ||
330 | } | ||
331 | |||
332 | static void __init tx4927_irq_pic_init(void) | ||
333 | { | ||
334 | int i; | ||
335 | |||
336 | TX4927_IRQ_DPRINTK(TX4927_IRQ_PIC_INIT, "beg=%d end=%d\n", | ||
337 | TX4927_IRQ_PIC_BEG, TX4927_IRQ_PIC_END); | ||
338 | |||
339 | for (i = TX4927_IRQ_PIC_BEG; i <= TX4927_IRQ_PIC_END; i++) | ||
340 | set_irq_chip_and_handler(i, &tx4927_irq_pic_type, | ||
341 | handle_level_irq); | ||
342 | |||
343 | setup_irq(TX4927_IRQ_NEST_PIC_ON_CP0, &tx4927_irq_pic_action); | ||
344 | |||
345 | TX4927_WR(0xff1ff640, 0x6); /* irq level mask -- only accept hightest */ | ||
346 | TX4927_WR(0xff1ff600, TX4927_RD(0xff1ff600) | 0x1); /* irq enable */ | ||
347 | } | ||
348 | |||
349 | static void tx4927_irq_pic_enable(unsigned int irq) | ||
350 | { | ||
351 | TX4927_IRQ_DPRINTK(TX4927_IRQ_PIC_ENABLE, "irq=%d\n", irq); | ||
352 | |||
353 | tx4927_irq_pic_modify(tx4927_irq_pic_addr(irq), 0, | ||
354 | tx4927_irq_pic_mask(irq)); | ||
355 | } | ||
356 | |||
357 | static void tx4927_irq_pic_disable(unsigned int irq) | ||
358 | { | ||
359 | TX4927_IRQ_DPRINTK(TX4927_IRQ_PIC_DISABLE, "irq=%d\n", irq); | ||
360 | |||
361 | tx4927_irq_pic_modify(tx4927_irq_pic_addr(irq), | ||
362 | tx4927_irq_pic_mask(irq), 0); | ||
363 | } | ||
364 | |||
365 | /* | ||
366 | * Main init functions | ||
367 | */ | ||
368 | void __init tx4927_irq_init(void) | 35 | void __init tx4927_irq_init(void) |
369 | { | 36 | { |
370 | TX4927_IRQ_DPRINTK(TX4927_IRQ_INIT, "-\n"); | 37 | mips_cpu_irq_init(); |
371 | 38 | txx9_irq_init(TX4927_IRC_REG); | |
372 | TX4927_IRQ_DPRINTK(TX4927_IRQ_INIT, "=Calling tx4927_irq_cp0_init()\n"); | 39 | set_irq_chained_handler(TX4927_IRQ_NEST_PIC_ON_CP0, handle_simple_irq); |
373 | tx4927_irq_cp0_init(); | ||
374 | |||
375 | TX4927_IRQ_DPRINTK(TX4927_IRQ_INIT, "=Calling tx4927_irq_pic_init()\n"); | ||
376 | tx4927_irq_pic_init(); | ||
377 | |||
378 | TX4927_IRQ_DPRINTK(TX4927_IRQ_INIT, "+\n"); | ||
379 | } | ||
380 | |||
381 | static int tx4927_irq_nested(void) | ||
382 | { | ||
383 | int sw_irq = 0; | ||
384 | u32 level2; | ||
385 | |||
386 | TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST1, "-\n"); | ||
387 | |||
388 | level2 = TX4927_RD(0xff1ff6a0); | ||
389 | TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST2, "=level2a=0x%x\n", level2); | ||
390 | |||
391 | if ((level2 & 0x10000) == 0) { | ||
392 | level2 &= 0x1f; | ||
393 | TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST3, "=level2b=0x%x\n", level2); | ||
394 | |||
395 | sw_irq = TX4927_IRQ_PIC_BEG + level2; | ||
396 | TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST3, "=sw_irq=%d\n", sw_irq); | ||
397 | |||
398 | if (sw_irq == 27) { | ||
399 | TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST4, "=irq-%d\n", | ||
400 | sw_irq); | ||
401 | |||
402 | #ifdef CONFIG_TOSHIBA_RBTX4927 | ||
403 | { | ||
404 | sw_irq = toshiba_rbtx4927_irq_nested(sw_irq); | ||
405 | } | ||
406 | #endif | ||
407 | |||
408 | TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST4, "=irq+%d\n", | ||
409 | sw_irq); | ||
410 | } | ||
411 | } | ||
412 | |||
413 | TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST2, "=sw_irq=%d\n", sw_irq); | ||
414 | |||
415 | TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST1, "+\n"); | ||
416 | |||
417 | return (sw_irq); | ||
418 | } | 40 | } |
419 | 41 | ||
420 | asmlinkage void plat_irq_dispatch(void) | 42 | asmlinkage void plat_irq_dispatch(void) |
@@ -424,9 +46,12 @@ asmlinkage void plat_irq_dispatch(void) | |||
424 | if (pending & STATUSF_IP7) /* cpu timer */ | 46 | if (pending & STATUSF_IP7) /* cpu timer */ |
425 | do_IRQ(TX4927_IRQ_CPU_TIMER); | 47 | do_IRQ(TX4927_IRQ_CPU_TIMER); |
426 | else if (pending & STATUSF_IP2) { /* tx4927 pic */ | 48 | else if (pending & STATUSF_IP2) { /* tx4927 pic */ |
427 | unsigned int irq = tx4927_irq_nested(); | 49 | int irq = txx9_irq(); |
428 | 50 | #ifdef CONFIG_TOSHIBA_RBTX4927 | |
429 | if (unlikely(irq == 0)) { | 51 | if (irq == TX4927_IRQ_NEST_EXT_ON_PIC) |
52 | irq = toshiba_rbtx4927_irq_nested(irq); | ||
53 | #endif | ||
54 | if (unlikely(irq < 0)) { | ||
430 | spurious_interrupt(); | 55 | spurious_interrupt(); |
431 | return; | 56 | return; |
432 | } | 57 | } |
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/Makefile b/arch/mips/tx4927/toshiba_rbtx4927/Makefile index 8a991f3c1a6f..13f96725d772 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/Makefile +++ b/arch/mips/tx4927/toshiba_rbtx4927/Makefile | |||
@@ -1,3 +1,5 @@ | |||
1 | obj-y += toshiba_rbtx4927_prom.o | 1 | obj-y += toshiba_rbtx4927_prom.o |
2 | obj-y += toshiba_rbtx4927_setup.o | 2 | obj-y += toshiba_rbtx4927_setup.o |
3 | obj-y += toshiba_rbtx4927_irq.o | 3 | obj-y += toshiba_rbtx4927_irq.o |
4 | |||
5 | EXTRA_CFLAGS += -Werror | ||
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c index e265fcd31b60..9607ad5e734a 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c +++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c | |||
@@ -133,6 +133,7 @@ JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthB | |||
133 | #include <linux/bootmem.h> | 133 | #include <linux/bootmem.h> |
134 | #include <linux/blkdev.h> | 134 | #include <linux/blkdev.h> |
135 | #ifdef CONFIG_TOSHIBA_FPCIB0 | 135 | #ifdef CONFIG_TOSHIBA_FPCIB0 |
136 | #include <asm/i8259.h> | ||
136 | #include <asm/tx4927/smsc_fdc37m81x.h> | 137 | #include <asm/tx4927/smsc_fdc37m81x.h> |
137 | #endif | 138 | #endif |
138 | #include <asm/tx4927/toshiba_rbtx4927.h> | 139 | #include <asm/tx4927/toshiba_rbtx4927.h> |
@@ -151,11 +152,6 @@ JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthB | |||
151 | #define TOSHIBA_RBTX4927_IRQ_IOC_ENABLE ( 1 << 13 ) | 152 | #define TOSHIBA_RBTX4927_IRQ_IOC_ENABLE ( 1 << 13 ) |
152 | #define TOSHIBA_RBTX4927_IRQ_IOC_DISABLE ( 1 << 14 ) | 153 | #define TOSHIBA_RBTX4927_IRQ_IOC_DISABLE ( 1 << 14 ) |
153 | 154 | ||
154 | #define TOSHIBA_RBTX4927_IRQ_ISA_INIT ( 1 << 20 ) | ||
155 | #define TOSHIBA_RBTX4927_IRQ_ISA_ENABLE ( 1 << 23 ) | ||
156 | #define TOSHIBA_RBTX4927_IRQ_ISA_DISABLE ( 1 << 24 ) | ||
157 | #define TOSHIBA_RBTX4927_IRQ_ISA_MASK ( 1 << 25 ) | ||
158 | |||
159 | #define TOSHIBA_RBTX4927_SETUP_ALL 0xffffffff | 155 | #define TOSHIBA_RBTX4927_SETUP_ALL 0xffffffff |
160 | #endif | 156 | #endif |
161 | 157 | ||
@@ -167,10 +163,6 @@ static const u32 toshiba_rbtx4927_irq_debug_flag = | |||
167 | // | TOSHIBA_RBTX4927_IRQ_IOC_INIT | 163 | // | TOSHIBA_RBTX4927_IRQ_IOC_INIT |
168 | // | TOSHIBA_RBTX4927_IRQ_IOC_ENABLE | 164 | // | TOSHIBA_RBTX4927_IRQ_IOC_ENABLE |
169 | // | TOSHIBA_RBTX4927_IRQ_IOC_DISABLE | 165 | // | TOSHIBA_RBTX4927_IRQ_IOC_DISABLE |
170 | // | TOSHIBA_RBTX4927_IRQ_ISA_INIT | ||
171 | // | TOSHIBA_RBTX4927_IRQ_ISA_ENABLE | ||
172 | // | TOSHIBA_RBTX4927_IRQ_ISA_DISABLE | ||
173 | // | TOSHIBA_RBTX4927_IRQ_ISA_MASK | ||
174 | ); | 166 | ); |
175 | #endif | 167 | #endif |
176 | 168 | ||
@@ -196,33 +188,14 @@ static const u32 toshiba_rbtx4927_irq_debug_flag = | |||
196 | #define TOSHIBA_RBTX4927_IRQ_IOC_BEG ((TX4927_IRQ_PIC_END+1)+TOSHIBA_RBTX4927_IRQ_IOC_RAW_BEG) /* 56 */ | 188 | #define TOSHIBA_RBTX4927_IRQ_IOC_BEG ((TX4927_IRQ_PIC_END+1)+TOSHIBA_RBTX4927_IRQ_IOC_RAW_BEG) /* 56 */ |
197 | #define TOSHIBA_RBTX4927_IRQ_IOC_END ((TX4927_IRQ_PIC_END+1)+TOSHIBA_RBTX4927_IRQ_IOC_RAW_END) /* 63 */ | 189 | #define TOSHIBA_RBTX4927_IRQ_IOC_END ((TX4927_IRQ_PIC_END+1)+TOSHIBA_RBTX4927_IRQ_IOC_RAW_END) /* 63 */ |
198 | 190 | ||
199 | |||
200 | #define TOSHIBA_RBTX4927_IRQ_ISA_BEG MI8259_IRQ_ISA_BEG | ||
201 | #define TOSHIBA_RBTX4927_IRQ_ISA_END MI8259_IRQ_ISA_END | ||
202 | #define TOSHIBA_RBTX4927_IRQ_ISA_MID ((TOSHIBA_RBTX4927_IRQ_ISA_BEG+TOSHIBA_RBTX4927_IRQ_ISA_END+1)/2) | ||
203 | |||
204 | |||
205 | #define TOSHIBA_RBTX4927_IRQ_NEST_IOC_ON_PIC TX4927_IRQ_NEST_EXT_ON_PIC | 191 | #define TOSHIBA_RBTX4927_IRQ_NEST_IOC_ON_PIC TX4927_IRQ_NEST_EXT_ON_PIC |
206 | #define TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_IOC (TOSHIBA_RBTX4927_IRQ_IOC_BEG+2) | 192 | #define TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_IOC (TOSHIBA_RBTX4927_IRQ_IOC_BEG+2) |
207 | #define TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_ISA (TOSHIBA_RBTX4927_IRQ_ISA_BEG+2) | ||
208 | 193 | ||
209 | extern int tx4927_using_backplane; | 194 | extern int tx4927_using_backplane; |
210 | 195 | ||
211 | #ifdef CONFIG_TOSHIBA_FPCIB0 | ||
212 | extern void enable_8259A_irq(unsigned int irq); | ||
213 | extern void disable_8259A_irq(unsigned int irq); | ||
214 | extern void mask_and_ack_8259A(unsigned int irq); | ||
215 | #endif | ||
216 | |||
217 | static void toshiba_rbtx4927_irq_ioc_enable(unsigned int irq); | 196 | static void toshiba_rbtx4927_irq_ioc_enable(unsigned int irq); |
218 | static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq); | 197 | static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq); |
219 | 198 | ||
220 | #ifdef CONFIG_TOSHIBA_FPCIB0 | ||
221 | static void toshiba_rbtx4927_irq_isa_enable(unsigned int irq); | ||
222 | static void toshiba_rbtx4927_irq_isa_disable(unsigned int irq); | ||
223 | static void toshiba_rbtx4927_irq_isa_mask_and_ack(unsigned int irq); | ||
224 | #endif | ||
225 | |||
226 | #define TOSHIBA_RBTX4927_IOC_NAME "RBTX4927-IOC" | 199 | #define TOSHIBA_RBTX4927_IOC_NAME "RBTX4927-IOC" |
227 | static struct irq_chip toshiba_rbtx4927_irq_ioc_type = { | 200 | static struct irq_chip toshiba_rbtx4927_irq_ioc_type = { |
228 | .name = TOSHIBA_RBTX4927_IOC_NAME, | 201 | .name = TOSHIBA_RBTX4927_IOC_NAME, |
@@ -235,18 +208,6 @@ static struct irq_chip toshiba_rbtx4927_irq_ioc_type = { | |||
235 | #define TOSHIBA_RBTX4927_IOC_INTR_STAT 0xbc002006 | 208 | #define TOSHIBA_RBTX4927_IOC_INTR_STAT 0xbc002006 |
236 | 209 | ||
237 | 210 | ||
238 | #ifdef CONFIG_TOSHIBA_FPCIB0 | ||
239 | #define TOSHIBA_RBTX4927_ISA_NAME "RBTX4927-ISA" | ||
240 | static struct irq_chip toshiba_rbtx4927_irq_isa_type = { | ||
241 | .name = TOSHIBA_RBTX4927_ISA_NAME, | ||
242 | .ack = toshiba_rbtx4927_irq_isa_mask_and_ack, | ||
243 | .mask = toshiba_rbtx4927_irq_isa_disable, | ||
244 | .mask_ack = toshiba_rbtx4927_irq_isa_mask_and_ack, | ||
245 | .unmask = toshiba_rbtx4927_irq_isa_enable, | ||
246 | }; | ||
247 | #endif | ||
248 | |||
249 | |||
250 | u32 bit2num(u32 num) | 211 | u32 bit2num(u32 num) |
251 | { | 212 | { |
252 | u32 i; | 213 | u32 i; |
@@ -271,31 +232,10 @@ int toshiba_rbtx4927_irq_nested(int sw_irq) | |||
271 | } | 232 | } |
272 | } | 233 | } |
273 | #ifdef CONFIG_TOSHIBA_FPCIB0 | 234 | #ifdef CONFIG_TOSHIBA_FPCIB0 |
274 | { | 235 | if (tx4927_using_backplane) { |
275 | if (tx4927_using_backplane) { | 236 | int irq = i8259_irq(); |
276 | u32 level4; | 237 | if (irq >= 0) |
277 | u32 level5; | 238 | sw_irq = irq; |
278 | outb(0x0A, 0x20); | ||
279 | level4 = inb(0x20) & 0xff; | ||
280 | if (level4) { | ||
281 | sw_irq = | ||
282 | TOSHIBA_RBTX4927_IRQ_ISA_BEG + | ||
283 | bit2num(level4); | ||
284 | if (sw_irq != | ||
285 | TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_ISA) { | ||
286 | goto RETURN; | ||
287 | } | ||
288 | } | ||
289 | |||
290 | outb(0x0A, 0xA0); | ||
291 | level5 = inb(0xA0) & 0xff; | ||
292 | if (level5) { | ||
293 | sw_irq = | ||
294 | TOSHIBA_RBTX4927_IRQ_ISA_MID + | ||
295 | bit2num(level5); | ||
296 | goto RETURN; | ||
297 | } | ||
298 | } | ||
299 | } | 239 | } |
300 | #endif | 240 | #endif |
301 | 241 | ||
@@ -307,12 +247,6 @@ int toshiba_rbtx4927_irq_nested(int sw_irq) | |||
307 | #define TOSHIBA_RBTX4927_PIC_ACTION(s) { no_action, IRQF_SHARED, CPU_MASK_NONE, s, NULL, NULL } | 247 | #define TOSHIBA_RBTX4927_PIC_ACTION(s) { no_action, IRQF_SHARED, CPU_MASK_NONE, s, NULL, NULL } |
308 | static struct irqaction toshiba_rbtx4927_irq_ioc_action = | 248 | static struct irqaction toshiba_rbtx4927_irq_ioc_action = |
309 | TOSHIBA_RBTX4927_PIC_ACTION(TOSHIBA_RBTX4927_IOC_NAME); | 249 | TOSHIBA_RBTX4927_PIC_ACTION(TOSHIBA_RBTX4927_IOC_NAME); |
310 | #ifdef CONFIG_TOSHIBA_FPCIB0 | ||
311 | static struct irqaction toshiba_rbtx4927_irq_isa_master = | ||
312 | TOSHIBA_RBTX4927_PIC_ACTION(TOSHIBA_RBTX4927_ISA_NAME "/M"); | ||
313 | static struct irqaction toshiba_rbtx4927_irq_isa_slave = | ||
314 | TOSHIBA_RBTX4927_PIC_ACTION(TOSHIBA_RBTX4927_ISA_NAME "/S"); | ||
315 | #endif | ||
316 | 250 | ||
317 | 251 | ||
318 | /**********************************************************************************/ | 252 | /**********************************************************************************/ |
@@ -378,92 +312,6 @@ static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq) | |||
378 | } | 312 | } |
379 | 313 | ||
380 | 314 | ||
381 | /**********************************************************************************/ | ||
382 | /* Functions for isa */ | ||
383 | /**********************************************************************************/ | ||
384 | |||
385 | |||
386 | #ifdef CONFIG_TOSHIBA_FPCIB0 | ||
387 | static void __init toshiba_rbtx4927_irq_isa_init(void) | ||
388 | { | ||
389 | int i; | ||
390 | |||
391 | TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_ISA_INIT, | ||
392 | "beg=%d end=%d\n", | ||
393 | TOSHIBA_RBTX4927_IRQ_ISA_BEG, | ||
394 | TOSHIBA_RBTX4927_IRQ_ISA_END); | ||
395 | |||
396 | for (i = TOSHIBA_RBTX4927_IRQ_ISA_BEG; | ||
397 | i <= TOSHIBA_RBTX4927_IRQ_ISA_END; i++) | ||
398 | set_irq_chip_and_handler(i, &toshiba_rbtx4927_irq_isa_type, | ||
399 | handle_level_irq); | ||
400 | |||
401 | setup_irq(TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_IOC, | ||
402 | &toshiba_rbtx4927_irq_isa_master); | ||
403 | setup_irq(TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_ISA, | ||
404 | &toshiba_rbtx4927_irq_isa_slave); | ||
405 | |||
406 | /* make sure we are looking at IRR (not ISR) */ | ||
407 | outb(0x0A, 0x20); | ||
408 | outb(0x0A, 0xA0); | ||
409 | } | ||
410 | #endif | ||
411 | |||
412 | |||
413 | #ifdef CONFIG_TOSHIBA_FPCIB0 | ||
414 | static void toshiba_rbtx4927_irq_isa_enable(unsigned int irq) | ||
415 | { | ||
416 | TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_ISA_ENABLE, | ||
417 | "irq=%d\n", irq); | ||
418 | |||
419 | if (irq < TOSHIBA_RBTX4927_IRQ_ISA_BEG | ||
420 | || irq > TOSHIBA_RBTX4927_IRQ_ISA_END) { | ||
421 | TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_EROR, | ||
422 | "bad irq=%d\n", irq); | ||
423 | panic("\n"); | ||
424 | } | ||
425 | |||
426 | enable_8259A_irq(irq); | ||
427 | } | ||
428 | #endif | ||
429 | |||
430 | |||
431 | #ifdef CONFIG_TOSHIBA_FPCIB0 | ||
432 | static void toshiba_rbtx4927_irq_isa_disable(unsigned int irq) | ||
433 | { | ||
434 | TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_ISA_DISABLE, | ||
435 | "irq=%d\n", irq); | ||
436 | |||
437 | if (irq < TOSHIBA_RBTX4927_IRQ_ISA_BEG | ||
438 | || irq > TOSHIBA_RBTX4927_IRQ_ISA_END) { | ||
439 | TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_EROR, | ||
440 | "bad irq=%d\n", irq); | ||
441 | panic("\n"); | ||
442 | } | ||
443 | |||
444 | disable_8259A_irq(irq); | ||
445 | } | ||
446 | #endif | ||
447 | |||
448 | |||
449 | #ifdef CONFIG_TOSHIBA_FPCIB0 | ||
450 | static void toshiba_rbtx4927_irq_isa_mask_and_ack(unsigned int irq) | ||
451 | { | ||
452 | TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_ISA_MASK, | ||
453 | "irq=%d\n", irq); | ||
454 | |||
455 | if (irq < TOSHIBA_RBTX4927_IRQ_ISA_BEG | ||
456 | || irq > TOSHIBA_RBTX4927_IRQ_ISA_END) { | ||
457 | TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_EROR, | ||
458 | "bad irq=%d\n", irq); | ||
459 | panic("\n"); | ||
460 | } | ||
461 | |||
462 | mask_and_ack_8259A(irq); | ||
463 | } | ||
464 | #endif | ||
465 | |||
466 | |||
467 | void __init arch_init_irq(void) | 315 | void __init arch_init_irq(void) |
468 | { | 316 | { |
469 | extern void tx4927_irq_init(void); | 317 | extern void tx4927_irq_init(void); |
@@ -471,12 +319,11 @@ void __init arch_init_irq(void) | |||
471 | tx4927_irq_init(); | 319 | tx4927_irq_init(); |
472 | toshiba_rbtx4927_irq_ioc_init(); | 320 | toshiba_rbtx4927_irq_ioc_init(); |
473 | #ifdef CONFIG_TOSHIBA_FPCIB0 | 321 | #ifdef CONFIG_TOSHIBA_FPCIB0 |
474 | { | 322 | if (tx4927_using_backplane) |
475 | if (tx4927_using_backplane) { | 323 | init_i8259_irqs(); |
476 | toshiba_rbtx4927_irq_isa_init(); | ||
477 | } | ||
478 | } | ||
479 | #endif | 324 | #endif |
325 | /* Onboard 10M Ether: High Active */ | ||
326 | set_irq_type(RBTX4927_RTL_8019_IRQ, IRQF_TRIGGER_HIGH); | ||
480 | 327 | ||
481 | wbflush(); | 328 | wbflush(); |
482 | } | 329 | } |
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c index ea5a70b252a0..3e84237abe63 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c +++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c | |||
@@ -151,7 +151,6 @@ unsigned long mips_memory_upper; | |||
151 | static int tx4927_ccfg_toeon = 1; | 151 | static int tx4927_ccfg_toeon = 1; |
152 | static int tx4927_pcic_trdyto = 0; /* default: disabled */ | 152 | static int tx4927_pcic_trdyto = 0; /* default: disabled */ |
153 | unsigned long tx4927_ce_base[8]; | 153 | unsigned long tx4927_ce_base[8]; |
154 | void tx4927_pci_setup(void); | ||
155 | void tx4927_reset_pci_pcic(void); | 154 | void tx4927_reset_pci_pcic(void); |
156 | int tx4927_pci66 = 0; /* 0:auto */ | 155 | int tx4927_pci66 = 0; /* 0:auto */ |
157 | #endif | 156 | #endif |
@@ -442,7 +441,7 @@ arch_initcall(tx4927_pcibios_init); | |||
442 | extern struct resource pci_io_resource; | 441 | extern struct resource pci_io_resource; |
443 | extern struct resource pci_mem_resource; | 442 | extern struct resource pci_mem_resource; |
444 | 443 | ||
445 | void tx4927_pci_setup(void) | 444 | void __init tx4927_pci_setup(void) |
446 | { | 445 | { |
447 | static int called = 0; | 446 | static int called = 0; |
448 | extern unsigned int tx4927_get_mem_size(void); | 447 | extern unsigned int tx4927_get_mem_size(void); |
@@ -748,12 +747,6 @@ void __init toshiba_rbtx4927_setup(void) | |||
748 | } | 747 | } |
749 | #endif | 748 | #endif |
750 | 749 | ||
751 | /* setup irq stuff */ | ||
752 | TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_SETUP, | ||
753 | ":Setting up tx4927 pic.\n"); | ||
754 | TX4927_WR(0xff1ff604, 0x00000400); /* irq trigger */ | ||
755 | TX4927_WR(0xff1ff608, 0x00000000); /* irq trigger */ | ||
756 | |||
757 | /* setup serial stuff */ | 750 | /* setup serial stuff */ |
758 | TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_SETUP, | 751 | TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_SETUP, |
759 | ":Setting up tx4927 sio.\n"); | 752 | ":Setting up tx4927 sio.\n"); |
@@ -915,7 +908,7 @@ void __init toshiba_rbtx4927_setup(void) | |||
915 | req.iotype = UPIO_MEM; | 908 | req.iotype = UPIO_MEM; |
916 | req.membase = (char *)(0xff1ff300 + i * 0x100); | 909 | req.membase = (char *)(0xff1ff300 + i * 0x100); |
917 | req.mapbase = 0xff1ff300 + i * 0x100; | 910 | req.mapbase = 0xff1ff300 + i * 0x100; |
918 | req.irq = 32 + i; | 911 | req.irq = TX4927_IRQ_PIC_BEG + 8 + i; |
919 | req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/; | 912 | req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/; |
920 | req.uartclk = 50000000; | 913 | req.uartclk = 50000000; |
921 | early_serial_txx9_setup(&req); | 914 | early_serial_txx9_setup(&req); |
diff --git a/arch/mips/tx4938/common/Makefile b/arch/mips/tx4938/common/Makefile index 83cda518f204..8352eca67906 100644 --- a/arch/mips/tx4938/common/Makefile +++ b/arch/mips/tx4938/common/Makefile | |||
@@ -9,3 +9,4 @@ | |||
9 | obj-y += prom.o setup.o irq.o | 9 | obj-y += prom.o setup.o irq.o |
10 | obj-$(CONFIG_KGDB) += dbgio.o | 10 | obj-$(CONFIG_KGDB) += dbgio.o |
11 | 11 | ||
12 | EXTRA_CFLAGS += -Werror | ||
diff --git a/arch/mips/tx4938/common/irq.c b/arch/mips/tx4938/common/irq.c index 3a2dbfc25014..c059b899d120 100644 --- a/arch/mips/tx4938/common/irq.c +++ b/arch/mips/tx4938/common/irq.c | |||
@@ -11,284 +11,21 @@ | |||
11 | * | 11 | * |
12 | * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com) | 12 | * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com) |
13 | */ | 13 | */ |
14 | #include <linux/errno.h> | ||
15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
16 | #include <linux/kernel_stat.h> | ||
17 | #include <linux/module.h> | ||
18 | #include <linux/signal.h> | ||
19 | #include <linux/sched.h> | ||
20 | #include <linux/types.h> | ||
21 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
22 | #include <linux/ioport.h> | 16 | #include <asm/irq_cpu.h> |
23 | #include <linux/timex.h> | ||
24 | #include <linux/slab.h> | ||
25 | #include <linux/random.h> | ||
26 | #include <linux/irq.h> | ||
27 | #include <asm/bitops.h> | ||
28 | #include <asm/bootinfo.h> | ||
29 | #include <asm/io.h> | ||
30 | #include <asm/irq.h> | ||
31 | #include <asm/mipsregs.h> | 17 | #include <asm/mipsregs.h> |
32 | #include <asm/system.h> | ||
33 | #include <asm/wbflush.h> | ||
34 | #include <asm/tx4938/rbtx4938.h> | 18 | #include <asm/tx4938/rbtx4938.h> |
35 | 19 | ||
36 | /**********************************************************************************/ | ||
37 | /* Forwad definitions for all pic's */ | ||
38 | /**********************************************************************************/ | ||
39 | |||
40 | static void tx4938_irq_cp0_enable(unsigned int irq); | ||
41 | static void tx4938_irq_cp0_disable(unsigned int irq); | ||
42 | |||
43 | static void tx4938_irq_pic_enable(unsigned int irq); | ||
44 | static void tx4938_irq_pic_disable(unsigned int irq); | ||
45 | |||
46 | /**********************************************************************************/ | ||
47 | /* Kernel structs for all pic's */ | ||
48 | /**********************************************************************************/ | ||
49 | |||
50 | #define TX4938_CP0_NAME "TX4938-CP0" | ||
51 | static struct irq_chip tx4938_irq_cp0_type = { | ||
52 | .name = TX4938_CP0_NAME, | ||
53 | .ack = tx4938_irq_cp0_disable, | ||
54 | .mask = tx4938_irq_cp0_disable, | ||
55 | .mask_ack = tx4938_irq_cp0_disable, | ||
56 | .unmask = tx4938_irq_cp0_enable, | ||
57 | }; | ||
58 | |||
59 | #define TX4938_PIC_NAME "TX4938-PIC" | ||
60 | static struct irq_chip tx4938_irq_pic_type = { | ||
61 | .name = TX4938_PIC_NAME, | ||
62 | .ack = tx4938_irq_pic_disable, | ||
63 | .mask = tx4938_irq_pic_disable, | ||
64 | .mask_ack = tx4938_irq_pic_disable, | ||
65 | .unmask = tx4938_irq_pic_enable, | ||
66 | }; | ||
67 | |||
68 | static struct irqaction tx4938_irq_pic_action = { | ||
69 | .handler = no_action, | ||
70 | .flags = 0, | ||
71 | .mask = CPU_MASK_NONE, | ||
72 | .name = TX4938_PIC_NAME | ||
73 | }; | ||
74 | |||
75 | /**********************************************************************************/ | ||
76 | /* Functions for cp0 */ | ||
77 | /**********************************************************************************/ | ||
78 | |||
79 | #define tx4938_irq_cp0_mask(irq) ( 1 << ( irq-TX4938_IRQ_CP0_BEG+8 ) ) | ||
80 | |||
81 | static void __init | ||
82 | tx4938_irq_cp0_init(void) | ||
83 | { | ||
84 | int i; | ||
85 | |||
86 | for (i = TX4938_IRQ_CP0_BEG; i <= TX4938_IRQ_CP0_END; i++) | ||
87 | set_irq_chip_and_handler(i, &tx4938_irq_cp0_type, | ||
88 | handle_level_irq); | ||
89 | } | ||
90 | |||
91 | static void | ||
92 | tx4938_irq_cp0_enable(unsigned int irq) | ||
93 | { | ||
94 | set_c0_status(tx4938_irq_cp0_mask(irq)); | ||
95 | } | ||
96 | |||
97 | static void | ||
98 | tx4938_irq_cp0_disable(unsigned int irq) | ||
99 | { | ||
100 | clear_c0_status(tx4938_irq_cp0_mask(irq)); | ||
101 | } | ||
102 | |||
103 | /**********************************************************************************/ | ||
104 | /* Functions for pic */ | ||
105 | /**********************************************************************************/ | ||
106 | |||
107 | u32 | ||
108 | tx4938_irq_pic_addr(int irq) | ||
109 | { | ||
110 | /* MVMCP -- need to formulize this */ | ||
111 | irq -= TX4938_IRQ_PIC_BEG; | ||
112 | |||
113 | switch (irq) { | ||
114 | case 17: | ||
115 | case 16: | ||
116 | case 1: | ||
117 | case 0:{ | ||
118 | return (TX4938_MKA(TX4938_IRC_IRLVL0)); | ||
119 | } | ||
120 | case 19: | ||
121 | case 18: | ||
122 | case 3: | ||
123 | case 2:{ | ||
124 | return (TX4938_MKA(TX4938_IRC_IRLVL1)); | ||
125 | } | ||
126 | case 21: | ||
127 | case 20: | ||
128 | case 5: | ||
129 | case 4:{ | ||
130 | return (TX4938_MKA(TX4938_IRC_IRLVL2)); | ||
131 | } | ||
132 | case 23: | ||
133 | case 22: | ||
134 | case 7: | ||
135 | case 6:{ | ||
136 | return (TX4938_MKA(TX4938_IRC_IRLVL3)); | ||
137 | } | ||
138 | case 25: | ||
139 | case 24: | ||
140 | case 9: | ||
141 | case 8:{ | ||
142 | return (TX4938_MKA(TX4938_IRC_IRLVL4)); | ||
143 | } | ||
144 | case 27: | ||
145 | case 26: | ||
146 | case 11: | ||
147 | case 10:{ | ||
148 | return (TX4938_MKA(TX4938_IRC_IRLVL5)); | ||
149 | } | ||
150 | case 29: | ||
151 | case 28: | ||
152 | case 13: | ||
153 | case 12:{ | ||
154 | return (TX4938_MKA(TX4938_IRC_IRLVL6)); | ||
155 | } | ||
156 | case 31: | ||
157 | case 30: | ||
158 | case 15: | ||
159 | case 14:{ | ||
160 | return (TX4938_MKA(TX4938_IRC_IRLVL7)); | ||
161 | } | ||
162 | } | ||
163 | |||
164 | return 0; | ||
165 | } | ||
166 | |||
167 | u32 | ||
168 | tx4938_irq_pic_mask(int irq) | ||
169 | { | ||
170 | /* MVMCP -- need to formulize this */ | ||
171 | irq -= TX4938_IRQ_PIC_BEG; | ||
172 | |||
173 | switch (irq) { | ||
174 | case 31: | ||
175 | case 29: | ||
176 | case 27: | ||
177 | case 25: | ||
178 | case 23: | ||
179 | case 21: | ||
180 | case 19: | ||
181 | case 17:{ | ||
182 | return (0x07000000); | ||
183 | } | ||
184 | case 30: | ||
185 | case 28: | ||
186 | case 26: | ||
187 | case 24: | ||
188 | case 22: | ||
189 | case 20: | ||
190 | case 18: | ||
191 | case 16:{ | ||
192 | return (0x00070000); | ||
193 | } | ||
194 | case 15: | ||
195 | case 13: | ||
196 | case 11: | ||
197 | case 9: | ||
198 | case 7: | ||
199 | case 5: | ||
200 | case 3: | ||
201 | case 1:{ | ||
202 | return (0x00000700); | ||
203 | } | ||
204 | case 14: | ||
205 | case 12: | ||
206 | case 10: | ||
207 | case 8: | ||
208 | case 6: | ||
209 | case 4: | ||
210 | case 2: | ||
211 | case 0:{ | ||
212 | return (0x00000007); | ||
213 | } | ||
214 | } | ||
215 | return 0x00000000; | ||
216 | } | ||
217 | |||
218 | static void | ||
219 | tx4938_irq_pic_modify(unsigned pic_reg, unsigned clr_bits, unsigned set_bits) | ||
220 | { | ||
221 | unsigned long val = 0; | ||
222 | |||
223 | val = TX4938_RD(pic_reg); | ||
224 | val &= (~clr_bits); | ||
225 | val |= (set_bits); | ||
226 | TX4938_WR(pic_reg, val); | ||
227 | mmiowb(); | ||
228 | TX4938_RD(pic_reg); | ||
229 | } | ||
230 | |||
231 | static void __init | ||
232 | tx4938_irq_pic_init(void) | ||
233 | { | ||
234 | int i; | ||
235 | |||
236 | for (i = TX4938_IRQ_PIC_BEG; i <= TX4938_IRQ_PIC_END; i++) | ||
237 | set_irq_chip_and_handler(i, &tx4938_irq_pic_type, | ||
238 | handle_level_irq); | ||
239 | |||
240 | setup_irq(TX4938_IRQ_NEST_PIC_ON_CP0, &tx4938_irq_pic_action); | ||
241 | |||
242 | TX4938_WR(0xff1ff640, 0x6); /* irq level mask -- only accept hightest */ | ||
243 | TX4938_WR(0xff1ff600, TX4938_RD(0xff1ff600) | 0x1); /* irq enable */ | ||
244 | } | ||
245 | |||
246 | static void | ||
247 | tx4938_irq_pic_enable(unsigned int irq) | ||
248 | { | ||
249 | tx4938_irq_pic_modify(tx4938_irq_pic_addr(irq), 0, | ||
250 | tx4938_irq_pic_mask(irq)); | ||
251 | } | ||
252 | |||
253 | static void | ||
254 | tx4938_irq_pic_disable(unsigned int irq) | ||
255 | { | ||
256 | tx4938_irq_pic_modify(tx4938_irq_pic_addr(irq), | ||
257 | tx4938_irq_pic_mask(irq), 0); | ||
258 | } | ||
259 | |||
260 | /**********************************************************************************/ | ||
261 | /* Main init functions */ | ||
262 | /**********************************************************************************/ | ||
263 | |||
264 | void __init | 20 | void __init |
265 | tx4938_irq_init(void) | 21 | tx4938_irq_init(void) |
266 | { | 22 | { |
267 | tx4938_irq_cp0_init(); | 23 | mips_cpu_irq_init(); |
268 | tx4938_irq_pic_init(); | 24 | txx9_irq_init(TX4938_IRC_REG); |
25 | set_irq_chained_handler(TX4938_IRQ_NEST_PIC_ON_CP0, handle_simple_irq); | ||
269 | } | 26 | } |
270 | 27 | ||
271 | int | 28 | int toshiba_rbtx4938_irq_nested(int irq); |
272 | tx4938_irq_nested(void) | ||
273 | { | ||
274 | int sw_irq = 0; | ||
275 | u32 level2; | ||
276 | |||
277 | level2 = TX4938_RD(0xff1ff6a0); | ||
278 | if ((level2 & 0x10000) == 0) { | ||
279 | level2 &= 0x1f; | ||
280 | sw_irq = TX4938_IRQ_PIC_BEG + level2; | ||
281 | if (sw_irq == 26) { | ||
282 | { | ||
283 | extern int toshiba_rbtx4938_irq_nested(int sw_irq); | ||
284 | sw_irq = toshiba_rbtx4938_irq_nested(sw_irq); | ||
285 | } | ||
286 | } | ||
287 | } | ||
288 | |||
289 | wbflush(); | ||
290 | return sw_irq; | ||
291 | } | ||
292 | 29 | ||
293 | asmlinkage void plat_irq_dispatch(void) | 30 | asmlinkage void plat_irq_dispatch(void) |
294 | { | 31 | { |
@@ -297,8 +34,10 @@ asmlinkage void plat_irq_dispatch(void) | |||
297 | if (pending & STATUSF_IP7) | 34 | if (pending & STATUSF_IP7) |
298 | do_IRQ(TX4938_IRQ_CPU_TIMER); | 35 | do_IRQ(TX4938_IRQ_CPU_TIMER); |
299 | else if (pending & STATUSF_IP2) { | 36 | else if (pending & STATUSF_IP2) { |
300 | int irq = tx4938_irq_nested(); | 37 | int irq = txx9_irq(); |
301 | if (irq) | 38 | if (irq == TX4938_IRQ_PIC_BEG + TX4938_IR_INT(0)) |
39 | irq = toshiba_rbtx4938_irq_nested(irq); | ||
40 | if (irq >= 0) | ||
302 | do_IRQ(irq); | 41 | do_IRQ(irq); |
303 | else | 42 | else |
304 | spurious_interrupt(); | 43 | spurious_interrupt(); |
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/Makefile b/arch/mips/tx4938/toshiba_rbtx4938/Makefile index 10c94e62bf5b..675bb1c3e40c 100644 --- a/arch/mips/tx4938/toshiba_rbtx4938/Makefile +++ b/arch/mips/tx4938/toshiba_rbtx4938/Makefile | |||
@@ -7,3 +7,5 @@ | |||
7 | # | 7 | # |
8 | 8 | ||
9 | obj-y += prom.o setup.o irq.o spi_eeprom.o | 9 | obj-y += prom.o setup.o irq.o spi_eeprom.o |
10 | |||
11 | EXTRA_CFLAGS += -Werror | ||
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/irq.c b/arch/mips/tx4938/toshiba_rbtx4938/irq.c index 91aea7aff515..f00185017e80 100644 --- a/arch/mips/tx4938/toshiba_rbtx4938/irq.c +++ b/arch/mips/tx4938/toshiba_rbtx4938/irq.c | |||
@@ -181,7 +181,7 @@ void __init arch_init_irq(void) | |||
181 | tx4938_irq_init(); | 181 | tx4938_irq_init(); |
182 | toshiba_rbtx4938_irq_ioc_init(); | 182 | toshiba_rbtx4938_irq_ioc_init(); |
183 | /* Onboard 10M Ether: High Active */ | 183 | /* Onboard 10M Ether: High Active */ |
184 | TX4938_WR(TX4938_MKA(TX4938_IRC_IRDM0), 0x00000040); | 184 | set_irq_type(RBTX4938_IRQ_ETHER, IRQF_TRIGGER_HIGH); |
185 | 185 | ||
186 | wbflush(); | 186 | wbflush(); |
187 | } | 187 | } |
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/setup.c b/arch/mips/tx4938/toshiba_rbtx4938/setup.c index f9ad482749e4..84ebff711e6e 100644 --- a/arch/mips/tx4938/toshiba_rbtx4938/setup.c +++ b/arch/mips/tx4938/toshiba_rbtx4938/setup.c | |||
@@ -773,10 +773,6 @@ void __init tx4938_board_setup(void) | |||
773 | txboard_add_phys_region(base, size); | 773 | txboard_add_phys_region(base, size); |
774 | } | 774 | } |
775 | 775 | ||
776 | /* IRC */ | ||
777 | /* disable interrupt control */ | ||
778 | tx4938_ircptr->cer = 0; | ||
779 | |||
780 | /* TMR */ | 776 | /* TMR */ |
781 | /* disable all timers */ | 777 | /* disable all timers */ |
782 | for (i = 0; i < TX4938_NR_TMR; i++) { | 778 | for (i = 0; i < TX4938_NR_TMR; i++) { |
@@ -875,9 +871,6 @@ void __init toshiba_rbtx4938_setup(void) | |||
875 | if (txx9_master_clock == 0) | 871 | if (txx9_master_clock == 0) |
876 | txx9_master_clock = 25000000; /* 25MHz */ | 872 | txx9_master_clock = 25000000; /* 25MHz */ |
877 | tx4938_board_setup(); | 873 | tx4938_board_setup(); |
878 | /* setup irq stuff */ | ||
879 | TX4938_WR(TX4938_MKA(TX4938_IRC_IRDM0), 0x00000000); /* irq trigger */ | ||
880 | TX4938_WR(TX4938_MKA(TX4938_IRC_IRDM1), 0x00000000); /* irq trigger */ | ||
881 | /* setup serial stuff */ | 874 | /* setup serial stuff */ |
882 | TX4938_WR(0xff1ff314, 0x00000000); /* h/w flow control off */ | 875 | TX4938_WR(0xff1ff314, 0x00000000); /* h/w flow control off */ |
883 | TX4938_WR(0xff1ff414, 0x00000000); /* h/w flow control off */ | 876 | TX4938_WR(0xff1ff414, 0x00000000); /* h/w flow control off */ |
@@ -897,7 +890,7 @@ void __init toshiba_rbtx4938_setup(void) | |||
897 | req.iotype = UPIO_MEM; | 890 | req.iotype = UPIO_MEM; |
898 | req.membase = (char *)(0xff1ff300 + i * 0x100); | 891 | req.membase = (char *)(0xff1ff300 + i * 0x100); |
899 | req.mapbase = 0xff1ff300 + i * 0x100; | 892 | req.mapbase = 0xff1ff300 + i * 0x100; |
900 | req.irq = 32 + i; | 893 | req.irq = RBTX4938_IRQ_IRC_SIO(i); |
901 | req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/; | 894 | req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/; |
902 | req.uartclk = 50000000; | 895 | req.uartclk = 50000000; |
903 | early_serial_txx9_setup(&req); | 896 | early_serial_txx9_setup(&req); |
@@ -1122,7 +1115,7 @@ static void __init txx9_spi_init(unsigned long base, int irq) | |||
1122 | static int __init rbtx4938_spi_init(void) | 1115 | static int __init rbtx4938_spi_init(void) |
1123 | { | 1116 | { |
1124 | struct spi_board_info srtc_info = { | 1117 | struct spi_board_info srtc_info = { |
1125 | .modalias = "rs5c348", | 1118 | .modalias = "rtc-rs5c348", |
1126 | .max_speed_hz = 1000000, /* 1.0Mbps @ Vdd 2.0V */ | 1119 | .max_speed_hz = 1000000, /* 1.0Mbps @ Vdd 2.0V */ |
1127 | .bus_num = 0, | 1120 | .bus_num = 0, |
1128 | .chip_select = 16 + SRTC_CS, | 1121 | .chip_select = 16 + SRTC_CS, |
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c index bb23ff71c28e..2989c6682bf6 100644 --- a/arch/parisc/kernel/sys_parisc32.c +++ b/arch/parisc/kernel/sys_parisc32.c | |||
@@ -285,147 +285,6 @@ int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf) | |||
285 | return err; | 285 | return err; |
286 | } | 286 | } |
287 | 287 | ||
288 | struct linux32_dirent { | ||
289 | u32 d_ino; | ||
290 | compat_off_t d_off; | ||
291 | u16 d_reclen; | ||
292 | char d_name[1]; | ||
293 | }; | ||
294 | |||
295 | struct old_linux32_dirent { | ||
296 | u32 d_ino; | ||
297 | u32 d_offset; | ||
298 | u16 d_namlen; | ||
299 | char d_name[1]; | ||
300 | }; | ||
301 | |||
302 | struct getdents32_callback { | ||
303 | struct linux32_dirent __user * current_dir; | ||
304 | struct linux32_dirent __user * previous; | ||
305 | int count; | ||
306 | int error; | ||
307 | }; | ||
308 | |||
309 | struct readdir32_callback { | ||
310 | struct old_linux32_dirent __user * dirent; | ||
311 | int count; | ||
312 | }; | ||
313 | |||
314 | #define NAME_OFFSET(de) ((int) ((de)->d_name - (char __user *) (de))) | ||
315 | static int filldir32 (void *__buf, const char *name, int namlen, | ||
316 | loff_t offset, u64 ino, unsigned int d_type) | ||
317 | { | ||
318 | struct linux32_dirent __user * dirent; | ||
319 | struct getdents32_callback * buf = (struct getdents32_callback *) __buf; | ||
320 | int reclen = ALIGN(NAME_OFFSET(dirent) + namlen + 1, 4); | ||
321 | u32 d_ino; | ||
322 | |||
323 | buf->error = -EINVAL; /* only used if we fail.. */ | ||
324 | if (reclen > buf->count) | ||
325 | return -EINVAL; | ||
326 | d_ino = ino; | ||
327 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) | ||
328 | return -EOVERFLOW; | ||
329 | dirent = buf->previous; | ||
330 | if (dirent) | ||
331 | put_user(offset, &dirent->d_off); | ||
332 | dirent = buf->current_dir; | ||
333 | buf->previous = dirent; | ||
334 | put_user(d_ino, &dirent->d_ino); | ||
335 | put_user(reclen, &dirent->d_reclen); | ||
336 | copy_to_user(dirent->d_name, name, namlen); | ||
337 | put_user(0, dirent->d_name + namlen); | ||
338 | dirent = ((void __user *)dirent) + reclen; | ||
339 | buf->current_dir = dirent; | ||
340 | buf->count -= reclen; | ||
341 | return 0; | ||
342 | } | ||
343 | |||
344 | asmlinkage long | ||
345 | sys32_getdents (unsigned int fd, void __user * dirent, unsigned int count) | ||
346 | { | ||
347 | struct file * file; | ||
348 | struct linux32_dirent __user * lastdirent; | ||
349 | struct getdents32_callback buf; | ||
350 | int error; | ||
351 | |||
352 | error = -EFAULT; | ||
353 | if (!access_ok(VERIFY_WRITE, dirent, count)) | ||
354 | goto out; | ||
355 | |||
356 | error = -EBADF; | ||
357 | file = fget(fd); | ||
358 | if (!file) | ||
359 | goto out; | ||
360 | |||
361 | buf.current_dir = (struct linux32_dirent __user *) dirent; | ||
362 | buf.previous = NULL; | ||
363 | buf.count = count; | ||
364 | buf.error = 0; | ||
365 | |||
366 | error = vfs_readdir(file, filldir32, &buf); | ||
367 | if (error < 0) | ||
368 | goto out_putf; | ||
369 | error = buf.error; | ||
370 | lastdirent = buf.previous; | ||
371 | if (lastdirent) { | ||
372 | if (put_user(file->f_pos, &lastdirent->d_off)) | ||
373 | error = -EFAULT; | ||
374 | else | ||
375 | error = count - buf.count; | ||
376 | } | ||
377 | |||
378 | out_putf: | ||
379 | fput(file); | ||
380 | out: | ||
381 | return error; | ||
382 | } | ||
383 | |||
384 | static int fillonedir32(void * __buf, const char * name, int namlen, | ||
385 | loff_t offset, u64 ino, unsigned int d_type) | ||
386 | { | ||
387 | struct readdir32_callback * buf = (struct readdir32_callback *) __buf; | ||
388 | struct old_linux32_dirent __user * dirent; | ||
389 | u32 d_ino; | ||
390 | |||
391 | if (buf->count) | ||
392 | return -EINVAL; | ||
393 | d_ino = ino; | ||
394 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) | ||
395 | return -EOVERFLOW; | ||
396 | buf->count++; | ||
397 | dirent = buf->dirent; | ||
398 | put_user(d_ino, &dirent->d_ino); | ||
399 | put_user(offset, &dirent->d_offset); | ||
400 | put_user(namlen, &dirent->d_namlen); | ||
401 | copy_to_user(dirent->d_name, name, namlen); | ||
402 | put_user(0, dirent->d_name + namlen); | ||
403 | return 0; | ||
404 | } | ||
405 | |||
406 | asmlinkage long | ||
407 | sys32_readdir (unsigned int fd, void __user * dirent, unsigned int count) | ||
408 | { | ||
409 | int error; | ||
410 | struct file * file; | ||
411 | struct readdir32_callback buf; | ||
412 | |||
413 | error = -EBADF; | ||
414 | file = fget(fd); | ||
415 | if (!file) | ||
416 | goto out; | ||
417 | |||
418 | buf.count = 0; | ||
419 | buf.dirent = dirent; | ||
420 | |||
421 | error = vfs_readdir(file, fillonedir32, &buf); | ||
422 | if (error >= 0) | ||
423 | error = buf.count; | ||
424 | fput(file); | ||
425 | out: | ||
426 | return error; | ||
427 | } | ||
428 | |||
429 | /*** copied from mips64 ***/ | 288 | /*** copied from mips64 ***/ |
430 | /* | 289 | /* |
431 | * Ooo, nasty. We need here to frob 32-bit unsigned longs to | 290 | * Ooo, nasty. We need here to frob 32-bit unsigned longs to |
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S index 627f3c28ad8c..2540786a970f 100644 --- a/arch/parisc/kernel/syscall_table.S +++ b/arch/parisc/kernel/syscall_table.S | |||
@@ -222,9 +222,7 @@ | |||
222 | ENTRY_SAME(setfsgid) | 222 | ENTRY_SAME(setfsgid) |
223 | /* I think this might work */ | 223 | /* I think this might work */ |
224 | ENTRY_SAME(llseek) /* 140 */ | 224 | ENTRY_SAME(llseek) /* 140 */ |
225 | /* struct linux_dirent has longs, like 'unsigned long d_ino' which | 225 | ENTRY_COMP(getdents) |
226 | * almost definitely should be 'ino_t d_ino' but it's too late now */ | ||
227 | ENTRY_DIFF(getdents) | ||
228 | /* it is POSSIBLE that select will be OK because even though fd_set | 226 | /* it is POSSIBLE that select will be OK because even though fd_set |
229 | * contains longs, the macros and sizes are clever. */ | 227 | * contains longs, the macros and sizes are clever. */ |
230 | ENTRY_COMP(select) | 228 | ENTRY_COMP(select) |
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S index d4e6a93c8d9a..ee7a16eb6fdd 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S | |||
@@ -81,6 +81,8 @@ SECTIONS | |||
81 | __ex_table : { *(__ex_table) } | 81 | __ex_table : { *(__ex_table) } |
82 | __stop___ex_table = .; | 82 | __stop___ex_table = .; |
83 | 83 | ||
84 | NOTES | ||
85 | |||
84 | __start___unwind = .; /* unwind info */ | 86 | __start___unwind = .; /* unwind info */ |
85 | .PARISC.unwind : { *(.PARISC.unwind) } | 87 | .PARISC.unwind : { *(.PARISC.unwind) } |
86 | __stop___unwind = .; | 88 | __stop___unwind = .; |
diff --git a/arch/powerpc/boot/dts/mpc8544ds.dts b/arch/powerpc/boot/dts/mpc8544ds.dts index 4680e2010887..3e79bf0a3159 100644 --- a/arch/powerpc/boot/dts/mpc8544ds.dts +++ b/arch/powerpc/boot/dts/mpc8544ds.dts | |||
@@ -44,8 +44,18 @@ | |||
44 | #size-cells = <1>; | 44 | #size-cells = <1>; |
45 | #interrupt-cells = <2>; | 45 | #interrupt-cells = <2>; |
46 | device_type = "soc"; | 46 | device_type = "soc"; |
47 | ranges = <0 e0000000 00100000>; | 47 | |
48 | reg = <e0000000 00100000>; // CCSRBAR 1M | 48 | |
49 | ranges = <00001000 e0001000 000ff000 | ||
50 | 80000000 80000000 20000000 | ||
51 | a0000000 a0000000 10000000 | ||
52 | b0000000 b0000000 00100000 | ||
53 | c0000000 c0000000 20000000 | ||
54 | b0100000 b0100000 00100000 | ||
55 | e1000000 e1000000 00010000 | ||
56 | e1010000 e1010000 00010000 | ||
57 | e1020000 e1020000 00010000>; | ||
58 | reg = <e0000000 00001000>; // CCSRBAR 1M | ||
49 | bus-frequency = <0>; // Filled out by uboot. | 59 | bus-frequency = <0>; // Filled out by uboot. |
50 | 60 | ||
51 | memory-controller@2000 { | 61 | memory-controller@2000 { |
@@ -161,8 +171,8 @@ | |||
161 | interrupt-parent = <&mpic>; | 171 | interrupt-parent = <&mpic>; |
162 | interrupts = <18 2>; | 172 | interrupts = <18 2>; |
163 | bus-range = <0 ff>; | 173 | bus-range = <0 ff>; |
164 | ranges = <02000000 0 80000000 80000000 0 10000000 | 174 | ranges = <02000000 0 c0000000 c0000000 0 20000000 |
165 | 01000000 0 00000000 e2000000 0 00800000>; | 175 | 01000000 0 00000000 e1000000 0 00010000>; |
166 | clock-frequency = <3f940aa>; | 176 | clock-frequency = <3f940aa>; |
167 | #interrupt-cells = <1>; | 177 | #interrupt-cells = <1>; |
168 | #size-cells = <2>; | 178 | #size-cells = <2>; |
@@ -178,8 +188,8 @@ | |||
178 | #address-cells = <3>; | 188 | #address-cells = <3>; |
179 | reg = <9000 1000>; | 189 | reg = <9000 1000>; |
180 | bus-range = <0 ff>; | 190 | bus-range = <0 ff>; |
181 | ranges = <02000000 0 90000000 90000000 0 10000000 | 191 | ranges = <02000000 0 80000000 80000000 0 20000000 |
182 | 01000000 0 00000000 e3000000 0 00800000>; | 192 | 01000000 0 00000000 e1010000 0 00010000>; |
183 | clock-frequency = <1fca055>; | 193 | clock-frequency = <1fca055>; |
184 | interrupt-parent = <&mpic>; | 194 | interrupt-parent = <&mpic>; |
185 | interrupts = <1a 2>; | 195 | interrupts = <1a 2>; |
@@ -202,7 +212,7 @@ | |||
202 | reg = <a000 1000>; | 212 | reg = <a000 1000>; |
203 | bus-range = <0 ff>; | 213 | bus-range = <0 ff>; |
204 | ranges = <02000000 0 a0000000 a0000000 0 10000000 | 214 | ranges = <02000000 0 a0000000 a0000000 0 10000000 |
205 | 01000000 0 00000000 e2800000 0 00800000>; | 215 | 01000000 0 00000000 e1020000 0 00010000>; |
206 | clock-frequency = <1fca055>; | 216 | clock-frequency = <1fca055>; |
207 | interrupt-parent = <&mpic>; | 217 | interrupt-parent = <&mpic>; |
208 | interrupts = <19 2>; | 218 | interrupts = <19 2>; |
@@ -224,49 +234,29 @@ | |||
224 | #address-cells = <3>; | 234 | #address-cells = <3>; |
225 | reg = <b000 1000>; | 235 | reg = <b000 1000>; |
226 | bus-range = <0 ff>; | 236 | bus-range = <0 ff>; |
227 | ranges = <02000000 0 b0000000 b0000000 0 10000000 | 237 | ranges = <02000000 0 b0000000 b0000000 0 00100000 |
228 | 01000000 0 00000000 e3800000 0 00800000>; | 238 | 01000000 0 00000000 b0100000 0 00100000>; |
229 | clock-frequency = <1fca055>; | 239 | clock-frequency = <1fca055>; |
230 | interrupt-parent = <&mpic>; | 240 | interrupt-parent = <&mpic>; |
231 | interrupts = <1b 2>; | 241 | interrupts = <1b 2>; |
232 | interrupt-map-mask = <f800 0 0 7>; | 242 | interrupt-map-mask = <fb00 0 0 0>; |
233 | interrupt-map = < | 243 | interrupt-map = < |
234 | |||
235 | // IDSEL 0x1a | ||
236 | d000 0 0 1 &i8259 6 2 | ||
237 | d000 0 0 2 &i8259 3 2 | ||
238 | d000 0 0 3 &i8259 4 2 | ||
239 | d000 0 0 4 &i8259 5 2 | ||
240 | |||
241 | // IDSEL 0x1b | ||
242 | d800 0 0 1 &i8259 5 2 | ||
243 | d800 0 0 2 &i8259 0 0 | ||
244 | d800 0 0 3 &i8259 0 0 | ||
245 | d800 0 0 4 &i8259 0 0 | ||
246 | |||
247 | // IDSEL 0x1c USB | 244 | // IDSEL 0x1c USB |
248 | e000 0 0 1 &i8259 9 2 | 245 | e000 0 0 0 &i8259 c 2 |
249 | e000 0 0 2 &i8259 a 2 | 246 | e100 0 0 0 &i8259 9 2 |
250 | e000 0 0 3 &i8259 c 2 | 247 | e200 0 0 0 &i8259 a 2 |
251 | e000 0 0 4 &i8259 7 2 | 248 | e300 0 0 0 &i8259 b 2 |
252 | 249 | ||
253 | // IDSEL 0x1d Audio | 250 | // IDSEL 0x1d Audio |
254 | e800 0 0 1 &i8259 9 2 | 251 | e800 0 0 0 &i8259 6 2 |
255 | e800 0 0 2 &i8259 a 2 | ||
256 | e800 0 0 3 &i8259 b 2 | ||
257 | e800 0 0 4 &i8259 0 0 | ||
258 | 252 | ||
259 | // IDSEL 0x1e Legacy | 253 | // IDSEL 0x1e Legacy |
260 | f000 0 0 1 &i8259 c 2 | 254 | f000 0 0 0 &i8259 7 2 |
261 | f000 0 0 2 &i8259 0 0 | 255 | f100 0 0 0 &i8259 7 2 |
262 | f000 0 0 3 &i8259 0 0 | ||
263 | f000 0 0 4 &i8259 0 0 | ||
264 | 256 | ||
265 | // IDSEL 0x1f IDE/SATA | 257 | // IDSEL 0x1f IDE/SATA |
266 | f800 0 0 1 &i8259 6 2 | 258 | f800 0 0 0 &i8259 e 2 |
267 | f800 0 0 2 &i8259 0 0 | 259 | f900 0 0 0 &i8259 5 2 |
268 | f800 0 0 3 &i8259 0 0 | ||
269 | f800 0 0 4 &i8259 0 0 | ||
270 | >; | 260 | >; |
271 | uli1575@0 { | 261 | uli1575@0 { |
272 | reg = <0 0 0 0 0>; | 262 | reg = <0 0 0 0 0>; |
@@ -274,10 +264,10 @@ | |||
274 | #address-cells = <3>; | 264 | #address-cells = <3>; |
275 | ranges = <02000000 0 b0000000 | 265 | ranges = <02000000 0 b0000000 |
276 | 02000000 0 b0000000 | 266 | 02000000 0 b0000000 |
277 | 0 10000000 | 267 | 0 00100000 |
278 | 01000000 0 00000000 | 268 | 01000000 0 00000000 |
279 | 01000000 0 00000000 | 269 | 01000000 0 00000000 |
280 | 0 00080000>; | 270 | 0 00100000>; |
281 | 271 | ||
282 | pci_bridge@0 { | 272 | pci_bridge@0 { |
283 | reg = <0 0 0 0 0>; | 273 | reg = <0 0 0 0 0>; |
@@ -285,10 +275,10 @@ | |||
285 | #address-cells = <3>; | 275 | #address-cells = <3>; |
286 | ranges = <02000000 0 b0000000 | 276 | ranges = <02000000 0 b0000000 |
287 | 02000000 0 b0000000 | 277 | 02000000 0 b0000000 |
288 | 0 20000000 | 278 | 0 00100000 |
289 | 01000000 0 00000000 | 279 | 01000000 0 00000000 |
290 | 01000000 0 00000000 | 280 | 01000000 0 00000000 |
291 | 0 00100000>; | 281 | 0 00100000>; |
292 | 282 | ||
293 | isa@1e { | 283 | isa@1e { |
294 | device_type = "isa"; | 284 | device_type = "isa"; |
@@ -296,7 +286,8 @@ | |||
296 | #size-cells = <1>; | 286 | #size-cells = <1>; |
297 | #address-cells = <2>; | 287 | #address-cells = <2>; |
298 | reg = <f000 0 0 0 0>; | 288 | reg = <f000 0 0 0 0>; |
299 | ranges = <1 0 01000000 0 0 | 289 | ranges = <1 0 |
290 | 01000000 0 0 | ||
300 | 00001000>; | 291 | 00001000>; |
301 | interrupt-parent = <&i8259>; | 292 | interrupt-parent = <&i8259>; |
302 | 293 | ||
@@ -312,8 +303,7 @@ | |||
312 | built-in; | 303 | built-in; |
313 | compatible = "chrp,iic"; | 304 | compatible = "chrp,iic"; |
314 | interrupts = <9 2>; | 305 | interrupts = <9 2>; |
315 | interrupt-parent = | 306 | interrupt-parent = <&mpic>; |
316 | <&mpic>; | ||
317 | }; | 307 | }; |
318 | 308 | ||
319 | i8042@60 { | 309 | i8042@60 { |
@@ -321,8 +311,7 @@ | |||
321 | #address-cells = <1>; | 311 | #address-cells = <1>; |
322 | reg = <1 60 1 1 64 1>; | 312 | reg = <1 60 1 1 64 1>; |
323 | interrupts = <1 3 c 3>; | 313 | interrupts = <1 3 c 3>; |
324 | interrupt-parent = | 314 | interrupt-parent = <&i8259>; |
325 | <&i8259>; | ||
326 | 315 | ||
327 | keyboard@0 { | 316 | keyboard@0 { |
328 | reg = <0>; | 317 | reg = <0>; |
@@ -336,8 +325,7 @@ | |||
336 | }; | 325 | }; |
337 | 326 | ||
338 | rtc@70 { | 327 | rtc@70 { |
339 | compatible = | 328 | compatible = "pnpPNP,b00"; |
340 | "pnpPNP,b00"; | ||
341 | reg = <1 70 2>; | 329 | reg = <1 70 2>; |
342 | }; | 330 | }; |
343 | 331 | ||
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts index 5d82709cfcbb..b0166e5c177e 100644 --- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts +++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts | |||
@@ -224,98 +224,36 @@ | |||
224 | clock-frequency = <1fca055>; | 224 | clock-frequency = <1fca055>; |
225 | interrupt-parent = <&mpic>; | 225 | interrupt-parent = <&mpic>; |
226 | interrupts = <18 2>; | 226 | interrupts = <18 2>; |
227 | interrupt-map-mask = <f800 0 0 7>; | 227 | interrupt-map-mask = <fb00 0 0 0>; |
228 | interrupt-map = < | 228 | interrupt-map = < |
229 | /* IDSEL 0x11 */ | 229 | /* IDSEL 0x11 */ |
230 | 8800 0 0 1 &i8259 3 2 | 230 | 8800 0 0 1 &i8259 9 2 |
231 | 8800 0 0 2 &i8259 4 2 | 231 | 8800 0 0 2 &i8259 a 2 |
232 | 8800 0 0 3 &i8259 5 2 | 232 | 8800 0 0 3 &i8259 b 2 |
233 | 8800 0 0 4 &i8259 6 2 | 233 | 8800 0 0 4 &i8259 c 2 |
234 | 234 | ||
235 | /* IDSEL 0x12 */ | 235 | /* IDSEL 0x12 */ |
236 | 9000 0 0 1 &i8259 4 2 | 236 | 9000 0 0 1 &i8259 a 2 |
237 | 9000 0 0 2 &i8259 5 2 | 237 | 9000 0 0 2 &i8259 b 2 |
238 | 9000 0 0 3 &i8259 6 2 | 238 | 9000 0 0 3 &i8259 c 2 |
239 | 9000 0 0 4 &i8259 3 2 | 239 | 9000 0 0 4 &i8259 9 2 |
240 | 240 | ||
241 | /* IDSEL 0x13 */ | 241 | // IDSEL 0x1c USB |
242 | 9800 0 0 1 &i8259 0 0 | 242 | e000 0 0 0 &i8259 c 2 |
243 | 9800 0 0 2 &i8259 0 0 | 243 | e100 0 0 0 &i8259 9 2 |
244 | 9800 0 0 3 &i8259 0 0 | 244 | e200 0 0 0 &i8259 a 2 |
245 | 9800 0 0 4 &i8259 0 0 | 245 | e300 0 0 0 &i8259 b 2 |
246 | 246 | ||
247 | /* IDSEL 0x14 */ | 247 | // IDSEL 0x1d Audio |
248 | a000 0 0 1 &i8259 0 0 | 248 | e800 0 0 0 &i8259 6 2 |
249 | a000 0 0 2 &i8259 0 0 | 249 | |
250 | a000 0 0 3 &i8259 0 0 | 250 | // IDSEL 0x1e Legacy |
251 | a000 0 0 4 &i8259 0 0 | 251 | f000 0 0 0 &i8259 7 2 |
252 | 252 | f100 0 0 0 &i8259 7 2 | |
253 | /* IDSEL 0x15 */ | 253 | |
254 | a800 0 0 1 &i8259 0 0 | 254 | // IDSEL 0x1f IDE/SATA |
255 | a800 0 0 2 &i8259 0 0 | 255 | f800 0 0 0 &i8259 e 2 |
256 | a800 0 0 3 &i8259 0 0 | 256 | f900 0 0 0 &i8259 5 2 |
257 | a800 0 0 4 &i8259 0 0 | ||
258 | |||
259 | /* IDSEL 0x16 */ | ||
260 | b000 0 0 1 &i8259 0 0 | ||
261 | b000 0 0 2 &i8259 0 0 | ||
262 | b000 0 0 3 &i8259 0 0 | ||
263 | b000 0 0 4 &i8259 0 0 | ||
264 | |||
265 | /* IDSEL 0x17 */ | ||
266 | b800 0 0 1 &i8259 0 0 | ||
267 | b800 0 0 2 &i8259 0 0 | ||
268 | b800 0 0 3 &i8259 0 0 | ||
269 | b800 0 0 4 &i8259 0 0 | ||
270 | |||
271 | /* IDSEL 0x18 */ | ||
272 | c000 0 0 1 &i8259 0 0 | ||
273 | c000 0 0 2 &i8259 0 0 | ||
274 | c000 0 0 3 &i8259 0 0 | ||
275 | c000 0 0 4 &i8259 0 0 | ||
276 | |||
277 | /* IDSEL 0x19 */ | ||
278 | c800 0 0 1 &i8259 0 0 | ||
279 | c800 0 0 2 &i8259 0 0 | ||
280 | c800 0 0 3 &i8259 0 0 | ||
281 | c800 0 0 4 &i8259 0 0 | ||
282 | |||
283 | /* IDSEL 0x1a */ | ||
284 | d000 0 0 1 &i8259 6 2 | ||
285 | d000 0 0 2 &i8259 3 2 | ||
286 | d000 0 0 3 &i8259 4 2 | ||
287 | d000 0 0 4 &i8259 5 2 | ||
288 | |||
289 | |||
290 | /* IDSEL 0x1b */ | ||
291 | d800 0 0 1 &i8259 5 2 | ||
292 | d800 0 0 2 &i8259 0 0 | ||
293 | d800 0 0 3 &i8259 0 0 | ||
294 | d800 0 0 4 &i8259 0 0 | ||
295 | |||
296 | /* IDSEL 0x1c */ | ||
297 | e000 0 0 1 &i8259 9 2 | ||
298 | e000 0 0 2 &i8259 a 2 | ||
299 | e000 0 0 3 &i8259 c 2 | ||
300 | e000 0 0 4 &i8259 7 2 | ||
301 | |||
302 | /* IDSEL 0x1d */ | ||
303 | e800 0 0 1 &i8259 9 2 | ||
304 | e800 0 0 2 &i8259 a 2 | ||
305 | e800 0 0 3 &i8259 b 2 | ||
306 | e800 0 0 4 &i8259 0 0 | ||
307 | |||
308 | /* IDSEL 0x1e */ | ||
309 | f000 0 0 1 &i8259 c 2 | ||
310 | f000 0 0 2 &i8259 0 0 | ||
311 | f000 0 0 3 &i8259 0 0 | ||
312 | f000 0 0 4 &i8259 0 0 | ||
313 | |||
314 | /* IDSEL 0x1f */ | ||
315 | f800 0 0 1 &i8259 6 2 | ||
316 | f800 0 0 2 &i8259 0 0 | ||
317 | f800 0 0 3 &i8259 0 0 | ||
318 | f800 0 0 4 &i8259 0 0 | ||
319 | >; | 257 | >; |
320 | uli1575@0 { | 258 | uli1575@0 { |
321 | reg = <0 0 0 0 0>; | 259 | reg = <0 0 0 0 0>; |
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig index d9ac24e8de16..8b47c846421c 100644 --- a/arch/powerpc/configs/cell_defconfig +++ b/arch/powerpc/configs/cell_defconfig | |||
@@ -1,9 +1,23 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.22-rc6 | 3 | # Linux kernel version: 2.6.23-rc3 |
4 | # Tue Jun 26 12:32:34 2007 | 4 | # Wed Aug 22 15:19:19 2007 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | |||
8 | # | ||
9 | # Processor support | ||
10 | # | ||
11 | # CONFIG_POWER4_ONLY is not set | ||
12 | CONFIG_POWER3=y | ||
13 | CONFIG_POWER4=y | ||
14 | CONFIG_PPC_FPU=y | ||
15 | CONFIG_ALTIVEC=y | ||
16 | CONFIG_PPC_STD_MMU=y | ||
17 | CONFIG_PPC_MM_SLICES=y | ||
18 | CONFIG_VIRT_CPU_ACCOUNTING=y | ||
19 | CONFIG_SMP=y | ||
20 | CONFIG_NR_CPUS=4 | ||
7 | CONFIG_64BIT=y | 21 | CONFIG_64BIT=y |
8 | CONFIG_PPC_MERGE=y | 22 | CONFIG_PPC_MERGE=y |
9 | CONFIG_MMU=y | 23 | CONFIG_MMU=y |
@@ -15,6 +29,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y | |||
15 | CONFIG_GENERIC_HWEIGHT=y | 29 | CONFIG_GENERIC_HWEIGHT=y |
16 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 30 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
17 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 31 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
32 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | ||
18 | CONFIG_PPC=y | 33 | CONFIG_PPC=y |
19 | CONFIG_EARLY_PRINTK=y | 34 | CONFIG_EARLY_PRINTK=y |
20 | CONFIG_COMPAT=y | 35 | CONFIG_COMPAT=y |
@@ -22,51 +37,33 @@ CONFIG_SYSVIPC_COMPAT=y | |||
22 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 37 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
23 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 38 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
24 | CONFIG_PPC_OF=y | 39 | CONFIG_PPC_OF=y |
40 | CONFIG_OF=y | ||
25 | CONFIG_PPC_UDBG_16550=y | 41 | CONFIG_PPC_UDBG_16550=y |
26 | # CONFIG_GENERIC_TBSYNC is not set | 42 | # CONFIG_GENERIC_TBSYNC is not set |
27 | CONFIG_AUDIT_ARCH=y | 43 | CONFIG_AUDIT_ARCH=y |
28 | CONFIG_GENERIC_BUG=y | 44 | CONFIG_GENERIC_BUG=y |
29 | # CONFIG_DEFAULT_UIMAGE is not set | 45 | # CONFIG_DEFAULT_UIMAGE is not set |
30 | |||
31 | # | ||
32 | # Processor support | ||
33 | # | ||
34 | # CONFIG_POWER4_ONLY is not set | ||
35 | CONFIG_POWER3=y | ||
36 | CONFIG_POWER4=y | ||
37 | CONFIG_PPC_FPU=y | ||
38 | # CONFIG_PPC_DCR_NATIVE is not set | 46 | # CONFIG_PPC_DCR_NATIVE is not set |
39 | CONFIG_PPC_DCR_MMIO=y | 47 | CONFIG_PPC_DCR_MMIO=y |
40 | CONFIG_PPC_DCR=y | 48 | CONFIG_PPC_DCR=y |
41 | CONFIG_PPC_OF_PLATFORM_PCI=y | 49 | CONFIG_PPC_OF_PLATFORM_PCI=y |
42 | CONFIG_ALTIVEC=y | ||
43 | CONFIG_PPC_STD_MMU=y | ||
44 | CONFIG_PPC_MM_SLICES=y | ||
45 | CONFIG_VIRT_CPU_ACCOUNTING=y | ||
46 | CONFIG_SMP=y | ||
47 | CONFIG_NR_CPUS=4 | ||
48 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 50 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
49 | 51 | ||
50 | # | 52 | # |
51 | # Code maturity level options | 53 | # General setup |
52 | # | 54 | # |
53 | CONFIG_EXPERIMENTAL=y | 55 | CONFIG_EXPERIMENTAL=y |
54 | CONFIG_LOCK_KERNEL=y | 56 | CONFIG_LOCK_KERNEL=y |
55 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 57 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
56 | |||
57 | # | ||
58 | # General setup | ||
59 | # | ||
60 | CONFIG_LOCALVERSION="" | 58 | CONFIG_LOCALVERSION="" |
61 | CONFIG_LOCALVERSION_AUTO=y | 59 | CONFIG_LOCALVERSION_AUTO=y |
62 | CONFIG_SWAP=y | 60 | CONFIG_SWAP=y |
63 | CONFIG_SYSVIPC=y | 61 | CONFIG_SYSVIPC=y |
64 | # CONFIG_IPC_NS is not set | ||
65 | CONFIG_SYSVIPC_SYSCTL=y | 62 | CONFIG_SYSVIPC_SYSCTL=y |
66 | # CONFIG_POSIX_MQUEUE is not set | 63 | # CONFIG_POSIX_MQUEUE is not set |
67 | # CONFIG_BSD_PROCESS_ACCT is not set | 64 | # CONFIG_BSD_PROCESS_ACCT is not set |
68 | # CONFIG_TASKSTATS is not set | 65 | # CONFIG_TASKSTATS is not set |
69 | # CONFIG_UTS_NS is not set | 66 | # CONFIG_USER_NS is not set |
70 | # CONFIG_AUDIT is not set | 67 | # CONFIG_AUDIT is not set |
71 | CONFIG_IKCONFIG=y | 68 | CONFIG_IKCONFIG=y |
72 | CONFIG_IKCONFIG_PROC=y | 69 | CONFIG_IKCONFIG_PROC=y |
@@ -96,16 +93,13 @@ CONFIG_TIMERFD=y | |||
96 | CONFIG_EVENTFD=y | 93 | CONFIG_EVENTFD=y |
97 | CONFIG_SHMEM=y | 94 | CONFIG_SHMEM=y |
98 | CONFIG_VM_EVENT_COUNTERS=y | 95 | CONFIG_VM_EVENT_COUNTERS=y |
99 | CONFIG_SLAB=y | 96 | CONFIG_SLUB_DEBUG=y |
100 | # CONFIG_SLUB is not set | 97 | # CONFIG_SLAB is not set |
98 | CONFIG_SLUB=y | ||
101 | # CONFIG_SLOB is not set | 99 | # CONFIG_SLOB is not set |
102 | CONFIG_RT_MUTEXES=y | 100 | CONFIG_RT_MUTEXES=y |
103 | # CONFIG_TINY_SHMEM is not set | 101 | # CONFIG_TINY_SHMEM is not set |
104 | CONFIG_BASE_SMALL=0 | 102 | CONFIG_BASE_SMALL=0 |
105 | |||
106 | # | ||
107 | # Loadable module support | ||
108 | # | ||
109 | CONFIG_MODULES=y | 103 | CONFIG_MODULES=y |
110 | CONFIG_MODULE_UNLOAD=y | 104 | CONFIG_MODULE_UNLOAD=y |
111 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 105 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
@@ -113,12 +107,9 @@ CONFIG_MODULE_UNLOAD=y | |||
113 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 107 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
114 | CONFIG_KMOD=y | 108 | CONFIG_KMOD=y |
115 | CONFIG_STOP_MACHINE=y | 109 | CONFIG_STOP_MACHINE=y |
116 | |||
117 | # | ||
118 | # Block layer | ||
119 | # | ||
120 | CONFIG_BLOCK=y | 110 | CONFIG_BLOCK=y |
121 | # CONFIG_BLK_DEV_IO_TRACE is not set | 111 | # CONFIG_BLK_DEV_IO_TRACE is not set |
112 | # CONFIG_BLK_DEV_BSG is not set | ||
122 | 113 | ||
123 | # | 114 | # |
124 | # IO Schedulers | 115 | # IO Schedulers |
@@ -138,7 +129,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
138 | # | 129 | # |
139 | CONFIG_PPC_MULTIPLATFORM=y | 130 | CONFIG_PPC_MULTIPLATFORM=y |
140 | # CONFIG_EMBEDDED6xx is not set | 131 | # CONFIG_EMBEDDED6xx is not set |
141 | # CONFIG_APUS is not set | 132 | # CONFIG_PPC_82xx is not set |
133 | # CONFIG_PPC_83xx is not set | ||
134 | # CONFIG_PPC_86xx is not set | ||
142 | # CONFIG_PPC_PSERIES is not set | 135 | # CONFIG_PPC_PSERIES is not set |
143 | # CONFIG_PPC_ISERIES is not set | 136 | # CONFIG_PPC_ISERIES is not set |
144 | # CONFIG_PPC_MPC52xx is not set | 137 | # CONFIG_PPC_MPC52xx is not set |
@@ -158,7 +151,11 @@ CONFIG_PS3_HTAB_SIZE=20 | |||
158 | CONFIG_PS3_USE_LPAR_ADDR=y | 151 | CONFIG_PS3_USE_LPAR_ADDR=y |
159 | CONFIG_PS3_VUART=y | 152 | CONFIG_PS3_VUART=y |
160 | CONFIG_PS3_PS3AV=y | 153 | CONFIG_PS3_PS3AV=y |
161 | CONFIG_PS3_SYS_MANAGER=y | 154 | CONFIG_PS3_SYS_MANAGER=m |
155 | CONFIG_PS3_STORAGE=y | ||
156 | CONFIG_PS3_DISK=y | ||
157 | CONFIG_PS3_ROM=m | ||
158 | CONFIG_PS3_FLASH=m | ||
162 | CONFIG_PPC_CELL=y | 159 | CONFIG_PPC_CELL=y |
163 | CONFIG_PPC_CELL_NATIVE=y | 160 | CONFIG_PPC_CELL_NATIVE=y |
164 | CONFIG_PPC_IBM_CELL_BLADE=y | 161 | CONFIG_PPC_IBM_CELL_BLADE=y |
@@ -171,6 +168,7 @@ CONFIG_SPU_BASE=y | |||
171 | CONFIG_CBE_RAS=y | 168 | CONFIG_CBE_RAS=y |
172 | CONFIG_CBE_THERM=m | 169 | CONFIG_CBE_THERM=m |
173 | CONFIG_CBE_CPUFREQ=m | 170 | CONFIG_CBE_CPUFREQ=m |
171 | CONFIG_CBE_CPUFREQ_PMI=m | ||
174 | # CONFIG_PQ2ADS is not set | 172 | # CONFIG_PQ2ADS is not set |
175 | CONFIG_PPC_NATIVE=y | 173 | CONFIG_PPC_NATIVE=y |
176 | CONFIG_UDBG_RTAS_CONSOLE=y | 174 | CONFIG_UDBG_RTAS_CONSOLE=y |
@@ -183,7 +181,7 @@ CONFIG_PPC_RTAS=y | |||
183 | # CONFIG_RTAS_ERROR_LOGGING is not set | 181 | # CONFIG_RTAS_ERROR_LOGGING is not set |
184 | CONFIG_RTAS_PROC=y | 182 | CONFIG_RTAS_PROC=y |
185 | CONFIG_RTAS_FLASH=y | 183 | CONFIG_RTAS_FLASH=y |
186 | # CONFIG_PPC_PMI is not set | 184 | CONFIG_PPC_PMI=m |
187 | CONFIG_MMIO_NVRAM=y | 185 | CONFIG_MMIO_NVRAM=y |
188 | # CONFIG_PPC_MPC106 is not set | 186 | # CONFIG_PPC_MPC106 is not set |
189 | # CONFIG_PPC_970_NAP is not set | 187 | # CONFIG_PPC_970_NAP is not set |
@@ -206,6 +204,8 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y | |||
206 | # CPU Frequency drivers | 204 | # CPU Frequency drivers |
207 | # | 205 | # |
208 | # CONFIG_CPM2 is not set | 206 | # CONFIG_CPM2 is not set |
207 | CONFIG_AXON_RAM=m | ||
208 | # CONFIG_FSL_ULI1575 is not set | ||
209 | 209 | ||
210 | # | 210 | # |
211 | # Kernel options | 211 | # Kernel options |
@@ -248,6 +248,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
248 | CONFIG_MIGRATION=y | 248 | CONFIG_MIGRATION=y |
249 | CONFIG_RESOURCES_64BIT=y | 249 | CONFIG_RESOURCES_64BIT=y |
250 | CONFIG_ZONE_DMA_FLAG=1 | 250 | CONFIG_ZONE_DMA_FLAG=1 |
251 | CONFIG_BOUNCE=y | ||
251 | CONFIG_ARCH_MEMORY_PROBE=y | 252 | CONFIG_ARCH_MEMORY_PROBE=y |
252 | CONFIG_NODES_SPAN_OTHER_NODES=y | 253 | CONFIG_NODES_SPAN_OTHER_NODES=y |
253 | CONFIG_PPC_HAS_HASH_64K=y | 254 | CONFIG_PPC_HAS_HASH_64K=y |
@@ -268,7 +269,9 @@ CONFIG_GENERIC_ISA_DMA=y | |||
268 | # CONFIG_PPC_INDIRECT_PCI is not set | 269 | # CONFIG_PPC_INDIRECT_PCI is not set |
269 | CONFIG_PCI=y | 270 | CONFIG_PCI=y |
270 | CONFIG_PCI_DOMAINS=y | 271 | CONFIG_PCI_DOMAINS=y |
272 | CONFIG_PCI_SYSCALL=y | ||
271 | CONFIG_PCIEPORTBUS=y | 273 | CONFIG_PCIEPORTBUS=y |
274 | CONFIG_PCIEAER=y | ||
272 | CONFIG_ARCH_SUPPORTS_MSI=y | 275 | CONFIG_ARCH_SUPPORTS_MSI=y |
273 | # CONFIG_PCI_MSI is not set | 276 | # CONFIG_PCI_MSI is not set |
274 | # CONFIG_PCI_DEBUG is not set | 277 | # CONFIG_PCI_DEBUG is not set |
@@ -359,6 +362,7 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m | |||
359 | CONFIG_NETFILTER_XT_TARGET_MARK=m | 362 | CONFIG_NETFILTER_XT_TARGET_MARK=m |
360 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | 363 | CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m |
361 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | 364 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m |
365 | # CONFIG_NETFILTER_XT_TARGET_TRACE is not set | ||
362 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | 366 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m |
363 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m | 367 | CONFIG_NETFILTER_XT_MATCH_COMMENT=m |
364 | CONFIG_NETFILTER_XT_MATCH_DCCP=m | 368 | CONFIG_NETFILTER_XT_MATCH_DCCP=m |
@@ -377,6 +381,7 @@ CONFIG_NETFILTER_XT_MATCH_SCTP=m | |||
377 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m | 381 | CONFIG_NETFILTER_XT_MATCH_STATISTIC=m |
378 | CONFIG_NETFILTER_XT_MATCH_STRING=m | 382 | CONFIG_NETFILTER_XT_MATCH_STRING=m |
379 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m | 383 | CONFIG_NETFILTER_XT_MATCH_TCPMSS=m |
384 | CONFIG_NETFILTER_XT_MATCH_U32=m | ||
380 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m | 385 | CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m |
381 | 386 | ||
382 | # | 387 | # |
@@ -448,6 +453,7 @@ CONFIG_NET_CLS_ROUTE=y | |||
448 | # CONFIG_MAC80211 is not set | 453 | # CONFIG_MAC80211 is not set |
449 | # CONFIG_IEEE80211 is not set | 454 | # CONFIG_IEEE80211 is not set |
450 | # CONFIG_RFKILL is not set | 455 | # CONFIG_RFKILL is not set |
456 | # CONFIG_NET_9P is not set | ||
451 | 457 | ||
452 | # | 458 | # |
453 | # Device Drivers | 459 | # Device Drivers |
@@ -462,28 +468,12 @@ CONFIG_FW_LOADER=y | |||
462 | # CONFIG_DEBUG_DRIVER is not set | 468 | # CONFIG_DEBUG_DRIVER is not set |
463 | # CONFIG_DEBUG_DEVRES is not set | 469 | # CONFIG_DEBUG_DEVRES is not set |
464 | # CONFIG_SYS_HYPERVISOR is not set | 470 | # CONFIG_SYS_HYPERVISOR is not set |
465 | |||
466 | # | ||
467 | # Connector - unified userspace <-> kernelspace linker | ||
468 | # | ||
469 | # CONFIG_CONNECTOR is not set | 471 | # CONFIG_CONNECTOR is not set |
470 | # CONFIG_MTD is not set | 472 | # CONFIG_MTD is not set |
471 | 473 | CONFIG_OF_DEVICE=y | |
472 | # | ||
473 | # Parallel port support | ||
474 | # | ||
475 | # CONFIG_PARPORT is not set | 474 | # CONFIG_PARPORT is not set |
476 | 475 | CONFIG_BLK_DEV=y | |
477 | # | ||
478 | # Plug and Play support | ||
479 | # | ||
480 | # CONFIG_PNPACPI is not set | ||
481 | |||
482 | # | ||
483 | # Block devices | ||
484 | # | ||
485 | # CONFIG_BLK_DEV_FD is not set | 476 | # CONFIG_BLK_DEV_FD is not set |
486 | # CONFIG_BLK_CPQ_DA is not set | ||
487 | # CONFIG_BLK_CPQ_CISS_DA is not set | 477 | # CONFIG_BLK_CPQ_CISS_DA is not set |
488 | # CONFIG_BLK_DEV_DAC960 is not set | 478 | # CONFIG_BLK_DEV_DAC960 is not set |
489 | # CONFIG_BLK_DEV_UMEM is not set | 479 | # CONFIG_BLK_DEV_UMEM is not set |
@@ -499,14 +489,11 @@ CONFIG_BLK_DEV_RAM_SIZE=131072 | |||
499 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 489 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
500 | # CONFIG_CDROM_PKTCDVD is not set | 490 | # CONFIG_CDROM_PKTCDVD is not set |
501 | # CONFIG_ATA_OVER_ETH is not set | 491 | # CONFIG_ATA_OVER_ETH is not set |
502 | 492 | CONFIG_MISC_DEVICES=y | |
503 | # | ||
504 | # Misc devices | ||
505 | # | ||
506 | # CONFIG_PHANTOM is not set | 493 | # CONFIG_PHANTOM is not set |
494 | # CONFIG_EEPROM_93CX6 is not set | ||
507 | # CONFIG_SGI_IOC4 is not set | 495 | # CONFIG_SGI_IOC4 is not set |
508 | # CONFIG_TIFM_CORE is not set | 496 | # CONFIG_TIFM_CORE is not set |
509 | # CONFIG_BLINK is not set | ||
510 | CONFIG_IDE=y | 497 | CONFIG_IDE=y |
511 | CONFIG_BLK_DEV_IDE=y | 498 | CONFIG_BLK_DEV_IDE=y |
512 | 499 | ||
@@ -572,6 +559,7 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
572 | # | 559 | # |
573 | # CONFIG_RAID_ATTRS is not set | 560 | # CONFIG_RAID_ATTRS is not set |
574 | CONFIG_SCSI=y | 561 | CONFIG_SCSI=y |
562 | CONFIG_SCSI_DMA=y | ||
575 | # CONFIG_SCSI_TGT is not set | 563 | # CONFIG_SCSI_TGT is not set |
576 | # CONFIG_SCSI_NETLINK is not set | 564 | # CONFIG_SCSI_NETLINK is not set |
577 | CONFIG_SCSI_PROC_FS=y | 565 | CONFIG_SCSI_PROC_FS=y |
@@ -604,10 +592,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
604 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 592 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
605 | CONFIG_SCSI_SAS_ATTRS=y | 593 | CONFIG_SCSI_SAS_ATTRS=y |
606 | # CONFIG_SCSI_SAS_LIBSAS is not set | 594 | # CONFIG_SCSI_SAS_LIBSAS is not set |
607 | 595 | CONFIG_SCSI_LOWLEVEL=y | |
608 | # | ||
609 | # SCSI low-level drivers | ||
610 | # | ||
611 | # CONFIG_ISCSI_TCP is not set | 596 | # CONFIG_ISCSI_TCP is not set |
612 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 597 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
613 | # CONFIG_SCSI_3W_9XXX is not set | 598 | # CONFIG_SCSI_3W_9XXX is not set |
@@ -622,7 +607,6 @@ CONFIG_SCSI_SAS_ATTRS=y | |||
622 | # CONFIG_MEGARAID_LEGACY is not set | 607 | # CONFIG_MEGARAID_LEGACY is not set |
623 | # CONFIG_MEGARAID_SAS is not set | 608 | # CONFIG_MEGARAID_SAS is not set |
624 | # CONFIG_SCSI_HPTIOP is not set | 609 | # CONFIG_SCSI_HPTIOP is not set |
625 | # CONFIG_SCSI_BUSLOGIC is not set | ||
626 | # CONFIG_SCSI_DMX3191D is not set | 610 | # CONFIG_SCSI_DMX3191D is not set |
627 | # CONFIG_SCSI_EATA is not set | 611 | # CONFIG_SCSI_EATA is not set |
628 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 612 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
@@ -696,10 +680,6 @@ CONFIG_PATA_PDC2027X=m | |||
696 | # CONFIG_PATA_VIA is not set | 680 | # CONFIG_PATA_VIA is not set |
697 | # CONFIG_PATA_WINBOND is not set | 681 | # CONFIG_PATA_WINBOND is not set |
698 | # CONFIG_PATA_SCC is not set | 682 | # CONFIG_PATA_SCC is not set |
699 | |||
700 | # | ||
701 | # Multi-device support (RAID and LVM) | ||
702 | # | ||
703 | CONFIG_MD=y | 683 | CONFIG_MD=y |
704 | CONFIG_BLK_DEV_MD=m | 684 | CONFIG_BLK_DEV_MD=m |
705 | CONFIG_MD_LINEAR=m | 685 | CONFIG_MD_LINEAR=m |
@@ -717,6 +697,7 @@ CONFIG_DM_MIRROR=m | |||
717 | CONFIG_DM_ZERO=m | 697 | CONFIG_DM_ZERO=m |
718 | CONFIG_DM_MULTIPATH=m | 698 | CONFIG_DM_MULTIPATH=m |
719 | # CONFIG_DM_MULTIPATH_EMC is not set | 699 | # CONFIG_DM_MULTIPATH_EMC is not set |
700 | # CONFIG_DM_MULTIPATH_RDAC is not set | ||
720 | # CONFIG_DM_DELAY is not set | 701 | # CONFIG_DM_DELAY is not set |
721 | 702 | ||
722 | # | 703 | # |
@@ -728,43 +709,30 @@ CONFIG_FUSION=y | |||
728 | CONFIG_FUSION_SAS=y | 709 | CONFIG_FUSION_SAS=y |
729 | CONFIG_FUSION_MAX_SGE=128 | 710 | CONFIG_FUSION_MAX_SGE=128 |
730 | # CONFIG_FUSION_CTL is not set | 711 | # CONFIG_FUSION_CTL is not set |
712 | # CONFIG_FUSION_LOGGING is not set | ||
731 | 713 | ||
732 | # | 714 | # |
733 | # IEEE 1394 (FireWire) support | 715 | # IEEE 1394 (FireWire) support |
734 | # | 716 | # |
735 | # CONFIG_FIREWIRE is not set | 717 | # CONFIG_FIREWIRE is not set |
736 | # CONFIG_IEEE1394 is not set | 718 | # CONFIG_IEEE1394 is not set |
737 | |||
738 | # | ||
739 | # I2O device support | ||
740 | # | ||
741 | # CONFIG_I2O is not set | 719 | # CONFIG_I2O is not set |
742 | # CONFIG_MACINTOSH_DRIVERS is not set | 720 | # CONFIG_MACINTOSH_DRIVERS is not set |
743 | |||
744 | # | ||
745 | # Network device support | ||
746 | # | ||
747 | CONFIG_NETDEVICES=y | 721 | CONFIG_NETDEVICES=y |
722 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
748 | # CONFIG_DUMMY is not set | 723 | # CONFIG_DUMMY is not set |
749 | CONFIG_BONDING=m | 724 | CONFIG_BONDING=m |
725 | CONFIG_MACVLAN=m | ||
750 | # CONFIG_EQUALIZER is not set | 726 | # CONFIG_EQUALIZER is not set |
751 | CONFIG_TUN=y | 727 | CONFIG_TUN=y |
752 | # CONFIG_ARCNET is not set | 728 | # CONFIG_ARCNET is not set |
753 | # CONFIG_PHYLIB is not set | 729 | # CONFIG_PHYLIB is not set |
754 | |||
755 | # | ||
756 | # Ethernet (10 or 100Mbit) | ||
757 | # | ||
758 | CONFIG_NET_ETHERNET=y | 730 | CONFIG_NET_ETHERNET=y |
759 | CONFIG_MII=y | 731 | CONFIG_MII=y |
760 | # CONFIG_HAPPYMEAL is not set | 732 | # CONFIG_HAPPYMEAL is not set |
761 | # CONFIG_SUNGEM is not set | 733 | # CONFIG_SUNGEM is not set |
762 | # CONFIG_CASSINI is not set | 734 | # CONFIG_CASSINI is not set |
763 | # CONFIG_NET_VENDOR_3COM is not set | 735 | # CONFIG_NET_VENDOR_3COM is not set |
764 | |||
765 | # | ||
766 | # Tulip family network device support | ||
767 | # | ||
768 | # CONFIG_NET_TULIP is not set | 736 | # CONFIG_NET_TULIP is not set |
769 | # CONFIG_HP100 is not set | 737 | # CONFIG_HP100 is not set |
770 | # CONFIG_NET_PCI is not set | 738 | # CONFIG_NET_PCI is not set |
@@ -781,11 +749,12 @@ CONFIG_E1000_NAPI=y | |||
781 | # CONFIG_SIS190 is not set | 749 | # CONFIG_SIS190 is not set |
782 | CONFIG_SKGE=m | 750 | CONFIG_SKGE=m |
783 | CONFIG_SKY2=m | 751 | CONFIG_SKY2=m |
784 | # CONFIG_SK98LIN is not set | 752 | # CONFIG_SKY2_DEBUG is not set |
785 | # CONFIG_VIA_VELOCITY is not set | 753 | # CONFIG_VIA_VELOCITY is not set |
786 | CONFIG_TIGON3=y | 754 | CONFIG_TIGON3=y |
787 | # CONFIG_BNX2 is not set | 755 | # CONFIG_BNX2 is not set |
788 | CONFIG_SPIDER_NET=y | 756 | CONFIG_SPIDER_NET=y |
757 | CONFIG_GELIC_NET=m | ||
789 | # CONFIG_QLA3XXX is not set | 758 | # CONFIG_QLA3XXX is not set |
790 | # CONFIG_ATL1 is not set | 759 | # CONFIG_ATL1 is not set |
791 | CONFIG_NETDEV_10000=y | 760 | CONFIG_NETDEV_10000=y |
@@ -824,15 +793,7 @@ CONFIG_NETDEV_10000=y | |||
824 | # CONFIG_NETCONSOLE is not set | 793 | # CONFIG_NETCONSOLE is not set |
825 | # CONFIG_NETPOLL is not set | 794 | # CONFIG_NETPOLL is not set |
826 | # CONFIG_NET_POLL_CONTROLLER is not set | 795 | # CONFIG_NET_POLL_CONTROLLER is not set |
827 | |||
828 | # | ||
829 | # ISDN subsystem | ||
830 | # | ||
831 | # CONFIG_ISDN is not set | 796 | # CONFIG_ISDN is not set |
832 | |||
833 | # | ||
834 | # Telephony Support | ||
835 | # | ||
836 | # CONFIG_PHONE is not set | 797 | # CONFIG_PHONE is not set |
837 | 798 | ||
838 | # | 799 | # |
@@ -925,10 +886,6 @@ CONFIG_UNIX98_PTYS=y | |||
925 | CONFIG_HVC_DRIVER=y | 886 | CONFIG_HVC_DRIVER=y |
926 | CONFIG_HVC_RTAS=y | 887 | CONFIG_HVC_RTAS=y |
927 | CONFIG_HVC_BEAT=y | 888 | CONFIG_HVC_BEAT=y |
928 | |||
929 | # | ||
930 | # IPMI | ||
931 | # | ||
932 | CONFIG_IPMI_HANDLER=m | 889 | CONFIG_IPMI_HANDLER=m |
933 | # CONFIG_IPMI_PANIC_EVENT is not set | 890 | # CONFIG_IPMI_PANIC_EVENT is not set |
934 | CONFIG_IPMI_DEVICE_INTERFACE=m | 891 | CONFIG_IPMI_DEVICE_INTERFACE=m |
@@ -963,10 +920,6 @@ CONFIG_GEN_RTC=y | |||
963 | # CONFIG_DRM is not set | 920 | # CONFIG_DRM is not set |
964 | # CONFIG_RAW_DRIVER is not set | 921 | # CONFIG_RAW_DRIVER is not set |
965 | # CONFIG_HANGCHECK_TIMER is not set | 922 | # CONFIG_HANGCHECK_TIMER is not set |
966 | |||
967 | # | ||
968 | # TPM devices | ||
969 | # | ||
970 | # CONFIG_TCG_TPM is not set | 923 | # CONFIG_TCG_TPM is not set |
971 | CONFIG_DEVPORT=y | 924 | CONFIG_DEVPORT=y |
972 | CONFIG_I2C=y | 925 | CONFIG_I2C=y |
@@ -1000,6 +953,7 @@ CONFIG_I2C_ALGOBIT=y | |||
1000 | # CONFIG_I2C_SIS5595 is not set | 953 | # CONFIG_I2C_SIS5595 is not set |
1001 | # CONFIG_I2C_SIS630 is not set | 954 | # CONFIG_I2C_SIS630 is not set |
1002 | # CONFIG_I2C_SIS96X is not set | 955 | # CONFIG_I2C_SIS96X is not set |
956 | # CONFIG_I2C_TAOS_EVM is not set | ||
1003 | # CONFIG_I2C_STUB is not set | 957 | # CONFIG_I2C_STUB is not set |
1004 | # CONFIG_I2C_TINY_USB is not set | 958 | # CONFIG_I2C_TINY_USB is not set |
1005 | # CONFIG_I2C_VIA is not set | 959 | # CONFIG_I2C_VIA is not set |
@@ -1011,11 +965,13 @@ CONFIG_I2C_ALGOBIT=y | |||
1011 | # | 965 | # |
1012 | # CONFIG_SENSORS_DS1337 is not set | 966 | # CONFIG_SENSORS_DS1337 is not set |
1013 | # CONFIG_SENSORS_DS1374 is not set | 967 | # CONFIG_SENSORS_DS1374 is not set |
968 | # CONFIG_DS1682 is not set | ||
1014 | # CONFIG_SENSORS_EEPROM is not set | 969 | # CONFIG_SENSORS_EEPROM is not set |
1015 | # CONFIG_SENSORS_PCF8574 is not set | 970 | # CONFIG_SENSORS_PCF8574 is not set |
1016 | # CONFIG_SENSORS_PCA9539 is not set | 971 | # CONFIG_SENSORS_PCA9539 is not set |
1017 | # CONFIG_SENSORS_PCF8591 is not set | 972 | # CONFIG_SENSORS_PCF8591 is not set |
1018 | # CONFIG_SENSORS_MAX6875 is not set | 973 | # CONFIG_SENSORS_MAX6875 is not set |
974 | # CONFIG_SENSORS_TSL2550 is not set | ||
1019 | # CONFIG_I2C_DEBUG_CORE is not set | 975 | # CONFIG_I2C_DEBUG_CORE is not set |
1020 | # CONFIG_I2C_DEBUG_ALGO is not set | 976 | # CONFIG_I2C_DEBUG_ALGO is not set |
1021 | # CONFIG_I2C_DEBUG_BUS is not set | 977 | # CONFIG_I2C_DEBUG_BUS is not set |
@@ -1026,11 +982,8 @@ CONFIG_I2C_ALGOBIT=y | |||
1026 | # | 982 | # |
1027 | # CONFIG_SPI is not set | 983 | # CONFIG_SPI is not set |
1028 | # CONFIG_SPI_MASTER is not set | 984 | # CONFIG_SPI_MASTER is not set |
1029 | |||
1030 | # | ||
1031 | # Dallas's 1-wire bus | ||
1032 | # | ||
1033 | # CONFIG_W1 is not set | 985 | # CONFIG_W1 is not set |
986 | # CONFIG_POWER_SUPPLY is not set | ||
1034 | # CONFIG_HWMON is not set | 987 | # CONFIG_HWMON is not set |
1035 | 988 | ||
1036 | # | 989 | # |
@@ -1055,6 +1008,7 @@ CONFIG_I2C_ALGOBIT=y | |||
1055 | # | 1008 | # |
1056 | # CONFIG_DISPLAY_SUPPORT is not set | 1009 | # CONFIG_DISPLAY_SUPPORT is not set |
1057 | # CONFIG_VGASTATE is not set | 1010 | # CONFIG_VGASTATE is not set |
1011 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
1058 | # CONFIG_FB is not set | 1012 | # CONFIG_FB is not set |
1059 | # CONFIG_FB_IBM_GXT4500 is not set | 1013 | # CONFIG_FB_IBM_GXT4500 is not set |
1060 | 1014 | ||
@@ -1068,10 +1022,7 @@ CONFIG_DUMMY_CONSOLE=y | |||
1068 | # Sound | 1022 | # Sound |
1069 | # | 1023 | # |
1070 | # CONFIG_SOUND is not set | 1024 | # CONFIG_SOUND is not set |
1071 | 1025 | CONFIG_HID_SUPPORT=y | |
1072 | # | ||
1073 | # HID Devices | ||
1074 | # | ||
1075 | CONFIG_HID=m | 1026 | CONFIG_HID=m |
1076 | # CONFIG_HID_DEBUG is not set | 1027 | # CONFIG_HID_DEBUG is not set |
1077 | 1028 | ||
@@ -1085,10 +1036,7 @@ CONFIG_HID=m | |||
1085 | # | 1036 | # |
1086 | # CONFIG_USB_KBD is not set | 1037 | # CONFIG_USB_KBD is not set |
1087 | # CONFIG_USB_MOUSE is not set | 1038 | # CONFIG_USB_MOUSE is not set |
1088 | 1039 | CONFIG_USB_SUPPORT=y | |
1089 | # | ||
1090 | # USB support | ||
1091 | # | ||
1092 | CONFIG_USB_ARCH_HAS_HCD=y | 1040 | CONFIG_USB_ARCH_HAS_HCD=y |
1093 | CONFIG_USB_ARCH_HAS_OHCI=y | 1041 | CONFIG_USB_ARCH_HAS_OHCI=y |
1094 | CONFIG_USB_ARCH_HAS_EHCI=y | 1042 | CONFIG_USB_ARCH_HAS_EHCI=y |
@@ -1122,6 +1070,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y | |||
1122 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | 1070 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y |
1123 | # CONFIG_USB_UHCI_HCD is not set | 1071 | # CONFIG_USB_UHCI_HCD is not set |
1124 | # CONFIG_USB_SL811_HCD is not set | 1072 | # CONFIG_USB_SL811_HCD is not set |
1073 | # CONFIG_USB_R8A66597_HCD is not set | ||
1125 | 1074 | ||
1126 | # | 1075 | # |
1127 | # USB Device Class drivers | 1076 | # USB Device Class drivers |
@@ -1199,23 +1148,7 @@ CONFIG_USB_MON=y | |||
1199 | # | 1148 | # |
1200 | # CONFIG_USB_GADGET is not set | 1149 | # CONFIG_USB_GADGET is not set |
1201 | # CONFIG_MMC is not set | 1150 | # CONFIG_MMC is not set |
1202 | |||
1203 | # | ||
1204 | # LED devices | ||
1205 | # | ||
1206 | # CONFIG_NEW_LEDS is not set | 1151 | # CONFIG_NEW_LEDS is not set |
1207 | |||
1208 | # | ||
1209 | # LED drivers | ||
1210 | # | ||
1211 | |||
1212 | # | ||
1213 | # LED Triggers | ||
1214 | # | ||
1215 | |||
1216 | # | ||
1217 | # InfiniBand support | ||
1218 | # | ||
1219 | CONFIG_INFINIBAND=m | 1152 | CONFIG_INFINIBAND=m |
1220 | CONFIG_INFINIBAND_USER_MAD=m | 1153 | CONFIG_INFINIBAND_USER_MAD=m |
1221 | CONFIG_INFINIBAND_USER_ACCESS=m | 1154 | CONFIG_INFINIBAND_USER_ACCESS=m |
@@ -1231,14 +1164,13 @@ CONFIG_INFINIBAND_IPOIB_DEBUG=y | |||
1231 | CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y | 1164 | CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y |
1232 | # CONFIG_INFINIBAND_SRP is not set | 1165 | # CONFIG_INFINIBAND_SRP is not set |
1233 | # CONFIG_INFINIBAND_ISER is not set | 1166 | # CONFIG_INFINIBAND_ISER is not set |
1167 | CONFIG_EDAC=y | ||
1234 | 1168 | ||
1235 | # | 1169 | # |
1236 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | 1170 | # Reporting subsystems |
1237 | # | ||
1238 | |||
1239 | # | ||
1240 | # Real Time Clock | ||
1241 | # | 1171 | # |
1172 | # CONFIG_EDAC_DEBUG is not set | ||
1173 | CONFIG_EDAC_MM_EDAC=y | ||
1242 | # CONFIG_RTC_CLASS is not set | 1174 | # CONFIG_RTC_CLASS is not set |
1243 | 1175 | ||
1244 | # | 1176 | # |
@@ -1255,6 +1187,12 @@ CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y | |||
1255 | # | 1187 | # |
1256 | 1188 | ||
1257 | # | 1189 | # |
1190 | # Userspace I/O | ||
1191 | # | ||
1192 | CONFIG_UIO=m | ||
1193 | # CONFIG_UIO_CIF is not set | ||
1194 | |||
1195 | # | ||
1258 | # File systems | 1196 | # File systems |
1259 | # | 1197 | # |
1260 | CONFIG_EXT2_FS=y | 1198 | CONFIG_EXT2_FS=y |
@@ -1357,7 +1295,6 @@ CONFIG_SUNRPC=y | |||
1357 | # CONFIG_NCP_FS is not set | 1295 | # CONFIG_NCP_FS is not set |
1358 | # CONFIG_CODA_FS is not set | 1296 | # CONFIG_CODA_FS is not set |
1359 | # CONFIG_AFS_FS is not set | 1297 | # CONFIG_AFS_FS is not set |
1360 | # CONFIG_9P_FS is not set | ||
1361 | 1298 | ||
1362 | # | 1299 | # |
1363 | # Partition Types | 1300 | # Partition Types |
@@ -1439,6 +1376,7 @@ CONFIG_BITREVERSE=y | |||
1439 | # CONFIG_CRC16 is not set | 1376 | # CONFIG_CRC16 is not set |
1440 | # CONFIG_CRC_ITU_T is not set | 1377 | # CONFIG_CRC_ITU_T is not set |
1441 | CONFIG_CRC32=y | 1378 | CONFIG_CRC32=y |
1379 | # CONFIG_CRC7 is not set | ||
1442 | # CONFIG_LIBCRC32C is not set | 1380 | # CONFIG_LIBCRC32C is not set |
1443 | CONFIG_ZLIB_INFLATE=m | 1381 | CONFIG_ZLIB_INFLATE=m |
1444 | CONFIG_ZLIB_DEFLATE=m | 1382 | CONFIG_ZLIB_DEFLATE=m |
@@ -1471,9 +1409,10 @@ CONFIG_DEBUG_FS=y | |||
1471 | CONFIG_DEBUG_KERNEL=y | 1409 | CONFIG_DEBUG_KERNEL=y |
1472 | # CONFIG_DEBUG_SHIRQ is not set | 1410 | # CONFIG_DEBUG_SHIRQ is not set |
1473 | # CONFIG_DETECT_SOFTLOCKUP is not set | 1411 | # CONFIG_DETECT_SOFTLOCKUP is not set |
1412 | CONFIG_SCHED_DEBUG=y | ||
1474 | # CONFIG_SCHEDSTATS is not set | 1413 | # CONFIG_SCHEDSTATS is not set |
1475 | # CONFIG_TIMER_STATS is not set | 1414 | # CONFIG_TIMER_STATS is not set |
1476 | # CONFIG_DEBUG_SLAB is not set | 1415 | # CONFIG_SLUB_DEBUG_ON is not set |
1477 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1416 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1478 | # CONFIG_RT_MUTEX_TESTER is not set | 1417 | # CONFIG_RT_MUTEX_TESTER is not set |
1479 | # CONFIG_DEBUG_SPINLOCK is not set | 1418 | # CONFIG_DEBUG_SPINLOCK is not set |
@@ -1504,10 +1443,6 @@ CONFIG_IRQSTACKS=y | |||
1504 | # | 1443 | # |
1505 | # CONFIG_KEYS is not set | 1444 | # CONFIG_KEYS is not set |
1506 | # CONFIG_SECURITY is not set | 1445 | # CONFIG_SECURITY is not set |
1507 | |||
1508 | # | ||
1509 | # Cryptographic options | ||
1510 | # | ||
1511 | CONFIG_CRYPTO=y | 1446 | CONFIG_CRYPTO=y |
1512 | CONFIG_CRYPTO_ALGAPI=y | 1447 | CONFIG_CRYPTO_ALGAPI=y |
1513 | CONFIG_CRYPTO_BLKCIPHER=m | 1448 | CONFIG_CRYPTO_BLKCIPHER=m |
@@ -1546,7 +1481,4 @@ CONFIG_CRYPTO_DEFLATE=m | |||
1546 | # CONFIG_CRYPTO_CRC32C is not set | 1481 | # CONFIG_CRYPTO_CRC32C is not set |
1547 | # CONFIG_CRYPTO_CAMELLIA is not set | 1482 | # CONFIG_CRYPTO_CAMELLIA is not set |
1548 | # CONFIG_CRYPTO_TEST is not set | 1483 | # CONFIG_CRYPTO_TEST is not set |
1549 | 1484 | CONFIG_CRYPTO_HW=y | |
1550 | # | ||
1551 | # Hardware crypto devices | ||
1552 | # | ||
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 2bb1cb911783..d8502e377518 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c | |||
@@ -299,7 +299,7 @@ static inline int check_io_access(struct pt_regs *regs) | |||
299 | #ifndef CONFIG_FSL_BOOKE | 299 | #ifndef CONFIG_FSL_BOOKE |
300 | #define get_mc_reason(regs) ((regs)->dsisr) | 300 | #define get_mc_reason(regs) ((regs)->dsisr) |
301 | #else | 301 | #else |
302 | #define get_mc_reason(regs) (mfspr(SPRN_MCSR)) | 302 | #define get_mc_reason(regs) (mfspr(SPRN_MCSR) & MCSR_MASK) |
303 | #endif | 303 | #endif |
304 | #define REASON_FP ESR_FP | 304 | #define REASON_FP ESR_FP |
305 | #define REASON_ILLEGAL (ESR_PIL | ESR_PUO) | 305 | #define REASON_ILLEGAL (ESR_PIL | ESR_PUO) |
@@ -414,8 +414,6 @@ void machine_check_exception(struct pt_regs *regs) | |||
414 | printk("Data Cache Push Parity Error\n"); | 414 | printk("Data Cache Push Parity Error\n"); |
415 | if (reason & MCSR_DCPERR) | 415 | if (reason & MCSR_DCPERR) |
416 | printk("Data Cache Parity Error\n"); | 416 | printk("Data Cache Parity Error\n"); |
417 | if (reason & MCSR_GL_CI) | ||
418 | printk("Guarded Load or Cache-Inhibited stwcx.\n"); | ||
419 | if (reason & MCSR_BUS_IAERR) | 417 | if (reason & MCSR_BUS_IAERR) |
420 | printk("Bus - Instruction Address Error\n"); | 418 | printk("Bus - Instruction Address Error\n"); |
421 | if (reason & MCSR_BUS_RAERR) | 419 | if (reason & MCSR_BUS_RAERR) |
diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c index a73d2d700973..ff1811ac6c81 100644 --- a/arch/powerpc/mm/slb.c +++ b/arch/powerpc/mm/slb.c | |||
@@ -74,6 +74,22 @@ static inline void slb_shadow_clear(unsigned long entry) | |||
74 | get_slb_shadow()->save_area[entry].esid = 0; | 74 | get_slb_shadow()->save_area[entry].esid = 0; |
75 | } | 75 | } |
76 | 76 | ||
77 | static inline void create_shadowed_slbe(unsigned long ea, unsigned long flags, | ||
78 | unsigned long entry) | ||
79 | { | ||
80 | /* | ||
81 | * Updating the shadow buffer before writing the SLB ensures | ||
82 | * we don't get a stale entry here if we get preempted by PHYP | ||
83 | * between these two statements. | ||
84 | */ | ||
85 | slb_shadow_update(ea, flags, entry); | ||
86 | |||
87 | asm volatile("slbmte %0,%1" : | ||
88 | : "r" (mk_vsid_data(ea, flags)), | ||
89 | "r" (mk_esid_data(ea, entry)) | ||
90 | : "memory" ); | ||
91 | } | ||
92 | |||
77 | void slb_flush_and_rebolt(void) | 93 | void slb_flush_and_rebolt(void) |
78 | { | 94 | { |
79 | /* If you change this make sure you change SLB_NUM_BOLTED | 95 | /* If you change this make sure you change SLB_NUM_BOLTED |
@@ -226,12 +242,16 @@ void slb_initialize(void) | |||
226 | vflags = SLB_VSID_KERNEL | vmalloc_llp; | 242 | vflags = SLB_VSID_KERNEL | vmalloc_llp; |
227 | 243 | ||
228 | /* Invalidate the entire SLB (even slot 0) & all the ERATS */ | 244 | /* Invalidate the entire SLB (even slot 0) & all the ERATS */ |
229 | slb_shadow_update(PAGE_OFFSET, lflags, 0); | 245 | asm volatile("isync":::"memory"); |
230 | asm volatile("isync; slbia; sync; slbmte %0,%1; isync" :: | 246 | asm volatile("slbmte %0,%0"::"r" (0) : "memory"); |
231 | "r" (get_slb_shadow()->save_area[0].vsid), | 247 | asm volatile("isync; slbia; isync":::"memory"); |
232 | "r" (get_slb_shadow()->save_area[0].esid) : "memory"); | 248 | create_shadowed_slbe(PAGE_OFFSET, lflags, 0); |
233 | 249 | ||
234 | slb_shadow_update(VMALLOC_START, vflags, 1); | 250 | create_shadowed_slbe(VMALLOC_START, vflags, 1); |
235 | 251 | ||
236 | slb_flush_and_rebolt(); | 252 | /* We don't bolt the stack for the time being - we're in boot, |
253 | * so the stack is in the bolted segment. By the time it goes | ||
254 | * elsewhere, we'll call _switch() which will bolt in the new | ||
255 | * one. */ | ||
256 | asm volatile("isync":::"memory"); | ||
237 | } | 257 | } |
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index f58184086c8c..f620171ad6b1 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig | |||
@@ -33,6 +33,7 @@ config MPC8544_DS | |||
33 | bool "Freescale MPC8544 DS" | 33 | bool "Freescale MPC8544 DS" |
34 | select PPC_I8259 | 34 | select PPC_I8259 |
35 | select DEFAULT_UIMAGE | 35 | select DEFAULT_UIMAGE |
36 | select FSL_ULI1575 | ||
36 | help | 37 | help |
37 | This option enables support for the MPC8544 DS board | 38 | This option enables support for the MPC8544 DS board |
38 | 39 | ||
diff --git a/arch/powerpc/platforms/85xx/mpc8544_ds.c b/arch/powerpc/platforms/85xx/mpc8544_ds.c index 4905f6f8903b..0f834d8be444 100644 --- a/arch/powerpc/platforms/85xx/mpc8544_ds.c +++ b/arch/powerpc/platforms/85xx/mpc8544_ds.c | |||
@@ -114,211 +114,25 @@ void __init mpc8544_ds_pic_init(void) | |||
114 | } | 114 | } |
115 | 115 | ||
116 | #ifdef CONFIG_PCI | 116 | #ifdef CONFIG_PCI |
117 | enum pirq { PIRQA = 8, PIRQB, PIRQC, PIRQD, PIRQE, PIRQF, PIRQG, PIRQH }; | 117 | extern int uses_fsl_uli_m1575; |
118 | extern int uli_exclude_device(struct pci_controller *hose, | ||
119 | u_char bus, u_char devfn); | ||
118 | 120 | ||
119 | /* | 121 | static int mpc85xx_exclude_device(struct pci_controller *hose, |
120 | * Value in table -- IRQ number | 122 | u_char bus, u_char devfn) |
121 | */ | ||
122 | const unsigned char uli1575_irq_route_table[16] = { | ||
123 | 0, /* 0: Reserved */ | ||
124 | 0x8, | ||
125 | 0, /* 2: Reserved */ | ||
126 | 0x2, | ||
127 | 0x4, | ||
128 | 0x5, | ||
129 | 0x7, | ||
130 | 0x6, | ||
131 | 0, /* 8: Reserved */ | ||
132 | 0x1, | ||
133 | 0x3, | ||
134 | 0x9, | ||
135 | 0xb, | ||
136 | 0, /* 13: Reserved */ | ||
137 | 0xd, | ||
138 | 0xf, | ||
139 | }; | ||
140 | |||
141 | static int __devinit | ||
142 | get_pci_irq_from_of(struct pci_controller *hose, int slot, int pin) | ||
143 | { | ||
144 | struct of_irq oirq; | ||
145 | u32 laddr[3]; | ||
146 | struct device_node *hosenode = hose ? hose->arch_data : NULL; | ||
147 | |||
148 | if (!hosenode) | ||
149 | return -EINVAL; | ||
150 | |||
151 | laddr[0] = (hose->first_busno << 16) | (PCI_DEVFN(slot, 0) << 8); | ||
152 | laddr[1] = laddr[2] = 0; | ||
153 | of_irq_map_raw(hosenode, &pin, 1, laddr, &oirq); | ||
154 | DBG("mpc8544_ds: pci irq addr %x, slot %d, pin %d, irq %d\n", | ||
155 | laddr[0], slot, pin, oirq.specifier[0]); | ||
156 | return oirq.specifier[0]; | ||
157 | } | ||
158 | |||
159 | /*8259*/ | ||
160 | static void __devinit quirk_uli1575(struct pci_dev *dev) | ||
161 | { | ||
162 | unsigned short temp; | ||
163 | struct pci_controller *hose = pci_bus_to_host(dev->bus); | ||
164 | unsigned char irq2pin[16]; | ||
165 | unsigned long pirq_map_word = 0; | ||
166 | u32 irq; | ||
167 | int i; | ||
168 | |||
169 | /* | ||
170 | * ULI1575 interrupts route setup | ||
171 | */ | ||
172 | memset(irq2pin, 0, 16); /* Initialize default value 0 */ | ||
173 | |||
174 | irq2pin[6]=PIRQA+3; /* enabled mapping for IRQ6 to PIRQD, used by SATA */ | ||
175 | |||
176 | /* | ||
177 | * PIRQE -> PIRQF mapping set manually | ||
178 | * | ||
179 | * IRQ pin IRQ# | ||
180 | * PIRQE ---- 9 | ||
181 | * PIRQF ---- 10 | ||
182 | * PIRQG ---- 11 | ||
183 | * PIRQH ---- 12 | ||
184 | */ | ||
185 | for (i = 0; i < 4; i++) | ||
186 | irq2pin[i + 9] = PIRQE + i; | ||
187 | |||
188 | /* Set IRQ-PIRQ Mapping to ULI1575 */ | ||
189 | for (i = 0; i < 16; i++) | ||
190 | if (irq2pin[i]) | ||
191 | pirq_map_word |= (uli1575_irq_route_table[i] & 0xf) | ||
192 | << ((irq2pin[i] - PIRQA) * 4); | ||
193 | |||
194 | pirq_map_word |= 1<<26; /* disable INTx in EP mode*/ | ||
195 | |||
196 | /* ULI1575 IRQ mapping conf register default value is 0xb9317542 */ | ||
197 | DBG("Setup ULI1575 IRQ mapping configuration register value = 0x%x\n", | ||
198 | (int)pirq_map_word); | ||
199 | pci_write_config_dword(dev, 0x48, pirq_map_word); | ||
200 | |||
201 | #define ULI1575_SET_DEV_IRQ(slot, pin, reg) \ | ||
202 | do { \ | ||
203 | int irq; \ | ||
204 | irq = get_pci_irq_from_of(hose, slot, pin); \ | ||
205 | if (irq > 0 && irq < 16) \ | ||
206 | pci_write_config_byte(dev, reg, irq2pin[irq]); \ | ||
207 | else \ | ||
208 | printk(KERN_WARNING "ULI1575 device" \ | ||
209 | "(slot %d, pin %d) irq %d is invalid.\n", \ | ||
210 | slot, pin, irq); \ | ||
211 | } while(0) | ||
212 | |||
213 | /* USB 1.1 OHCI controller 1, slot 28, pin 1 */ | ||
214 | ULI1575_SET_DEV_IRQ(28, 1, 0x86); | ||
215 | |||
216 | /* USB 1.1 OHCI controller 2, slot 28, pin 2 */ | ||
217 | ULI1575_SET_DEV_IRQ(28, 2, 0x87); | ||
218 | |||
219 | /* USB 1.1 OHCI controller 3, slot 28, pin 3 */ | ||
220 | ULI1575_SET_DEV_IRQ(28, 3, 0x88); | ||
221 | |||
222 | /* USB 2.0 controller, slot 28, pin 4 */ | ||
223 | irq = get_pci_irq_from_of(hose, 28, 4); | ||
224 | if (irq >= 0 && irq <= 15) | ||
225 | pci_write_config_dword(dev, 0x74, uli1575_irq_route_table[irq]); | ||
226 | |||
227 | /* Audio controller, slot 29, pin 1 */ | ||
228 | ULI1575_SET_DEV_IRQ(29, 1, 0x8a); | ||
229 | |||
230 | /* Modem controller, slot 29, pin 2 */ | ||
231 | ULI1575_SET_DEV_IRQ(29, 2, 0x8b); | ||
232 | |||
233 | /* HD audio controller, slot 29, pin 3 */ | ||
234 | ULI1575_SET_DEV_IRQ(29, 3, 0x8c); | ||
235 | |||
236 | /* SMB interrupt: slot 30, pin 1 */ | ||
237 | ULI1575_SET_DEV_IRQ(30, 1, 0x8e); | ||
238 | |||
239 | /* PMU ACPI SCI interrupt: slot 30, pin 2 */ | ||
240 | ULI1575_SET_DEV_IRQ(30, 2, 0x8f); | ||
241 | |||
242 | /* Serial ATA interrupt: slot 31, pin 1 */ | ||
243 | ULI1575_SET_DEV_IRQ(31, 1, 0x8d); | ||
244 | |||
245 | /* Primary PATA IDE IRQ: 14 | ||
246 | * Secondary PATA IDE IRQ: 15 | ||
247 | */ | ||
248 | pci_write_config_byte(dev, 0x44, 0x30 | uli1575_irq_route_table[14]); | ||
249 | pci_write_config_byte(dev, 0x75, uli1575_irq_route_table[15]); | ||
250 | |||
251 | /* Set IRQ14 and IRQ15 to legacy IRQs */ | ||
252 | pci_read_config_word(dev, 0x46, &temp); | ||
253 | temp |= 0xc000; | ||
254 | pci_write_config_word(dev, 0x46, temp); | ||
255 | |||
256 | /* Set i8259 interrupt trigger | ||
257 | * IRQ 3: Level | ||
258 | * IRQ 4: Level | ||
259 | * IRQ 5: Level | ||
260 | * IRQ 6: Level | ||
261 | * IRQ 7: Level | ||
262 | * IRQ 9: Level | ||
263 | * IRQ 10: Level | ||
264 | * IRQ 11: Level | ||
265 | * IRQ 12: Level | ||
266 | * IRQ 14: Edge | ||
267 | * IRQ 15: Edge | ||
268 | */ | ||
269 | outb(0xfa, 0x4d0); | ||
270 | outb(0x1e, 0x4d1); | ||
271 | |||
272 | #undef ULI1575_SET_DEV_IRQ | ||
273 | } | ||
274 | |||
275 | /* SATA */ | ||
276 | static void __devinit quirk_uli5288(struct pci_dev *dev) | ||
277 | { | 123 | { |
278 | unsigned char c; | 124 | struct device_node* node; |
279 | 125 | struct resource rsrc; | |
280 | pci_read_config_byte(dev, 0x83, &c); | ||
281 | c |= 0x80; /* read/write lock */ | ||
282 | pci_write_config_byte(dev, 0x83, c); | ||
283 | |||
284 | pci_write_config_byte(dev, 0x09, 0x01); /* Base class code: storage */ | ||
285 | pci_write_config_byte(dev, 0x0a, 0x06); /* IDE disk */ | ||
286 | 126 | ||
287 | pci_read_config_byte(dev, 0x83, &c); | 127 | node = (struct device_node *)hose->arch_data; |
288 | c &= 0x7f; | 128 | of_address_to_resource(node, 0, &rsrc); |
289 | pci_write_config_byte(dev, 0x83, c); | ||
290 | |||
291 | pci_read_config_byte(dev, 0x84, &c); | ||
292 | c |= 0x01; /* emulated PATA mode enabled */ | ||
293 | pci_write_config_byte(dev, 0x84, c); | ||
294 | } | ||
295 | 129 | ||
296 | /* PATA */ | 130 | if ((rsrc.start & 0xfffff) == 0xb000) { |
297 | static void __devinit quirk_uli5229(struct pci_dev *dev) | 131 | return uli_exclude_device(hose, bus, devfn); |
298 | { | 132 | } |
299 | unsigned short temp; | ||
300 | pci_write_config_word(dev, 0x04, 0x0405); /* MEM IO MSI */ | ||
301 | pci_read_config_word(dev, 0x4a, &temp); | ||
302 | temp |= 0x1000; /* Enable Native IRQ 14/15 */ | ||
303 | pci_write_config_word(dev, 0x4a, temp); | ||
304 | } | ||
305 | 133 | ||
306 | /*Bridge*/ | 134 | return PCIBIOS_SUCCESSFUL; |
307 | static void __devinit early_uli5249(struct pci_dev *dev) | ||
308 | { | ||
309 | unsigned char temp; | ||
310 | pci_write_config_word(dev, 0x04, 0x0007); /* mem access */ | ||
311 | pci_read_config_byte(dev, 0x7c, &temp); | ||
312 | pci_write_config_byte(dev, 0x7c, 0x80); /* R/W lock control */ | ||
313 | pci_write_config_byte(dev, 0x09, 0x01); /* set as pci-pci bridge */ | ||
314 | pci_write_config_byte(dev, 0x7c, temp); /* restore pci bus debug control */ | ||
315 | dev->class |= 0x1; | ||
316 | } | 135 | } |
317 | |||
318 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x1575, quirk_uli1575); | ||
319 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x5288, quirk_uli5288); | ||
320 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x5229, quirk_uli5229); | ||
321 | DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AL, 0x5249, early_uli5249); | ||
322 | #endif /* CONFIG_PCI */ | 136 | #endif /* CONFIG_PCI */ |
323 | 137 | ||
324 | /* | 138 | /* |
@@ -342,6 +156,8 @@ static void __init mpc8544_ds_setup_arch(void) | |||
342 | else | 156 | else |
343 | fsl_add_bridge(np, 0); | 157 | fsl_add_bridge(np, 0); |
344 | } | 158 | } |
159 | uses_fsl_uli_m1575 = 1; | ||
160 | ppc_md.pci_exclude_device = mpc85xx_exclude_device; | ||
345 | #endif | 161 | #endif |
346 | 162 | ||
347 | printk("MPC8544 DS board from Freescale Semiconductor\n"); | 163 | printk("MPC8544 DS board from Freescale Semiconductor\n"); |
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig index 343b76d0d793..685b2fbbbe00 100644 --- a/arch/powerpc/platforms/86xx/Kconfig +++ b/arch/powerpc/platforms/86xx/Kconfig | |||
@@ -7,6 +7,7 @@ config MPC8641_HPCN | |||
7 | bool "Freescale MPC8641 HPCN" | 7 | bool "Freescale MPC8641 HPCN" |
8 | select PPC_I8259 | 8 | select PPC_I8259 |
9 | select DEFAULT_UIMAGE | 9 | select DEFAULT_UIMAGE |
10 | select FSL_ULI1575 | ||
10 | help | 11 | help |
11 | This option enables support for the MPC8641 HPCN board. | 12 | This option enables support for the MPC8641 HPCN board. |
12 | 13 | ||
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c index e9eaa0749ae6..56b27caf7a27 100644 --- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c +++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | |||
@@ -107,220 +107,25 @@ mpc86xx_hpcn_init_irq(void) | |||
107 | } | 107 | } |
108 | 108 | ||
109 | #ifdef CONFIG_PCI | 109 | #ifdef CONFIG_PCI |
110 | extern int uses_fsl_uli_m1575; | ||
111 | extern int uli_exclude_device(struct pci_controller *hose, | ||
112 | u_char bus, u_char devfn); | ||
110 | 113 | ||
111 | enum pirq{PIRQA = 8, PIRQB, PIRQC, PIRQD, PIRQE, PIRQF, PIRQG, PIRQH}; | 114 | static int mpc86xx_exclude_device(struct pci_controller *hose, |
112 | const unsigned char uli1575_irq_route_table[16] = { | 115 | u_char bus, u_char devfn) |
113 | 0, /* 0: Reserved */ | ||
114 | 0x8, /* 1: 0b1000 */ | ||
115 | 0, /* 2: Reserved */ | ||
116 | 0x2, /* 3: 0b0010 */ | ||
117 | 0x4, /* 4: 0b0100 */ | ||
118 | 0x5, /* 5: 0b0101 */ | ||
119 | 0x7, /* 6: 0b0111 */ | ||
120 | 0x6, /* 7: 0b0110 */ | ||
121 | 0, /* 8: Reserved */ | ||
122 | 0x1, /* 9: 0b0001 */ | ||
123 | 0x3, /* 10: 0b0011 */ | ||
124 | 0x9, /* 11: 0b1001 */ | ||
125 | 0xb, /* 12: 0b1011 */ | ||
126 | 0, /* 13: Reserved */ | ||
127 | 0xd, /* 14, 0b1101 */ | ||
128 | 0xf, /* 15, 0b1111 */ | ||
129 | }; | ||
130 | |||
131 | static int __devinit | ||
132 | get_pci_irq_from_of(struct pci_controller *hose, int slot, int pin) | ||
133 | { | ||
134 | struct of_irq oirq; | ||
135 | u32 laddr[3]; | ||
136 | struct device_node *hosenode = hose ? hose->arch_data : NULL; | ||
137 | |||
138 | if (!hosenode) return -EINVAL; | ||
139 | |||
140 | laddr[0] = (hose->first_busno << 16) | (PCI_DEVFN(slot, 0) << 8); | ||
141 | laddr[1] = laddr[2] = 0; | ||
142 | of_irq_map_raw(hosenode, &pin, 1, laddr, &oirq); | ||
143 | DBG("mpc86xx_hpcn: pci irq addr %x, slot %d, pin %d, irq %d\n", | ||
144 | laddr[0], slot, pin, oirq.specifier[0]); | ||
145 | return oirq.specifier[0]; | ||
146 | } | ||
147 | |||
148 | static void __devinit quirk_uli1575(struct pci_dev *dev) | ||
149 | { | ||
150 | unsigned short temp; | ||
151 | struct pci_controller *hose = pci_bus_to_host(dev->bus); | ||
152 | unsigned char irq2pin[16], c; | ||
153 | unsigned long pirq_map_word = 0; | ||
154 | u32 irq; | ||
155 | int i; | ||
156 | |||
157 | /* | ||
158 | * ULI1575 interrupts route setup | ||
159 | */ | ||
160 | memset(irq2pin, 0, 16); /* Initialize default value 0 */ | ||
161 | |||
162 | /* | ||
163 | * PIRQA -> PIRQD mapping read from OF-tree | ||
164 | * | ||
165 | * interrupts for PCI slot0 -- PIRQA / PIRQB / PIRQC / PIRQD | ||
166 | * PCI slot1 -- PIRQB / PIRQC / PIRQD / PIRQA | ||
167 | */ | ||
168 | for (i = 0; i < 4; i++){ | ||
169 | irq = get_pci_irq_from_of(hose, 17, i + 1); | ||
170 | if (irq > 0 && irq < 16) | ||
171 | irq2pin[irq] = PIRQA + i; | ||
172 | else | ||
173 | printk(KERN_WARNING "ULI1575 device" | ||
174 | "(slot %d, pin %d) irq %d is invalid.\n", | ||
175 | 17, i, irq); | ||
176 | } | ||
177 | |||
178 | /* | ||
179 | * PIRQE -> PIRQF mapping set manually | ||
180 | * | ||
181 | * IRQ pin IRQ# | ||
182 | * PIRQE ---- 9 | ||
183 | * PIRQF ---- 10 | ||
184 | * PIRQG ---- 11 | ||
185 | * PIRQH ---- 12 | ||
186 | */ | ||
187 | for (i = 0; i < 4; i++) irq2pin[i + 9] = PIRQE + i; | ||
188 | |||
189 | /* Set IRQ-PIRQ Mapping to ULI1575 */ | ||
190 | for (i = 0; i < 16; i++) | ||
191 | if (irq2pin[i]) | ||
192 | pirq_map_word |= (uli1575_irq_route_table[i] & 0xf) | ||
193 | << ((irq2pin[i] - PIRQA) * 4); | ||
194 | |||
195 | /* ULI1575 IRQ mapping conf register default value is 0xb9317542 */ | ||
196 | DBG("Setup ULI1575 IRQ mapping configuration register value = 0x%x\n", | ||
197 | pirq_map_word); | ||
198 | pci_write_config_dword(dev, 0x48, pirq_map_word); | ||
199 | |||
200 | #define ULI1575_SET_DEV_IRQ(slot, pin, reg) \ | ||
201 | do { \ | ||
202 | int irq; \ | ||
203 | irq = get_pci_irq_from_of(hose, slot, pin); \ | ||
204 | if (irq > 0 && irq < 16) \ | ||
205 | pci_write_config_byte(dev, reg, irq2pin[irq]); \ | ||
206 | else \ | ||
207 | printk(KERN_WARNING "ULI1575 device" \ | ||
208 | "(slot %d, pin %d) irq %d is invalid.\n", \ | ||
209 | slot, pin, irq); \ | ||
210 | } while(0) | ||
211 | |||
212 | /* USB 1.1 OHCI controller 1, slot 28, pin 1 */ | ||
213 | ULI1575_SET_DEV_IRQ(28, 1, 0x86); | ||
214 | |||
215 | /* USB 1.1 OHCI controller 2, slot 28, pin 2 */ | ||
216 | ULI1575_SET_DEV_IRQ(28, 2, 0x87); | ||
217 | |||
218 | /* USB 1.1 OHCI controller 3, slot 28, pin 3 */ | ||
219 | ULI1575_SET_DEV_IRQ(28, 3, 0x88); | ||
220 | |||
221 | /* USB 2.0 controller, slot 28, pin 4 */ | ||
222 | irq = get_pci_irq_from_of(hose, 28, 4); | ||
223 | if (irq >= 0 && irq <=15) | ||
224 | pci_write_config_dword(dev, 0x74, uli1575_irq_route_table[irq]); | ||
225 | |||
226 | /* Audio controller, slot 29, pin 1 */ | ||
227 | ULI1575_SET_DEV_IRQ(29, 1, 0x8a); | ||
228 | |||
229 | /* Modem controller, slot 29, pin 2 */ | ||
230 | ULI1575_SET_DEV_IRQ(29, 2, 0x8b); | ||
231 | |||
232 | /* HD audio controller, slot 29, pin 3 */ | ||
233 | ULI1575_SET_DEV_IRQ(29, 3, 0x8c); | ||
234 | |||
235 | /* SMB interrupt: slot 30, pin 1 */ | ||
236 | ULI1575_SET_DEV_IRQ(30, 1, 0x8e); | ||
237 | |||
238 | /* PMU ACPI SCI interrupt: slot 30, pin 2 */ | ||
239 | ULI1575_SET_DEV_IRQ(30, 2, 0x8f); | ||
240 | |||
241 | /* Serial ATA interrupt: slot 31, pin 1 */ | ||
242 | ULI1575_SET_DEV_IRQ(31, 1, 0x8d); | ||
243 | |||
244 | /* Primary PATA IDE IRQ: 14 | ||
245 | * Secondary PATA IDE IRQ: 15 | ||
246 | */ | ||
247 | pci_write_config_byte(dev, 0x44, 0x30 | uli1575_irq_route_table[14]); | ||
248 | pci_write_config_byte(dev, 0x75, uli1575_irq_route_table[15]); | ||
249 | |||
250 | /* Set IRQ14 and IRQ15 to legacy IRQs */ | ||
251 | pci_read_config_word(dev, 0x46, &temp); | ||
252 | temp |= 0xc000; | ||
253 | pci_write_config_word(dev, 0x46, temp); | ||
254 | |||
255 | /* Set i8259 interrupt trigger | ||
256 | * IRQ 3: Level | ||
257 | * IRQ 4: Level | ||
258 | * IRQ 5: Level | ||
259 | * IRQ 6: Level | ||
260 | * IRQ 7: Level | ||
261 | * IRQ 9: Level | ||
262 | * IRQ 10: Level | ||
263 | * IRQ 11: Level | ||
264 | * IRQ 12: Level | ||
265 | * IRQ 14: Edge | ||
266 | * IRQ 15: Edge | ||
267 | */ | ||
268 | outb(0xfa, 0x4d0); | ||
269 | outb(0x1e, 0x4d1); | ||
270 | |||
271 | #undef ULI1575_SET_DEV_IRQ | ||
272 | |||
273 | /* Disable the HD interface and enable the AC97 interface. */ | ||
274 | pci_read_config_byte(dev, 0xb8, &c); | ||
275 | c &= 0x7f; | ||
276 | pci_write_config_byte(dev, 0xb8, c); | ||
277 | } | ||
278 | |||
279 | static void __devinit quirk_uli5288(struct pci_dev *dev) | ||
280 | { | 116 | { |
281 | unsigned char c; | 117 | struct device_node* node; |
118 | struct resource rsrc; | ||
282 | 119 | ||
283 | pci_read_config_byte(dev,0x83,&c); | 120 | node = (struct device_node *)hose->arch_data; |
284 | c |= 0x80; | 121 | of_address_to_resource(node, 0, &rsrc); |
285 | pci_write_config_byte(dev, 0x83, c); | ||
286 | 122 | ||
287 | pci_write_config_byte(dev, 0x09, 0x01); | 123 | if ((rsrc.start & 0xfffff) == 0x8000) { |
288 | pci_write_config_byte(dev, 0x0a, 0x06); | 124 | return uli_exclude_device(hose, bus, devfn); |
289 | 125 | } | |
290 | pci_read_config_byte(dev,0x83,&c); | ||
291 | c &= 0x7f; | ||
292 | pci_write_config_byte(dev, 0x83, c); | ||
293 | |||
294 | pci_read_config_byte(dev,0x84,&c); | ||
295 | c |= 0x01; | ||
296 | pci_write_config_byte(dev, 0x84, c); | ||
297 | } | ||
298 | |||
299 | static void __devinit quirk_uli5229(struct pci_dev *dev) | ||
300 | { | ||
301 | unsigned short temp; | ||
302 | pci_write_config_word(dev, 0x04, 0x0405); | ||
303 | dev->class &= ~0x5; | ||
304 | pci_read_config_word(dev, 0x4a, &temp); | ||
305 | temp |= 0x1000; | ||
306 | pci_write_config_word(dev, 0x4a, temp); | ||
307 | } | ||
308 | 126 | ||
309 | static void __devinit early_uli5249(struct pci_dev *dev) | 127 | return PCIBIOS_SUCCESSFUL; |
310 | { | ||
311 | unsigned char temp; | ||
312 | pci_write_config_word(dev, 0x04, 0x0007); | ||
313 | pci_read_config_byte(dev, 0x7c, &temp); | ||
314 | pci_write_config_byte(dev, 0x7c, 0x80); | ||
315 | pci_write_config_byte(dev, 0x09, 0x01); | ||
316 | pci_write_config_byte(dev, 0x7c, temp); | ||
317 | dev->class |= 0x1; | ||
318 | } | 128 | } |
319 | |||
320 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x1575, quirk_uli1575); | ||
321 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x5288, quirk_uli5288); | ||
322 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x5229, quirk_uli5229); | ||
323 | DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AL, 0x5249, early_uli5249); | ||
324 | #endif /* CONFIG_PCI */ | 129 | #endif /* CONFIG_PCI */ |
325 | 130 | ||
326 | 131 | ||
@@ -353,6 +158,9 @@ mpc86xx_hpcn_setup_arch(void) | |||
353 | else | 158 | else |
354 | fsl_add_bridge(np, 0); | 159 | fsl_add_bridge(np, 0); |
355 | } | 160 | } |
161 | uses_fsl_uli_m1575 = 1; | ||
162 | ppc_md.pci_exclude_device = mpc86xx_exclude_device; | ||
163 | |||
356 | #endif | 164 | #endif |
357 | 165 | ||
358 | printk("MPC86xx HPCN board from Freescale Semiconductor\n"); | 166 | printk("MPC86xx HPCN board from Freescale Semiconductor\n"); |
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index 2c937fb207fe..041df77ec117 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig | |||
@@ -283,4 +283,12 @@ config AXON_RAM | |||
283 | minor numbers are available in /proc/devices, /proc/partitions or | 283 | minor numbers are available in /proc/devices, /proc/partitions or |
284 | in /sys/block/axonram?/dev. | 284 | in /sys/block/axonram?/dev. |
285 | 285 | ||
286 | config FSL_ULI1575 | ||
287 | bool | ||
288 | default n | ||
289 | help | ||
290 | Supports for the ULI1575 PCIe south bridge that exists on some | ||
291 | Freescale reference boards. The boards all use the ULI in pretty | ||
292 | much the same way. | ||
293 | |||
286 | endmenu | 294 | endmenu |
diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile index d6e041a46d25..d44e832b01f2 100644 --- a/arch/powerpc/platforms/Makefile +++ b/arch/powerpc/platforms/Makefile | |||
@@ -1,3 +1,6 @@ | |||
1 | |||
2 | obj-$(CONFIG_FSL_ULI1575) += fsl_uli1575.o | ||
3 | |||
1 | ifeq ($(CONFIG_PPC_MERGE),y) | 4 | ifeq ($(CONFIG_PPC_MERGE),y) |
2 | obj-$(CONFIG_PPC_PMAC) += powermac/ | 5 | obj-$(CONFIG_PPC_PMAC) += powermac/ |
3 | else | 6 | else |
diff --git a/arch/powerpc/platforms/cell/cbe_regs.h b/arch/powerpc/platforms/cell/cbe_regs.h index 17d597144877..b24025f2ac7a 100644 --- a/arch/powerpc/platforms/cell/cbe_regs.h +++ b/arch/powerpc/platforms/cell/cbe_regs.h | |||
@@ -113,10 +113,14 @@ struct cbe_pmd_regs { | |||
113 | u64 checkstop_fir; /* 0x0c00 */ | 113 | u64 checkstop_fir; /* 0x0c00 */ |
114 | u64 recoverable_fir; /* 0x0c08 */ | 114 | u64 recoverable_fir; /* 0x0c08 */ |
115 | u64 spec_att_mchk_fir; /* 0x0c10 */ | 115 | u64 spec_att_mchk_fir; /* 0x0c10 */ |
116 | u64 fir_mode_reg; /* 0x0c18 */ | 116 | u32 fir_mode_reg; /* 0x0c18 */ |
117 | u8 pad_0x0c1c_0x0c20 [4]; /* 0x0c1c */ | ||
118 | #define CBE_PMD_FIR_MODE_M8 0x00800 | ||
117 | u64 fir_enable_mask; /* 0x0c20 */ | 119 | u64 fir_enable_mask; /* 0x0c20 */ |
118 | 120 | ||
119 | u8 pad_0x0c28_0x1000 [0x1000 - 0x0c28]; /* 0x0c28 */ | 121 | u8 pad_0x0c28_0x0ca8 [0x0ca8 - 0x0c28]; /* 0x0c28 */ |
122 | u64 ras_esc_0; /* 0x0ca8 */ | ||
123 | u8 pad_0x0cb0_0x1000 [0x1000 - 0x0cb0]; /* 0x0cb0 */ | ||
120 | }; | 124 | }; |
121 | 125 | ||
122 | extern struct cbe_pmd_regs __iomem *cbe_get_pmd_regs(struct device_node *np); | 126 | extern struct cbe_pmd_regs __iomem *cbe_get_pmd_regs(struct device_node *np); |
diff --git a/arch/powerpc/platforms/cell/cbe_thermal.c b/arch/powerpc/platforms/cell/cbe_thermal.c index e4132f8f51b3..fb5eda48467d 100644 --- a/arch/powerpc/platforms/cell/cbe_thermal.c +++ b/arch/powerpc/platforms/cell/cbe_thermal.c | |||
@@ -88,17 +88,13 @@ static struct cbe_pmd_regs __iomem *get_pmd_regs(struct sys_device *sysdev) | |||
88 | /* returns the value for a given spu in a given register */ | 88 | /* returns the value for a given spu in a given register */ |
89 | static u8 spu_read_register_value(struct sys_device *sysdev, union spe_reg __iomem *reg) | 89 | static u8 spu_read_register_value(struct sys_device *sysdev, union spe_reg __iomem *reg) |
90 | { | 90 | { |
91 | const unsigned int *id; | ||
92 | union spe_reg value; | 91 | union spe_reg value; |
93 | struct spu *spu; | 92 | struct spu *spu; |
94 | 93 | ||
95 | /* getting the id from the reg attribute will not work on future device-tree layouts | ||
96 | * in future we should store the id to the spu struct and use it here */ | ||
97 | spu = container_of(sysdev, struct spu, sysdev); | 94 | spu = container_of(sysdev, struct spu, sysdev); |
98 | id = of_get_property(spu_devnode(spu), "reg", NULL); | ||
99 | value.val = in_be64(®->val); | 95 | value.val = in_be64(®->val); |
100 | 96 | ||
101 | return value.spe[*id]; | 97 | return value.spe[spu->spe_id]; |
102 | } | 98 | } |
103 | 99 | ||
104 | static ssize_t spu_show_temp(struct sys_device *sysdev, char *buf) | 100 | static ssize_t spu_show_temp(struct sys_device *sysdev, char *buf) |
diff --git a/arch/powerpc/platforms/cell/pervasive.c b/arch/powerpc/platforms/cell/pervasive.c index 812bf563ed65..4ede22d363fa 100644 --- a/arch/powerpc/platforms/cell/pervasive.c +++ b/arch/powerpc/platforms/cell/pervasive.c | |||
@@ -38,6 +38,8 @@ | |||
38 | #include "pervasive.h" | 38 | #include "pervasive.h" |
39 | #include "cbe_regs.h" | 39 | #include "cbe_regs.h" |
40 | 40 | ||
41 | static int sysreset_hack; | ||
42 | |||
41 | static void cbe_power_save(void) | 43 | static void cbe_power_save(void) |
42 | { | 44 | { |
43 | unsigned long ctrl, thread_switch_control; | 45 | unsigned long ctrl, thread_switch_control; |
@@ -85,6 +87,9 @@ static void cbe_power_save(void) | |||
85 | 87 | ||
86 | static int cbe_system_reset_exception(struct pt_regs *regs) | 88 | static int cbe_system_reset_exception(struct pt_regs *regs) |
87 | { | 89 | { |
90 | int cpu; | ||
91 | struct cbe_pmd_regs __iomem *pmd; | ||
92 | |||
88 | switch (regs->msr & SRR1_WAKEMASK) { | 93 | switch (regs->msr & SRR1_WAKEMASK) { |
89 | case SRR1_WAKEEE: | 94 | case SRR1_WAKEEE: |
90 | do_IRQ(regs); | 95 | do_IRQ(regs); |
@@ -93,6 +98,18 @@ static int cbe_system_reset_exception(struct pt_regs *regs) | |||
93 | timer_interrupt(regs); | 98 | timer_interrupt(regs); |
94 | break; | 99 | break; |
95 | case SRR1_WAKEMT: | 100 | case SRR1_WAKEMT: |
101 | /* | ||
102 | * The BMC can inject user triggered system reset exceptions, | ||
103 | * but cannot set the system reset reason in srr1, | ||
104 | * so check an extra register here. | ||
105 | */ | ||
106 | if (sysreset_hack && (cpu = smp_processor_id()) == 0) { | ||
107 | pmd = cbe_get_cpu_pmd_regs(cpu); | ||
108 | if (in_be64(&pmd->ras_esc_0) & 0xffff) { | ||
109 | out_be64(&pmd->ras_esc_0, 0); | ||
110 | return 0; | ||
111 | } | ||
112 | } | ||
96 | break; | 113 | break; |
97 | #ifdef CONFIG_CBE_RAS | 114 | #ifdef CONFIG_CBE_RAS |
98 | case SRR1_WAKESYSERR: | 115 | case SRR1_WAKESYSERR: |
@@ -113,9 +130,12 @@ static int cbe_system_reset_exception(struct pt_regs *regs) | |||
113 | void __init cbe_pervasive_init(void) | 130 | void __init cbe_pervasive_init(void) |
114 | { | 131 | { |
115 | int cpu; | 132 | int cpu; |
133 | |||
116 | if (!cpu_has_feature(CPU_FTR_PAUSE_ZERO)) | 134 | if (!cpu_has_feature(CPU_FTR_PAUSE_ZERO)) |
117 | return; | 135 | return; |
118 | 136 | ||
137 | sysreset_hack = machine_is_compatible("IBM,CBPLUS-1.0"); | ||
138 | |||
119 | for_each_possible_cpu(cpu) { | 139 | for_each_possible_cpu(cpu) { |
120 | struct cbe_pmd_regs __iomem *regs = cbe_get_cpu_pmd_regs(cpu); | 140 | struct cbe_pmd_regs __iomem *regs = cbe_get_cpu_pmd_regs(cpu); |
121 | if (!regs) | 141 | if (!regs) |
@@ -124,6 +144,12 @@ void __init cbe_pervasive_init(void) | |||
124 | /* Enable Pause(0) control bit */ | 144 | /* Enable Pause(0) control bit */ |
125 | out_be64(®s->pmcr, in_be64(®s->pmcr) | | 145 | out_be64(®s->pmcr, in_be64(®s->pmcr) | |
126 | CBE_PMD_PAUSE_ZERO_CONTROL); | 146 | CBE_PMD_PAUSE_ZERO_CONTROL); |
147 | |||
148 | /* Enable JTAG system-reset hack */ | ||
149 | if (sysreset_hack) | ||
150 | out_be32(®s->fir_mode_reg, | ||
151 | in_be32(®s->fir_mode_reg) | | ||
152 | CBE_PMD_FIR_MODE_M8); | ||
127 | } | 153 | } |
128 | 154 | ||
129 | ppc_md.power_save = cbe_power_save; | 155 | ppc_md.power_save = cbe_power_save; |
diff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c index 5eb88346181a..7c0668a9dcc7 100644 --- a/arch/powerpc/platforms/cell/spu_manage.c +++ b/arch/powerpc/platforms/cell/spu_manage.c | |||
@@ -48,7 +48,7 @@ static u64 __init find_spu_unit_number(struct device_node *spe) | |||
48 | { | 48 | { |
49 | const unsigned int *prop; | 49 | const unsigned int *prop; |
50 | int proplen; | 50 | int proplen; |
51 | prop = of_get_property(spe, "unit-id", &proplen); | 51 | prop = of_get_property(spe, "physical-id", &proplen); |
52 | if (proplen == 4) | 52 | if (proplen == 4) |
53 | return (u64)*prop; | 53 | return (u64)*prop; |
54 | 54 | ||
diff --git a/arch/powerpc/platforms/fsl_uli1575.c b/arch/powerpc/platforms/fsl_uli1575.c new file mode 100644 index 000000000000..afc9141be63e --- /dev/null +++ b/arch/powerpc/platforms/fsl_uli1575.c | |||
@@ -0,0 +1,255 @@ | |||
1 | /* | ||
2 | * ULI M1575 setup code - specific to Freescale boards | ||
3 | * | ||
4 | * Copyright 2007 Freescale Semiconductor Inc. | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify it | ||
7 | * under the terms of the GNU General Public License as published by the | ||
8 | * Free Software Foundation; either version 2 of the License, or (at your | ||
9 | * option) any later version. | ||
10 | */ | ||
11 | |||
12 | #include <linux/stddef.h> | ||
13 | #include <linux/kernel.h> | ||
14 | #include <linux/pci.h> | ||
15 | #include <linux/interrupt.h> | ||
16 | #include <linux/mc146818rtc.h> | ||
17 | |||
18 | #include <asm/system.h> | ||
19 | #include <asm/pci-bridge.h> | ||
20 | |||
21 | #define ULI_PIRQA 0x08 | ||
22 | #define ULI_PIRQB 0x09 | ||
23 | #define ULI_PIRQC 0x0a | ||
24 | #define ULI_PIRQD 0x0b | ||
25 | #define ULI_PIRQE 0x0c | ||
26 | #define ULI_PIRQF 0x0d | ||
27 | #define ULI_PIRQG 0x0e | ||
28 | |||
29 | #define ULI_8259_NONE 0x00 | ||
30 | #define ULI_8259_IRQ1 0x08 | ||
31 | #define ULI_8259_IRQ3 0x02 | ||
32 | #define ULI_8259_IRQ4 0x04 | ||
33 | #define ULI_8259_IRQ5 0x05 | ||
34 | #define ULI_8259_IRQ6 0x07 | ||
35 | #define ULI_8259_IRQ7 0x06 | ||
36 | #define ULI_8259_IRQ9 0x01 | ||
37 | #define ULI_8259_IRQ10 0x03 | ||
38 | #define ULI_8259_IRQ11 0x09 | ||
39 | #define ULI_8259_IRQ12 0x0b | ||
40 | #define ULI_8259_IRQ14 0x0d | ||
41 | #define ULI_8259_IRQ15 0x0f | ||
42 | |||
43 | u8 uli_pirq_to_irq[8] = { | ||
44 | ULI_8259_IRQ9, /* PIRQA */ | ||
45 | ULI_8259_IRQ10, /* PIRQB */ | ||
46 | ULI_8259_IRQ11, /* PIRQC */ | ||
47 | ULI_8259_IRQ12, /* PIRQD */ | ||
48 | ULI_8259_IRQ5, /* PIRQE */ | ||
49 | ULI_8259_IRQ6, /* PIRQF */ | ||
50 | ULI_8259_IRQ7, /* PIRQG */ | ||
51 | ULI_8259_NONE, /* PIRQH */ | ||
52 | }; | ||
53 | |||
54 | /* set in board code if you want this quirks to do something */ | ||
55 | int uses_fsl_uli_m1575; | ||
56 | |||
57 | /* Bridge */ | ||
58 | static void __devinit early_uli5249(struct pci_dev *dev) | ||
59 | { | ||
60 | unsigned char temp; | ||
61 | |||
62 | if (!uses_fsl_uli_m1575) | ||
63 | return; | ||
64 | |||
65 | pci_write_config_word(dev, PCI_COMMAND, PCI_COMMAND_IO | | ||
66 | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER); | ||
67 | |||
68 | /* read/write lock */ | ||
69 | pci_read_config_byte(dev, 0x7c, &temp); | ||
70 | pci_write_config_byte(dev, 0x7c, 0x80); | ||
71 | |||
72 | /* set as P2P bridge */ | ||
73 | pci_write_config_byte(dev, PCI_CLASS_PROG, 0x01); | ||
74 | dev->class |= 0x1; | ||
75 | |||
76 | /* restore lock */ | ||
77 | pci_write_config_byte(dev, 0x7c, temp); | ||
78 | } | ||
79 | |||
80 | |||
81 | static void __devinit quirk_uli1575(struct pci_dev *dev) | ||
82 | { | ||
83 | int i; | ||
84 | |||
85 | if (!uses_fsl_uli_m1575) | ||
86 | return; | ||
87 | |||
88 | /* | ||
89 | * ULI1575 interrupts route setup | ||
90 | */ | ||
91 | |||
92 | /* ULI1575 IRQ mapping conf register maps PIRQx to IRQn */ | ||
93 | for (i = 0; i < 4; i++) { | ||
94 | u8 val = uli_pirq_to_irq[i*2] | (uli_pirq_to_irq[i*2+1] << 4); | ||
95 | pci_write_config_byte(dev, 0x48 + i, val); | ||
96 | } | ||
97 | |||
98 | /* USB 1.1 OHCI controller 1: dev 28, func 0 - IRQ12 */ | ||
99 | pci_write_config_byte(dev, 0x86, ULI_PIRQD); | ||
100 | |||
101 | /* USB 1.1 OHCI controller 2: dev 28, func 1 - IRQ9 */ | ||
102 | pci_write_config_byte(dev, 0x87, ULI_PIRQA); | ||
103 | |||
104 | /* USB 1.1 OHCI controller 3: dev 28, func 2 - IRQ10 */ | ||
105 | pci_write_config_byte(dev, 0x88, ULI_PIRQB); | ||
106 | |||
107 | /* Lan controller: dev 27, func 0 - IRQ6 */ | ||
108 | pci_write_config_byte(dev, 0x89, ULI_PIRQF); | ||
109 | |||
110 | /* AC97 Audio controller: dev 29, func 0 - IRQ6 */ | ||
111 | pci_write_config_byte(dev, 0x8a, ULI_PIRQF); | ||
112 | |||
113 | /* Modem controller: dev 29, func 1 - IRQ6 */ | ||
114 | pci_write_config_byte(dev, 0x8b, ULI_PIRQF); | ||
115 | |||
116 | /* HD Audio controller: dev 29, func 2 - IRQ6 */ | ||
117 | pci_write_config_byte(dev, 0x8c, ULI_PIRQF); | ||
118 | |||
119 | /* SATA controller: dev 31, func 1 - IRQ5 */ | ||
120 | pci_write_config_byte(dev, 0x8d, ULI_PIRQE); | ||
121 | |||
122 | /* SMB interrupt: dev 30, func 1 - IRQ7 */ | ||
123 | pci_write_config_byte(dev, 0x8e, ULI_PIRQG); | ||
124 | |||
125 | /* PMU ACPI SCI interrupt: dev 30, func 2 - IRQ7 */ | ||
126 | pci_write_config_byte(dev, 0x8f, ULI_PIRQG); | ||
127 | |||
128 | /* USB 2.0 controller: dev 28, func 3 */ | ||
129 | pci_write_config_byte(dev, 0x74, ULI_8259_IRQ11); | ||
130 | |||
131 | /* Primary PATA IDE IRQ: 14 | ||
132 | * Secondary PATA IDE IRQ: 15 | ||
133 | */ | ||
134 | pci_write_config_byte(dev, 0x44, 0x30 | ULI_8259_IRQ14); | ||
135 | pci_write_config_byte(dev, 0x75, ULI_8259_IRQ15); | ||
136 | } | ||
137 | |||
138 | static void __devinit quirk_final_uli1575(struct pci_dev *dev) | ||
139 | { | ||
140 | /* Set i8259 interrupt trigger | ||
141 | * IRQ 3: Level | ||
142 | * IRQ 4: Level | ||
143 | * IRQ 5: Level | ||
144 | * IRQ 6: Level | ||
145 | * IRQ 7: Level | ||
146 | * IRQ 9: Level | ||
147 | * IRQ 10: Level | ||
148 | * IRQ 11: Level | ||
149 | * IRQ 12: Level | ||
150 | * IRQ 14: Edge | ||
151 | * IRQ 15: Edge | ||
152 | */ | ||
153 | if (!uses_fsl_uli_m1575) | ||
154 | return; | ||
155 | |||
156 | outb(0xfa, 0x4d0); | ||
157 | outb(0x1e, 0x4d1); | ||
158 | |||
159 | /* setup RTC */ | ||
160 | CMOS_WRITE(RTC_SET, RTC_CONTROL); | ||
161 | CMOS_WRITE(RTC_24H, RTC_CONTROL); | ||
162 | |||
163 | /* ensure month, date, and week alarm fields are ignored */ | ||
164 | CMOS_WRITE(0, RTC_VALID); | ||
165 | |||
166 | outb_p(0x7c, 0x72); | ||
167 | outb_p(RTC_ALARM_DONT_CARE, 0x73); | ||
168 | |||
169 | outb_p(0x7d, 0x72); | ||
170 | outb_p(RTC_ALARM_DONT_CARE, 0x73); | ||
171 | } | ||
172 | |||
173 | /* SATA */ | ||
174 | static void __devinit quirk_uli5288(struct pci_dev *dev) | ||
175 | { | ||
176 | unsigned char c; | ||
177 | unsigned int d; | ||
178 | |||
179 | if (!uses_fsl_uli_m1575) | ||
180 | return; | ||
181 | |||
182 | /* read/write lock */ | ||
183 | pci_read_config_byte(dev, 0x83, &c); | ||
184 | pci_write_config_byte(dev, 0x83, c|0x80); | ||
185 | |||
186 | pci_read_config_dword(dev, PCI_CLASS_REVISION, &d); | ||
187 | d = (d & 0xff) | (PCI_CLASS_STORAGE_SATA_AHCI << 8); | ||
188 | pci_write_config_dword(dev, PCI_CLASS_REVISION, d); | ||
189 | |||
190 | /* restore lock */ | ||
191 | pci_write_config_byte(dev, 0x83, c); | ||
192 | |||
193 | /* disable emulated PATA mode enabled */ | ||
194 | pci_read_config_byte(dev, 0x84, &c); | ||
195 | pci_write_config_byte(dev, 0x84, c & ~0x01); | ||
196 | } | ||
197 | |||
198 | /* PATA */ | ||
199 | static void __devinit quirk_uli5229(struct pci_dev *dev) | ||
200 | { | ||
201 | unsigned short temp; | ||
202 | |||
203 | if (!uses_fsl_uli_m1575) | ||
204 | return; | ||
205 | |||
206 | pci_write_config_word(dev, PCI_COMMAND, PCI_COMMAND_INTX_DISABLE | | ||
207 | PCI_COMMAND_MASTER | PCI_COMMAND_IO); | ||
208 | |||
209 | /* Enable Native IRQ 14/15 */ | ||
210 | pci_read_config_word(dev, 0x4a, &temp); | ||
211 | pci_write_config_word(dev, 0x4a, temp | 0x1000); | ||
212 | } | ||
213 | |||
214 | /* We have to do a dummy read on the P2P for the RTC to work, WTF */ | ||
215 | static void __devinit quirk_final_uli5249(struct pci_dev *dev) | ||
216 | { | ||
217 | int i; | ||
218 | u8 *dummy; | ||
219 | struct pci_bus *bus = dev->bus; | ||
220 | |||
221 | for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) { | ||
222 | if ((bus->resource[i]) && | ||
223 | (bus->resource[i]->flags & IORESOURCE_MEM)) { | ||
224 | dummy = ioremap(bus->resource[i]->start, 0x4); | ||
225 | if (dummy) { | ||
226 | in_8(dummy); | ||
227 | iounmap(dummy); | ||
228 | } | ||
229 | break; | ||
230 | } | ||
231 | } | ||
232 | } | ||
233 | |||
234 | DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AL, 0x5249, early_uli5249); | ||
235 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x1575, quirk_uli1575); | ||
236 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x5288, quirk_uli5288); | ||
237 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x5229, quirk_uli5229); | ||
238 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, 0x5249, quirk_final_uli5249); | ||
239 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, 0x1575, quirk_final_uli1575); | ||
240 | |||
241 | int uli_exclude_device(struct pci_controller *hose, | ||
242 | u_char bus, u_char devfn) | ||
243 | { | ||
244 | if (bus == (hose->first_busno + 2)) { | ||
245 | /* exclude Modem controller */ | ||
246 | if ((PCI_SLOT(devfn) == 29) && (PCI_FUNC(devfn) == 1)) | ||
247 | return PCIBIOS_DEVICE_NOT_FOUND; | ||
248 | |||
249 | /* exclude HD Audio controller */ | ||
250 | if ((PCI_SLOT(devfn) == 29) && (PCI_FUNC(devfn) == 2)) | ||
251 | return PCIBIOS_DEVICE_NOT_FOUND; | ||
252 | } | ||
253 | |||
254 | return PCIBIOS_SUCCESSFUL; | ||
255 | } | ||
diff --git a/arch/powerpc/platforms/pasemi/iommu.c b/arch/powerpc/platforms/pasemi/iommu.c index c910ec9c2bdf..6c42787fb382 100644 --- a/arch/powerpc/platforms/pasemi/iommu.c +++ b/arch/powerpc/platforms/pasemi/iommu.c | |||
@@ -93,7 +93,7 @@ static void iobmap_build(struct iommu_table *tbl, long index, | |||
93 | 93 | ||
94 | pr_debug("iobmap: build at: %lx, %lx, addr: %lx\n", index, npages, uaddr); | 94 | pr_debug("iobmap: build at: %lx, %lx, addr: %lx\n", index, npages, uaddr); |
95 | 95 | ||
96 | bus_addr = (tbl->it_offset + index) << PAGE_SHIFT; | 96 | bus_addr = (tbl->it_offset + index) << IOBMAP_PAGE_SHIFT; |
97 | 97 | ||
98 | ip = ((u32 *)tbl->it_base) + index; | 98 | ip = ((u32 *)tbl->it_base) + index; |
99 | 99 | ||
@@ -118,7 +118,7 @@ static void iobmap_free(struct iommu_table *tbl, long index, | |||
118 | 118 | ||
119 | pr_debug("iobmap: free at: %lx, %lx\n", index, npages); | 119 | pr_debug("iobmap: free at: %lx, %lx\n", index, npages); |
120 | 120 | ||
121 | bus_addr = (tbl->it_offset + index) << PAGE_SHIFT; | 121 | bus_addr = (tbl->it_offset + index) << IOBMAP_PAGE_SHIFT; |
122 | 122 | ||
123 | ip = ((u32 *)tbl->it_base) + index; | 123 | ip = ((u32 *)tbl->it_base) + index; |
124 | 124 | ||
@@ -137,7 +137,7 @@ static void iommu_table_iobmap_setup(void) | |||
137 | iommu_table_iobmap.it_busno = 0; | 137 | iommu_table_iobmap.it_busno = 0; |
138 | iommu_table_iobmap.it_offset = 0; | 138 | iommu_table_iobmap.it_offset = 0; |
139 | /* it_size is in number of entries */ | 139 | /* it_size is in number of entries */ |
140 | iommu_table_iobmap.it_size = 0x80000000 >> PAGE_SHIFT; | 140 | iommu_table_iobmap.it_size = 0x80000000 >> IOBMAP_PAGE_SHIFT; |
141 | 141 | ||
142 | /* Initialize the common IOMMU code */ | 142 | /* Initialize the common IOMMU code */ |
143 | iommu_table_iobmap.it_base = (unsigned long)iob_l2_base; | 143 | iommu_table_iobmap.it_base = (unsigned long)iob_l2_base; |
diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c index 2326d5dc5752..ab037a3a40db 100644 --- a/arch/powerpc/sysdev/axonram.c +++ b/arch/powerpc/sysdev/axonram.c | |||
@@ -59,8 +59,7 @@ | |||
59 | struct axon_ram_bank { | 59 | struct axon_ram_bank { |
60 | struct of_device *device; | 60 | struct of_device *device; |
61 | struct gendisk *disk; | 61 | struct gendisk *disk; |
62 | unsigned int irq_correctable; | 62 | unsigned int irq_id; |
63 | unsigned int irq_uncorrectable; | ||
64 | unsigned long ph_addr; | 63 | unsigned long ph_addr; |
65 | unsigned long io_addr; | 64 | unsigned long io_addr; |
66 | unsigned long size; | 65 | unsigned long size; |
@@ -93,16 +92,9 @@ axon_ram_irq_handler(int irq, void *dev) | |||
93 | 92 | ||
94 | BUG_ON(!bank); | 93 | BUG_ON(!bank); |
95 | 94 | ||
96 | if (irq == bank->irq_correctable) { | 95 | dev_err(&device->dev, "Correctable memory error occured\n"); |
97 | dev_err(&device->dev, "Correctable memory error occured\n"); | 96 | bank->ecc_counter++; |
98 | bank->ecc_counter++; | 97 | return IRQ_HANDLED; |
99 | return IRQ_HANDLED; | ||
100 | } else if (irq == bank->irq_uncorrectable) { | ||
101 | dev_err(&device->dev, "Uncorrectable memory error occured\n"); | ||
102 | panic("Critical ECC error on %s", device->node->full_name); | ||
103 | } | ||
104 | |||
105 | return IRQ_NONE; | ||
106 | } | 98 | } |
107 | 99 | ||
108 | /** | 100 | /** |
@@ -259,28 +251,18 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id) | |||
259 | blk_queue_hardsect_size(bank->disk->queue, AXON_RAM_SECTOR_SIZE); | 251 | blk_queue_hardsect_size(bank->disk->queue, AXON_RAM_SECTOR_SIZE); |
260 | add_disk(bank->disk); | 252 | add_disk(bank->disk); |
261 | 253 | ||
262 | bank->irq_correctable = irq_of_parse_and_map(device->node, 0); | 254 | bank->irq_id = irq_of_parse_and_map(device->node, 0); |
263 | bank->irq_uncorrectable = irq_of_parse_and_map(device->node, 1); | 255 | if (bank->irq_id == NO_IRQ) { |
264 | if ((bank->irq_correctable <= 0) || (bank->irq_uncorrectable <= 0)) { | ||
265 | dev_err(&device->dev, "Cannot access ECC interrupt ID\n"); | 256 | dev_err(&device->dev, "Cannot access ECC interrupt ID\n"); |
266 | rc = -EFAULT; | 257 | rc = -EFAULT; |
267 | goto failed; | 258 | goto failed; |
268 | } | 259 | } |
269 | 260 | ||
270 | rc = request_irq(bank->irq_correctable, axon_ram_irq_handler, | 261 | rc = request_irq(bank->irq_id, axon_ram_irq_handler, |
271 | AXON_RAM_IRQ_FLAGS, bank->disk->disk_name, device); | ||
272 | if (rc != 0) { | ||
273 | dev_err(&device->dev, "Cannot register ECC interrupt handler\n"); | ||
274 | bank->irq_correctable = bank->irq_uncorrectable = 0; | ||
275 | rc = -EFAULT; | ||
276 | goto failed; | ||
277 | } | ||
278 | |||
279 | rc = request_irq(bank->irq_uncorrectable, axon_ram_irq_handler, | ||
280 | AXON_RAM_IRQ_FLAGS, bank->disk->disk_name, device); | 262 | AXON_RAM_IRQ_FLAGS, bank->disk->disk_name, device); |
281 | if (rc != 0) { | 263 | if (rc != 0) { |
282 | dev_err(&device->dev, "Cannot register ECC interrupt handler\n"); | 264 | dev_err(&device->dev, "Cannot register ECC interrupt handler\n"); |
283 | bank->irq_uncorrectable = 0; | 265 | bank->irq_id = NO_IRQ; |
284 | rc = -EFAULT; | 266 | rc = -EFAULT; |
285 | goto failed; | 267 | goto failed; |
286 | } | 268 | } |
@@ -296,13 +278,9 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id) | |||
296 | 278 | ||
297 | failed: | 279 | failed: |
298 | if (bank != NULL) { | 280 | if (bank != NULL) { |
299 | if (bank->irq_uncorrectable > 0) | 281 | if (bank->irq_id != NO_IRQ) |
300 | free_irq(bank->irq_uncorrectable, device); | 282 | free_irq(bank->irq_id, device); |
301 | if (bank->irq_correctable > 0) | ||
302 | free_irq(bank->irq_correctable, device); | ||
303 | if (bank->disk != NULL) { | 283 | if (bank->disk != NULL) { |
304 | if (bank->disk->queue != NULL) | ||
305 | blk_cleanup_queue(bank->disk->queue); | ||
306 | if (bank->disk->major > 0) | 284 | if (bank->disk->major > 0) |
307 | unregister_blkdev(bank->disk->major, | 285 | unregister_blkdev(bank->disk->major, |
308 | bank->disk->disk_name); | 286 | bank->disk->disk_name); |
@@ -329,9 +307,7 @@ axon_ram_remove(struct of_device *device) | |||
329 | BUG_ON(!bank || !bank->disk); | 307 | BUG_ON(!bank || !bank->disk); |
330 | 308 | ||
331 | device_remove_file(&device->dev, &dev_attr_ecc); | 309 | device_remove_file(&device->dev, &dev_attr_ecc); |
332 | free_irq(bank->irq_uncorrectable, device); | 310 | free_irq(bank->irq_id, device); |
333 | free_irq(bank->irq_correctable, device); | ||
334 | blk_cleanup_queue(bank->disk->queue); | ||
335 | unregister_blkdev(bank->disk->major, bank->disk->disk_name); | 311 | unregister_blkdev(bank->disk->major, bank->disk->disk_name); |
336 | del_gendisk(bank->disk); | 312 | del_gendisk(bank->disk); |
337 | iounmap((void __iomem *) bank->io_addr); | 313 | iounmap((void __iomem *) bank->io_addr); |
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 9fb0ce5c7176..114c90f8f560 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c | |||
@@ -251,6 +251,8 @@ DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8568E, quirk_fsl_pcie_transpare | |||
251 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8568, quirk_fsl_pcie_transparent); | 251 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8568, quirk_fsl_pcie_transparent); |
252 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8567E, quirk_fsl_pcie_transparent); | 252 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8567E, quirk_fsl_pcie_transparent); |
253 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8567, quirk_fsl_pcie_transparent); | 253 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8567, quirk_fsl_pcie_transparent); |
254 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8533E, quirk_fsl_pcie_transparent); | ||
255 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8533, quirk_fsl_pcie_transparent); | ||
254 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8544E, quirk_fsl_pcie_transparent); | 256 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8544E, quirk_fsl_pcie_transparent); |
255 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8544, quirk_fsl_pcie_transparent); | 257 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8544, quirk_fsl_pcie_transparent); |
256 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8641, quirk_fsl_pcie_transparent); | 258 | DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8641, quirk_fsl_pcie_transparent); |
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c index 565f57d777fe..f3abce11bead 100644 --- a/arch/powerpc/sysdev/fsl_soc.c +++ b/arch/powerpc/sysdev/fsl_soc.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
23 | #include <linux/device.h> | 23 | #include <linux/device.h> |
24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
25 | #include <linux/of_platform.h> | ||
25 | #include <linux/phy.h> | 26 | #include <linux/phy.h> |
26 | #include <linux/fsl_devices.h> | 27 | #include <linux/fsl_devices.h> |
27 | #include <linux/fs_enet_pd.h> | 28 | #include <linux/fs_enet_pd.h> |
diff --git a/arch/powerpc/sysdev/rtc_cmos_setup.c b/arch/powerpc/sysdev/rtc_cmos_setup.c index e276048b8c5f..0c9ac7ee08fb 100644 --- a/arch/powerpc/sysdev/rtc_cmos_setup.c +++ b/arch/powerpc/sysdev/rtc_cmos_setup.c | |||
@@ -20,14 +20,16 @@ static int __init add_rtc(void) | |||
20 | { | 20 | { |
21 | struct device_node *np; | 21 | struct device_node *np; |
22 | struct platform_device *pd; | 22 | struct platform_device *pd; |
23 | struct resource res; | 23 | struct resource res[2]; |
24 | int ret; | 24 | int ret; |
25 | 25 | ||
26 | memset(&res, 0, sizeof(res)); | ||
27 | |||
26 | np = of_find_compatible_node(NULL, NULL, "pnpPNP,b00"); | 28 | np = of_find_compatible_node(NULL, NULL, "pnpPNP,b00"); |
27 | if (!np) | 29 | if (!np) |
28 | return -ENODEV; | 30 | return -ENODEV; |
29 | 31 | ||
30 | ret = of_address_to_resource(np, 0, &res); | 32 | ret = of_address_to_resource(np, 0, &res[0]); |
31 | of_node_put(np); | 33 | of_node_put(np); |
32 | if (ret) | 34 | if (ret) |
33 | return ret; | 35 | return ret; |
@@ -36,11 +38,18 @@ static int __init add_rtc(void) | |||
36 | * RTC_PORT(x) is hardcoded in asm/mc146818rtc.h. Verify that the | 38 | * RTC_PORT(x) is hardcoded in asm/mc146818rtc.h. Verify that the |
37 | * address provided by the device node matches. | 39 | * address provided by the device node matches. |
38 | */ | 40 | */ |
39 | if (res.start != RTC_PORT(0)) | 41 | if (res[0].start != RTC_PORT(0)) |
40 | return -EINVAL; | 42 | return -EINVAL; |
41 | 43 | ||
44 | /* Use a fixed interrupt value of 8 since on PPC if we are using this | ||
45 | * its off an i8259 which we ensure has interrupt numbers 0..15. */ | ||
46 | res[1].start = 8; | ||
47 | res[1].end = 8; | ||
48 | res[1].flags = IORESOURCE_IRQ; | ||
49 | |||
42 | pd = platform_device_register_simple("rtc_cmos", -1, | 50 | pd = platform_device_register_simple("rtc_cmos", -1, |
43 | &res, 1); | 51 | &res[0], 2); |
52 | |||
44 | if (IS_ERR(pd)) | 53 | if (IS_ERR(pd)) |
45 | return PTR_ERR(pd); | 54 | return PTR_ERR(pd); |
46 | 55 | ||
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c index ad4ca75c0f04..5245717295b8 100644 --- a/arch/s390/hypfs/inode.c +++ b/arch/s390/hypfs/inode.c | |||
@@ -60,17 +60,28 @@ static void hypfs_add_dentry(struct dentry *dentry) | |||
60 | hypfs_last_dentry = dentry; | 60 | hypfs_last_dentry = dentry; |
61 | } | 61 | } |
62 | 62 | ||
63 | static inline int hypfs_positive(struct dentry *dentry) | ||
64 | { | ||
65 | return dentry->d_inode && !d_unhashed(dentry); | ||
66 | } | ||
67 | |||
63 | static void hypfs_remove(struct dentry *dentry) | 68 | static void hypfs_remove(struct dentry *dentry) |
64 | { | 69 | { |
65 | struct dentry *parent; | 70 | struct dentry *parent; |
66 | 71 | ||
67 | parent = dentry->d_parent; | 72 | parent = dentry->d_parent; |
68 | if (S_ISDIR(dentry->d_inode->i_mode)) | 73 | if (!parent || !parent->d_inode) |
69 | simple_rmdir(parent->d_inode, dentry); | 74 | return; |
70 | else | 75 | mutex_lock(&parent->d_inode->i_mutex); |
71 | simple_unlink(parent->d_inode, dentry); | 76 | if (hypfs_positive(dentry)) { |
77 | if (S_ISDIR(dentry->d_inode->i_mode)) | ||
78 | simple_rmdir(parent->d_inode, dentry); | ||
79 | else | ||
80 | simple_unlink(parent->d_inode, dentry); | ||
81 | } | ||
72 | d_delete(dentry); | 82 | d_delete(dentry); |
73 | dput(dentry); | 83 | dput(dentry); |
84 | mutex_unlock(&parent->d_inode->i_mutex); | ||
74 | } | 85 | } |
75 | 86 | ||
76 | static void hypfs_delete_tree(struct dentry *root) | 87 | static void hypfs_delete_tree(struct dentry *root) |
@@ -315,6 +326,7 @@ static int hypfs_fill_super(struct super_block *sb, void *data, int silent) | |||
315 | } | 326 | } |
316 | hypfs_update_update(sb); | 327 | hypfs_update_update(sb); |
317 | sb->s_root = root_dentry; | 328 | sb->s_root = root_dentry; |
329 | printk(KERN_INFO "hypfs: Hypervisor filesystem mounted\n"); | ||
318 | return 0; | 330 | return 0; |
319 | 331 | ||
320 | err_tree: | 332 | err_tree: |
@@ -356,13 +368,17 @@ static struct dentry *hypfs_create_file(struct super_block *sb, | |||
356 | qname.name = name; | 368 | qname.name = name; |
357 | qname.len = strlen(name); | 369 | qname.len = strlen(name); |
358 | qname.hash = full_name_hash(name, qname.len); | 370 | qname.hash = full_name_hash(name, qname.len); |
371 | mutex_lock(&parent->d_inode->i_mutex); | ||
359 | dentry = lookup_one_len(name, parent, strlen(name)); | 372 | dentry = lookup_one_len(name, parent, strlen(name)); |
360 | if (IS_ERR(dentry)) | 373 | if (IS_ERR(dentry)) { |
361 | return ERR_PTR(-ENOMEM); | 374 | dentry = ERR_PTR(-ENOMEM); |
375 | goto fail; | ||
376 | } | ||
362 | inode = hypfs_make_inode(sb, mode); | 377 | inode = hypfs_make_inode(sb, mode); |
363 | if (!inode) { | 378 | if (!inode) { |
364 | dput(dentry); | 379 | dput(dentry); |
365 | return ERR_PTR(-ENOMEM); | 380 | dentry = ERR_PTR(-ENOMEM); |
381 | goto fail; | ||
366 | } | 382 | } |
367 | if (mode & S_IFREG) { | 383 | if (mode & S_IFREG) { |
368 | inode->i_fop = &hypfs_file_ops; | 384 | inode->i_fop = &hypfs_file_ops; |
@@ -379,6 +395,8 @@ static struct dentry *hypfs_create_file(struct super_block *sb, | |||
379 | inode->i_private = data; | 395 | inode->i_private = data; |
380 | d_instantiate(dentry, inode); | 396 | d_instantiate(dentry, inode); |
381 | dget(dentry); | 397 | dget(dentry); |
398 | fail: | ||
399 | mutex_unlock(&parent->d_inode->i_mutex); | ||
382 | return dentry; | 400 | return dentry; |
383 | } | 401 | } |
384 | 402 | ||
@@ -391,7 +409,6 @@ struct dentry *hypfs_mkdir(struct super_block *sb, struct dentry *parent, | |||
391 | if (IS_ERR(dentry)) | 409 | if (IS_ERR(dentry)) |
392 | return dentry; | 410 | return dentry; |
393 | hypfs_add_dentry(dentry); | 411 | hypfs_add_dentry(dentry); |
394 | parent->d_inode->i_nlink++; | ||
395 | return dentry; | 412 | return dentry; |
396 | } | 413 | } |
397 | 414 | ||
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile index 3195d375bd51..56cb71007cd9 100644 --- a/arch/s390/kernel/Makefile +++ b/arch/s390/kernel/Makefile | |||
@@ -6,7 +6,7 @@ EXTRA_AFLAGS := -traditional | |||
6 | 6 | ||
7 | obj-y := bitmap.o traps.o time.o process.o base.o early.o \ | 7 | obj-y := bitmap.o traps.o time.o process.o base.o early.o \ |
8 | setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \ | 8 | setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \ |
9 | semaphore.o s390_ext.o debug.o irq.o ipl.o dis.o | 9 | semaphore.o s390_ext.o debug.o irq.o ipl.o dis.o diag.o |
10 | 10 | ||
11 | obj-y += $(if $(CONFIG_64BIT),entry64.o,entry.o) | 11 | obj-y += $(if $(CONFIG_64BIT),entry64.o,entry.o) |
12 | obj-y += $(if $(CONFIG_64BIT),reipl64.o,reipl.o) | 12 | obj-y += $(if $(CONFIG_64BIT),reipl64.o,reipl.o) |
diff --git a/arch/s390/kernel/diag.c b/arch/s390/kernel/diag.c new file mode 100644 index 000000000000..c032d11da8a1 --- /dev/null +++ b/arch/s390/kernel/diag.c | |||
@@ -0,0 +1,102 @@ | |||
1 | /* | ||
2 | * Implementation of s390 diagnose codes | ||
3 | * | ||
4 | * Copyright IBM Corp. 2007 | ||
5 | * Author(s): Michael Holzheu <holzheu@de.ibm.com> | ||
6 | */ | ||
7 | |||
8 | #include <linux/module.h> | ||
9 | #include <asm/diag.h> | ||
10 | |||
11 | /* | ||
12 | * Diagnose 10: Release pages | ||
13 | */ | ||
14 | void diag10(unsigned long addr) | ||
15 | { | ||
16 | if (addr >= 0x7ff00000) | ||
17 | return; | ||
18 | asm volatile( | ||
19 | #ifdef CONFIG_64BIT | ||
20 | " sam31\n" | ||
21 | " diag %0,%0,0x10\n" | ||
22 | "0: sam64\n" | ||
23 | #else | ||
24 | " diag %0,%0,0x10\n" | ||
25 | "0:\n" | ||
26 | #endif | ||
27 | EX_TABLE(0b, 0b) | ||
28 | : : "a" (addr)); | ||
29 | } | ||
30 | EXPORT_SYMBOL(diag10); | ||
31 | |||
32 | /* | ||
33 | * Diagnose 14: Input spool file manipulation | ||
34 | */ | ||
35 | int diag14(unsigned long rx, unsigned long ry1, unsigned long subcode) | ||
36 | { | ||
37 | register unsigned long _ry1 asm("2") = ry1; | ||
38 | register unsigned long _ry2 asm("3") = subcode; | ||
39 | int rc = 0; | ||
40 | |||
41 | asm volatile( | ||
42 | #ifdef CONFIG_64BIT | ||
43 | " sam31\n" | ||
44 | " diag %2,2,0x14\n" | ||
45 | " sam64\n" | ||
46 | #else | ||
47 | " diag %2,2,0x14\n" | ||
48 | #endif | ||
49 | " ipm %0\n" | ||
50 | " srl %0,28\n" | ||
51 | : "=d" (rc), "+d" (_ry2) | ||
52 | : "d" (rx), "d" (_ry1) | ||
53 | : "cc"); | ||
54 | |||
55 | return rc; | ||
56 | } | ||
57 | EXPORT_SYMBOL(diag14); | ||
58 | |||
59 | /* | ||
60 | * Diagnose 210: Get information about a virtual device | ||
61 | */ | ||
62 | int diag210(struct diag210 *addr) | ||
63 | { | ||
64 | /* | ||
65 | * diag 210 needs its data below the 2GB border, so we | ||
66 | * use a static data area to be sure | ||
67 | */ | ||
68 | static struct diag210 diag210_tmp; | ||
69 | static DEFINE_SPINLOCK(diag210_lock); | ||
70 | unsigned long flags; | ||
71 | int ccode; | ||
72 | |||
73 | spin_lock_irqsave(&diag210_lock, flags); | ||
74 | diag210_tmp = *addr; | ||
75 | |||
76 | #ifdef CONFIG_64BIT | ||
77 | asm volatile( | ||
78 | " lhi %0,-1\n" | ||
79 | " sam31\n" | ||
80 | " diag %1,0,0x210\n" | ||
81 | "0: ipm %0\n" | ||
82 | " srl %0,28\n" | ||
83 | "1: sam64\n" | ||
84 | EX_TABLE(0b, 1b) | ||
85 | : "=&d" (ccode) : "a" (&diag210_tmp) : "cc", "memory"); | ||
86 | #else | ||
87 | asm volatile( | ||
88 | " lhi %0,-1\n" | ||
89 | " diag %1,0,0x210\n" | ||
90 | "0: ipm %0\n" | ||
91 | " srl %0,28\n" | ||
92 | "1:\n" | ||
93 | EX_TABLE(0b, 1b) | ||
94 | : "=&d" (ccode) : "a" (&diag210_tmp) : "cc", "memory"); | ||
95 | #endif | ||
96 | |||
97 | *addr = diag210_tmp; | ||
98 | spin_unlock_irqrestore(&diag210_lock, flags); | ||
99 | |||
100 | return ccode; | ||
101 | } | ||
102 | EXPORT_SYMBOL(diag210); | ||
diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c index d3057318f2bf..50d2235df732 100644 --- a/arch/s390/kernel/dis.c +++ b/arch/s390/kernel/dis.c | |||
@@ -577,7 +577,7 @@ static struct insn opcode_b2[] = { | |||
577 | { "esta", 0x4a, INSTR_RRE_RR }, | 577 | { "esta", 0x4a, INSTR_RRE_RR }, |
578 | { "lura", 0x4b, INSTR_RRE_RR }, | 578 | { "lura", 0x4b, INSTR_RRE_RR }, |
579 | { "tar", 0x4c, INSTR_RRE_AR }, | 579 | { "tar", 0x4c, INSTR_RRE_AR }, |
580 | { "cpya", INSTR_RRE_AA }, | 580 | { "cpya", 0x4d, INSTR_RRE_AA }, |
581 | { "sar", 0x4e, INSTR_RRE_AR }, | 581 | { "sar", 0x4e, INSTR_RRE_AR }, |
582 | { "ear", 0x4f, INSTR_RRE_RA }, | 582 | { "ear", 0x4f, INSTR_RRE_RA }, |
583 | { "csp", 0x50, INSTR_RRE_RR }, | 583 | { "csp", 0x50, INSTR_RRE_RR }, |
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c index 358d2bbbc481..e40373d9fbce 100644 --- a/arch/s390/kernel/kprobes.c +++ b/arch/s390/kernel/kprobes.c | |||
@@ -85,7 +85,7 @@ void __kprobes get_instruction_type(struct arch_specific_insn *ainsn) | |||
85 | ainsn->reg = (*ainsn->insn & 0xf0) >> 4; | 85 | ainsn->reg = (*ainsn->insn & 0xf0) >> 4; |
86 | 86 | ||
87 | /* save the instruction length (pop 5-5) in bytes */ | 87 | /* save the instruction length (pop 5-5) in bytes */ |
88 | switch (*(__u8 *) (ainsn->insn) >> 4) { | 88 | switch (*(__u8 *) (ainsn->insn) >> 6) { |
89 | case 0: | 89 | case 0: |
90 | ainsn->ilen = 2; | 90 | ainsn->ilen = 2; |
91 | break; | 91 | break; |
diff --git a/arch/s390/kernel/s390_ksyms.c b/arch/s390/kernel/s390_ksyms.c index 90b5ef529eb7..7234c737f825 100644 --- a/arch/s390/kernel/s390_ksyms.c +++ b/arch/s390/kernel/s390_ksyms.c | |||
@@ -25,7 +25,6 @@ EXPORT_SYMBOL(_oi_bitmap); | |||
25 | EXPORT_SYMBOL(_ni_bitmap); | 25 | EXPORT_SYMBOL(_ni_bitmap); |
26 | EXPORT_SYMBOL(_zb_findmap); | 26 | EXPORT_SYMBOL(_zb_findmap); |
27 | EXPORT_SYMBOL(_sb_findmap); | 27 | EXPORT_SYMBOL(_sb_findmap); |
28 | EXPORT_SYMBOL(diag10); | ||
29 | 28 | ||
30 | /* | 29 | /* |
31 | * semaphore ops | 30 | * semaphore ops |
diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c index c5b2f4f078bc..fabc50adc46a 100644 --- a/arch/s390/mm/cmm.c +++ b/arch/s390/mm/cmm.c | |||
@@ -20,6 +20,7 @@ | |||
20 | 20 | ||
21 | #include <asm/pgalloc.h> | 21 | #include <asm/pgalloc.h> |
22 | #include <asm/uaccess.h> | 22 | #include <asm/uaccess.h> |
23 | #include <asm/diag.h> | ||
23 | 24 | ||
24 | static char *sender = "VMRMSVM"; | 25 | static char *sender = "VMRMSVM"; |
25 | module_param(sender, charp, 0400); | 26 | module_param(sender, charp, 0400); |
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index 9098531a2671..3a25bbf2eb0a 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c | |||
@@ -42,23 +42,6 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | |||
42 | pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__((__aligned__(PAGE_SIZE))); | 42 | pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__((__aligned__(PAGE_SIZE))); |
43 | char empty_zero_page[PAGE_SIZE] __attribute__((__aligned__(PAGE_SIZE))); | 43 | char empty_zero_page[PAGE_SIZE] __attribute__((__aligned__(PAGE_SIZE))); |
44 | 44 | ||
45 | void diag10(unsigned long addr) | ||
46 | { | ||
47 | if (addr >= 0x7ff00000) | ||
48 | return; | ||
49 | asm volatile( | ||
50 | #ifdef CONFIG_64BIT | ||
51 | " sam31\n" | ||
52 | " diag %0,%0,0x10\n" | ||
53 | "0: sam64\n" | ||
54 | #else | ||
55 | " diag %0,%0,0x10\n" | ||
56 | "0:\n" | ||
57 | #endif | ||
58 | EX_TABLE(0b,0b) | ||
59 | : : "a" (addr)); | ||
60 | } | ||
61 | |||
62 | void show_mem(void) | 45 | void show_mem(void) |
63 | { | 46 | { |
64 | int i, total = 0, reserved = 0; | 47 | int i, total = 0, reserved = 0; |
diff --git a/arch/sh/Makefile b/arch/sh/Makefile index 3d211aa33cd8..97ac58682d0f 100644 --- a/arch/sh/Makefile +++ b/arch/sh/Makefile | |||
@@ -34,6 +34,8 @@ isa-y := $(isa-y)-nofpu | |||
34 | endif | 34 | endif |
35 | endif | 35 | endif |
36 | 36 | ||
37 | isa-y := $(isa-y)-up | ||
38 | |||
37 | cflags-$(CONFIG_CPU_SH2) := $(call cc-option,-m2,) | 39 | cflags-$(CONFIG_CPU_SH2) := $(call cc-option,-m2,) |
38 | cflags-$(CONFIG_CPU_SH2A) += $(call cc-option,-m2a,) \ | 40 | cflags-$(CONFIG_CPU_SH2A) += $(call cc-option,-m2a,) \ |
39 | $(call cc-option,-m2a-nofpu,) | 41 | $(call cc-option,-m2a-nofpu,) |
@@ -46,7 +48,20 @@ cflags-$(CONFIG_CPU_SH4A) += $(call cc-option,-m4a,) \ | |||
46 | cflags-$(CONFIG_CPU_BIG_ENDIAN) += -mb | 48 | cflags-$(CONFIG_CPU_BIG_ENDIAN) += -mb |
47 | cflags-$(CONFIG_CPU_LITTLE_ENDIAN) += -ml | 49 | cflags-$(CONFIG_CPU_LITTLE_ENDIAN) += -ml |
48 | 50 | ||
49 | cflags-y += $(call as-option,-Wa$(comma)-isa=$(isa-y),) -ffreestanding | 51 | # |
52 | # -Wa,-isa= tuning implies -Wa,-dsp for the versions of binutils that | ||
53 | # support it, while -Wa,-dsp by itself limits the range of usable opcodes | ||
54 | # on certain CPU subtypes. Try the ISA variant first, and if that fails, | ||
55 | # fall back on -Wa,-dsp for the old binutils versions. Even without DSP | ||
56 | # opcodes, we always want the best ISA tuning the version of binutils | ||
57 | # will provide. | ||
58 | # | ||
59 | isaflags-y := $(call as-option,-Wa$(comma)-isa=$(isa-y),) | ||
60 | |||
61 | isaflags-$(CONFIG_SH_DSP) := \ | ||
62 | $(call as-option,-Wa$(comma)-isa=$(isa-y),-Wa$(comma)-dsp) | ||
63 | |||
64 | cflags-y += $(isaflags-y) -ffreestanding | ||
50 | 65 | ||
51 | cflags-$(CONFIG_MORE_COMPILE_OPTIONS) += \ | 66 | cflags-$(CONFIG_MORE_COMPILE_OPTIONS) += \ |
52 | $(shell echo $(CONFIG_COMPILE_OPTIONS) | sed -e 's/"//g') | 67 | $(shell echo $(CONFIG_COMPILE_OPTIONS) | sed -e 's/"//g') |
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c index 6e4e96541358..dab193293f20 100644 --- a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c +++ b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c | |||
@@ -41,3 +41,8 @@ static int __init sh4202_devices_setup(void) | |||
41 | ARRAY_SIZE(sh4202_devices)); | 41 | ARRAY_SIZE(sh4202_devices)); |
42 | } | 42 | } |
43 | __initcall(sh4202_devices_setup); | 43 | __initcall(sh4202_devices_setup); |
44 | |||
45 | void __init plat_irq_setup(void) | ||
46 | { | ||
47 | /* do nothing - all IRL interrupts are handled by the board code */ | ||
48 | } | ||
diff --git a/arch/sh/kernel/early_printk.c b/arch/sh/kernel/early_printk.c index 9833493d8867..80b637c30203 100644 --- a/arch/sh/kernel/early_printk.c +++ b/arch/sh/kernel/early_printk.c | |||
@@ -76,7 +76,7 @@ static void scif_sercon_putc(int c) | |||
76 | sci_in(&scif_port, SCxSR); | 76 | sci_in(&scif_port, SCxSR); |
77 | sci_out(&scif_port, SCxSR, 0xf3 & ~(0x20 | 0x40)); | 77 | sci_out(&scif_port, SCxSR, 0xf3 & ~(0x20 | 0x40)); |
78 | 78 | ||
79 | while ((sci_in(&scif_port, SCxSR) & 0x40) == 0); | 79 | while ((sci_in(&scif_port, SCxSR) & 0x40) == 0) |
80 | ; | 80 | ; |
81 | 81 | ||
82 | if (c == '\n') | 82 | if (c == '\n') |
diff --git a/arch/sh/kernel/machvec.c b/arch/sh/kernel/machvec.c index 23c5948f0124..129b2cfd18a8 100644 --- a/arch/sh/kernel/machvec.c +++ b/arch/sh/kernel/machvec.c | |||
@@ -91,6 +91,13 @@ void __init sh_mv_setup(void) | |||
91 | (unsigned long)&__machvec_start); | 91 | (unsigned long)&__machvec_start); |
92 | 92 | ||
93 | /* | 93 | /* |
94 | * Sanity check for machvec section alignment. Ensure | ||
95 | * __initmv hasn't been misused. | ||
96 | */ | ||
97 | if (machvec_size % sizeof(struct sh_machine_vector)) | ||
98 | panic("machvec misaligned, invalid __initmv use?"); | ||
99 | |||
100 | /* | ||
94 | * If the machvec hasn't been preselected, use the first | 101 | * If the machvec hasn't been preselected, use the first |
95 | * vector (usually the only one) from .machvec.init. | 102 | * vector (usually the only one) from .machvec.init. |
96 | */ | 103 | */ |
diff --git a/arch/sh/kernel/ptrace.c b/arch/sh/kernel/ptrace.c index 891d1d46c902..f64a2d2416d4 100644 --- a/arch/sh/kernel/ptrace.c +++ b/arch/sh/kernel/ptrace.c | |||
@@ -93,6 +93,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
93 | case PTRACE_PEEKTEXT: /* read word at location addr. */ | 93 | case PTRACE_PEEKTEXT: /* read word at location addr. */ |
94 | case PTRACE_PEEKDATA: | 94 | case PTRACE_PEEKDATA: |
95 | ret = generic_ptrace_peekdata(child, addr, data); | 95 | ret = generic_ptrace_peekdata(child, addr, data); |
96 | break; | ||
96 | 97 | ||
97 | /* read the word at location addr in the USER area. */ | 98 | /* read the word at location addr in the USER area. */ |
98 | case PTRACE_PEEKUSR: { | 99 | case PTRACE_PEEKUSR: { |
diff --git a/arch/sh64/kernel/setup.c b/arch/sh64/kernel/setup.c index 53e9d20a874a..2b7264c0c6f7 100644 --- a/arch/sh64/kernel/setup.c +++ b/arch/sh64/kernel/setup.c | |||
@@ -59,10 +59,6 @@ | |||
59 | #include <asm/setup.h> | 59 | #include <asm/setup.h> |
60 | #include <asm/smp.h> | 60 | #include <asm/smp.h> |
61 | 61 | ||
62 | #ifdef CONFIG_VT | ||
63 | #include <linux/console.h> | ||
64 | #endif | ||
65 | |||
66 | struct screen_info screen_info; | 62 | struct screen_info screen_info; |
67 | 63 | ||
68 | #ifdef CONFIG_BLK_DEV_RAM | 64 | #ifdef CONFIG_BLK_DEV_RAM |
diff --git a/arch/sh64/kernel/signal.c b/arch/sh64/kernel/signal.c index 0bb4a8f94276..79fc48cf54c6 100644 --- a/arch/sh64/kernel/signal.c +++ b/arch/sh64/kernel/signal.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <linux/ptrace.h> | 25 | #include <linux/ptrace.h> |
26 | #include <linux/unistd.h> | 26 | #include <linux/unistd.h> |
27 | #include <linux/stddef.h> | 27 | #include <linux/stddef.h> |
28 | #include <linux/personality.h> | ||
29 | #include <asm/ucontext.h> | 28 | #include <asm/ucontext.h> |
30 | #include <asm/uaccess.h> | 29 | #include <asm/uaccess.h> |
31 | #include <asm/pgtable.h> | 30 | #include <asm/pgtable.h> |
diff --git a/arch/sparc/kernel/ebus.c b/arch/sparc/kernel/ebus.c index ac352eb6dff3..e2d02fd13f35 100644 --- a/arch/sparc/kernel/ebus.c +++ b/arch/sparc/kernel/ebus.c | |||
@@ -238,6 +238,7 @@ void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *d | |||
238 | sd = &dev->ofdev.dev.archdata; | 238 | sd = &dev->ofdev.dev.archdata; |
239 | sd->prom_node = dp; | 239 | sd->prom_node = dp; |
240 | sd->op = &dev->ofdev; | 240 | sd->op = &dev->ofdev; |
241 | sd->iommu = dev->bus->ofdev.dev.parent->archdata.iommu; | ||
241 | 242 | ||
242 | dev->ofdev.node = dp; | 243 | dev->ofdev.node = dp; |
243 | dev->ofdev.dev.parent = &dev->bus->ofdev.dev; | 244 | dev->ofdev.dev.parent = &dev->bus->ofdev.dev; |
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile index 9ddc5b9ce3bd..76effdbea075 100644 --- a/arch/sparc/lib/Makefile +++ b/arch/sparc/lib/Makefile | |||
@@ -8,6 +8,7 @@ lib-y := mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o memcpy.o memset.o \ | |||
8 | strlen.o checksum.o blockops.o memscan.o memcmp.o strncmp.o \ | 8 | strlen.o checksum.o blockops.o memscan.o memcmp.o strncmp.o \ |
9 | strncpy_from_user.o divdi3.o udivdi3.o strlen_user.o \ | 9 | strncpy_from_user.o divdi3.o udivdi3.o strlen_user.o \ |
10 | copy_user.o locks.o atomic.o \ | 10 | copy_user.o locks.o atomic.o \ |
11 | lshrdi3.o ashldi3.o rwsem.o muldi3.o bitext.o | 11 | lshrdi3.o ashldi3.o rwsem.o muldi3.o bitext.o \ |
12 | cmpdi2.o | ||
12 | 13 | ||
13 | obj-y += iomap.o atomic32.o | 14 | obj-y += iomap.o atomic32.o |
diff --git a/arch/sparc/lib/cmpdi2.c b/arch/sparc/lib/cmpdi2.c new file mode 100644 index 000000000000..8c1306437ed1 --- /dev/null +++ b/arch/sparc/lib/cmpdi2.c | |||
@@ -0,0 +1,27 @@ | |||
1 | #include <linux/module.h> | ||
2 | |||
3 | #include "libgcc.h" | ||
4 | |||
5 | word_type __cmpdi2(long long a, long long b) | ||
6 | { | ||
7 | const DWunion au = { | ||
8 | .ll = a | ||
9 | }; | ||
10 | const DWunion bu = { | ||
11 | .ll = b | ||
12 | }; | ||
13 | |||
14 | if (au.s.high < bu.s.high) | ||
15 | return 0; | ||
16 | else if (au.s.high > bu.s.high) | ||
17 | return 2; | ||
18 | |||
19 | if ((unsigned int) au.s.low < (unsigned int) bu.s.low) | ||
20 | return 0; | ||
21 | else if ((unsigned int) au.s.low > (unsigned int) bu.s.low) | ||
22 | return 2; | ||
23 | |||
24 | return 1; | ||
25 | } | ||
26 | |||
27 | EXPORT_SYMBOL(__cmpdi2); | ||
diff --git a/arch/sparc/lib/libgcc.h b/arch/sparc/lib/libgcc.h new file mode 100644 index 000000000000..b84fd797f3ea --- /dev/null +++ b/arch/sparc/lib/libgcc.h | |||
@@ -0,0 +1,18 @@ | |||
1 | #ifndef __ASM_LIBGCC_H | ||
2 | #define __ASM_LIBGCC_H | ||
3 | |||
4 | #include <asm/byteorder.h> | ||
5 | |||
6 | typedef int word_type __attribute__ ((mode (__word__))); | ||
7 | |||
8 | struct DWstruct { | ||
9 | int high, low; | ||
10 | }; | ||
11 | |||
12 | typedef union | ||
13 | { | ||
14 | struct DWstruct s; | ||
15 | long long ll; | ||
16 | } DWunion; | ||
17 | |||
18 | #endif /* __ASM_LIBGCC_H */ | ||
diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c index 4ccda77d08d6..7c89893b1fe8 100644 --- a/arch/sparc/mm/io-unit.c +++ b/arch/sparc/mm/io-unit.c | |||
@@ -66,7 +66,7 @@ iounit_init(int sbi_node, int io_node, struct sbus_bus *sbus) | |||
66 | } | 66 | } |
67 | if(!xpt) panic("Cannot map External Page Table."); | 67 | if(!xpt) panic("Cannot map External Page Table."); |
68 | 68 | ||
69 | sbus->iommu = (struct iommu_struct *)iounit; | 69 | sbus->ofdev.dev.archdata.iommu = iounit; |
70 | iounit->page_table = xpt; | 70 | iounit->page_table = xpt; |
71 | spin_lock_init(&iounit->lock); | 71 | spin_lock_init(&iounit->lock); |
72 | 72 | ||
@@ -127,7 +127,7 @@ nexti: scan = find_next_zero_bit(iounit->bmap, limit, scan); | |||
127 | static __u32 iounit_get_scsi_one(char *vaddr, unsigned long len, struct sbus_bus *sbus) | 127 | static __u32 iounit_get_scsi_one(char *vaddr, unsigned long len, struct sbus_bus *sbus) |
128 | { | 128 | { |
129 | unsigned long ret, flags; | 129 | unsigned long ret, flags; |
130 | struct iounit_struct *iounit = (struct iounit_struct *)sbus->iommu; | 130 | struct iounit_struct *iounit = sbus->ofdev.dev.archdata.iommu; |
131 | 131 | ||
132 | spin_lock_irqsave(&iounit->lock, flags); | 132 | spin_lock_irqsave(&iounit->lock, flags); |
133 | ret = iounit_get_area(iounit, (unsigned long)vaddr, len); | 133 | ret = iounit_get_area(iounit, (unsigned long)vaddr, len); |
@@ -138,7 +138,7 @@ static __u32 iounit_get_scsi_one(char *vaddr, unsigned long len, struct sbus_bus | |||
138 | static void iounit_get_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_bus *sbus) | 138 | static void iounit_get_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_bus *sbus) |
139 | { | 139 | { |
140 | unsigned long flags; | 140 | unsigned long flags; |
141 | struct iounit_struct *iounit = (struct iounit_struct *)sbus->iommu; | 141 | struct iounit_struct *iounit = sbus->ofdev.dev.archdata.iommu; |
142 | 142 | ||
143 | /* FIXME: Cache some resolved pages - often several sg entries are to the same page */ | 143 | /* FIXME: Cache some resolved pages - often several sg entries are to the same page */ |
144 | spin_lock_irqsave(&iounit->lock, flags); | 144 | spin_lock_irqsave(&iounit->lock, flags); |
@@ -153,7 +153,7 @@ static void iounit_get_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_bus | |||
153 | static void iounit_release_scsi_one(__u32 vaddr, unsigned long len, struct sbus_bus *sbus) | 153 | static void iounit_release_scsi_one(__u32 vaddr, unsigned long len, struct sbus_bus *sbus) |
154 | { | 154 | { |
155 | unsigned long flags; | 155 | unsigned long flags; |
156 | struct iounit_struct *iounit = (struct iounit_struct *)sbus->iommu; | 156 | struct iounit_struct *iounit = sbus->ofdev.dev.archdata.iommu; |
157 | 157 | ||
158 | spin_lock_irqsave(&iounit->lock, flags); | 158 | spin_lock_irqsave(&iounit->lock, flags); |
159 | len = ((vaddr & ~PAGE_MASK) + len + (PAGE_SIZE-1)) >> PAGE_SHIFT; | 159 | len = ((vaddr & ~PAGE_MASK) + len + (PAGE_SIZE-1)) >> PAGE_SHIFT; |
@@ -168,7 +168,7 @@ static void iounit_release_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_ | |||
168 | { | 168 | { |
169 | unsigned long flags; | 169 | unsigned long flags; |
170 | unsigned long vaddr, len; | 170 | unsigned long vaddr, len; |
171 | struct iounit_struct *iounit = (struct iounit_struct *)sbus->iommu; | 171 | struct iounit_struct *iounit = sbus->ofdev.dev.archdata.iommu; |
172 | 172 | ||
173 | spin_lock_irqsave(&iounit->lock, flags); | 173 | spin_lock_irqsave(&iounit->lock, flags); |
174 | while (sz != 0) { | 174 | while (sz != 0) { |
@@ -211,7 +211,7 @@ static int iounit_map_dma_area(dma_addr_t *pba, unsigned long va, __u32 addr, in | |||
211 | i = ((addr - IOUNIT_DMA_BASE) >> PAGE_SHIFT); | 211 | i = ((addr - IOUNIT_DMA_BASE) >> PAGE_SHIFT); |
212 | 212 | ||
213 | for_each_sbus(sbus) { | 213 | for_each_sbus(sbus) { |
214 | struct iounit_struct *iounit = (struct iounit_struct *)sbus->iommu; | 214 | struct iounit_struct *iounit = sbus->ofdev.dev.archdata.iommu; |
215 | 215 | ||
216 | iopte = (iopte_t *)(iounit->page_table + i); | 216 | iopte = (iopte_t *)(iounit->page_table + i); |
217 | *iopte = MKIOPTE(__pa(page)); | 217 | *iopte = MKIOPTE(__pa(page)); |
@@ -235,7 +235,7 @@ static void iounit_unmap_dma_area(unsigned long addr, int len) | |||
235 | static struct page *iounit_translate_dvma(unsigned long addr) | 235 | static struct page *iounit_translate_dvma(unsigned long addr) |
236 | { | 236 | { |
237 | struct sbus_bus *sbus = sbus_root; /* They are all the same */ | 237 | struct sbus_bus *sbus = sbus_root; /* They are all the same */ |
238 | struct iounit_struct *iounit = (struct iounit_struct *)sbus->iommu; | 238 | struct iounit_struct *iounit = sbus->ofdev.dev.archdata.iommu; |
239 | int i; | 239 | int i; |
240 | iopte_t *iopte; | 240 | iopte_t *iopte; |
241 | 241 | ||
@@ -279,7 +279,7 @@ __u32 iounit_map_dma_init(struct sbus_bus *sbus, int size) | |||
279 | unsigned long rotor, scan, limit; | 279 | unsigned long rotor, scan, limit; |
280 | unsigned long flags; | 280 | unsigned long flags; |
281 | __u32 ret; | 281 | __u32 ret; |
282 | struct iounit_struct *iounit = (struct iounit_struct *)sbus->iommu; | 282 | struct iounit_struct *iounit = sbus->ofdev.dev.archdata.iommu; |
283 | 283 | ||
284 | npages = (size + (PAGE_SIZE-1)) >> PAGE_SHIFT; | 284 | npages = (size + (PAGE_SIZE-1)) >> PAGE_SHIFT; |
285 | i = 0x0213; | 285 | i = 0x0213; |
@@ -315,7 +315,7 @@ nexti: scan = find_next_zero_bit(iounit->bmap, limit, scan); | |||
315 | __u32 iounit_map_dma_page(__u32 vaddr, void *addr, struct sbus_bus *sbus) | 315 | __u32 iounit_map_dma_page(__u32 vaddr, void *addr, struct sbus_bus *sbus) |
316 | { | 316 | { |
317 | int scan = (vaddr - IOUNIT_DMA_BASE) >> PAGE_SHIFT; | 317 | int scan = (vaddr - IOUNIT_DMA_BASE) >> PAGE_SHIFT; |
318 | struct iounit_struct *iounit = (struct iounit_struct *)sbus->iommu; | 318 | struct iounit_struct *iounit = sbus->ofdev.dev.archdata.iommu; |
319 | 319 | ||
320 | iounit->page_table[scan] = MKIOPTE(__pa(((unsigned long)addr) & PAGE_MASK)); | 320 | iounit->page_table[scan] = MKIOPTE(__pa(((unsigned long)addr) & PAGE_MASK)); |
321 | return vaddr + (((unsigned long)addr) & ~PAGE_MASK); | 321 | return vaddr + (((unsigned long)addr) & ~PAGE_MASK); |
diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c index be042efd1ba4..52e907af9d29 100644 --- a/arch/sparc/mm/iommu.c +++ b/arch/sparc/mm/iommu.c | |||
@@ -132,7 +132,7 @@ iommu_init(int iommund, struct sbus_bus *sbus) | |||
132 | impl, vers, iommu->page_table, | 132 | impl, vers, iommu->page_table, |
133 | (int)(IOMMU_NPTES*sizeof(iopte_t)), (int)IOMMU_NPTES); | 133 | (int)(IOMMU_NPTES*sizeof(iopte_t)), (int)IOMMU_NPTES); |
134 | 134 | ||
135 | sbus->iommu = iommu; | 135 | sbus->ofdev.dev.archdata.iommu = iommu; |
136 | } | 136 | } |
137 | 137 | ||
138 | /* This begs to be btfixup-ed by srmmu. */ | 138 | /* This begs to be btfixup-ed by srmmu. */ |
@@ -166,7 +166,7 @@ static void iommu_flush_iotlb(iopte_t *iopte, unsigned int niopte) | |||
166 | 166 | ||
167 | static u32 iommu_get_one(struct page *page, int npages, struct sbus_bus *sbus) | 167 | static u32 iommu_get_one(struct page *page, int npages, struct sbus_bus *sbus) |
168 | { | 168 | { |
169 | struct iommu_struct *iommu = sbus->iommu; | 169 | struct iommu_struct *iommu = sbus->ofdev.dev.archdata.iommu; |
170 | int ioptex; | 170 | int ioptex; |
171 | iopte_t *iopte, *iopte0; | 171 | iopte_t *iopte, *iopte0; |
172 | unsigned int busa, busa0; | 172 | unsigned int busa, busa0; |
@@ -291,7 +291,7 @@ static void iommu_get_scsi_sgl_pflush(struct scatterlist *sg, int sz, struct sbu | |||
291 | 291 | ||
292 | static void iommu_release_one(u32 busa, int npages, struct sbus_bus *sbus) | 292 | static void iommu_release_one(u32 busa, int npages, struct sbus_bus *sbus) |
293 | { | 293 | { |
294 | struct iommu_struct *iommu = sbus->iommu; | 294 | struct iommu_struct *iommu = sbus->ofdev.dev.archdata.iommu; |
295 | int ioptex; | 295 | int ioptex; |
296 | int i; | 296 | int i; |
297 | 297 | ||
@@ -334,7 +334,7 @@ static int iommu_map_dma_area(dma_addr_t *pba, unsigned long va, | |||
334 | unsigned long addr, int len) | 334 | unsigned long addr, int len) |
335 | { | 335 | { |
336 | unsigned long page, end; | 336 | unsigned long page, end; |
337 | struct iommu_struct *iommu = sbus_root->iommu; | 337 | struct iommu_struct *iommu = sbus_root->ofdev.dev.archdata.iommu; |
338 | iopte_t *iopte = iommu->page_table; | 338 | iopte_t *iopte = iommu->page_table; |
339 | iopte_t *first; | 339 | iopte_t *first; |
340 | int ioptex; | 340 | int ioptex; |
@@ -399,7 +399,7 @@ static int iommu_map_dma_area(dma_addr_t *pba, unsigned long va, | |||
399 | 399 | ||
400 | static void iommu_unmap_dma_area(unsigned long busa, int len) | 400 | static void iommu_unmap_dma_area(unsigned long busa, int len) |
401 | { | 401 | { |
402 | struct iommu_struct *iommu = sbus_root->iommu; | 402 | struct iommu_struct *iommu = sbus_root->ofdev.dev.archdata.iommu; |
403 | iopte_t *iopte = iommu->page_table; | 403 | iopte_t *iopte = iommu->page_table; |
404 | unsigned long end; | 404 | unsigned long end; |
405 | int ioptex = (busa - iommu->start) >> PAGE_SHIFT; | 405 | int ioptex = (busa - iommu->start) >> PAGE_SHIFT; |
@@ -420,7 +420,7 @@ static void iommu_unmap_dma_area(unsigned long busa, int len) | |||
420 | 420 | ||
421 | static struct page *iommu_translate_dvma(unsigned long busa) | 421 | static struct page *iommu_translate_dvma(unsigned long busa) |
422 | { | 422 | { |
423 | struct iommu_struct *iommu = sbus_root->iommu; | 423 | struct iommu_struct *iommu = sbus_root->ofdev.dev.archdata.iommu; |
424 | iopte_t *iopte = iommu->page_table; | 424 | iopte_t *iopte = iommu->page_table; |
425 | 425 | ||
426 | iopte += ((busa - iommu->start) >> PAGE_SHIFT); | 426 | iopte += ((busa - iommu->start) >> PAGE_SHIFT); |
diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c index 79d60d86f6f8..005a3e72d4f2 100644 --- a/arch/sparc/mm/sun4c.c +++ b/arch/sparc/mm/sun4c.c | |||
@@ -268,7 +268,6 @@ static inline void sun4c_init_clean_mmu(unsigned long kernel_end) | |||
268 | unsigned char savectx, ctx; | 268 | unsigned char savectx, ctx; |
269 | 269 | ||
270 | savectx = sun4c_get_context(); | 270 | savectx = sun4c_get_context(); |
271 | kernel_end = SUN4C_REAL_PGDIR_ALIGN(kernel_end); | ||
272 | for (ctx = 0; ctx < num_contexts; ctx++) { | 271 | for (ctx = 0; ctx < num_contexts; ctx++) { |
273 | sun4c_set_context(ctx); | 272 | sun4c_set_context(ctx); |
274 | for (vaddr = 0; vaddr < 0x20000000; vaddr += SUN4C_REAL_PGDIR_SIZE) | 273 | for (vaddr = 0; vaddr < 0x20000000; vaddr += SUN4C_REAL_PGDIR_SIZE) |
@@ -2064,7 +2063,6 @@ void __init sun4c_paging_init(void) | |||
2064 | unsigned long end_pfn, pages_avail; | 2063 | unsigned long end_pfn, pages_avail; |
2065 | 2064 | ||
2066 | kernel_end = (unsigned long) &end; | 2065 | kernel_end = (unsigned long) &end; |
2067 | kernel_end += (SUN4C_REAL_PGDIR_SIZE * 4); | ||
2068 | kernel_end = SUN4C_REAL_PGDIR_ALIGN(kernel_end); | 2066 | kernel_end = SUN4C_REAL_PGDIR_ALIGN(kernel_end); |
2069 | 2067 | ||
2070 | pages_avail = 0; | 2068 | pages_avail = 0; |
diff --git a/arch/sparc/prom/console.c b/arch/sparc/prom/console.c index 8d1cfb0d5068..2a007a784415 100644 --- a/arch/sparc/prom/console.c +++ b/arch/sparc/prom/console.c | |||
@@ -17,9 +17,6 @@ | |||
17 | 17 | ||
18 | extern void restore_current(void); | 18 | extern void restore_current(void); |
19 | 19 | ||
20 | static char con_name_jmc[] = "/obio/su@"; /* "/obio/su@0,3002f8"; */ | ||
21 | #define CON_SIZE_JMC (sizeof(con_name_jmc)) | ||
22 | |||
23 | /* Non blocking get character from console input device, returns -1 | 20 | /* Non blocking get character from console input device, returns -1 |
24 | * if no input was taken. This can be used for polling. | 21 | * if no input was taken. This can be used for polling. |
25 | */ | 22 | */ |
diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S index ac18bd8e273f..63144ad476f6 100644 --- a/arch/sparc64/kernel/head.S +++ b/arch/sparc64/kernel/head.S | |||
@@ -501,7 +501,7 @@ niagara_tlb_fixup: | |||
501 | cmp %g1, SUN4V_CHIP_NIAGARA1 | 501 | cmp %g1, SUN4V_CHIP_NIAGARA1 |
502 | be,pt %xcc, niagara_patch | 502 | be,pt %xcc, niagara_patch |
503 | cmp %g1, SUN4V_CHIP_NIAGARA2 | 503 | cmp %g1, SUN4V_CHIP_NIAGARA2 |
504 | be,pt %xcc, niagara_patch | 504 | be,pt %xcc, niagara2_patch |
505 | nop | 505 | nop |
506 | 506 | ||
507 | call generic_patch_copyops | 507 | call generic_patch_copyops |
@@ -512,6 +512,15 @@ niagara_tlb_fixup: | |||
512 | nop | 512 | nop |
513 | 513 | ||
514 | ba,a,pt %xcc, 80f | 514 | ba,a,pt %xcc, 80f |
515 | niagara2_patch: | ||
516 | call niagara2_patch_copyops | ||
517 | nop | ||
518 | call niagara_patch_bzero | ||
519 | nop | ||
520 | call niagara2_patch_pageops | ||
521 | nop | ||
522 | |||
523 | ba,a,pt %xcc, 80f | ||
515 | 524 | ||
516 | niagara_patch: | 525 | niagara_patch: |
517 | call niagara_patch_copyops | 526 | call niagara_patch_copyops |
@@ -706,12 +715,13 @@ setup_trap_table: | |||
706 | 715 | ||
707 | membar #Sync | 716 | membar #Sync |
708 | 717 | ||
718 | BRANCH_IF_SUN4V(o2, 1f) | ||
719 | |||
709 | /* Kill PROM timer */ | 720 | /* Kill PROM timer */ |
710 | sethi %hi(0x80000000), %o2 | 721 | sethi %hi(0x80000000), %o2 |
711 | sllx %o2, 32, %o2 | 722 | sllx %o2, 32, %o2 |
712 | wr %o2, 0, %tick_cmpr | 723 | wr %o2, 0, %tick_cmpr |
713 | 724 | ||
714 | BRANCH_IF_SUN4V(o2, 1f) | ||
715 | BRANCH_IF_ANY_CHEETAH(o2, o3, 1f) | 725 | BRANCH_IF_ANY_CHEETAH(o2, o3, 1f) |
716 | 726 | ||
717 | ba,pt %xcc, 2f | 727 | ba,pt %xcc, 2f |
diff --git a/arch/sparc64/kernel/mdesc.c b/arch/sparc64/kernel/mdesc.c index 95059c2ec414..9f22e4ff6015 100644 --- a/arch/sparc64/kernel/mdesc.c +++ b/arch/sparc64/kernel/mdesc.c | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <linux/list.h> | 9 | #include <linux/list.h> |
10 | #include <linux/slab.h> | 10 | #include <linux/slab.h> |
11 | #include <linux/mm.h> | 11 | #include <linux/mm.h> |
12 | #include <linux/miscdevice.h> | ||
12 | 13 | ||
13 | #include <asm/hypervisor.h> | 14 | #include <asm/hypervisor.h> |
14 | #include <asm/mdesc.h> | 15 | #include <asm/mdesc.h> |
@@ -836,6 +837,43 @@ void __devinit mdesc_fill_in_cpu_data(cpumask_t mask) | |||
836 | mdesc_release(hp); | 837 | mdesc_release(hp); |
837 | } | 838 | } |
838 | 839 | ||
840 | static ssize_t mdesc_read(struct file *file, char __user *buf, | ||
841 | size_t len, loff_t *offp) | ||
842 | { | ||
843 | struct mdesc_handle *hp = mdesc_grab(); | ||
844 | int err; | ||
845 | |||
846 | if (!hp) | ||
847 | return -ENODEV; | ||
848 | |||
849 | err = hp->handle_size; | ||
850 | if (len < hp->handle_size) | ||
851 | err = -EMSGSIZE; | ||
852 | else if (copy_to_user(buf, &hp->mdesc, hp->handle_size)) | ||
853 | err = -EFAULT; | ||
854 | mdesc_release(hp); | ||
855 | |||
856 | return err; | ||
857 | } | ||
858 | |||
859 | static const struct file_operations mdesc_fops = { | ||
860 | .read = mdesc_read, | ||
861 | .owner = THIS_MODULE, | ||
862 | }; | ||
863 | |||
864 | static struct miscdevice mdesc_misc = { | ||
865 | .minor = MISC_DYNAMIC_MINOR, | ||
866 | .name = "mdesc", | ||
867 | .fops = &mdesc_fops, | ||
868 | }; | ||
869 | |||
870 | static int __init mdesc_misc_init(void) | ||
871 | { | ||
872 | return misc_register(&mdesc_misc); | ||
873 | } | ||
874 | |||
875 | __initcall(mdesc_misc_init); | ||
876 | |||
839 | void __init sun4v_mdesc_init(void) | 877 | void __init sun4v_mdesc_init(void) |
840 | { | 878 | { |
841 | struct mdesc_handle *hp; | 879 | struct mdesc_handle *hp; |
diff --git a/arch/sparc64/kernel/trampoline.S b/arch/sparc64/kernel/trampoline.S index 9448595f9063..9533a25ce5d2 100644 --- a/arch/sparc64/kernel/trampoline.S +++ b/arch/sparc64/kernel/trampoline.S | |||
@@ -95,14 +95,13 @@ spitfire_startup: | |||
95 | membar #Sync | 95 | membar #Sync |
96 | 96 | ||
97 | startup_continue: | 97 | startup_continue: |
98 | mov %o0, %l0 | ||
99 | BRANCH_IF_SUN4V(g1, niagara_lock_tlb) | ||
100 | |||
98 | sethi %hi(0x80000000), %g2 | 101 | sethi %hi(0x80000000), %g2 |
99 | sllx %g2, 32, %g2 | 102 | sllx %g2, 32, %g2 |
100 | wr %g2, 0, %tick_cmpr | 103 | wr %g2, 0, %tick_cmpr |
101 | 104 | ||
102 | mov %o0, %l0 | ||
103 | |||
104 | BRANCH_IF_SUN4V(g1, niagara_lock_tlb) | ||
105 | |||
106 | /* Call OBP by hand to lock KERNBASE into i/d tlbs. | 105 | /* Call OBP by hand to lock KERNBASE into i/d tlbs. |
107 | * We lock 2 consequetive entries if we are 'bigkernel'. | 106 | * We lock 2 consequetive entries if we are 'bigkernel'. |
108 | */ | 107 | */ |
diff --git a/arch/sparc64/lib/Makefile b/arch/sparc64/lib/Makefile index f95fbfa3eeb8..f095e13910bc 100644 --- a/arch/sparc64/lib/Makefile +++ b/arch/sparc64/lib/Makefile | |||
@@ -13,6 +13,8 @@ lib-y := PeeCeeI.o copy_page.o clear_page.o strlen.o strncmp.o \ | |||
13 | U3memcpy.o U3copy_from_user.o U3copy_to_user.o U3patch.o \ | 13 | U3memcpy.o U3copy_from_user.o U3copy_to_user.o U3patch.o \ |
14 | NGmemcpy.o NGcopy_from_user.o NGcopy_to_user.o NGpatch.o \ | 14 | NGmemcpy.o NGcopy_from_user.o NGcopy_to_user.o NGpatch.o \ |
15 | NGpage.o NGbzero.o \ | 15 | NGpage.o NGbzero.o \ |
16 | NG2memcpy.o NG2copy_from_user.o NG2copy_to_user.o NG2patch.o \ | ||
17 | NG2page.o \ | ||
16 | GENmemcpy.o GENcopy_from_user.o GENcopy_to_user.o GENpatch.o \ | 18 | GENmemcpy.o GENcopy_from_user.o GENcopy_to_user.o GENpatch.o \ |
17 | GENpage.o GENbzero.o \ | 19 | GENpage.o GENbzero.o \ |
18 | copy_in_user.o user_fixup.o memmove.o \ | 20 | copy_in_user.o user_fixup.o memmove.o \ |
diff --git a/arch/sparc64/lib/NG2copy_from_user.S b/arch/sparc64/lib/NG2copy_from_user.S new file mode 100644 index 000000000000..c77ef5f22102 --- /dev/null +++ b/arch/sparc64/lib/NG2copy_from_user.S | |||
@@ -0,0 +1,40 @@ | |||
1 | /* NG2copy_from_user.S: Niagara-2 optimized copy from userspace. | ||
2 | * | ||
3 | * Copyright (C) 2007 David S. Miller (davem@davemloft.net) | ||
4 | */ | ||
5 | |||
6 | #define EX_LD(x) \ | ||
7 | 98: x; \ | ||
8 | .section .fixup; \ | ||
9 | .align 4; \ | ||
10 | 99: wr %g0, ASI_AIUS, %asi;\ | ||
11 | retl; \ | ||
12 | mov 1, %o0; \ | ||
13 | .section __ex_table,"a";\ | ||
14 | .align 4; \ | ||
15 | .word 98b, 99b; \ | ||
16 | .text; \ | ||
17 | .align 4; | ||
18 | |||
19 | #ifndef ASI_AIUS | ||
20 | #define ASI_AIUS 0x11 | ||
21 | #endif | ||
22 | |||
23 | #ifndef ASI_BLK_AIUS_4V | ||
24 | #define ASI_BLK_AIUS_4V 0x17 | ||
25 | #endif | ||
26 | |||
27 | #define FUNC_NAME NG2copy_from_user | ||
28 | #define LOAD(type,addr,dest) type##a [addr] %asi, dest | ||
29 | #define LOAD_BLK(addr,dest) ldda [addr] ASI_BLK_AIUS_4V, dest | ||
30 | #define EX_RETVAL(x) 0 | ||
31 | |||
32 | #ifdef __KERNEL__ | ||
33 | #define PREAMBLE \ | ||
34 | rd %asi, %g1; \ | ||
35 | cmp %g1, ASI_AIUS; \ | ||
36 | bne,pn %icc, memcpy_user_stub; \ | ||
37 | nop | ||
38 | #endif | ||
39 | |||
40 | #include "NG2memcpy.S" | ||
diff --git a/arch/sparc64/lib/NG2copy_to_user.S b/arch/sparc64/lib/NG2copy_to_user.S new file mode 100644 index 000000000000..4bd4093acbbd --- /dev/null +++ b/arch/sparc64/lib/NG2copy_to_user.S | |||
@@ -0,0 +1,49 @@ | |||
1 | /* NG2copy_to_user.S: Niagara-2 optimized copy to userspace. | ||
2 | * | ||
3 | * Copyright (C) 2007 David S. Miller (davem@davemloft.net) | ||
4 | */ | ||
5 | |||
6 | #define EX_ST(x) \ | ||
7 | 98: x; \ | ||
8 | .section .fixup; \ | ||
9 | .align 4; \ | ||
10 | 99: wr %g0, ASI_AIUS, %asi;\ | ||
11 | retl; \ | ||
12 | mov 1, %o0; \ | ||
13 | .section __ex_table,"a";\ | ||
14 | .align 4; \ | ||
15 | .word 98b, 99b; \ | ||
16 | .text; \ | ||
17 | .align 4; | ||
18 | |||
19 | #ifndef ASI_AIUS | ||
20 | #define ASI_AIUS 0x11 | ||
21 | #endif | ||
22 | |||
23 | #ifndef ASI_BLK_AIUS_4V | ||
24 | #define ASI_BLK_AIUS_4V 0x17 | ||
25 | #endif | ||
26 | |||
27 | #ifndef ASI_BLK_INIT_QUAD_LDD_AIUS | ||
28 | #define ASI_BLK_INIT_QUAD_LDD_AIUS 0x23 | ||
29 | #endif | ||
30 | |||
31 | #define FUNC_NAME NG2copy_to_user | ||
32 | #define STORE(type,src,addr) type##a src, [addr] ASI_AIUS | ||
33 | #define STORE_ASI ASI_BLK_INIT_QUAD_LDD_AIUS | ||
34 | #define STORE_BLK(src,addr) stda src, [addr] ASI_BLK_AIUS_4V | ||
35 | #define EX_RETVAL(x) 0 | ||
36 | |||
37 | #ifdef __KERNEL__ | ||
38 | /* Writing to %asi is _expensive_ so we hardcode it. | ||
39 | * Reading %asi to check for KERNEL_DS is comparatively | ||
40 | * cheap. | ||
41 | */ | ||
42 | #define PREAMBLE \ | ||
43 | rd %asi, %g1; \ | ||
44 | cmp %g1, ASI_AIUS; \ | ||
45 | bne,pn %icc, memcpy_user_stub; \ | ||
46 | nop | ||
47 | #endif | ||
48 | |||
49 | #include "NG2memcpy.S" | ||
diff --git a/arch/sparc64/lib/NG2memcpy.S b/arch/sparc64/lib/NG2memcpy.S new file mode 100644 index 000000000000..0aed75653b50 --- /dev/null +++ b/arch/sparc64/lib/NG2memcpy.S | |||
@@ -0,0 +1,520 @@ | |||
1 | /* NG2memcpy.S: Niagara-2 optimized memcpy. | ||
2 | * | ||
3 | * Copyright (C) 2007 David S. Miller (davem@davemloft.net) | ||
4 | */ | ||
5 | |||
6 | #ifdef __KERNEL__ | ||
7 | #include <asm/visasm.h> | ||
8 | #include <asm/asi.h> | ||
9 | #define GLOBAL_SPARE %g7 | ||
10 | #else | ||
11 | #define ASI_PNF 0x82 | ||
12 | #define ASI_BLK_P 0xf0 | ||
13 | #define ASI_BLK_INIT_QUAD_LDD_P 0xe2 | ||
14 | #define FPRS_FEF 0x04 | ||
15 | #ifdef MEMCPY_DEBUG | ||
16 | #define VISEntryHalf rd %fprs, %o5; wr %g0, FPRS_FEF, %fprs; \ | ||
17 | clr %g1; clr %g2; clr %g3; subcc %g0, %g0, %g0; | ||
18 | #define VISExitHalf and %o5, FPRS_FEF, %o5; wr %o5, 0x0, %fprs | ||
19 | #else | ||
20 | #define VISEntryHalf rd %fprs, %o5; wr %g0, FPRS_FEF, %fprs | ||
21 | #define VISExitHalf and %o5, FPRS_FEF, %o5; wr %o5, 0x0, %fprs | ||
22 | #endif | ||
23 | #define GLOBAL_SPARE %g5 | ||
24 | #endif | ||
25 | |||
26 | #ifndef STORE_ASI | ||
27 | #ifndef SIMULATE_NIAGARA_ON_NON_NIAGARA | ||
28 | #define STORE_ASI ASI_BLK_INIT_QUAD_LDD_P | ||
29 | #else | ||
30 | #define STORE_ASI 0x80 /* ASI_P */ | ||
31 | #endif | ||
32 | #endif | ||
33 | |||
34 | #ifndef EX_LD | ||
35 | #define EX_LD(x) x | ||
36 | #endif | ||
37 | |||
38 | #ifndef EX_ST | ||
39 | #define EX_ST(x) x | ||
40 | #endif | ||
41 | |||
42 | #ifndef EX_RETVAL | ||
43 | #define EX_RETVAL(x) x | ||
44 | #endif | ||
45 | |||
46 | #ifndef LOAD | ||
47 | #define LOAD(type,addr,dest) type [addr], dest | ||
48 | #endif | ||
49 | |||
50 | #ifndef LOAD_BLK | ||
51 | #define LOAD_BLK(addr,dest) ldda [addr] ASI_BLK_P, dest | ||
52 | #endif | ||
53 | |||
54 | #ifndef STORE | ||
55 | #ifndef MEMCPY_DEBUG | ||
56 | #define STORE(type,src,addr) type src, [addr] | ||
57 | #else | ||
58 | #define STORE(type,src,addr) type##a src, [addr] 0x80 | ||
59 | #endif | ||
60 | #endif | ||
61 | |||
62 | #ifndef STORE_BLK | ||
63 | #define STORE_BLK(src,addr) stda src, [addr] ASI_BLK_P | ||
64 | #endif | ||
65 | |||
66 | #ifndef STORE_INIT | ||
67 | #define STORE_INIT(src,addr) stxa src, [addr] STORE_ASI | ||
68 | #endif | ||
69 | |||
70 | #ifndef FUNC_NAME | ||
71 | #define FUNC_NAME NG2memcpy | ||
72 | #endif | ||
73 | |||
74 | #ifndef PREAMBLE | ||
75 | #define PREAMBLE | ||
76 | #endif | ||
77 | |||
78 | #ifndef XCC | ||
79 | #define XCC xcc | ||
80 | #endif | ||
81 | |||
82 | #define FREG_FROB(x0, x1, x2, x3, x4, x5, x6, x7, x8) \ | ||
83 | faligndata %x0, %x1, %f0; \ | ||
84 | faligndata %x1, %x2, %f2; \ | ||
85 | faligndata %x2, %x3, %f4; \ | ||
86 | faligndata %x3, %x4, %f6; \ | ||
87 | faligndata %x4, %x5, %f8; \ | ||
88 | faligndata %x5, %x6, %f10; \ | ||
89 | faligndata %x6, %x7, %f12; \ | ||
90 | faligndata %x7, %x8, %f14; | ||
91 | |||
92 | #define FREG_MOVE_1(x0) \ | ||
93 | fmovd %x0, %f0; | ||
94 | #define FREG_MOVE_2(x0, x1) \ | ||
95 | fmovd %x0, %f0; \ | ||
96 | fmovd %x1, %f2; | ||
97 | #define FREG_MOVE_3(x0, x1, x2) \ | ||
98 | fmovd %x0, %f0; \ | ||
99 | fmovd %x1, %f2; \ | ||
100 | fmovd %x2, %f4; | ||
101 | #define FREG_MOVE_4(x0, x1, x2, x3) \ | ||
102 | fmovd %x0, %f0; \ | ||
103 | fmovd %x1, %f2; \ | ||
104 | fmovd %x2, %f4; \ | ||
105 | fmovd %x3, %f6; | ||
106 | #define FREG_MOVE_5(x0, x1, x2, x3, x4) \ | ||
107 | fmovd %x0, %f0; \ | ||
108 | fmovd %x1, %f2; \ | ||
109 | fmovd %x2, %f4; \ | ||
110 | fmovd %x3, %f6; \ | ||
111 | fmovd %x4, %f8; | ||
112 | #define FREG_MOVE_6(x0, x1, x2, x3, x4, x5) \ | ||
113 | fmovd %x0, %f0; \ | ||
114 | fmovd %x1, %f2; \ | ||
115 | fmovd %x2, %f4; \ | ||
116 | fmovd %x3, %f6; \ | ||
117 | fmovd %x4, %f8; \ | ||
118 | fmovd %x5, %f10; | ||
119 | #define FREG_MOVE_7(x0, x1, x2, x3, x4, x5, x6) \ | ||
120 | fmovd %x0, %f0; \ | ||
121 | fmovd %x1, %f2; \ | ||
122 | fmovd %x2, %f4; \ | ||
123 | fmovd %x3, %f6; \ | ||
124 | fmovd %x4, %f8; \ | ||
125 | fmovd %x5, %f10; \ | ||
126 | fmovd %x6, %f12; | ||
127 | #define FREG_MOVE_8(x0, x1, x2, x3, x4, x5, x6, x7) \ | ||
128 | fmovd %x0, %f0; \ | ||
129 | fmovd %x1, %f2; \ | ||
130 | fmovd %x2, %f4; \ | ||
131 | fmovd %x3, %f6; \ | ||
132 | fmovd %x4, %f8; \ | ||
133 | fmovd %x5, %f10; \ | ||
134 | fmovd %x6, %f12; \ | ||
135 | fmovd %x7, %f14; | ||
136 | #define FREG_LOAD_1(base, x0) \ | ||
137 | EX_LD(LOAD(ldd, base + 0x00, %x0)) | ||
138 | #define FREG_LOAD_2(base, x0, x1) \ | ||
139 | EX_LD(LOAD(ldd, base + 0x00, %x0)); \ | ||
140 | EX_LD(LOAD(ldd, base + 0x08, %x1)); | ||
141 | #define FREG_LOAD_3(base, x0, x1, x2) \ | ||
142 | EX_LD(LOAD(ldd, base + 0x00, %x0)); \ | ||
143 | EX_LD(LOAD(ldd, base + 0x08, %x1)); \ | ||
144 | EX_LD(LOAD(ldd, base + 0x10, %x2)); | ||
145 | #define FREG_LOAD_4(base, x0, x1, x2, x3) \ | ||
146 | EX_LD(LOAD(ldd, base + 0x00, %x0)); \ | ||
147 | EX_LD(LOAD(ldd, base + 0x08, %x1)); \ | ||
148 | EX_LD(LOAD(ldd, base + 0x10, %x2)); \ | ||
149 | EX_LD(LOAD(ldd, base + 0x18, %x3)); | ||
150 | #define FREG_LOAD_5(base, x0, x1, x2, x3, x4) \ | ||
151 | EX_LD(LOAD(ldd, base + 0x00, %x0)); \ | ||
152 | EX_LD(LOAD(ldd, base + 0x08, %x1)); \ | ||
153 | EX_LD(LOAD(ldd, base + 0x10, %x2)); \ | ||
154 | EX_LD(LOAD(ldd, base + 0x18, %x3)); \ | ||
155 | EX_LD(LOAD(ldd, base + 0x20, %x4)); | ||
156 | #define FREG_LOAD_6(base, x0, x1, x2, x3, x4, x5) \ | ||
157 | EX_LD(LOAD(ldd, base + 0x00, %x0)); \ | ||
158 | EX_LD(LOAD(ldd, base + 0x08, %x1)); \ | ||
159 | EX_LD(LOAD(ldd, base + 0x10, %x2)); \ | ||
160 | EX_LD(LOAD(ldd, base + 0x18, %x3)); \ | ||
161 | EX_LD(LOAD(ldd, base + 0x20, %x4)); \ | ||
162 | EX_LD(LOAD(ldd, base + 0x28, %x5)); | ||
163 | #define FREG_LOAD_7(base, x0, x1, x2, x3, x4, x5, x6) \ | ||
164 | EX_LD(LOAD(ldd, base + 0x00, %x0)); \ | ||
165 | EX_LD(LOAD(ldd, base + 0x08, %x1)); \ | ||
166 | EX_LD(LOAD(ldd, base + 0x10, %x2)); \ | ||
167 | EX_LD(LOAD(ldd, base + 0x18, %x3)); \ | ||
168 | EX_LD(LOAD(ldd, base + 0x20, %x4)); \ | ||
169 | EX_LD(LOAD(ldd, base + 0x28, %x5)); \ | ||
170 | EX_LD(LOAD(ldd, base + 0x30, %x6)); | ||
171 | |||
172 | .register %g2,#scratch | ||
173 | .register %g3,#scratch | ||
174 | |||
175 | .text | ||
176 | .align 64 | ||
177 | |||
178 | .globl FUNC_NAME | ||
179 | .type FUNC_NAME,#function | ||
180 | FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */ | ||
181 | srlx %o2, 31, %g2 | ||
182 | cmp %g2, 0 | ||
183 | tne %xcc, 5 | ||
184 | PREAMBLE | ||
185 | mov %o0, GLOBAL_SPARE | ||
186 | cmp %o2, 0 | ||
187 | be,pn %XCC, 85f | ||
188 | or %o0, %o1, %o3 | ||
189 | cmp %o2, 16 | ||
190 | blu,a,pn %XCC, 80f | ||
191 | or %o3, %o2, %o3 | ||
192 | |||
193 | /* 2 blocks (128 bytes) is the minimum we can do the block | ||
194 | * copy with. We need to ensure that we'll iterate at least | ||
195 | * once in the block copy loop. At worst we'll need to align | ||
196 | * the destination to a 64-byte boundary which can chew up | ||
197 | * to (64 - 1) bytes from the length before we perform the | ||
198 | * block copy loop. | ||
199 | * | ||
200 | * However, the cut-off point, performance wise, is around | ||
201 | * 4 64-byte blocks. | ||
202 | */ | ||
203 | cmp %o2, (4 * 64) | ||
204 | blu,pt %XCC, 75f | ||
205 | andcc %o3, 0x7, %g0 | ||
206 | |||
207 | /* %o0: dst | ||
208 | * %o1: src | ||
209 | * %o2: len (known to be >= 128) | ||
210 | * | ||
211 | * The block copy loops can use %o4, %g2, %g3 as | ||
212 | * temporaries while copying the data. %o5 must | ||
213 | * be preserved between VISEntryHalf and VISExitHalf | ||
214 | */ | ||
215 | |||
216 | LOAD(prefetch, %o1 + 0x000, #one_read) | ||
217 | LOAD(prefetch, %o1 + 0x040, #one_read) | ||
218 | LOAD(prefetch, %o1 + 0x080, #one_read) | ||
219 | |||
220 | /* Align destination on 64-byte boundary. */ | ||
221 | andcc %o0, (64 - 1), %o4 | ||
222 | be,pt %XCC, 2f | ||
223 | sub %o4, 64, %o4 | ||
224 | sub %g0, %o4, %o4 ! bytes to align dst | ||
225 | sub %o2, %o4, %o2 | ||
226 | 1: subcc %o4, 1, %o4 | ||
227 | EX_LD(LOAD(ldub, %o1, %g1)) | ||
228 | EX_ST(STORE(stb, %g1, %o0)) | ||
229 | add %o1, 1, %o1 | ||
230 | bne,pt %XCC, 1b | ||
231 | add %o0, 1, %o0 | ||
232 | |||
233 | 2: | ||
234 | /* Clobbers o5/g1/g2/g3/g7/icc/xcc. We must preserve | ||
235 | * o5 from here until we hit VISExitHalf. | ||
236 | */ | ||
237 | VISEntryHalf | ||
238 | |||
239 | alignaddr %o1, %g0, %g0 | ||
240 | |||
241 | add %o1, (64 - 1), %o4 | ||
242 | andn %o4, (64 - 1), %o4 | ||
243 | andn %o2, (64 - 1), %g1 | ||
244 | sub %o2, %g1, %o2 | ||
245 | |||
246 | and %o1, (64 - 1), %g2 | ||
247 | add %o1, %g1, %o1 | ||
248 | sub %o0, %o4, %g3 | ||
249 | brz,pt %g2, 190f | ||
250 | cmp %g2, 32 | ||
251 | blu,a 5f | ||
252 | cmp %g2, 16 | ||
253 | cmp %g2, 48 | ||
254 | blu,a 4f | ||
255 | cmp %g2, 40 | ||
256 | cmp %g2, 56 | ||
257 | blu 170f | ||
258 | nop | ||
259 | ba,a,pt %xcc, 180f | ||
260 | |||
261 | 4: /* 32 <= low bits < 48 */ | ||
262 | blu 150f | ||
263 | nop | ||
264 | ba,a,pt %xcc, 160f | ||
265 | 5: /* 0 < low bits < 32 */ | ||
266 | blu,a 6f | ||
267 | cmp %g2, 8 | ||
268 | cmp %g2, 24 | ||
269 | blu 130f | ||
270 | nop | ||
271 | ba,a,pt %xcc, 140f | ||
272 | 6: /* 0 < low bits < 16 */ | ||
273 | bgeu 120f | ||
274 | nop | ||
275 | /* fall through for 0 < low bits < 8 */ | ||
276 | 110: sub %o4, 64, %g2 | ||
277 | EX_LD(LOAD_BLK(%g2, %f0)) | ||
278 | 1: EX_ST(STORE_INIT(%g0, %o4 + %g3)) | ||
279 | EX_LD(LOAD_BLK(%o4, %f16)) | ||
280 | FREG_FROB(f0, f2, f4, f6, f8, f10, f12, f14, f16) | ||
281 | EX_ST(STORE_BLK(%f0, %o4 + %g3)) | ||
282 | FREG_MOVE_8(f16, f18, f20, f22, f24, f26, f28, f30) | ||
283 | subcc %g1, 64, %g1 | ||
284 | add %o4, 64, %o4 | ||
285 | bne,pt %xcc, 1b | ||
286 | LOAD(prefetch, %o4 + 64, #one_read) | ||
287 | ba,pt %xcc, 195f | ||
288 | nop | ||
289 | |||
290 | 120: sub %o4, 56, %g2 | ||
291 | FREG_LOAD_7(%g2, f0, f2, f4, f6, f8, f10, f12) | ||
292 | 1: EX_ST(STORE_INIT(%g0, %o4 + %g3)) | ||
293 | EX_LD(LOAD_BLK(%o4, %f16)) | ||
294 | FREG_FROB(f0, f2, f4, f6, f8, f10, f12, f16, f18) | ||
295 | EX_ST(STORE_BLK(%f0, %o4 + %g3)) | ||
296 | FREG_MOVE_7(f18, f20, f22, f24, f26, f28, f30) | ||
297 | subcc %g1, 64, %g1 | ||
298 | add %o4, 64, %o4 | ||
299 | bne,pt %xcc, 1b | ||
300 | LOAD(prefetch, %o4 + 64, #one_read) | ||
301 | ba,pt %xcc, 195f | ||
302 | nop | ||
303 | |||
304 | 130: sub %o4, 48, %g2 | ||
305 | FREG_LOAD_6(%g2, f0, f2, f4, f6, f8, f10) | ||
306 | 1: EX_ST(STORE_INIT(%g0, %o4 + %g3)) | ||
307 | EX_LD(LOAD_BLK(%o4, %f16)) | ||
308 | FREG_FROB(f0, f2, f4, f6, f8, f10, f16, f18, f20) | ||
309 | EX_ST(STORE_BLK(%f0, %o4 + %g3)) | ||
310 | FREG_MOVE_6(f20, f22, f24, f26, f28, f30) | ||
311 | subcc %g1, 64, %g1 | ||
312 | add %o4, 64, %o4 | ||
313 | bne,pt %xcc, 1b | ||
314 | LOAD(prefetch, %o4 + 64, #one_read) | ||
315 | ba,pt %xcc, 195f | ||
316 | nop | ||
317 | |||
318 | 140: sub %o4, 40, %g2 | ||
319 | FREG_LOAD_5(%g2, f0, f2, f4, f6, f8) | ||
320 | 1: EX_ST(STORE_INIT(%g0, %o4 + %g3)) | ||
321 | EX_LD(LOAD_BLK(%o4, %f16)) | ||
322 | FREG_FROB(f0, f2, f4, f6, f8, f16, f18, f20, f22) | ||
323 | EX_ST(STORE_BLK(%f0, %o4 + %g3)) | ||
324 | FREG_MOVE_5(f22, f24, f26, f28, f30) | ||
325 | subcc %g1, 64, %g1 | ||
326 | add %o4, 64, %o4 | ||
327 | bne,pt %xcc, 1b | ||
328 | LOAD(prefetch, %o4 + 64, #one_read) | ||
329 | ba,pt %xcc, 195f | ||
330 | nop | ||
331 | |||
332 | 150: sub %o4, 32, %g2 | ||
333 | FREG_LOAD_4(%g2, f0, f2, f4, f6) | ||
334 | 1: EX_ST(STORE_INIT(%g0, %o4 + %g3)) | ||
335 | EX_LD(LOAD_BLK(%o4, %f16)) | ||
336 | FREG_FROB(f0, f2, f4, f6, f16, f18, f20, f22, f24) | ||
337 | EX_ST(STORE_BLK(%f0, %o4 + %g3)) | ||
338 | FREG_MOVE_4(f24, f26, f28, f30) | ||
339 | subcc %g1, 64, %g1 | ||
340 | add %o4, 64, %o4 | ||
341 | bne,pt %xcc, 1b | ||
342 | LOAD(prefetch, %o4 + 64, #one_read) | ||
343 | ba,pt %xcc, 195f | ||
344 | nop | ||
345 | |||
346 | 160: sub %o4, 24, %g2 | ||
347 | FREG_LOAD_3(%g2, f0, f2, f4) | ||
348 | 1: EX_ST(STORE_INIT(%g0, %o4 + %g3)) | ||
349 | EX_LD(LOAD_BLK(%o4, %f16)) | ||
350 | FREG_FROB(f0, f2, f4, f16, f18, f20, f22, f24, f26) | ||
351 | EX_ST(STORE_BLK(%f0, %o4 + %g3)) | ||
352 | FREG_MOVE_3(f26, f28, f30) | ||
353 | subcc %g1, 64, %g1 | ||
354 | add %o4, 64, %o4 | ||
355 | bne,pt %xcc, 1b | ||
356 | LOAD(prefetch, %o4 + 64, #one_read) | ||
357 | ba,pt %xcc, 195f | ||
358 | nop | ||
359 | |||
360 | 170: sub %o4, 16, %g2 | ||
361 | FREG_LOAD_2(%g2, f0, f2) | ||
362 | 1: EX_ST(STORE_INIT(%g0, %o4 + %g3)) | ||
363 | EX_LD(LOAD_BLK(%o4, %f16)) | ||
364 | FREG_FROB(f0, f2, f16, f18, f20, f22, f24, f26, f28) | ||
365 | EX_ST(STORE_BLK(%f0, %o4 + %g3)) | ||
366 | FREG_MOVE_2(f28, f30) | ||
367 | subcc %g1, 64, %g1 | ||
368 | add %o4, 64, %o4 | ||
369 | bne,pt %xcc, 1b | ||
370 | LOAD(prefetch, %o4 + 64, #one_read) | ||
371 | ba,pt %xcc, 195f | ||
372 | nop | ||
373 | |||
374 | 180: sub %o4, 8, %g2 | ||
375 | FREG_LOAD_1(%g2, f0) | ||
376 | 1: EX_ST(STORE_INIT(%g0, %o4 + %g3)) | ||
377 | EX_LD(LOAD_BLK(%o4, %f16)) | ||
378 | FREG_FROB(f0, f16, f18, f20, f22, f24, f26, f28, f30) | ||
379 | EX_ST(STORE_BLK(%f0, %o4 + %g3)) | ||
380 | FREG_MOVE_1(f30) | ||
381 | subcc %g1, 64, %g1 | ||
382 | add %o4, 64, %o4 | ||
383 | bne,pt %xcc, 1b | ||
384 | LOAD(prefetch, %o4 + 64, #one_read) | ||
385 | ba,pt %xcc, 195f | ||
386 | nop | ||
387 | |||
388 | 190: | ||
389 | 1: EX_ST(STORE_INIT(%g0, %o4 + %g3)) | ||
390 | subcc %g1, 64, %g1 | ||
391 | EX_LD(LOAD_BLK(%o4, %f0)) | ||
392 | EX_ST(STORE_BLK(%f0, %o4 + %g3)) | ||
393 | add %o4, 64, %o4 | ||
394 | bne,pt %xcc, 1b | ||
395 | LOAD(prefetch, %o4 + 64, #one_read) | ||
396 | |||
397 | 195: | ||
398 | add %o4, %g3, %o0 | ||
399 | membar #Sync | ||
400 | |||
401 | VISExitHalf | ||
402 | |||
403 | /* %o2 contains any final bytes still needed to be copied | ||
404 | * over. If anything is left, we copy it one byte at a time. | ||
405 | */ | ||
406 | brz,pt %o2, 85f | ||
407 | sub %o0, %o1, %o3 | ||
408 | ba,a,pt %XCC, 90f | ||
409 | |||
410 | .align 64 | ||
411 | 75: /* 16 < len <= 64 */ | ||
412 | bne,pn %XCC, 75f | ||
413 | sub %o0, %o1, %o3 | ||
414 | |||
415 | 72: | ||
416 | andn %o2, 0xf, %o4 | ||
417 | and %o2, 0xf, %o2 | ||
418 | 1: subcc %o4, 0x10, %o4 | ||
419 | EX_LD(LOAD(ldx, %o1, %o5)) | ||
420 | add %o1, 0x08, %o1 | ||
421 | EX_LD(LOAD(ldx, %o1, %g1)) | ||
422 | sub %o1, 0x08, %o1 | ||
423 | EX_ST(STORE(stx, %o5, %o1 + %o3)) | ||
424 | add %o1, 0x8, %o1 | ||
425 | EX_ST(STORE(stx, %g1, %o1 + %o3)) | ||
426 | bgu,pt %XCC, 1b | ||
427 | add %o1, 0x8, %o1 | ||
428 | 73: andcc %o2, 0x8, %g0 | ||
429 | be,pt %XCC, 1f | ||
430 | nop | ||
431 | sub %o2, 0x8, %o2 | ||
432 | EX_LD(LOAD(ldx, %o1, %o5)) | ||
433 | EX_ST(STORE(stx, %o5, %o1 + %o3)) | ||
434 | add %o1, 0x8, %o1 | ||
435 | 1: andcc %o2, 0x4, %g0 | ||
436 | be,pt %XCC, 1f | ||
437 | nop | ||
438 | sub %o2, 0x4, %o2 | ||
439 | EX_LD(LOAD(lduw, %o1, %o5)) | ||
440 | EX_ST(STORE(stw, %o5, %o1 + %o3)) | ||
441 | add %o1, 0x4, %o1 | ||
442 | 1: cmp %o2, 0 | ||
443 | be,pt %XCC, 85f | ||
444 | nop | ||
445 | ba,pt %xcc, 90f | ||
446 | nop | ||
447 | |||
448 | 75: | ||
449 | andcc %o0, 0x7, %g1 | ||
450 | sub %g1, 0x8, %g1 | ||
451 | be,pn %icc, 2f | ||
452 | sub %g0, %g1, %g1 | ||
453 | sub %o2, %g1, %o2 | ||
454 | |||
455 | 1: subcc %g1, 1, %g1 | ||
456 | EX_LD(LOAD(ldub, %o1, %o5)) | ||
457 | EX_ST(STORE(stb, %o5, %o1 + %o3)) | ||
458 | bgu,pt %icc, 1b | ||
459 | add %o1, 1, %o1 | ||
460 | |||
461 | 2: add %o1, %o3, %o0 | ||
462 | andcc %o1, 0x7, %g1 | ||
463 | bne,pt %icc, 8f | ||
464 | sll %g1, 3, %g1 | ||
465 | |||
466 | cmp %o2, 16 | ||
467 | bgeu,pt %icc, 72b | ||
468 | nop | ||
469 | ba,a,pt %xcc, 73b | ||
470 | |||
471 | 8: mov 64, %o3 | ||
472 | andn %o1, 0x7, %o1 | ||
473 | EX_LD(LOAD(ldx, %o1, %g2)) | ||
474 | sub %o3, %g1, %o3 | ||
475 | andn %o2, 0x7, %o4 | ||
476 | sllx %g2, %g1, %g2 | ||
477 | 1: add %o1, 0x8, %o1 | ||
478 | EX_LD(LOAD(ldx, %o1, %g3)) | ||
479 | subcc %o4, 0x8, %o4 | ||
480 | srlx %g3, %o3, %o5 | ||
481 | or %o5, %g2, %o5 | ||
482 | EX_ST(STORE(stx, %o5, %o0)) | ||
483 | add %o0, 0x8, %o0 | ||
484 | bgu,pt %icc, 1b | ||
485 | sllx %g3, %g1, %g2 | ||
486 | |||
487 | srl %g1, 3, %g1 | ||
488 | andcc %o2, 0x7, %o2 | ||
489 | be,pn %icc, 85f | ||
490 | add %o1, %g1, %o1 | ||
491 | ba,pt %xcc, 90f | ||
492 | sub %o0, %o1, %o3 | ||
493 | |||
494 | .align 64 | ||
495 | 80: /* 0 < len <= 16 */ | ||
496 | andcc %o3, 0x3, %g0 | ||
497 | bne,pn %XCC, 90f | ||
498 | sub %o0, %o1, %o3 | ||
499 | |||
500 | 1: | ||
501 | subcc %o2, 4, %o2 | ||
502 | EX_LD(LOAD(lduw, %o1, %g1)) | ||
503 | EX_ST(STORE(stw, %g1, %o1 + %o3)) | ||
504 | bgu,pt %XCC, 1b | ||
505 | add %o1, 4, %o1 | ||
506 | |||
507 | 85: retl | ||
508 | mov EX_RETVAL(GLOBAL_SPARE), %o0 | ||
509 | |||
510 | .align 32 | ||
511 | 90: | ||
512 | subcc %o2, 1, %o2 | ||
513 | EX_LD(LOAD(ldub, %o1, %g1)) | ||
514 | EX_ST(STORE(stb, %g1, %o1 + %o3)) | ||
515 | bgu,pt %XCC, 90b | ||
516 | add %o1, 1, %o1 | ||
517 | retl | ||
518 | mov EX_RETVAL(GLOBAL_SPARE), %o0 | ||
519 | |||
520 | .size FUNC_NAME, .-FUNC_NAME | ||
diff --git a/arch/sparc64/lib/NG2page.S b/arch/sparc64/lib/NG2page.S new file mode 100644 index 000000000000..73b6b7c72cbf --- /dev/null +++ b/arch/sparc64/lib/NG2page.S | |||
@@ -0,0 +1,61 @@ | |||
1 | /* NG2page.S: Niagara-2 optimized clear and copy page. | ||
2 | * | ||
3 | * Copyright (C) 2007 (davem@davemloft.net) | ||
4 | */ | ||
5 | |||
6 | #include <asm/asi.h> | ||
7 | #include <asm/page.h> | ||
8 | #include <asm/visasm.h> | ||
9 | |||
10 | .text | ||
11 | .align 32 | ||
12 | |||
13 | /* This is heavily simplified from the sun4u variants | ||
14 | * because Niagara-2 does not have any D-cache aliasing issues. | ||
15 | */ | ||
16 | NG2copy_user_page: /* %o0=dest, %o1=src, %o2=vaddr */ | ||
17 | prefetch [%o1 + 0x00], #one_read | ||
18 | prefetch [%o1 + 0x40], #one_read | ||
19 | VISEntryHalf | ||
20 | set PAGE_SIZE, %g7 | ||
21 | sub %o0, %o1, %g3 | ||
22 | 1: stxa %g0, [%o1 + %g3] ASI_BLK_INIT_QUAD_LDD_P | ||
23 | subcc %g7, 64, %g7 | ||
24 | ldda [%o1] ASI_BLK_P, %f0 | ||
25 | stda %f0, [%o1 + %g3] ASI_BLK_P | ||
26 | add %o1, 64, %o1 | ||
27 | bne,pt %xcc, 1b | ||
28 | prefetch [%o1 + 0x40], #one_read | ||
29 | membar #Sync | ||
30 | VISExitHalf | ||
31 | retl | ||
32 | nop | ||
33 | |||
34 | #define BRANCH_ALWAYS 0x10680000 | ||
35 | #define NOP 0x01000000 | ||
36 | #define NG_DO_PATCH(OLD, NEW) \ | ||
37 | sethi %hi(NEW), %g1; \ | ||
38 | or %g1, %lo(NEW), %g1; \ | ||
39 | sethi %hi(OLD), %g2; \ | ||
40 | or %g2, %lo(OLD), %g2; \ | ||
41 | sub %g1, %g2, %g1; \ | ||
42 | sethi %hi(BRANCH_ALWAYS), %g3; \ | ||
43 | sll %g1, 11, %g1; \ | ||
44 | srl %g1, 11 + 2, %g1; \ | ||
45 | or %g3, %lo(BRANCH_ALWAYS), %g3; \ | ||
46 | or %g3, %g1, %g3; \ | ||
47 | stw %g3, [%g2]; \ | ||
48 | sethi %hi(NOP), %g3; \ | ||
49 | or %g3, %lo(NOP), %g3; \ | ||
50 | stw %g3, [%g2 + 0x4]; \ | ||
51 | flush %g2; | ||
52 | |||
53 | .globl niagara2_patch_pageops | ||
54 | .type niagara2_patch_pageops,#function | ||
55 | niagara2_patch_pageops: | ||
56 | NG_DO_PATCH(copy_user_page, NG2copy_user_page) | ||
57 | NG_DO_PATCH(_clear_page, NGclear_page) | ||
58 | NG_DO_PATCH(clear_user_page, NGclear_user_page) | ||
59 | retl | ||
60 | nop | ||
61 | .size niagara2_patch_pageops,.-niagara2_patch_pageops | ||
diff --git a/arch/sparc64/lib/NG2patch.S b/arch/sparc64/lib/NG2patch.S new file mode 100644 index 000000000000..28c36f06a6d1 --- /dev/null +++ b/arch/sparc64/lib/NG2patch.S | |||
@@ -0,0 +1,33 @@ | |||
1 | /* NG2patch.S: Patch Ultra-I routines with Niagara-2 variant. | ||
2 | * | ||
3 | * Copyright (C) 2007 David S. Miller <davem@davemloft.net> | ||
4 | */ | ||
5 | |||
6 | #define BRANCH_ALWAYS 0x10680000 | ||
7 | #define NOP 0x01000000 | ||
8 | #define NG_DO_PATCH(OLD, NEW) \ | ||
9 | sethi %hi(NEW), %g1; \ | ||
10 | or %g1, %lo(NEW), %g1; \ | ||
11 | sethi %hi(OLD), %g2; \ | ||
12 | or %g2, %lo(OLD), %g2; \ | ||
13 | sub %g1, %g2, %g1; \ | ||
14 | sethi %hi(BRANCH_ALWAYS), %g3; \ | ||
15 | sll %g1, 11, %g1; \ | ||
16 | srl %g1, 11 + 2, %g1; \ | ||
17 | or %g3, %lo(BRANCH_ALWAYS), %g3; \ | ||
18 | or %g3, %g1, %g3; \ | ||
19 | stw %g3, [%g2]; \ | ||
20 | sethi %hi(NOP), %g3; \ | ||
21 | or %g3, %lo(NOP), %g3; \ | ||
22 | stw %g3, [%g2 + 0x4]; \ | ||
23 | flush %g2; | ||
24 | |||
25 | .globl niagara2_patch_copyops | ||
26 | .type niagara2_patch_copyops,#function | ||
27 | niagara2_patch_copyops: | ||
28 | NG_DO_PATCH(memcpy, NG2memcpy) | ||
29 | NG_DO_PATCH(___copy_from_user, NG2copy_from_user) | ||
30 | NG_DO_PATCH(___copy_to_user, NG2copy_to_user) | ||
31 | retl | ||
32 | nop | ||
33 | .size niagara2_patch_copyops,.-niagara2_patch_copyops | ||
diff --git a/arch/sparc64/lib/NGpage.S b/arch/sparc64/lib/NGpage.S index 8ce3a0c9c537..428920de05ba 100644 --- a/arch/sparc64/lib/NGpage.S +++ b/arch/sparc64/lib/NGpage.S | |||
@@ -45,6 +45,7 @@ NGcopy_user_page: /* %o0=dest, %o1=src, %o2=vaddr */ | |||
45 | retl | 45 | retl |
46 | nop | 46 | nop |
47 | 47 | ||
48 | .globl NGclear_page, NGclear_user_page | ||
48 | NGclear_page: /* %o0=dest */ | 49 | NGclear_page: /* %o0=dest */ |
49 | NGclear_user_page: /* %o0=dest, %o1=vaddr */ | 50 | NGclear_user_page: /* %o0=dest, %o1=vaddr */ |
50 | mov 8, %g1 | 51 | mov 8, %g1 |
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index aff661fe2ee1..0eabe73c964d 100644 --- a/arch/um/drivers/ubd_kern.c +++ b/arch/um/drivers/ubd_kern.c | |||
@@ -612,6 +612,8 @@ static int ubd_open_dev(struct ubd *ubd_dev) | |||
612 | ubd_dev->fd = fd; | 612 | ubd_dev->fd = fd; |
613 | 613 | ||
614 | if(ubd_dev->cow.file != NULL){ | 614 | if(ubd_dev->cow.file != NULL){ |
615 | blk_queue_max_sectors(ubd_dev->queue, 8 * sizeof(long)); | ||
616 | |||
615 | err = -ENOMEM; | 617 | err = -ENOMEM; |
616 | ubd_dev->cow.bitmap = (void *) vmalloc(ubd_dev->cow.bitmap_len); | 618 | ubd_dev->cow.bitmap = (void *) vmalloc(ubd_dev->cow.bitmap_len); |
617 | if(ubd_dev->cow.bitmap == NULL){ | 619 | if(ubd_dev->cow.bitmap == NULL){ |
@@ -712,8 +714,6 @@ static int ubd_add(int n, char **error_out) | |||
712 | ubd_dev->queue->queuedata = ubd_dev; | 714 | ubd_dev->queue->queuedata = ubd_dev; |
713 | 715 | ||
714 | blk_queue_max_hw_segments(ubd_dev->queue, MAX_SG); | 716 | blk_queue_max_hw_segments(ubd_dev->queue, MAX_SG); |
715 | if(ubd_dev->cow.file != NULL) | ||
716 | blk_queue_max_sectors(ubd_dev->queue, 8 * sizeof(long)); | ||
717 | err = ubd_disk_register(MAJOR_NR, ubd_dev->size, n, &ubd_gendisk[n]); | 717 | err = ubd_disk_register(MAJOR_NR, ubd_dev->size, n, &ubd_gendisk[n]); |
718 | if(err){ | 718 | if(err){ |
719 | *error_out = "Failed to register device"; | 719 | *error_out = "Failed to register device"; |
diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile index 128561d3e876..b024e4a86895 100644 --- a/arch/x86_64/Makefile +++ b/arch/x86_64/Makefile | |||
@@ -57,8 +57,8 @@ cflags-y += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,) | |||
57 | cflags-y += -maccumulate-outgoing-args | 57 | cflags-y += -maccumulate-outgoing-args |
58 | 58 | ||
59 | # do binutils support CFI? | 59 | # do binutils support CFI? |
60 | cflags-y += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,) | 60 | cflags-y += $(call as-instr,.cfi_startproc\n.cfi_rel_offset rsp${comma}0\n.cfi_endproc,-DCONFIG_AS_CFI=1,) |
61 | AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,) | 61 | AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_rel_offset rsp${comma}0\n.cfi_endproc,-DCONFIG_AS_CFI=1,) |
62 | 62 | ||
63 | # is .cfi_signal_frame supported too? | 63 | # is .cfi_signal_frame supported too? |
64 | cflags-y += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1,) | 64 | cflags-y += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1,) |
diff --git a/arch/x86_64/kernel/head.S b/arch/x86_64/kernel/head.S index e89abcdbdde8..b6167fe3330e 100644 --- a/arch/x86_64/kernel/head.S +++ b/arch/x86_64/kernel/head.S | |||
@@ -345,8 +345,7 @@ NEXT_PAGE(level2_kernel_pgt) | |||
345 | /* 40MB kernel mapping. The kernel code cannot be bigger than that. | 345 | /* 40MB kernel mapping. The kernel code cannot be bigger than that. |
346 | When you change this change KERNEL_TEXT_SIZE in page.h too. */ | 346 | When you change this change KERNEL_TEXT_SIZE in page.h too. */ |
347 | /* (2^48-(2*1024*1024*1024)-((2^39)*511)-((2^30)*510)) = 0 */ | 347 | /* (2^48-(2*1024*1024*1024)-((2^39)*511)-((2^30)*510)) = 0 */ |
348 | PMDS(0x0000000000000000, __PAGE_KERNEL_LARGE_EXEC|_PAGE_GLOBAL, | 348 | PMDS(0x0000000000000000, __PAGE_KERNEL_LARGE_EXEC|_PAGE_GLOBAL, KERNEL_TEXT_SIZE/PMD_SIZE) |
349 | KERNEL_TEXT_SIZE/PMD_SIZE) | ||
350 | /* Module mapping starts here */ | 349 | /* Module mapping starts here */ |
351 | .fill (PTRS_PER_PMD - (KERNEL_TEXT_SIZE/PMD_SIZE)),8,0 | 350 | .fill (PTRS_PER_PMD - (KERNEL_TEXT_SIZE/PMD_SIZE)),8,0 |
352 | 351 | ||
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c index f57f8b901912..966fa1062491 100644 --- a/arch/x86_64/kernel/io_apic.c +++ b/arch/x86_64/kernel/io_apic.c | |||
@@ -397,14 +397,12 @@ static void clear_IO_APIC (void) | |||
397 | int skip_ioapic_setup; | 397 | int skip_ioapic_setup; |
398 | int ioapic_force; | 398 | int ioapic_force; |
399 | 399 | ||
400 | /* dummy parsing: see setup.c */ | 400 | static int __init parse_noapic(char *str) |
401 | |||
402 | static int __init disable_ioapic_setup(char *str) | ||
403 | { | 401 | { |
404 | skip_ioapic_setup = 1; | 402 | disable_ioapic_setup(); |
405 | return 0; | 403 | return 0; |
406 | } | 404 | } |
407 | early_param("noapic", disable_ioapic_setup); | 405 | early_param("noapic", parse_noapic); |
408 | 406 | ||
409 | /* Actually the next is obsolete, but keep it for paranoid reasons -AK */ | 407 | /* Actually the next is obsolete, but keep it for paranoid reasons -AK */ |
410 | static int __init disable_timer_pin_setup(char *arg) | 408 | static int __init disable_timer_pin_setup(char *arg) |
diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c index cb8ee9d02f86..0ec6d2ddb931 100644 --- a/arch/x86_64/kernel/nmi.c +++ b/arch/x86_64/kernel/nmi.c | |||
@@ -85,7 +85,7 @@ int __init check_nmi_watchdog (void) | |||
85 | int *counts; | 85 | int *counts; |
86 | int cpu; | 86 | int cpu; |
87 | 87 | ||
88 | if ((nmi_watchdog == NMI_NONE) || (nmi_watchdog == NMI_DEFAULT)) | 88 | if ((nmi_watchdog == NMI_NONE) || (nmi_watchdog == NMI_DISABLED)) |
89 | return 0; | 89 | return 0; |
90 | 90 | ||
91 | if (!atomic_read(&nmi_active)) | 91 | if (!atomic_read(&nmi_active)) |
@@ -442,7 +442,7 @@ int proc_nmi_enabled(struct ctl_table *table, int write, struct file *file, | |||
442 | if (!!old_state == !!nmi_watchdog_enabled) | 442 | if (!!old_state == !!nmi_watchdog_enabled) |
443 | return 0; | 443 | return 0; |
444 | 444 | ||
445 | if (atomic_read(&nmi_active) < 0) { | 445 | if (atomic_read(&nmi_active) < 0 || nmi_watchdog == NMI_DISABLED) { |
446 | printk( KERN_WARNING "NMI watchdog is permanently disabled\n"); | 446 | printk( KERN_WARNING "NMI watchdog is permanently disabled\n"); |
447 | return -EIO; | 447 | return -EIO; |
448 | } | 448 | } |
diff --git a/arch/x86_64/kernel/pci-dma.c b/arch/x86_64/kernel/pci-dma.c index 05d745ede561..29711445c818 100644 --- a/arch/x86_64/kernel/pci-dma.c +++ b/arch/x86_64/kernel/pci-dma.c | |||
@@ -82,6 +82,10 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, | |||
82 | if (dma_mask == 0) | 82 | if (dma_mask == 0) |
83 | dma_mask = DMA_32BIT_MASK; | 83 | dma_mask = DMA_32BIT_MASK; |
84 | 84 | ||
85 | /* Device not DMA able */ | ||
86 | if (dev->dma_mask == NULL) | ||
87 | return NULL; | ||
88 | |||
85 | /* Don't invoke OOM killer */ | 89 | /* Don't invoke OOM killer */ |
86 | gfp |= __GFP_NORETRY; | 90 | gfp |= __GFP_NORETRY; |
87 | 91 | ||