Commit eca4ee0d1615c4fb01e437f674163542ec2dd072

Authored by Linus Torvalds

Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] amba: fix amba device resources
  [ARM] pgtable: file pte layout documentation
  [ARM] pgtable: swp pte layout documentation, definitions, and check
  [ARM] export __cpu_flush_dcache_page
  [ARM] 5576/1: Update kb9202_defconfig
  [ARM] 5581/1: U300 clock updates
  [ARM] 5579/1: Updated U300 defconfig

Showing 6 changed files Side-by-side Diff

arch/arm/configs/kb9202_defconfig
Changes suppressed. Click to show
1 1 #
2 2 # Automatically generated make config: don't edit
3   -# Linux kernel version: 2.6.13-rc2
4   -# Sun Aug 14 19:26:59 2005
  3 +# Linux kernel version: 2.6.30-rc8
  4 +# Wed Jun 3 13:52:33 2009
5 5 #
6 6 CONFIG_ARM=y
  7 +CONFIG_SYS_SUPPORTS_APM_EMULATION=y
  8 +CONFIG_GENERIC_GPIO=y
  9 +CONFIG_GENERIC_TIME=y
  10 +CONFIG_GENERIC_CLOCKEVENTS=y
7 11 CONFIG_MMU=y
8   -CONFIG_UID16=y
  12 +# CONFIG_NO_IOPORT is not set
  13 +CONFIG_GENERIC_HARDIRQS=y
  14 +CONFIG_STACKTRACE_SUPPORT=y
  15 +CONFIG_HAVE_LATENCYTOP_SUPPORT=y
  16 +CONFIG_LOCKDEP_SUPPORT=y
  17 +CONFIG_TRACE_IRQFLAGS_SUPPORT=y
  18 +CONFIG_HARDIRQS_SW_RESEND=y
  19 +CONFIG_GENERIC_IRQ_PROBE=y
9 20 CONFIG_RWSEM_GENERIC_SPINLOCK=y
  21 +# CONFIG_ARCH_HAS_ILOG2_U32 is not set
  22 +# CONFIG_ARCH_HAS_ILOG2_U64 is not set
  23 +CONFIG_GENERIC_HWEIGHT=y
10 24 CONFIG_GENERIC_CALIBRATE_DELAY=y
  25 +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
  26 +CONFIG_VECTORS_BASE=0xffff0000
  27 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
11 28  
12 29 #
13   -# Code maturity level options
  30 +# General setup
14 31 #
15   -# CONFIG_EXPERIMENTAL is not set
16   -CONFIG_CLEAN_COMPILE=y
  32 +CONFIG_EXPERIMENTAL=y
17 33 CONFIG_BROKEN_ON_SMP=y
  34 +CONFIG_LOCK_KERNEL=y
18 35 CONFIG_INIT_ENV_ARG_LIMIT=32
  36 +CONFIG_LOCALVERSION=""
  37 +CONFIG_LOCALVERSION_AUTO=y
  38 +# CONFIG_SWAP is not set
  39 +CONFIG_SYSVIPC=y
  40 +CONFIG_SYSVIPC_SYSCTL=y
  41 +CONFIG_POSIX_MQUEUE=y
  42 +CONFIG_POSIX_MQUEUE_SYSCTL=y
  43 +CONFIG_BSD_PROCESS_ACCT=y
  44 +# CONFIG_BSD_PROCESS_ACCT_V3 is not set
  45 +# CONFIG_TASKSTATS is not set
  46 +CONFIG_AUDIT=y
19 47  
20 48 #
21   -# General setup
  49 +# RCU Subsystem
22 50 #
23   -CONFIG_LOCALVERSION=""
24   -# CONFIG_SWAP is not set
25   -# CONFIG_SYSVIPC is not set
26   -# CONFIG_BSD_PROCESS_ACCT is not set
  51 +CONFIG_CLASSIC_RCU=y
  52 +# CONFIG_TREE_RCU is not set
  53 +# CONFIG_PREEMPT_RCU is not set
  54 +# CONFIG_TREE_RCU_TRACE is not set
  55 +# CONFIG_PREEMPT_RCU_TRACE is not set
  56 +CONFIG_IKCONFIG=y
  57 +CONFIG_IKCONFIG_PROC=y
  58 +CONFIG_LOG_BUF_SHIFT=17
  59 +# CONFIG_GROUP_SCHED is not set
  60 +# CONFIG_CGROUPS is not set
  61 +# CONFIG_SYSFS_DEPRECATED_V2 is not set
  62 +# CONFIG_RELAY is not set
  63 +CONFIG_NAMESPACES=y
  64 +# CONFIG_UTS_NS is not set
  65 +# CONFIG_IPC_NS is not set
  66 +# CONFIG_USER_NS is not set
  67 +# CONFIG_PID_NS is not set
  68 +# CONFIG_NET_NS is not set
  69 +CONFIG_BLK_DEV_INITRD=y
  70 +CONFIG_INITRAMFS_SOURCE=""
  71 +CONFIG_RD_GZIP=y
  72 +CONFIG_RD_BZIP2=y
  73 +CONFIG_RD_LZMA=y
  74 +CONFIG_CC_OPTIMIZE_FOR_SIZE=y
27 75 CONFIG_SYSCTL=y
28   -# CONFIG_AUDIT is not set
29   -CONFIG_HOTPLUG=y
30   -# CONFIG_KOBJECT_UEVENT is not set
31   -# CONFIG_IKCONFIG is not set
  76 +CONFIG_ANON_INODES=y
32 77 # CONFIG_EMBEDDED is not set
  78 +CONFIG_UID16=y
  79 +CONFIG_SYSCTL_SYSCALL=y
33 80 CONFIG_KALLSYMS=y
34 81 # CONFIG_KALLSYMS_ALL is not set
35   -# CONFIG_KALLSYMS_EXTRA_PASS is not set
  82 +CONFIG_KALLSYMS_EXTRA_PASS=y
  83 +# CONFIG_STRIP_ASM_SYMS is not set
  84 +CONFIG_HOTPLUG=y
36 85 CONFIG_PRINTK=y
37 86 CONFIG_BUG=y
  87 +CONFIG_ELF_CORE=y
38 88 CONFIG_BASE_FULL=y
39 89 CONFIG_FUTEX=y
40 90 CONFIG_EPOLL=y
41   -CONFIG_CC_OPTIMIZE_FOR_SIZE=y
  91 +CONFIG_SIGNALFD=y
  92 +CONFIG_TIMERFD=y
  93 +CONFIG_EVENTFD=y
42 94 CONFIG_SHMEM=y
43   -CONFIG_CC_ALIGN_FUNCTIONS=0
44   -CONFIG_CC_ALIGN_LABELS=0
45   -CONFIG_CC_ALIGN_LOOPS=0
46   -CONFIG_CC_ALIGN_JUMPS=0
47   -# CONFIG_TINY_SHMEM is not set
  95 +CONFIG_AIO=y
  96 +CONFIG_VM_EVENT_COUNTERS=y
  97 +CONFIG_SLUB_DEBUG=y
  98 +CONFIG_COMPAT_BRK=y
  99 +# CONFIG_SLAB is not set
  100 +CONFIG_SLUB=y
  101 +# CONFIG_SLOB is not set
  102 +# CONFIG_PROFILING is not set
  103 +CONFIG_TRACEPOINTS=y
  104 +CONFIG_MARKERS=y
  105 +CONFIG_HAVE_OPROFILE=y
  106 +# CONFIG_KPROBES is not set
  107 +CONFIG_HAVE_KPROBES=y
  108 +CONFIG_HAVE_KRETPROBES=y
  109 +CONFIG_HAVE_CLK=y
  110 +# CONFIG_SLOW_WORK is not set
  111 +CONFIG_HAVE_GENERIC_DMA_COHERENT=y
  112 +CONFIG_SLABINFO=y
  113 +CONFIG_RT_MUTEXES=y
48 114 CONFIG_BASE_SMALL=0
  115 +CONFIG_MODULES=y
  116 +# CONFIG_MODULE_FORCE_LOAD is not set
  117 +CONFIG_MODULE_UNLOAD=y
  118 +# CONFIG_MODULE_FORCE_UNLOAD is not set
  119 +CONFIG_MODVERSIONS=y
  120 +CONFIG_MODULE_SRCVERSION_ALL=y
  121 +CONFIG_BLOCK=y
  122 +# CONFIG_LBD is not set
  123 +# CONFIG_BLK_DEV_BSG is not set
  124 +# CONFIG_BLK_DEV_INTEGRITY is not set
49 125  
50 126 #
51   -# Loadable module support
  127 +# IO Schedulers
52 128 #
53   -CONFIG_MODULES=y
54   -CONFIG_MODULE_UNLOAD=y
55   -CONFIG_OBSOLETE_MODPARM=y
56   -# CONFIG_MODULE_SRCVERSION_ALL is not set
57   -CONFIG_KMOD=y
  129 +CONFIG_IOSCHED_NOOP=y
  130 +# CONFIG_IOSCHED_AS is not set
  131 +# CONFIG_IOSCHED_DEADLINE is not set
  132 +CONFIG_IOSCHED_CFQ=y
  133 +# CONFIG_DEFAULT_AS is not set
  134 +# CONFIG_DEFAULT_DEADLINE is not set
  135 +CONFIG_DEFAULT_CFQ=y
  136 +# CONFIG_DEFAULT_NOOP is not set
  137 +CONFIG_DEFAULT_IOSCHED="cfq"
  138 +# CONFIG_FREEZER is not set
58 139  
59 140 #
60 141 # System Type
61 142 #
62   -# CONFIG_ARCH_CLPS7500 is not set
  143 +# CONFIG_ARCH_AAEC2000 is not set
  144 +# CONFIG_ARCH_INTEGRATOR is not set
  145 +# CONFIG_ARCH_REALVIEW is not set
  146 +# CONFIG_ARCH_VERSATILE is not set
  147 +CONFIG_ARCH_AT91=y
63 148 # CONFIG_ARCH_CLPS711X is not set
64   -# CONFIG_ARCH_CO285 is not set
65 149 # CONFIG_ARCH_EBSA110 is not set
  150 +# CONFIG_ARCH_EP93XX is not set
  151 +# CONFIG_ARCH_GEMINI is not set
66 152 # CONFIG_ARCH_FOOTBRIDGE is not set
67   -# CONFIG_ARCH_INTEGRATOR is not set
68   -# CONFIG_ARCH_IOP3XX is not set
69   -# CONFIG_ARCH_IXP4XX is not set
  153 +# CONFIG_ARCH_NETX is not set
  154 +# CONFIG_ARCH_H720X is not set
  155 +# CONFIG_ARCH_IMX is not set
  156 +# CONFIG_ARCH_IOP13XX is not set
  157 +# CONFIG_ARCH_IOP32X is not set
  158 +# CONFIG_ARCH_IOP33X is not set
  159 +# CONFIG_ARCH_IXP23XX is not set
70 160 # CONFIG_ARCH_IXP2000 is not set
  161 +# CONFIG_ARCH_IXP4XX is not set
71 162 # CONFIG_ARCH_L7200 is not set
  163 +# CONFIG_ARCH_KIRKWOOD is not set
  164 +# CONFIG_ARCH_KS8695 is not set
  165 +# CONFIG_ARCH_NS9XXX is not set
  166 +# CONFIG_ARCH_LOKI is not set
  167 +# CONFIG_ARCH_MV78XX0 is not set
  168 +# CONFIG_ARCH_MXC is not set
  169 +# CONFIG_ARCH_ORION5X is not set
  170 +# CONFIG_ARCH_PNX4008 is not set
72 171 # CONFIG_ARCH_PXA is not set
  172 +# CONFIG_ARCH_MMP is not set
73 173 # CONFIG_ARCH_RPC is not set
74 174 # CONFIG_ARCH_SA1100 is not set
75 175 # CONFIG_ARCH_S3C2410 is not set
  176 +# CONFIG_ARCH_S3C64XX is not set
76 177 # CONFIG_ARCH_SHARK is not set
77 178 # CONFIG_ARCH_LH7A40X is not set
  179 +# CONFIG_ARCH_DAVINCI is not set
78 180 # CONFIG_ARCH_OMAP is not set
79   -# CONFIG_ARCH_VERSATILE is not set
80   -# CONFIG_ARCH_IMX is not set
81   -# CONFIG_ARCH_H720X is not set
82   -# CONFIG_ARCH_AAEC2000 is not set
83   -CONFIG_ARCH_AT91=y
  181 +# CONFIG_ARCH_MSM is not set
  182 +# CONFIG_ARCH_W90X900 is not set
  183 +
  184 +#
  185 +# Atmel AT91 System-on-Chip
  186 +#
84 187 CONFIG_ARCH_AT91RM9200=y
  188 +# CONFIG_ARCH_AT91SAM9260 is not set
  189 +# CONFIG_ARCH_AT91SAM9261 is not set
  190 +# CONFIG_ARCH_AT91SAM9263 is not set
  191 +# CONFIG_ARCH_AT91SAM9RL is not set
  192 +# CONFIG_ARCH_AT91SAM9G20 is not set
  193 +# CONFIG_ARCH_AT91CAP9 is not set
  194 +# CONFIG_ARCH_AT91X40 is not set
  195 +CONFIG_AT91_PMC_UNIT=y
85 196  
86 197 #
87   -# AT91RM9200 Implementations
  198 +# AT91RM9200 Board Type
88 199 #
  200 +# CONFIG_MACH_ONEARM is not set
89 201 # CONFIG_ARCH_AT91RM9200DK is not set
90 202 # CONFIG_MACH_AT91RM9200EK is not set
91 203 # CONFIG_MACH_CSB337 is not set
92 204 # CONFIG_MACH_CSB637 is not set
93 205 # CONFIG_MACH_CARMEVA is not set
  206 +# CONFIG_MACH_ATEB9200 is not set
94 207 CONFIG_MACH_KB9200=y
  208 +# CONFIG_MACH_PICOTUX2XX is not set
  209 +# CONFIG_MACH_KAFA is not set
  210 +# CONFIG_MACH_ECBAT91 is not set
  211 +# CONFIG_MACH_YL9200 is not set
95 212  
96 213 #
  214 +# AT91 Board Options
  215 +#
  216 +
  217 +#
  218 +# AT91 Feature Selections
  219 +#
  220 +CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
  221 +CONFIG_AT91_TIMER_HZ=128
  222 +CONFIG_AT91_EARLY_DBGU=y
  223 +# CONFIG_AT91_EARLY_USART0 is not set
  224 +# CONFIG_AT91_EARLY_USART1 is not set
  225 +# CONFIG_AT91_EARLY_USART2 is not set
  226 +# CONFIG_AT91_EARLY_USART3 is not set
  227 +# CONFIG_AT91_EARLY_USART4 is not set
  228 +# CONFIG_AT91_EARLY_USART5 is not set
  229 +
  230 +#
