aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m32r/m32700ut
diff options
context:
space:
mode:
authorHirokazu Takata <takata@linux-m32r.org>2005-06-21 20:16:16 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-21 22:07:31 -0400
commit960c2a89a051333d2e6793a416d9a33c4b116b41 (patch)
tree09de2c4b0e3ac3e0a4320e368353d7ae881bbb9e /arch/m32r/m32700ut
parent0adbb44a146d6dff3f74ea7a9d3826f8942ed709 (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/m32700ut')
-rw-r--r--arch/m32r/m32700ut/defconfig.m32700ut.smp53
-rw-r--r--arch/m32r/m32700ut/defconfig.m32700ut.up52
2 files changed, 63 insertions, 42 deletions
diff --git a/arch/m32r/m32700ut/defconfig.m32700ut.smp b/arch/m32r/m32700ut/defconfig.m32700ut.smp
index 1c002181df7f..3e607d90b5f4 100644
--- a/arch/m32r/m32700ut/defconfig.m32700ut.smp
+++ b/arch/m32r/m32700ut/defconfig.m32700ut.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:10:50 2005 4# Fri Jun 3 16:20:58 2005
5# 5#
6CONFIG_M32R=y 6CONFIG_M32R=y
7# CONFIG_UID16 is not set 7# CONFIG_UID16 is not set
@@ -15,6 +15,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
15CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
16CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
17CONFIG_LOCK_KERNEL=y 17CONFIG_LOCK_KERNEL=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
18 19
19# 20#
20# General setup 21# General setup
@@ -27,13 +28,16 @@ CONFIG_BSD_PROCESS_ACCT=y
27# CONFIG_BSD_PROCESS_ACCT_V3 is not set 28# CONFIG_BSD_PROCESS_ACCT_V3 is not set
28CONFIG_SYSCTL=y 29CONFIG_SYSCTL=y
29# CONFIG_AUDIT is not set 30# CONFIG_AUDIT is not set
30CONFIG_LOG_BUF_SHIFT=15
31CONFIG_HOTPLUG=y 31CONFIG_HOTPLUG=y
32CONFIG_KOBJECT_UEVENT=y 32CONFIG_KOBJECT_UEVENT=y
33CONFIG_IKCONFIG=y 33CONFIG_IKCONFIG=y
34# CONFIG_IKCONFIG_PROC is not set 34# CONFIG_IKCONFIG_PROC is not set
35# CONFIG_CPUSETS is not set
35CONFIG_EMBEDDED=y 36CONFIG_EMBEDDED=y
36# CONFIG_KALLSYMS is not set 37# CONFIG_KALLSYMS is not set
38CONFIG_PRINTK=y
39CONFIG_BUG=y
40CONFIG_BASE_FULL=y
37# CONFIG_FUTEX is not set 41# CONFIG_FUTEX is not set
38# CONFIG_EPOLL is not set 42# CONFIG_EPOLL is not set
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 43# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -43,6 +47,7 @@ CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0 47CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0 48CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set 49# CONFIG_TINY_SHMEM is not set
50CONFIG_BASE_SMALL=0
46 51
47# 52#
48# Loadable module support 53# Loadable module support
@@ -65,6 +70,7 @@ CONFIG_PLAT_M32700UT=y
65# CONFIG_PLAT_OPSPUT is not set 70# CONFIG_PLAT_OPSPUT is not set
66# CONFIG_PLAT_OAKS32R is not set 71# CONFIG_PLAT_OAKS32R is not set
67# CONFIG_PLAT_MAPPI2 is not set 72# CONFIG_PLAT_MAPPI2 is not set
73# CONFIG_PLAT_MAPPI3 is not set
68CONFIG_CHIP_M32700=y 74CONFIG_CHIP_M32700=y
69# CONFIG_CHIP_M32102 is not set 75# CONFIG_CHIP_M32102 is not set
70# CONFIG_CHIP_VDEC2 is not set 76# CONFIG_CHIP_VDEC2 is not set
@@ -271,7 +277,6 @@ CONFIG_NET=y
271# 277#
272CONFIG_PACKET=y 278CONFIG_PACKET=y
273# CONFIG_PACKET_MMAP is not set 279# CONFIG_PACKET_MMAP is not set
274# CONFIG_NETLINK_DEV is not set
275CONFIG_UNIX=y 280CONFIG_UNIX=y
276# CONFIG_NET_KEY is not set 281# CONFIG_NET_KEY is not set
277CONFIG_INET=y 282CONFIG_INET=y
@@ -396,18 +401,6 @@ CONFIG_INPUT=y
396# CONFIG_INPUT_EVBUG is not set 401# CONFIG_INPUT_EVBUG is not set
397 402
398# 403#
399# Input I/O drivers
400#
401# CONFIG_GAMEPORT is not set
402CONFIG_SOUND_GAMEPORT=y
403CONFIG_SERIO=y
404# CONFIG_SERIO_I8042 is not set
405CONFIG_SERIO_SERPORT=y
406# CONFIG_SERIO_CT82C710 is not set
407# CONFIG_SERIO_LIBPS2 is not set
408# CONFIG_SERIO_RAW is not set
409
410#
411# Input Device Drivers 404# Input Device Drivers
412# 405#
413# CONFIG_INPUT_KEYBOARD is not set 406# CONFIG_INPUT_KEYBOARD is not set
@@ -417,6 +410,17 @@ CONFIG_SERIO_SERPORT=y
417# CONFIG_INPUT_MISC is not set 410# CONFIG_INPUT_MISC is not set
418 411
419# 412#
413# Hardware I/O ports
414#
415CONFIG_SERIO=y
416# CONFIG_SERIO_I8042 is not set
417CONFIG_SERIO_SERPORT=y
418# CONFIG_SERIO_LIBPS2 is not set
419# CONFIG_SERIO_RAW is not set
420# CONFIG_GAMEPORT is not set
421CONFIG_SOUND_GAMEPORT=y
422
423#
420# Character devices 424# Character devices
421# 425#
422CONFIG_VT=y 426CONFIG_VT=y
@@ -468,6 +472,10 @@ CONFIG_DS1302=y
468# CONFIG_RAW_DRIVER is not set 472# CONFIG_RAW_DRIVER is not set
469 473
470# 474#
475# TPM devices
476#
477
478#
471# I2C support 479# I2C support
472# 480#
473# CONFIG_I2C is not set 481# CONFIG_I2C is not set
@@ -511,8 +519,14 @@ CONFIG_VIDEO_M32R_AR_M64278=y
511# Graphics support 519# Graphics support
512# 520#
513CONFIG_FB=y 521CONFIG_FB=y
522# CONFIG_FB_CFB_FILLRECT is not set
523# CONFIG_FB_CFB_COPYAREA is not set
524# CONFIG_FB_CFB_IMAGEBLIT is not set
525# CONFIG_FB_SOFT_CURSOR is not set
526# CONFIG_FB_MACMODES is not set
514# CONFIG_FB_MODE_HELPERS is not set 527# CONFIG_FB_MODE_HELPERS is not set
515# CONFIG_FB_TILEBLITTING is not set 528# CONFIG_FB_TILEBLITTING is not set
529# CONFIG_FB_S1D13XXX is not set
516# CONFIG_FB_VIRTUAL is not set 530# CONFIG_FB_VIRTUAL is not set
517 531
518# 532#
@@ -546,10 +560,6 @@ CONFIG_LOGO_LINUX_CLUT224=y
546# CONFIG_USB_ARCH_HAS_OHCI is not set 560# CONFIG_USB_ARCH_HAS_OHCI is not set
547 561
548# 562#
549# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
550#
551
552#
553# USB Gadget Support 563# USB Gadget Support
554# 564#
555# CONFIG_USB_GADGET is not set 565# CONFIG_USB_GADGET is not set
@@ -722,8 +732,9 @@ CONFIG_NLS_DEFAULT="iso8859-1"
722# 732#
723# Kernel hacking 733# Kernel hacking
724# 734#
735# CONFIG_PRINTK_TIME is not set
725# CONFIG_DEBUG_KERNEL is not set 736# CONFIG_DEBUG_KERNEL is not set
726CONFIG_DEBUG_PREEMPT=y 737CONFIG_LOG_BUF_SHIFT=15
727# CONFIG_DEBUG_BUGVERBOSE is not set 738# CONFIG_DEBUG_BUGVERBOSE is not set
728# CONFIG_FRAME_POINTER is not set 739# CONFIG_FRAME_POINTER is not set
729 740
diff --git a/arch/m32r/m32700ut/defconfig.m32700ut.up b/arch/m32r/m32700ut/defconfig.m32700ut.up
index 805357f7bda1..2d3e7cda8f46 100644
--- a/arch/m32r/m32700ut/defconfig.m32700ut.up
+++ b/arch/m32r/m32700ut/defconfig.m32700ut.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:10:54 2005 4# Fri Jun 3 16:21:34 2005
5# 5#
6CONFIG_M32R=y 6CONFIG_M32R=y
7# CONFIG_UID16 is not set 7# CONFIG_UID16 is not set
@@ -16,6 +16,7 @@ CONFIG_EXPERIMENTAL=y
16CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
17CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_LOCK_KERNEL=y 18CONFIG_LOCK_KERNEL=y
19CONFIG_INIT_ENV_ARG_LIMIT=32
19 20
20# 21#
21# General setup 22# General setup
@@ -28,13 +29,15 @@ CONFIG_BSD_PROCESS_ACCT=y
28# CONFIG_BSD_PROCESS_ACCT_V3 is not set 29# CONFIG_BSD_PROCESS_ACCT_V3 is not set
29CONFIG_SYSCTL=y 30CONFIG_SYSCTL=y
30# CONFIG_AUDIT is not set 31# CONFIG_AUDIT is not set
31CONFIG_LOG_BUF_SHIFT=14
32CONFIG_HOTPLUG=y 32CONFIG_HOTPLUG=y
33CONFIG_KOBJECT_UEVENT=y 33CONFIG_KOBJECT_UEVENT=y
34CONFIG_IKCONFIG=y 34CONFIG_IKCONFIG=y
35# CONFIG_IKCONFIG_PROC is not set 35# CONFIG_IKCONFIG_PROC is not set
36CONFIG_EMBEDDED=y 36CONFIG_EMBEDDED=y
37# CONFIG_KALLSYMS is not set 37# CONFIG_KALLSYMS is not set
38CONFIG_PRINTK=y
39CONFIG_BUG=y
40CONFIG_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
44CONFIG_CC_ALIGN_LOOPS=0 47CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0 48CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set 49# CONFIG_TINY_SHMEM is not set
50CONFIG_BASE_SMALL=0
47 51
48# 52#
49# Loadable module support 53# Loadable module support
@@ -65,6 +69,7 @@ CONFIG_PLAT_M32700UT=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
68CONFIG_CHIP_M32700=y 73CONFIG_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
@@ -268,7 +273,6 @@ CONFIG_NET=y
268# 273#
269CONFIG_PACKET=y 274CONFIG_PACKET=y
270# CONFIG_PACKET_MMAP is not set 275# CONFIG_PACKET_MMAP is not set
271# CONFIG_NETLINK_DEV is not set
272CONFIG_UNIX=y 276CONFIG_UNIX=y
273# CONFIG_NET_KEY is not set 277# CONFIG_NET_KEY is not set
274CONFIG_INET=y 278CONFIG_INET=y
@@ -393,18 +397,6 @@ CONFIG_INPUT=y
393# CONFIG_INPUT_EVBUG is not set 397# CONFIG_INPUT_EVBUG is not set
394 398
395# 399#
396# Input I/O drivers
397#
398# CONFIG_GAMEPORT is not set
399CONFIG_SOUND_GAMEPORT=y
400CONFIG_SERIO=y
401# CONFIG_SERIO_I8042 is not set
402CONFIG_SERIO_SERPORT=y
403# CONFIG_SERIO_CT82C710 is not set
404# CONFIG_SERIO_LIBPS2 is not set
405# CONFIG_SERIO_RAW is not set
406
407#
408# Input Device Drivers 400# Input Device Drivers
409# 401#
410# CONFIG_INPUT_KEYBOARD is not set 402# CONFIG_INPUT_KEYBOARD is not set
@@ -414,6 +406,17 @@ CONFIG_SERIO_SERPORT=y
414# CONFIG_INPUT_MISC is not set 406# CONFIG_INPUT_MISC is not set
415 407
416# 408#
409# Hardware I/O ports
410#
411CONFIG_SERIO=y
412# CONFIG_SERIO_I8042 is not set
413CONFIG_SERIO_SERPORT=y
414# CONFIG_SERIO_LIBPS2 is not set
415# CONFIG_SERIO_RAW is not set
416# CONFIG_GAMEPORT is not set
417CONFIG_SOUND_GAMEPORT=y
418
419#
417# Character devices 420# Character devices
418# 421#
419CONFIG_VT=y 422CONFIG_VT=y
@@ -465,6 +468,10 @@ CONFIG_DS1302=y
465# CONFIG_RAW_DRIVER is not set 468# CONFIG_RAW_DRIVER is not set
466 469
467# 470#
471# TPM devices
472#
473
474#
468# I2C support 475# I2C support
469# 476#
470# CONFIG_I2C is not set 477# CONFIG_I2C is not set
@@ -508,8 +515,14 @@ CONFIG_VIDEO_M32R_AR_M64278=y
508# Graphics support 515# Graphics support
509# 516#
510CONFIG_FB=y 517CONFIG_FB=y
518# CONFIG_FB_CFB_FILLRECT is not set
519# CONFIG_FB_CFB_COPYAREA is not set
520# CONFIG_FB_CFB_IMAGEBLIT is not set
521# CONFIG_FB_SOFT_CURSOR is not set
522# CONFIG_FB_MACMODES is not set
511# CONFIG_FB_MODE_HELPERS is not set 523# CONFIG_FB_MODE_HELPERS is not set
512# CONFIG_FB_TILEBLITTING is not set 524# CONFIG_FB_TILEBLITTING is not set
525# CONFIG_FB_S1D13XXX is not set
513# CONFIG_FB_VIRTUAL is not set 526# CONFIG_FB_VIRTUAL is not set
514 527
515# 528#
@@ -543,10 +556,6 @@ CONFIG_LOGO_LINUX_CLUT224=y
543# CONFIG_USB_ARCH_HAS_OHCI is not set 556# CONFIG_USB_ARCH_HAS_OHCI is not set
544 557
545# 558#
546# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
547#
548
549#
550# USB Gadget Support 559# USB Gadget Support
551# 560#
552# CONFIG_USB_GADGET is not set 561# CONFIG_USB_GADGET is not set
@@ -719,8 +728,9 @@ CONFIG_NLS_DEFAULT="iso8859-1"
719# 728#
720# Kernel hacking 729# Kernel hacking
721# 730#
731# CONFIG_PRINTK_TIME is not set
722# CONFIG_DEBUG_KERNEL is not set 732# CONFIG_DEBUG_KERNEL is not set
723CONFIG_DEBUG_PREEMPT=y 733CONFIG_LOG_BUF_SHIFT=14
724# CONFIG_DEBUG_BUGVERBOSE is not set 734# CONFIG_DEBUG_BUGVERBOSE is not set
725# CONFIG_FRAME_POINTER is not set 735# CONFIG_FRAME_POINTER is not set
726 736