Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] m68knommu: update m68knommu defconfnig

Updated defconfig for m68knommu arch. Includes recent changes to the clock
and RAM configuration options.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Greg Ungerer and committed by
Linus Torvalds
67bdd984 9a6404b4

+133 -74
+133 -74
arch/m68knommu/defconfig
··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.13-uc0 4 - # Wed Aug 31 15:03:26 2005 3 + # Linux kernel version: 2.6.17 4 + # Tue Jun 27 12:57:06 2006 5 5 # 6 - CONFIG_M68KNOMMU=y 6 + CONFIG_M68K=y 7 7 # CONFIG_MMU is not set 8 8 # CONFIG_FPU is not set 9 - CONFIG_UID16=y 10 9 CONFIG_RWSEM_GENERIC_SPINLOCK=y 11 10 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set 11 + CONFIG_GENERIC_FIND_NEXT_BIT=y 12 + CONFIG_GENERIC_HWEIGHT=y 12 13 CONFIG_GENERIC_CALIBRATE_DELAY=y 14 + CONFIG_TIME_LOW_RES=y 13 15 14 16 # 15 17 # Code maturity level options 16 18 # 17 19 CONFIG_EXPERIMENTAL=y 18 - CONFIG_CLEAN_COMPILE=y 19 20 CONFIG_BROKEN_ON_SMP=y 20 21 CONFIG_INIT_ENV_ARG_LIMIT=32 21 22 ··· 24 23 # General setup 25 24 # 26 25 CONFIG_LOCALVERSION="" 26 + CONFIG_LOCALVERSION_AUTO=y 27 + # CONFIG_SYSVIPC is not set 27 28 # CONFIG_POSIX_MQUEUE is not set 28 29 # CONFIG_BSD_PROCESS_ACCT is not set 29 30 # CONFIG_SYSCTL is not set 30 31 # CONFIG_AUDIT is not set 31 - # CONFIG_HOTPLUG is not set 32 - # CONFIG_KOBJECT_UEVENT is not set 33 32 # CONFIG_IKCONFIG is not set 33 + # CONFIG_RELAY is not set 34 + CONFIG_INITRAMFS_SOURCE="" 35 + CONFIG_UID16=y 36 + # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 34 37 CONFIG_EMBEDDED=y 35 38 # CONFIG_KALLSYMS is not set 39 + # CONFIG_HOTPLUG is not set 36 40 CONFIG_PRINTK=y 37 41 CONFIG_BUG=y 42 + CONFIG_ELF_CORE=y 38 43 CONFIG_BASE_FULL=y 39 44 # CONFIG_FUTEX is not set 40 45 # CONFIG_EPOLL is not set 41 - # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 42 - CONFIG_CC_ALIGN_FUNCTIONS=0 43 - CONFIG_CC_ALIGN_LABELS=0 44 - CONFIG_CC_ALIGN_LOOPS=0 45 - CONFIG_CC_ALIGN_JUMPS=0 46 + CONFIG_SLAB=y 47 + CONFIG_TINY_SHMEM=y 46 48 CONFIG_BASE_SMALL=0 49 + # CONFIG_SLOB is not set 47 50 48 51 # 49 52 # Loadable module support 50 53 # 51 54 # CONFIG_MODULES is not set 55 + 56 + # 57 + # Block layer 58 + # 59 + # CONFIG_BLK_DEV_IO_TRACE is not set 60 + 61 + # 62 + # IO Schedulers 63 + # 64 + CONFIG_IOSCHED_NOOP=y 65 + # CONFIG_IOSCHED_AS is not set 66 + # CONFIG_IOSCHED_DEADLINE is not set 67 + # CONFIG_IOSCHED_CFQ is not set 68 + # CONFIG_DEFAULT_AS is not set 69 + # CONFIG_DEFAULT_DEADLINE is not set 70 + # CONFIG_DEFAULT_CFQ is not set 71 + CONFIG_DEFAULT_NOOP=y 72 + CONFIG_DEFAULT_IOSCHED="noop" 52 73 53 74 # 54 75 # Processor type and features ··· 81 58 # CONFIG_M68360 is not set 82 59 # CONFIG_M5206 is not set 83 60 # CONFIG_M5206e is not set 61 + # CONFIG_M520x is not set 84 62 # CONFIG_M523x is not set 85 63 # CONFIG_M5249 is not set 86 64 # CONFIG_M5271 is not set ··· 89 65 # CONFIG_M5275 is not set 90 66 # CONFIG_M528x is not set 91 67 # CONFIG_M5307 is not set 68 + # CONFIG_M532x is not set 92 69 # CONFIG_M5407 is not set 93 70 CONFIG_COLDFIRE=y 94 - # CONFIG_CLOCK_AUTO is not set 95 - # CONFIG_CLOCK_11MHz is not set 96 - # CONFIG_CLOCK_16MHz is not set 97 - # CONFIG_CLOCK_20MHz is not set 98 - # CONFIG_CLOCK_24MHz is not set 99 - # CONFIG_CLOCK_25MHz is not set 100 - # CONFIG_CLOCK_33MHz is not set 101 - # CONFIG_CLOCK_40MHz is not set 102 - # CONFIG_CLOCK_45MHz is not set 103 - # CONFIG_CLOCK_48MHz is not set 104 - # CONFIG_CLOCK_50MHz is not set 105 - # CONFIG_CLOCK_54MHz is not set 106 - # CONFIG_CLOCK_60MHz is not set 107 - # CONFIG_CLOCK_62_5MHz is not set 108 - # CONFIG_CLOCK_64MHz is not set 109 - CONFIG_CLOCK_66MHz=y 110 - # CONFIG_CLOCK_70MHz is not set 111 - # CONFIG_CLOCK_100MHz is not set 112 - # CONFIG_CLOCK_140MHz is not set 113 - # CONFIG_CLOCK_150MHz is not set 114 - # CONFIG_CLOCK_166MHz is not set 71 + CONFIG_CLOCK_SET=y 72 + CONFIG_CLOCK_FREQ=66666666 73 + CONFIG_CLOCK_DIV=1 115 74 116 75 # 117 76 # Platform ··· 109 102 CONFIG_FREESCALE=y 110 103 # CONFIG_LARGE_ALLOCS is not set 111 104 CONFIG_4KSTACKS=y 112 - CONFIG_RAMAUTO=y 113 - # CONFIG_RAM4MB is not set 114 - # CONFIG_RAM8MB is not set 115 - # CONFIG_RAM16MB is not set 116 - # CONFIG_RAM32MB is not set 105 + 106 + # 107 + # RAM configuration 108 + # 109 + CONFIG_RAMBASE=0x0 110 + CONFIG_RAMSIZE=0x800000 111 + CONFIG_VECTORBASE=0x0 112 + CONFIG_KERNELBASE=0x20000 117 113 CONFIG_RAMAUTOBIT=y 118 114 # CONFIG_RAM8BIT is not set 119 115 # CONFIG_RAM16BIT is not set ··· 129 119 # CONFIG_SPARSEMEM_MANUAL is not set 130 120 CONFIG_FLATMEM=y 131 121 CONFIG_FLAT_NODE_MEM_MAP=y 122 + # CONFIG_SPARSEMEM_STATIC is not set 123 + CONFIG_SPLIT_PTLOCK_CPUS=4 132 124 133 125 # 134 126 # Bus options (PCI, PCMCIA, EISA, MCA, ISA) ··· 152 140 CONFIG_BINFMT_FLAT=y 153 141 # CONFIG_BINFMT_ZFLAT is not set 154 142 # CONFIG_BINFMT_SHARED_FLAT is not set 143 + # CONFIG_BINFMT_AOUT is not set 155 144 # CONFIG_BINFMT_MISC is not set 156 145 157 146 # ··· 168 155 # 169 156 # Networking options 170 157 # 158 + # CONFIG_NETDEBUG is not set 171 159 CONFIG_PACKET=y 172 160 # CONFIG_PACKET_MMAP is not set 173 161 CONFIG_UNIX=y ··· 185 171 # CONFIG_INET_AH is not set 186 172 # CONFIG_INET_ESP is not set 187 173 # CONFIG_INET_IPCOMP is not set 174 + # CONFIG_INET_XFRM_TUNNEL is not set 188 175 # CONFIG_INET_TUNNEL is not set 189 - # CONFIG_IP_TCPDIAG is not set 190 - # CONFIG_IP_TCPDIAG_IPV6 is not set 176 + # CONFIG_INET_DIAG is not set 191 177 # CONFIG_TCP_CONG_ADVANCED is not set 192 178 CONFIG_TCP_CONG_BIC=y 193 179 # CONFIG_IPV6 is not set 180 + # CONFIG_INET6_XFRM_TUNNEL is not set 181 + # CONFIG_INET6_TUNNEL is not set 194 182 # CONFIG_NETFILTER is not set 183 + 184 + # 185 + # DCCP Configuration (EXPERIMENTAL) 186 + # 187 + # CONFIG_IP_DCCP is not set 195 188 196 189 # 197 190 # SCTP Configuration (EXPERIMENTAL) 198 191 # 199 192 # CONFIG_IP_SCTP is not set 193 + 194 + # 195 + # TIPC Configuration (EXPERIMENTAL) 196 + # 197 + # CONFIG_TIPC is not set 200 198 # CONFIG_ATM is not set 201 199 # CONFIG_BRIDGE is not set 202 200 # CONFIG_VLAN_8021Q is not set ··· 221 195 # CONFIG_NET_DIVERT is not set 222 196 # CONFIG_ECONET is not set 223 197 # CONFIG_WAN_ROUTER is not set 198 + 199 + # 200 + # QoS and/or fair queueing 201 + # 224 202 # CONFIG_NET_SCHED is not set 225 - # CONFIG_NET_CLS_ROUTE is not set 226 203 227 204 # 228 205 # Network testing ··· 234 205 # CONFIG_HAMRADIO is not set 235 206 # CONFIG_IRDA is not set 236 207 # CONFIG_BT is not set 208 + # CONFIG_IEEE80211 is not set 237 209 238 210 # 239 211 # Device Drivers ··· 246 216 CONFIG_STANDALONE=y 247 217 CONFIG_PREVENT_FIRMWARE_BUILD=y 248 218 # CONFIG_FW_LOADER is not set 219 + 220 + # 221 + # Connector - unified userspace <-> kernelspace linker 222 + # 223 + # CONFIG_CONNECTOR is not set 249 224 250 225 # 251 226 # Memory Technology Devices (MTD) ··· 270 235 # CONFIG_FTL is not set 271 236 # CONFIG_NFTL is not set 272 237 # CONFIG_INFTL is not set 238 + # CONFIG_RFD_FTL is not set 273 239 274 240 # 275 241 # RAM/ROM/Flash chip drivers ··· 290 254 CONFIG_MTD_RAM=y 291 255 # CONFIG_MTD_ROM is not set 292 256 # CONFIG_MTD_ABSENT is not set 257 + # CONFIG_MTD_OBSOLETE_CHIPS is not set 293 258 294 259 # 295 260 # Mapping drivers for chip access 296 261 # 297 262 # CONFIG_MTD_COMPLEX_MAPPINGS is not set 298 263 CONFIG_MTD_UCLINUX=y 299 - # CONFIG_MTD_SNAPGEARuC is not set 300 264 # CONFIG_MTD_PLATRAM is not set 301 265 302 266 # ··· 305 269 # CONFIG_MTD_SLRAM is not set 306 270 # CONFIG_MTD_PHRAM is not set 307 271 # CONFIG_MTD_MTDRAM is not set 308 - # CONFIG_MTD_BLKMTD is not set 309 272 # CONFIG_MTD_BLOCK2MTD is not set 310 273 311 274 # ··· 320 285 # CONFIG_MTD_NAND is not set 321 286 322 287 # 288 + # OneNAND Flash Device Drivers 289 + # 290 + # CONFIG_MTD_ONENAND is not set 291 + 292 + # 323 293 # Parallel port support 324 294 # 325 295 # CONFIG_PARPORT is not set ··· 336 296 # 337 297 # Block devices 338 298 # 339 - # CONFIG_BLK_DEV_FD is not set 340 299 # CONFIG_BLK_DEV_COW_COMMON is not set 341 300 # CONFIG_BLK_DEV_LOOP is not set 342 301 # CONFIG_BLK_DEV_NBD is not set ··· 343 304 CONFIG_BLK_DEV_RAM_COUNT=16 344 305 CONFIG_BLK_DEV_RAM_SIZE=4096 345 306 # CONFIG_BLK_DEV_INITRD is not set 346 - CONFIG_INITRAMFS_SOURCE="" 347 307 # CONFIG_CDROM_PKTCDVD is not set 348 - 349 - # 350 - # IO Schedulers 351 - # 352 - CONFIG_IOSCHED_NOOP=y 353 - # CONFIG_IOSCHED_AS is not set 354 - # CONFIG_IOSCHED_DEADLINE is not set 355 - # CONFIG_IOSCHED_CFQ is not set 356 308 # CONFIG_ATA_OVER_ETH is not set 357 309 358 310 # ··· 354 324 # 355 325 # SCSI device support 356 326 # 327 + # CONFIG_RAID_ATTRS is not set 357 328 # CONFIG_SCSI is not set 358 329 359 330 # ··· 385 354 # CONFIG_TUN is not set 386 355 387 356 # 357 + # PHY device support 358 + # 359 + # CONFIG_PHYLIB is not set 360 + 361 + # 388 362 # Ethernet (10 or 100Mbit) 389 363 # 390 364 CONFIG_NET_ETHERNET=y 391 365 # CONFIG_MII is not set 392 - # CONFIG_NET_VENDOR_SMC is not set 393 - # CONFIG_NE2000 is not set 394 - # CONFIG_NET_PCI is not set 395 366 CONFIG_FEC=y 396 367 # CONFIG_FEC2 is not set 397 368 ··· 425 392 # CONFIG_PPP_SYNC_TTY is not set 426 393 # CONFIG_PPP_DEFLATE is not set 427 394 # CONFIG_PPP_BSDCOMP is not set 395 + # CONFIG_PPP_MPPE is not set 428 396 # CONFIG_PPPOE is not set 429 397 # CONFIG_SLIP is not set 430 398 # CONFIG_SHAPER is not set ··· 459 425 # 460 426 # CONFIG_VT is not set 461 427 # CONFIG_SERIAL_NONSTANDARD is not set 462 - # CONFIG_LEDMAN is not set 463 - # CONFIG_RESETSWITCH is not set 464 428 465 429 # 466 430 # Serial drivers ··· 482 450 # Watchdog Cards 483 451 # 484 452 # CONFIG_WATCHDOG is not set 485 - # CONFIG_MCFWATCHDOG is not set 486 - # CONFIG_RTC is not set 487 453 # CONFIG_GEN_RTC is not set 488 454 # CONFIG_DTLK is not set 489 455 # CONFIG_R3964 is not set ··· 494 464 # 495 465 # TPM devices 496 466 # 497 - # CONFIG_MCF_QSPI is not set 498 - # CONFIG_M41T11M6 is not set 467 + # CONFIG_TCG_TPM is not set 468 + # CONFIG_TELCLOCK is not set 499 469 500 470 # 501 471 # I2C support 502 472 # 503 473 # CONFIG_I2C is not set 504 - # CONFIG_I2C_SENSOR is not set 474 + 475 + # 476 + # SPI support 477 + # 478 + # CONFIG_SPI is not set 479 + # CONFIG_SPI_MASTER is not set 505 480 506 481 # 507 482 # Dallas's 1-wire bus ··· 517 482 # Hardware Monitoring support 518 483 # 519 484 # CONFIG_HWMON is not set 485 + # CONFIG_HWMON_VID is not set 520 486 521 487 # 522 488 # Misc devices ··· 527 491 # Multimedia devices 528 492 # 529 493 # CONFIG_VIDEO_DEV is not set 494 + CONFIG_VIDEO_V4L2=y 530 495 531 496 # 532 497 # Digital Video Broadcasting Devices ··· 540 503 # CONFIG_FB is not set 541 504 542 505 # 543 - # SPI support 544 - # 545 - # CONFIG_SPI is not set 546 - 547 - # 548 506 # Sound 549 507 # 550 508 # CONFIG_SOUND is not set ··· 549 517 # 550 518 # CONFIG_USB_ARCH_HAS_HCD is not set 551 519 # CONFIG_USB_ARCH_HAS_OHCI is not set 520 + # CONFIG_USB_ARCH_HAS_EHCI is not set 521 + 522 + # 523 + # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 524 + # 552 525 553 526 # 554 527 # USB Gadget Support ··· 566 529 # CONFIG_MMC is not set 567 530 568 531 # 532 + # LED devices 533 + # 534 + # CONFIG_NEW_LEDS is not set 535 + 536 + # 537 + # LED drivers 538 + # 539 + 540 + # 541 + # LED Triggers 542 + # 543 + 544 + # 569 545 # InfiniBand support 570 546 # 571 547 572 548 # 573 - # SN Devices 549 + # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) 574 550 # 551 + 552 + # 553 + # Real Time Clock 554 + # 555 + # CONFIG_RTC_CLASS is not set 575 556 576 557 # 577 558 # File systems ··· 598 543 # CONFIG_EXT2_FS_XATTR is not set 599 544 # CONFIG_EXT2_FS_XIP is not set 600 545 # CONFIG_EXT3_FS is not set 601 - # CONFIG_JBD is not set 602 546 # CONFIG_REISERFS_FS is not set 603 547 # CONFIG_JFS_FS is not set 604 548 # CONFIG_FS_POSIX_ACL is not set 605 - 606 - # 607 - # XFS support 608 - # 609 549 # CONFIG_XFS_FS is not set 550 + # CONFIG_OCFS2_FS is not set 610 551 # CONFIG_MINIX_FS is not set 611 552 CONFIG_ROMFS_FS=y 612 553 # CONFIG_INOTIFY is not set ··· 610 559 # CONFIG_DNOTIFY is not set 611 560 # CONFIG_AUTOFS_FS is not set 612 561 # CONFIG_AUTOFS4_FS is not set 562 + # CONFIG_FUSE_FS is not set 613 563 614 564 # 615 565 # CD-ROM/DVD Filesystems ··· 633 581 # CONFIG_TMPFS is not set 634 582 # CONFIG_HUGETLB_PAGE is not set 635 583 CONFIG_RAMFS=y 584 + # CONFIG_CONFIGFS_FS is not set 636 585 637 586 # 638 587 # Miscellaneous filesystems ··· 664 611 # CONFIG_NCP_FS is not set 665 612 # CONFIG_CODA_FS is not set 666 613 # CONFIG_AFS_FS is not set 614 + # CONFIG_9P_FS is not set 667 615 668 616 # 669 617 # Partition Types ··· 681 627 # Kernel hacking 682 628 # 683 629 # CONFIG_PRINTK_TIME is not set 630 + # CONFIG_MAGIC_SYSRQ is not set 684 631 # CONFIG_DEBUG_KERNEL is not set 685 632 CONFIG_LOG_BUF_SHIFT=14 633 + # CONFIG_DEBUG_BUGVERBOSE is not set 634 + # CONFIG_DEBUG_FS is not set 635 + # CONFIG_UNWIND_INFO is not set 686 636 # CONFIG_FULLDEBUG is not set 687 637 # CONFIG_HIGHPROFILE is not set 688 638 # CONFIG_BOOTPARAM is not set ··· 713 655 # Library routines 714 656 # 715 657 # CONFIG_CRC_CCITT is not set 658 + # CONFIG_CRC16 is not set 716 659 # CONFIG_CRC32 is not set 717 660 # CONFIG_LIBCRC32C is not set