97 231 # Processor Type
98 232 #
99 233 CONFIG_CPU_32=y
100 234 CONFIG_CPU_ARM920T=y
101   -CONFIG_CPU_32v4=y
  235 +CONFIG_CPU_32v4T=y
102 236 CONFIG_CPU_ABRT_EV4T=y
  237 +CONFIG_CPU_PABRT_NOIFAR=y
103 238 CONFIG_CPU_CACHE_V4WT=y
104 239 CONFIG_CPU_CACHE_VIVT=y
105 240 CONFIG_CPU_COPY_V4WB=y
106 241 CONFIG_CPU_TLB_V4WBI=y
  242 +CONFIG_CPU_CP15=y
  243 +CONFIG_CPU_CP15_MMU=y
107 244  
108 245 #
109 246 # Processor Features
110 247  
111 248  
112 249  
... ... @@ -112,23 +249,48 @@
112 249 # CONFIG_CPU_ICACHE_DISABLE is not set
113 250 # CONFIG_CPU_DCACHE_DISABLE is not set
114 251 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
  252 +# CONFIG_OUTER_CACHE is not set
115 253  
116 254 #
117 255 # Bus support
118 256 #
119   -CONFIG_ISA_DMA_API=y
120   -
121   -#
122   -# PCCARD (PCMCIA/CardBus) support
123   -#
  257 +# CONFIG_PCI_SYSCALL is not set
  258 +# CONFIG_ARCH_SUPPORTS_MSI is not set
124 259 # CONFIG_PCCARD is not set
125 260  
126 261 #
127 262 # Kernel Features
128 263 #
129   -# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
  264 +CONFIG_TICK_ONESHOT=y
  265 +CONFIG_NO_HZ=y
  266 +CONFIG_HIGH_RES_TIMERS=y
  267 +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
  268 +CONFIG_VMSPLIT_3G=y
  269 +# CONFIG_VMSPLIT_2G is not set
  270 +# CONFIG_VMSPLIT_1G is not set
  271 +CONFIG_PAGE_OFFSET=0xC0000000
  272 +CONFIG_PREEMPT=y
  273 +CONFIG_HZ=128
  274 +CONFIG_AEABI=y
  275 +CONFIG_OABI_COMPAT=y
  276 +# CONFIG_ARCH_HAS_HOLES_MEMORYMODEL is not set
  277 +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
  278 +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
  279 +# CONFIG_HIGHMEM is not set
  280 +CONFIG_SELECT_MEMORY_MODEL=y
  281 +CONFIG_FLATMEM_MANUAL=y
  282 +# CONFIG_DISCONTIGMEM_MANUAL is not set
  283 +# CONFIG_SPARSEMEM_MANUAL is not set
130 284 CONFIG_FLATMEM=y
131 285 CONFIG_FLAT_NODE_MEM_MAP=y
  286 +CONFIG_PAGEFLAGS_EXTENDED=y
  287 +CONFIG_SPLIT_PTLOCK_CPUS=4096
  288 +# CONFIG_PHYS_ADDR_T_64BIT is not set
  289 +CONFIG_ZONE_DMA_FLAG=0
  290 +CONFIG_VIRT_TO_BUS=y
  291 +CONFIG_UNEVICTABLE_LRU=y
  292 +CONFIG_HAVE_MLOCK=y
  293 +CONFIG_HAVE_MLOCKED_PAGE_BIT=y
132 294 # CONFIG_LEDS is not set
133 295 CONFIG_ALIGNMENT_TRAP=y
134 296  
135 297  
... ... @@ -137,10 +299,18 @@
137 299 #
138 300 CONFIG_ZBOOT_ROM_TEXT=0x10000000
139 301 CONFIG_ZBOOT_ROM_BSS=0x20040000
140   -CONFIG_ZBOOT_ROM=y
141   -CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/ram rw initrd=0x20210000,654933"
  302 +# CONFIG_ZBOOT_ROM is not set
  303 +CONFIG_CMDLINE="noinitrd root=/dev/mtdblock0 rootfstype=jffs2 mem=64M"
  304 +# CONFIG_XIP_KERNEL is not set
  305 +CONFIG_KEXEC=y
  306 +CONFIG_ATAGS_PROC=y
142 307  
143 308 #
  309 +# CPU Power Management
  310 +#
  311 +# CONFIG_CPU_IDLE is not set
  312 +
  313 +#
144 314 # Floating point emulation
145 315 #
146 316  
147 317  
148 318  
149 319  
150 320  
151 321  
152 322  
153 323  
154 324  
155 325  
156 326  
157 327  
158 328  
159 329  
160 330  
161 331  
162 332  
163 333  
164 334  
165 335  
166 336  
167 337  
... ... @@ -149,74 +319,251 @@
149 319 #
150 320 CONFIG_FPE_NWFPE=y
151 321 # CONFIG_FPE_NWFPE_XP is not set
  322 +# CONFIG_FPE_FASTFPE is not set
152 323  
153 324 #
154 325 # Userspace binary formats
155 326 #
156 327 CONFIG_BINFMT_ELF=y
157   -CONFIG_BINFMT_AOUT=y
  328 +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
  329 +CONFIG_HAVE_AOUT=y
  330 +# CONFIG_BINFMT_AOUT is not set
158 331 CONFIG_BINFMT_MISC=y
159   -# CONFIG_ARTHUR is not set
160 332  
161 333 #
162 334 # Power management options
163 335 #
164 336 # CONFIG_PM is not set
  337 +CONFIG_ARCH_SUSPEND_POSSIBLE=y
  338 +CONFIG_NET=y
165 339  
166 340 #
  341 +# Networking options
  342 +#
  343 +CONFIG_PACKET=y
  344 +# CONFIG_PACKET_MMAP is not set
  345 +CONFIG_UNIX=y
  346 +# CONFIG_NET_KEY is not set
  347 +CONFIG_INET=y
  348 +# CONFIG_IP_MULTICAST is not set
  349 +# CONFIG_IP_ADVANCED_ROUTER is not set
  350 +CONFIG_IP_FIB_HASH=y
  351 +CONFIG_IP_PNP=y
  352 +CONFIG_IP_PNP_DHCP=y
  353 +CONFIG_IP_PNP_BOOTP=y
  354 +# CONFIG_IP_PNP_RARP is not set
  355 +# CONFIG_NET_IPIP is not set
  356 +# CONFIG_NET_IPGRE is not set
  357 +# CONFIG_ARPD is not set
  358 +# CONFIG_SYN_COOKIES is not set
  359 +# CONFIG_INET_AH is not set
  360 +# CONFIG_INET_ESP is not set
  361 +# CONFIG_INET_IPCOMP is not set
  362 +# CONFIG_INET_XFRM_TUNNEL is not set
  363 +# CONFIG_INET_TUNNEL is not set
  364 +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
  365 +# CONFIG_INET_XFRM_MODE_TUNNEL is not set
  366 +# CONFIG_INET_XFRM_MODE_BEET is not set
  367 +# CONFIG_INET_LRO is not set
  368 +# CONFIG_INET_DIAG is not set
  369 +# CONFIG_TCP_CONG_ADVANCED is not set
  370 +CONFIG_TCP_CONG_CUBIC=y
  371 +CONFIG_DEFAULT_TCP_CONG="cubic"
  372 +# CONFIG_TCP_MD5SIG is not set
  373 +# CONFIG_IPV6 is not set
  374 +# CONFIG_NETWORK_SECMARK is not set
  375 +# CONFIG_NETFILTER is not set
  376 +# CONFIG_IP_DCCP is not set
  377 +# CONFIG_IP_SCTP is not set
  378 +# CONFIG_TIPC is not set
  379 +# CONFIG_ATM is not set
  380 +# CONFIG_BRIDGE is not set
  381 +# CONFIG_NET_DSA is not set
  382 +# CONFIG_VLAN_8021Q is not set
  383 +# CONFIG_DECNET is not set
  384 +# CONFIG_LLC2 is not set
  385 +# CONFIG_IPX is not set
  386 +# CONFIG_ATALK is not set
  387 +# CONFIG_X25 is not set
  388 +# CONFIG_LAPB is not set
  389 +# CONFIG_ECONET is not set
  390 +# CONFIG_WAN_ROUTER is not set
  391 +# CONFIG_PHONET is not set
  392 +# CONFIG_NET_SCHED is not set
  393 +# CONFIG_DCB is not set
  394 +
  395 +#
  396 +# Network testing
  397 +#
  398 +# CONFIG_NET_PKTGEN is not set
  399 +# CONFIG_NET_DROP_MONITOR is not set
  400 +# CONFIG_HAMRADIO is not set
  401 +# CONFIG_CAN is not set
  402 +# CONFIG_IRDA is not set
  403 +# CONFIG_BT is not set
  404 +# CONFIG_AF_RXRPC is not set
  405 +# CONFIG_WIRELESS is not set
  406 +# CONFIG_WIMAX is not set
  407 +# CONFIG_RFKILL is not set
  408 +# CONFIG_NET_9P is not set
  409 +
  410 +#
167 411 # Device Drivers
168 412 #
169 413  
170 414 #
171 415 # Generic Driver Options
172 416 #
  417 +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
173 418 CONFIG_STANDALONE=y
174 419 CONFIG_PREVENT_FIRMWARE_BUILD=y
175   -# CONFIG_FW_LOADER is not set
176   -CONFIG_DEBUG_DRIVER=y
  420 +CONFIG_FW_LOADER=y
  421 +# CONFIG_FIRMWARE_IN_KERNEL is not set
  422 +CONFIG_EXTRA_FIRMWARE=""
  423 +# CONFIG_DEBUG_DRIVER is not set
  424 +# CONFIG_DEBUG_DEVRES is not set
  425 +# CONFIG_SYS_HYPERVISOR is not set
  426 +# CONFIG_CONNECTOR is not set
  427 +CONFIG_MTD=y
  428 +# CONFIG_MTD_DEBUG is not set
  429 +CONFIG_MTD_CONCAT=y
  430 +CONFIG_MTD_PARTITIONS=y
  431 +# CONFIG_MTD_TESTS is not set
  432 +# CONFIG_MTD_REDBOOT_PARTS is not set
  433 +CONFIG_MTD_CMDLINE_PARTS=y
  434 +# CONFIG_MTD_AFS_PARTS is not set
  435 +# CONFIG_MTD_AR7_PARTS is not set
177 436  
178 437 #
179   -# Memory Technology Devices (MTD)
  438 +# User Modules And Translation Layers
180 439 #
181   -# CONFIG_MTD is not set
  440 +CONFIG_MTD_CHAR=y
  441 +CONFIG_MTD_BLKDEVS=y
  442 +CONFIG_MTD_BLOCK=y
  443 +# CONFIG_FTL is not set
  444 +# CONFIG_NFTL is not set
  445 +# CONFIG_INFTL is not set
  446 +# CONFIG_RFD_FTL is not set
  447 +# CONFIG_SSFDC is not set
  448 +# CONFIG_MTD_OOPS is not set
182 449  
183 450 #
184   -# Parallel port support
  451 +# RAM/ROM/Flash chip drivers
185 452 #
186   -# CONFIG_PARPORT is not set
  453 +CONFIG_MTD_CFI=y
  454 +# CONFIG_MTD_JEDECPROBE is not set
  455 +CONFIG_MTD_GEN_PROBE=y
  456 +# CONFIG_MTD_CFI_ADV_OPTIONS is not set
  457 +CONFIG_MTD_MAP_BANK_WIDTH_1=y
  458 +CONFIG_MTD_MAP_BANK_WIDTH_2=y
  459 +CONFIG_MTD_MAP_BANK_WIDTH_4=y
  460 +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
  461 +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
  462 +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
  463 +CONFIG_MTD_CFI_I1=y
  464 +CONFIG_MTD_CFI_I2=y
  465 +# CONFIG_MTD_CFI_I4 is not set
  466 +# CONFIG_MTD_CFI_I8 is not set
  467 +CONFIG_MTD_CFI_INTELEXT=y
  468 +# CONFIG_MTD_CFI_AMDSTD is not set
  469 +# CONFIG_MTD_CFI_STAA is not set
  470 +CONFIG_MTD_CFI_UTIL=y
  471 +# CONFIG_MTD_RAM is not set
  472 +# CONFIG_MTD_ROM is not set
  473 +# CONFIG_MTD_ABSENT is not set
187 474  
188 475 #
189   -# Plug and Play support
  476 +# Mapping drivers for chip access
190 477 #
  478 +CONFIG_MTD_COMPLEX_MAPPINGS=y
  479 +CONFIG_MTD_PHYSMAP=y
  480 +# CONFIG_MTD_PHYSMAP_COMPAT is not set
  481 +# CONFIG_MTD_ARM_INTEGRATOR is not set
  482 +# CONFIG_MTD_PLATRAM is not set
191 483  
192 484 #
193   -# Block devices
  485 +# Self-contained MTD device drivers
194 486 #
  487 +# CONFIG_MTD_SLRAM is not set
  488 +# CONFIG_MTD_PHRAM is not set
  489 +# CONFIG_MTD_MTDRAM is not set
  490 +# CONFIG_MTD_BLOCK2MTD is not set
  491 +
  492 +#
  493 +# Disk-On-Chip Device Drivers
  494 +#
  495 +# CONFIG_MTD_DOC2000 is not set
  496 +# CONFIG_MTD_DOC2001 is not set
  497 +# CONFIG_MTD_DOC2001PLUS is not set
  498 +CONFIG_MTD_NAND=y
  499 +# CONFIG_MTD_NAND_VERIFY_WRITE is not set
  500 +# CONFIG_MTD_NAND_ECC_SMC is not set
  501 +# CONFIG_MTD_NAND_MUSEUM_IDS is not set
  502 +# CONFIG_MTD_NAND_GPIO is not set
  503 +CONFIG_MTD_NAND_IDS=y
  504 +# CONFIG_MTD_NAND_DISKONCHIP is not set
  505 +CONFIG_MTD_NAND_ATMEL=y
  506 +# CONFIG_MTD_NAND_ATMEL_ECC_HW is not set
  507 +CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y
  508 +# CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set
  509 +# CONFIG_MTD_NAND_NANDSIM is not set
  510 +# CONFIG_MTD_NAND_PLATFORM is not set
  511 +# CONFIG_MTD_ALAUDA is not set
  512 +# CONFIG_MTD_ONENAND is not set
  513 +
  514 +#
  515 +# LPDDR flash memory drivers
  516 +#
  517 +# CONFIG_MTD_LPDDR is not set
  518 +
  519 +#
  520 +# UBI - Unsorted block images
  521 +#
  522 +CONFIG_MTD_UBI=y
  523 +CONFIG_MTD_UBI_WL_THRESHOLD=4096
  524 +CONFIG_MTD_UBI_BEB_RESERVE=1
  525 +CONFIG_MTD_UBI_GLUEBI=y
  526 +
  527 +#
  528 +# UBI debugging options
  529 +#
  530 +# CONFIG_MTD_UBI_DEBUG is not set
  531 +# CONFIG_PARPORT is not set
  532 +CONFIG_BLK_DEV=y
