diff options
author | Hirokazu Takata <takata@linux-m32r.org> | 2005-06-21 20:16:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 22:07:31 -0400 |
commit | 960c2a89a051333d2e6793a416d9a33c4b116b41 (patch) | |
tree | 09de2c4b0e3ac3e0a4320e368353d7ae881bbb9e /arch/m32r/mappi | |
parent | 0adbb44a146d6dff3f74ea7a9d3826f8942ed709 (diff) |
[PATCH] m32r: Update defconfig files
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m32r/mappi')
-rw-r--r-- | arch/m32r/mappi/defconfig.nommu | 46 | ||||
-rw-r--r-- | arch/m32r/mappi/defconfig.smp | 49 | ||||
-rw-r--r-- | arch/m32r/mappi/defconfig.up | 48 |
3 files changed, 78 insertions, 65 deletions
diff --git a/arch/m32r/mappi/defconfig.nommu b/arch/m32r/mappi/defconfig.nommu index 714aa6e7034c..a8425fba340b 100644 --- a/arch/m32r/mappi/defconfig.nommu +++ b/arch/m32r/mappi/defconfig.nommu | |||
@@ -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.11-rc4 | 3 | # Linux kernel version: 2.6.12-rc5 |
4 | # Wed Feb 16 21:10:57 2005 | 4 | # Fri Jun 3 16:21:46 2005 |
5 | # | 5 | # |
6 | CONFIG_M32R=y | 6 | CONFIG_M32R=y |
7 | # CONFIG_UID16 is not set | 7 | # CONFIG_UID16 is not set |
@@ -16,6 +16,7 @@ CONFIG_EXPERIMENTAL=y | |||
16 | CONFIG_CLEAN_COMPILE=y | 16 | CONFIG_CLEAN_COMPILE=y |
17 | CONFIG_BROKEN_ON_SMP=y | 17 | CONFIG_BROKEN_ON_SMP=y |
18 | CONFIG_LOCK_KERNEL=y | 18 | CONFIG_LOCK_KERNEL=y |
19 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
19 | 20 | ||
20 | # | 21 | # |
21 | # General setup | 22 | # General setup |
@@ -26,13 +27,15 @@ CONFIG_BSD_PROCESS_ACCT=y | |||
26 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | 27 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
27 | CONFIG_SYSCTL=y | 28 | CONFIG_SYSCTL=y |
28 | # CONFIG_AUDIT is not set | 29 | # CONFIG_AUDIT is not set |
29 | CONFIG_LOG_BUF_SHIFT=14 | ||
30 | CONFIG_HOTPLUG=y | 30 | CONFIG_HOTPLUG=y |
31 | CONFIG_KOBJECT_UEVENT=y | 31 | CONFIG_KOBJECT_UEVENT=y |
32 | CONFIG_IKCONFIG=y | 32 | CONFIG_IKCONFIG=y |
33 | # CONFIG_IKCONFIG_PROC is not set | 33 | # CONFIG_IKCONFIG_PROC is not set |
34 | CONFIG_EMBEDDED=y | 34 | CONFIG_EMBEDDED=y |
35 | # CONFIG_KALLSYMS is not set | 35 | # CONFIG_KALLSYMS is not set |
36 | CONFIG_PRINTK=y | ||
37 | CONFIG_BUG=y | ||
38 | CONFIG_BASE_FULL=y | ||
36 | # CONFIG_FUTEX is not set | 39 | # CONFIG_FUTEX is not set |
37 | # CONFIG_EPOLL is not set | 40 | # CONFIG_EPOLL is not set |
38 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 41 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
@@ -41,6 +44,7 @@ CONFIG_CC_ALIGN_LABELS=0 | |||
41 | CONFIG_CC_ALIGN_LOOPS=0 | 44 | CONFIG_CC_ALIGN_LOOPS=0 |
42 | CONFIG_CC_ALIGN_JUMPS=0 | 45 | CONFIG_CC_ALIGN_JUMPS=0 |
43 | CONFIG_TINY_SHMEM=y | 46 | CONFIG_TINY_SHMEM=y |
47 | CONFIG_BASE_SMALL=0 | ||
44 | 48 | ||
45 | # | 49 | # |
46 | # Loadable module support | 50 | # Loadable module support |
@@ -62,6 +66,7 @@ CONFIG_PLAT_MAPPI=y | |||
62 | # CONFIG_PLAT_OPSPUT is not set | 66 | # CONFIG_PLAT_OPSPUT is not set |
63 | # CONFIG_PLAT_OAKS32R is not set | 67 | # CONFIG_PLAT_OAKS32R is not set |
64 | # CONFIG_PLAT_MAPPI2 is not set | 68 | # CONFIG_PLAT_MAPPI2 is not set |
69 | # CONFIG_PLAT_MAPPI3 is not set | ||
65 | CONFIG_CHIP_M32700=y | 70 | CONFIG_CHIP_M32700=y |
66 | # CONFIG_CHIP_M32102 is not set | 71 | # CONFIG_CHIP_M32102 is not set |
67 | # CONFIG_CHIP_VDEC2 is not set | 72 | # CONFIG_CHIP_VDEC2 is not set |
@@ -202,7 +207,6 @@ CONFIG_NET=y | |||
202 | # | 207 | # |
203 | CONFIG_PACKET=y | 208 | CONFIG_PACKET=y |
204 | # CONFIG_PACKET_MMAP is not set | 209 | # CONFIG_PACKET_MMAP is not set |
205 | # CONFIG_NETLINK_DEV is not set | ||
206 | CONFIG_UNIX=y | 210 | CONFIG_UNIX=y |
207 | # CONFIG_NET_KEY is not set | 211 | # CONFIG_NET_KEY is not set |
208 | CONFIG_INET=y | 212 | CONFIG_INET=y |
@@ -325,18 +329,6 @@ CONFIG_INPUT=y | |||
325 | # CONFIG_INPUT_EVBUG is not set | 329 | # CONFIG_INPUT_EVBUG is not set |
326 | 330 | ||
327 | # | 331 | # |
328 | # Input I/O drivers | ||
329 | # | ||
330 | # CONFIG_GAMEPORT is not set | ||
331 | CONFIG_SOUND_GAMEPORT=y | ||
332 | CONFIG_SERIO=y | ||
333 | # CONFIG_SERIO_I8042 is not set | ||
334 | CONFIG_SERIO_SERPORT=y | ||
335 | # CONFIG_SERIO_CT82C710 is not set | ||
336 | # CONFIG_SERIO_LIBPS2 is not set | ||
337 | # CONFIG_SERIO_RAW is not set | ||
338 | |||
339 | # | ||
340 | # Input Device Drivers | 332 | # Input Device Drivers |
341 | # | 333 | # |
342 | # CONFIG_INPUT_KEYBOARD is not set | 334 | # CONFIG_INPUT_KEYBOARD is not set |
@@ -346,6 +338,17 @@ CONFIG_SERIO_SERPORT=y | |||
346 | # CONFIG_INPUT_MISC is not set | 338 | # CONFIG_INPUT_MISC is not set |
347 | 339 | ||
348 | # | 340 | # |
341 | # Hardware I/O ports | ||
342 | # | ||
343 | CONFIG_SERIO=y | ||
344 | # CONFIG_SERIO_I8042 is not set | ||
345 | CONFIG_SERIO_SERPORT=y | ||
346 | # CONFIG_SERIO_LIBPS2 is not set | ||
347 | # CONFIG_SERIO_RAW is not set | ||
348 | # CONFIG_GAMEPORT is not set | ||
349 | CONFIG_SOUND_GAMEPORT=y | ||
350 | |||
351 | # | ||
349 | # Character devices | 352 | # Character devices |
350 | # | 353 | # |
351 | # CONFIG_VT is not set | 354 | # CONFIG_VT is not set |
@@ -394,6 +397,10 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
394 | # CONFIG_RAW_DRIVER is not set | 397 | # CONFIG_RAW_DRIVER is not set |
395 | 398 | ||
396 | # | 399 | # |
400 | # TPM devices | ||
401 | # | ||
402 | |||
403 | # | ||
397 | # I2C support | 404 | # I2C support |
398 | # | 405 | # |
399 | # CONFIG_I2C is not set | 406 | # CONFIG_I2C is not set |
@@ -434,10 +441,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
434 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 441 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
435 | 442 | ||
436 | # | 443 | # |
437 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information | ||
438 | # | ||
439 | |||
440 | # | ||
441 | # USB Gadget Support | 444 | # USB Gadget Support |
442 | # | 445 | # |
443 | # CONFIG_USB_GADGET is not set | 446 | # CONFIG_USB_GADGET is not set |
@@ -595,8 +598,9 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
595 | # | 598 | # |
596 | # Kernel hacking | 599 | # Kernel hacking |
597 | # | 600 | # |
601 | # CONFIG_PRINTK_TIME is not set | ||
598 | # CONFIG_DEBUG_KERNEL is not set | 602 | # CONFIG_DEBUG_KERNEL is not set |
599 | CONFIG_DEBUG_PREEMPT=y | 603 | CONFIG_LOG_BUF_SHIFT=14 |
600 | # CONFIG_DEBUG_BUGVERBOSE is not set | 604 | # CONFIG_DEBUG_BUGVERBOSE is not set |
601 | # CONFIG_FRAME_POINTER is not set | 605 | # CONFIG_FRAME_POINTER is not set |
602 | 606 | ||
diff --git a/arch/m32r/mappi/defconfig.smp b/arch/m32r/mappi/defconfig.smp index 956a8e2f98d6..1a7f3cd42246 100644 --- a/arch/m32r/mappi/defconfig.smp +++ b/arch/m32r/mappi/defconfig.smp | |||
@@ -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.11-rc4 | 3 | # Linux kernel version: 2.6.12-rc5 |
4 | # Wed Feb 16 21:11:02 2005 | 4 | # Fri Jun 3 16:21:52 2005 |
5 | # | 5 | # |
6 | CONFIG_M32R=y | 6 | CONFIG_M32R=y |
7 | # CONFIG_UID16 is not set | 7 | # CONFIG_UID16 is not set |
@@ -17,6 +17,7 @@ CONFIG_EXPERIMENTAL=y | |||
17 | CONFIG_BROKEN=y | 17 | CONFIG_BROKEN=y |
18 | CONFIG_BROKEN_ON_SMP=y | 18 | CONFIG_BROKEN_ON_SMP=y |
19 | CONFIG_LOCK_KERNEL=y | 19 | CONFIG_LOCK_KERNEL=y |
20 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
20 | 21 | ||
21 | # | 22 | # |
22 | # General setup | 23 | # General setup |
@@ -28,13 +29,16 @@ CONFIG_SYSVIPC=y | |||
28 | # CONFIG_BSD_PROCESS_ACCT is not set | 29 | # CONFIG_BSD_PROCESS_ACCT is not set |
29 | CONFIG_SYSCTL=y | 30 | CONFIG_SYSCTL=y |
30 | # CONFIG_AUDIT is not set | 31 | # CONFIG_AUDIT is not set |
31 | CONFIG_LOG_BUF_SHIFT=15 | ||
32 | CONFIG_HOTPLUG=y | 32 | CONFIG_HOTPLUG=y |
33 | CONFIG_KOBJECT_UEVENT=y | 33 | CONFIG_KOBJECT_UEVENT=y |
34 | CONFIG_IKCONFIG=y | 34 | CONFIG_IKCONFIG=y |
35 | CONFIG_IKCONFIG_PROC=y | 35 | CONFIG_IKCONFIG_PROC=y |
36 | # CONFIG_CPUSETS is not set | ||
36 | CONFIG_EMBEDDED=y | 37 | CONFIG_EMBEDDED=y |
37 | # CONFIG_KALLSYMS is not set | 38 | # CONFIG_KALLSYMS is not set |
39 | CONFIG_PRINTK=y | ||
40 | CONFIG_BUG=y | ||
41 | CONFIG_BASE_FULL=y | ||
38 | # CONFIG_FUTEX is not set | 42 | # CONFIG_FUTEX is not set |
39 | # CONFIG_EPOLL is not set | 43 | # CONFIG_EPOLL is not set |
40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 44 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
@@ -44,6 +48,7 @@ CONFIG_CC_ALIGN_LABELS=0 | |||
44 | CONFIG_CC_ALIGN_LOOPS=0 | 48 | CONFIG_CC_ALIGN_LOOPS=0 |
45 | CONFIG_CC_ALIGN_JUMPS=0 | 49 | CONFIG_CC_ALIGN_JUMPS=0 |
46 | # CONFIG_TINY_SHMEM is not set | 50 | # CONFIG_TINY_SHMEM is not set |
51 | CONFIG_BASE_SMALL=0 | ||
47 | 52 | ||
48 | # | 53 | # |
49 | # Loadable module support | 54 | # Loadable module support |
@@ -66,6 +71,7 @@ CONFIG_PLAT_MAPPI=y | |||
66 | # CONFIG_PLAT_OPSPUT is not set | 71 | # CONFIG_PLAT_OPSPUT is not set |
67 | # CONFIG_PLAT_OAKS32R is not set | 72 | # CONFIG_PLAT_OAKS32R is not set |
68 | # CONFIG_PLAT_MAPPI2 is not set | 73 | # CONFIG_PLAT_MAPPI2 is not set |
74 | # CONFIG_PLAT_MAPPI3 is not set | ||
69 | CONFIG_CHIP_M32700=y | 75 | CONFIG_CHIP_M32700=y |
70 | # CONFIG_CHIP_M32102 is not set | 76 | # CONFIG_CHIP_M32102 is not set |
71 | # CONFIG_CHIP_VDEC2 is not set | 77 | # CONFIG_CHIP_VDEC2 is not set |
@@ -139,8 +145,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
139 | # | 145 | # |
140 | CONFIG_MTD=y | 146 | CONFIG_MTD=y |
141 | # CONFIG_MTD_DEBUG is not set | 147 | # CONFIG_MTD_DEBUG is not set |
142 | CONFIG_MTD_PARTITIONS=y | ||
143 | # CONFIG_MTD_CONCAT is not set | 148 | # CONFIG_MTD_CONCAT is not set |
149 | CONFIG_MTD_PARTITIONS=y | ||
144 | CONFIG_MTD_REDBOOT_PARTS=y | 150 | CONFIG_MTD_REDBOOT_PARTS=y |
145 | CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 | 151 | CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 |
146 | # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set | 152 | # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set |
@@ -294,7 +300,6 @@ CONFIG_NET=y | |||
294 | # Networking options | 300 | # Networking options |
295 | # | 301 | # |
296 | # CONFIG_PACKET is not set | 302 | # CONFIG_PACKET is not set |
297 | # CONFIG_NETLINK_DEV is not set | ||
298 | CONFIG_UNIX=y | 303 | CONFIG_UNIX=y |
299 | # CONFIG_NET_KEY is not set | 304 | # CONFIG_NET_KEY is not set |
300 | CONFIG_INET=y | 305 | CONFIG_INET=y |
@@ -420,18 +425,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
420 | # CONFIG_INPUT_EVBUG is not set | 425 | # CONFIG_INPUT_EVBUG is not set |
421 | 426 | ||
422 | # | 427 | # |
423 | # Input I/O drivers | ||
424 | # | ||
425 | # CONFIG_GAMEPORT is not set | ||
426 | CONFIG_SOUND_GAMEPORT=y | ||
427 | CONFIG_SERIO=y | ||
428 | # CONFIG_SERIO_I8042 is not set | ||
429 | # CONFIG_SERIO_SERPORT is not set | ||
430 | # CONFIG_SERIO_CT82C710 is not set | ||
431 | # CONFIG_SERIO_LIBPS2 is not set | ||
432 | # CONFIG_SERIO_RAW is not set | ||
433 | |||
434 | # | ||
435 | # Input Device Drivers | 428 | # Input Device Drivers |
436 | # | 429 | # |
437 | # CONFIG_INPUT_KEYBOARD is not set | 430 | # CONFIG_INPUT_KEYBOARD is not set |
@@ -441,6 +434,17 @@ CONFIG_SERIO=y | |||
441 | # CONFIG_INPUT_MISC is not set | 434 | # CONFIG_INPUT_MISC is not set |
442 | 435 | ||
443 | # | 436 | # |
437 | # Hardware I/O ports | ||
438 | # | ||
439 | CONFIG_SERIO=y | ||
440 | # CONFIG_SERIO_I8042 is not set | ||
441 | # CONFIG_SERIO_SERPORT is not set | ||
442 | # CONFIG_SERIO_LIBPS2 is not set | ||
443 | # CONFIG_SERIO_RAW is not set | ||
444 | # CONFIG_GAMEPORT is not set | ||
445 | CONFIG_SOUND_GAMEPORT=y | ||
446 | |||
447 | # | ||
444 | # Character devices | 448 | # Character devices |
445 | # | 449 | # |
446 | # CONFIG_VT is not set | 450 | # CONFIG_VT is not set |
@@ -489,6 +493,10 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
489 | # CONFIG_RAW_DRIVER is not set | 493 | # CONFIG_RAW_DRIVER is not set |
490 | 494 | ||
491 | # | 495 | # |
496 | # TPM devices | ||
497 | # | ||
498 | |||
499 | # | ||
492 | # I2C support | 500 | # I2C support |
493 | # | 501 | # |
494 | # CONFIG_I2C is not set | 502 | # CONFIG_I2C is not set |
@@ -529,10 +537,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
529 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 537 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
530 | 538 | ||
531 | # | 539 | # |
532 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information | ||
533 | # | ||
534 | |||
535 | # | ||
536 | # USB Gadget Support | 540 | # USB Gadget Support |
537 | # | 541 | # |
538 | # CONFIG_USB_GADGET is not set | 542 | # CONFIG_USB_GADGET is not set |
@@ -708,8 +712,9 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
708 | # | 712 | # |
709 | # Kernel hacking | 713 | # Kernel hacking |
710 | # | 714 | # |
715 | # CONFIG_PRINTK_TIME is not set | ||
711 | # CONFIG_DEBUG_KERNEL is not set | 716 | # CONFIG_DEBUG_KERNEL is not set |
712 | CONFIG_DEBUG_PREEMPT=y | 717 | CONFIG_LOG_BUF_SHIFT=15 |
713 | # CONFIG_DEBUG_BUGVERBOSE is not set | 718 | # CONFIG_DEBUG_BUGVERBOSE is not set |
714 | # CONFIG_FRAME_POINTER is not set | 719 | # CONFIG_FRAME_POINTER is not set |
715 | 720 | ||
diff --git a/arch/m32r/mappi/defconfig.up b/arch/m32r/mappi/defconfig.up index c9253e94efbd..38910fb76692 100644 --- a/arch/m32r/mappi/defconfig.up +++ b/arch/m32r/mappi/defconfig.up | |||
@@ -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.11-rc4 | 3 | # Linux kernel version: 2.6.12-rc5 |
4 | # Wed Feb 16 21:11:07 2005 | 4 | # Fri Jun 3 16:21:59 2005 |
5 | # | 5 | # |
6 | CONFIG_M32R=y | 6 | CONFIG_M32R=y |
7 | # CONFIG_UID16 is not set | 7 | # CONFIG_UID16 is not set |
@@ -17,6 +17,7 @@ CONFIG_EXPERIMENTAL=y | |||
17 | CONFIG_BROKEN=y | 17 | CONFIG_BROKEN=y |
18 | CONFIG_BROKEN_ON_SMP=y | 18 | CONFIG_BROKEN_ON_SMP=y |
19 | CONFIG_LOCK_KERNEL=y | 19 | CONFIG_LOCK_KERNEL=y |
20 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
20 | 21 | ||
21 | # | 22 | # |
22 | # General setup | 23 | # General setup |
@@ -28,13 +29,15 @@ CONFIG_SYSVIPC=y | |||
28 | # CONFIG_BSD_PROCESS_ACCT is not set | 29 | # CONFIG_BSD_PROCESS_ACCT is not set |
29 | CONFIG_SYSCTL=y | 30 | CONFIG_SYSCTL=y |
30 | # CONFIG_AUDIT is not set | 31 | # CONFIG_AUDIT is not set |
31 | CONFIG_LOG_BUF_SHIFT=14 | ||
32 | CONFIG_HOTPLUG=y | 32 | CONFIG_HOTPLUG=y |
33 | CONFIG_KOBJECT_UEVENT=y | 33 | CONFIG_KOBJECT_UEVENT=y |
34 | CONFIG_IKCONFIG=y | 34 | CONFIG_IKCONFIG=y |
35 | CONFIG_IKCONFIG_PROC=y | 35 | CONFIG_IKCONFIG_PROC=y |
36 | CONFIG_EMBEDDED=y | 36 | CONFIG_EMBEDDED=y |
37 | # CONFIG_KALLSYMS is not set | 37 | # CONFIG_KALLSYMS is not set |
38 | CONFIG_PRINTK=y | ||
39 | CONFIG_BUG=y | ||
40 | CONFIG_BASE_FULL=y | ||
38 | # CONFIG_FUTEX is not set | 41 | # CONFIG_FUTEX is not set |
39 | # CONFIG_EPOLL is not set | 42 | # CONFIG_EPOLL is not set |
40 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 43 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
@@ -44,6 +47,7 @@ CONFIG_CC_ALIGN_LABELS=0 | |||
44 | CONFIG_CC_ALIGN_LOOPS=0 | 47 | CONFIG_CC_ALIGN_LOOPS=0 |
45 | CONFIG_CC_ALIGN_JUMPS=0 | 48 | CONFIG_CC_ALIGN_JUMPS=0 |
46 | # CONFIG_TINY_SHMEM is not set | 49 | # CONFIG_TINY_SHMEM is not set |
50 | CONFIG_BASE_SMALL=0 | ||
47 | 51 | ||
48 | # | 52 | # |
49 | # Loadable module support | 53 | # Loadable module support |
@@ -65,6 +69,7 @@ CONFIG_PLAT_MAPPI=y | |||
65 | # CONFIG_PLAT_OPSPUT is not set | 69 | # CONFIG_PLAT_OPSPUT is not set |
66 | # CONFIG_PLAT_OAKS32R is not set | 70 | # CONFIG_PLAT_OAKS32R is not set |
67 | # CONFIG_PLAT_MAPPI2 is not set | 71 | # CONFIG_PLAT_MAPPI2 is not set |
72 | # CONFIG_PLAT_MAPPI3 is not set | ||
68 | CONFIG_CHIP_M32700=y | 73 | CONFIG_CHIP_M32700=y |
69 | # CONFIG_CHIP_M32102 is not set | 74 | # CONFIG_CHIP_M32102 is not set |
70 | # CONFIG_CHIP_VDEC2 is not set | 75 | # CONFIG_CHIP_VDEC2 is not set |
@@ -135,8 +140,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
135 | # | 140 | # |
136 | CONFIG_MTD=y | 141 | CONFIG_MTD=y |
137 | # CONFIG_MTD_DEBUG is not set | 142 | # CONFIG_MTD_DEBUG is not set |
138 | CONFIG_MTD_PARTITIONS=y | ||
139 | # CONFIG_MTD_CONCAT is not set | 143 | # CONFIG_MTD_CONCAT is not set |
144 | CONFIG_MTD_PARTITIONS=y | ||
140 | CONFIG_MTD_REDBOOT_PARTS=y | 145 | CONFIG_MTD_REDBOOT_PARTS=y |
141 | CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 | 146 | CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 |
142 | # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set | 147 | # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set |
@@ -290,7 +295,6 @@ CONFIG_NET=y | |||
290 | # Networking options | 295 | # Networking options |
291 | # | 296 | # |
292 | # CONFIG_PACKET is not set | 297 | # CONFIG_PACKET is not set |
293 | # CONFIG_NETLINK_DEV is not set | ||
294 | CONFIG_UNIX=y | 298 | CONFIG_UNIX=y |
295 | # CONFIG_NET_KEY is not set | 299 | # CONFIG_NET_KEY is not set |
296 | CONFIG_INET=y | 300 | CONFIG_INET=y |
@@ -416,18 +420,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
416 | # CONFIG_INPUT_EVBUG is not set | 420 | # CONFIG_INPUT_EVBUG is not set |
417 | 421 | ||
418 | # | 422 | # |
419 | # Input I/O drivers | ||
420 | # | ||
421 | # CONFIG_GAMEPORT is not set | ||
422 | CONFIG_SOUND_GAMEPORT=y | ||
423 | CONFIG_SERIO=y | ||
424 | # CONFIG_SERIO_I8042 is not set | ||
425 | # CONFIG_SERIO_SERPORT is not set | ||
426 | # CONFIG_SERIO_CT82C710 is not set | ||
427 | # CONFIG_SERIO_LIBPS2 is not set | ||
428 | # CONFIG_SERIO_RAW is not set | ||
429 | |||
430 | # | ||
431 | # Input Device Drivers | 423 | # Input Device Drivers |
432 | # | 424 | # |
433 | # CONFIG_INPUT_KEYBOARD is not set | 425 | # CONFIG_INPUT_KEYBOARD is not set |
@@ -437,6 +429,17 @@ CONFIG_SERIO=y | |||
437 | # CONFIG_INPUT_MISC is not set | 429 | # CONFIG_INPUT_MISC is not set |
438 | 430 | ||
439 | # | 431 | # |
432 | # Hardware I/O ports | ||
433 | # | ||
434 | CONFIG_SERIO=y | ||
435 | # CONFIG_SERIO_I8042 is not set | ||
436 | # CONFIG_SERIO_SERPORT is not set | ||
437 | # CONFIG_SERIO_LIBPS2 is not set | ||
438 | # CONFIG_SERIO_RAW is not set | ||
439 | # CONFIG_GAMEPORT is not set | ||
440 | CONFIG_SOUND_GAMEPORT=y | ||
441 | |||
442 | # | ||
440 | # Character devices | 443 | # Character devices |
441 | # | 444 | # |
442 | # CONFIG_VT is not set | 445 | # CONFIG_VT is not set |
@@ -485,6 +488,10 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
485 | # CONFIG_RAW_DRIVER is not set | 488 | # CONFIG_RAW_DRIVER is not set |
486 | 489 | ||
487 | # | 490 | # |
491 | # TPM devices | ||
492 | # | ||
493 | |||
494 | # | ||
488 | # I2C support | 495 | # I2C support |
489 | # | 496 | # |
490 | # CONFIG_I2C is not set | 497 | # CONFIG_I2C is not set |
@@ -525,10 +532,6 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
525 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 532 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
526 | 533 | ||
527 | # | 534 | # |
528 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information | ||
529 | # | ||
530 | |||
531 | # | ||
532 | # USB Gadget Support | 535 | # USB Gadget Support |
533 | # | 536 | # |
534 | # CONFIG_USB_GADGET is not set | 537 | # CONFIG_USB_GADGET is not set |
@@ -704,8 +707,9 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
704 | # | 707 | # |
705 | # Kernel hacking | 708 | # Kernel hacking |
706 | # | 709 | # |
710 | # CONFIG_PRINTK_TIME is not set | ||
707 | # CONFIG_DEBUG_KERNEL is not set | 711 | # CONFIG_DEBUG_KERNEL is not set |
708 | CONFIG_DEBUG_PREEMPT=y | 712 | CONFIG_LOG_BUF_SHIFT=14 |
709 | # CONFIG_DEBUG_BUGVERBOSE is not set | 713 | # CONFIG_DEBUG_BUGVERBOSE is not set |
710 | # CONFIG_FRAME_POINTER is not set | 714 | # CONFIG_FRAME_POINTER is not set |
711 | 715 | ||