diff options
author | arnd@arndb.de <arnd@arndb.de> | 2006-06-19 14:33:18 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-06-21 01:01:29 -0400 |
commit | 0f0f90c304b42d8ce7fc5958de894bdcff3a0ca1 (patch) | |
tree | 2cc6131da89ac3d38f211d22c2ba7886e6d150cb /arch/powerpc/configs | |
parent | b40feec8efbe609a3a38bca1f18d3ba4d590563a (diff) |
[POWERPC] cell: update defconfig
Enable some of the most requested features in defconfig
and refresh with the latest powerpc.git Kconfig files.
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/configs')
-rw-r--r-- | arch/powerpc/configs/cell_defconfig | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig index 5b8599d03f16..5569befa405d 100644 --- a/arch/powerpc/configs/cell_defconfig +++ b/arch/powerpc/configs/cell_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.16 | 3 | # Linux kernel version: 2.6.17 |
4 | # Thu Mar 23 20:48:09 2006 | 4 | # Mon Jun 19 17:23:03 2006 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
@@ -11,6 +11,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
11 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 11 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
12 | CONFIG_GENERIC_HWEIGHT=y | 12 | CONFIG_GENERIC_HWEIGHT=y |
13 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 13 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
14 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
14 | CONFIG_PPC=y | 15 | CONFIG_PPC=y |
15 | CONFIG_EARLY_PRINTK=y | 16 | CONFIG_EARLY_PRINTK=y |
16 | CONFIG_COMPAT=y | 17 | CONFIG_COMPAT=y |
@@ -55,7 +56,7 @@ CONFIG_SYSCTL=y | |||
55 | # CONFIG_AUDIT is not set | 56 | # CONFIG_AUDIT is not set |
56 | CONFIG_IKCONFIG=y | 57 | CONFIG_IKCONFIG=y |
57 | CONFIG_IKCONFIG_PROC=y | 58 | CONFIG_IKCONFIG_PROC=y |
58 | # CONFIG_CPUSETS is not set | 59 | CONFIG_CPUSETS=y |
59 | # CONFIG_RELAY is not set | 60 | # CONFIG_RELAY is not set |
60 | CONFIG_INITRAMFS_SOURCE="" | 61 | CONFIG_INITRAMFS_SOURCE="" |
61 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 62 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
@@ -116,6 +117,7 @@ CONFIG_PPC_MULTIPLATFORM=y | |||
116 | # CONFIG_PPC_PMAC is not set | 117 | # CONFIG_PPC_PMAC is not set |
117 | # CONFIG_PPC_MAPLE is not set | 118 | # CONFIG_PPC_MAPLE is not set |
118 | CONFIG_PPC_CELL=y | 119 | CONFIG_PPC_CELL=y |
120 | CONFIG_PPC_SYSTEMSIM=y | ||
119 | # CONFIG_U3_DART is not set | 121 | # CONFIG_U3_DART is not set |
120 | CONFIG_PPC_RTAS=y | 122 | CONFIG_PPC_RTAS=y |
121 | # CONFIG_RTAS_ERROR_LOGGING is not set | 123 | # CONFIG_RTAS_ERROR_LOGGING is not set |
@@ -153,20 +155,24 @@ CONFIG_FORCE_MAX_ZONEORDER=13 | |||
153 | CONFIG_KEXEC=y | 155 | CONFIG_KEXEC=y |
154 | # CONFIG_CRASH_DUMP is not set | 156 | # CONFIG_CRASH_DUMP is not set |
155 | CONFIG_IRQ_ALL_CPUS=y | 157 | CONFIG_IRQ_ALL_CPUS=y |
156 | # CONFIG_NUMA is not set | 158 | CONFIG_NUMA=y |
159 | CONFIG_NODES_SHIFT=4 | ||
157 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 160 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
158 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
159 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 161 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
160 | CONFIG_SELECT_MEMORY_MODEL=y | 162 | CONFIG_SELECT_MEMORY_MODEL=y |
161 | # CONFIG_FLATMEM_MANUAL is not set | 163 | # CONFIG_FLATMEM_MANUAL is not set |
162 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 164 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
163 | CONFIG_SPARSEMEM_MANUAL=y | 165 | CONFIG_SPARSEMEM_MANUAL=y |
164 | CONFIG_SPARSEMEM=y | 166 | CONFIG_SPARSEMEM=y |
167 | CONFIG_NEED_MULTIPLE_NODES=y | ||
165 | CONFIG_HAVE_MEMORY_PRESENT=y | 168 | CONFIG_HAVE_MEMORY_PRESENT=y |
166 | # CONFIG_SPARSEMEM_STATIC is not set | 169 | # CONFIG_SPARSEMEM_STATIC is not set |
167 | CONFIG_SPARSEMEM_EXTREME=y | 170 | CONFIG_SPARSEMEM_EXTREME=y |
168 | # CONFIG_MEMORY_HOTPLUG is not set | 171 | CONFIG_MEMORY_HOTPLUG=y |
169 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 172 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
173 | CONFIG_MIGRATION=y | ||
174 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | ||
175 | CONFIG_ARCH_MEMORY_PROBE=y | ||
170 | # CONFIG_PPC_64K_PAGES is not set | 176 | # CONFIG_PPC_64K_PAGES is not set |
171 | CONFIG_SCHED_SMT=y | 177 | CONFIG_SCHED_SMT=y |
172 | CONFIG_PROC_DEVICETREE=y | 178 | CONFIG_PROC_DEVICETREE=y |
@@ -183,6 +189,7 @@ CONFIG_GENERIC_ISA_DMA=y | |||
183 | # CONFIG_PPC_INDIRECT_PCI is not set | 189 | # CONFIG_PPC_INDIRECT_PCI is not set |
184 | CONFIG_PCI=y | 190 | CONFIG_PCI=y |
185 | CONFIG_PCI_DOMAINS=y | 191 | CONFIG_PCI_DOMAINS=y |
192 | CONFIG_PCIEPORTBUS=y | ||
186 | # CONFIG_PCI_DEBUG is not set | 193 | # CONFIG_PCI_DEBUG is not set |
187 | 194 | ||
188 | # | 195 | # |
@@ -477,7 +484,7 @@ CONFIG_DM_MULTIPATH=m | |||
477 | # | 484 | # |
478 | CONFIG_NETDEVICES=y | 485 | CONFIG_NETDEVICES=y |
479 | # CONFIG_DUMMY is not set | 486 | # CONFIG_DUMMY is not set |
480 | # CONFIG_BONDING is not set | 487 | CONFIG_BONDING=y |
481 | # CONFIG_EQUALIZER is not set | 488 | # CONFIG_EQUALIZER is not set |
482 | # CONFIG_TUN is not set | 489 | # CONFIG_TUN is not set |
483 | 490 | ||
@@ -625,6 +632,7 @@ CONFIG_SERIAL_NONSTANDARD=y | |||
625 | # CONFIG_N_HDLC is not set | 632 | # CONFIG_N_HDLC is not set |
626 | # CONFIG_SPECIALIX is not set | 633 | # CONFIG_SPECIALIX is not set |
627 | # CONFIG_SX is not set | 634 | # CONFIG_SX is not set |
635 | # CONFIG_RIO is not set | ||
628 | # CONFIG_STALDRV is not set | 636 | # CONFIG_STALDRV is not set |
629 | 637 | ||
630 | # | 638 | # |
@@ -767,6 +775,7 @@ CONFIG_I2C_ALGOBIT=y | |||
767 | # Multimedia devices | 775 | # Multimedia devices |
768 | # | 776 | # |
769 | # CONFIG_VIDEO_DEV is not set | 777 | # CONFIG_VIDEO_DEV is not set |
778 | CONFIG_VIDEO_V4L2=y | ||
770 | 779 | ||
771 | # | 780 | # |
772 | # Digital Video Broadcasting Devices | 781 | # Digital Video Broadcasting Devices |
@@ -1055,11 +1064,7 @@ CONFIG_DEBUGGER=y | |||
1055 | # CONFIG_XMON is not set | 1064 | # CONFIG_XMON is not set |
1056 | CONFIG_IRQSTACKS=y | 1065 | CONFIG_IRQSTACKS=y |
1057 | # CONFIG_BOOTX_TEXT is not set | 1066 | # CONFIG_BOOTX_TEXT is not set |
1058 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set | 1067 | # CONFIG_PPC_EARLY_DEBUG is not set |
1059 | # CONFIG_PPC_EARLY_DEBUG_G5 is not set | ||
1060 | # CONFIG_PPC_EARLY_DEBUG_RTAS is not set | ||
1061 | # CONFIG_PPC_EARLY_DEBUG_MAPLE is not set | ||
1062 | # CONFIG_PPC_EARLY_DEBUG_ISERIES is not set | ||
1063 | 1068 | ||
1064 | # | 1069 | # |
1065 | # Security options | 1070 | # Security options |