195 533 # CONFIG_BLK_DEV_COW_COMMON is not set
196 534 CONFIG_BLK_DEV_LOOP=y
197 535 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
198   -CONFIG_BLK_DEV_NBD=y
  536 +# CONFIG_BLK_DEV_NBD is not set
199 537 # CONFIG_BLK_DEV_UB is not set
200 538 CONFIG_BLK_DEV_RAM=y
201 539 CONFIG_BLK_DEV_RAM_COUNT=16
202   -CONFIG_BLK_DEV_RAM_SIZE=4096
203   -CONFIG_BLK_DEV_INITRD=y
204   -CONFIG_INITRAMFS_SOURCE=""
  540 +CONFIG_BLK_DEV_RAM_SIZE=16384
  541 +# CONFIG_BLK_DEV_XIP is not set
205 542 # CONFIG_CDROM_PKTCDVD is not set
  543 +# CONFIG_ATA_OVER_ETH is not set
  544 +CONFIG_MISC_DEVICES=y
  545 +CONFIG_ATMEL_TCLIB=y
  546 +CONFIG_ATMEL_TCB_CLKSRC=y
  547 +CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0
  548 +CONFIG_ATMEL_SSC=y
  549 +# CONFIG_ENCLOSURE_SERVICES is not set
  550 +# CONFIG_C2PORT is not set
206 551  
207 552 #
208   -# IO Schedulers
  553 +# EEPROM support
209 554 #
210   -CONFIG_IOSCHED_NOOP=y
211   -CONFIG_IOSCHED_AS=y
212   -CONFIG_IOSCHED_DEADLINE=y
213   -CONFIG_IOSCHED_CFQ=y
214   -# CONFIG_ATA_OVER_ETH is not set
  555 +# CONFIG_EEPROM_93CX6 is not set
  556 +CONFIG_HAVE_IDE=y
  557 +# CONFIG_IDE is not set
215 558  
216 559 #
217 560 # SCSI device support
218 561 #
  562 +# CONFIG_RAID_ATTRS is not set
219 563 CONFIG_SCSI=y
  564 +CONFIG_SCSI_DMA=y
  565 +# CONFIG_SCSI_TGT is not set
  566 +# CONFIG_SCSI_NETLINK is not set
220 567 CONFIG_SCSI_PROC_FS=y
221 568  
222 569 #
223 570  
224 571  
225 572  
226 573  
227 574  
228 575  
229 576  
230 577  
231 578  
232 579  
233 580  
234 581  
235 582  
236 583  
237 584  
238 585  
... ... @@ -232,145 +579,87 @@
232 579 #
233 580 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
234 581 #
235   -# CONFIG_SCSI_MULTI_LUN is not set
236   -# CONFIG_SCSI_CONSTANTS is not set
237   -# CONFIG_SCSI_LOGGING is not set
  582 +CONFIG_SCSI_MULTI_LUN=y
  583 +CONFIG_SCSI_CONSTANTS=y
  584 +CONFIG_SCSI_LOGGING=y
  585 +# CONFIG_SCSI_SCAN_ASYNC is not set
  586 +CONFIG_SCSI_WAIT_SCAN=m
238 587  
239 588 #
240   -# SCSI Transport Attributes
  589 +# SCSI Transports
241 590 #
242   -# CONFIG_SCSI_SPI_ATTRS is not set
  591 +CONFIG_SCSI_SPI_ATTRS=m
243 592 # CONFIG_SCSI_FC_ATTRS is not set
244 593 # CONFIG_SCSI_ISCSI_ATTRS is not set
245   -
246   -#
247   -# SCSI low-level drivers
248   -#
249   -# CONFIG_SCSI_SATA is not set
250   -# CONFIG_SCSI_DEBUG is not set
251   -
252   -#
253   -# Multi-device support (RAID and LVM)
254   -#
  594 +# CONFIG_SCSI_SAS_LIBSAS is not set
  595 +# CONFIG_SCSI_SRP_ATTRS is not set
  596 +# CONFIG_SCSI_LOWLEVEL is not set
  597 +# CONFIG_SCSI_DH is not set
  598 +# CONFIG_SCSI_OSD_INITIATOR is not set
  599 +# CONFIG_ATA is not set
255 600 # CONFIG_MD is not set
256   -
257   -#
258   -# Fusion MPT device support
259   -#
260   -# CONFIG_FUSION is not set
261   -
262   -#
263   -# IEEE 1394 (FireWire) support
264   -#
265   -
266   -#
267   -# I2O device support
268   -#
269   -
270   -#
271   -# Networking support
272   -#
273   -CONFIG_NET=y
274   -
275   -#
276   -# Networking options
277   -#
278   -CONFIG_PACKET=y
279   -# CONFIG_PACKET_MMAP is not set
280   -CONFIG_UNIX=y
281   -# CONFIG_NET_KEY is not set
282   -CONFIG_INET=y
283   -CONFIG_IP_MULTICAST=y
284   -# CONFIG_IP_ADVANCED_ROUTER is not set
285   -CONFIG_IP_FIB_HASH=y
286   -CONFIG_IP_PNP=y
287   -CONFIG_IP_PNP_DHCP=y
288   -# CONFIG_IP_PNP_BOOTP is not set
289   -# CONFIG_IP_PNP_RARP is not set
290   -# CONFIG_NET_IPIP is not set
291   -# CONFIG_NET_IPGRE is not set
292   -# CONFIG_IP_MROUTE is not set
293   -# CONFIG_SYN_COOKIES is not set
294   -# CONFIG_INET_AH is not set
295   -# CONFIG_INET_ESP is not set
296   -# CONFIG_INET_IPCOMP is not set
297   -# CONFIG_INET_TUNNEL is not set
298   -# CONFIG_IP_TCPDIAG is not set
299   -# CONFIG_IP_TCPDIAG_IPV6 is not set
300   -# CONFIG_TCP_CONG_ADVANCED is not set
301   -CONFIG_TCP_CONG_BIC=y
302   -# CONFIG_IPV6 is not set
303   -# CONFIG_NETFILTER is not set
304   -# CONFIG_BRIDGE is not set
305   -# CONFIG_VLAN_8021Q is not set
306   -# CONFIG_DECNET is not set
307   -# CONFIG_LLC2 is not set
308   -# CONFIG_IPX is not set
309   -# CONFIG_ATALK is not set
310   -
311   -#
312   -# QoS and/or fair queueing
313   -#
314   -# CONFIG_NET_SCHED is not set
315   -# CONFIG_NET_CLS_ROUTE is not set
316   -
317   -#
318   -# Network testing
319   -#
320   -# CONFIG_NET_PKTGEN is not set
321   -# CONFIG_NETPOLL is not set
322   -# CONFIG_NET_POLL_CONTROLLER is not set
323   -# CONFIG_HAMRADIO is not set
324   -# CONFIG_IRDA is not set
325   -# CONFIG_BT is not set
326 601 CONFIG_NETDEVICES=y
  602 +CONFIG_COMPAT_NET_DEV_OPS=y
327 603 # CONFIG_DUMMY is not set
328 604 # CONFIG_BONDING is not set
  605 +# CONFIG_MACVLAN is not set
329 606 # CONFIG_EQUALIZER is not set
330 607 # CONFIG_TUN is not set
331   -
332   -#
333   -# Ethernet (10 or 100Mbit)
334   -#
  608 +# CONFIG_VETH is not set
  609 +# CONFIG_PHYLIB is not set
335 610 CONFIG_NET_ETHERNET=y
336 611 CONFIG_MII=y
337 612 CONFIG_ARM_AT91_ETHER=y
  613 +# CONFIG_AX88796 is not set
338 614 # CONFIG_SMC91X is not set
339 615 # CONFIG_DM9000 is not set
  616 +# CONFIG_ETHOC is not set
  617 +# CONFIG_SMC911X is not set
  618 +# CONFIG_SMSC911X is not set
  619 +# CONFIG_DNET is not set
  620 +# CONFIG_IBM_NEW_EMAC_ZMII is not set
  621 +# CONFIG_IBM_NEW_EMAC_RGMII is not set
  622 +# CONFIG_IBM_NEW_EMAC_TAH is not set
  623 +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
  624 +# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
  625 +# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
  626 +# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
  627 +# CONFIG_B44 is not set
  628 +# CONFIG_NETDEV_1000 is not set
  629 +# CONFIG_NETDEV_10000 is not set
340 630  
341 631 #
342   -# Ethernet (1000 Mbit)
  632 +# Wireless LAN
343 633 #
  634 +# CONFIG_WLAN_PRE80211 is not set
  635 +# CONFIG_WLAN_80211 is not set
344 636  
345 637 #
346   -# Ethernet (10000 Mbit)
  638 +# Enable WiMAX (Networking options) to see the WiMAX drivers
347 639 #
348 640  
349 641 #
350   -# Token Ring devices
  642 +# USB Network Adapters
351 643 #
352   -
353   -#
354   -# Wireless LAN (non-hamradio)
355   -#
356   -# CONFIG_NET_RADIO is not set
357   -
358   -#
359   -# Wan interfaces
360   -#
  644 +# CONFIG_USB_CATC is not set
  645 +# CONFIG_USB_KAWETH is not set
  646 +# CONFIG_USB_PEGASUS is not set
  647 +# CONFIG_USB_RTL8150 is not set
  648 +# CONFIG_USB_USBNET is not set
361 649 # CONFIG_WAN is not set
362 650 # CONFIG_PPP is not set
363 651 # CONFIG_SLIP is not set
364   -
365   -#
366   -# ISDN subsystem
367   -#
  652 +# CONFIG_NETCONSOLE is not set
  653 +# CONFIG_NETPOLL is not set
  654 +# CONFIG_NET_POLL_CONTROLLER is not set
368 655 # CONFIG_ISDN is not set
369 656  
370 657 #
371 658 # Input device support
372 659 #
373 660 CONFIG_INPUT=y
  661 +# CONFIG_INPUT_FF_MEMLESS is not set
  662 +# CONFIG_INPUT_POLLDEV is not set
374 663  
375 664 #
376 665 # Userland interfaces
... ... @@ -380,7 +669,6 @@
380 669 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
381 670 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
382 671 # CONFIG_INPUT_JOYDEV is not set
383   -# CONFIG_INPUT_TSDEV is not set
384 672 # CONFIG_INPUT_EVDEV is not set
385 673 # CONFIG_INPUT_EVBUG is not set
386 674  
387 675  
388 676  
389 677  
... ... @@ -390,23 +678,25 @@
390 678 # CONFIG_INPUT_KEYBOARD is not set
391 679 # CONFIG_INPUT_MOUSE is not set
392 680 # CONFIG_INPUT_JOYSTICK is not set
  681 +# CONFIG_INPUT_TABLET is not set
393 682 # CONFIG_INPUT_TOUCHSCREEN is not set
394 683 # CONFIG_INPUT_MISC is not set
395 684  
396 685 #
397 686 # Hardware I/O ports
398 687 #
399   -CONFIG_SERIO=y
400   -# CONFIG_SERIO_SERPORT is not set
401   -# CONFIG_SERIO_RAW is not set
  688 +# CONFIG_SERIO is not set
402 689 # CONFIG_GAMEPORT is not set
403 690  
404 691 #
405 692 # Character devices
406 693 #
407 694 CONFIG_VT=y
  695 +CONFIG_CONSOLE_TRANSLATIONS=y
408 696 CONFIG_VT_CONSOLE=y
409 697 CONFIG_HW_CONSOLE=y
  698 +# CONFIG_VT_HW_CONSOLE_BINDING is not set
  699 +CONFIG_DEVKMEM=y
410 700 # CONFIG_SERIAL_NONSTANDARD is not set
411 701  
412 702 #
413 703  
414 704  
415 705  
416 706  
417 707  
418 708  
419 709  
420 710  
421 711  
422 712  
423 713  
424 714  
425 715  
426 716  
427 717  
428 718  
429 719  
430 720  
431 721  
432 722  
433 723  
434 724  
435 725  
436 726  
437 727  
438 728  
439 729  
440 730  
441 731  
442 732  
443 733  
444 734  
445 735  
446 736  
447 737  
448 738  
449 739  
450 740  
451 741  
452 742  
453 743  
454 744  
455 745  
456 746  
457 747  
458 748  
459 749  
460 750  
461 751  
462 752  
463 753  
464 754  
465 755  
466 756  
467 757  
468 758  
469 759  
470 760  
471 761  
472 762  
473 763  
474 764  
475 765  
... ... @@ -419,215 +709,362 @@
419 709 #
420 710 CONFIG_SERIAL_ATMEL=y
421 711 CONFIG_SERIAL_ATMEL_CONSOLE=y
  712 +CONFIG_SERIAL_ATMEL_PDC=y
  713 +# CONFIG_SERIAL_ATMEL_TTYAT is not set
422 714 CONFIG_SERIAL_CORE=y
423 715 CONFIG_SERIAL_CORE_CONSOLE=y
424 716 CONFIG_UNIX98_PTYS=y
425   -CONFIG_LEGACY_PTYS=y
426   -CONFIG_LEGACY_PTY_COUNT=256
  717 +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
  718 +# CONFIG_LEGACY_PTYS is not set
  719 +# CONFIG_IPMI_HANDLER is not set
  720 +# CONFIG_HW_RANDOM is not set
  721 +# CONFIG_R3964 is not set
  722 +# CONFIG_RAW_DRIVER is not set
  723 +# CONFIG_TCG_TPM is not set
  724 +# CONFIG_I2C is not set
  725 +# CONFIG_SPI is not set
  726 +CONFIG_ARCH_REQUIRE_GPIOLIB=y
  727 +CONFIG_GPIOLIB=y
  728 +# CONFIG_DEBUG_GPIO is not set
  729 +# CONFIG_GPIO_SYSFS is not set
427 730  
428 731 #
429   -# IPMI
  732 +# Memory mapped GPIO expanders:
430 733 #
431   -# CONFIG_IPMI_HANDLER is not set
432 734  
433 735 #
434   -# Watchdog Cards
  736 +# I2C GPIO expanders:
435 737 #
436   -# CONFIG_WATCHDOG is not set
437   -# CONFIG_NVRAM is not set
438   -# CONFIG_RTC is not set
439   -# CONFIG_AT91RM9200_RTC is not set
440   -# CONFIG_DTLK is not set
441   -# CONFIG_R3964 is not set
442 738  
443 739 #
444   -# Ftape, the floppy tape device driver
  740 +# PCI GPIO expanders:
445 741 #
446   -# CONFIG_RAW_DRIVER is not set
447 742  
448 743 #
449   -# TPM devices
  744 +# SPI GPIO expanders:
450 745 #
451   -# CONFIG_AT91_SPI is not set
  746 +# CONFIG_W1 is not set
  747 +# CONFIG_POWER_SUPPLY is not set
  748 +# CONFIG_HWMON is not set
  749 +# CONFIG_THERMAL is not set
  750 +# CONFIG_THERMAL_HWMON is not set
  751 +CONFIG_WATCHDOG=y
  752 +# CONFIG_WATCHDOG_NOWAYOUT is not set
