Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 691027b91be99413dc60fab0902b366434555015

Authored by Ben Dooks
Committed by Russell King
1 parent d97a666f36
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] ARM: 2730/1: S3C2410 default configuration update 

Patch from Ben Dooks

Add support for the DM9000 and bring default configuration
up-to-date with the latest 2.6.12 kernel release

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 1 changed file with 18 additions and 9 deletions Side-by-side Diff

arch/arm/configs/s3c2410_defconfig
Diff comments   View file @ 691027b
1 1 #
2 2 # Automatically generated make config: don't edit
3   -# Linux kernel version: 2.6.12-rc1-bk2
4   -# Sun Mar 27 17:47:45 2005
  3 +# Linux kernel version: 2.6.12-git4
  4 +# Wed Jun 22 15:56:42 2005
5 5 #
6 6 CONFIG_ARM=y
7 7 CONFIG_MMU=y
8 8 CONFIG_UID16=y
9 9 CONFIG_RWSEM_GENERIC_SPINLOCK=y
10 10 CONFIG_GENERIC_CALIBRATE_DELAY=y
11   -CONFIG_GENERIC_IOMAP=y
12 11  
13 12 #
14 13 # Code maturity level options
... ... @@ -17,6 +16,7 @@
17 16 # CONFIG_CLEAN_COMPILE is not set
18 17 CONFIG_BROKEN=y
19 18 CONFIG_BROKEN_ON_SMP=y
  19 +CONFIG_INIT_ENV_ARG_LIMIT=32
20 20  
21 21 #
22 22 # General setup
... ... @@ -35,6 +35,8 @@
35 35 CONFIG_KALLSYMS=y
36 36 # CONFIG_KALLSYMS_ALL is not set
37 37 # CONFIG_KALLSYMS_EXTRA_PASS is not set
  38 +CONFIG_PRINTK=y
  39 +CONFIG_BUG=y
38 40 CONFIG_BASE_FULL=y
39 41 CONFIG_FUTEX=y
40 42 CONFIG_EPOLL=y
... ... @@ -81,6 +83,7 @@
81 83 # CONFIG_ARCH_VERSATILE is not set
82 84 # CONFIG_ARCH_IMX is not set
83 85 # CONFIG_ARCH_H720X is not set
  86 +# CONFIG_ARCH_AAEC2000 is not set
84 87  
85 88 #
86 89 # S3C24XX Implementations
... ... @@ -134,6 +137,7 @@
134 137 #
135 138 # Bus support
136 139 #
  140 +CONFIG_ISA_DMA_API=y
137 141  
138 142 #
139 143 # PCCARD (PCMCIA/CardBus) support
140 144  
... ... @@ -143,7 +147,9 @@
143 147 #
144 148 # Kernel Features
145 149 #
  150 +# CONFIG_SMP is not set
146 151 # CONFIG_PREEMPT is not set
  152 +# CONFIG_DISCONTIGMEM is not set
147 153 CONFIG_ALIGNMENT_TRAP=y
148 154  
149 155 #
... ... @@ -297,7 +303,6 @@
297 303 #
298 304 # Block devices
299 305 #
300   -# CONFIG_BLK_DEV_FD is not set
301 306 # CONFIG_PARIDE is not set
302 307 # CONFIG_BLK_DEV_COW_COMMON is not set
303 308 CONFIG_BLK_DEV_LOOP=y
... ... @@ -359,6 +364,7 @@
359 364 #
360 365 # Fusion MPT device support
361 366 #
  367 +# CONFIG_FUSION is not set
362 368  
363 369 #
364 370 # IEEE 1394 (FireWire) support
365 371  
... ... @@ -378,10 +384,11 @@
378 384 # Networking options
379 385 #
380 386 # CONFIG_PACKET is not set
381   -# CONFIG_NETLINK_DEV is not set
382 387 CONFIG_UNIX=y
383 388 # CONFIG_NET_KEY is not set
384 389 CONFIG_INET=y
  390 +CONFIG_IP_FIB_HASH=y
  391 +# CONFIG_IP_FIB_TRIE is not set
385 392 # CONFIG_IP_MULTICAST is not set
386 393 # CONFIG_IP_ADVANCED_ROUTER is not set
387 394 CONFIG_IP_PNP=y
388 395  
... ... @@ -443,8 +450,9 @@
443 450 # Ethernet (10 or 100Mbit)
444 451 #
445 452 CONFIG_NET_ETHERNET=y
446   -# CONFIG_MII is not set
  453 +CONFIG_MII=m
447 454 # CONFIG_SMC91X is not set
  455 +CONFIG_DM9000=m
448 456  
449 457 #
450 458 # Ethernet (1000 Mbit)
... ... @@ -521,7 +529,6 @@
521 529 CONFIG_SERIO_LIBPS2=y
522 530 # CONFIG_SERIO_RAW is not set
523 531 # CONFIG_GAMEPORT is not set
524   -CONFIG_SOUND_GAMEPORT=y
525 532  
526 533 #
527 534 # Character devices
... ... @@ -605,7 +612,6 @@
605 612 #
606 613 # TPM devices
607 614 #
608   -# CONFIG_TCG_TPM is not set
609 615  
610 616 #
611 617 # I2C support
... ... @@ -654,6 +660,7 @@
654 660 CONFIG_SENSORS_LM85=m
655 661 # CONFIG_SENSORS_LM87 is not set
656 662 # CONFIG_SENSORS_LM90 is not set
  663 +# CONFIG_SENSORS_LM92 is not set
657 664 # CONFIG_SENSORS_MAX1619 is not set
658 665 # CONFIG_SENSORS_PC87360 is not set
659 666 # CONFIG_SENSORS_SMSC47B397 is not set
... ... @@ -665,6 +672,7 @@
665 672 #
666 673 # Other I2C Chip support
667 674 #
  675 +# CONFIG_SENSORS_DS1337 is not set
668 676 CONFIG_SENSORS_EEPROM=m
669 677 # CONFIG_SENSORS_PCF8574 is not set
670 678 # CONFIG_SENSORS_PCF8591 is not set
671 679  
... ... @@ -696,8 +704,10 @@
696 704 # CONFIG_FB_CFB_COPYAREA is not set
697 705 # CONFIG_FB_CFB_IMAGEBLIT is not set
698 706 # CONFIG_FB_SOFT_CURSOR is not set
  707 +# CONFIG_FB_MACMODES is not set
699 708 CONFIG_FB_MODE_HELPERS=y
700 709 # CONFIG_FB_TILEBLITTING is not set
  710 +# CONFIG_FB_S1D13XXX is not set
701 711 # CONFIG_FB_VIRTUAL is not set
702 712  
703 713 #
... ... @@ -782,7 +792,6 @@
782 792 #
783 793 CONFIG_PROC_FS=y
784 794 CONFIG_SYSFS=y
785   -# CONFIG_DEVFS_FS is not set
786 795 # CONFIG_DEVPTS_FS_XATTR is not set
787 796 # CONFIG_TMPFS is not set
788 797 # CONFIG_HUGETLBFS is not set