diff options
Diffstat (limited to 'arch/arm')
26 files changed, 773 insertions, 444 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1dbf6ddb300d..08b7cc900cae 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -150,8 +150,6 @@ config ARCH_IOP3XX | |||
| 150 | 150 | ||
| 151 | config ARCH_IXP4XX | 151 | config ARCH_IXP4XX |
| 152 | bool "IXP4xx-based" | 152 | bool "IXP4xx-based" |
| 153 | select DMABOUNCE | ||
| 154 | select PCI | ||
| 155 | help | 153 | help |
| 156 | Support for Intel's IXP4XX (XScale) family of processors. | 154 | Support for Intel's IXP4XX (XScale) family of processors. |
| 157 | 155 | ||
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c index 0af3772efcb7..ace3fb5835d9 100644 --- a/arch/arm/boot/compressed/misc.c +++ b/arch/arm/boot/compressed/misc.c | |||
| @@ -38,10 +38,10 @@ static void icedcc_putc(int ch) | |||
| 38 | if (--i < 0) | 38 | if (--i < 0) |
| 39 | return; | 39 | return; |
| 40 | 40 | ||
| 41 | asm("mrc p14, 0, %0, c0, c0, 0" : "=r" (status)); | 41 | asm volatile ("mrc p14, 0, %0, c0, c0, 0" : "=r" (status)); |
| 42 | } while (status & 2); | 42 | } while (status & 2); |
| 43 | 43 | ||
| 44 | asm("mcr p15, 0, %0, c1, c0, 0" : : "r" (ch)); | 44 | asm("mcr p14, 0, %0, c1, c0, 0" : : "r" (ch)); |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | #define putc(ch) icedcc_putc(ch) | 47 | #define putc(ch) icedcc_putc(ch) |
diff --git a/arch/arm/configs/collie_defconfig b/arch/arm/configs/collie_defconfig index c9aa878e610a..074c47a4fb2e 100644 --- a/arch/arm/configs/collie_defconfig +++ b/arch/arm/configs/collie_defconfig | |||
| @@ -1,21 +1,21 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.14-rc3 | 3 | # Linux kernel version: 2.6.17-rc1 |
| 4 | # Sun Oct 9 16:55:14 2005 | 4 | # Fri Apr 14 19:09:52 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| 8 | CONFIG_UID16=y | ||
| 9 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 9 | CONFIG_GENERIC_HWEIGHT=y | ||
| 10 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 10 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 11 | CONFIG_ARCH_MTD_XIP=y | ||
| 12 | CONFIG_VECTORS_BASE=0xffff0000 | ||
| 11 | 13 | ||
| 12 | # | 14 | # |
| 13 | # Code maturity level options | 15 | # Code maturity level options |
| 14 | # | 16 | # |
| 15 | CONFIG_EXPERIMENTAL=y | 17 | CONFIG_EXPERIMENTAL=y |
| 16 | CONFIG_CLEAN_COMPILE=y | ||
| 17 | CONFIG_BROKEN_ON_SMP=y | 18 | CONFIG_BROKEN_ON_SMP=y |
| 18 | CONFIG_LOCK_KERNEL=y | ||
| 19 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 19 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 20 | 20 | ||
| 21 | # | 21 | # |
| @@ -23,45 +23,58 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 | |||
| 23 | # | 23 | # |
| 24 | CONFIG_LOCALVERSION="" | 24 | CONFIG_LOCALVERSION="" |
| 25 | CONFIG_LOCALVERSION_AUTO=y | 25 | CONFIG_LOCALVERSION_AUTO=y |
| 26 | CONFIG_SWAP=y | 26 | # CONFIG_SWAP is not set |
| 27 | CONFIG_SYSVIPC=y | 27 | CONFIG_SYSVIPC=y |
| 28 | # CONFIG_POSIX_MQUEUE is not set | 28 | # CONFIG_POSIX_MQUEUE is not set |
| 29 | CONFIG_BSD_PROCESS_ACCT=y | 29 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 30 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
| 31 | CONFIG_SYSCTL=y | 30 | CONFIG_SYSCTL=y |
| 32 | # CONFIG_AUDIT is not set | 31 | # CONFIG_AUDIT is not set |
| 33 | CONFIG_HOTPLUG=y | ||
| 34 | CONFIG_KOBJECT_UEVENT=y | ||
| 35 | # CONFIG_IKCONFIG is not set | 32 | # CONFIG_IKCONFIG is not set |
| 33 | # CONFIG_RELAY is not set | ||
| 36 | CONFIG_INITRAMFS_SOURCE="" | 34 | CONFIG_INITRAMFS_SOURCE="" |
| 35 | CONFIG_UID16=y | ||
| 36 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 37 | CONFIG_EMBEDDED=y | 37 | CONFIG_EMBEDDED=y |
| 38 | CONFIG_KALLSYMS=y | 38 | CONFIG_KALLSYMS=y |
| 39 | # CONFIG_KALLSYMS_ALL is not set | 39 | # CONFIG_KALLSYMS_ALL is not set |
| 40 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 40 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 41 | CONFIG_HOTPLUG=y | ||
| 41 | CONFIG_PRINTK=y | 42 | CONFIG_PRINTK=y |
| 42 | CONFIG_BUG=y | 43 | CONFIG_BUG=y |
| 43 | CONFIG_BASE_FULL=y | 44 | CONFIG_ELF_CORE=y |
| 45 | # CONFIG_BASE_FULL is not set | ||
| 44 | CONFIG_FUTEX=y | 46 | CONFIG_FUTEX=y |
| 45 | CONFIG_EPOLL=y | 47 | # CONFIG_EPOLL is not set |
| 46 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
| 47 | CONFIG_SHMEM=y | 48 | CONFIG_SHMEM=y |
| 48 | CONFIG_CC_ALIGN_FUNCTIONS=0 | 49 | # CONFIG_SLAB is not set |
| 49 | CONFIG_CC_ALIGN_LABELS=0 | 50 | CONFIG_DOUBLEFAULT=y |
| 50 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 51 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 52 | # CONFIG_TINY_SHMEM is not set | 51 | # CONFIG_TINY_SHMEM is not set |
| 53 | CONFIG_BASE_SMALL=0 | 52 | CONFIG_BASE_SMALL=1 |
| 53 | CONFIG_SLOB=y | ||
| 54 | CONFIG_OBSOLETE_INTERMODULE=y | ||
| 54 | 55 | ||
| 55 | # | 56 | # |
| 56 | # Loadable module support | 57 | # Loadable module support |
| 57 | # | 58 | # |
| 58 | CONFIG_MODULES=y | 59 | # CONFIG_MODULES is not set |
| 59 | CONFIG_MODULE_UNLOAD=y | 60 | |
| 60 | CONFIG_MODULE_FORCE_UNLOAD=y | 61 | # |
| 61 | CONFIG_OBSOLETE_MODPARM=y | 62 | # Block layer |
| 62 | CONFIG_MODVERSIONS=y | 63 | # |
| 63 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 64 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 64 | CONFIG_KMOD=y | 65 | |
| 66 | # | ||
| 67 | # IO Schedulers | ||
| 68 | # | ||
| 69 | CONFIG_IOSCHED_NOOP=y | ||
| 70 | CONFIG_IOSCHED_AS=y | ||
| 71 | # CONFIG_IOSCHED_DEADLINE is not set | ||
| 72 | # CONFIG_IOSCHED_CFQ is not set | ||
| 73 | CONFIG_DEFAULT_AS=y | ||
| 74 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 75 | # CONFIG_DEFAULT_CFQ is not set | ||
| 76 | # CONFIG_DEFAULT_NOOP is not set | ||
| 77 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 65 | 78 | ||
| 66 | # | 79 | # |
| 67 | # System Type | 80 | # System Type |
| @@ -70,11 +83,13 @@ CONFIG_KMOD=y | |||
| 70 | # CONFIG_ARCH_CLPS711X is not set | 83 | # CONFIG_ARCH_CLPS711X is not set |
| 71 | # CONFIG_ARCH_CO285 is not set | 84 | # CONFIG_ARCH_CO285 is not set |
| 72 | # CONFIG_ARCH_EBSA110 is not set | 85 | # CONFIG_ARCH_EBSA110 is not set |
| 86 | # CONFIG_ARCH_EP93XX is not set | ||
| 73 | # CONFIG_ARCH_FOOTBRIDGE is not set | 87 | # CONFIG_ARCH_FOOTBRIDGE is not set |
| 74 | # CONFIG_ARCH_INTEGRATOR is not set | 88 | # CONFIG_ARCH_INTEGRATOR is not set |
| 75 | # CONFIG_ARCH_IOP3XX is not set | 89 | # CONFIG_ARCH_IOP3XX is not set |
| 76 | # CONFIG_ARCH_IXP4XX is not set | 90 | # CONFIG_ARCH_IXP4XX is not set |
| 77 | # CONFIG_ARCH_IXP2000 is not set | 91 | # CONFIG_ARCH_IXP2000 is not set |
| 92 | # CONFIG_ARCH_IXP23XX is not set | ||
| 78 | # CONFIG_ARCH_L7200 is not set | 93 | # CONFIG_ARCH_L7200 is not set |
| 79 | # CONFIG_ARCH_PXA is not set | 94 | # CONFIG_ARCH_PXA is not set |
| 80 | # CONFIG_ARCH_RPC is not set | 95 | # CONFIG_ARCH_RPC is not set |
| @@ -84,9 +99,11 @@ CONFIG_ARCH_SA1100=y | |||
| 84 | # CONFIG_ARCH_LH7A40X is not set | 99 | # CONFIG_ARCH_LH7A40X is not set |
| 85 | # CONFIG_ARCH_OMAP is not set | 100 | # CONFIG_ARCH_OMAP is not set |
| 86 | # CONFIG_ARCH_VERSATILE is not set | 101 | # CONFIG_ARCH_VERSATILE is not set |
| 102 | # CONFIG_ARCH_REALVIEW is not set | ||
| 87 | # CONFIG_ARCH_IMX is not set | 103 | # CONFIG_ARCH_IMX is not set |
| 88 | # CONFIG_ARCH_H720X is not set | 104 | # CONFIG_ARCH_H720X is not set |
| 89 | # CONFIG_ARCH_AAEC2000 is not set | 105 | # CONFIG_ARCH_AAEC2000 is not set |
| 106 | # CONFIG_ARCH_AT91RM9200 is not set | ||
| 90 | 107 | ||
| 91 | # | 108 | # |
| 92 | # SA11x0 Implementations | 109 | # SA11x0 Implementations |
| @@ -128,20 +145,32 @@ CONFIG_SHARP_SCOOP=y | |||
| 128 | # Bus support | 145 | # Bus support |
| 129 | # | 146 | # |
| 130 | CONFIG_ISA=y | 147 | CONFIG_ISA=y |
| 131 | CONFIG_ISA_DMA_API=y | ||
| 132 | 148 | ||
| 133 | # | 149 | # |
| 134 | # PCCARD (PCMCIA/CardBus) support | 150 | # PCCARD (PCMCIA/CardBus) support |
| 135 | # | 151 | # |
| 136 | # CONFIG_PCCARD is not set | 152 | CONFIG_PCCARD=y |
| 153 | CONFIG_PCMCIA_DEBUG=y | ||
| 154 | CONFIG_PCMCIA=y | ||
| 155 | CONFIG_PCMCIA_LOAD_CIS=y | ||
| 156 | CONFIG_PCMCIA_IOCTL=y | ||
| 157 | |||
| 158 | # | ||
| 159 | # PC-card bridges | ||
| 160 | # | ||
| 161 | # CONFIG_I82365 is not set | ||
| 162 | # CONFIG_TCIC is not set | ||
| 163 | CONFIG_PCMCIA_SA1100=y | ||
| 137 | 164 | ||
| 138 | # | 165 | # |
| 139 | # Kernel Features | 166 | # Kernel Features |
| 140 | # | 167 | # |
| 141 | # CONFIG_SMP is not set | 168 | # CONFIG_PREEMPT is not set |
| 142 | CONFIG_PREEMPT=y | ||
| 143 | # CONFIG_NO_IDLE_HZ is not set | 169 | # CONFIG_NO_IDLE_HZ is not set |
| 170 | CONFIG_HZ=100 | ||
| 171 | # CONFIG_AEABI is not set | ||
| 144 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | 172 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y |
| 173 | CONFIG_NODES_SHIFT=2 | ||
| 145 | CONFIG_SELECT_MEMORY_MODEL=y | 174 | CONFIG_SELECT_MEMORY_MODEL=y |
| 146 | # CONFIG_FLATMEM_MANUAL is not set | 175 | # CONFIG_FLATMEM_MANUAL is not set |
| 147 | CONFIG_DISCONTIGMEM_MANUAL=y | 176 | CONFIG_DISCONTIGMEM_MANUAL=y |
| @@ -150,6 +179,7 @@ CONFIG_DISCONTIGMEM=y | |||
| 150 | CONFIG_FLAT_NODE_MEM_MAP=y | 179 | CONFIG_FLAT_NODE_MEM_MAP=y |
| 151 | CONFIG_NEED_MULTIPLE_NODES=y | 180 | CONFIG_NEED_MULTIPLE_NODES=y |
| 152 | # CONFIG_SPARSEMEM_STATIC is not set | 181 | # CONFIG_SPARSEMEM_STATIC is not set |
| 182 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
| 153 | # CONFIG_LEDS is not set | 183 | # CONFIG_LEDS is not set |
| 154 | CONFIG_ALIGNMENT_TRAP=y | 184 | CONFIG_ALIGNMENT_TRAP=y |
| 155 | 185 | ||
| @@ -158,7 +188,7 @@ CONFIG_ALIGNMENT_TRAP=y | |||
| 158 | # | 188 | # |
| 159 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 189 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
| 160 | CONFIG_ZBOOT_ROM_BSS=0x0 | 190 | CONFIG_ZBOOT_ROM_BSS=0x0 |
| 161 | CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 debug" | 191 | CONFIG_CMDLINE="noinitrd root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1" |
| 162 | # CONFIG_XIP_KERNEL is not set | 192 | # CONFIG_XIP_KERNEL is not set |
| 163 | 193 | ||
| 164 | # | 194 | # |
| @@ -181,14 +211,16 @@ CONFIG_FPE_NWFPE=y | |||
| 181 | # Userspace binary formats | 211 | # Userspace binary formats |
| 182 | # | 212 | # |
| 183 | CONFIG_BINFMT_ELF=y | 213 | CONFIG_BINFMT_ELF=y |
| 184 | CONFIG_BINFMT_AOUT=m | 214 | # CONFIG_BINFMT_AOUT is not set |
| 185 | CONFIG_BINFMT_MISC=m | 215 | # CONFIG_BINFMT_MISC is not set |
| 186 | # CONFIG_ARTHUR is not set | 216 | # CONFIG_ARTHUR is not set |
| 187 | 217 | ||
| 188 | # | 218 | # |
| 189 | # Power management options | 219 | # Power management options |
| 190 | # | 220 | # |
| 191 | CONFIG_PM=y | 221 | CONFIG_PM=y |
| 222 | CONFIG_PM_LEGACY=y | ||
| 223 | # CONFIG_PM_DEBUG is not set | ||
| 192 | CONFIG_APM=y | 224 | CONFIG_APM=y |
| 193 | 225 | ||
| 194 | # | 226 | # |
| @@ -199,6 +231,7 @@ CONFIG_NET=y | |||
| 199 | # | 231 | # |
| 200 | # Networking options | 232 | # Networking options |
| 201 | # | 233 | # |
| 234 | # CONFIG_NETDEBUG is not set | ||
| 202 | CONFIG_PACKET=y | 235 | CONFIG_PACKET=y |
| 203 | CONFIG_PACKET_MMAP=y | 236 | CONFIG_PACKET_MMAP=y |
| 204 | CONFIG_UNIX=y | 237 | CONFIG_UNIX=y |
| @@ -211,16 +244,19 @@ CONFIG_IP_FIB_HASH=y | |||
| 211 | # CONFIG_NET_IPIP is not set | 244 | # CONFIG_NET_IPIP is not set |
| 212 | # CONFIG_NET_IPGRE is not set | 245 | # CONFIG_NET_IPGRE is not set |
| 213 | # CONFIG_ARPD is not set | 246 | # CONFIG_ARPD is not set |
| 214 | CONFIG_SYN_COOKIES=y | 247 | # CONFIG_SYN_COOKIES is not set |
| 215 | # CONFIG_INET_AH is not set | 248 | # CONFIG_INET_AH is not set |
| 216 | # CONFIG_INET_ESP is not set | 249 | # CONFIG_INET_ESP is not set |
| 217 | # CONFIG_INET_IPCOMP is not set | 250 | # CONFIG_INET_IPCOMP is not set |
| 251 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 218 | # CONFIG_INET_TUNNEL is not set | 252 | # CONFIG_INET_TUNNEL is not set |
| 219 | CONFIG_INET_DIAG=y | 253 | CONFIG_INET_DIAG=y |
| 220 | CONFIG_INET_TCP_DIAG=y | 254 | CONFIG_INET_TCP_DIAG=y |
| 221 | # CONFIG_TCP_CONG_ADVANCED is not set | 255 | # CONFIG_TCP_CONG_ADVANCED is not set |
| 222 | CONFIG_TCP_CONG_BIC=y | 256 | CONFIG_TCP_CONG_BIC=y |
| 223 | # CONFIG_IPV6 is not set | 257 | # CONFIG_IPV6 is not set |
| 258 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 259 | # CONFIG_INET6_TUNNEL is not set | ||
| 224 | # CONFIG_NETFILTER is not set | 260 | # CONFIG_NETFILTER is not set |
| 225 | 261 | ||
| 226 | # | 262 | # |
| @@ -232,6 +268,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 232 | # SCTP Configuration (EXPERIMENTAL) | 268 | # SCTP Configuration (EXPERIMENTAL) |
| 233 | # | 269 | # |
| 234 | # CONFIG_IP_SCTP is not set | 270 | # CONFIG_IP_SCTP is not set |
| 271 | |||
| 272 | # | ||
| 273 | # TIPC Configuration (EXPERIMENTAL) | ||
| 274 | # | ||
| 275 | # CONFIG_TIPC is not set | ||
| 235 | # CONFIG_ATM is not set | 276 | # CONFIG_ATM is not set |
| 236 | # CONFIG_BRIDGE is not set | 277 | # CONFIG_BRIDGE is not set |
| 237 | # CONFIG_VLAN_8021Q is not set | 278 | # CONFIG_VLAN_8021Q is not set |
| @@ -244,8 +285,11 @@ CONFIG_TCP_CONG_BIC=y | |||
| 244 | # CONFIG_NET_DIVERT is not set | 285 | # CONFIG_NET_DIVERT is not set |
| 245 | # CONFIG_ECONET is not set | 286 | # CONFIG_ECONET is not set |
| 246 | # CONFIG_WAN_ROUTER is not set | 287 | # CONFIG_WAN_ROUTER is not set |
| 288 | |||
| 289 | # | ||
| 290 | # QoS and/or fair queueing | ||
| 291 | # | ||
| 247 | # CONFIG_NET_SCHED is not set | 292 | # CONFIG_NET_SCHED is not set |
| 248 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 249 | 293 | ||
| 250 | # | 294 | # |
| 251 | # Network testing | 295 | # Network testing |
| @@ -265,10 +309,15 @@ CONFIG_TCP_CONG_BIC=y | |||
| 265 | # | 309 | # |
| 266 | CONFIG_STANDALONE=y | 310 | CONFIG_STANDALONE=y |
| 267 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 311 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 268 | CONFIG_FW_LOADER=m | 312 | CONFIG_FW_LOADER=y |
| 269 | # CONFIG_DEBUG_DRIVER is not set | 313 | # CONFIG_DEBUG_DRIVER is not set |
| 270 | 314 | ||
| 271 | # | 315 | # |
| 316 | # Connector - unified userspace <-> kernelspace linker | ||
| 317 | # | ||
| 318 | # CONFIG_CONNECTOR is not set | ||
| 319 | |||
| 320 | # | ||
| 272 | # Memory Technology Devices (MTD) | 321 | # Memory Technology Devices (MTD) |
| 273 | # | 322 | # |
| 274 | CONFIG_MTD=y | 323 | CONFIG_MTD=y |
| @@ -287,32 +336,49 @@ CONFIG_MTD_BLOCK=y | |||
| 287 | # CONFIG_FTL is not set | 336 | # CONFIG_FTL is not set |
| 288 | # CONFIG_NFTL is not set | 337 | # CONFIG_NFTL is not set |
| 289 | # CONFIG_INFTL is not set | 338 | # CONFIG_INFTL is not set |
| 339 | # CONFIG_RFD_FTL is not set | ||
| 290 | 340 | ||
| 291 | # | 341 | # |
| 292 | # RAM/ROM/Flash chip drivers | 342 | # RAM/ROM/Flash chip drivers |
| 293 | # | 343 | # |
| 294 | # CONFIG_MTD_CFI is not set | 344 | CONFIG_MTD_CFI=y |
| 295 | # CONFIG_MTD_JEDECPROBE is not set | 345 | CONFIG_MTD_JEDECPROBE=y |
| 296 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | 346 | CONFIG_MTD_GEN_PROBE=y |
| 297 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | 347 | CONFIG_MTD_CFI_ADV_OPTIONS=y |
| 348 | CONFIG_MTD_CFI_NOSWAP=y | ||
| 349 | # CONFIG_MTD_CFI_BE_BYTE_SWAP is not set | ||
| 350 | # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set | ||
| 351 | CONFIG_MTD_CFI_GEOMETRY=y | ||
| 352 | # CONFIG_MTD_MAP_BANK_WIDTH_1 is not set | ||
| 353 | # CONFIG_MTD_MAP_BANK_WIDTH_2 is not set | ||
| 298 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | 354 | CONFIG_MTD_MAP_BANK_WIDTH_4=y |
| 299 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | 355 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set |
| 300 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | 356 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set |
| 301 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | 357 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set |
| 302 | CONFIG_MTD_CFI_I1=y | 358 | # CONFIG_MTD_CFI_I1 is not set |
| 303 | CONFIG_MTD_CFI_I2=y | 359 | # CONFIG_MTD_CFI_I2 is not set |
| 304 | # CONFIG_MTD_CFI_I4 is not set | 360 | CONFIG_MTD_CFI_I4=y |
| 305 | # CONFIG_MTD_CFI_I8 is not set | 361 | # CONFIG_MTD_CFI_I8 is not set |
| 362 | # CONFIG_MTD_OTP is not set | ||
| 363 | CONFIG_MTD_CFI_INTELEXT=y | ||
| 364 | # CONFIG_MTD_CFI_AMDSTD is not set | ||
| 365 | # CONFIG_MTD_CFI_STAA is not set | ||
| 366 | CONFIG_MTD_CFI_UTIL=y | ||
| 306 | # CONFIG_MTD_RAM is not set | 367 | # CONFIG_MTD_RAM is not set |
| 307 | # CONFIG_MTD_ROM is not set | 368 | # CONFIG_MTD_ROM is not set |
| 308 | # CONFIG_MTD_ABSENT is not set | 369 | # CONFIG_MTD_ABSENT is not set |
| 309 | CONFIG_MTD_OBSOLETE_CHIPS=y | 370 | CONFIG_MTD_OBSOLETE_CHIPS=y |
| 310 | CONFIG_MTD_SHARP=y | 371 | CONFIG_MTD_SHARP=y |
| 372 | # CONFIG_MTD_XIP is not set | ||
| 311 | 373 | ||
| 312 | # | 374 | # |
| 313 | # Mapping drivers for chip access | 375 | # Mapping drivers for chip access |
| 314 | # | 376 | # |
| 315 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | 377 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set |
| 378 | # CONFIG_MTD_PHYSMAP is not set | ||
| 379 | # CONFIG_MTD_ARM_INTEGRATOR is not set | ||
| 380 | CONFIG_MTD_SA1100=y | ||
| 381 | # CONFIG_MTD_IMPA7 is not set | ||
| 316 | # CONFIG_MTD_PLATRAM is not set | 382 | # CONFIG_MTD_PLATRAM is not set |
| 317 | 383 | ||
| 318 | # | 384 | # |
| @@ -321,7 +387,6 @@ CONFIG_MTD_SHARP=y | |||
| 321 | # CONFIG_MTD_SLRAM is not set | 387 | # CONFIG_MTD_SLRAM is not set |
| 322 | # CONFIG_MTD_PHRAM is not set | 388 | # CONFIG_MTD_PHRAM is not set |
| 323 | # CONFIG_MTD_MTDRAM is not set | 389 | # CONFIG_MTD_MTDRAM is not set |
| 324 | # CONFIG_MTD_BLKMTD is not set | ||
| 325 | # CONFIG_MTD_BLOCK2MTD is not set | 390 | # CONFIG_MTD_BLOCK2MTD is not set |
| 326 | 391 | ||
| 327 | # | 392 | # |
| @@ -337,6 +402,11 @@ CONFIG_MTD_SHARP=y | |||
| 337 | # CONFIG_MTD_NAND is not set | 402 | # CONFIG_MTD_NAND is not set |
| 338 | 403 | ||
| 339 | # | 404 | # |
| 405 | # OneNAND Flash Device Drivers | ||
| 406 | # | ||
| 407 | # CONFIG_MTD_ONENAND is not set | ||
| 408 | |||
| 409 | # | ||
| 340 | # Parallel port support | 410 | # Parallel port support |
| 341 | # | 411 | # |
| 342 | # CONFIG_PARPORT is not set | 412 | # CONFIG_PARPORT is not set |
| @@ -349,7 +419,6 @@ CONFIG_MTD_SHARP=y | |||
| 349 | # | 419 | # |
| 350 | # Block devices | 420 | # Block devices |
| 351 | # | 421 | # |
| 352 | # CONFIG_BLK_DEV_XD is not set | ||
| 353 | # CONFIG_BLK_DEV_COW_COMMON is not set | 422 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 354 | CONFIG_BLK_DEV_LOOP=y | 423 | CONFIG_BLK_DEV_LOOP=y |
| 355 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 424 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
| @@ -359,20 +428,35 @@ CONFIG_BLK_DEV_RAM_COUNT=16 | |||
| 359 | CONFIG_BLK_DEV_RAM_SIZE=1024 | 428 | CONFIG_BLK_DEV_RAM_SIZE=1024 |
| 360 | CONFIG_BLK_DEV_INITRD=y | 429 | CONFIG_BLK_DEV_INITRD=y |
| 361 | # CONFIG_CDROM_PKTCDVD is not set | 430 | # CONFIG_CDROM_PKTCDVD is not set |
| 431 | # CONFIG_ATA_OVER_ETH is not set | ||
| 362 | 432 | ||
| 363 | # | 433 | # |
| 364 | # IO Schedulers | 434 | # ATA/ATAPI/MFM/RLL support |
| 365 | # | 435 | # |
| 366 | CONFIG_IOSCHED_NOOP=y | 436 | CONFIG_IDE=y |
| 367 | CONFIG_IOSCHED_AS=y | 437 | CONFIG_BLK_DEV_IDE=y |
| 368 | CONFIG_IOSCHED_DEADLINE=y | ||
| 369 | CONFIG_IOSCHED_CFQ=y | ||
| 370 | CONFIG_ATA_OVER_ETH=m | ||
| 371 | 438 | ||
| 372 | # | 439 | # |
| 373 | # ATA/ATAPI/MFM/RLL support | 440 | # Please see Documentation/ide.txt for help/info on IDE drives |
| 441 | # | ||
| 442 | # CONFIG_BLK_DEV_IDE_SATA is not set | ||
| 443 | CONFIG_BLK_DEV_IDEDISK=y | ||
| 444 | CONFIG_IDEDISK_MULTI_MODE=y | ||
| 445 | CONFIG_BLK_DEV_IDECS=y | ||
| 446 | # CONFIG_BLK_DEV_IDECD is not set | ||
| 447 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
| 448 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | ||
| 449 | # CONFIG_IDE_TASK_IOCTL is not set | ||
| 450 | |||
| 451 | # | ||
| 452 | # IDE chipset support/bugfixes | ||
| 374 | # | 453 | # |
| 375 | # CONFIG_IDE is not set | 454 | CONFIG_IDE_GENERIC=y |
| 455 | # CONFIG_IDE_ARM is not set | ||
| 456 | # CONFIG_IDE_CHIPSETS is not set | ||
| 457 | # CONFIG_BLK_DEV_IDEDMA is not set | ||
| 458 | # CONFIG_IDEDMA_AUTO is not set | ||
| 459 | # CONFIG_BLK_DEV_HD is not set | ||
| 376 | 460 | ||
| 377 | # | 461 | # |
| 378 | # SCSI device support | 462 | # SCSI device support |
| @@ -402,6 +486,39 @@ CONFIG_ATA_OVER_ETH=m | |||
| 402 | # Network device support | 486 | # Network device support |
| 403 | # | 487 | # |
| 404 | # CONFIG_NETDEVICES is not set | 488 | # CONFIG_NETDEVICES is not set |
| 489 | # CONFIG_DUMMY is not set | ||
| 490 | # CONFIG_BONDING is not set | ||
| 491 | # CONFIG_EQUALIZER is not set | ||
| 492 | # CONFIG_TUN is not set | ||
| 493 | |||
| 494 | # | ||
| 495 | # PHY device support | ||
| 496 | # | ||
| 497 | |||
| 498 | # | ||
| 499 | # Ethernet (10 or 100Mbit) | ||
| 500 | # | ||
| 501 | # CONFIG_NET_ETHERNET is not set | ||
| 502 | |||
| 503 | # | ||
| 504 | # Ethernet (1000 Mbit) | ||
| 505 | # | ||
| 506 | |||
| 507 | # | ||
| 508 | # Ethernet (10000 Mbit) | ||
| 509 | # | ||
| 510 | CONFIG_PPP=y | ||
| 511 | # CONFIG_PPP_MULTILINK is not set | ||
| 512 | # CONFIG_PPP_FILTER is not set | ||
| 513 | CONFIG_PPP_ASYNC=y | ||
| 514 | # CONFIG_PPP_SYNC_TTY is not set | ||
| 515 | # CONFIG_PPP_DEFLATE is not set | ||
| 516 | # CONFIG_PPP_BSDCOMP is not set | ||
| 517 | # CONFIG_PPP_MPPE is not set | ||
| 518 | # CONFIG_PPPOE is not set | ||
| 519 | # CONFIG_SLIP is not set | ||
| 520 | # CONFIG_SHAPER is not set | ||
| 521 | # CONFIG_NETCONSOLE is not set | ||
| 405 | # CONFIG_NETPOLL is not set | 522 | # CONFIG_NETPOLL is not set |
| 406 | # CONFIG_NET_POLL_CONTROLLER is not set | 523 | # CONFIG_NET_POLL_CONTROLLER is not set |
| 407 | 524 | ||
| @@ -424,7 +541,7 @@ CONFIG_INPUT_TSDEV=y | |||
| 424 | CONFIG_INPUT_TSDEV_SCREEN_X=240 | 541 | CONFIG_INPUT_TSDEV_SCREEN_X=240 |
| 425 | CONFIG_INPUT_TSDEV_SCREEN_Y=320 | 542 | CONFIG_INPUT_TSDEV_SCREEN_Y=320 |
| 426 | CONFIG_INPUT_EVDEV=y | 543 | CONFIG_INPUT_EVDEV=y |
| 427 | CONFIG_INPUT_EVBUG=y | 544 | # CONFIG_INPUT_EVBUG is not set |
| 428 | 545 | ||
| 429 | # | 546 | # |
| 430 | # Input Device Drivers | 547 | # Input Device Drivers |
| @@ -438,7 +555,11 @@ CONFIG_KEYBOARD_LOCOMO=y | |||
| 438 | # CONFIG_KEYBOARD_NEWTON is not set | 555 | # CONFIG_KEYBOARD_NEWTON is not set |
| 439 | # CONFIG_INPUT_MOUSE is not set | 556 | # CONFIG_INPUT_MOUSE is not set |
| 440 | # CONFIG_INPUT_JOYSTICK is not set | 557 | # CONFIG_INPUT_JOYSTICK is not set |
| 441 | # CONFIG_INPUT_TOUCHSCREEN is not set | 558 | CONFIG_INPUT_TOUCHSCREEN=y |
| 559 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
| 560 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
| 561 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
| 562 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
| 442 | # CONFIG_INPUT_MISC is not set | 563 | # CONFIG_INPUT_MISC is not set |
| 443 | 564 | ||
| 444 | # | 565 | # |
| @@ -461,7 +582,16 @@ CONFIG_HW_CONSOLE=y | |||
| 461 | # | 582 | # |
| 462 | # Serial drivers | 583 | # Serial drivers |
| 463 | # | 584 | # |
| 464 | # CONFIG_SERIAL_8250 is not set | 585 | CONFIG_SERIAL_8250=y |
| 586 | # CONFIG_SERIAL_8250_CONSOLE is not set | ||
| 587 | CONFIG_SERIAL_8250_CS=y | ||
| 588 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
| 589 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 590 | CONFIG_SERIAL_8250_EXTENDED=y | ||
| 591 | # CONFIG_SERIAL_8250_MANY_PORTS is not set | ||
| 592 | # CONFIG_SERIAL_8250_SHARE_IRQ is not set | ||
| 593 | # CONFIG_SERIAL_8250_DETECT_IRQ is not set | ||
| 594 | # CONFIG_SERIAL_8250_RSA is not set | ||
| 465 | 595 | ||
| 466 | # | 596 | # |
| 467 | # Non-8250 serial port support | 597 | # Non-8250 serial port support |
| @@ -483,94 +613,48 @@ CONFIG_UNIX98_PTYS=y | |||
| 483 | # | 613 | # |
| 484 | # CONFIG_WATCHDOG is not set | 614 | # CONFIG_WATCHDOG is not set |
| 485 | # CONFIG_NVRAM is not set | 615 | # CONFIG_NVRAM is not set |
| 486 | # CONFIG_RTC is not set | ||
| 487 | # CONFIG_DTLK is not set | 616 | # CONFIG_DTLK is not set |
| 488 | # CONFIG_R3964 is not set | 617 | # CONFIG_R3964 is not set |
| 489 | 618 | ||
| 490 | # | 619 | # |
| 491 | # Ftape, the floppy tape device driver | 620 | # Ftape, the floppy tape device driver |
| 492 | # | 621 | # |
| 493 | # CONFIG_RAW_DRIVER is not set | ||
| 494 | 622 | ||
| 495 | # | 623 | # |
| 496 | # TPM devices | 624 | # PCMCIA character devices |
| 497 | # | 625 | # |
| 626 | # CONFIG_SYNCLINK_CS is not set | ||
| 627 | # CONFIG_CARDMAN_4000 is not set | ||
| 628 | # CONFIG_CARDMAN_4040 is not set | ||
| 629 | # CONFIG_RAW_DRIVER is not set | ||
| 498 | 630 | ||
| 499 | # | 631 | # |
| 500 | # I2C support | 632 | # TPM devices |
| 501 | # | 633 | # |
| 502 | CONFIG_I2C=m | 634 | # CONFIG_TCG_TPM is not set |
| 503 | # CONFIG_I2C_CHARDEV is not set | 635 | # CONFIG_TELCLOCK is not set |
| 504 | 636 | ||
| 505 | # | 637 | # |
| 506 | # I2C Algorithms | 638 | # I2C support |
| 507 | # | 639 | # |
| 508 | CONFIG_I2C_ALGOBIT=m | 640 | # CONFIG_I2C is not set |
| 509 | # CONFIG_I2C_ALGOPCF is not set | ||
| 510 | # CONFIG_I2C_ALGOPCA is not set | ||
| 511 | 641 | ||
| 512 | # | 642 | # |
| 513 | # I2C Hardware Bus support | 643 | # SPI support |
| 514 | # | 644 | # |
| 515 | # CONFIG_I2C_ELEKTOR is not set | 645 | # CONFIG_SPI is not set |
| 516 | # CONFIG_I2C_PARPORT_LIGHT is not set | 646 | # CONFIG_SPI_MASTER is not set |
| 517 | # CONFIG_I2C_STUB is not set | ||
| 518 | # CONFIG_I2C_PCA_ISA is not set | ||
| 519 | 647 | ||
| 520 | # | 648 | # |
| 521 | # Miscellaneous I2C Chip support | 649 | # Dallas's 1-wire bus |
| 522 | # | 650 | # |
| 523 | # CONFIG_SENSORS_DS1337 is not set | 651 | # CONFIG_W1 is not set |
| 524 | # CONFIG_SENSORS_DS1374 is not set | ||
| 525 | # CONFIG_SENSORS_EEPROM is not set | ||
| 526 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 527 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 528 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 529 | # CONFIG_SENSORS_RTC8564 is not set | ||
| 530 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 531 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 532 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 533 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 534 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 535 | 652 | ||
| 536 | # | 653 | # |
| 537 | # Hardware Monitoring support | 654 | # Hardware Monitoring support |
| 538 | # | 655 | # |
| 539 | CONFIG_HWMON=y | 656 | # CONFIG_HWMON is not set |
| 540 | # CONFIG_HWMON_VID is not set | 657 | # CONFIG_HWMON_VID is not set |
| 541 | # CONFIG_SENSORS_ADM1021 is not set | ||
| 542 | # CONFIG_SENSORS_ADM1025 is not set | ||
| 543 | # CONFIG_SENSORS_ADM1026 is not set | ||
| 544 | # CONFIG_SENSORS_ADM1031 is not set | ||
| 545 | # CONFIG_SENSORS_ADM9240 is not set | ||
| 546 | # CONFIG_SENSORS_ASB100 is not set | ||
| 547 | # CONFIG_SENSORS_ATXP1 is not set | ||
| 548 | # CONFIG_SENSORS_DS1621 is not set | ||
| 549 | # CONFIG_SENSORS_FSCHER is not set | ||
| 550 | # CONFIG_SENSORS_FSCPOS is not set | ||
| 551 | # CONFIG_SENSORS_GL518SM is not set | ||
| 552 | # CONFIG_SENSORS_GL520SM is not set | ||
| 553 | # CONFIG_SENSORS_IT87 is not set | ||
| 554 | # CONFIG_SENSORS_LM63 is not set | ||
| 555 | # CONFIG_SENSORS_LM75 is not set | ||
| 556 | # CONFIG_SENSORS_LM77 is not set | ||
| 557 | # CONFIG_SENSORS_LM78 is not set | ||
| 558 | # CONFIG_SENSORS_LM80 is not set | ||
| 559 | # CONFIG_SENSORS_LM83 is not set | ||
| 560 | # CONFIG_SENSORS_LM85 is not set | ||
| 561 | # CONFIG_SENSORS_LM87 is not set | ||
| 562 | # CONFIG_SENSORS_LM90 is not set | ||
| 563 | # CONFIG_SENSORS_LM92 is not set | ||
| 564 | # CONFIG_SENSORS_MAX1619 is not set | ||
| 565 | # CONFIG_SENSORS_PC87360 is not set | ||
| 566 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 567 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 568 | # CONFIG_SENSORS_W83781D is not set | ||
| 569 | # CONFIG_SENSORS_W83792D is not set | ||
| 570 | # CONFIG_SENSORS_W83L785TS is not set | ||
| 571 | # CONFIG_SENSORS_W83627HF is not set | ||
| 572 | # CONFIG_SENSORS_W83627EHF is not set | ||
| 573 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
| 574 | 658 | ||
| 575 | # | 659 | # |
| 576 | # Misc devices | 660 | # Misc devices |
| @@ -579,42 +663,33 @@ CONFIG_HWMON=y | |||
| 579 | # | 663 | # |
| 580 | # Multimedia Capabilities Port drivers | 664 | # Multimedia Capabilities Port drivers |
| 581 | # | 665 | # |
| 582 | # CONFIG_MCP_SA11X0 is not set | 666 | CONFIG_MCP=y |
| 667 | CONFIG_MCP_SA11X0=y | ||
| 668 | CONFIG_MCP_UCB1200=y | ||
| 669 | CONFIG_MCP_UCB1200_TS=y | ||
| 583 | 670 | ||
| 584 | # | 671 | # |
| 585 | # Multimedia devices | 672 | # LED devices |
| 586 | # | 673 | # |
| 587 | CONFIG_VIDEO_DEV=m | 674 | CONFIG_NEW_LEDS=y |
| 675 | CONFIG_LEDS_CLASS=y | ||
| 588 | 676 | ||
| 589 | # | 677 | # |
| 590 | # Video For Linux | 678 | # LED drivers |
| 591 | # | 679 | # |
| 680 | CONFIG_LEDS_LOCOMO=y | ||
| 592 | 681 | ||
| 593 | # | 682 | # |
| 594 | # Video Adapters | 683 | # LED Triggers |
| 595 | # | 684 | # |
| 596 | # CONFIG_VIDEO_PMS is not set | 685 | CONFIG_LEDS_TRIGGERS=y |
| 597 | # CONFIG_VIDEO_CPIA is not set | 686 | CONFIG_LEDS_TRIGGER_TIMER=y |
| 598 | # CONFIG_VIDEO_SAA5246A is not set | 687 | CONFIG_LEDS_TRIGGER_IDE_DISK=y |
| 599 | # CONFIG_VIDEO_SAA5249 is not set | ||
| 600 | # CONFIG_TUNER_3036 is not set | ||
| 601 | # CONFIG_VIDEO_OVCAMCHIP is not set | ||
| 602 | 688 | ||
| 603 | # | 689 | # |
| 604 | # Radio Adapters | 690 | # Multimedia devices |
| 605 | # | 691 | # |
| 606 | # CONFIG_RADIO_CADET is not set | 692 | # CONFIG_VIDEO_DEV is not set |
| 607 | # CONFIG_RADIO_RTRACK is not set | ||
| 608 | # CONFIG_RADIO_RTRACK2 is not set | ||
| 609 | # CONFIG_RADIO_AZTECH is not set | ||
| 610 | # CONFIG_RADIO_GEMTEK is not set | ||
| 611 | # CONFIG_RADIO_MAESTRO is not set | ||
| 612 | # CONFIG_RADIO_SF16FMI is not set | ||
| 613 | # CONFIG_RADIO_SF16FMR2 is not set | ||
| 614 | # CONFIG_RADIO_TERRATEC is not set | ||
| 615 | # CONFIG_RADIO_TRUST is not set | ||
| 616 | # CONFIG_RADIO_TYPHOON is not set | ||
| 617 | # CONFIG_RADIO_ZOLTRIX is not set | ||
| 618 | 693 | ||
| 619 | # | 694 | # |
| 620 | # Digital Video Broadcasting Devices | 695 | # Digital Video Broadcasting Devices |
| @@ -628,8 +703,8 @@ CONFIG_FB=y | |||
| 628 | CONFIG_FB_CFB_FILLRECT=y | 703 | CONFIG_FB_CFB_FILLRECT=y |
| 629 | CONFIG_FB_CFB_COPYAREA=y | 704 | CONFIG_FB_CFB_COPYAREA=y |
| 630 | CONFIG_FB_CFB_IMAGEBLIT=y | 705 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 631 | CONFIG_FB_SOFT_CURSOR=y | ||
| 632 | # CONFIG_FB_MACMODES is not set | 706 | # CONFIG_FB_MACMODES is not set |
| 707 | # CONFIG_FB_FIRMWARE_EDID is not set | ||
| 633 | CONFIG_FB_MODE_HELPERS=y | 708 | CONFIG_FB_MODE_HELPERS=y |
| 634 | # CONFIG_FB_TILEBLITTING is not set | 709 | # CONFIG_FB_TILEBLITTING is not set |
| 635 | CONFIG_FB_SA1100=y | 710 | CONFIG_FB_SA1100=y |
| @@ -643,14 +718,15 @@ CONFIG_FB_SA1100=y | |||
| 643 | # CONFIG_MDA_CONSOLE is not set | 718 | # CONFIG_MDA_CONSOLE is not set |
| 644 | CONFIG_DUMMY_CONSOLE=y | 719 | CONFIG_DUMMY_CONSOLE=y |
| 645 | CONFIG_FRAMEBUFFER_CONSOLE=y | 720 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 721 | CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y | ||
| 646 | CONFIG_FONTS=y | 722 | CONFIG_FONTS=y |
| 647 | CONFIG_FONT_8x8=y | 723 | # CONFIG_FONT_8x8 is not set |
| 648 | # CONFIG_FONT_8x16 is not set | 724 | # CONFIG_FONT_8x16 is not set |
| 649 | # CONFIG_FONT_6x11 is not set | 725 | # CONFIG_FONT_6x11 is not set |
| 650 | # CONFIG_FONT_7x14 is not set | 726 | # CONFIG_FONT_7x14 is not set |
| 651 | # CONFIG_FONT_PEARL_8x8 is not set | 727 | # CONFIG_FONT_PEARL_8x8 is not set |
| 652 | # CONFIG_FONT_ACORN_8x8 is not set | 728 | # CONFIG_FONT_ACORN_8x8 is not set |
| 653 | # CONFIG_FONT_MINI_4x6 is not set | 729 | CONFIG_FONT_MINI_4x6=y |
| 654 | # CONFIG_FONT_SUN8x16 is not set | 730 | # CONFIG_FONT_SUN8x16 is not set |
| 655 | # CONFIG_FONT_SUN12x22 is not set | 731 | # CONFIG_FONT_SUN12x22 is not set |
| 656 | # CONFIG_FONT_10x18 is not set | 732 | # CONFIG_FONT_10x18 is not set |
| @@ -659,7 +735,11 @@ CONFIG_FONT_8x8=y | |||
| 659 | # Logo configuration | 735 | # Logo configuration |
| 660 | # | 736 | # |
| 661 | # CONFIG_LOGO is not set | 737 | # CONFIG_LOGO is not set |
| 662 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 738 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
| 739 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 740 | CONFIG_BACKLIGHT_DEVICE=y | ||
| 741 | CONFIG_LCD_CLASS_DEVICE=y | ||
| 742 | CONFIG_LCD_DEVICE=y | ||
| 663 | 743 | ||
| 664 | # | 744 | # |
| 665 | # Sound | 745 | # Sound |
| @@ -671,20 +751,17 @@ CONFIG_FONT_8x8=y | |||
| 671 | # | 751 | # |
| 672 | CONFIG_USB_ARCH_HAS_HCD=y | 752 | CONFIG_USB_ARCH_HAS_HCD=y |
| 673 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 753 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 754 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 674 | # CONFIG_USB is not set | 755 | # CONFIG_USB is not set |
| 675 | 756 | ||
| 676 | # | 757 | # |
| 758 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 759 | # | ||
| 760 | |||
| 761 | # | ||
| 677 | # USB Gadget Support | 762 | # USB Gadget Support |
| 678 | # | 763 | # |
| 679 | CONFIG_USB_GADGET=y | 764 | # CONFIG_USB_GADGET is not set |
| 680 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | ||
| 681 | # CONFIG_USB_GADGET_NET2280 is not set | ||
| 682 | # CONFIG_USB_GADGET_PXA2XX is not set | ||
| 683 | # CONFIG_USB_GADGET_GOKU is not set | ||
| 684 | # CONFIG_USB_GADGET_LH7A40X is not set | ||
| 685 | # CONFIG_USB_GADGET_OMAP is not set | ||
| 686 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | ||
| 687 | # CONFIG_USB_GADGET_DUALSPEED is not set | ||
| 688 | 765 | ||
| 689 | # | 766 | # |
| 690 | # MMC/SD Card support | 767 | # MMC/SD Card support |
| @@ -692,23 +769,24 @@ CONFIG_USB_GADGET=y | |||
| 692 | # CONFIG_MMC is not set | 769 | # CONFIG_MMC is not set |
| 693 | 770 | ||
| 694 | # | 771 | # |
| 772 | # Real Time Clock | ||
| 773 | # | ||
| 774 | CONFIG_RTC_LIB=y | ||
| 775 | # CONFIG_RTC_CLASS is not set | ||
| 776 | |||
| 777 | # | ||
| 695 | # File systems | 778 | # File systems |
| 696 | # | 779 | # |
| 697 | CONFIG_EXT2_FS=y | 780 | # CONFIG_EXT2_FS is not set |
| 698 | CONFIG_EXT2_FS_XATTR=y | ||
| 699 | CONFIG_EXT2_FS_POSIX_ACL=y | ||
| 700 | CONFIG_EXT2_FS_SECURITY=y | ||
| 701 | # CONFIG_EXT2_FS_XIP is not set | ||
| 702 | # CONFIG_EXT3_FS is not set | 781 | # CONFIG_EXT3_FS is not set |
| 703 | # CONFIG_JBD is not set | ||
| 704 | CONFIG_FS_MBCACHE=y | ||
| 705 | # CONFIG_REISERFS_FS is not set | 782 | # CONFIG_REISERFS_FS is not set |
| 706 | # CONFIG_JFS_FS is not set | 783 | # CONFIG_JFS_FS is not set |
| 707 | CONFIG_FS_POSIX_ACL=y | 784 | # CONFIG_FS_POSIX_ACL is not set |
| 708 | # CONFIG_XFS_FS is not set | 785 | # CONFIG_XFS_FS is not set |
| 786 | # CONFIG_OCFS2_FS is not set | ||
| 709 | # CONFIG_MINIX_FS is not set | 787 | # CONFIG_MINIX_FS is not set |
| 710 | CONFIG_ROMFS_FS=y | 788 | CONFIG_ROMFS_FS=y |
| 711 | CONFIG_INOTIFY=y | 789 | # CONFIG_INOTIFY is not set |
| 712 | # CONFIG_QUOTA is not set | 790 | # CONFIG_QUOTA is not set |
| 713 | # CONFIG_DNOTIFY is not set | 791 | # CONFIG_DNOTIFY is not set |
| 714 | # CONFIG_AUTOFS_FS is not set | 792 | # CONFIG_AUTOFS_FS is not set |
| @@ -725,7 +803,7 @@ CONFIG_INOTIFY=y | |||
| 725 | # DOS/FAT/NT Filesystems | 803 | # DOS/FAT/NT Filesystems |
| 726 | # | 804 | # |
| 727 | CONFIG_FAT_FS=y | 805 | CONFIG_FAT_FS=y |
| 728 | CONFIG_MSDOS_FS=y | 806 | # CONFIG_MSDOS_FS is not set |
| 729 | CONFIG_VFAT_FS=y | 807 | CONFIG_VFAT_FS=y |
| 730 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | 808 | CONFIG_FAT_DEFAULT_CODEPAGE=437 |
| 731 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | 809 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" |
| @@ -739,7 +817,7 @@ CONFIG_SYSFS=y | |||
| 739 | CONFIG_TMPFS=y | 817 | CONFIG_TMPFS=y |
| 740 | # CONFIG_HUGETLB_PAGE is not set | 818 | # CONFIG_HUGETLB_PAGE is not set |
| 741 | CONFIG_RAMFS=y | 819 | CONFIG_RAMFS=y |
| 742 | # CONFIG_RELAYFS_FS is not set | 820 | # CONFIG_CONFIGFS_FS is not set |
| 743 | 821 | ||
| 744 | # | 822 | # |
| 745 | # Miscellaneous filesystems | 823 | # Miscellaneous filesystems |
| @@ -755,11 +833,12 @@ CONFIG_RAMFS=y | |||
| 755 | CONFIG_JFFS2_FS=y | 833 | CONFIG_JFFS2_FS=y |
| 756 | CONFIG_JFFS2_FS_DEBUG=0 | 834 | CONFIG_JFFS2_FS_DEBUG=0 |
| 757 | CONFIG_JFFS2_FS_WRITEBUFFER=y | 835 | CONFIG_JFFS2_FS_WRITEBUFFER=y |
| 836 | # CONFIG_JFFS2_SUMMARY is not set | ||
| 758 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | 837 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set |
| 759 | CONFIG_JFFS2_ZLIB=y | 838 | CONFIG_JFFS2_ZLIB=y |
| 760 | CONFIG_JFFS2_RTIME=y | 839 | CONFIG_JFFS2_RTIME=y |
| 761 | # CONFIG_JFFS2_RUBIN is not set | 840 | # CONFIG_JFFS2_RUBIN is not set |
| 762 | CONFIG_CRAMFS=y | 841 | # CONFIG_CRAMFS is not set |
| 763 | # CONFIG_VXFS_FS is not set | 842 | # CONFIG_VXFS_FS is not set |
| 764 | # CONFIG_HPFS_FS is not set | 843 | # CONFIG_HPFS_FS is not set |
| 765 | # CONFIG_QNX4FS_FS is not set | 844 | # CONFIG_QNX4FS_FS is not set |
| @@ -789,7 +868,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 789 | # | 868 | # |
| 790 | CONFIG_NLS=y | 869 | CONFIG_NLS=y |
| 791 | CONFIG_NLS_DEFAULT="cp437" | 870 | CONFIG_NLS_DEFAULT="cp437" |
| 792 | CONFIG_NLS_CODEPAGE_437=m | 871 | CONFIG_NLS_CODEPAGE_437=y |
| 793 | # CONFIG_NLS_CODEPAGE_737 is not set | 872 | # CONFIG_NLS_CODEPAGE_737 is not set |
| 794 | # CONFIG_NLS_CODEPAGE_775 is not set | 873 | # CONFIG_NLS_CODEPAGE_775 is not set |
| 795 | # CONFIG_NLS_CODEPAGE_850 is not set | 874 | # CONFIG_NLS_CODEPAGE_850 is not set |
| @@ -813,7 +892,7 @@ CONFIG_NLS_CODEPAGE_437=m | |||
| 813 | # CONFIG_NLS_CODEPAGE_1250 is not set | 892 | # CONFIG_NLS_CODEPAGE_1250 is not set |
| 814 | # CONFIG_NLS_CODEPAGE_1251 is not set | 893 | # CONFIG_NLS_CODEPAGE_1251 is not set |
| 815 | # CONFIG_NLS_ASCII is not set | 894 | # CONFIG_NLS_ASCII is not set |
| 816 | CONFIG_NLS_ISO8859_1=m | 895 | CONFIG_NLS_ISO8859_1=y |
| 817 | # CONFIG_NLS_ISO8859_2 is not set | 896 | # CONFIG_NLS_ISO8859_2 is not set |
| 818 | # CONFIG_NLS_ISO8859_3 is not set | 897 | # CONFIG_NLS_ISO8859_3 is not set |
| 819 | # CONFIG_NLS_ISO8859_4 is not set | 898 | # CONFIG_NLS_ISO8859_4 is not set |
| @@ -826,7 +905,7 @@ CONFIG_NLS_ISO8859_1=m | |||
| 826 | # CONFIG_NLS_ISO8859_15 is not set | 905 | # CONFIG_NLS_ISO8859_15 is not set |
| 827 | # CONFIG_NLS_KOI8_R is not set | 906 | # CONFIG_NLS_KOI8_R is not set |
| 828 | # CONFIG_NLS_KOI8_U is not set | 907 | # CONFIG_NLS_KOI8_U is not set |
| 829 | CONFIG_NLS_UTF8=m | 908 | # CONFIG_NLS_UTF8 is not set |
| 830 | 909 | ||
| 831 | # | 910 | # |
| 832 | # Profiling support | 911 | # Profiling support |
| @@ -837,20 +916,23 @@ CONFIG_NLS_UTF8=m | |||
| 837 | # Kernel hacking | 916 | # Kernel hacking |
| 838 | # | 917 | # |
| 839 | # CONFIG_PRINTK_TIME is not set | 918 | # CONFIG_PRINTK_TIME is not set |
| 840 | CONFIG_DEBUG_KERNEL=y | ||
| 841 | CONFIG_MAGIC_SYSRQ=y | 919 | CONFIG_MAGIC_SYSRQ=y |
| 920 | CONFIG_DEBUG_KERNEL=y | ||
| 842 | CONFIG_LOG_BUF_SHIFT=14 | 921 | CONFIG_LOG_BUF_SHIFT=14 |
| 843 | CONFIG_DETECT_SOFTLOCKUP=y | 922 | # CONFIG_DETECT_SOFTLOCKUP is not set |
| 844 | # CONFIG_SCHEDSTATS is not set | 923 | # CONFIG_SCHEDSTATS is not set |
| 845 | # CONFIG_DEBUG_SLAB is not set | 924 | CONFIG_DEBUG_MUTEXES=y |
| 846 | CONFIG_DEBUG_PREEMPT=y | ||
| 847 | # CONFIG_DEBUG_SPINLOCK is not set | 925 | # CONFIG_DEBUG_SPINLOCK is not set |
| 848 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 926 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 849 | # CONFIG_DEBUG_KOBJECT is not set | 927 | # CONFIG_DEBUG_KOBJECT is not set |
| 850 | # CONFIG_DEBUG_BUGVERBOSE is not set | 928 | # CONFIG_DEBUG_BUGVERBOSE is not set |
| 851 | # CONFIG_DEBUG_INFO is not set | 929 | # CONFIG_DEBUG_INFO is not set |
| 852 | # CONFIG_DEBUG_FS is not set | 930 | # CONFIG_DEBUG_FS is not set |
| 931 | # CONFIG_DEBUG_VM is not set | ||
| 853 | CONFIG_FRAME_POINTER=y | 932 | CONFIG_FRAME_POINTER=y |
| 933 | # CONFIG_UNWIND_INFO is not set | ||
| 934 | CONFIG_FORCED_INLINING=y | ||
| 935 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 854 | # CONFIG_DEBUG_USER is not set | 936 | # CONFIG_DEBUG_USER is not set |
| 855 | # CONFIG_DEBUG_WAITQ is not set | 937 | # CONFIG_DEBUG_WAITQ is not set |
| 856 | CONFIG_DEBUG_ERRORS=y | 938 | CONFIG_DEBUG_ERRORS=y |
| @@ -874,7 +956,7 @@ CONFIG_DEBUG_ERRORS=y | |||
| 874 | # | 956 | # |
| 875 | # Library routines | 957 | # Library routines |
| 876 | # | 958 | # |
| 877 | # CONFIG_CRC_CCITT is not set | 959 | CONFIG_CRC_CCITT=y |
| 878 | # CONFIG_CRC16 is not set | 960 | # CONFIG_CRC16 is not set |
| 879 | CONFIG_CRC32=y | 961 | CONFIG_CRC32=y |
| 880 | # CONFIG_LIBCRC32C is not set | 962 | # CONFIG_LIBCRC32C is not set |
diff --git a/arch/arm/configs/versatile_defconfig b/arch/arm/configs/versatile_defconfig index 2687a225aa6a..96b7a7762426 100644 --- a/arch/arm/configs/versatile_defconfig +++ b/arch/arm/configs/versatile_defconfig | |||
| @@ -1,50 +1,55 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.12-rc1-bk2 | 3 | # Linux kernel version: 2.6.17-rc3 |
| 4 | # Mon Mar 28 00:20:50 2005 | 4 | # Mon May 8 20:15:57 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
| 7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
| 8 | CONFIG_UID16=y | ||
| 9 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
| 9 | CONFIG_GENERIC_HWEIGHT=y | ||
| 10 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 10 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 11 | CONFIG_GENERIC_IOMAP=y | 11 | CONFIG_VECTORS_BASE=0xffff0000 |
| 12 | 12 | ||
| 13 | # | 13 | # |
| 14 | # Code maturity level options | 14 | # Code maturity level options |
| 15 | # | 15 | # |
| 16 | CONFIG_EXPERIMENTAL=y | 16 | CONFIG_EXPERIMENTAL=y |
| 17 | CONFIG_CLEAN_COMPILE=y | ||
| 18 | CONFIG_BROKEN_ON_SMP=y | 17 | CONFIG_BROKEN_ON_SMP=y |
| 18 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
| 19 | 19 | ||
| 20 | # | 20 | # |
| 21 | # General setup | 21 | # General setup |
| 22 | # | 22 | # |
| 23 | CONFIG_LOCALVERSION="" | 23 | CONFIG_LOCALVERSION="" |
| 24 | # CONFIG_LOCALVERSION_AUTO is not set | ||
| 24 | CONFIG_SWAP=y | 25 | CONFIG_SWAP=y |
| 25 | CONFIG_SYSVIPC=y | 26 | CONFIG_SYSVIPC=y |
| 26 | # CONFIG_POSIX_MQUEUE is not set | 27 | # CONFIG_POSIX_MQUEUE is not set |
| 27 | # CONFIG_BSD_PROCESS_ACCT is not set | 28 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 28 | CONFIG_SYSCTL=y | 29 | CONFIG_SYSCTL=y |
| 29 | # CONFIG_AUDIT is not set | 30 | # CONFIG_AUDIT is not set |
| 30 | CONFIG_HOTPLUG=y | ||
| 31 | CONFIG_KOBJECT_UEVENT=y | ||
| 32 | # CONFIG_IKCONFIG is not set | 31 | # CONFIG_IKCONFIG is not set |
| 32 | # CONFIG_RELAY is not set | ||
| 33 | CONFIG_INITRAMFS_SOURCE="" | ||
| 34 | CONFIG_UID16=y | ||
| 35 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 33 | # CONFIG_EMBEDDED is not set | 36 | # CONFIG_EMBEDDED is not set |
| 34 | CONFIG_KALLSYMS=y | 37 | CONFIG_KALLSYMS=y |
| 35 | # CONFIG_KALLSYMS_ALL is not set | 38 | # CONFIG_KALLSYMS_ALL is not set |
| 36 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 39 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
| 40 | CONFIG_HOTPLUG=y | ||
| 41 | CONFIG_PRINTK=y | ||
| 42 | CONFIG_BUG=y | ||
| 43 | CONFIG_ELF_CORE=y | ||
| 37 | CONFIG_BASE_FULL=y | 44 | CONFIG_BASE_FULL=y |
| 38 | CONFIG_FUTEX=y | 45 | CONFIG_FUTEX=y |
| 39 | CONFIG_EPOLL=y | 46 | CONFIG_EPOLL=y |
| 40 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
| 41 | CONFIG_SHMEM=y | 47 | CONFIG_SHMEM=y |
| 42 | CONFIG_CC_ALIGN_FUNCTIONS=0 | 48 | CONFIG_SLAB=y |
| 43 | CONFIG_CC_ALIGN_LABELS=0 | ||
| 44 | CONFIG_CC_ALIGN_LOOPS=0 | ||
| 45 | CONFIG_CC_ALIGN_JUMPS=0 | ||
| 46 | # CONFIG_TINY_SHMEM is not set | 49 | # CONFIG_TINY_SHMEM is not set |
| 47 | CONFIG_BASE_SMALL=0 | 50 | CONFIG_BASE_SMALL=0 |
| 51 | # CONFIG_SLOB is not set | ||
| 52 | CONFIG_OBSOLETE_INTERMODULE=y | ||
| 48 | 53 | ||
| 49 | # | 54 | # |
| 50 | # Loadable module support | 55 | # Loadable module support |
| @@ -52,23 +57,42 @@ CONFIG_BASE_SMALL=0 | |||
| 52 | CONFIG_MODULES=y | 57 | CONFIG_MODULES=y |
| 53 | CONFIG_MODULE_UNLOAD=y | 58 | CONFIG_MODULE_UNLOAD=y |
| 54 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 59 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
| 55 | CONFIG_OBSOLETE_MODPARM=y | ||
| 56 | # CONFIG_MODVERSIONS is not set | 60 | # CONFIG_MODVERSIONS is not set |
| 57 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 61 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
| 58 | CONFIG_KMOD=y | 62 | CONFIG_KMOD=y |
| 59 | 63 | ||
| 60 | # | 64 | # |
| 65 | # Block layer | ||
| 66 | # | ||
| 67 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
| 68 | |||
| 69 | # | ||
| 70 | # IO Schedulers | ||
| 71 | # | ||
| 72 | CONFIG_IOSCHED_NOOP=y | ||
| 73 | CONFIG_IOSCHED_AS=y | ||
| 74 | CONFIG_IOSCHED_DEADLINE=y | ||
| 75 | CONFIG_IOSCHED_CFQ=y | ||
| 76 | CONFIG_DEFAULT_AS=y | ||
| 77 | # CONFIG_DEFAULT_DEADLINE is not set | ||
| 78 | # CONFIG_DEFAULT_CFQ is not set | ||
| 79 | # CONFIG_DEFAULT_NOOP is not set | ||
| 80 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
| 81 | |||
| 82 | # | ||
| 61 | # System Type | 83 | # System Type |
| 62 | # | 84 | # |
| 63 | # CONFIG_ARCH_CLPS7500 is not set | 85 | # CONFIG_ARCH_CLPS7500 is not set |
| 64 | # CONFIG_ARCH_CLPS711X is not set | 86 | # CONFIG_ARCH_CLPS711X is not set |
| 65 | # CONFIG_ARCH_CO285 is not set | 87 | # CONFIG_ARCH_CO285 is not set |
| 66 | # CONFIG_ARCH_EBSA110 is not set | 88 | # CONFIG_ARCH_EBSA110 is not set |
| 89 | # CONFIG_ARCH_EP93XX is not set | ||
| 67 | # CONFIG_ARCH_FOOTBRIDGE is not set | 90 | # CONFIG_ARCH_FOOTBRIDGE is not set |
| 68 | # CONFIG_ARCH_INTEGRATOR is not set | 91 | # CONFIG_ARCH_INTEGRATOR is not set |
| 69 | # CONFIG_ARCH_IOP3XX is not set | 92 | # CONFIG_ARCH_IOP3XX is not set |
| 70 | # CONFIG_ARCH_IXP4XX is not set | 93 | # CONFIG_ARCH_IXP4XX is not set |
| 71 | # CONFIG_ARCH_IXP2000 is not set | 94 | # CONFIG_ARCH_IXP2000 is not set |
| 95 | # CONFIG_ARCH_IXP23XX is not set | ||
| 72 | # CONFIG_ARCH_L7200 is not set | 96 | # CONFIG_ARCH_L7200 is not set |
| 73 | # CONFIG_ARCH_PXA is not set | 97 | # CONFIG_ARCH_PXA is not set |
| 74 | # CONFIG_ARCH_RPC is not set | 98 | # CONFIG_ARCH_RPC is not set |
| @@ -78,14 +102,17 @@ CONFIG_KMOD=y | |||
| 78 | # CONFIG_ARCH_LH7A40X is not set | 102 | # CONFIG_ARCH_LH7A40X is not set |
| 79 | # CONFIG_ARCH_OMAP is not set | 103 | # CONFIG_ARCH_OMAP is not set |
| 80 | CONFIG_ARCH_VERSATILE=y | 104 | CONFIG_ARCH_VERSATILE=y |
| 105 | # CONFIG_ARCH_REALVIEW is not set | ||
| 81 | # CONFIG_ARCH_IMX is not set | 106 | # CONFIG_ARCH_IMX is not set |
| 82 | # CONFIG_ARCH_H720X is not set | 107 | # CONFIG_ARCH_H720X is not set |
| 108 | # CONFIG_ARCH_AAEC2000 is not set | ||
| 109 | # CONFIG_ARCH_AT91RM9200 is not set | ||
| 83 | 110 | ||
| 84 | # | 111 | # |
| 85 | # Versatile platform type | 112 | # Versatile platform type |
| 86 | # | 113 | # |
| 87 | CONFIG_ARCH_VERSATILE_PB=y | 114 | CONFIG_ARCH_VERSATILE_PB=y |
| 88 | # CONFIG_MACH_VERSATILE_AB is not set | 115 | CONFIG_MACH_VERSATILE_AB=y |
| 89 | 116 | ||
| 90 | # | 117 | # |
| 91 | # Processor Type | 118 | # Processor Type |
| @@ -106,12 +133,14 @@ CONFIG_ARM_THUMB=y | |||
| 106 | # CONFIG_CPU_DCACHE_DISABLE is not set | 133 | # CONFIG_CPU_DCACHE_DISABLE is not set |
| 107 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | 134 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set |
| 108 | # CONFIG_CPU_CACHE_ROUND_ROBIN is not set | 135 | # CONFIG_CPU_CACHE_ROUND_ROBIN is not set |
| 136 | CONFIG_ARM_VIC=y | ||
| 109 | CONFIG_ICST307=y | 137 | CONFIG_ICST307=y |
| 110 | 138 | ||
| 111 | # | 139 | # |
| 112 | # Bus support | 140 | # Bus support |
| 113 | # | 141 | # |
| 114 | CONFIG_ARM_AMBA=y | 142 | CONFIG_ARM_AMBA=y |
| 143 | # CONFIG_PCI is not set | ||
| 115 | 144 | ||
| 116 | # | 145 | # |
| 117 | # PCCARD (PCMCIA/CardBus) support | 146 | # PCCARD (PCMCIA/CardBus) support |
| @@ -122,6 +151,18 @@ CONFIG_ARM_AMBA=y | |||
| 122 | # Kernel Features | 151 | # Kernel Features |
| 123 | # | 152 | # |
| 124 | # CONFIG_PREEMPT is not set | 153 | # CONFIG_PREEMPT is not set |
| 154 | # CONFIG_NO_IDLE_HZ is not set | ||
| 155 | CONFIG_HZ=100 | ||
| 156 | # CONFIG_AEABI is not set | ||
| 157 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
| 158 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 159 | CONFIG_FLATMEM_MANUAL=y | ||
| 160 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 161 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
| 162 | CONFIG_FLATMEM=y | ||
| 163 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
| 164 | # CONFIG_SPARSEMEM_STATIC is not set | ||
| 165 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
| 125 | CONFIG_LEDS=y | 166 | CONFIG_LEDS=y |
| 126 | CONFIG_LEDS_TIMER=y | 167 | CONFIG_LEDS_TIMER=y |
| 127 | CONFIG_LEDS_CPU=y | 168 | CONFIG_LEDS_CPU=y |
| @@ -145,7 +186,7 @@ CONFIG_CMDLINE="root=1f03 mem=32M" | |||
| 145 | CONFIG_FPE_NWFPE=y | 186 | CONFIG_FPE_NWFPE=y |
| 146 | # CONFIG_FPE_NWFPE_XP is not set | 187 | # CONFIG_FPE_NWFPE_XP is not set |
| 147 | # CONFIG_FPE_FASTFPE is not set | 188 | # CONFIG_FPE_FASTFPE is not set |
| 148 | # CONFIG_VFP is not set | 189 | CONFIG_VFP=y |
| 149 | 190 | ||
| 150 | # | 191 | # |
| 151 | # Userspace binary formats | 192 | # Userspace binary formats |
| @@ -159,9 +200,92 @@ CONFIG_BINFMT_ELF=y | |||
| 159 | # Power management options | 200 | # Power management options |
| 160 | # | 201 | # |
| 161 | CONFIG_PM=y | 202 | CONFIG_PM=y |
| 203 | CONFIG_PM_LEGACY=y | ||
| 204 | # CONFIG_PM_DEBUG is not set | ||
| 162 | # CONFIG_APM is not set | 205 | # CONFIG_APM is not set |
| 163 | 206 | ||
| 164 | # | 207 | # |
| 208 | # Networking | ||
| 209 | # | ||
| 210 | CONFIG_NET=y | ||
| 211 | |||
| 212 | # | ||
| 213 | # Networking options | ||
| 214 | # | ||
| 215 | # CONFIG_NETDEBUG is not set | ||
| 216 | CONFIG_PACKET=y | ||
| 217 | CONFIG_PACKET_MMAP=y | ||
| 218 | CONFIG_UNIX=y | ||
| 219 | # CONFIG_NET_KEY is not set | ||
| 220 | CONFIG_INET=y | ||
| 221 | CONFIG_IP_MULTICAST=y | ||
| 222 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 223 | CONFIG_IP_FIB_HASH=y | ||
| 224 | CONFIG_IP_PNP=y | ||
| 225 | # CONFIG_IP_PNP_DHCP is not set | ||
| 226 | CONFIG_IP_PNP_BOOTP=y | ||
| 227 | # CONFIG_IP_PNP_RARP is not set | ||
| 228 | # CONFIG_NET_IPIP is not set | ||
| 229 | # CONFIG_NET_IPGRE is not set | ||
| 230 | # CONFIG_IP_MROUTE is not set | ||
| 231 | # CONFIG_ARPD is not set | ||
| 232 | # CONFIG_SYN_COOKIES is not set | ||
| 233 | # CONFIG_INET_AH is not set | ||
| 234 | # CONFIG_INET_ESP is not set | ||
| 235 | # CONFIG_INET_IPCOMP is not set | ||
| 236 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
| 237 | # CONFIG_INET_TUNNEL is not set | ||
| 238 | # CONFIG_INET_DIAG is not set | ||
| 239 | CONFIG_INET_TCP_DIAG=y | ||
| 240 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
| 241 | CONFIG_TCP_CONG_BIC=y | ||
| 242 | # CONFIG_IPV6 is not set | ||
| 243 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
| 244 | # CONFIG_INET6_TUNNEL is not set | ||
| 245 | # CONFIG_NETFILTER is not set | ||
| 246 | |||
| 247 | # | ||
| 248 | # DCCP Configuration (EXPERIMENTAL) | ||
| 249 | # | ||
| 250 | # CONFIG_IP_DCCP is not set | ||
| 251 | |||
| 252 | # | ||
| 253 | # SCTP Configuration (EXPERIMENTAL) | ||
| 254 | # | ||
| 255 | # CONFIG_IP_SCTP is not set | ||
| 256 | |||
| 257 | # | ||
| 258 | # TIPC Configuration (EXPERIMENTAL) | ||
| 259 | # | ||
| 260 | # CONFIG_TIPC is not set | ||
| 261 | # CONFIG_ATM is not set | ||
| 262 | # CONFIG_BRIDGE is not set | ||
| 263 | # CONFIG_VLAN_8021Q is not set | ||
| 264 | # CONFIG_DECNET is not set | ||
| 265 | # CONFIG_LLC2 is not set | ||
| 266 | # CONFIG_IPX is not set | ||
| 267 | # CONFIG_ATALK is not set | ||
| 268 | # CONFIG_X25 is not set | ||
| 269 | # CONFIG_LAPB is not set | ||
| 270 | # CONFIG_NET_DIVERT is not set | ||
| 271 | # CONFIG_ECONET is not set | ||
| 272 | # CONFIG_WAN_ROUTER is not set | ||
| 273 | |||
| 274 | # | ||
| 275 | # QoS and/or fair queueing | ||
| 276 | # | ||
| 277 | # CONFIG_NET_SCHED is not set | ||
| 278 | |||
| 279 | # | ||
| 280 | # Network testing | ||
| 281 | # | ||
| 282 | # CONFIG_NET_PKTGEN is not set | ||
| 283 | # CONFIG_HAMRADIO is not set | ||
| 284 | # CONFIG_IRDA is not set | ||
| 285 | # CONFIG_BT is not set | ||
| 286 | # CONFIG_IEEE80211 is not set | ||
| 287 | |||
| 288 | # | ||
| 165 | # Device Drivers | 289 | # Device Drivers |
| 166 | # | 290 | # |
| 167 | 291 | ||
| @@ -174,6 +298,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
| 174 | # CONFIG_DEBUG_DRIVER is not set | 298 | # CONFIG_DEBUG_DRIVER is not set |
| 175 | 299 | ||
| 176 | # | 300 | # |
| 301 | # Connector - unified userspace <-> kernelspace linker | ||
| 302 | # | ||
| 303 | # CONFIG_CONNECTOR is not set | ||
| 304 | |||
| 305 | # | ||
| 177 | # Memory Technology Devices (MTD) | 306 | # Memory Technology Devices (MTD) |
| 178 | # | 307 | # |
| 179 | CONFIG_MTD=y | 308 | CONFIG_MTD=y |
| @@ -192,6 +321,7 @@ CONFIG_MTD_BLOCK=y | |||
| 192 | # CONFIG_FTL is not set | 321 | # CONFIG_FTL is not set |
| 193 | # CONFIG_NFTL is not set | 322 | # CONFIG_NFTL is not set |
| 194 | # CONFIG_INFTL is not set | 323 | # CONFIG_INFTL is not set |
| 324 | # CONFIG_RFD_FTL is not set | ||
| 195 | 325 | ||
| 196 | # | 326 | # |
| 197 | # RAM/ROM/Flash chip drivers | 327 | # RAM/ROM/Flash chip drivers |
| @@ -214,6 +344,7 @@ CONFIG_MTD_CFI_I1=y | |||
| 214 | CONFIG_MTD_CFI_I2=y | 344 | CONFIG_MTD_CFI_I2=y |
| 215 | # CONFIG_MTD_CFI_I4 is not set | 345 | # CONFIG_MTD_CFI_I4 is not set |
| 216 | # CONFIG_MTD_CFI_I8 is not set | 346 | # CONFIG_MTD_CFI_I8 is not set |
| 347 | # CONFIG_MTD_OTP is not set | ||
| 217 | CONFIG_MTD_CFI_INTELEXT=y | 348 | CONFIG_MTD_CFI_INTELEXT=y |
| 218 | # CONFIG_MTD_CFI_AMDSTD is not set | 349 | # CONFIG_MTD_CFI_AMDSTD is not set |
| 219 | # CONFIG_MTD_CFI_STAA is not set | 350 | # CONFIG_MTD_CFI_STAA is not set |
| @@ -221,7 +352,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 221 | # CONFIG_MTD_RAM is not set | 352 | # CONFIG_MTD_RAM is not set |
| 222 | # CONFIG_MTD_ROM is not set | 353 | # CONFIG_MTD_ROM is not set |
| 223 | # CONFIG_MTD_ABSENT is not set | 354 | # CONFIG_MTD_ABSENT is not set |
| 224 | # CONFIG_MTD_XIP is not set | 355 | # CONFIG_MTD_OBSOLETE_CHIPS is not set |
| 225 | 356 | ||
| 226 | # | 357 | # |
| 227 | # Mapping drivers for chip access | 358 | # Mapping drivers for chip access |
| @@ -229,7 +360,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
| 229 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | 360 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set |
| 230 | # CONFIG_MTD_PHYSMAP is not set | 361 | # CONFIG_MTD_PHYSMAP is not set |
| 231 | CONFIG_MTD_ARM_INTEGRATOR=y | 362 | CONFIG_MTD_ARM_INTEGRATOR=y |
| 232 | # CONFIG_MTD_EDB7312 is not set | 363 | # CONFIG_MTD_PLATRAM is not set |
| 233 | 364 | ||
| 234 | # | 365 | # |
| 235 | # Self-contained MTD device drivers | 366 | # Self-contained MTD device drivers |
| @@ -237,7 +368,6 @@ CONFIG_MTD_ARM_INTEGRATOR=y | |||
| 237 | # CONFIG_MTD_SLRAM is not set | 368 | # CONFIG_MTD_SLRAM is not set |
| 238 | # CONFIG_MTD_PHRAM is not set | 369 | # CONFIG_MTD_PHRAM is not set |
| 239 | # CONFIG_MTD_MTDRAM is not set | 370 | # CONFIG_MTD_MTDRAM is not set |
| 240 | # CONFIG_MTD_BLKMTD is not set | ||
| 241 | # CONFIG_MTD_BLOCK2MTD is not set | 371 | # CONFIG_MTD_BLOCK2MTD is not set |
| 242 | 372 | ||
| 243 | # | 373 | # |
| @@ -253,6 +383,11 @@ CONFIG_MTD_ARM_INTEGRATOR=y | |||
| 253 | # CONFIG_MTD_NAND is not set | 383 | # CONFIG_MTD_NAND is not set |
| 254 | 384 | ||
| 255 | # | 385 | # |
| 386 | # OneNAND Flash Device Drivers | ||
| 387 | # | ||
| 388 | # CONFIG_MTD_ONENAND is not set | ||
| 389 | |||
| 390 | # | ||
| 256 | # Parallel port support | 391 | # Parallel port support |
| 257 | # | 392 | # |
| 258 | # CONFIG_PARPORT is not set | 393 | # CONFIG_PARPORT is not set |
| @@ -264,7 +399,6 @@ CONFIG_MTD_ARM_INTEGRATOR=y | |||
| 264 | # | 399 | # |
| 265 | # Block devices | 400 | # Block devices |
| 266 | # | 401 | # |
| 267 | # CONFIG_BLK_DEV_FD is not set | ||
| 268 | # CONFIG_BLK_DEV_COW_COMMON is not set | 402 | # CONFIG_BLK_DEV_COW_COMMON is not set |
| 269 | # CONFIG_BLK_DEV_LOOP is not set | 403 | # CONFIG_BLK_DEV_LOOP is not set |
| 270 | # CONFIG_BLK_DEV_NBD is not set | 404 | # CONFIG_BLK_DEV_NBD is not set |
| @@ -272,21 +406,13 @@ CONFIG_BLK_DEV_RAM=y | |||
| 272 | CONFIG_BLK_DEV_RAM_COUNT=16 | 406 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 273 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 407 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
| 274 | CONFIG_BLK_DEV_INITRD=y | 408 | CONFIG_BLK_DEV_INITRD=y |
| 275 | CONFIG_INITRAMFS_SOURCE="" | ||
| 276 | # CONFIG_CDROM_PKTCDVD is not set | 409 | # CONFIG_CDROM_PKTCDVD is not set |
| 277 | |||
| 278 | # | ||
| 279 | # IO Schedulers | ||
| 280 | # | ||
| 281 | CONFIG_IOSCHED_NOOP=y | ||
| 282 | CONFIG_IOSCHED_AS=y | ||
| 283 | CONFIG_IOSCHED_DEADLINE=y | ||
| 284 | CONFIG_IOSCHED_CFQ=y | ||
| 285 | # CONFIG_ATA_OVER_ETH is not set | 410 | # CONFIG_ATA_OVER_ETH is not set |
| 286 | 411 | ||
| 287 | # | 412 | # |
| 288 | # SCSI device support | 413 | # SCSI device support |
| 289 | # | 414 | # |
| 415 | # CONFIG_RAID_ATTRS is not set | ||
| 290 | # CONFIG_SCSI is not set | 416 | # CONFIG_SCSI is not set |
| 291 | 417 | ||
| 292 | # | 418 | # |
| @@ -297,6 +423,7 @@ CONFIG_IOSCHED_CFQ=y | |||
| 297 | # | 423 | # |
| 298 | # Fusion MPT device support | 424 | # Fusion MPT device support |
| 299 | # | 425 | # |
| 426 | # CONFIG_FUSION is not set | ||
| 300 | 427 | ||
| 301 | # | 428 | # |
| 302 | # IEEE 1394 (FireWire) support | 429 | # IEEE 1394 (FireWire) support |
| @@ -307,71 +434,8 @@ CONFIG_IOSCHED_CFQ=y | |||
| 307 | # | 434 | # |
| 308 | 435 | ||
| 309 | # | 436 | # |
| 310 | # Networking support | 437 | # Network device support |
| 311 | # | ||
| 312 | CONFIG_NET=y | ||
| 313 | |||
| 314 | # | ||
| 315 | # Networking options | ||
| 316 | # | ||
| 317 | CONFIG_PACKET=y | ||
| 318 | CONFIG_PACKET_MMAP=y | ||
| 319 | # CONFIG_NETLINK_DEV is not set | ||
| 320 | CONFIG_UNIX=y | ||
| 321 | # CONFIG_NET_KEY is not set | ||
| 322 | CONFIG_INET=y | ||
| 323 | CONFIG_IP_MULTICAST=y | ||
| 324 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
| 325 | CONFIG_IP_PNP=y | ||
| 326 | # CONFIG_IP_PNP_DHCP is not set | ||
| 327 | CONFIG_IP_PNP_BOOTP=y | ||
| 328 | # CONFIG_IP_PNP_RARP is not set | ||
| 329 | # CONFIG_NET_IPIP is not set | ||
| 330 | # CONFIG_NET_IPGRE is not set | ||
| 331 | # CONFIG_IP_MROUTE is not set | ||
| 332 | # CONFIG_ARPD is not set | ||
| 333 | # CONFIG_SYN_COOKIES is not set | ||
| 334 | # CONFIG_INET_AH is not set | ||
| 335 | # CONFIG_INET_ESP is not set | ||
| 336 | # CONFIG_INET_IPCOMP is not set | ||
| 337 | # CONFIG_INET_TUNNEL is not set | ||
| 338 | # CONFIG_IP_TCPDIAG is not set | ||
| 339 | # CONFIG_IP_TCPDIAG_IPV6 is not set | ||
| 340 | # CONFIG_IPV6 is not set | ||
| 341 | # CONFIG_NETFILTER is not set | ||
| 342 | |||
| 343 | # | ||
| 344 | # SCTP Configuration (EXPERIMENTAL) | ||
| 345 | # | ||
| 346 | # CONFIG_IP_SCTP is not set | ||
| 347 | # CONFIG_ATM is not set | ||
| 348 | # CONFIG_BRIDGE is not set | ||
| 349 | # CONFIG_VLAN_8021Q is not set | ||
| 350 | # CONFIG_DECNET is not set | ||
| 351 | # CONFIG_LLC2 is not set | ||
| 352 | # CONFIG_IPX is not set | ||
| 353 | # CONFIG_ATALK is not set | ||
| 354 | # CONFIG_X25 is not set | ||
| 355 | # CONFIG_LAPB is not set | ||
| 356 | # CONFIG_NET_DIVERT is not set | ||
| 357 | # CONFIG_ECONET is not set | ||
| 358 | # CONFIG_WAN_ROUTER is not set | ||
| 359 | |||
| 360 | # | ||
| 361 | # QoS and/or fair queueing | ||
| 362 | # | ||
| 363 | # CONFIG_NET_SCHED is not set | ||
| 364 | # CONFIG_NET_CLS_ROUTE is not set | ||
| 365 | |||
| 366 | # | ||
| 367 | # Network testing | ||
| 368 | # | 438 | # |
| 369 | # CONFIG_NET_PKTGEN is not set | ||
| 370 | # CONFIG_NETPOLL is not set | ||
| 371 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 372 | # CONFIG_HAMRADIO is not set | ||
| 373 | # CONFIG_IRDA is not set | ||
| 374 | # CONFIG_BT is not set | ||
| 375 | CONFIG_NETDEVICES=y | 439 | CONFIG_NETDEVICES=y |
| 376 | # CONFIG_DUMMY is not set | 440 | # CONFIG_DUMMY is not set |
| 377 | # CONFIG_BONDING is not set | 441 | # CONFIG_BONDING is not set |
| @@ -379,11 +443,17 @@ CONFIG_NETDEVICES=y | |||
| 379 | # CONFIG_TUN is not set | 443 | # CONFIG_TUN is not set |
| 380 | 444 | ||
| 381 | # | 445 | # |
| 446 | # PHY device support | ||
| 447 | # | ||
| 448 | # CONFIG_PHYLIB is not set | ||
| 449 | |||
| 450 | # | ||
| 382 | # Ethernet (10 or 100Mbit) | 451 | # Ethernet (10 or 100Mbit) |
| 383 | # | 452 | # |
| 384 | CONFIG_NET_ETHERNET=y | 453 | CONFIG_NET_ETHERNET=y |
| 385 | CONFIG_MII=y | 454 | CONFIG_MII=y |
| 386 | CONFIG_SMC91X=y | 455 | CONFIG_SMC91X=y |
| 456 | # CONFIG_DM9000 is not set | ||
| 387 | 457 | ||
| 388 | # | 458 | # |
| 389 | # Ethernet (1000 Mbit) | 459 | # Ethernet (1000 Mbit) |
| @@ -410,6 +480,8 @@ CONFIG_SMC91X=y | |||
| 410 | # CONFIG_SLIP is not set | 480 | # CONFIG_SLIP is not set |
| 411 | # CONFIG_SHAPER is not set | 481 | # CONFIG_SHAPER is not set |
| 412 | # CONFIG_NETCONSOLE is not set | 482 | # CONFIG_NETCONSOLE is not set |
| 483 | # CONFIG_NETPOLL is not set | ||
| 484 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
| 413 | 485 | ||
| 414 | # | 486 | # |
| 415 | # ISDN subsystem | 487 | # ISDN subsystem |
| @@ -459,7 +531,6 @@ CONFIG_SERIO_AMBAKMI=y | |||
| 459 | CONFIG_SERIO_LIBPS2=y | 531 | CONFIG_SERIO_LIBPS2=y |
| 460 | # CONFIG_SERIO_RAW is not set | 532 | # CONFIG_SERIO_RAW is not set |
| 461 | # CONFIG_GAMEPORT is not set | 533 | # CONFIG_GAMEPORT is not set |
| 462 | CONFIG_SOUND_GAMEPORT=y | ||
| 463 | 534 | ||
| 464 | # | 535 | # |
| 465 | # Character devices | 536 | # Character devices |
| @@ -474,17 +545,16 @@ CONFIG_HW_CONSOLE=y | |||
| 474 | # | 545 | # |
| 475 | CONFIG_SERIAL_8250=m | 546 | CONFIG_SERIAL_8250=m |
| 476 | CONFIG_SERIAL_8250_NR_UARTS=4 | 547 | CONFIG_SERIAL_8250_NR_UARTS=4 |
| 548 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
| 477 | CONFIG_SERIAL_8250_EXTENDED=y | 549 | CONFIG_SERIAL_8250_EXTENDED=y |
| 478 | CONFIG_SERIAL_8250_MANY_PORTS=y | 550 | CONFIG_SERIAL_8250_MANY_PORTS=y |
| 479 | CONFIG_SERIAL_8250_SHARE_IRQ=y | 551 | CONFIG_SERIAL_8250_SHARE_IRQ=y |
| 480 | # CONFIG_SERIAL_8250_DETECT_IRQ is not set | 552 | # CONFIG_SERIAL_8250_DETECT_IRQ is not set |
| 481 | CONFIG_SERIAL_8250_MULTIPORT=y | ||
| 482 | CONFIG_SERIAL_8250_RSA=y | 553 | CONFIG_SERIAL_8250_RSA=y |
| 483 | 554 | ||
| 484 | # | 555 | # |
| 485 | # Non-8250 serial port support | 556 | # Non-8250 serial port support |
| 486 | # | 557 | # |
| 487 | # CONFIG_SERIAL_AMBA_PL010 is not set | ||
| 488 | CONFIG_SERIAL_AMBA_PL011=y | 558 | CONFIG_SERIAL_AMBA_PL011=y |
| 489 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y | 559 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y |
| 490 | CONFIG_SERIAL_CORE=y | 560 | CONFIG_SERIAL_CORE=y |
| @@ -503,20 +573,19 @@ CONFIG_LEGACY_PTY_COUNT=16 | |||
| 503 | # | 573 | # |
| 504 | # CONFIG_WATCHDOG is not set | 574 | # CONFIG_WATCHDOG is not set |
| 505 | # CONFIG_NVRAM is not set | 575 | # CONFIG_NVRAM is not set |
| 506 | # CONFIG_RTC is not set | ||
| 507 | # CONFIG_DTLK is not set | 576 | # CONFIG_DTLK is not set |
| 508 | # CONFIG_R3964 is not set | 577 | # CONFIG_R3964 is not set |
| 509 | 578 | ||
| 510 | # | 579 | # |
| 511 | # Ftape, the floppy tape device driver | 580 | # Ftape, the floppy tape device driver |
| 512 | # | 581 | # |
| 513 | # CONFIG_DRM is not set | ||
| 514 | # CONFIG_RAW_DRIVER is not set | 582 | # CONFIG_RAW_DRIVER is not set |
| 515 | 583 | ||
| 516 | # | 584 | # |
| 517 | # TPM devices | 585 | # TPM devices |
| 518 | # | 586 | # |
| 519 | # CONFIG_TCG_TPM is not set | 587 | # CONFIG_TCG_TPM is not set |
| 588 | # CONFIG_TELCLOCK is not set | ||
| 520 | 589 | ||
| 521 | # | 590 | # |
| 522 | # I2C support | 591 | # I2C support |
| @@ -534,60 +603,60 @@ CONFIG_I2C_ALGOBIT=y | |||
| 534 | # | 603 | # |
| 535 | # I2C Hardware Bus support | 604 | # I2C Hardware Bus support |
| 536 | # | 605 | # |
| 537 | # CONFIG_I2C_ISA is not set | ||
| 538 | # CONFIG_I2C_PARPORT_LIGHT is not set | 606 | # CONFIG_I2C_PARPORT_LIGHT is not set |
| 539 | # CONFIG_I2C_STUB is not set | 607 | # CONFIG_I2C_STUB is not set |
| 540 | # CONFIG_I2C_PCA_ISA is not set | 608 | # CONFIG_I2C_PCA_ISA is not set |
| 541 | 609 | ||
| 542 | # | 610 | # |
| 543 | # Hardware Sensors Chip support | 611 | # Miscellaneous I2C Chip support |
| 544 | # | ||
| 545 | CONFIG_I2C_SENSOR=m | ||
| 546 | # CONFIG_SENSORS_ADM1021 is not set | ||
| 547 | # CONFIG_SENSORS_ADM1025 is not set | ||
| 548 | # CONFIG_SENSORS_ADM1026 is not set | ||
| 549 | # CONFIG_SENSORS_ADM1031 is not set | ||
| 550 | # CONFIG_SENSORS_ASB100 is not set | ||
| 551 | # CONFIG_SENSORS_DS1621 is not set | ||
| 552 | # CONFIG_SENSORS_FSCHER is not set | ||
| 553 | # CONFIG_SENSORS_FSCPOS is not set | ||
| 554 | # CONFIG_SENSORS_GL518SM is not set | ||
| 555 | # CONFIG_SENSORS_GL520SM is not set | ||
| 556 | # CONFIG_SENSORS_IT87 is not set | ||
| 557 | # CONFIG_SENSORS_LM63 is not set | ||
| 558 | # CONFIG_SENSORS_LM75 is not set | ||
| 559 | # CONFIG_SENSORS_LM77 is not set | ||
| 560 | # CONFIG_SENSORS_LM78 is not set | ||
| 561 | # CONFIG_SENSORS_LM80 is not set | ||
| 562 | # CONFIG_SENSORS_LM83 is not set | ||
| 563 | # CONFIG_SENSORS_LM85 is not set | ||
| 564 | # CONFIG_SENSORS_LM87 is not set | ||
| 565 | # CONFIG_SENSORS_LM90 is not set | ||
| 566 | # CONFIG_SENSORS_MAX1619 is not set | ||
| 567 | # CONFIG_SENSORS_PC87360 is not set | ||
| 568 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
| 569 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
| 570 | # CONFIG_SENSORS_W83781D is not set | ||
| 571 | # CONFIG_SENSORS_W83L785TS is not set | ||
| 572 | # CONFIG_SENSORS_W83627HF is not set | ||
| 573 | |||
| 574 | # | ||
| 575 | # Other I2C Chip support | ||
| 576 | # | 612 | # |
| 613 | # CONFIG_SENSORS_DS1337 is not set | ||
| 614 | # CONFIG_SENSORS_DS1374 is not set | ||
| 577 | CONFIG_SENSORS_EEPROM=m | 615 | CONFIG_SENSORS_EEPROM=m |
| 578 | # CONFIG_SENSORS_PCF8574 is not set | 616 | # CONFIG_SENSORS_PCF8574 is not set |
| 617 | # CONFIG_SENSORS_PCA9539 is not set | ||
| 579 | # CONFIG_SENSORS_PCF8591 is not set | 618 | # CONFIG_SENSORS_PCF8591 is not set |
| 580 | # CONFIG_SENSORS_RTC8564 is not set | 619 | # CONFIG_SENSORS_MAX6875 is not set |
| 581 | # CONFIG_I2C_DEBUG_CORE is not set | 620 | # CONFIG_I2C_DEBUG_CORE is not set |
| 582 | # CONFIG_I2C_DEBUG_ALGO is not set | 621 | # CONFIG_I2C_DEBUG_ALGO is not set |
| 583 | # CONFIG_I2C_DEBUG_BUS is not set | 622 | # CONFIG_I2C_DEBUG_BUS is not set |
| 584 | # CONFIG_I2C_DEBUG_CHIP is not set | 623 | # CONFIG_I2C_DEBUG_CHIP is not set |
| 585 | 624 | ||
| 586 | # | 625 | # |
| 626 | # SPI support | ||
| 627 | # | ||
| 628 | # CONFIG_SPI is not set | ||
| 629 | # CONFIG_SPI_MASTER is not set | ||
| 630 | |||
| 631 | # | ||
| 632 | # Dallas's 1-wire bus | ||
| 633 | # | ||
| 634 | # CONFIG_W1 is not set | ||
| 635 | |||
| 636 | # | ||
| 637 | # Hardware Monitoring support | ||
| 638 | # | ||
| 639 | # CONFIG_HWMON is not set | ||
| 640 | # CONFIG_HWMON_VID is not set | ||
| 641 | |||
| 642 | # | ||
| 587 | # Misc devices | 643 | # Misc devices |
| 588 | # | 644 | # |
| 589 | 645 | ||
| 590 | # | 646 | # |
| 647 | # LED devices | ||
| 648 | # | ||
| 649 | # CONFIG_NEW_LEDS is not set | ||
| 650 | |||
| 651 | # | ||
| 652 | # LED drivers | ||
| 653 | # | ||
| 654 | |||
| 655 | # | ||
| 656 | # LED Triggers | ||
| 657 | # | ||
| 658 | |||
| 659 | # | ||
| 591 | # Multimedia devices | 660 | # Multimedia devices |
| 592 | # | 661 | # |
| 593 | # CONFIG_VIDEO_DEV is not set | 662 | # CONFIG_VIDEO_DEV is not set |
| @@ -604,27 +673,31 @@ CONFIG_FB=y | |||
| 604 | CONFIG_FB_CFB_FILLRECT=y | 673 | CONFIG_FB_CFB_FILLRECT=y |
| 605 | CONFIG_FB_CFB_COPYAREA=y | 674 | CONFIG_FB_CFB_COPYAREA=y |
| 606 | CONFIG_FB_CFB_IMAGEBLIT=y | 675 | CONFIG_FB_CFB_IMAGEBLIT=y |
| 607 | CONFIG_FB_SOFT_CURSOR=y | 676 | # CONFIG_FB_MACMODES is not set |
| 677 | # CONFIG_FB_FIRMWARE_EDID is not set | ||
| 608 | # CONFIG_FB_MODE_HELPERS is not set | 678 | # CONFIG_FB_MODE_HELPERS is not set |
| 609 | # CONFIG_FB_TILEBLITTING is not set | 679 | # CONFIG_FB_TILEBLITTING is not set |
| 610 | CONFIG_FB_ARMCLCD=y | 680 | CONFIG_FB_ARMCLCD=y |
| 681 | # CONFIG_FB_S1D13XXX is not set | ||
| 611 | # CONFIG_FB_VIRTUAL is not set | 682 | # CONFIG_FB_VIRTUAL is not set |
| 612 | 683 | ||
| 613 | # | 684 | # |
| 614 | # Console display driver support | 685 | # Console display driver support |
| 615 | # | 686 | # |
| 616 | # CONFIG_VGA_CONSOLE is not set | ||
| 617 | CONFIG_DUMMY_CONSOLE=y | 687 | CONFIG_DUMMY_CONSOLE=y |
| 618 | CONFIG_FRAMEBUFFER_CONSOLE=y | 688 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 689 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
| 619 | CONFIG_FONTS=y | 690 | CONFIG_FONTS=y |
| 620 | # CONFIG_FONT_8x8 is not set | 691 | # CONFIG_FONT_8x8 is not set |
| 621 | # CONFIG_FONT_8x16 is not set | 692 | # CONFIG_FONT_8x16 is not set |
| 622 | # CONFIG_FONT_6x11 is not set | 693 | # CONFIG_FONT_6x11 is not set |
| 694 | # CONFIG_FONT_7x14 is not set | ||
| 623 | # CONFIG_FONT_PEARL_8x8 is not set | 695 | # CONFIG_FONT_PEARL_8x8 is not set |
| 624 | CONFIG_FONT_ACORN_8x8=y | 696 | CONFIG_FONT_ACORN_8x8=y |
| 625 | # CONFIG_FONT_MINI_4x6 is not set | 697 | # CONFIG_FONT_MINI_4x6 is not set |
| 626 | # CONFIG_FONT_SUN8x16 is not set | 698 | # CONFIG_FONT_SUN8x16 is not set |
| 627 | # CONFIG_FONT_SUN12x22 is not set | 699 | # CONFIG_FONT_SUN12x22 is not set |
| 700 | # CONFIG_FONT_10x18 is not set | ||
| 628 | 701 | ||
| 629 | # | 702 | # |
| 630 | # Logo configuration | 703 | # Logo configuration |
| @@ -647,12 +720,18 @@ CONFIG_SND_PCM=m | |||
| 647 | CONFIG_SND_OSSEMUL=y | 720 | CONFIG_SND_OSSEMUL=y |
| 648 | CONFIG_SND_MIXER_OSS=m | 721 | CONFIG_SND_MIXER_OSS=m |
| 649 | CONFIG_SND_PCM_OSS=m | 722 | CONFIG_SND_PCM_OSS=m |
| 723 | CONFIG_SND_PCM_OSS_PLUGINS=y | ||
| 724 | # CONFIG_SND_DYNAMIC_MINORS is not set | ||
| 725 | CONFIG_SND_SUPPORT_OLD_API=y | ||
| 726 | CONFIG_SND_VERBOSE_PROCFS=y | ||
| 650 | # CONFIG_SND_VERBOSE_PRINTK is not set | 727 | # CONFIG_SND_VERBOSE_PRINTK is not set |
| 651 | # CONFIG_SND_DEBUG is not set | 728 | # CONFIG_SND_DEBUG is not set |
| 652 | 729 | ||
| 653 | # | 730 | # |
| 654 | # Generic devices | 731 | # Generic devices |
| 655 | # | 732 | # |
| 733 | CONFIG_SND_AC97_CODEC=m | ||
| 734 | CONFIG_SND_AC97_BUS=m | ||
| 656 | # CONFIG_SND_DUMMY is not set | 735 | # CONFIG_SND_DUMMY is not set |
| 657 | # CONFIG_SND_MTPAV is not set | 736 | # CONFIG_SND_MTPAV is not set |
| 658 | # CONFIG_SND_SERIAL_U16550 is not set | 737 | # CONFIG_SND_SERIAL_U16550 is not set |
| @@ -661,6 +740,7 @@ CONFIG_SND_PCM_OSS=m | |||
| 661 | # | 740 | # |
| 662 | # ALSA ARM devices | 741 | # ALSA ARM devices |
| 663 | # | 742 | # |
| 743 | CONFIG_SND_ARMAACI=m | ||
| 664 | 744 | ||
| 665 | # | 745 | # |
| 666 | # Open Sound System | 746 | # Open Sound System |
| @@ -672,9 +752,14 @@ CONFIG_SND_PCM_OSS=m | |||
| 672 | # | 752 | # |
| 673 | CONFIG_USB_ARCH_HAS_HCD=y | 753 | CONFIG_USB_ARCH_HAS_HCD=y |
| 674 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 754 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
| 755 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
| 675 | # CONFIG_USB is not set | 756 | # CONFIG_USB is not set |
| 676 | 757 | ||
| 677 | # | 758 | # |
| 759 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
| 760 | # | ||
| 761 | |||
| 762 | # | ||
| 678 | # USB Gadget Support | 763 | # USB Gadget Support |
| 679 | # | 764 | # |
| 680 | # CONFIG_USB_GADGET is not set | 765 | # CONFIG_USB_GADGET is not set |
| @@ -688,25 +773,31 @@ CONFIG_MMC_BLOCK=y | |||
| 688 | CONFIG_MMC_ARMMMCI=m | 773 | CONFIG_MMC_ARMMMCI=m |
| 689 | 774 | ||
| 690 | # | 775 | # |
| 776 | # Real Time Clock | ||
| 777 | # | ||
| 778 | CONFIG_RTC_LIB=y | ||
| 779 | # CONFIG_RTC_CLASS is not set | ||
| 780 | |||
| 781 | # | ||
| 691 | # File systems | 782 | # File systems |
| 692 | # | 783 | # |
| 693 | CONFIG_EXT2_FS=y | 784 | CONFIG_EXT2_FS=y |
| 694 | # CONFIG_EXT2_FS_XATTR is not set | 785 | # CONFIG_EXT2_FS_XATTR is not set |
| 786 | # CONFIG_EXT2_FS_XIP is not set | ||
| 695 | # CONFIG_EXT3_FS is not set | 787 | # CONFIG_EXT3_FS is not set |
| 696 | # CONFIG_JBD is not set | ||
| 697 | # CONFIG_REISERFS_FS is not set | 788 | # CONFIG_REISERFS_FS is not set |
| 698 | # CONFIG_JFS_FS is not set | 789 | # CONFIG_JFS_FS is not set |
| 699 | 790 | # CONFIG_FS_POSIX_ACL is not set | |
| 700 | # | ||
| 701 | # XFS support | ||
| 702 | # | ||
| 703 | # CONFIG_XFS_FS is not set | 791 | # CONFIG_XFS_FS is not set |
| 792 | # CONFIG_OCFS2_FS is not set | ||
| 704 | CONFIG_MINIX_FS=y | 793 | CONFIG_MINIX_FS=y |
| 705 | CONFIG_ROMFS_FS=y | 794 | CONFIG_ROMFS_FS=y |
| 795 | # CONFIG_INOTIFY is not set | ||
| 706 | # CONFIG_QUOTA is not set | 796 | # CONFIG_QUOTA is not set |
| 707 | CONFIG_DNOTIFY=y | 797 | CONFIG_DNOTIFY=y |
| 708 | # CONFIG_AUTOFS_FS is not set | 798 | # CONFIG_AUTOFS_FS is not set |
| 709 | # CONFIG_AUTOFS4_FS is not set | 799 | # CONFIG_AUTOFS4_FS is not set |
| 800 | # CONFIG_FUSE_FS is not set | ||
| 710 | 801 | ||
| 711 | # | 802 | # |
| 712 | # CD-ROM/DVD Filesystems | 803 | # CD-ROM/DVD Filesystems |
| @@ -729,11 +820,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 729 | # | 820 | # |
| 730 | CONFIG_PROC_FS=y | 821 | CONFIG_PROC_FS=y |
| 731 | CONFIG_SYSFS=y | 822 | CONFIG_SYSFS=y |
| 732 | # CONFIG_DEVFS_FS is not set | ||
| 733 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
| 734 | # CONFIG_TMPFS is not set | 823 | # CONFIG_TMPFS is not set |
| 735 | # CONFIG_HUGETLB_PAGE is not set | 824 | # CONFIG_HUGETLB_PAGE is not set |
| 736 | CONFIG_RAMFS=y | 825 | CONFIG_RAMFS=y |
| 826 | # CONFIG_CONFIGFS_FS is not set | ||
| 737 | 827 | ||
| 738 | # | 828 | # |
| 739 | # Miscellaneous filesystems | 829 | # Miscellaneous filesystems |
| @@ -748,8 +838,8 @@ CONFIG_RAMFS=y | |||
| 748 | # CONFIG_JFFS_FS is not set | 838 | # CONFIG_JFFS_FS is not set |
| 749 | CONFIG_JFFS2_FS=y | 839 | CONFIG_JFFS2_FS=y |
| 750 | CONFIG_JFFS2_FS_DEBUG=0 | 840 | CONFIG_JFFS2_FS_DEBUG=0 |
| 751 | # CONFIG_JFFS2_FS_NAND is not set | 841 | CONFIG_JFFS2_FS_WRITEBUFFER=y |
| 752 | # CONFIG_JFFS2_FS_NOR_ECC is not set | 842 | # CONFIG_JFFS2_SUMMARY is not set |
| 753 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | 843 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set |
| 754 | CONFIG_JFFS2_ZLIB=y | 844 | CONFIG_JFFS2_ZLIB=y |
| 755 | CONFIG_JFFS2_RTIME=y | 845 | CONFIG_JFFS2_RTIME=y |
| @@ -766,16 +856,19 @@ CONFIG_CRAMFS=y | |||
| 766 | # | 856 | # |
| 767 | CONFIG_NFS_FS=y | 857 | CONFIG_NFS_FS=y |
| 768 | CONFIG_NFS_V3=y | 858 | CONFIG_NFS_V3=y |
| 859 | # CONFIG_NFS_V3_ACL is not set | ||
| 769 | # CONFIG_NFS_V4 is not set | 860 | # CONFIG_NFS_V4 is not set |
| 770 | # CONFIG_NFS_DIRECTIO is not set | 861 | # CONFIG_NFS_DIRECTIO is not set |
| 771 | CONFIG_NFSD=y | 862 | CONFIG_NFSD=y |
| 772 | CONFIG_NFSD_V3=y | 863 | CONFIG_NFSD_V3=y |
| 864 | # CONFIG_NFSD_V3_ACL is not set | ||
| 773 | # CONFIG_NFSD_V4 is not set | 865 | # CONFIG_NFSD_V4 is not set |
| 774 | # CONFIG_NFSD_TCP is not set | 866 | # CONFIG_NFSD_TCP is not set |
| 775 | CONFIG_ROOT_NFS=y | 867 | CONFIG_ROOT_NFS=y |
| 776 | CONFIG_LOCKD=y | 868 | CONFIG_LOCKD=y |
| 777 | CONFIG_LOCKD_V4=y | 869 | CONFIG_LOCKD_V4=y |
| 778 | CONFIG_EXPORTFS=y | 870 | CONFIG_EXPORTFS=y |
| 871 | CONFIG_NFS_COMMON=y | ||
| 779 | CONFIG_SUNRPC=y | 872 | CONFIG_SUNRPC=y |
| 780 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 873 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
| 781 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 874 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
| @@ -784,6 +877,7 @@ CONFIG_SUNRPC=y | |||
| 784 | # CONFIG_NCP_FS is not set | 877 | # CONFIG_NCP_FS is not set |
| 785 | # CONFIG_CODA_FS is not set | 878 | # CONFIG_CODA_FS is not set |
| 786 | # CONFIG_AFS_FS is not set | 879 | # CONFIG_AFS_FS is not set |
| 880 | # CONFIG_9P_FS is not set | ||
| 787 | 881 | ||
| 788 | # | 882 | # |
| 789 | # Partition Types | 883 | # Partition Types |
| @@ -803,6 +897,7 @@ CONFIG_MSDOS_PARTITION=y | |||
| 803 | # CONFIG_SGI_PARTITION is not set | 897 | # CONFIG_SGI_PARTITION is not set |
| 804 | # CONFIG_ULTRIX_PARTITION is not set | 898 | # CONFIG_ULTRIX_PARTITION is not set |
| 805 | # CONFIG_SUN_PARTITION is not set | 899 | # CONFIG_SUN_PARTITION is not set |
| 900 | # CONFIG_KARMA_PARTITION is not set | ||
| 806 | # CONFIG_EFI_PARTITION is not set | 901 | # CONFIG_EFI_PARTITION is not set |
| 807 | 902 | ||
| 808 | # | 903 | # |
| @@ -858,18 +953,24 @@ CONFIG_NLS_ISO8859_1=m | |||
| 858 | # Kernel hacking | 953 | # Kernel hacking |
| 859 | # | 954 | # |
| 860 | # CONFIG_PRINTK_TIME is not set | 955 | # CONFIG_PRINTK_TIME is not set |
| 861 | CONFIG_DEBUG_KERNEL=y | ||
| 862 | CONFIG_MAGIC_SYSRQ=y | 956 | CONFIG_MAGIC_SYSRQ=y |
| 957 | CONFIG_DEBUG_KERNEL=y | ||
| 863 | CONFIG_LOG_BUF_SHIFT=14 | 958 | CONFIG_LOG_BUF_SHIFT=14 |
| 959 | CONFIG_DETECT_SOFTLOCKUP=y | ||
| 864 | # CONFIG_SCHEDSTATS is not set | 960 | # CONFIG_SCHEDSTATS is not set |
| 865 | # CONFIG_DEBUG_SLAB is not set | 961 | # CONFIG_DEBUG_SLAB is not set |
| 962 | # CONFIG_DEBUG_MUTEXES is not set | ||
| 866 | # CONFIG_DEBUG_SPINLOCK is not set | 963 | # CONFIG_DEBUG_SPINLOCK is not set |
| 867 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 964 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
| 868 | # CONFIG_DEBUG_KOBJECT is not set | 965 | # CONFIG_DEBUG_KOBJECT is not set |
| 869 | CONFIG_DEBUG_BUGVERBOSE=y | 966 | CONFIG_DEBUG_BUGVERBOSE=y |
| 870 | # CONFIG_DEBUG_INFO is not set | 967 | # CONFIG_DEBUG_INFO is not set |
| 871 | # CONFIG_DEBUG_FS is not set | 968 | # CONFIG_DEBUG_FS is not set |
| 969 | # CONFIG_DEBUG_VM is not set | ||
| 872 | CONFIG_FRAME_POINTER=y | 970 | CONFIG_FRAME_POINTER=y |
| 971 | # CONFIG_UNWIND_INFO is not set | ||
| 972 | CONFIG_FORCED_INLINING=y | ||
| 973 | # CONFIG_RCU_TORTURE_TEST is not set | ||
| 873 | CONFIG_DEBUG_USER=y | 974 | CONFIG_DEBUG_USER=y |
| 874 | # CONFIG_DEBUG_WAITQ is not set | 975 | # CONFIG_DEBUG_WAITQ is not set |
| 875 | CONFIG_DEBUG_ERRORS=y | 976 | CONFIG_DEBUG_ERRORS=y |
| @@ -895,6 +996,7 @@ CONFIG_DEBUG_LL=y | |||
| 895 | # Library routines | 996 | # Library routines |
| 896 | # | 997 | # |
| 897 | # CONFIG_CRC_CCITT is not set | 998 | # CONFIG_CRC_CCITT is not set |
| 999 | # CONFIG_CRC16 is not set | ||
| 898 | CONFIG_CRC32=y | 1000 | CONFIG_CRC32=y |
| 899 | # CONFIG_LIBCRC32C is not set | 1001 | # CONFIG_LIBCRC32C is not set |
| 900 | CONFIG_ZLIB_INFLATE=y | 1002 | CONFIG_ZLIB_INFLATE=y |
diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c index b324dcac1c56..396efba9bacd 100644 --- a/arch/arm/kernel/asm-offsets.c +++ b/arch/arm/kernel/asm-offsets.c | |||
| @@ -95,5 +95,13 @@ int main(void) | |||
| 95 | DEFINE(SYS_ERROR0, 0x9f0000); | 95 | DEFINE(SYS_ERROR0, 0x9f0000); |
| 96 | BLANK(); | 96 | BLANK(); |
| 97 | DEFINE(SIZEOF_MACHINE_DESC, sizeof(struct machine_desc)); | 97 | DEFINE(SIZEOF_MACHINE_DESC, sizeof(struct machine_desc)); |
| 98 | DEFINE(MACHINFO_TYPE, offsetof(struct machine_desc, nr)); | ||
| 99 | DEFINE(MACHINFO_NAME, offsetof(struct machine_desc, name)); | ||
| 100 | DEFINE(MACHINFO_PHYSIO, offsetof(struct machine_desc, phys_io)); | ||
| 101 | DEFINE(MACHINFO_PGOFFIO, offsetof(struct machine_desc, io_pg_offst)); | ||
| 102 | BLANK(); | ||
| 103 | DEFINE(PROC_INFO_SZ, sizeof(struct proc_info_list)); | ||
| 104 | DEFINE(PROCINFO_INITFUNC, offsetof(struct proc_info_list, __cpu_flush)); | ||
| 105 | DEFINE(PROCINFO_MMUFLAGS, offsetof(struct proc_info_list, __cpu_mmu_flags)); | ||
| 98 | return 0; | 106 | return 0; |
| 99 | } | 107 | } |
diff --git a/arch/arm/kernel/dma-isa.c b/arch/arm/kernel/dma-isa.c index 03532769a97f..0a3e9ad297d8 100644 --- a/arch/arm/kernel/dma-isa.c +++ b/arch/arm/kernel/dma-isa.c | |||
| @@ -143,12 +143,23 @@ static struct dma_ops isa_dma_ops = { | |||
| 143 | .residue = isa_get_dma_residue, | 143 | .residue = isa_get_dma_residue, |
| 144 | }; | 144 | }; |
| 145 | 145 | ||
| 146 | static struct resource dma_resources[] = { | 146 | static struct resource dma_resources[] = { { |
| 147 | { "dma1", 0x0000, 0x000f }, | 147 | .name = "dma1", |
| 148 | { "dma low page", 0x0080, 0x008f }, | 148 | .start = 0x0000, |
| 149 | { "dma2", 0x00c0, 0x00df }, | 149 | .end = 0x000f |
| 150 | { "dma high page", 0x0480, 0x048f } | 150 | }, { |
| 151 | }; | 151 | .name = "dma low page", |
| 152 | .start = 0x0080, | ||
| 153 | .end = 0x008f | ||
| 154 | }, { | ||
| 155 | .name = "dma2", | ||
| 156 | .start = 0x00c0, | ||
| 157 | .end = 0x00df | ||
| 158 | }, { | ||
| 159 | .name = "dma high page", | ||
| 160 | .start = 0x0480, | ||
| 161 | .end = 0x048f | ||
| 162 | } }; | ||
| 152 | 163 | ||
| 153 | void __init isa_init_dma(dma_t *dma) | 164 | void __init isa_init_dma(dma_t *dma) |
| 154 | { | 165 | { |
diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S index 0bea65864051..adf62e5eaad7 100644 --- a/arch/arm/kernel/head-nommu.S +++ b/arch/arm/kernel/head-nommu.S | |||
| @@ -20,12 +20,10 @@ | |||
| 20 | #include <asm/mach-types.h> | 20 | #include <asm/mach-types.h> |
| 21 | #include <asm/procinfo.h> | 21 | #include <asm/procinfo.h> |
| 22 | #include <asm/ptrace.h> | 22 | #include <asm/ptrace.h> |
| 23 | #include <asm/asm-offsets.h> | ||
| 23 | #include <asm/thread_info.h> | 24 | #include <asm/thread_info.h> |
| 24 | #include <asm/system.h> | 25 | #include <asm/system.h> |
| 25 | 26 | ||
| 26 | #define PROCINFO_INITFUNC 12 | ||
| 27 | #define MACHINFO_TYPE 0 | ||
| 28 | |||
| 29 | /* | 27 | /* |
| 30 | * Kernel startup entry point. | 28 | * Kernel startup entry point. |
| 31 | * --------------------------- | 29 | * --------------------------- |
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 04b66a9328ef..04f7344e356a 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S | |||
| @@ -24,14 +24,6 @@ | |||
| 24 | #include <asm/thread_info.h> | 24 | #include <asm/thread_info.h> |
| 25 | #include <asm/system.h> | 25 | #include <asm/system.h> |
| 26 | 26 | ||
| 27 | #define PROCINFO_MMUFLAGS 8 | ||
| 28 | #define PROCINFO_INITFUNC 12 | ||
| 29 | |||
| 30 | #define MACHINFO_TYPE 0 | ||
| 31 | #define MACHINFO_PHYSIO 4 | ||
| 32 | #define MACHINFO_PGOFFIO 8 | ||
| 33 | #define MACHINFO_NAME 12 | ||
| 34 | |||
| 35 | #define KERNEL_RAM_ADDR (PAGE_OFFSET + TEXT_OFFSET) | 27 | #define KERNEL_RAM_ADDR (PAGE_OFFSET + TEXT_OFFSET) |
| 36 | 28 | ||
| 37 | /* | 29 | /* |
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 1ff75cee4b0d..7df6e1aaa323 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c | |||
| @@ -264,8 +264,12 @@ void show_fpregs(struct user_fp *regs) | |||
| 264 | /* | 264 | /* |
| 265 | * Task structure and kernel stack allocation. | 265 | * Task structure and kernel stack allocation. |
| 266 | */ | 266 | */ |
| 267 | static unsigned long *thread_info_head; | 267 | struct thread_info_list { |
| 268 | static unsigned int nr_thread_info; | 268 | unsigned long *head; |
| 269 | unsigned int nr; | ||
| 270 | }; | ||
| 271 | |||
| 272 | static DEFINE_PER_CPU(struct thread_info_list, thread_info_list) = { NULL, 0 }; | ||
| 269 | 273 | ||
| 270 | #define EXTRA_TASK_STRUCT 4 | 274 | #define EXTRA_TASK_STRUCT 4 |
| 271 | 275 | ||
| @@ -274,12 +278,15 @@ struct thread_info *alloc_thread_info(struct task_struct *task) | |||
| 274 | struct thread_info *thread = NULL; | 278 | struct thread_info *thread = NULL; |
| 275 | 279 | ||
| 276 | if (EXTRA_TASK_STRUCT) { | 280 | if (EXTRA_TASK_STRUCT) { |
| 277 | unsigned long *p = thread_info_head; | 281 | struct thread_info_list *th = &get_cpu_var(thread_info_list); |
| 282 | unsigned long *p = th->head; | ||
| 278 | 283 | ||
| 279 | if (p) { | 284 | if (p) { |
| 280 | thread_info_head = (unsigned long *)p[0]; | 285 | th->head = (unsigned long *)p[0]; |
| 281 | nr_thread_info -= 1; | 286 | th->nr -= 1; |
| 282 | } | 287 | } |
| 288 | put_cpu_var(thread_info_list); | ||
| 289 | |||
| 283 | thread = (struct thread_info *)p; | 290 | thread = (struct thread_info *)p; |
| 284 | } | 291 | } |
| 285 | 292 | ||
| @@ -300,13 +307,19 @@ struct thread_info *alloc_thread_info(struct task_struct *task) | |||
| 300 | 307 | ||
| 301 | void free_thread_info(struct thread_info *thread) | 308 | void free_thread_info(struct thread_info *thread) |
| 302 | { | 309 | { |
| 303 | if (EXTRA_TASK_STRUCT && nr_thread_info < EXTRA_TASK_STRUCT) { | 310 | if (EXTRA_TASK_STRUCT) { |
| 304 | unsigned long *p = (unsigned long *)thread; | 311 | struct thread_info_list *th = &get_cpu_var(thread_info_list); |
| 305 | p[0] = (unsigned long)thread_info_head; | 312 | if (th->nr < EXTRA_TASK_STRUCT) { |
| 306 | thread_info_head = p; | 313 | unsigned long *p = (unsigned long *)thread; |
| 307 | nr_thread_info += 1; | 314 | p[0] = (unsigned long)th->head; |
| 308 | } else | 315 | th->head = p; |
| 309 | free_pages((unsigned long)thread, THREAD_SIZE_ORDER); | 316 | th->nr += 1; |
| 317 | put_cpu_var(thread_info_list); | ||
| 318 | return; | ||
| 319 | } | ||
| 320 | put_cpu_var(thread_info_list); | ||
| 321 | } | ||
| 322 | free_pages((unsigned long)thread, THREAD_SIZE_ORDER); | ||
| 310 | } | 323 | } |
| 311 | 324 | ||
| 312 | /* | 325 | /* |
diff --git a/arch/arm/lib/backtrace.S b/arch/arm/lib/backtrace.S index 3bdc8c6949c5..16153c86c3f8 100644 --- a/arch/arm/lib/backtrace.S +++ b/arch/arm/lib/backtrace.S | |||
| @@ -122,7 +122,7 @@ ENTRY(c_backtrace) | |||
| 122 | #define reg r5 | 122 | #define reg r5 |
| 123 | #define stack r6 | 123 | #define stack r6 |
| 124 | 124 | ||
| 125 | .Ldumpstm: stmfd sp!, {instr, reg, stack, r7, lr} | 125 | .Ldumpstm: stmfd sp!, {instr, reg, stack, r7, r8, lr} |
| 126 | mov stack, r0 | 126 | mov stack, r0 |
| 127 | mov instr, r1 | 127 | mov instr, r1 |
| 128 | mov reg, #9 | 128 | mov reg, #9 |
| @@ -145,7 +145,7 @@ ENTRY(c_backtrace) | |||
| 145 | adrne r0, .Lcr | 145 | adrne r0, .Lcr |
| 146 | blne printk | 146 | blne printk |
| 147 | mov r0, stack | 147 | mov r0, stack |
| 148 | LOADREGS(fd, sp!, {instr, reg, stack, r7, pc}) | 148 | LOADREGS(fd, sp!, {instr, reg, stack, r7, r8, pc}) |
| 149 | 149 | ||
| 150 | .Lfp: .asciz " r%d = %08X%c" | 150 | .Lfp: .asciz " r%d = %08X%c" |
| 151 | .Lcr: .asciz "\n" | 151 | .Lcr: .asciz "\n" |
diff --git a/arch/arm/lib/div64.S b/arch/arm/lib/div64.S index ec9a1cd6176f..58eef6607629 100644 --- a/arch/arm/lib/div64.S +++ b/arch/arm/lib/div64.S | |||
| @@ -189,12 +189,12 @@ ENTRY(__do_div64) | |||
| 189 | moveq pc, lr | 189 | moveq pc, lr |
| 190 | 190 | ||
| 191 | @ Division by 0: | 191 | @ Division by 0: |
| 192 | str lr, [sp, #-4]! | 192 | str lr, [sp, #-8]! |
| 193 | bl __div0 | 193 | bl __div0 |
| 194 | 194 | ||
| 195 | @ as wrong as it could be... | 195 | @ as wrong as it could be... |
| 196 | mov yl, #0 | 196 | mov yl, #0 |
| 197 | mov yh, #0 | 197 | mov yh, #0 |
| 198 | mov xh, #0 | 198 | mov xh, #0 |
| 199 | ldr pc, [sp], #4 | 199 | ldr pc, [sp], #8 |
| 200 | 200 | ||
diff --git a/arch/arm/mach-aaec2000/aaed2000.c b/arch/arm/mach-aaec2000/aaed2000.c index dc5fa8e5ebef..83f57da3184c 100644 --- a/arch/arm/mach-aaec2000/aaed2000.c +++ b/arch/arm/mach-aaec2000/aaed2000.c | |||
| @@ -79,7 +79,12 @@ static void __init aaed2000_init(void) | |||
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | static struct map_desc aaed2000_io_desc[] __initdata = { | 81 | static struct map_desc aaed2000_io_desc[] __initdata = { |
| 82 | { EXT_GPIO_VBASE, EXT_GPIO_PBASE, EXT_GPIO_LENGTH, MT_DEVICE }, /* Ext GPIO */ | 82 | { |
| 83 | .virtual = EXT_GPIO_VBASE, | ||
| 84 | .pfn = __phys_to_pfn(EXT_GPIO_PBASE), | ||
| 85 | .length = EXT_GPIO_LENGTH, | ||
| 86 | .type = MT_DEVICE | ||
| 87 | }, | ||
| 83 | }; | 88 | }; |
| 84 | 89 | ||
| 85 | static void __init aaed2000_map_io(void) | 90 | static void __init aaed2000_map_io(void) |
diff --git a/arch/arm/mach-aaec2000/core.c b/arch/arm/mach-aaec2000/core.c index dce4815cf53c..65be5efd633c 100644 --- a/arch/arm/mach-aaec2000/core.c +++ b/arch/arm/mach-aaec2000/core.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 21 | #include <linux/timex.h> | 21 | #include <linux/timex.h> |
| 22 | #include <linux/signal.h> | 22 | #include <linux/signal.h> |
| 23 | #include <linux/amba/bus.h> | ||
| 24 | 23 | ||
| 25 | #include <asm/hardware.h> | 24 | #include <asm/hardware.h> |
| 26 | #include <asm/irq.h> | 25 | #include <asm/irq.h> |
| @@ -50,12 +49,12 @@ | |||
| 50 | static struct map_desc standard_io_desc[] __initdata = { | 49 | static struct map_desc standard_io_desc[] __initdata = { |
| 51 | { | 50 | { |
| 52 | .virtual = VIO_APB_BASE, | 51 | .virtual = VIO_APB_BASE, |
| 53 | .physical = __phys_to_pfn(PIO_APB_BASE), | 52 | .pfn = __phys_to_pfn(PIO_APB_BASE), |
| 54 | .length = IO_APB_LENGTH, | 53 | .length = IO_APB_LENGTH, |
| 55 | .type = MT_DEVICE | 54 | .type = MT_DEVICE |
| 56 | }, { | 55 | }, { |
| 57 | .virtual = VIO_AHB_BASE, | 56 | .virtual = VIO_AHB_BASE, |
| 58 | .physical = __phys_to_pfn(PIO_AHB_BASE), | 57 | .pfn = __phys_to_pfn(PIO_AHB_BASE), |
| 59 | .length = IO_AHB_LENGTH, | 58 | .length = IO_AHB_LENGTH, |
| 60 | .type = MT_DEVICE | 59 | .type = MT_DEVICE |
| 61 | } | 60 | } |
diff --git a/arch/arm/mach-aaec2000/core.h b/arch/arm/mach-aaec2000/core.h index b6029a95f19c..59501b573167 100644 --- a/arch/arm/mach-aaec2000/core.h +++ b/arch/arm/mach-aaec2000/core.h | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/amba/bus.h> | ||
| 12 | #include <linux/amba/clcd.h> | 13 | #include <linux/amba/clcd.h> |
| 13 | 14 | ||
| 14 | struct sys_timer; | 15 | struct sys_timer; |
diff --git a/arch/arm/mach-imx/generic.c b/arch/arm/mach-imx/generic.c index 9d8331be2b58..12ea58a3b84f 100644 --- a/arch/arm/mach-imx/generic.c +++ b/arch/arm/mach-imx/generic.c | |||
| @@ -195,56 +195,6 @@ void __init imx_set_mmc_info(struct imxmmc_platform_data *info) | |||
| 195 | } | 195 | } |
| 196 | EXPORT_SYMBOL(imx_set_mmc_info); | 196 | EXPORT_SYMBOL(imx_set_mmc_info); |
| 197 | 197 | ||
| 198 | static struct resource imx_uart1_resources[] = { | ||
| 199 | [0] = { | ||
| 200 | .start = 0x00206000, | ||
| 201 | .end = 0x002060FF, | ||
| 202 | .flags = IORESOURCE_MEM, | ||
| 203 | }, | ||
| 204 | [1] = { | ||
| 205 | .start = (UART1_MINT_RX), | ||
| 206 | .end = (UART1_MINT_RX), | ||
| 207 | .flags = IORESOURCE_IRQ, | ||
| 208 | }, | ||
| 209 | [2] = { | ||
| 210 | .start = (UART1_MINT_TX), | ||
| 211 | .end = (UART1_MINT_TX), | ||
| 212 | .flags = IORESOURCE_IRQ, | ||
| 213 | }, | ||
| 214 | }; | ||
| 215 | |||
| 216 | static struct platform_device imx_uart1_device = { | ||
| 217 | .name = "imx-uart", | ||
| 218 | .id = 0, | ||
| 219 | .num_resources = ARRAY_SIZE(imx_uart1_resources), | ||
| 220 | .resource = imx_uart1_resources, | ||
| 221 | }; | ||
| 222 | |||
| 223 | static struct resource imx_uart2_resources[] = { | ||
| 224 | [0] = { | ||
| 225 | .start = 0x00207000, | ||
| 226 | .end = 0x002070FF, | ||
| 227 | .flags = IORESOURCE_MEM, | ||
| 228 | }, | ||
| 229 | [1] = { | ||
| 230 | .start = (UART2_MINT_RX), | ||
| 231 | .end = (UART2_MINT_RX), | ||
| 232 | .flags = IORESOURCE_IRQ, | ||
| 233 | }, | ||
| 234 | [2] = { | ||
| 235 | .start = (UART2_MINT_TX), | ||
| 236 | .end = (UART2_MINT_TX), | ||
| 237 | .flags = IORESOURCE_IRQ, | ||
| 238 | }, | ||
| 239 | }; | ||
| 240 | |||
| 241 | static struct platform_device imx_uart2_device = { | ||
| 242 | .name = "imx-uart", | ||
| 243 | .id = 1, | ||
| 244 | .num_resources = ARRAY_SIZE(imx_uart2_resources), | ||
| 245 | .resource = imx_uart2_resources, | ||
| 246 | }; | ||
| 247 | |||
| 248 | static struct imxfb_mach_info imx_fb_info; | 198 | static struct imxfb_mach_info imx_fb_info; |
| 249 | 199 | ||
| 250 | void __init set_imx_fb_info(struct imxfb_mach_info *hard_imx_fb_info) | 200 | void __init set_imx_fb_info(struct imxfb_mach_info *hard_imx_fb_info) |
| @@ -283,8 +233,6 @@ static struct platform_device imxfb_device = { | |||
| 283 | static struct platform_device *devices[] __initdata = { | 233 | static struct platform_device *devices[] __initdata = { |
| 284 | &imx_mmc_device, | 234 | &imx_mmc_device, |
| 285 | &imxfb_device, | 235 | &imxfb_device, |
| 286 | &imx_uart1_device, | ||
| 287 | &imx_uart2_device, | ||
| 288 | }; | 236 | }; |
| 289 | 237 | ||
| 290 | static struct map_desc imx_io_desc[] __initdata = { | 238 | static struct map_desc imx_io_desc[] __initdata = { |
diff --git a/arch/arm/mach-imx/mx1ads.c b/arch/arm/mach-imx/mx1ads.c index e34d0df90aed..da893c80d471 100644 --- a/arch/arm/mach-imx/mx1ads.c +++ b/arch/arm/mach-imx/mx1ads.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | #include <asm/mach/arch.h> | 27 | #include <asm/mach/arch.h> |
| 28 | #include <asm/arch/mmc.h> | 28 | #include <asm/arch/mmc.h> |
| 29 | #include <asm/arch/imx-uart.h> | ||
| 29 | #include <linux/interrupt.h> | 30 | #include <linux/interrupt.h> |
| 30 | #include "generic.h" | 31 | #include "generic.h" |
| 31 | 32 | ||
| @@ -48,8 +49,70 @@ static struct platform_device cs89x0_device = { | |||
| 48 | .resource = cs89x0_resources, | 49 | .resource = cs89x0_resources, |
| 49 | }; | 50 | }; |
| 50 | 51 | ||
| 52 | static struct imxuart_platform_data uart_pdata = { | ||
| 53 | .flags = IMXUART_HAVE_RTSCTS, | ||
| 54 | }; | ||
| 55 | |||
| 56 | static struct resource imx_uart1_resources[] = { | ||
| 57 | [0] = { | ||
| 58 | .start = 0x00206000, | ||
| 59 | .end = 0x002060FF, | ||
| 60 | .flags = IORESOURCE_MEM, | ||
| 61 | }, | ||
| 62 | [1] = { | ||
| 63 | .start = (UART1_MINT_RX), | ||
| 64 | .end = (UART1_MINT_RX), | ||
| 65 | .flags = IORESOURCE_IRQ, | ||
| 66 | }, | ||
| 67 | [2] = { | ||
| 68 | .start = (UART1_MINT_TX), | ||
| 69 | .end = (UART1_MINT_TX), | ||
| 70 | .flags = IORESOURCE_IRQ, | ||
| 71 | }, | ||
| 72 | }; | ||
| 73 | |||
| 74 | static struct platform_device imx_uart1_device = { | ||
| 75 | .name = "imx-uart", | ||
| 76 | .id = 0, | ||
| 77 | .num_resources = ARRAY_SIZE(imx_uart1_resources), | ||
| 78 | .resource = imx_uart1_resources, | ||
| 79 | .dev = { | ||
| 80 | .platform_data = &uart_pdata, | ||
| 81 | } | ||
| 82 | }; | ||
| 83 | |||
| 84 | static struct resource imx_uart2_resources[] = { | ||
| 85 | [0] = { | ||
| 86 | .start = 0x00207000, | ||
| 87 | .end = 0x002070FF, | ||
| 88 | .flags = IORESOURCE_MEM, | ||
| 89 | }, | ||
| 90 | [1] = { | ||
| 91 | .start = (UART2_MINT_RX), | ||
| 92 | .end = (UART2_MINT_RX), | ||
| 93 | .flags = IORESOURCE_IRQ, | ||
| 94 | }, | ||
| 95 | [2] = { | ||
| 96 | .start = (UART2_MINT_TX), | ||
| 97 | .end = (UART2_MINT_TX), | ||
| 98 | .flags = IORESOURCE_IRQ, | ||
| 99 | }, | ||
| 100 | }; | ||
| 101 | |||
| 102 | static struct platform_device imx_uart2_device = { | ||
| 103 | .name = "imx-uart", | ||
| 104 | .id = 1, | ||
| 105 | .num_resources = ARRAY_SIZE(imx_uart2_resources), | ||
| 106 | .resource = imx_uart2_resources, | ||
| 107 | .dev = { | ||
| 108 | .platform_data = &uart_pdata, | ||
| 109 | } | ||
| 110 | }; | ||
| 111 | |||
| 51 | static struct platform_device *devices[] __initdata = { | 112 | static struct platform_device *devices[] __initdata = { |
| 52 | &cs89x0_device, | 113 | &cs89x0_device, |
| 114 | &imx_uart1_device, | ||
| 115 | &imx_uart2_device, | ||
| 53 | }; | 116 | }; |
| 54 | 117 | ||
| 55 | #ifdef CONFIG_MMC_IMX | 118 | #ifdef CONFIG_MMC_IMX |
| @@ -75,6 +138,17 @@ mx1ads_init(void) | |||
| 75 | imx_gpio_mode(GPIO_PORTB | GPIO_GIUS | GPIO_IN | 20); | 138 | imx_gpio_mode(GPIO_PORTB | GPIO_GIUS | GPIO_IN | 20); |
| 76 | imx_set_mmc_info(&mx1ads_mmc_info); | 139 | imx_set_mmc_info(&mx1ads_mmc_info); |
| 77 | #endif | 140 | #endif |
| 141 | |||
| 142 | imx_gpio_mode(PC9_PF_UART1_CTS); | ||
| 143 | imx_gpio_mode(PC10_PF_UART1_RTS); | ||
| 144 | imx_gpio_mode(PC11_PF_UART1_TXD); | ||
| 145 | imx_gpio_mode(PC12_PF_UART1_RXD); | ||
| 146 | |||
| 147 | imx_gpio_mode(PB28_PF_UART2_CTS); | ||
| 148 | imx_gpio_mode(PB29_PF_UART2_RTS); | ||
| 149 | imx_gpio_mode(PB30_PF_UART2_TXD); | ||
| 150 | imx_gpio_mode(PB31_PF_UART2_RXD); | ||
| 151 | |||
| 78 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 152 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
| 79 | } | 153 | } |
| 80 | 154 | ||
| @@ -87,7 +161,7 @@ mx1ads_map_io(void) | |||
| 87 | MACHINE_START(MX1ADS, "Motorola MX1ADS") | 161 | MACHINE_START(MX1ADS, "Motorola MX1ADS") |
| 88 | /* Maintainer: Sascha Hauer, Pengutronix */ | 162 | /* Maintainer: Sascha Hauer, Pengutronix */ |
| 89 | .phys_io = 0x00200000, | 163 | .phys_io = 0x00200000, |
| 90 | .io_pg_offst = ((0xe0200000) >> 18) & 0xfffc, | 164 | .io_pg_offst = ((0xe0000000) >> 18) & 0xfffc, |
| 91 | .boot_params = 0x08000100, | 165 | .boot_params = 0x08000100, |
| 92 | .map_io = mx1ads_map_io, | 166 | .map_io = mx1ads_map_io, |
| 93 | .init_irq = imx_init_irq, | 167 | .init_irq = imx_init_irq, |
diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig index 5bf50a2a737d..2a39f9e481ad 100644 --- a/arch/arm/mach-ixp4xx/Kconfig +++ b/arch/arm/mach-ixp4xx/Kconfig | |||
| @@ -11,6 +11,7 @@ comment "IXP4xx Platforms" | |||
| 11 | config MACH_NSLU2 | 11 | config MACH_NSLU2 |
| 12 | bool | 12 | bool |
| 13 | prompt "Linksys NSLU2" | 13 | prompt "Linksys NSLU2" |
| 14 | select PCI | ||
| 14 | help | 15 | help |
| 15 | Say 'Y' here if you want your kernel to support Linksys's | 16 | Say 'Y' here if you want your kernel to support Linksys's |
| 16 | NSLU2 NAS device. For more information on this platform, | 17 | NSLU2 NAS device. For more information on this platform, |
| @@ -18,6 +19,7 @@ config MACH_NSLU2 | |||
| 18 | 19 | ||
| 19 | config ARCH_AVILA | 20 | config ARCH_AVILA |
| 20 | bool "Avila" | 21 | bool "Avila" |
| 22 | select PCI | ||
| 21 | help | 23 | help |
| 22 | Say 'Y' here if you want your kernel to support the Gateworks | 24 | Say 'Y' here if you want your kernel to support the Gateworks |
| 23 | Avila Network Platform. For more information on this platform, | 25 | Avila Network Platform. For more information on this platform, |
| @@ -25,6 +27,7 @@ config ARCH_AVILA | |||
| 25 | 27 | ||
| 26 | config ARCH_ADI_COYOTE | 28 | config ARCH_ADI_COYOTE |
| 27 | bool "Coyote" | 29 | bool "Coyote" |
| 30 | select PCI | ||
| 28 | help | 31 | help |
| 29 | Say 'Y' here if you want your kernel to support the ADI | 32 | Say 'Y' here if you want your kernel to support the ADI |
| 30 | Engineering Coyote Gateway Reference Platform. For more | 33 | Engineering Coyote Gateway Reference Platform. For more |
| @@ -32,6 +35,7 @@ config ARCH_ADI_COYOTE | |||
| 32 | 35 | ||
| 33 | config ARCH_IXDP425 | 36 | config ARCH_IXDP425 |
| 34 | bool "IXDP425" | 37 | bool "IXDP425" |
| 38 | select PCI | ||
| 35 | help | 39 | help |
| 36 | Say 'Y' here if you want your kernel to support Intel's | 40 | Say 'Y' here if you want your kernel to support Intel's |
| 37 | IXDP425 Development Platform (Also known as Richfield). | 41 | IXDP425 Development Platform (Also known as Richfield). |
| @@ -39,6 +43,7 @@ config ARCH_IXDP425 | |||
| 39 | 43 | ||
| 40 | config MACH_IXDPG425 | 44 | config MACH_IXDPG425 |
| 41 | bool "IXDPG425" | 45 | bool "IXDPG425" |
| 46 | select PCI | ||
| 42 | help | 47 | help |
| 43 | Say 'Y' here if you want your kernel to support Intel's | 48 | Say 'Y' here if you want your kernel to support Intel's |
| 44 | IXDPG425 Development Platform (Also known as Montajade). | 49 | IXDPG425 Development Platform (Also known as Montajade). |
| @@ -46,6 +51,7 @@ config MACH_IXDPG425 | |||
| 46 | 51 | ||
| 47 | config MACH_IXDP465 | 52 | config MACH_IXDP465 |
| 48 | bool "IXDP465" | 53 | bool "IXDP465" |
| 54 | select PCI | ||
| 49 | help | 55 | help |
| 50 | Say 'Y' here if you want your kernel to support Intel's | 56 | Say 'Y' here if you want your kernel to support Intel's |
| 51 | IXDP465 Development Platform (Also known as BMP). | 57 | IXDP465 Development Platform (Also known as BMP). |
| @@ -72,6 +78,7 @@ config ARCH_PRPMC1100 | |||
| 72 | config MACH_NAS100D | 78 | config MACH_NAS100D |
| 73 | bool | 79 | bool |
| 74 | prompt "NAS100D" | 80 | prompt "NAS100D" |
| 81 | select PCI | ||
| 75 | help | 82 | help |
| 76 | Say 'Y' here if you want your kernel to support Iomega's | 83 | Say 'Y' here if you want your kernel to support Iomega's |
| 77 | NAS 100d device. For more information on this platform, | 84 | NAS 100d device. For more information on this platform, |
| @@ -96,6 +103,7 @@ config CPU_IXP46X | |||
| 96 | config MACH_GTWX5715 | 103 | config MACH_GTWX5715 |
| 97 | bool "Gemtek WX5715 (Linksys WRV54G)" | 104 | bool "Gemtek WX5715 (Linksys WRV54G)" |
| 98 | depends on ARCH_IXP4XX | 105 | depends on ARCH_IXP4XX |
| 106 | select PCI | ||
| 99 | help | 107 | help |
| 100 | This board is currently inside the Linksys WRV54G Gateways. | 108 | This board is currently inside the Linksys WRV54G Gateways. |
| 101 | 109 | ||
| @@ -110,11 +118,16 @@ config MACH_GTWX5715 | |||
| 110 | "High Speed" UART is n/c (as far as I can tell) | 118 | "High Speed" UART is n/c (as far as I can tell) |
| 111 | 20 Pin ARM/Xscale JTAG interface on J2 | 119 | 20 Pin ARM/Xscale JTAG interface on J2 |
| 112 | 120 | ||
| 113 | |||
| 114 | comment "IXP4xx Options" | 121 | comment "IXP4xx Options" |
| 115 | 122 | ||
| 123 | config DMABOUNCE | ||
| 124 | bool | ||
| 125 | default y | ||
| 126 | depends on PCI | ||
| 127 | |||
| 116 | config IXP4XX_INDIRECT_PCI | 128 | config IXP4XX_INDIRECT_PCI |
| 117 | bool "Use indirect PCI memory access" | 129 | bool "Use indirect PCI memory access" |
| 130 | depends on PCI | ||
| 118 | help | 131 | help |
| 119 | IXP4xx provides two methods of accessing PCI memory space: | 132 | IXP4xx provides two methods of accessing PCI memory space: |
| 120 | 133 | ||
diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile index 0471044fa179..5a4aaa0e0a09 100644 --- a/arch/arm/mach-ixp4xx/Makefile +++ b/arch/arm/mach-ixp4xx/Makefile | |||
| @@ -2,8 +2,9 @@ | |||
| 2 | # Makefile for the linux kernel. | 2 | # Makefile for the linux kernel. |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-y += common.o common-pci.o | 5 | obj-y += common.o |
| 6 | 6 | ||
| 7 | obj-$(CONFIG_PCI) += common-pci.o | ||
| 7 | obj-$(CONFIG_ARCH_IXDP4XX) += ixdp425-pci.o ixdp425-setup.o | 8 | obj-$(CONFIG_ARCH_IXDP4XX) += ixdp425-pci.o ixdp425-setup.o |
| 8 | obj-$(CONFIG_MACH_IXDPG425) += ixdpg425-pci.o coyote-setup.o | 9 | obj-$(CONFIG_MACH_IXDPG425) += ixdpg425-pci.o coyote-setup.o |
| 9 | obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-pci.o coyote-setup.o | 10 | obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-pci.o coyote-setup.o |
diff --git a/arch/arm/mach-pxa/dma.c b/arch/arm/mach-pxa/dma.c index 458112b21e25..7d8c85486c66 100644 --- a/arch/arm/mach-pxa/dma.c +++ b/arch/arm/mach-pxa/dma.c | |||
| @@ -45,23 +45,16 @@ int pxa_request_dma (char *name, pxa_dma_prio prio, | |||
| 45 | 45 | ||
| 46 | local_irq_save(flags); | 46 | local_irq_save(flags); |
| 47 | 47 | ||
| 48 | /* try grabbing a DMA channel with the requested priority */ | 48 | do { |
| 49 | for (i = prio; i < prio + PXA_DMA_NBCH(prio); i++) { | 49 | /* try grabbing a DMA channel with the requested priority */ |
| 50 | if (!dma_channels[i].name) { | 50 | pxa_for_each_dma_prio (i, prio) { |
| 51 | found = 1; | ||
| 52 | break; | ||
| 53 | } | ||
| 54 | } | ||
| 55 | |||
| 56 | if (!found) { | ||
| 57 | /* requested prio group is full, try hier priorities */ | ||
| 58 | for (i = prio-1; i >= 0; i--) { | ||
| 59 | if (!dma_channels[i].name) { | 51 | if (!dma_channels[i].name) { |
| 60 | found = 1; | 52 | found = 1; |
| 61 | break; | 53 | break; |
| 62 | } | 54 | } |
| 63 | } | 55 | } |
| 64 | } | 56 | /* if requested prio group is full, try a hier priority */ |
| 57 | } while (!found && prio--); | ||
| 65 | 58 | ||
| 66 | if (found) { | 59 | if (found) { |
| 67 | DCSR(i) = DCSR_STARTINTR|DCSR_ENDINTR|DCSR_BUSERR; | 60 | DCSR(i) = DCSR_STARTINTR|DCSR_ENDINTR|DCSR_BUSERR; |
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c index 98356f810007..02e188d98e7d 100644 --- a/arch/arm/mach-pxa/mainstone.c +++ b/arch/arm/mach-pxa/mainstone.c | |||
| @@ -95,7 +95,10 @@ static void __init mainstone_init_irq(void) | |||
| 95 | for(irq = MAINSTONE_IRQ(0); irq <= MAINSTONE_IRQ(15); irq++) { | 95 | for(irq = MAINSTONE_IRQ(0); irq <= MAINSTONE_IRQ(15); irq++) { |
| 96 | set_irq_chip(irq, &mainstone_irq_chip); | 96 | set_irq_chip(irq, &mainstone_irq_chip); |
| 97 | set_irq_handler(irq, do_level_IRQ); | 97 | set_irq_handler(irq, do_level_IRQ); |
| 98 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); | 98 | if (irq == MAINSTONE_IRQ(10) || irq == MAINSTONE_IRQ(14)) |
| 99 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE | IRQF_NOAUTOEN); | ||
| 100 | else | ||
| 101 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); | ||
| 99 | } | 102 | } |
| 100 | set_irq_flags(MAINSTONE_IRQ(8), 0); | 103 | set_irq_flags(MAINSTONE_IRQ(8), 0); |
| 101 | set_irq_flags(MAINSTONE_IRQ(12), 0); | 104 | set_irq_flags(MAINSTONE_IRQ(12), 0); |
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c index d4a586e38d5b..693fb1e396e0 100644 --- a/arch/arm/mach-realview/realview_eb.c +++ b/arch/arm/mach-realview/realview_eb.c | |||
| @@ -137,8 +137,11 @@ static struct amba_device *amba_devs[] __initdata = { | |||
| 137 | static void __init gic_init_irq(void) | 137 | static void __init gic_init_irq(void) |
| 138 | { | 138 | { |
| 139 | #ifdef CONFIG_REALVIEW_MPCORE | 139 | #ifdef CONFIG_REALVIEW_MPCORE |
| 140 | unsigned int pldctrl; | ||
| 140 | writel(0x0000a05f, __io_address(REALVIEW_SYS_LOCK)); | 141 | writel(0x0000a05f, __io_address(REALVIEW_SYS_LOCK)); |
| 141 | writel(0x008003c0, __io_address(REALVIEW_SYS_BASE) + 0xd8); | 142 | pldctrl = readl(__io_address(REALVIEW_SYS_BASE) + 0xd8); |
| 143 | pldctrl |= 0x00800000; /* New irq mode */ | ||
| 144 | writel(pldctrl, __io_address(REALVIEW_SYS_BASE) + 0xd8); | ||
| 142 | writel(0x00000000, __io_address(REALVIEW_SYS_LOCK)); | 145 | writel(0x00000000, __io_address(REALVIEW_SYS_LOCK)); |
| 143 | #endif | 146 | #endif |
| 144 | gic_dist_init(__io_address(REALVIEW_GIC_DIST_BASE)); | 147 | gic_dist_init(__io_address(REALVIEW_GIC_DIST_BASE)); |
diff --git a/arch/arm/mach-s3c2410/sleep.S b/arch/arm/mach-s3c2410/sleep.S index 832fb86a03b4..73de2eaca22a 100644 --- a/arch/arm/mach-s3c2410/sleep.S +++ b/arch/arm/mach-s3c2410/sleep.S | |||
| @@ -59,8 +59,7 @@ ENTRY(s3c2410_cpu_suspend) | |||
| 59 | mrc p15, 0, r5, c13, c0, 0 @ PID | 59 | mrc p15, 0, r5, c13, c0, 0 @ PID |
| 60 | mrc p15, 0, r6, c3, c0, 0 @ Domain ID | 60 | mrc p15, 0, r6, c3, c0, 0 @ Domain ID |
| 61 | mrc p15, 0, r7, c2, c0, 0 @ translation table base address | 61 | mrc p15, 0, r7, c2, c0, 0 @ translation table base address |
| 62 | mrc p15, 0, r8, c2, c0, 0 @ auxiliary control register | 62 | mrc p15, 0, r8, c1, c0, 0 @ control register |
| 63 | mrc p15, 0, r9, c1, c0, 0 @ control register | ||
| 64 | 63 | ||
| 65 | stmia r0, { r4 - r13 } | 64 | stmia r0, { r4 - r13 } |
| 66 | 65 | ||
| @@ -165,7 +164,6 @@ ENTRY(s3c2410_cpu_resume) | |||
| 165 | mcr p15, 0, r5, c13, c0, 0 @ PID | 164 | mcr p15, 0, r5, c13, c0, 0 @ PID |
| 166 | mcr p15, 0, r6, c3, c0, 0 @ Domain ID | 165 | mcr p15, 0, r6, c3, c0, 0 @ Domain ID |
| 167 | mcr p15, 0, r7, c2, c0, 0 @ translation table base | 166 | mcr p15, 0, r7, c2, c0, 0 @ translation table base |
| 168 | mcr p15, 0, r8, c1, c1, 0 @ auxilliary control | ||
| 169 | 167 | ||
| 170 | #ifdef CONFIG_DEBUG_RESUME | 168 | #ifdef CONFIG_DEBUG_RESUME |
| 171 | mov r3, #'R' | 169 | mov r3, #'R' |
| @@ -173,7 +171,7 @@ ENTRY(s3c2410_cpu_resume) | |||
| 173 | #endif | 171 | #endif |
| 174 | 172 | ||
| 175 | ldr r2, =resume_with_mmu | 173 | ldr r2, =resume_with_mmu |
| 176 | mcr p15, 0, r9, c1, c0, 0 @ turn on MMU, etc | 174 | mcr p15, 0, r8, c1, c0, 0 @ turn on MMU, etc |
| 177 | nop @ second-to-last before mmu | 175 | nop @ second-to-last before mmu |
| 178 | mov pc, r2 @ go back to virtual address | 176 | mov pc, r2 @ go back to virtual address |
| 179 | 177 | ||
diff --git a/arch/arm/mach-sa1100/irq.c b/arch/arm/mach-sa1100/irq.c index c131a5201b5b..b3a56024182e 100644 --- a/arch/arm/mach-sa1100/irq.c +++ b/arch/arm/mach-sa1100/irq.c | |||
| @@ -199,10 +199,26 @@ static void sa1100_unmask_irq(unsigned int irq) | |||
| 199 | ICMR |= (1 << irq); | 199 | ICMR |= (1 << irq); |
| 200 | } | 200 | } |
| 201 | 201 | ||
| 202 | /* | ||
| 203 | * Apart form GPIOs, only the RTC alarm can be a wakeup event. | ||
| 204 | */ | ||
| 205 | static int sa1100_set_wake(unsigned int irq, unsigned int on) | ||
| 206 | { | ||
| 207 | if (irq == IRQ_RTCAlrm) { | ||
| 208 | if (on) | ||
| 209 | PWER |= PWER_RTC; | ||
| 210 | else | ||
| 211 | PWER &= ~PWER_RTC; | ||
| 212 | return 0; | ||
| 213 | } | ||
| 214 | return -EINVAL; | ||
| 215 | } | ||
| 216 | |||
| 202 | static struct irqchip sa1100_normal_chip = { | 217 | static struct irqchip sa1100_normal_chip = { |
| 203 | .ack = sa1100_mask_irq, | 218 | .ack = sa1100_mask_irq, |
| 204 | .mask = sa1100_mask_irq, | 219 | .mask = sa1100_mask_irq, |
| 205 | .unmask = sa1100_unmask_irq, | 220 | .unmask = sa1100_unmask_irq, |
| 221 | .set_wake = sa1100_set_wake, | ||
| 206 | }; | 222 | }; |
| 207 | 223 | ||
| 208 | static struct resource irq_resource = { | 224 | static struct resource irq_resource = { |
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index 25e0ca3e598c..c1f7180c7bed 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c | |||
| @@ -141,7 +141,7 @@ __ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size, | |||
| 141 | return NULL; | 141 | return NULL; |
| 142 | addr = (unsigned long)area->addr; | 142 | addr = (unsigned long)area->addr; |
| 143 | if (remap_area_pages(addr, pfn, size, flags)) { | 143 | if (remap_area_pages(addr, pfn, size, flags)) { |
| 144 | vfree((void *)addr); | 144 | vunmap((void *)addr); |
| 145 | return NULL; | 145 | return NULL; |
| 146 | } | 146 | } |
| 147 | return (void __iomem *) (offset + (char *)addr); | 147 | return (void __iomem *) (offset + (char *)addr); |
| @@ -173,7 +173,7 @@ EXPORT_SYMBOL(__ioremap); | |||
| 173 | 173 | ||
| 174 | void __iounmap(void __iomem *addr) | 174 | void __iounmap(void __iomem *addr) |
| 175 | { | 175 | { |
| 176 | vfree((void *) (PAGE_MASK & (unsigned long) addr)); | 176 | vunmap((void *)(PAGE_MASK & (unsigned long)addr)); |
| 177 | } | 177 | } |
| 178 | EXPORT_SYMBOL(__iounmap); | 178 | EXPORT_SYMBOL(__iounmap); |
| 179 | 179 | ||
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types index 8ab5300dcb94..6d7de9c0412f 100644 --- a/arch/arm/tools/mach-types +++ b/arch/arm/tools/mach-types | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | # | 12 | # |
| 13 | # http://www.arm.linux.org.uk/developer/machines/?action=new | 13 | # http://www.arm.linux.org.uk/developer/machines/?action=new |
| 14 | # | 14 | # |
| 15 | # Last update: Mon Feb 20 10:18:02 2006 | 15 | # Last update: Mon May 8 20:11:05 2006 |
| 16 | # | 16 | # |
| 17 | # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number | 17 | # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number |
| 18 | # | 18 | # |
| @@ -566,8 +566,8 @@ switchgrass MACH_SWITCHGRASS SWITCHGRASS 549 | |||
| 566 | ens_cmu MACH_ENS_CMU ENS_CMU 550 | 566 | ens_cmu MACH_ENS_CMU ENS_CMU 550 |
| 567 | mm6_sdb MACH_MM6_SDB MM6_SDB 551 | 567 | mm6_sdb MACH_MM6_SDB MM6_SDB 551 |
| 568 | saturn MACH_SATURN SATURN 552 | 568 | saturn MACH_SATURN SATURN 552 |
| 569 | argonplusevb MACH_ARGONPLUSEVB ARGONPLUSEVB 553 | 569 | i30030evb MACH_ARGONPLUSEVB ARGONPLUSEVB 553 |
| 570 | scma11evb MACH_SCMA11EVB SCMA11EVB 554 | 570 | mxc27530evb MACH_SCMA11EVB SCMA11EVB 554 |
| 571 | smdk2800 MACH_SMDK2800 SMDK2800 555 | 571 | smdk2800 MACH_SMDK2800 SMDK2800 555 |
| 572 | mtwilson MACH_MTWILSON MTWILSON 556 | 572 | mtwilson MACH_MTWILSON MTWILSON 556 |
| 573 | ziti MACH_ZITI ZITI 557 | 573 | ziti MACH_ZITI ZITI 557 |
| @@ -647,7 +647,7 @@ sendt MACH_SENDT SENDT 630 | |||
| 647 | mx2jazz MACH_MX2JAZZ MX2JAZZ 631 | 647 | mx2jazz MACH_MX2JAZZ MX2JAZZ 631 |
| 648 | multiio MACH_MULTIIO MULTIIO 632 | 648 | multiio MACH_MULTIIO MULTIIO 632 |
| 649 | hrdisplay MACH_HRDISPLAY HRDISPLAY 633 | 649 | hrdisplay MACH_HRDISPLAY HRDISPLAY 633 |
| 650 | scma11bb MACH_SCMA11BB SCMA11BB 634 | 650 | mxc27530ads MACH_SCMA11BB SCMA11BB 634 |
| 651 | trizeps3 MACH_TRIZEPS3 TRIZEPS3 635 | 651 | trizeps3 MACH_TRIZEPS3 TRIZEPS3 635 |
| 652 | zefeerdza MACH_ZEFEERDZA ZEFEERDZA 636 | 652 | zefeerdza MACH_ZEFEERDZA ZEFEERDZA 636 |
| 653 | zefeerdzb MACH_ZEFEERDZB ZEFEERDZB 637 | 653 | zefeerdzb MACH_ZEFEERDZB ZEFEERDZB 637 |
| @@ -721,7 +721,7 @@ gp32 MACH_GP32 GP32 706 | |||
| 721 | gem MACH_GEM GEM 707 | 721 | gem MACH_GEM GEM 707 |
| 722 | i858 MACH_I858 I858 708 | 722 | i858 MACH_I858 I858 708 |
| 723 | hx2750 MACH_HX2750 HX2750 709 | 723 | hx2750 MACH_HX2750 HX2750 709 |
| 724 | zeusevb MACH_ZEUSEVB ZEUSEVB 710 | 724 | mxc91131evb MACH_ZEUSEVB ZEUSEVB 710 |
| 725 | p700 MACH_P700 P700 711 | 725 | p700 MACH_P700 P700 711 |
| 726 | cpe MACH_CPE CPE 712 | 726 | cpe MACH_CPE CPE 712 |
| 727 | spitz MACH_SPITZ SPITZ 713 | 727 | spitz MACH_SPITZ SPITZ 713 |
| @@ -802,7 +802,7 @@ cpuat91 MACH_CPUAT91 CPUAT91 787 | |||
| 802 | rea9200 MACH_REA9200 REA9200 788 | 802 | rea9200 MACH_REA9200 REA9200 788 |
| 803 | acts_pune_sa1110 MACH_ACTS_PUNE_SA1110 ACTS_PUNE_SA1110 789 | 803 | acts_pune_sa1110 MACH_ACTS_PUNE_SA1110 ACTS_PUNE_SA1110 789 |
| 804 | ixp425 MACH_IXP425 IXP425 790 | 804 | ixp425 MACH_IXP425 IXP425 790 |
| 805 | argonplusodyssey MACH_ARGONPLUSODYSSEY ARGONPLUSODYSSEY 791 | 805 | i30030ads MACH_ARGONPLUSODYSSEY ARGONPLUSODYSSEY 791 |
| 806 | perch MACH_PERCH PERCH 792 | 806 | perch MACH_PERCH PERCH 792 |
| 807 | eis05r1 MACH_EIS05R1 EIS05R1 793 | 807 | eis05r1 MACH_EIS05R1 EIS05R1 793 |
| 808 | pepperpad MACH_PEPPERPAD PEPPERPAD 794 | 808 | pepperpad MACH_PEPPERPAD PEPPERPAD 794 |
| @@ -827,7 +827,7 @@ micro9l MACH_MICRO9L MICRO9L 812 | |||
| 827 | uc5471dsp MACH_UC5471DSP UC5471DSP 813 | 827 | uc5471dsp MACH_UC5471DSP UC5471DSP 813 |
| 828 | sj5471eng MACH_SJ5471ENG SJ5471ENG 814 | 828 | sj5471eng MACH_SJ5471ENG SJ5471ENG 814 |
| 829 | none MACH_CMPXA26X CMPXA26X 815 | 829 | none MACH_CMPXA26X CMPXA26X 815 |
| 830 | nc MACH_NC NC 816 | 830 | nc1 MACH_NC NC 816 |
| 831 | omap_palmte MACH_OMAP_PALMTE OMAP_PALMTE 817 | 831 | omap_palmte MACH_OMAP_PALMTE OMAP_PALMTE 817 |
| 832 | ajax52x MACH_AJAX52X AJAX52X 818 | 832 | ajax52x MACH_AJAX52X AJAX52X 818 |
| 833 | siriustar MACH_SIRIUSTAR SIRIUSTAR 819 | 833 | siriustar MACH_SIRIUSTAR SIRIUSTAR 819 |
| @@ -930,7 +930,7 @@ netclient MACH_NETCLIENT NETCLIENT 916 | |||
| 930 | xscale_palmtt5 MACH_XSCALE_PALMTT5 XSCALE_PALMTT5 917 | 930 | xscale_palmtt5 MACH_XSCALE_PALMTT5 XSCALE_PALMTT5 917 |
| 931 | xscale_palmtc MACH_OMAP_PALMTC OMAP_PALMTC 918 | 931 | xscale_palmtc MACH_OMAP_PALMTC OMAP_PALMTC 918 |
| 932 | omap_apollon MACH_OMAP_APOLLON OMAP_APOLLON 919 | 932 | omap_apollon MACH_OMAP_APOLLON OMAP_APOLLON 919 |
| 933 | argonlvevb MACH_ARGONLVEVB ARGONLVEVB 920 | 933 | mxc30030evb MACH_ARGONLVEVB ARGONLVEVB 920 |
| 934 | rea_2d MACH_REA_2D REA_2D 921 | 934 | rea_2d MACH_REA_2D REA_2D 921 |
| 935 | eti3e524 MACH_TI3E524 TI3E524 922 | 935 | eti3e524 MACH_TI3E524 TI3E524 922 |
| 936 | ateb9200 MACH_ATEB9200 ATEB9200 923 | 936 | ateb9200 MACH_ATEB9200 ATEB9200 923 |
| @@ -965,7 +965,78 @@ sisteron MACH_SISTERON SISTERON 951 | |||
| 965 | rx1950 MACH_RX1950 RX1950 952 | 965 | rx1950 MACH_RX1950 RX1950 952 |
| 966 | tsc_venus MACH_TSC_VENUS TSC_VENUS 953 | 966 | tsc_venus MACH_TSC_VENUS TSC_VENUS 953 |
| 967 | ds101j MACH_DS101J DS101J 954 | 967 | ds101j MACH_DS101J DS101J 954 |
| 968 | mxc300_30ads MACH_MXC30030ADS MXC30030ADS 955 | 968 | mxc30030ads MACH_MXC30030ADS MXC30030ADS 955 |
| 969 | fujitsu_wimaxsoc MACH_FUJITSU_WIMAXSOC FUJITSU_WIMAXSOC 956 | 969 | fujitsu_wimaxsoc MACH_FUJITSU_WIMAXSOC FUJITSU_WIMAXSOC 956 |
| 970 | dualpcmodem MACH_DUALPCMODEM DUALPCMODEM 957 | 970 | dualpcmodem MACH_DUALPCMODEM DUALPCMODEM 957 |
| 971 | gesbc9312 MACH_GESBC9312 GESBC9312 958 | 971 | gesbc9312 MACH_GESBC9312 GESBC9312 958 |
| 972 | htcapache MACH_HTCAPACHE HTCAPACHE 959 | ||
| 973 | ixdp435 MACH_IXDP435 IXDP435 960 | ||
| 974 | catprovt100 MACH_CATPROVT100 CATPROVT100 961 | ||
| 975 | picotux1xx MACH_PICOTUX1XX PICOTUX1XX 962 | ||
| 976 | picotux2xx MACH_PICOTUX2XX PICOTUX2XX 963 | ||
| 977 | dsmg600 MACH_DSMG600 DSMG600 964 | ||
| 978 | empc2 MACH_EMPC2 EMPC2 965 | ||
| 979 | ventura MACH_VENTURA VENTURA 966 | ||
| 980 | phidget_sbc MACH_PHIDGET_SBC PHIDGET_SBC 967 | ||
| 981 | ij3k MACH_IJ3K IJ3K 968 | ||
| 982 | pisgah MACH_PISGAH PISGAH 969 | ||
| 983 | omap_fsample MACH_OMAP_FSAMPLE OMAP_FSAMPLE 970 | ||
| 984 | sg720 MACH_SG720 SG720 971 | ||
| 985 | redfox MACH_REDFOX REDFOX 972 | ||
| 986 | mysh_ep9315_1 MACH_MYSH_EP9315_1 MYSH_EP9315_1 973 | ||
| 987 | tpf106 MACH_TPF106 TPF106 974 | ||
| 988 | at91rm9200kg MACH_AT91RM9200KG AT91RM9200KG 975 | ||
| 989 | racemt2 MACH_SLEDB SLEDB 976 | ||
| 990 | ontrack MACH_ONTRACK ONTRACK 977 | ||
| 991 | pm1200 MACH_PM1200 PM1200 978 | ||
| 992 | ess24562 MACH_ESS24XXX ESS24XXX 979 | ||
| 993 | coremp7 MACH_COREMP7 COREMP7 980 | ||
| 994 | nexcoder_6446 MACH_NEXCODER_6446 NEXCODER_6446 981 | ||
| 995 | stvc8380 MACH_STVC8380 STVC8380 982 | ||
| 996 | teklynx MACH_TEKLYNX TEKLYNX 983 | ||
| 997 | carbonado MACH_CARBONADO CARBONADO 984 | ||
| 998 | sysmos_mp730 MACH_SYSMOS_MP730 SYSMOS_MP730 985 | ||
| 999 | snapper_cl15 MACH_SNAPPER_CL15 SNAPPER_CL15 986 | ||
| 1000 | pgigim MACH_PGIGIM PGIGIM 987 | ||
| 1001 | ptx9160p2 MACH_PTX9160P2 PTX9160P2 988 | ||
| 1002 | dcore1 MACH_DCORE1 DCORE1 989 | ||
| 1003 | victorpxa MACH_VICTORPXA VICTORPXA 990 | ||
| 1004 | mx2dtb MACH_MX2DTB MX2DTB 991 | ||
| 1005 | pxa_irex_er0100 MACH_PXA_IREX_ER0100 PXA_IREX_ER0100 992 | ||
| 1006 | omap_palmz71 MACH_OMAP_PALMZ71 OMAP_PALMZ71 993 | ||
| 1007 | bartec_deg MACH_BARTEC_DEG BARTEC_DEG 994 | ||
| 1008 | hw50251 MACH_HW50251 HW50251 995 | ||
| 1009 | ibox MACH_IBOX IBOX 996 | ||
| 1010 | atlaslh7a404 MACH_ATLASLH7A404 ATLASLH7A404 997 | ||
| 1011 | pt2026 MACH_PT2026 PT2026 998 | ||
| 1012 | htcalpine MACH_HTCALPINE HTCALPINE 999 | ||
| 1013 | bartec_vtu MACH_BARTEC_VTU BARTEC_VTU 1000 | ||
| 1014 | vcoreii MACH_VCOREII VCOREII 1001 | ||
| 1015 | pdnb3 MACH_PDNB3 PDNB3 1002 | ||
| 1016 | htcbeetles MACH_HTCBEETLES HTCBEETLES 1003 | ||
| 1017 | s3c6400 MACH_S3C6400 S3C6400 1004 | ||
| 1018 | s3c2443 MACH_S3C2443 S3C2443 1005 | ||
| 1019 | omap_ldk MACH_OMAP_LDK OMAP_LDK 1006 | ||
| 1020 | smdk2460 MACH_SMDK2460 SMDK2460 1007 | ||
| 1021 | smdk2440 MACH_SMDK2440 SMDK2440 1008 | ||
| 1022 | smdk2412 MACH_SMDK2412 SMDK2412 1009 | ||
| 1023 | webbox MACH_WEBBOX WEBBOX 1010 | ||
| 1024 | cwwndp MACH_CWWNDP CWWNDP 1011 | ||
| 1025 | dragon MACH_DRAGON DRAGON 1012 | ||
| 1026 | opendo_cpu_board MACH_OPENDO_CPU_BOARD OPENDO_CPU_BOARD 1013 | ||
| 1027 | ccm2200 MACH_CCM2200 CCM2200 1014 | ||
| 1028 | etwarm MACH_ETWARM ETWARM 1015 | ||
| 1029 | m93030 MACH_M93030 M93030 1016 | ||
| 1030 | cc7u MACH_CC7U CC7U 1017 | ||
| 1031 | mtt_ranger MACH_MTT_RANGER MTT_RANGER 1018 | ||
| 1032 | nexus MACH_NEXUS NEXUS 1019 | ||
| 1033 | desman MACH_DESMAN DESMAN 1020 | ||
| 1034 | bkde303 MACH_BKDE303 BKDE303 1021 | ||
| 1035 | smdk2413 MACH_SMDK2413 SMDK2413 1022 | ||
| 1036 | aml_m7200 MACH_AML_M7200 AML_M7200 1023 | ||
| 1037 | aml_m5900 MACH_AML_M5900 AML_M5900 1024 | ||
| 1038 | sg640 MACH_SG640 SG640 1025 | ||
| 1039 | edg79524 MACH_EDG79524 EDG79524 1026 | ||
| 1040 | ai2410 MACH_AI2410 AI2410 1027 | ||
| 1041 | ixp465 MACH_IXP465 IXP465 1028 | ||
| 1042 | balloon3 MACH_BALLOON3 BALLOON3 1029 | ||
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index 37ff8145b5b5..03486be04193 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c | |||
| @@ -245,7 +245,7 @@ void VFP9_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs) | |||
| 245 | */ | 245 | */ |
| 246 | barrier(); | 246 | barrier(); |
| 247 | trigger = fmrx(FPINST2); | 247 | trigger = fmrx(FPINST2); |
| 248 | fpscr = fmrx(FPSCR); | 248 | orig_fpscr = fpscr = fmrx(FPSCR); |
| 249 | 249 | ||
| 250 | emulate: | 250 | emulate: |
| 251 | exceptions = vfp_emulate_instruction(trigger, fpscr, regs); | 251 | exceptions = vfp_emulate_instruction(trigger, fpscr, regs); |