452 753  
453 754 #
454   -# I2C support
  755 +# Watchdog Device Drivers
455 756 #
456   -# CONFIG_I2C is not set
  757 +# CONFIG_SOFT_WATCHDOG is not set
  758 +CONFIG_AT91RM9200_WATCHDOG=y
457 759  
458 760 #
459   -# Misc devices
  761 +# USB-based Watchdog Cards
460 762 #
  763 +# CONFIG_USBPCWATCHDOG is not set
  764 +CONFIG_SSB_POSSIBLE=y
461 765  
462 766 #
  767 +# Sonics Silicon Backplane
  768 +#
  769 +# CONFIG_SSB is not set
  770 +
  771 +#
  772 +# Multifunction device drivers
  773 +#
  774 +# CONFIG_MFD_CORE is not set
  775 +# CONFIG_MFD_SM501 is not set
  776 +# CONFIG_MFD_ASIC3 is not set
  777 +# CONFIG_HTC_EGPIO is not set
  778 +# CONFIG_HTC_PASIC3 is not set
  779 +# CONFIG_MFD_TMIO is not set
  780 +# CONFIG_MFD_T7L66XB is not set
  781 +# CONFIG_MFD_TC6387XB is not set
  782 +# CONFIG_MFD_TC6393XB is not set
  783 +
  784 +#
463 785 # Multimedia devices
464 786 #
  787 +
  788 +#
  789 +# Multimedia core support
  790 +#
465 791 # CONFIG_VIDEO_DEV is not set
  792 +# CONFIG_DVB_CORE is not set
  793 +# CONFIG_VIDEO_MEDIA is not set
466 794  
467 795 #
468   -# Digital Video Broadcasting Devices
  796 +# Multimedia drivers
469 797 #
470   -# CONFIG_DVB is not set
  798 +# CONFIG_DAB is not set
471 799  
472 800 #
473 801 # Graphics support
474 802 #
475   -# CONFIG_FB is not set
  803 +# CONFIG_VGASTATE is not set
  804 +# CONFIG_VIDEO_OUTPUT_CONTROL is not set
  805 +CONFIG_FB=y
  806 +# CONFIG_FIRMWARE_EDID is not set
  807 +# CONFIG_FB_DDC is not set
  808 +# CONFIG_FB_BOOT_VESA_SUPPORT is not set
  809 +# CONFIG_FB_CFB_FILLRECT is not set
  810 +# CONFIG_FB_CFB_COPYAREA is not set
  811 +# CONFIG_FB_CFB_IMAGEBLIT is not set
  812 +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
  813 +# CONFIG_FB_SYS_FILLRECT is not set
  814 +# CONFIG_FB_SYS_COPYAREA is not set
  815 +# CONFIG_FB_SYS_IMAGEBLIT is not set
  816 +# CONFIG_FB_FOREIGN_ENDIAN is not set
  817 +# CONFIG_FB_SYS_FOPS is not set
  818 +# CONFIG_FB_SVGALIB is not set
  819 +# CONFIG_FB_MACMODES is not set
  820 +# CONFIG_FB_BACKLIGHT is not set
  821 +CONFIG_FB_MODE_HELPERS=y
  822 +CONFIG_FB_TILEBLITTING=y
476 823  
477 824 #
478   -# Console display driver support
  825 +# Frame buffer hardware drivers
479 826 #
480   -# CONFIG_VGA_CONSOLE is not set
481   -CONFIG_DUMMY_CONSOLE=y
  827 +# CONFIG_FB_S1D13XXX is not set
  828 +# CONFIG_FB_VIRTUAL is not set
  829 +# CONFIG_FB_METRONOME is not set
  830 +# CONFIG_FB_MB862XX is not set
  831 +# CONFIG_FB_BROADSHEET is not set
  832 +CONFIG_BACKLIGHT_LCD_SUPPORT=y
  833 +# CONFIG_LCD_CLASS_DEVICE is not set
  834 +CONFIG_BACKLIGHT_CLASS_DEVICE=y
  835 +# CONFIG_BACKLIGHT_GENERIC is not set
482 836  
483 837 #
484   -# Sound
  838 +# Display device support
485 839 #
486   -# CONFIG_SOUND is not set
  840 +# CONFIG_DISPLAY_SUPPORT is not set
487 841  
488 842 #
489   -# USB support
  843 +# Console display driver support
490 844 #
  845 +# CONFIG_VGA_CONSOLE is not set
  846 +CONFIG_DUMMY_CONSOLE=y
  847 +CONFIG_FRAMEBUFFER_CONSOLE=y
  848 +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
  849 +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
  850 +CONFIG_FONTS=y
  851 +# CONFIG_FONT_8x8 is not set
  852 +# CONFIG_FONT_8x16 is not set
  853 +# CONFIG_FONT_6x11 is not set
  854 +# CONFIG_FONT_7x14 is not set
  855 +# CONFIG_FONT_PEARL_8x8 is not set
  856 +# CONFIG_FONT_ACORN_8x8 is not set
  857 +CONFIG_FONT_MINI_4x6=y
  858 +# CONFIG_FONT_SUN8x16 is not set
  859 +# CONFIG_FONT_SUN12x22 is not set
  860 +# CONFIG_FONT_10x18 is not set
  861 +# CONFIG_LOGO is not set
  862 +# CONFIG_SOUND is not set
  863 +# CONFIG_HID_SUPPORT is not set
  864 +CONFIG_USB_SUPPORT=y
491 865 CONFIG_USB_ARCH_HAS_HCD=y
492 866 CONFIG_USB_ARCH_HAS_OHCI=y
  867 +# CONFIG_USB_ARCH_HAS_EHCI is not set
493 868 CONFIG_USB=y
494   -CONFIG_USB_DEBUG=y
  869 +# CONFIG_USB_DEBUG is not set
  870 +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
495 871  
496 872 #
497 873 # Miscellaneous USB options
498 874 #
499 875 CONFIG_USB_DEVICEFS=y
  876 +CONFIG_USB_DEVICE_CLASS=y
  877 +# CONFIG_USB_DYNAMIC_MINORS is not set
  878 +# CONFIG_USB_OTG is not set
  879 +# CONFIG_USB_MON is not set
  880 +# CONFIG_USB_WUSB is not set
  881 +# CONFIG_USB_WUSB_CBAF is not set
500 882  
501 883 #
502 884 # USB Host Controller Drivers
503 885 #
  886 +# CONFIG_USB_C67X00_HCD is not set
  887 +# CONFIG_USB_OXU210HP_HCD is not set
504 888 # CONFIG_USB_ISP116X_HCD is not set
  889 +# CONFIG_USB_ISP1760_HCD is not set
505 890 CONFIG_USB_OHCI_HCD=y
506   -# CONFIG_USB_OHCI_BIG_ENDIAN is not set
  891 +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
  892 +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
507 893 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
508 894 # CONFIG_USB_SL811_HCD is not set
  895 +# CONFIG_USB_R8A66597_HCD is not set
  896 +# CONFIG_USB_HWA_HCD is not set
  897 +# CONFIG_USB_MUSB_HDRC is not set
509 898  
510 899 #
511 900 # USB Device Class drivers
512 901 #
513   -# CONFIG_USB_BLUETOOTH_TTY is not set
514 902 # CONFIG_USB_ACM is not set
515 903 # CONFIG_USB_PRINTER is not set
  904 +# CONFIG_USB_WDM is not set
  905 +# CONFIG_USB_TMC is not set
516 906  
517 907 #
518   -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
  908 +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
519 909 #
520   -CONFIG_USB_STORAGE=y
521   -CONFIG_USB_STORAGE_DEBUG=y
522   -# CONFIG_USB_STORAGE_FREECOM is not set
523   -# CONFIG_USB_STORAGE_DPCM is not set
524 910  
525 911 #
526   -# USB Input Devices
  912 +# also be needed; see USB_STORAGE Help for more info
527 913 #
528   -# CONFIG_USB_HID is not set
  914 +CONFIG_USB_STORAGE=y
  915 +# CONFIG_USB_STORAGE_DEBUG is not set
  916 +# CONFIG_USB_STORAGE_DATAFAB is not set
  917 +# CONFIG_USB_STORAGE_FREECOM is not set
  918 +# CONFIG_USB_STORAGE_ISD200 is not set
  919 +# CONFIG_USB_STORAGE_USBAT is not set
  920 +# CONFIG_USB_STORAGE_SDDR09 is not set
  921 +# CONFIG_USB_STORAGE_SDDR55 is not set
  922 +# CONFIG_USB_STORAGE_JUMPSHOT is not set
  923 +# CONFIG_USB_STORAGE_ALAUDA is not set
  924 +# CONFIG_USB_STORAGE_ONETOUCH is not set
  925 +# CONFIG_USB_STORAGE_KARMA is not set
  926 +# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
  927 +CONFIG_USB_LIBUSUAL=y
529 928  
530 929 #
531   -# USB HID Boot Protocol drivers
532   -#
533   -# CONFIG_USB_KBD is not set
534   -# CONFIG_USB_MOUSE is not set
535   -# CONFIG_USB_AIPTEK is not set
536   -# CONFIG_USB_WACOM is not set
537   -# CONFIG_USB_ACECAD is not set
538   -# CONFIG_USB_KBTAB is not set
539   -# CONFIG_USB_POWERMATE is not set
540   -# CONFIG_USB_MTOUCH is not set
541   -# CONFIG_USB_ITMTOUCH is not set
542   -# CONFIG_USB_EGALAX is not set
543   -# CONFIG_USB_XPAD is not set
544   -# CONFIG_USB_ATI_REMOTE is not set
545   -
546   -#
547 930 # USB Imaging devices
548 931 #
  932 +# CONFIG_USB_MDC800 is not set
549 933 # CONFIG_USB_MICROTEK is not set
550 934  
551 935 #
552   -# USB Multimedia devices
  936 +# USB port drivers
553 937 #
554   -# CONFIG_USB_DABUSB is not set
  938 +# CONFIG_USB_SERIAL is not set
555 939  
556 940 #
557   -# Video4Linux support is needed for USB Multimedia device support
  941 +# USB Miscellaneous drivers
558 942 #
  943 +# CONFIG_USB_EMI62 is not set
  944 +# CONFIG_USB_EMI26 is not set
  945 +# CONFIG_USB_ADUTUX is not set
  946 +# CONFIG_USB_SEVSEG is not set
  947 +# CONFIG_USB_RIO500 is not set
  948 +# CONFIG_USB_LEGOTOWER is not set
  949 +# CONFIG_USB_LCD is not set
  950 +# CONFIG_USB_BERRY_CHARGE is not set
  951 +# CONFIG_USB_LED is not set
  952 +# CONFIG_USB_CYPRESS_CY7C63 is not set
  953 +# CONFIG_USB_CYTHERM is not set
  954 +# CONFIG_USB_IDMOUSE is not set
  955 +# CONFIG_USB_FTDI_ELAN is not set
  956 +# CONFIG_USB_APPLEDISPLAY is not set
  957 +# CONFIG_USB_LD is not set
  958 +# CONFIG_USB_TRANCEVIBRATOR is not set
  959 +# CONFIG_USB_IOWARRIOR is not set
  960 +# CONFIG_USB_TEST is not set
  961 +# CONFIG_USB_ISIGHTFW is not set
  962 +# CONFIG_USB_VST is not set
  963 +# CONFIG_USB_GADGET is not set
559 964  
560 965 #
561   -# USB Network Adapters
  966 +# OTG and related infrastructure
562 967 #
563   -# CONFIG_USB_KAWETH is not set
564   -# CONFIG_USB_PEGASUS is not set
565   -# CONFIG_USB_USBNET is not set
566   -# CONFIG_USB_MON is not set
  968 +# CONFIG_USB_GPIO_VBUS is not set
  969 +# CONFIG_NOP_USB_XCEIV is not set
  970 +CONFIG_MMC=y
  971 +# CONFIG_MMC_DEBUG is not set
  972 +# CONFIG_MMC_UNSAFE_RESUME is not set
567 973  
568 974 #
569   -# USB port drivers
  975 +# MMC/SD/SDIO Card Drivers
570 976 #
  977 +CONFIG_MMC_BLOCK=y
  978 +CONFIG_MMC_BLOCK_BOUNCE=y
  979 +# CONFIG_SDIO_UART is not set
  980 +# CONFIG_MMC_TEST is not set
571 981  
572 982 #
573   -# USB Serial Converter support
  983 +# MMC/SD/SDIO Host Controller Drivers
574 984 #
575   -# CONFIG_USB_SERIAL is not set
  985 +# CONFIG_MMC_SDHCI is not set
  986 +CONFIG_MMC_AT91=y
  987 +# CONFIG_MEMSTICK is not set
  988 +# CONFIG_ACCESSIBILITY is not set
  989 +# CONFIG_NEW_LEDS is not set
  990 +CONFIG_RTC_LIB=y
  991 +CONFIG_RTC_CLASS=y
  992 +CONFIG_RTC_HCTOSYS=y
  993 +CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
  994 +# CONFIG_RTC_DEBUG is not set
576 995  
577 996 #
578   -# USB Miscellaneous drivers
  997 +# RTC interfaces
579 998 #
580   -# CONFIG_USB_EMI62 is not set
581   -# CONFIG_USB_EMI26 is not set
582   -# CONFIG_USB_LCD is not set
583   -# CONFIG_USB_LED is not set
584   -# CONFIG_USB_CYTHERM is not set
585   -# CONFIG_USB_PHIDGETKIT is not set
586   -# CONFIG_USB_PHIDGETSERVO is not set
587   -# CONFIG_USB_IDMOUSE is not set
  999 +CONFIG_RTC_INTF_SYSFS=y
  1000 +CONFIG_RTC_INTF_PROC=y
  1001 +CONFIG_RTC_INTF_DEV=y
  1002 +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
  1003 +# CONFIG_RTC_DRV_TEST is not set
588 1004  
589 1005 #
590   -# USB DSL modem support
  1006 +# SPI RTC drivers
591 1007 #
592 1008  
593 1009 #
594   -# USB Gadget Support
  1010 +# Platform RTC drivers
595 1011 #
596   -# CONFIG_USB_GADGET is not set
  1012 +# CONFIG_RTC_DRV_CMOS is not set
  1013 +# CONFIG_RTC_DRV_DS1286 is not set
  1014 +# CONFIG_RTC_DRV_DS1511 is not set
  1015 +# CONFIG_RTC_DRV_DS1553 is not set
  1016 +# CONFIG_RTC_DRV_DS1742 is not set
  1017 +# CONFIG_RTC_DRV_STK17TA8 is not set
  1018 +# CONFIG_RTC_DRV_M48T86 is not set
  1019 +# CONFIG_RTC_DRV_M48T35 is not set
  1020 +# CONFIG_RTC_DRV_M48T59 is not set
  1021 +# CONFIG_RTC_DRV_BQ4802 is not set
  1022 +# CONFIG_RTC_DRV_V3020 is not set
597 1023  
598 1024 #
599   -# MMC/SD Card support
  1025 +# on-CPU RTC drivers
600 1026 #
601   -# CONFIG_MMC is not set
  1027 +CONFIG_RTC_DRV_AT91RM9200=y
  1028 +# CONFIG_DMADEVICES is not set
  1029 +# CONFIG_AUXDISPLAY is not set
  1030 +# CONFIG_REGULATOR is not set
  1031 +# CONFIG_UIO is not set
  1032 +# CONFIG_STAGING is not set
602 1033  
603 1034 #
604 1035 # File systems
605 1036 #
606 1037 CONFIG_EXT2_FS=y
607   -CONFIG_EXT2_FS_XATTR=y
608   -# CONFIG_EXT2_FS_POSIX_ACL is not set
609   -# CONFIG_EXT2_FS_SECURITY is not set
  1038 +# CONFIG_EXT2_FS_XATTR is not set
610 1039 # CONFIG_EXT2_FS_XIP is not set
611 1040 CONFIG_EXT3_FS=y
  1041 +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
612 1042 CONFIG_EXT3_FS_XATTR=y
613 1043 # CONFIG_EXT3_FS_POSIX_ACL is not set
614 1044 # CONFIG_EXT3_FS_SECURITY is not set
  1045 +# CONFIG_EXT4_FS is not set
615 1046 CONFIG_JBD=y
616 1047 # CONFIG_JBD_DEBUG is not set
617 1048 CONFIG_FS_MBCACHE=y
618 1049 # CONFIG_REISERFS_FS is not set
619 1050 # CONFIG_JFS_FS is not set
  1051 +# CONFIG_FS_POSIX_ACL is not set
  1052 +CONFIG_FILE_LOCKING=y
  1053 +# CONFIG_XFS_FS is not set
  1054 +# CONFIG_OCFS2_FS is not set
  1055 +# CONFIG_BTRFS_FS is not set
  1056 +# CONFIG_DNOTIFY is not set
  1057 +CONFIG_INOTIFY=y
  1058 +CONFIG_INOTIFY_USER=y
  1059 +# CONFIG_QUOTA is not set
  1060 +# CONFIG_AUTOFS_FS is not set
  1061 +# CONFIG_AUTOFS4_FS is not set
  1062 +# CONFIG_FUSE_FS is not set
620 1063  
621 1064 #
622   -# XFS support
  1065 +# Caches
623 1066 #
624   -# CONFIG_XFS_FS is not set
625   -# CONFIG_MINIX_FS is not set
626   -# CONFIG_ROMFS_FS is not set
627   -# CONFIG_QUOTA is not set
628   -CONFIG_DNOTIFY=y
629   -CONFIG_AUTOFS_FS=y
630   -CONFIG_AUTOFS4_FS=y
  1067 +# CONFIG_FSCACHE is not set
631 1068  
632 1069 #
633 1070 # CD-ROM/DVD Filesystems
... ... @@ -639,7 +1076,7 @@
639 1076 # DOS/FAT/NT Filesystems
640 1077 #
641 1078 CONFIG_FAT_FS=y
642   -CONFIG_MSDOS_FS=y
  1079 +# CONFIG_MSDOS_FS is not set
643 1080 CONFIG_VFAT_FS=y
644 1081 CONFIG_FAT_DEFAULT_CODEPAGE=437
645 1082 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
646 1083  
647 1084  
648 1085  
649 1086  
650 1087  
651 1088  
652 1089  
653 1090  
654 1091  
655 1092  
656 1093  
657 1094  
658 1095  
659 1096  
... ... @@ -649,53 +1086,70 @@
649 1086 # Pseudo filesystems
650 1087 #
651 1088 CONFIG_PROC_FS=y
  1089 +CONFIG_PROC_SYSCTL=y
  1090 +CONFIG_PROC_PAGE_MONITOR=y
652 1091 CONFIG_SYSFS=y
653   -CONFIG_DEVPTS_FS_XATTR=y
654   -# CONFIG_DEVPTS_FS_SECURITY is not set
655 1092 CONFIG_TMPFS=y
656   -# CONFIG_TMPFS_XATTR is not set
  1093 +# CONFIG_TMPFS_POSIX_ACL is not set
657 1094 # CONFIG_HUGETLB_PAGE is not set
658   -CONFIG_RAMFS=y
659   -
660   -#
661   -# Miscellaneous filesystems
662   -#
  1095 +CONFIG_CONFIGFS_FS=y
  1096 +CONFIG_MISC_FILESYSTEMS=y
  1097 +# CONFIG_ADFS_FS is not set
  1098 +# CONFIG_AFFS_FS is not set
  1099 +# CONFIG_HFS_FS is not set
663 1100 # CONFIG_HFSPLUS_FS is not set
  1101 +# CONFIG_BEFS_FS is not set
  1102 +# CONFIG_BFS_FS is not set
  1103 +# CONFIG_EFS_FS is not set
  1104 +CONFIG_JFFS2_FS=y
  1105 +CONFIG_JFFS2_FS_DEBUG=0
  1106 +CONFIG_JFFS2_FS_WRITEBUFFER=y
  1107 +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
  1108 +# CONFIG_JFFS2_SUMMARY is not set
  1109 +# CONFIG_JFFS2_FS_XATTR is not set
  1110 +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
  1111 +CONFIG_JFFS2_ZLIB=y
  1112 +# CONFIG_JFFS2_LZO is not set
  1113 +CONFIG_JFFS2_RTIME=y
  1114 +# CONFIG_JFFS2_RUBIN is not set
  1115 +# CONFIG_UBIFS_FS is not set
664 1116 # CONFIG_CRAMFS is not set
  1117 +# CONFIG_SQUASHFS is not set
665 1118 # CONFIG_VXFS_FS is not set
  1119 +# CONFIG_MINIX_FS is not set
  1120 +# CONFIG_OMFS_FS is not set
666 1121 # CONFIG_HPFS_FS is not set
667 1122 # CONFIG_QNX4FS_FS is not set
  1123 +# CONFIG_ROMFS_FS is not set
668 1124 # CONFIG_SYSV_FS is not set
669 1125 # CONFIG_UFS_FS is not set
670   -
671   -#
672   -# Network File Systems
673   -#
  1126 +# CONFIG_NILFS2_FS is not set
  1127 +CONFIG_NETWORK_FILESYSTEMS=y
674 1128 CONFIG_NFS_FS=y
675 1129 CONFIG_NFS_V3=y
676 1130 # CONFIG_NFS_V3_ACL is not set
677   -# CONFIG_NFSD is not set
  1131 +# CONFIG_NFS_V4 is not set
678 1132 CONFIG_ROOT_NFS=y
  1133 +# CONFIG_NFSD is not set
679 1134 CONFIG_LOCKD=y
680 1135 CONFIG_LOCKD_V4=y
681 1136 CONFIG_NFS_COMMON=y
682 1137 CONFIG_SUNRPC=y
  1138 +# CONFIG_RPCSEC_GSS_KRB5 is not set
  1139 +# CONFIG_RPCSEC_GSS_SPKM3 is not set
683 1140 # CONFIG_SMB_FS is not set
684 1141 # CONFIG_CIFS is not set
685 1142 # CONFIG_NCP_FS is not set
686 1143 # CONFIG_CODA_FS is not set
  1144 +# CONFIG_AFS_FS is not set
687 1145  
688 1146 #
689 1147 # Partition Types
690 1148 #
691 1149 # CONFIG_PARTITION_ADVANCED is not set
692 1150 CONFIG_MSDOS_PARTITION=y
693   -
694   -#
695   -# Native Language Support
696   -#
697 1151 CONFIG_NLS=y
698   -CONFIG_NLS_DEFAULT="utf8"
  1152 +CONFIG_NLS_DEFAULT="iso8859-1"
699 1153 CONFIG_NLS_CODEPAGE_437=y
700 1154 # CONFIG_NLS_CODEPAGE_737 is not set
701 1155 # CONFIG_NLS_CODEPAGE_775 is not set
... ... @@ -719,7 +1173,7 @@
719 1173 # CONFIG_NLS_ISO8859_8 is not set
720 1174 # CONFIG_NLS_CODEPAGE_1250 is not set
721 1175 # CONFIG_NLS_CODEPAGE_1251 is not set
722   -CONFIG_NLS_ASCII=y
  1176 +# CONFIG_NLS_ASCII is not set
723 1177 # CONFIG_NLS_ISO8859_1 is not set
724 1178 # CONFIG_NLS_ISO8859_2 is not set
725 1179 # CONFIG_NLS_ISO8859_3 is not set
726 1180  
727 1181  
728 1182  
729 1183  
730 1184  
731 1185  
732 1186  
733 1187  
734 1188  
735 1189  
736 1190  
737 1191  
738 1192  
739 1193  
740 1194  
741 1195  
... ... @@ -733,48 +1187,120 @@
733 1187 # CONFIG_NLS_ISO8859_15 is not set
734 1188 # CONFIG_NLS_KOI8_R is not set
735 1189 # CONFIG_NLS_KOI8_U is not set
736   -# CONFIG_NLS_UTF8 is not set
  1190 +CONFIG_NLS_UTF8=y
  1191 +# CONFIG_DLM is not set
737 1192  
738 1193 #
739 1194 # Kernel hacking
740 1195 #
741 1196 # CONFIG_PRINTK_TIME is not set
  1197 +CONFIG_ENABLE_WARN_DEPRECATED=y
  1198 +CONFIG_ENABLE_MUST_CHECK=y
  1199 +CONFIG_FRAME_WARN=1024
  1200 +CONFIG_MAGIC_SYSRQ=y
  1201 +# CONFIG_UNUSED_SYMBOLS is not set
  1202 +CONFIG_DEBUG_FS=y
  1203 +# CONFIG_HEADERS_CHECK is not set
742 1204 CONFIG_DEBUG_KERNEL=y
743   -# CONFIG_MAGIC_SYSRQ is not set
744   -CONFIG_LOG_BUF_SHIFT=14
  1205 +# CONFIG_DEBUG_SHIRQ is not set
  1206 +CONFIG_DETECT_SOFTLOCKUP=y
  1207 +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
  1208 +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
  1209 +CONFIG_DETECT_HUNG_TASK=y
  1210 +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
  1211 +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
  1212 +# CONFIG_SCHED_DEBUG is not set
745 1213 # CONFIG_SCHEDSTATS is not set
746   -# CONFIG_DEBUG_SLAB is not set
  1214 +# CONFIG_TIMER_STATS is not set
  1215 +# CONFIG_DEBUG_OBJECTS is not set
  1216 +# CONFIG_SLUB_DEBUG_ON is not set
  1217 +# CONFIG_SLUB_STATS is not set
  1218 +# CONFIG_DEBUG_PREEMPT is not set
  1219 +# CONFIG_DEBUG_RT_MUTEXES is not set
  1220 +# CONFIG_RT_MUTEX_TESTER is not set
747 1221 # CONFIG_DEBUG_SPINLOCK is not set
  1222 +# CONFIG_DEBUG_MUTEXES is not set
  1223 +# CONFIG_DEBUG_LOCK_ALLOC is not set
  1224 +# CONFIG_PROVE_LOCKING is not set
  1225 +# CONFIG_LOCK_STAT is not set
748 1226 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
  1227 +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
749 1228 # CONFIG_DEBUG_KOBJECT is not set
750 1229 CONFIG_DEBUG_BUGVERBOSE=y
751 1230 # CONFIG_DEBUG_INFO is not set
752   -# CONFIG_DEBUG_FS is not set
753   -CONFIG_FRAME_POINTER=y
754   -CONFIG_DEBUG_USER=y
755   -CONFIG_DEBUG_ERRORS=y
756   -CONFIG_DEBUG_LL=y
757   -# CONFIG_DEBUG_ICEDCC is not set
  1231 +# CONFIG_DEBUG_VM is not set
  1232 +# CONFIG_DEBUG_WRITECOUNT is not set
  1233 +CONFIG_DEBUG_MEMORY_INIT=y
  1234 +# CONFIG_DEBUG_LIST is not set
  1235 +# CONFIG_DEBUG_SG is not set
  1236 +# CONFIG_DEBUG_NOTIFIERS is not set
  1237 +# CONFIG_BOOT_PRINTK_DELAY is not set
  1238 +# CONFIG_RCU_TORTURE_TEST is not set
  1239 +# CONFIG_RCU_CPU_STALL_DETECTOR is not set
  1240 +# CONFIG_BACKTRACE_SELF_TEST is not set
  1241 +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
  1242 +# CONFIG_FAULT_INJECTION is not set
  1243 +# CONFIG_LATENCYTOP is not set
  1244 +# CONFIG_SYSCTL_SYSCALL_CHECK is not set
  1245 +# CONFIG_PAGE_POISONING is not set
  1246 +CONFIG_HAVE_FUNCTION_TRACER=y
  1247 +CONFIG_TRACING_SUPPORT=y
758 1248  
759 1249 #
760   -# Security options
  1250 +# Tracers
761 1251 #
762   -# CONFIG_KEYS is not set
763   -# CONFIG_SECURITY is not set
  1252 +# CONFIG_FUNCTION_TRACER is not set
  1253 +# CONFIG_IRQSOFF_TRACER is not set
  1254 +# CONFIG_PREEMPT_TRACER is not set
  1255 +# CONFIG_SCHED_TRACER is not set
  1256 +# CONFIG_CONTEXT_SWITCH_TRACER is not set
  1257 +# CONFIG_EVENT_TRACER is not set
  1258 +# CONFIG_BOOT_TRACER is not set
  1259 +# CONFIG_TRACE_BRANCH_PROFILING is not set
  1260 +# CONFIG_STACK_TRACER is not set
  1261 +# CONFIG_KMEMTRACE is not set
  1262 +# CONFIG_WORKQUEUE_TRACER is not set
  1263 +# CONFIG_BLK_DEV_IO_TRACE is not set
  1264 +# CONFIG_DYNAMIC_DEBUG is not set
  1265 +# CONFIG_SAMPLES is not set
  1266 +CONFIG_HAVE_ARCH_KGDB=y
  1267 +# CONFIG_KGDB is not set
  1268 +CONFIG_ARM_UNWIND=y
  1269 +# CONFIG_DEBUG_USER is not set
  1270 +# CONFIG_DEBUG_ERRORS is not set
  1271 +# CONFIG_DEBUG_STACK_USAGE is not set
  1272 +# CONFIG_DEBUG_LL is not set
764 1273  
765 1274 #
766   -# Cryptographic options
  1275 +# Security options
767 1276 #
  1277 +# CONFIG_KEYS is not set
  1278 +# CONFIG_SECURITY is not set
  1279 +# CONFIG_SECURITYFS is not set
  1280 +# CONFIG_SECURITY_FILE_CAPABILITIES is not set
768 1281 # CONFIG_CRYPTO is not set
  1282 +# CONFIG_BINARY_PRINTF is not set
769 1283  
770 1284 #
771   -# Hardware crypto devices
772   -#
773   -
774   -#
775 1285 # Library routines
776 1286 #
  1287 +CONFIG_BITREVERSE=y
  1288 +CONFIG_GENERIC_FIND_LAST_BIT=y
777 1289 # CONFIG_CRC_CCITT is not set
  1290 +# CONFIG_CRC16 is not set
  1291 +# CONFIG_CRC_T10DIF is not set
  1292 +# CONFIG_CRC_ITU_T is not set
778 1293 CONFIG_CRC32=y
  1294 +# CONFIG_CRC7 is not set
779 1295 # CONFIG_LIBCRC32C is not set
  1296 +CONFIG_AUDIT_GENERIC=y
  1297 +CONFIG_ZLIB_INFLATE=y
  1298 +CONFIG_ZLIB_DEFLATE=y
  1299 +CONFIG_DECOMPRESS_GZIP=y
  1300 +CONFIG_DECOMPRESS_BZIP2=y
  1301 +CONFIG_DECOMPRESS_LZMA=y
  1302 +CONFIG_HAS_IOMEM=y
  1303 +CONFIG_HAS_IOPORT=y
  1304 +CONFIG_HAS_DMA=y
  1305 +CONFIG_NLATTR=y
arch/arm/configs/u300_defconfig
1 1 #
2 2 # Automatically generated make config: don't edit
3   -# Linux kernel version: 2.6.30-rc6
4   -# Mon Jun 1 09:18:22 2009
  3 +# Linux kernel version: 2.6.31-rc1
  4 +# Thu Jul 2 00:16:59 2009
5 5 #
6 6 CONFIG_ARM=y
7 7 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
... ... @@ -9,7 +9,7 @@
9 9 CONFIG_GENERIC_TIME=y
10 10 CONFIG_GENERIC_CLOCKEVENTS=y
11 11 CONFIG_MMU=y
12   -# CONFIG_NO_IOPORT is not set
  12 +CONFIG_HAVE_TCM=y
13 13 CONFIG_GENERIC_HARDIRQS=y
14 14 CONFIG_STACKTRACE_SUPPORT=y
15 15 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
16 16  
... ... @@ -18,13 +18,12 @@
18 18 CONFIG_HARDIRQS_SW_RESEND=y
19 19 CONFIG_GENERIC_IRQ_PROBE=y
20 20 CONFIG_RWSEM_GENERIC_SPINLOCK=y
21   -# CONFIG_ARCH_HAS_ILOG2_U32 is not set
22   -# CONFIG_ARCH_HAS_ILOG2_U64 is not set
23 21 CONFIG_GENERIC_HWEIGHT=y
24 22 CONFIG_GENERIC_CALIBRATE_DELAY=y
25 23 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
26 24 CONFIG_VECTORS_BASE=0xffff0000
27 25 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  26 +CONFIG_CONSTRUCTORS=y
28 27  
29 28 #
30 29 # General setup
... ... @@ -68,7 +67,6 @@
68 67 CONFIG_KALLSYMS=y
69 68 # CONFIG_KALLSYMS_ALL is not set
70 69 # CONFIG_KALLSYMS_EXTRA_PASS is not set
71   -# CONFIG_STRIP_ASM_SYMS is not set
72 70 CONFIG_HOTPLUG=y
73 71 CONFIG_PRINTK=y
74 72 CONFIG_BUG=y
75 73  
... ... @@ -81,8 +79,13 @@
81 79 CONFIG_EVENTFD=y
82 80 CONFIG_SHMEM=y
83 81 # CONFIG_AIO is not set
  82 +
  83 +#
  84 +# Performance Counters
  85 +#
84 86 # CONFIG_VM_EVENT_COUNTERS is not set
85 87 CONFIG_SLUB_DEBUG=y
  88 +# CONFIG_STRIP_ASM_SYMS is not set
86 89 CONFIG_COMPAT_BRK=y
87 90 # CONFIG_SLAB is not set
88 91 CONFIG_SLUB=y
... ... @@ -94,6 +97,10 @@
94 97 CONFIG_HAVE_KPROBES=y
95 98 CONFIG_HAVE_KRETPROBES=y
96 99 CONFIG_HAVE_CLK=y
  100 +
  101 +#
  102 +# GCOV-based kernel profiling
  103 +#
97 104 # CONFIG_SLOW_WORK is not set
98 105 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
99 106 CONFIG_SLABINFO=y
... ... @@ -106,7 +113,7 @@
106 113 # CONFIG_MODVERSIONS is not set
107 114 # CONFIG_MODULE_SRCVERSION_ALL is not set
108 115 CONFIG_BLOCK=y
109   -# CONFIG_LBD is not set
  116 +CONFIG_LBDAF=y
110 117 # CONFIG_BLK_DEV_BSG is not set
111 118 # CONFIG_BLK_DEV_INTEGRITY is not set
112 119  
113 120  
... ... @@ -138,9 +145,9 @@
138 145 # CONFIG_ARCH_EP93XX is not set
139 146 # CONFIG_ARCH_FOOTBRIDGE is not set
140 147 # CONFIG_ARCH_MXC is not set
  148 +# CONFIG_ARCH_STMP3XXX is not set
141 149 # CONFIG_ARCH_NETX is not set
142 150 # CONFIG_ARCH_H720X is not set
143   -# CONFIG_ARCH_IMX is not set
144 151 # CONFIG_ARCH_IOP13XX is not set
145 152 # CONFIG_ARCH_IOP32X is not set
146 153 # CONFIG_ARCH_IOP33X is not set
147 154  
... ... @@ -216,8 +223,8 @@
216 223 # CONFIG_CPU_DCACHE_DISABLE is not set
217 224 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
218 225 # CONFIG_CPU_CACHE_ROUND_ROBIN is not set
219   -# CONFIG_OUTER_CACHE is not set
220 226 CONFIG_ARM_VIC=y
  227 +CONFIG_ARM_VIC_NR=2
221 228 CONFIG_COMMON_CLKDEV=y
222 229  
223 230 #
... ... @@ -243,7 +250,6 @@
243 250 CONFIG_HZ=100
244 251 CONFIG_AEABI=y
245 252 CONFIG_OABI_COMPAT=y
246   -CONFIG_ARCH_FLATMEM_HAS_HOLES=y
247 253 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
248 254 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
249 255 # CONFIG_HIGHMEM is not set
250 256  
251 257  
252 258  
... ... @@ -258,17 +264,18 @@
258 264 # CONFIG_PHYS_ADDR_T_64BIT is not set
259 265 CONFIG_ZONE_DMA_FLAG=0
260 266 CONFIG_VIRT_TO_BUS=y
261   -CONFIG_UNEVICTABLE_LRU=y
262 267 CONFIG_HAVE_MLOCK=y
263 268 CONFIG_HAVE_MLOCKED_PAGE_BIT=y
  269 +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
264 270 CONFIG_ALIGNMENT_TRAP=y
  271 +# CONFIG_UACCESS_WITH_MEMCPY is not set
265 272  
266 273 #
267 274 # Boot options
268 275 #
269 276 CONFIG_ZBOOT_ROM_TEXT=0x0
270 277 CONFIG_ZBOOT_ROM_BSS=0x0
271   -CONFIG_CMDLINE="root=/dev/mtdblock2 rw rootfstype=yaffs2 console=ttyAMA0,115200n8 ab3100.force=0,0x48 mtdparts=u300nand:128k@0x0(bootrecords)ro,8064k@128k(free)ro,253952k@8192k(platform) lpj=515072"
  278 +CONFIG_CMDLINE="root=/dev/ram0 rw rootfstype=rootfs console=ttyAMA0,115200n8 lpj=515072"
272 279 # CONFIG_XIP_KERNEL is not set
273 280 # CONFIG_KEXEC is not set
274 281  
... ... @@ -359,6 +366,7 @@
359 366 # CONFIG_ECONET is not set
360 367 # CONFIG_WAN_ROUTER is not set
361 368 # CONFIG_PHONET is not set
  369 +# CONFIG_IEEE802154 is not set
362 370 # CONFIG_NET_SCHED is not set
363 371 # CONFIG_DCB is not set
364 372  
... ... @@ -497,6 +505,7 @@
497 505 # CONFIG_EEPROM_AT24 is not set
498 506 # CONFIG_EEPROM_AT25 is not set
499 507 # CONFIG_EEPROM_LEGACY is not set
  508 +# CONFIG_EEPROM_MAX6875 is not set
500 509 # CONFIG_EEPROM_93CX6 is not set
501 510 CONFIG_HAVE_IDE=y
502 511 # CONFIG_IDE is not set
... ... @@ -538,6 +547,7 @@
538 547 # CONFIG_KEYBOARD_XTKBD is not set
539 548 # CONFIG_KEYBOARD_NEWTON is not set
540 549 # CONFIG_KEYBOARD_STOWAWAY is not set
  550 +# CONFIG_KEYBOARD_LM8323 is not set
541 551 # CONFIG_KEYBOARD_GPIO is not set
542 552 # CONFIG_INPUT_MOUSE is not set
543 553 # CONFIG_INPUT_JOYSTICK is not set
544 554  
... ... @@ -597,9 +607,11 @@
597 607 #
598 608 # I2C system bus drivers (mostly embedded / system-on-chip)
599 609 #
  610 +# CONFIG_I2C_DESIGNWARE is not set
600 611 # CONFIG_I2C_GPIO is not set
601 612 # CONFIG_I2C_OCORES is not set
602 613 # CONFIG_I2C_SIMTEC is not set
  614 +CONFIG_I2C_STU300=y
603 615  
604 616 #
605 617 # External I2C/SMBus adapter drivers
... ... @@ -620,7 +632,6 @@
620 632 # CONFIG_SENSORS_PCF8574 is not set
621 633 # CONFIG_PCF8575 is not set
622 634 # CONFIG_SENSORS_PCA9539 is not set
623   -# CONFIG_SENSORS_MAX6875 is not set
624 635 # CONFIG_SENSORS_TSL2550 is not set
625 636 # CONFIG_I2C_DEBUG_CORE is not set
626 637 # CONFIG_I2C_DEBUG_ALGO is not set
... ... @@ -635,6 +646,7 @@
635 646 #
636 647 # CONFIG_SPI_BITBANG is not set
637 648 # CONFIG_SPI_GPIO is not set
  649 +CONFIG_SPI_PL022=y
638 650  
639 651 #
640 652 # SPI Protocol Masters
... ... @@ -647,6 +659,7 @@
647 659 # CONFIG_PDA_POWER is not set
648 660 # CONFIG_BATTERY_DS2760 is not set
649 661 # CONFIG_BATTERY_BQ27x00 is not set
  662 +# CONFIG_BATTERY_MAX17040 is not set
650 663 # CONFIG_HWMON is not set
651 664 # CONFIG_THERMAL is not set
652 665 # CONFIG_THERMAL_HWMON is not set
... ... @@ -657,6 +670,7 @@
657 670 # Watchdog Device Drivers
658 671 #
659 672 # CONFIG_SOFT_WATCHDOG is not set
  673 +CONFIG_COH901327_WATCHDOG=y
660 674 CONFIG_SSB_POSSIBLE=y
661 675  
662 676 #
663 677  
... ... @@ -678,24 +692,11 @@
678 692 # CONFIG_MFD_WM8400 is not set
679 693 # CONFIG_MFD_WM8350_I2C is not set
680 694 # CONFIG_MFD_PCF50633 is not set
  695 +CONFIG_AB3100_CORE=y
  696 +# CONFIG_EZX_PCAP is not set
  697 +# CONFIG_MEDIA_SUPPORT is not set
681 698  
682 699 #
683   -# Multimedia devices
684   -#
685   -
686   -#
687   -# Multimedia core support
688   -#
689   -# CONFIG_VIDEO_DEV is not set
690   -# CONFIG_DVB_CORE is not set
691   -# CONFIG_VIDEO_MEDIA is not set
692   -
693   -#
694   -# Multimedia drivers
695   -#
696   -# CONFIG_DAB is not set
697   -
698   -#
699 700 # Graphics support
700 701 #
701 702 # CONFIG_VGASTATE is not set
... ... @@ -760,6 +761,11 @@
760 761 # CONFIG_SND_VERBOSE_PROCFS is not set
761 762 # CONFIG_SND_VERBOSE_PRINTK is not set
762 763 # CONFIG_SND_DEBUG is not set
  764 +# CONFIG_SND_RAWMIDI_SEQ is not set
  765 +# CONFIG_SND_OPL3_LIB_SEQ is not set
  766 +# CONFIG_SND_OPL4_LIB_SEQ is not set
  767 +# CONFIG_SND_SBAWE_SEQ is not set
  768 +# CONFIG_SND_EMU10K1_SEQ is not set
763 769 # CONFIG_SND_DRIVERS is not set
764 770 # CONFIG_SND_ARM is not set
765 771 # CONFIG_SND_SPI is not set
... ... @@ -770,7 +776,7 @@
770 776 # CONFIG_HID_SUPPORT is not set
771 777 # CONFIG_USB_SUPPORT is not set
772 778 CONFIG_MMC=y
773   -# CONFIG_MMC_DEBUG is not set
  779 +CONFIG_MMC_DEBUG=y
774 780 # CONFIG_MMC_UNSAFE_RESUME is not set
775 781  
776 782 #
... ... @@ -797,7 +803,7 @@
797 803 #
798 804 # CONFIG_LEDS_PCA9532 is not set
799 805 # CONFIG_LEDS_GPIO is not set
800   -# CONFIG_LEDS_LP5521 is not set
  806 +# CONFIG_LEDS_LP3944 is not set
801 807 # CONFIG_LEDS_PCA955X is not set
802 808 # CONFIG_LEDS_DAC124S085 is not set
803 809 # CONFIG_LEDS_BD2802 is not set
... ... @@ -845,6 +851,7 @@
845 851 # CONFIG_RTC_DRV_S35390A is not set
846 852 # CONFIG_RTC_DRV_FM3130 is not set
847 853 # CONFIG_RTC_DRV_RX8581 is not set
  854 +# CONFIG_RTC_DRV_RX8025 is not set
848 855  
849 856 #
850 857 # SPI RTC drivers
851 858  
... ... @@ -887,7 +894,10 @@
887 894 # CONFIG_REGULATOR_DEBUG is not set
888 895 # CONFIG_REGULATOR_FIXED_VOLTAGE is not set
889 896 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
  897 +# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
890 898 # CONFIG_REGULATOR_BQ24022 is not set
  899 +# CONFIG_REGULATOR_MAX1586 is not set
  900 +# CONFIG_REGULATOR_LP3971 is not set
891 901 # CONFIG_UIO is not set
892 902 # CONFIG_STAGING is not set
893 903  
894 904  
895 905  
896 906  
897 907  
... ... @@ -900,16 +910,20 @@
900 910 # CONFIG_REISERFS_FS is not set
901 911 # CONFIG_JFS_FS is not set
902 912 # CONFIG_FS_POSIX_ACL is not set
903   -CONFIG_FILE_LOCKING=y
904 913 # CONFIG_XFS_FS is not set
  914 +# CONFIG_GFS2_FS is not set
905 915 # CONFIG_OCFS2_FS is not set
906 916 # CONFIG_BTRFS_FS is not set
  917 +CONFIG_FILE_LOCKING=y
  918 +CONFIG_FSNOTIFY=y
907 919 # CONFIG_DNOTIFY is not set
908 920 # CONFIG_INOTIFY is not set
  921 +CONFIG_INOTIFY_USER=y
909 922 # CONFIG_QUOTA is not set
910 923 # CONFIG_AUTOFS_FS is not set
911 924 # CONFIG_AUTOFS4_FS is not set
912 925 CONFIG_FUSE_FS=y
  926 +# CONFIG_CUSE is not set
913 927  
914 928 #
915 929 # Caches
... ... @@ -1033,6 +1047,7 @@
1033 1047 # CONFIG_DEBUG_OBJECTS is not set
1034 1048 # CONFIG_SLUB_DEBUG_ON is not set
1035 1049 # CONFIG_SLUB_STATS is not set
  1050 +# CONFIG_DEBUG_KMEMLEAK is not set
1036 1051 # CONFIG_DEBUG_PREEMPT is not set
1037 1052 # CONFIG_DEBUG_RT_MUTEXES is not set
1038 1053 # CONFIG_RT_MUTEX_TESTER is not set
1039 1054  
1040 1055  
... ... @@ -1063,18 +1078,16 @@
1063 1078 # CONFIG_PAGE_POISONING is not set
1064 1079 CONFIG_HAVE_FUNCTION_TRACER=y
1065 1080 CONFIG_TRACING_SUPPORT=y
1066   -
1067   -#
1068   -# Tracers
1069   -#
  1081 +CONFIG_FTRACE=y
1070 1082 # CONFIG_FUNCTION_TRACER is not set
1071 1083 # CONFIG_IRQSOFF_TRACER is not set
1072 1084 # CONFIG_PREEMPT_TRACER is not set
1073 1085 # CONFIG_SCHED_TRACER is not set
1074   -# CONFIG_CONTEXT_SWITCH_TRACER is not set
1075   -# CONFIG_EVENT_TRACER is not set
  1086 +# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1076 1087 # CONFIG_BOOT_TRACER is not set
1077   -# CONFIG_TRACE_BRANCH_PROFILING is not set
  1088 +CONFIG_BRANCH_PROFILE_NONE=y
  1089 +# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
  1090 +# CONFIG_PROFILE_ALL_BRANCHES is not set
1078 1091 # CONFIG_STACK_TRACER is not set
1079 1092 # CONFIG_KMEMTRACE is not set
1080 1093 # CONFIG_WORKQUEUE_TRACER is not set
... ... @@ -1109,6 +1122,7 @@
1109 1122 # CONFIG_CRC32 is not set
1110 1123 # CONFIG_CRC7 is not set
1111 1124 # CONFIG_LIBCRC32C is not set
  1125 +CONFIG_GENERIC_ALLOCATOR=y
1112 1126 CONFIG_HAS_IOMEM=y
1113 1127 CONFIG_HAS_IOPORT=y
1114 1128 CONFIG_HAS_DMA=y
arch/arm/include/asm/pgtable.h
... ... @@ -285,15 +285,6 @@
285 285 #define pte_young(pte) (pte_val(pte) & L_PTE_YOUNG)
286 286 #define pte_special(pte) (0)
287 287  
288   -/*
289   - * The following only works if pte_present() is not true.
290   - */
291   -#define pte_file(pte) (pte_val(pte) & L_PTE_FILE)
292   -#define pte_to_pgoff(x) (pte_val(x) >> 2)
293   -#define pgoff_to_pte(x) __pte(((x) << 2) | L_PTE_FILE)
294   -
295   -#define PTE_FILE_MAX_BITS 30
296   -
297 288 #define PTE_BIT_FUNC(fn,op) \
298 289 static inline pte_t pte_##fn(pte_t pte) { pte_val(pte) op; return pte; }
299 290  
300 291  
301 292  
302 293  
... ... @@ -384,15 +375,49 @@
384 375  
385 376 extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
386 377  
387   -/* Encode and decode a swap entry.
  378 +/*
  379 + * Encode and decode a swap entry. Swap entries are stored in the Linux
  380 + * page tables as follows:
388 381 *
389   - * We support up to 32GB of swap on 4k machines
  382 + * 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
  383 + * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
  384 + * <--------------- offset --------------------> <--- type --> 0 0
  385 + *
  386 + * This gives us up to 127 swap files and 32GB per swap file. Note that
  387 + * the offset field is always non-zero.
390 388 */
391   -#define __swp_type(x) (((x).val >> 2) & 0x7f)
392   -#define __swp_offset(x) ((x).val >> 9)
393   -#define __swp_entry(type,offset) ((swp_entry_t) { ((type) << 2) | ((offset) << 9) })
  389 +#define __SWP_TYPE_SHIFT 2
  390 +#define __SWP_TYPE_BITS 7
  391 +#define __SWP_TYPE_MASK ((1 << __SWP_TYPE_BITS) - 1)
  392 +#define __SWP_OFFSET_SHIFT (__SWP_TYPE_BITS + __SWP_TYPE_SHIFT)
  393 +
  394 +#define __swp_type(x) (((x).val >> __SWP_TYPE_SHIFT) & __SWP_TYPE_MASK)
  395 +#define __swp_offset(x) ((x).val >> __SWP_OFFSET_SHIFT)
  396 +#define __swp_entry(type,offset) ((swp_entry_t) { ((type) << __SWP_TYPE_SHIFT) | ((offset) << __SWP_OFFSET_SHIFT) })
  397 +
394 398 #define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
395 399 #define __swp_entry_to_pte(swp) ((pte_t) { (swp).val })
  400 +
  401 +/*
  402 + * It is an error for the kernel to have more swap files than we can
  403 + * encode in the PTEs. This ensures that we know when MAX_SWAPFILES
  404 + * is increased beyond what we presently support.
  405 + */
  406 +#define MAX_SWAPFILES_CHECK() BUILD_BUG_ON(MAX_SWAPFILES_SHIFT > __SWP_TYPE_BITS)
  407 +
  408 +/*
  409 + * Encode and decode a file entry. File entries are stored in the Linux
  410 + * page tables as follows:
  411 + *
  412 + * 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
  413 + * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
  414 + * <------------------------ offset -------------------------> 1 0
  415 + */
  416 +#define pte_file(pte) (pte_val(pte) & L_PTE_FILE)
  417 +#define pte_to_pgoff(x) (pte_val(x) >> 2)
  418 +#define pgoff_to_pte(x) __pte(((x) << 2) | L_PTE_FILE)
  419 +
  420 +#define PTE_FILE_MAX_BITS 30
396 421  
397 422 /* Needs to be defined here and not in linux/mm.h, as it is arch dependent */
398 423 /* FIXME: this is not correct */
arch/arm/mach-u300/clock.c
... ... @@ -24,6 +24,7 @@
24 24 #include <linux/init.h>
25 25 #include <linux/timer.h>
26 26 #include <linux/io.h>
  27 +#include <linux/seq_file.h>
27 28  
28 29 #include <asm/clkdev.h>
29 30 #include <mach/hardware.h>
... ... @@ -702,6 +703,7 @@
702 703 .rate = 52000000, /* this varies! */
703 704 .hw_ctrld = true,
704 705 .reset = false,
  706 + .lock = __SPIN_LOCK_UNLOCKED(amba_clk.lock),
705 707 };
706 708  
707 709 /*
... ... @@ -720,6 +722,7 @@
720 722 .set_rate = clk_set_rate_cpuclk,
721 723 .get_rate = clk_get_rate_cpuclk,
722 724 .round_rate = clk_round_rate_cpuclk,
  725 + .lock = __SPIN_LOCK_UNLOCKED(cpu_clk.lock),
723 726 };
724 727  
725 728 static struct clk nandif_clk = {
... ... @@ -732,6 +735,7 @@
732 735 .clk_val = U300_SYSCON_SBCER_NANDIF_CLK_EN,
733 736 .enable = syscon_clk_enable,
734 737 .disable = syscon_clk_disable,
  738 + .lock = __SPIN_LOCK_UNLOCKED(nandif_clk.lock),
735 739 };
736 740  
737 741 static struct clk semi_clk = {
... ... @@ -744,6 +748,7 @@
744 748 .clk_val = U300_SYSCON_SBCER_SEMI_CLK_EN,
745 749 .enable = syscon_clk_enable,
746 750 .disable = syscon_clk_disable,
  751 + .lock = __SPIN_LOCK_UNLOCKED(semi_clk.lock),
747 752 };
748 753  
749 754 #ifdef CONFIG_MACH_U300_BS335
... ... @@ -758,6 +763,7 @@
758 763 .clk_val = U300_SYSCON_SBCER_ISP_CLK_EN,
759 764 .enable = syscon_clk_enable,
760 765 .disable = syscon_clk_disable,
  766 + .lock = __SPIN_LOCK_UNLOCKED(isp_clk.lock),
761 767 };
762 768  
763 769 static struct clk cds_clk = {
... ... @@ -771,6 +777,7 @@
771 777 .clk_val = U300_SYSCON_SBCER_CDS_CLK_EN,
772 778 .enable = syscon_clk_enable,
773 779 .disable = syscon_clk_disable,
  780 + .lock = __SPIN_LOCK_UNLOCKED(cds_clk.lock),
774 781 };
775 782 #endif
776 783  
... ... @@ -785,6 +792,7 @@
785 792 .clk_val = U300_SYSCON_SBCER_DMAC_CLK_EN,
786 793 .enable = syscon_clk_enable,
787 794 .disable = syscon_clk_disable,
  795 + .lock = __SPIN_LOCK_UNLOCKED(dma_clk.lock),
788 796 };
789 797  
790 798 static struct clk aaif_clk = {
... ... @@ -798,6 +806,7 @@
798 806 .clk_val = U300_SYSCON_SBCER_AAIF_CLK_EN,
799 807 .enable = syscon_clk_enable,
800 808 .disable = syscon_clk_disable,
  809 + .lock = __SPIN_LOCK_UNLOCKED(aaif_clk.lock),
801 810 };
802 811  
803 812 static struct clk apex_clk = {
... ... @@ -811,6 +820,7 @@
811 820 .clk_val = U300_SYSCON_SBCER_APEX_CLK_EN,
812 821 .enable = syscon_clk_enable,
813 822 .disable = syscon_clk_disable,
  823 + .lock = __SPIN_LOCK_UNLOCKED(apex_clk.lock),
814 824 };
815 825  
816 826 static struct clk video_enc_clk = {
... ... @@ -825,6 +835,7 @@
825 835 .clk_val = U300_SYSCON_SBCER_VIDEO_ENC_CLK_EN,
826 836 .enable = syscon_clk_enable,
827 837 .disable = syscon_clk_disable,
  838 + .lock = __SPIN_LOCK_UNLOCKED(video_enc_clk.lock),
828 839 };
829 840  
830 841 static struct clk xgam_clk = {
... ... @@ -839,6 +850,7 @@
839 850 .get_rate = clk_get_rate_xgamclk,
840 851 .enable = syscon_clk_enable,
841 852 .disable = syscon_clk_disable,
  853 + .lock = __SPIN_LOCK_UNLOCKED(xgam_clk.lock),
842 854 };
843 855  
844 856 /* This clock is used to activate the video encoder */
... ... @@ -854,6 +866,7 @@
854 866 .enable = syscon_clk_enable,
855 867 .disable = syscon_clk_disable,
856 868 .get_rate = clk_get_rate_ahb_clk,
  869 + .lock = __SPIN_LOCK_UNLOCKED(ahb_clk.lock),
857 870 };
858 871  
859 872  
... ... @@ -871,6 +884,7 @@
871 884 .enable = syscon_clk_enable,
872 885 .disable = syscon_clk_disable,
873 886 .get_rate = clk_get_rate_ahb_clk,
  887 + .lock = __SPIN_LOCK_UNLOCKED(ahb_subsys_clk.lock),
874 888 };
875 889  
876 890 static struct clk intcon_clk = {
... ... @@ -882,6 +896,8 @@
882 896 .res_reg = U300_SYSCON_VBASE + U300_SYSCON_RRR,
883 897 .res_mask = U300_SYSCON_RRR_INTCON_RESET_EN,
884 898 /* INTCON can be reset but not clock-gated */
  899 + .lock = __SPIN_LOCK_UNLOCKED(intcon_clk.lock),
  900 +
885 901 };
886 902  
887 903 static struct clk mspro_clk = {
... ... @@ -895,6 +911,7 @@
895 911 .clk_val = U300_SYSCON_SBCER_MSPRO_CLK_EN,
896 912 .enable = syscon_clk_enable,
897 913 .disable = syscon_clk_disable,
  914 + .lock = __SPIN_LOCK_UNLOCKED(mspro_clk.lock),
898 915 };
899 916  
900 917 static struct clk emif_clk = {
... ... @@ -909,6 +926,7 @@
909 926 .enable = syscon_clk_enable,
910 927 .disable = syscon_clk_disable,
911 928 .get_rate = clk_get_rate_emif_clk,
  929 + .lock = __SPIN_LOCK_UNLOCKED(emif_clk.lock),
912 930 };
913 931  
914 932  
... ... @@ -926,6 +944,7 @@
926 944 .clk_val = U300_SYSCON_SBCER_FAST_BRIDGE_CLK_EN,
927 945 .enable = syscon_clk_enable,
928 946 .disable = syscon_clk_disable,
  947 + .lock = __SPIN_LOCK_UNLOCKED(fast_clk.lock),
929 948 };
930 949  
931 950 static struct clk mmcsd_clk = {
... ... @@ -942,6 +961,7 @@
942 961 .round_rate = clk_round_rate_mclk,
943 962 .disable = syscon_clk_disable,
944 963 .enable = syscon_clk_enable,
  964 + .lock = __SPIN_LOCK_UNLOCKED(mmcsd_clk.lock),
945 965 };
946 966  
947 967 static struct clk i2s0_clk = {
... ... @@ -956,6 +976,7 @@
956 976 .enable = syscon_clk_enable,
957 977 .disable = syscon_clk_disable,
958 978 .get_rate = clk_get_rate_i2s_i2c_spi,
  979 + .lock = __SPIN_LOCK_UNLOCKED(i2s0_clk.lock),
959 980 };
960 981  
961 982 static struct clk i2s1_clk = {
... ... @@ -970,6 +991,7 @@
970 991 .enable = syscon_clk_enable,
971 992 .disable = syscon_clk_disable,
972 993 .get_rate = clk_get_rate_i2s_i2c_spi,
  994 + .lock = __SPIN_LOCK_UNLOCKED(i2s1_clk.lock),
973 995 };
974 996  
975 997 static struct clk i2c0_clk = {
... ... @@ -984,6 +1006,7 @@
984 1006 .enable = syscon_clk_enable,
985 1007 .disable = syscon_clk_disable,
986 1008 .get_rate = clk_get_rate_i2s_i2c_spi,
  1009 + .lock = __SPIN_LOCK_UNLOCKED(i2c0_clk.lock),
987 1010 };
988 1011  
989 1012 static struct clk i2c1_clk = {
... ... @@ -998,6 +1021,7 @@
998 1021 .enable = syscon_clk_enable,
999 1022 .disable = syscon_clk_disable,
1000 1023 .get_rate = clk_get_rate_i2s_i2c_spi,
  1024 + .lock = __SPIN_LOCK_UNLOCKED(i2c1_clk.lock),
1001 1025 };
1002 1026  
1003 1027 static struct clk spi_clk = {
... ... @@ -1012,6 +1036,7 @@
1012 1036 .enable = syscon_clk_enable,
1013 1037 .disable = syscon_clk_disable,
1014 1038 .get_rate = clk_get_rate_i2s_i2c_spi,
  1039 + .lock = __SPIN_LOCK_UNLOCKED(spi_clk.lock),
1015 1040 };
1016 1041  
1017 1042 #ifdef CONFIG_MACH_U300_BS335
... ... @@ -1026,6 +1051,7 @@
1026 1051 .clk_val = U300_SYSCON_SBCER_UART1_CLK_EN,
1027 1052 .enable = syscon_clk_enable,
1028 1053 .disable = syscon_clk_disable,
  1054 + .lock = __SPIN_LOCK_UNLOCKED(uart1_clk.lock),
1029 1055 };
1030 1056 #endif
1031 1057  
... ... @@ -1044,6 +1070,7 @@
1044 1070 .clk_val = U300_SYSCON_SBCER_SLOW_BRIDGE_CLK_EN,
1045 1071 .enable = syscon_clk_enable,
1046 1072 .disable = syscon_clk_disable,
  1073 + .lock = __SPIN_LOCK_UNLOCKED(slow_clk.lock),
1047 1074 };
1048 1075  
1049 1076 /* TODO: implement SYSCON clock? */
... ... @@ -1055,6 +1082,7 @@
1055 1082 .rate = 32768,
1056 1083 .reset = false,
1057 1084 /* This is always on, cannot be enabled/disabled or reset */
  1085 + .lock = __SPIN_LOCK_UNLOCKED(wdog_clk.lock),
1058 1086 };
1059 1087  
1060 1088 /* This one is hardwired to PLL13 */
... ... @@ -1069,6 +1097,7 @@
1069 1097 .clk_val = U300_SYSCON_SBCER_UART_CLK_EN,
1070 1098 .enable = syscon_clk_enable,
1071 1099 .disable = syscon_clk_disable,
  1100 + .lock = __SPIN_LOCK_UNLOCKED(uart_clk.lock),
1072 1101 };
1073 1102  
1074 1103 static struct clk keypad_clk = {
... ... @@ -1082,6 +1111,7 @@
1082 1111 .clk_val = U300_SYSCON_SBCER_KEYPAD_CLK_EN,
1083 1112 .enable = syscon_clk_enable,
1084 1113 .disable = syscon_clk_disable,
  1114 + .lock = __SPIN_LOCK_UNLOCKED(keypad_clk.lock),
1085 1115 };
1086 1116  
1087 1117 static struct clk gpio_clk = {
... ... @@ -1095,6 +1125,7 @@
1095 1125 .clk_val = U300_SYSCON_SBCER_GPIO_CLK_EN,
1096 1126 .enable = syscon_clk_enable,
1097 1127 .disable = syscon_clk_disable,
  1128 + .lock = __SPIN_LOCK_UNLOCKED(gpio_clk.lock),
1098 1129 };
1099 1130  
1100 1131 static struct clk rtc_clk = {
... ... @@ -1106,6 +1137,7 @@
1106 1137 .res_reg = U300_SYSCON_VBASE + U300_SYSCON_RSR,
1107 1138 .res_mask = U300_SYSCON_RSR_RTC_RESET_EN,
1108 1139 /* This clock is always on, cannot be enabled/disabled */
  1140 + .lock = __SPIN_LOCK_UNLOCKED(rtc_clk.lock),
1109 1141 };
1110 1142  
1111 1143 static struct clk bustr_clk = {
... ... @@ -1119,6 +1151,7 @@
1119 1151 .clk_val = U300_SYSCON_SBCER_BTR_CLK_EN,
1120 1152 .enable = syscon_clk_enable,
1121 1153 .disable = syscon_clk_disable,
  1154 + .lock = __SPIN_LOCK_UNLOCKED(bustr_clk.lock),
1122 1155 };
1123 1156  
1124 1157 static struct clk evhist_clk = {
... ... @@ -1132,6 +1165,7 @@
1132 1165 .clk_val = U300_SYSCON_SBCER_EH_CLK_EN,
1133 1166 .enable = syscon_clk_enable,
1134 1167 .disable = syscon_clk_disable,
  1168 + .lock = __SPIN_LOCK_UNLOCKED(evhist_clk.lock),
1135 1169 };
1136 1170  
1137 1171 static struct clk timer_clk = {
... ... @@ -1145,6 +1179,7 @@
1145 1179 .clk_val = U300_SYSCON_SBCER_ACC_TMR_CLK_EN,
1146 1180 .enable = syscon_clk_enable,
1147 1181 .disable = syscon_clk_disable,
  1182 + .lock = __SPIN_LOCK_UNLOCKED(timer_clk.lock),
1148 1183 };
1149 1184  
1150 1185 static struct clk app_timer_clk = {
... ... @@ -1158,6 +1193,7 @@
1158 1193 .clk_val = U300_SYSCON_SBCER_APP_TMR_CLK_EN,
1159 1194 .enable = syscon_clk_enable,
1160 1195 .disable = syscon_clk_disable,
  1196 + .lock = __SPIN_LOCK_UNLOCKED(app_timer_clk.lock),
1161 1197 };
1162 1198  
1163 1199 #ifdef CONFIG_MACH_U300_BS335
... ... @@ -1172,6 +1208,7 @@
1172 1208 .clk_val = U300_SYSCON_SBCER_PPM_CLK_EN,
1173 1209 .enable = syscon_clk_enable,
1174 1210 .disable = syscon_clk_disable,
  1211 + .lock = __SPIN_LOCK_UNLOCKED(ppm_clk.lock),
1175 1212 };
1176 1213 #endif
1177 1214  
1178 1215  
1179 1216  
1180 1217  
1181 1218  
1182 1219  
1183 1220  
1184 1221  
1185 1222  
1186 1223  
1187 1224  
... ... @@ -1187,53 +1224,53 @@
1187 1224 */
1188 1225 static struct clk_lookup lookups[] = {
1189 1226 /* Connected directly to the AMBA bus */
1190   - DEF_LOOKUP("amba", &amba_clk),
1191   - DEF_LOOKUP("cpu", &cpu_clk),
1192   - DEF_LOOKUP("nandif", &nandif_clk),
1193   - DEF_LOOKUP("semi", &semi_clk),
  1227 + DEF_LOOKUP("amba", &amba_clk),
  1228 + DEF_LOOKUP("cpu", &cpu_clk),
  1229 + DEF_LOOKUP("fsmc", &nandif_clk),
  1230 + DEF_LOOKUP("semi", &semi_clk),
1194 1231 #ifdef CONFIG_MACH_U300_BS335
1195   - DEF_LOOKUP("isp", &isp_clk),
1196   - DEF_LOOKUP("cds", &cds_clk),
  1232 + DEF_LOOKUP("isp", &isp_clk),
  1233 + DEF_LOOKUP("cds", &cds_clk),
1197 1234 #endif
1198   - DEF_LOOKUP("dma", &dma_clk),
1199   - DEF_LOOKUP("aaif", &aaif_clk),
1200   - DEF_LOOKUP("apex", &apex_clk),
  1235 + DEF_LOOKUP("dma", &dma_clk),
  1236 + DEF_LOOKUP("msl", &aaif_clk),
  1237 + DEF_LOOKUP("apex", &apex_clk),
1201 1238 DEF_LOOKUP("video_enc", &video_enc_clk),
1202   - DEF_LOOKUP("xgam", &xgam_clk),
1203   - DEF_LOOKUP("ahb", &ahb_clk),
  1239 + DEF_LOOKUP("xgam", &xgam_clk),
  1240 + DEF_LOOKUP("ahb", &ahb_clk),
1204 1241 /* AHB bridge clocks */
1205   - DEF_LOOKUP("ahb", &ahb_subsys_clk),
1206   - DEF_LOOKUP("intcon", &intcon_clk),
1207   - DEF_LOOKUP("mspro", &mspro_clk),
1208   - DEF_LOOKUP("pl172", &emif_clk),
  1242 + DEF_LOOKUP("ahb_subsys", &ahb_subsys_clk),
  1243 + DEF_LOOKUP("intcon", &intcon_clk),
  1244 + DEF_LOOKUP("mspro", &mspro_clk),
  1245 + DEF_LOOKUP("pl172", &emif_clk),
1209 1246 /* FAST bridge clocks */
1210   - DEF_LOOKUP("fast", &fast_clk),
1211   - DEF_LOOKUP("mmci", &mmcsd_clk),
  1247 + DEF_LOOKUP("fast", &fast_clk),
  1248 + DEF_LOOKUP("mmci", &mmcsd_clk),
1212 1249 /*
1213 1250 * The .0 and .1 identifiers on these comes from the platform device
1214 1251 * .id field and are assigned when the platform devices are registered.
1215 1252 */
1216   - DEF_LOOKUP("i2s.0", &i2s0_clk),
1217   - DEF_LOOKUP("i2s.1", &i2s1_clk),
1218   - DEF_LOOKUP("stddci2c.0", &i2c0_clk),
1219   - DEF_LOOKUP("stddci2c.1", &i2c1_clk),
1220   - DEF_LOOKUP("pl022", &spi_clk),
  1253 + DEF_LOOKUP("i2s.0", &i2s0_clk),
  1254 + DEF_LOOKUP("i2s.1", &i2s1_clk),
  1255 + DEF_LOOKUP("stu300.0", &i2c0_clk),
  1256 + DEF_LOOKUP("stu300.1", &i2c1_clk),
  1257 + DEF_LOOKUP("pl022", &spi_clk),
1221 1258 #ifdef CONFIG_MACH_U300_BS335
1222   - DEF_LOOKUP("uart1", &uart1_clk),
  1259 + DEF_LOOKUP("uart1", &uart1_clk),
1223 1260 #endif
1224 1261 /* SLOW bridge clocks */
1225   - DEF_LOOKUP("slow", &slow_clk),
1226   - DEF_LOOKUP("wdog", &wdog_clk),
1227   - DEF_LOOKUP("uart0", &uart_clk),
1228   - DEF_LOOKUP("apptimer", &app_timer_clk),
1229   - DEF_LOOKUP("keypad", &keypad_clk),
  1262 + DEF_LOOKUP("slow", &slow_clk),
  1263 + DEF_LOOKUP("coh901327_wdog", &wdog_clk),
  1264 + DEF_LOOKUP("uart0", &uart_clk),
  1265 + DEF_LOOKUP("apptimer", &app_timer_clk),
  1266 + DEF_LOOKUP("coh901461-keypad", &keypad_clk),
1230 1267 DEF_LOOKUP("u300-gpio", &gpio_clk),
1231   - DEF_LOOKUP("rtc0", &rtc_clk),
1232   - DEF_LOOKUP("bustr", &bustr_clk),
1233   - DEF_LOOKUP("evhist", &evhist_clk),
1234   - DEF_LOOKUP("timer", &timer_clk),
  1268 + DEF_LOOKUP("rtc-coh901331", &rtc_clk),
  1269 + DEF_LOOKUP("bustr", &bustr_clk),
  1270 + DEF_LOOKUP("evhist", &evhist_clk),
  1271 + DEF_LOOKUP("timer", &timer_clk),
1235 1272 #ifdef CONFIG_MACH_U300_BS335
1236   - DEF_LOOKUP("ppm", &ppm_clk),
  1273 + DEF_LOOKUP("ppm", &ppm_clk),
1237 1274 #endif
1238 1275 };
1239 1276  
1240 1277  
1241 1278  
... ... @@ -1427,16 +1464,20 @@
1427 1464 .release = single_release,
1428 1465 };
1429 1466  
1430   -static void init_clk_read_procfs(void)
  1467 +static int __init init_clk_read_debugfs(void)
1431 1468 {
1432 1469 /* Expose a simple debugfs interface to view all clocks */
1433 1470 (void) debugfs_create_file("u300_clocks", S_IFREG | S_IRUGO,
1434   - NULL, NULL, &u300_clocks_operations);
  1471 + NULL, NULL,
  1472 + &u300_clocks_operations);
  1473 + return 0;
1435 1474 }
1436   -#else
1437   -static inline void init_clk_read_procfs(void)
1438   -{
1439   -}
  1475 +/*
  1476 + * This needs to come in after the core_initcall() for the
  1477 + * overall clocks, because debugfs is not available until
  1478 + * the subsystems come up.
  1479 + */
  1480 +module_init(init_clk_read_debugfs);
1440 1481 #endif
1441 1482  
1442 1483 static int __init u300_clock_init(void)
... ... @@ -1461,8 +1502,6 @@
1461 1502 writew(val, U300_SYSCON_VBASE + U300_SYSCON_PMCR);
1462 1503  
1463 1504 clk_register();
1464   -
1465   - init_clk_read_procfs();
1466 1505  
1467 1506 /*
1468 1507 * Some of these may be on when we boot the system so make sure they
arch/arm/mm/proc-syms.c
... ... @@ -27,6 +27,7 @@
27 27 EXPORT_SYMBOL(__cpuc_flush_user_all);
28 28 EXPORT_SYMBOL(__cpuc_flush_user_range);
29 29 EXPORT_SYMBOL(__cpuc_coherent_kern_range);
  30 +EXPORT_SYMBOL(__cpuc_flush_dcache_page);
30 31 EXPORT_SYMBOL(dmac_inv_range); /* because of flush_ioremap_region() */
31 32 #else
32 33 EXPORT_SYMBOL(cpu_cache);
... ... @@ -207,6 +207,16 @@
207 207 void __iomem *tmp;
208 208 int i, ret;
209 209  
  210 + device_initialize(&dev->dev);
  211 +
  212 + /*
  213 + * Copy from device_add
  214 + */
  215 + if (dev->dev.init_name) {
  216 + dev_set_name(&dev->dev, "%s", dev->dev.init_name);
  217 + dev->dev.init_name = NULL;
  218 + }
  219 +
210 220 dev->dev.release = amba_device_release;
211 221 dev->dev.bus = &amba_bustype;
212 222 dev->dev.dma_mask = &dev->dma_mask;
... ... @@ -240,7 +250,7 @@
240 250 goto err_release;
241 251 }
242 252  
243   - ret = device_register(&dev->dev);
  253 + ret = device_add(&dev->dev);
244 254 if (ret)
245 255 goto err_release;
246 256