aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-12-01 12:53:45 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-12-01 12:53:45 -0500
commit657e1de8e742cf81153d2d15545948bd58294200 (patch)
tree0fa3df23305e3763027f819cde6016dde8b24223 /arch/arm
parent93982535a201399c0023c1166a7f16a335134d5a (diff)
parent6f13d278836d7251168631faeb0cbf5e4cdd98e5 (diff)
Merge branch 'for-rmk-realview' of git://linux-arm.org/linux-2.6 into devel
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/Kconfig2
-rw-r--r--arch/arm/configs/realview-smp_defconfig718
-rw-r--r--arch/arm/configs/realview_defconfig763
-rw-r--r--arch/arm/include/asm/smp.h6
-rw-r--r--arch/arm/kernel/smp.c4
-rw-r--r--arch/arm/mach-realview/Kconfig28
-rw-r--r--arch/arm/mach-realview/Makefile1
-rw-r--r--arch/arm/mach-realview/Makefile.boot7
-rw-r--r--arch/arm/mach-realview/core.c89
-rw-r--r--arch/arm/mach-realview/core.h4
-rw-r--r--arch/arm/mach-realview/hotplug.c5
-rw-r--r--arch/arm/mach-realview/include/mach/board-eb.h18
-rw-r--r--arch/arm/mach-realview/include/mach/board-pb11mp.h3
-rw-r--r--arch/arm/mach-realview/include/mach/board-pba8.h152
-rw-r--r--arch/arm/mach-realview/include/mach/debug-macro.S29
-rw-r--r--arch/arm/mach-realview/include/mach/hardware.h9
-rw-r--r--arch/arm/mach-realview/include/mach/irqs.h1
-rw-r--r--arch/arm/mach-realview/include/mach/memory.h4
-rw-r--r--arch/arm/mach-realview/include/mach/uncompress.h3
-rw-r--r--arch/arm/mach-realview/include/mach/vmalloc.h2
-rw-r--r--arch/arm/mach-realview/localtimer.c44
-rw-r--r--arch/arm/mach-realview/platsmp.c37
-rw-r--r--arch/arm/mach-realview/realview_eb.c31
-rw-r--r--arch/arm/mach-realview/realview_pb1176.c11
-rw-r--r--arch/arm/mach-realview/realview_pb11mp.c14
-rw-r--r--arch/arm/mach-realview/realview_pba8.c300
-rw-r--r--arch/arm/mm/Kconfig2
27 files changed, 1609 insertions, 678 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 131b7120995e..93c5bebcd10f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -804,7 +804,7 @@ config HOTPLUG_CPU
804 804
805config LOCAL_TIMERS 805config LOCAL_TIMERS
806 bool "Use local timer interrupts" 806 bool "Use local timer interrupts"
807 depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP) 807 depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || REALVIEW_EB_A9MP)
808 default y 808 default y
809 help 809 help
810 Enable support for local timers on SMP platforms, rather then the 810 Enable support for local timers on SMP platforms, rather then the
diff --git a/arch/arm/configs/realview-smp_defconfig b/arch/arm/configs/realview-smp_defconfig
index 0c09b23167ec..cd29824d791c 100644
--- a/arch/arm/configs/realview-smp_defconfig
+++ b/arch/arm/configs/realview-smp_defconfig
@@ -1,84 +1,111 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19-rc3 3# Linux kernel version: 2.6.28-rc2
4# Wed Oct 25 14:12:00 2006 4# Mon Nov 10 14:41:47 2008
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7# CONFIG_GENERIC_TIME is not set 7CONFIG_SYS_SUPPORTS_APM_EMULATION=y
8# CONFIG_GENERIC_GPIO is not set
9CONFIG_GENERIC_TIME=y
10CONFIG_GENERIC_CLOCKEVENTS=y
8CONFIG_MMU=y 11CONFIG_MMU=y
12# CONFIG_NO_IOPORT is not set
9CONFIG_GENERIC_HARDIRQS=y 13CONFIG_GENERIC_HARDIRQS=y
14CONFIG_STACKTRACE_SUPPORT=y
15CONFIG_LOCKDEP_SUPPORT=y
10CONFIG_TRACE_IRQFLAGS_SUPPORT=y 16CONFIG_TRACE_IRQFLAGS_SUPPORT=y
11CONFIG_HARDIRQS_SW_RESEND=y 17CONFIG_HARDIRQS_SW_RESEND=y
12CONFIG_GENERIC_IRQ_PROBE=y 18CONFIG_GENERIC_IRQ_PROBE=y
13CONFIG_RWSEM_GENERIC_SPINLOCK=y 19CONFIG_RWSEM_GENERIC_SPINLOCK=y
20# CONFIG_ARCH_HAS_ILOG2_U32 is not set
21# CONFIG_ARCH_HAS_ILOG2_U64 is not set
14CONFIG_GENERIC_HWEIGHT=y 22CONFIG_GENERIC_HWEIGHT=y
15CONFIG_GENERIC_CALIBRATE_DELAY=y 23CONFIG_GENERIC_CALIBRATE_DELAY=y
24CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_VECTORS_BASE=0xffff0000 25CONFIG_VECTORS_BASE=0xffff0000
17CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 26CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
18 27
19# 28#
20# Code maturity level options 29# General setup
21# 30#
22CONFIG_EXPERIMENTAL=y 31CONFIG_EXPERIMENTAL=y
23CONFIG_LOCK_KERNEL=y 32CONFIG_LOCK_KERNEL=y
24CONFIG_INIT_ENV_ARG_LIMIT=32 33CONFIG_INIT_ENV_ARG_LIMIT=32
25
26#
27# General setup
28#
29CONFIG_LOCALVERSION="" 34CONFIG_LOCALVERSION=""
30CONFIG_LOCALVERSION_AUTO=y 35CONFIG_LOCALVERSION_AUTO=y
31# CONFIG_SWAP is not set 36# CONFIG_SWAP is not set
32CONFIG_SYSVIPC=y 37CONFIG_SYSVIPC=y
33# CONFIG_IPC_NS is not set 38CONFIG_SYSVIPC_SYSCTL=y
34# CONFIG_POSIX_MQUEUE is not set 39# CONFIG_POSIX_MQUEUE is not set
35# CONFIG_BSD_PROCESS_ACCT is not set 40# CONFIG_BSD_PROCESS_ACCT is not set
36# CONFIG_TASKSTATS is not set 41# CONFIG_TASKSTATS is not set
37# CONFIG_UTS_NS is not set
38# CONFIG_AUDIT is not set 42# CONFIG_AUDIT is not set
39# CONFIG_IKCONFIG is not set 43# CONFIG_IKCONFIG is not set
40# CONFIG_CPUSETS is not set 44CONFIG_LOG_BUF_SHIFT=14
45# CONFIG_CGROUPS is not set
46# CONFIG_GROUP_SCHED is not set
47CONFIG_SYSFS_DEPRECATED=y
48CONFIG_SYSFS_DEPRECATED_V2=y
41# CONFIG_RELAY is not set 49# CONFIG_RELAY is not set
42CONFIG_INITRAMFS_SOURCE="" 50CONFIG_NAMESPACES=y
51# CONFIG_UTS_NS is not set
52# CONFIG_IPC_NS is not set
53# CONFIG_USER_NS is not set
54# CONFIG_PID_NS is not set
55# CONFIG_BLK_DEV_INITRD is not set
43CONFIG_CC_OPTIMIZE_FOR_SIZE=y 56CONFIG_CC_OPTIMIZE_FOR_SIZE=y
44CONFIG_SYSCTL=y 57CONFIG_SYSCTL=y
45# CONFIG_EMBEDDED is not set 58# CONFIG_EMBEDDED is not set
46CONFIG_UID16=y 59CONFIG_UID16=y
47# CONFIG_SYSCTL_SYSCALL is not set 60CONFIG_SYSCTL_SYSCALL=y
48CONFIG_KALLSYMS=y 61CONFIG_KALLSYMS=y
49CONFIG_KALLSYMS_ALL=y 62# CONFIG_KALLSYMS_ALL is not set
50# CONFIG_KALLSYMS_EXTRA_PASS is not set 63# CONFIG_KALLSYMS_EXTRA_PASS is not set
51CONFIG_HOTPLUG=y 64CONFIG_HOTPLUG=y
52CONFIG_PRINTK=y 65CONFIG_PRINTK=y
53CONFIG_BUG=y 66CONFIG_BUG=y
54CONFIG_ELF_CORE=y 67CONFIG_ELF_CORE=y
68CONFIG_COMPAT_BRK=y
55CONFIG_BASE_FULL=y 69CONFIG_BASE_FULL=y
56CONFIG_FUTEX=y 70CONFIG_FUTEX=y
71CONFIG_ANON_INODES=y
57CONFIG_EPOLL=y 72CONFIG_EPOLL=y
73CONFIG_SIGNALFD=y
74CONFIG_TIMERFD=y
75CONFIG_EVENTFD=y
58CONFIG_SHMEM=y 76CONFIG_SHMEM=y
59CONFIG_SLAB=y 77CONFIG_AIO=y
60CONFIG_VM_EVENT_COUNTERS=y 78CONFIG_VM_EVENT_COUNTERS=y
79CONFIG_SLAB=y
80# CONFIG_SLUB is not set
81# CONFIG_SLOB is not set
82# CONFIG_PROFILING is not set
83# CONFIG_MARKERS is not set
84CONFIG_HAVE_OPROFILE=y
85# CONFIG_KPROBES is not set
86CONFIG_HAVE_KPROBES=y
87CONFIG_HAVE_KRETPROBES=y
88CONFIG_USE_GENERIC_SMP_HELPERS=y
89CONFIG_HAVE_CLK=y
90CONFIG_HAVE_GENERIC_DMA_COHERENT=y
91CONFIG_SLABINFO=y
61CONFIG_RT_MUTEXES=y 92CONFIG_RT_MUTEXES=y
62# CONFIG_TINY_SHMEM is not set 93# CONFIG_TINY_SHMEM is not set
63CONFIG_BASE_SMALL=0 94CONFIG_BASE_SMALL=0
64# CONFIG_SLOB is not set
65
66#
67# Loadable module support
68#
69CONFIG_MODULES=y 95CONFIG_MODULES=y
96# CONFIG_MODULE_FORCE_LOAD is not set
70CONFIG_MODULE_UNLOAD=y 97CONFIG_MODULE_UNLOAD=y
71# CONFIG_MODULE_FORCE_UNLOAD is not set 98# CONFIG_MODULE_FORCE_UNLOAD is not set
72# CONFIG_MODVERSIONS is not set 99# CONFIG_MODVERSIONS is not set
73# CONFIG_MODULE_SRCVERSION_ALL is not set 100# CONFIG_MODULE_SRCVERSION_ALL is not set
74# CONFIG_KMOD is not set 101CONFIG_KMOD=y
75CONFIG_STOP_MACHINE=y 102CONFIG_STOP_MACHINE=y
76
77#
78# Block layer
79#
80CONFIG_BLOCK=y 103CONFIG_BLOCK=y
104# CONFIG_LBD is not set
81# CONFIG_BLK_DEV_IO_TRACE is not set 105# CONFIG_BLK_DEV_IO_TRACE is not set
106# CONFIG_LSF is not set
107# CONFIG_BLK_DEV_BSG is not set
108# CONFIG_BLK_DEV_INTEGRITY is not set
82 109
83# 110#
84# IO Schedulers 111# IO Schedulers
@@ -92,6 +119,8 @@ CONFIG_DEFAULT_DEADLINE=y
92# CONFIG_DEFAULT_CFQ is not set 119# CONFIG_DEFAULT_CFQ is not set
93# CONFIG_DEFAULT_NOOP is not set 120# CONFIG_DEFAULT_NOOP is not set
94CONFIG_DEFAULT_IOSCHED="deadline" 121CONFIG_DEFAULT_IOSCHED="deadline"
122CONFIG_CLASSIC_RCU=y
123# CONFIG_FREEZER is not set
95 124
96# 125#
97# System Type 126# System Type
@@ -103,19 +132,26 @@ CONFIG_ARCH_REALVIEW=y
103# CONFIG_ARCH_AT91 is not set 132# CONFIG_ARCH_AT91 is not set
104# CONFIG_ARCH_CLPS7500 is not set 133# CONFIG_ARCH_CLPS7500 is not set
105# CONFIG_ARCH_CLPS711X is not set 134# CONFIG_ARCH_CLPS711X is not set
106# CONFIG_ARCH_CO285 is not set
107# CONFIG_ARCH_EBSA110 is not set 135# CONFIG_ARCH_EBSA110 is not set
108# CONFIG_ARCH_EP93XX is not set 136# CONFIG_ARCH_EP93XX is not set
109# CONFIG_ARCH_FOOTBRIDGE is not set 137# CONFIG_ARCH_FOOTBRIDGE is not set
110# CONFIG_ARCH_NETX is not set 138# CONFIG_ARCH_NETX is not set
111# CONFIG_ARCH_H720X is not set 139# CONFIG_ARCH_H720X is not set
112# CONFIG_ARCH_IMX is not set 140# CONFIG_ARCH_IMX is not set
141# CONFIG_ARCH_IOP13XX is not set
113# CONFIG_ARCH_IOP32X is not set 142# CONFIG_ARCH_IOP32X is not set
114# CONFIG_ARCH_IOP33X is not set 143# CONFIG_ARCH_IOP33X is not set
115# CONFIG_ARCH_IXP4XX is not set
116# CONFIG_ARCH_IXP2000 is not set
117# CONFIG_ARCH_IXP23XX is not set 144# CONFIG_ARCH_IXP23XX is not set
145# CONFIG_ARCH_IXP2000 is not set
146# CONFIG_ARCH_IXP4XX is not set
118# CONFIG_ARCH_L7200 is not set 147# CONFIG_ARCH_L7200 is not set
148# CONFIG_ARCH_KIRKWOOD is not set
149# CONFIG_ARCH_KS8695 is not set
150# CONFIG_ARCH_NS9XXX is not set
151# CONFIG_ARCH_LOKI is not set
152# CONFIG_ARCH_MV78XX0 is not set
153# CONFIG_ARCH_MXC is not set
154# CONFIG_ARCH_ORION5X is not set
119# CONFIG_ARCH_PNX4008 is not set 155# CONFIG_ARCH_PNX4008 is not set
120# CONFIG_ARCH_PXA is not set 156# CONFIG_ARCH_PXA is not set
121# CONFIG_ARCH_RPC is not set 157# CONFIG_ARCH_RPC is not set
@@ -123,13 +159,29 @@ CONFIG_ARCH_REALVIEW=y
123# CONFIG_ARCH_S3C2410 is not set 159# CONFIG_ARCH_S3C2410 is not set
124# CONFIG_ARCH_SHARK is not set 160# CONFIG_ARCH_SHARK is not set
125# CONFIG_ARCH_LH7A40X is not set 161# CONFIG_ARCH_LH7A40X is not set
162# CONFIG_ARCH_DAVINCI is not set
126# CONFIG_ARCH_OMAP is not set 163# CONFIG_ARCH_OMAP is not set
164# CONFIG_ARCH_MSM is not set
165
166#
167# Boot options
168#
169
170#
171# Power management
172#
127 173
128# 174#
129# RealView platform type 175# RealView platform type
130# 176#
131CONFIG_MACH_REALVIEW_EB=y 177CONFIG_MACH_REALVIEW_EB=y
132CONFIG_REALVIEW_MPCORE=y 178# CONFIG_REALVIEW_EB_A9MP is not set
179CONFIG_REALVIEW_EB_ARM11MP=y
180# CONFIG_REALVIEW_EB_ARM11MP_REVB is not set
181CONFIG_MACH_REALVIEW_PB11MP=y
182# CONFIG_MACH_REALVIEW_PB1176 is not set
183# CONFIG_MACH_REALVIEW_PBA8 is not set
184CONFIG_REALVIEW_HIGH_PHYS_OFFSET=y
133 185
134# 186#
135# Processor Type 187# Processor Type
@@ -138,12 +190,15 @@ CONFIG_CPU_32=y
138# CONFIG_CPU_ARM926T is not set 190# CONFIG_CPU_ARM926T is not set
139CONFIG_CPU_V6=y 191CONFIG_CPU_V6=y
140CONFIG_CPU_32v6K=y 192CONFIG_CPU_32v6K=y
193# CONFIG_CPU_V7 is not set
141CONFIG_CPU_32v6=y 194CONFIG_CPU_32v6=y
142CONFIG_CPU_ABRT_EV6=y 195CONFIG_CPU_ABRT_EV6=y
196CONFIG_CPU_PABRT_NOIFAR=y
143CONFIG_CPU_CACHE_V6=y 197CONFIG_CPU_CACHE_V6=y
144CONFIG_CPU_CACHE_VIPT=y 198CONFIG_CPU_CACHE_VIPT=y
145CONFIG_CPU_COPY_V6=y 199CONFIG_CPU_COPY_V6=y
146CONFIG_CPU_TLB_V6=y 200CONFIG_CPU_TLB_V6=y
201CONFIG_CPU_HAS_ASID=y
147CONFIG_CPU_CP15=y 202CONFIG_CPU_CP15=y
148CONFIG_CPU_CP15_MMU=y 203CONFIG_CPU_CP15_MMU=y
149 204
@@ -153,9 +208,10 @@ CONFIG_CPU_CP15_MMU=y
153CONFIG_ARM_THUMB=y 208CONFIG_ARM_THUMB=y
154# CONFIG_CPU_ICACHE_DISABLE is not set 209# CONFIG_CPU_ICACHE_DISABLE is not set
155# CONFIG_CPU_DCACHE_DISABLE is not set 210# CONFIG_CPU_DCACHE_DISABLE is not set
156# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
157# CONFIG_CPU_BPREDICT_DISABLE is not set 211# CONFIG_CPU_BPREDICT_DISABLE is not set
158CONFIG_HAS_TLS_REG=y 212CONFIG_HAS_TLS_REG=y
213CONFIG_OUTER_CACHE=y
214CONFIG_CACHE_L2X0=y
159CONFIG_ARM_GIC=y 215CONFIG_ARM_GIC=y
160CONFIG_ICST307=y 216CONFIG_ICST307=y
161 217
@@ -163,32 +219,44 @@ CONFIG_ICST307=y
163# Bus support 219# Bus support
164# 220#
165CONFIG_ARM_AMBA=y 221CONFIG_ARM_AMBA=y
166 222# CONFIG_PCI_SYSCALL is not set
167# 223# CONFIG_ARCH_SUPPORTS_MSI is not set
168# PCCARD (PCMCIA/CardBus) support
169#
170# CONFIG_PCCARD is not set 224# CONFIG_PCCARD is not set
171 225
172# 226#
173# Kernel Features 227# Kernel Features
174# 228#
229# CONFIG_NO_HZ is not set
230# CONFIG_HIGH_RES_TIMERS is not set
231CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
175CONFIG_SMP=y 232CONFIG_SMP=y
233CONFIG_VMSPLIT_3G=y
234# CONFIG_VMSPLIT_2G is not set
235# CONFIG_VMSPLIT_1G is not set
236CONFIG_PAGE_OFFSET=0xC0000000
176CONFIG_NR_CPUS=4 237CONFIG_NR_CPUS=4
177CONFIG_HOTPLUG_CPU=y 238CONFIG_HOTPLUG_CPU=y
178CONFIG_LOCAL_TIMERS=y 239CONFIG_LOCAL_TIMERS=y
179# CONFIG_PREEMPT is not set 240# CONFIG_PREEMPT is not set
180CONFIG_HZ=100 241CONFIG_HZ=100
181# CONFIG_AEABI is not set 242CONFIG_AEABI=y
182# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set 243CONFIG_OABI_COMPAT=y
244CONFIG_ARCH_FLATMEM_HAS_HOLES=y
245# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
246# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
183CONFIG_SELECT_MEMORY_MODEL=y 247CONFIG_SELECT_MEMORY_MODEL=y
184CONFIG_FLATMEM_MANUAL=y 248CONFIG_FLATMEM_MANUAL=y
185# CONFIG_DISCONTIGMEM_MANUAL is not set 249# CONFIG_DISCONTIGMEM_MANUAL is not set
186# CONFIG_SPARSEMEM_MANUAL is not set 250# CONFIG_SPARSEMEM_MANUAL is not set
187CONFIG_FLATMEM=y 251CONFIG_FLATMEM=y
188CONFIG_FLAT_NODE_MEM_MAP=y 252CONFIG_FLAT_NODE_MEM_MAP=y
189# CONFIG_SPARSEMEM_STATIC is not set 253CONFIG_PAGEFLAGS_EXTENDED=y
190CONFIG_SPLIT_PTLOCK_CPUS=4 254CONFIG_SPLIT_PTLOCK_CPUS=4
191# CONFIG_RESOURCES_64BIT is not set 255# CONFIG_RESOURCES_64BIT is not set
256# CONFIG_PHYS_ADDR_T_64BIT is not set
257CONFIG_ZONE_DMA_FLAG=0
258CONFIG_VIRT_TO_BUS=y
259CONFIG_UNEVICTABLE_LRU=y
192CONFIG_ALIGNMENT_TRAP=y 260CONFIG_ALIGNMENT_TRAP=y
193 261
194# 262#
@@ -198,6 +266,12 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
198CONFIG_ZBOOT_ROM_BSS=0x0 266CONFIG_ZBOOT_ROM_BSS=0x0
199CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M" 267CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M"
200# CONFIG_XIP_KERNEL is not set 268# CONFIG_XIP_KERNEL is not set
269# CONFIG_KEXEC is not set
270
271#
272# CPU Power Management
273#
274# CONFIG_CPU_IDLE is not set
201 275
202# 276#
203# Floating point emulation 277# Floating point emulation
@@ -206,8 +280,7 @@ CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=tt
206# 280#
207# At least one emulation must be selected 281# At least one emulation must be selected
208# 282#
209CONFIG_FPE_NWFPE=y 283# CONFIG_FPE_NWFPE is not set
210# CONFIG_FPE_NWFPE_XP is not set
211# CONFIG_FPE_FASTFPE is not set 284# CONFIG_FPE_FASTFPE is not set
212CONFIG_VFP=y 285CONFIG_VFP=y
213 286
@@ -215,28 +288,29 @@ CONFIG_VFP=y
215# Userspace binary formats 288# Userspace binary formats
216# 289#
217CONFIG_BINFMT_ELF=y 290CONFIG_BINFMT_ELF=y
291# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
292CONFIG_HAVE_AOUT=y
218# CONFIG_BINFMT_AOUT is not set 293# CONFIG_BINFMT_AOUT is not set
219# CONFIG_BINFMT_MISC is not set 294# CONFIG_BINFMT_MISC is not set
220# CONFIG_ARTHUR is not set
221 295
222# 296#
223# Power management options 297# Power management options
224# 298#
225# CONFIG_PM is not set 299# CONFIG_PM is not set
226# CONFIG_APM is not set 300CONFIG_ARCH_SUSPEND_POSSIBLE=y
227
228#
229# Networking
230#
231CONFIG_NET=y 301CONFIG_NET=y
232 302
233# 303#
234# Networking options 304# Networking options
235# 305#
236# CONFIG_NETDEBUG is not set
237CONFIG_PACKET=y 306CONFIG_PACKET=y
238# CONFIG_PACKET_MMAP is not set 307# CONFIG_PACKET_MMAP is not set
239CONFIG_UNIX=y 308CONFIG_UNIX=y
309CONFIG_XFRM=y
310# CONFIG_XFRM_USER is not set
311# CONFIG_XFRM_SUB_POLICY is not set
312# CONFIG_XFRM_MIGRATE is not set
313# CONFIG_XFRM_STATISTICS is not set
240# CONFIG_NET_KEY is not set 314# CONFIG_NET_KEY is not set
241CONFIG_INET=y 315CONFIG_INET=y
242# CONFIG_IP_MULTICAST is not set 316# CONFIG_IP_MULTICAST is not set
@@ -255,36 +329,25 @@ CONFIG_IP_PNP_BOOTP=y
255# CONFIG_INET_IPCOMP is not set 329# CONFIG_INET_IPCOMP is not set
256# CONFIG_INET_XFRM_TUNNEL is not set 330# CONFIG_INET_XFRM_TUNNEL is not set
257# CONFIG_INET_TUNNEL is not set 331# CONFIG_INET_TUNNEL is not set
258# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 332CONFIG_INET_XFRM_MODE_TRANSPORT=y
259# CONFIG_INET_XFRM_MODE_TUNNEL is not set 333CONFIG_INET_XFRM_MODE_TUNNEL=y
260# CONFIG_INET_XFRM_MODE_BEET is not set 334CONFIG_INET_XFRM_MODE_BEET=y
335# CONFIG_INET_LRO is not set
261CONFIG_INET_DIAG=y 336CONFIG_INET_DIAG=y
262CONFIG_INET_TCP_DIAG=y 337CONFIG_INET_TCP_DIAG=y
263# CONFIG_TCP_CONG_ADVANCED is not set 338# CONFIG_TCP_CONG_ADVANCED is not set
264CONFIG_TCP_CONG_CUBIC=y 339CONFIG_TCP_CONG_CUBIC=y
265CONFIG_DEFAULT_TCP_CONG="cubic" 340CONFIG_DEFAULT_TCP_CONG="cubic"
341# CONFIG_TCP_MD5SIG is not set
266# CONFIG_IPV6 is not set 342# CONFIG_IPV6 is not set
267# CONFIG_INET6_XFRM_TUNNEL is not set
268# CONFIG_INET6_TUNNEL is not set
269# CONFIG_NETWORK_SECMARK is not set 343# CONFIG_NETWORK_SECMARK is not set
270# CONFIG_NETFILTER is not set 344# CONFIG_NETFILTER is not set
271
272#
273# DCCP Configuration (EXPERIMENTAL)
274#
275# CONFIG_IP_DCCP is not set 345# CONFIG_IP_DCCP is not set
276
277#
278# SCTP Configuration (EXPERIMENTAL)
279#
280# CONFIG_IP_SCTP is not set 346# CONFIG_IP_SCTP is not set
281
282#
283# TIPC Configuration (EXPERIMENTAL)
284#
285# CONFIG_TIPC is not set 347# CONFIG_TIPC is not set
286# CONFIG_ATM is not set 348# CONFIG_ATM is not set
287# CONFIG_BRIDGE is not set 349# CONFIG_BRIDGE is not set
350# CONFIG_NET_DSA is not set
288# CONFIG_VLAN_8021Q is not set 351# CONFIG_VLAN_8021Q is not set
289# CONFIG_DECNET is not set 352# CONFIG_DECNET is not set
290# CONFIG_LLC2 is not set 353# CONFIG_LLC2 is not set
@@ -294,10 +357,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
294# CONFIG_LAPB is not set 357# CONFIG_LAPB is not set
295# CONFIG_ECONET is not set 358# CONFIG_ECONET is not set
296# CONFIG_WAN_ROUTER is not set 359# CONFIG_WAN_ROUTER is not set
297
298#
299# QoS and/or fair queueing
300#
301# CONFIG_NET_SCHED is not set 360# CONFIG_NET_SCHED is not set
302 361
303# 362#
@@ -305,9 +364,14 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
305# 364#
306# CONFIG_NET_PKTGEN is not set 365# CONFIG_NET_PKTGEN is not set
307# CONFIG_HAMRADIO is not set 366# CONFIG_HAMRADIO is not set
367# CONFIG_CAN is not set
308# CONFIG_IRDA is not set 368# CONFIG_IRDA is not set
309# CONFIG_BT is not set 369# CONFIG_BT is not set
310# CONFIG_IEEE80211 is not set 370# CONFIG_AF_RXRPC is not set
371# CONFIG_PHONET is not set
372# CONFIG_WIRELESS is not set
373# CONFIG_RFKILL is not set
374# CONFIG_NET_9P is not set
311 375
312# 376#
313# Device Drivers 377# Device Drivers
@@ -316,38 +380,37 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
316# 380#
317# Generic Driver Options 381# Generic Driver Options
318# 382#
383CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
319CONFIG_STANDALONE=y 384CONFIG_STANDALONE=y
320CONFIG_PREVENT_FIRMWARE_BUILD=y 385CONFIG_PREVENT_FIRMWARE_BUILD=y
321# CONFIG_FW_LOADER is not set 386CONFIG_FW_LOADER=y
387CONFIG_FIRMWARE_IN_KERNEL=y
388CONFIG_EXTRA_FIRMWARE=""
322# CONFIG_DEBUG_DRIVER is not set 389# CONFIG_DEBUG_DRIVER is not set
390# CONFIG_DEBUG_DEVRES is not set
323# CONFIG_SYS_HYPERVISOR is not set 391# CONFIG_SYS_HYPERVISOR is not set
324
325#
326# Connector - unified userspace <-> kernelspace linker
327#
328# CONFIG_CONNECTOR is not set 392# CONFIG_CONNECTOR is not set
329
330#
331# Memory Technology Devices (MTD)
332#
333CONFIG_MTD=y 393CONFIG_MTD=y
334# CONFIG_MTD_DEBUG is not set 394# CONFIG_MTD_DEBUG is not set
335# CONFIG_MTD_CONCAT is not set 395CONFIG_MTD_CONCAT=y
336CONFIG_MTD_PARTITIONS=y 396CONFIG_MTD_PARTITIONS=y
337# CONFIG_MTD_REDBOOT_PARTS is not set 397# CONFIG_MTD_REDBOOT_PARTS is not set
338CONFIG_MTD_CMDLINE_PARTS=y 398CONFIG_MTD_CMDLINE_PARTS=y
339# CONFIG_MTD_AFS_PARTS is not set 399# CONFIG_MTD_AFS_PARTS is not set
400# CONFIG_MTD_AR7_PARTS is not set
340 401
341# 402#
342# User Modules And Translation Layers 403# User Modules And Translation Layers
343# 404#
344CONFIG_MTD_CHAR=y 405CONFIG_MTD_CHAR=y
406CONFIG_MTD_BLKDEVS=y
345CONFIG_MTD_BLOCK=y 407CONFIG_MTD_BLOCK=y
346# CONFIG_FTL is not set 408# CONFIG_FTL is not set
347# CONFIG_NFTL is not set 409# CONFIG_NFTL is not set
348# CONFIG_INFTL is not set 410# CONFIG_INFTL is not set
349# CONFIG_RFD_FTL is not set 411# CONFIG_RFD_FTL is not set
350# CONFIG_SSFDC is not set 412# CONFIG_SSFDC is not set
413# CONFIG_MTD_OOPS is not set
351 414
352# 415#
353# RAM/ROM/Flash chip drivers 416# RAM/ROM/Flash chip drivers
@@ -373,7 +436,6 @@ CONFIG_MTD_CFI_UTIL=y
373# CONFIG_MTD_RAM is not set 436# CONFIG_MTD_RAM is not set
374# CONFIG_MTD_ROM is not set 437# CONFIG_MTD_ROM is not set
375# CONFIG_MTD_ABSENT is not set 438# CONFIG_MTD_ABSENT is not set
376# CONFIG_MTD_OBSOLETE_CHIPS is not set
377 439
378# 440#
379# Mapping drivers for chip access 441# Mapping drivers for chip access
@@ -397,115 +459,73 @@ CONFIG_MTD_ARM_INTEGRATOR=y
397# CONFIG_MTD_DOC2000 is not set 459# CONFIG_MTD_DOC2000 is not set
398# CONFIG_MTD_DOC2001 is not set 460# CONFIG_MTD_DOC2001 is not set
399# CONFIG_MTD_DOC2001PLUS is not set 461# CONFIG_MTD_DOC2001PLUS is not set
400
401#
402# NAND Flash Device Drivers
403#
404# CONFIG_MTD_NAND is not set 462# CONFIG_MTD_NAND is not set
405
406#
407# OneNAND Flash Device Drivers
408#
409# CONFIG_MTD_ONENAND is not set 463# CONFIG_MTD_ONENAND is not set
410 464
411# 465#
412# Parallel port support 466# UBI - Unsorted block images
413# 467#
468# CONFIG_MTD_UBI is not set
414# CONFIG_PARPORT is not set 469# CONFIG_PARPORT is not set
415 470CONFIG_BLK_DEV=y
416#
417# Plug and Play support
418#
419
420#
421# Block devices
422#
423# CONFIG_BLK_DEV_COW_COMMON is not set 471# CONFIG_BLK_DEV_COW_COMMON is not set
424# CONFIG_BLK_DEV_LOOP is not set 472# CONFIG_BLK_DEV_LOOP is not set
425# CONFIG_BLK_DEV_NBD is not set 473# CONFIG_BLK_DEV_NBD is not set
426# CONFIG_BLK_DEV_RAM is not set 474# CONFIG_BLK_DEV_RAM is not set
427CONFIG_BLK_DEV_INITRD=y
428# CONFIG_CDROM_PKTCDVD is not set 475# CONFIG_CDROM_PKTCDVD is not set
429# CONFIG_ATA_OVER_ETH is not set 476# CONFIG_ATA_OVER_ETH is not set
477CONFIG_MISC_DEVICES=y
478# CONFIG_EEPROM_93CX6 is not set
479# CONFIG_ENCLOSURE_SERVICES is not set
480CONFIG_HAVE_IDE=y
481# CONFIG_IDE is not set
430 482
431# 483#
432# SCSI device support 484# SCSI device support
433# 485#
434# CONFIG_RAID_ATTRS is not set 486# CONFIG_RAID_ATTRS is not set
435# CONFIG_SCSI is not set 487# CONFIG_SCSI is not set
488# CONFIG_SCSI_DMA is not set
436# CONFIG_SCSI_NETLINK is not set 489# CONFIG_SCSI_NETLINK is not set
437 490# CONFIG_ATA is not set
438#
439# Multi-device support (RAID and LVM)
440#
441# CONFIG_MD is not set 491# CONFIG_MD is not set
442
443#
444# Fusion MPT device support
445#
446# CONFIG_FUSION is not set
447
448#
449# IEEE 1394 (FireWire) support
450#
451
452#
453# I2O device support
454#
455
456#
457# Network device support
458#
459CONFIG_NETDEVICES=y 492CONFIG_NETDEVICES=y
460# CONFIG_DUMMY is not set 493# CONFIG_DUMMY is not set
461# CONFIG_BONDING is not set 494# CONFIG_BONDING is not set
495# CONFIG_MACVLAN is not set
462# CONFIG_EQUALIZER is not set 496# CONFIG_EQUALIZER is not set
463# CONFIG_TUN is not set 497# CONFIG_TUN is not set
464 498# CONFIG_VETH is not set
465#
466# PHY device support
467#
468# CONFIG_PHYLIB is not set 499# CONFIG_PHYLIB is not set
469
470#
471# Ethernet (10 or 100Mbit)
472#
473CONFIG_NET_ETHERNET=y 500CONFIG_NET_ETHERNET=y
474CONFIG_MII=y 501CONFIG_MII=y
502# CONFIG_AX88796 is not set
475CONFIG_SMC91X=y 503CONFIG_SMC91X=y
476# CONFIG_DM9000 is not set 504# CONFIG_DM9000 is not set
477 505CONFIG_SMC911X=y
478# 506# CONFIG_IBM_NEW_EMAC_ZMII is not set
479# Ethernet (1000 Mbit) 507# CONFIG_IBM_NEW_EMAC_RGMII is not set
480# 508# CONFIG_IBM_NEW_EMAC_TAH is not set
481 509# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
482# 510# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
483# Ethernet (10000 Mbit) 511# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
484# 512# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
485 513# CONFIG_B44 is not set
486# 514# CONFIG_NETDEV_1000 is not set
487# Token Ring devices 515# CONFIG_NETDEV_10000 is not set
488# 516
489 517#
490# 518# Wireless LAN
491# Wireless LAN (non-hamradio) 519#
492# 520# CONFIG_WLAN_PRE80211 is not set
493# CONFIG_NET_RADIO is not set 521# CONFIG_WLAN_80211 is not set
494 522# CONFIG_IWLWIFI_LEDS is not set
495#
496# Wan interfaces
497#
498# CONFIG_WAN is not set 523# CONFIG_WAN is not set
499# CONFIG_PPP is not set 524# CONFIG_PPP is not set
500# CONFIG_SLIP is not set 525# CONFIG_SLIP is not set
501# CONFIG_SHAPER is not set
502# CONFIG_NETCONSOLE is not set 526# CONFIG_NETCONSOLE is not set
503# CONFIG_NETPOLL is not set 527# CONFIG_NETPOLL is not set
504# CONFIG_NET_POLL_CONTROLLER is not set 528# CONFIG_NET_POLL_CONTROLLER is not set
505
506#
507# ISDN subsystem
508#
509# CONFIG_ISDN is not set 529# CONFIG_ISDN is not set
510 530
511# 531#
@@ -513,6 +533,7 @@ CONFIG_SMC91X=y
513# 533#
514CONFIG_INPUT=y 534CONFIG_INPUT=y
515# CONFIG_INPUT_FF_MEMLESS is not set 535# CONFIG_INPUT_FF_MEMLESS is not set
536# CONFIG_INPUT_POLLDEV is not set
516 537
517# 538#
518# Userland interfaces 539# Userland interfaces
@@ -522,7 +543,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
522CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 543CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
523CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 544CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
524# CONFIG_INPUT_JOYDEV is not set 545# CONFIG_INPUT_JOYDEV is not set
525# CONFIG_INPUT_TSDEV is not set
526# CONFIG_INPUT_EVDEV is not set 546# CONFIG_INPUT_EVDEV is not set
527# CONFIG_INPUT_EVBUG is not set 547# CONFIG_INPUT_EVBUG is not set
528 548
@@ -538,9 +558,16 @@ CONFIG_KEYBOARD_ATKBD=y
538# CONFIG_KEYBOARD_STOWAWAY is not set 558# CONFIG_KEYBOARD_STOWAWAY is not set
539CONFIG_INPUT_MOUSE=y 559CONFIG_INPUT_MOUSE=y
540CONFIG_MOUSE_PS2=y 560CONFIG_MOUSE_PS2=y
561CONFIG_MOUSE_PS2_ALPS=y
562CONFIG_MOUSE_PS2_LOGIPS2PP=y
563CONFIG_MOUSE_PS2_SYNAPTICS=y
564CONFIG_MOUSE_PS2_LIFEBOOK=y
565CONFIG_MOUSE_PS2_TRACKPOINT=y
566# CONFIG_MOUSE_PS2_TOUCHKIT is not set
541# CONFIG_MOUSE_SERIAL is not set 567# CONFIG_MOUSE_SERIAL is not set
542# CONFIG_MOUSE_VSXXXAA is not set 568# CONFIG_MOUSE_VSXXXAA is not set
543# CONFIG_INPUT_JOYSTICK is not set 569# CONFIG_INPUT_JOYSTICK is not set
570# CONFIG_INPUT_TABLET is not set
544# CONFIG_INPUT_TOUCHSCREEN is not set 571# CONFIG_INPUT_TOUCHSCREEN is not set
545# CONFIG_INPUT_MISC is not set 572# CONFIG_INPUT_MISC is not set
546 573
@@ -558,9 +585,11 @@ CONFIG_SERIO_LIBPS2=y
558# Character devices 585# Character devices
559# 586#
560CONFIG_VT=y 587CONFIG_VT=y
588CONFIG_CONSOLE_TRANSLATIONS=y
561CONFIG_VT_CONSOLE=y 589CONFIG_VT_CONSOLE=y
562CONFIG_HW_CONSOLE=y 590CONFIG_HW_CONSOLE=y
563# CONFIG_VT_HW_CONSOLE_BINDING is not set 591# CONFIG_VT_HW_CONSOLE_BINDING is not set
592CONFIG_DEVKMEM=y
564# CONFIG_SERIAL_NONSTANDARD is not set 593# CONFIG_SERIAL_NONSTANDARD is not set
565 594
566# 595#
@@ -579,97 +608,91 @@ CONFIG_SERIAL_CORE_CONSOLE=y
579CONFIG_UNIX98_PTYS=y 608CONFIG_UNIX98_PTYS=y
580CONFIG_LEGACY_PTYS=y 609CONFIG_LEGACY_PTYS=y
581CONFIG_LEGACY_PTY_COUNT=16 610CONFIG_LEGACY_PTY_COUNT=16
582
583#
584# IPMI
585#
586# CONFIG_IPMI_HANDLER is not set 611# CONFIG_IPMI_HANDLER is not set
587
588#
589# Watchdog Cards
590#
591# CONFIG_WATCHDOG is not set
592# CONFIG_HW_RANDOM is not set 612# CONFIG_HW_RANDOM is not set
593# CONFIG_NVRAM is not set 613# CONFIG_NVRAM is not set
594# CONFIG_DTLK is not set
595# CONFIG_R3964 is not set 614# CONFIG_R3964 is not set
596
597#
598# Ftape, the floppy tape device driver
599#
600# CONFIG_RAW_DRIVER is not set 615# CONFIG_RAW_DRIVER is not set
601
602#
603# TPM devices
604#
605# CONFIG_TCG_TPM is not set 616# CONFIG_TCG_TPM is not set
606
607#
608# I2C support
609#
610# CONFIG_I2C is not set 617# CONFIG_I2C is not set
611
612#
613# SPI support
614#
615# CONFIG_SPI is not set 618# CONFIG_SPI is not set
616# CONFIG_SPI_MASTER is not set
617
618#
619# Dallas's 1-wire bus
620#
621# CONFIG_W1 is not set 619# CONFIG_W1 is not set
622 620# CONFIG_POWER_SUPPLY is not set
623#
624# Hardware Monitoring support
625#
626# CONFIG_HWMON is not set 621# CONFIG_HWMON is not set
627# CONFIG_HWMON_VID is not set 622# CONFIG_THERMAL is not set
628 623# CONFIG_THERMAL_HWMON is not set
629# 624# CONFIG_WATCHDOG is not set
630# Misc devices
631#
632# CONFIG_SGI_IOC4 is not set
633# CONFIG_TIFM_CORE is not set
634 625
635# 626#
636# LED devices 627# Sonics Silicon Backplane
637# 628#
638# CONFIG_NEW_LEDS is not set 629CONFIG_SSB_POSSIBLE=y
630# CONFIG_SSB is not set
639 631
640# 632#
641# LED drivers 633# Multifunction device drivers
642# 634#
635# CONFIG_MFD_CORE is not set
636# CONFIG_MFD_SM501 is not set
637# CONFIG_HTC_PASIC3 is not set
638# CONFIG_MFD_TMIO is not set
639# CONFIG_MFD_T7L66XB is not set
640# CONFIG_MFD_TC6387XB is not set
641# CONFIG_MFD_WM8400 is not set
643 642
644# 643#
645# LED Triggers 644# Multimedia devices
646# 645#
647 646
648# 647#
649# Multimedia devices 648# Multimedia core support
650# 649#
651# CONFIG_VIDEO_DEV is not set 650# CONFIG_VIDEO_DEV is not set
651# CONFIG_DVB_CORE is not set
652# CONFIG_VIDEO_MEDIA is not set
652 653
653# 654#
654# Digital Video Broadcasting Devices 655# Multimedia drivers
655# 656#
656# CONFIG_DVB is not set 657# CONFIG_DAB is not set
657 658
658# 659#
659# Graphics support 660# Graphics support
660# 661#
661# CONFIG_FIRMWARE_EDID is not set 662# CONFIG_VGASTATE is not set
663# CONFIG_VIDEO_OUTPUT_CONTROL is not set
662CONFIG_FB=y 664CONFIG_FB=y
665# CONFIG_FIRMWARE_EDID is not set
666# CONFIG_FB_DDC is not set
667# CONFIG_FB_BOOT_VESA_SUPPORT is not set
663CONFIG_FB_CFB_FILLRECT=y 668CONFIG_FB_CFB_FILLRECT=y
664CONFIG_FB_CFB_COPYAREA=y 669CONFIG_FB_CFB_COPYAREA=y
665CONFIG_FB_CFB_IMAGEBLIT=y 670CONFIG_FB_CFB_IMAGEBLIT=y
671# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
672# CONFIG_FB_SYS_FILLRECT is not set
673# CONFIG_FB_SYS_COPYAREA is not set
674# CONFIG_FB_SYS_IMAGEBLIT is not set
675# CONFIG_FB_FOREIGN_ENDIAN is not set
676# CONFIG_FB_SYS_FOPS is not set
677# CONFIG_FB_SVGALIB is not set
666# CONFIG_FB_MACMODES is not set 678# CONFIG_FB_MACMODES is not set
667# CONFIG_FB_BACKLIGHT is not set 679# CONFIG_FB_BACKLIGHT is not set
668# CONFIG_FB_MODE_HELPERS is not set 680# CONFIG_FB_MODE_HELPERS is not set
669# CONFIG_FB_TILEBLITTING is not set 681# CONFIG_FB_TILEBLITTING is not set
682
683#
684# Frame buffer hardware drivers
685#
670CONFIG_FB_ARMCLCD=y 686CONFIG_FB_ARMCLCD=y
671# CONFIG_FB_S1D13XXX is not set 687# CONFIG_FB_S1D13XXX is not set
672# CONFIG_FB_VIRTUAL is not set 688# CONFIG_FB_VIRTUAL is not set
689# CONFIG_FB_METRONOME is not set
690# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
691
692#
693# Display device support
694#
695# CONFIG_DISPLAY_SUPPORT is not set
673 696
674# 697#
675# Console display driver support 698# Console display driver support
@@ -677,28 +700,17 @@ CONFIG_FB_ARMCLCD=y
677# CONFIG_VGA_CONSOLE is not set 700# CONFIG_VGA_CONSOLE is not set
678CONFIG_DUMMY_CONSOLE=y 701CONFIG_DUMMY_CONSOLE=y
679CONFIG_FRAMEBUFFER_CONSOLE=y 702CONFIG_FRAMEBUFFER_CONSOLE=y
703# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
680# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set 704# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
681# CONFIG_FONTS is not set 705# CONFIG_FONTS is not set
682CONFIG_FONT_8x8=y 706CONFIG_FONT_8x8=y
683CONFIG_FONT_8x16=y 707CONFIG_FONT_8x16=y
684
685#
686# Logo configuration
687#
688CONFIG_LOGO=y 708CONFIG_LOGO=y
689# CONFIG_LOGO_LINUX_MONO is not set 709# CONFIG_LOGO_LINUX_MONO is not set
690# CONFIG_LOGO_LINUX_VGA16 is not set 710# CONFIG_LOGO_LINUX_VGA16 is not set
691CONFIG_LOGO_LINUX_CLUT224=y 711CONFIG_LOGO_LINUX_CLUT224=y
692# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
693
694#
695# Sound
696#
697CONFIG_SOUND=y 712CONFIG_SOUND=y
698 713CONFIG_SOUND_OSS_CORE=y
699#
700# Advanced Linux Sound Architecture
701#
702CONFIG_SND=y 714CONFIG_SND=y
703CONFIG_SND_TIMER=y 715CONFIG_SND_TIMER=y
704CONFIG_SND_PCM=y 716CONFIG_SND_PCM=y
@@ -712,100 +724,65 @@ CONFIG_SND_SUPPORT_OLD_API=y
712CONFIG_SND_VERBOSE_PROCFS=y 724CONFIG_SND_VERBOSE_PROCFS=y
713# CONFIG_SND_VERBOSE_PRINTK is not set 725# CONFIG_SND_VERBOSE_PRINTK is not set
714# CONFIG_SND_DEBUG is not set 726# CONFIG_SND_DEBUG is not set
715 727CONFIG_SND_VMASTER=y
716# 728CONFIG_SND_AC97_CODEC=y
717# Generic devices 729# CONFIG_SND_DRIVERS is not set
718# 730CONFIG_SND_ARM=y
719CONFIG_SND_AC97_CODEC=m 731CONFIG_SND_ARMAACI=y
720CONFIG_SND_AC97_BUS=m 732# CONFIG_SND_SOC is not set
721# CONFIG_SND_DUMMY is not set
722# CONFIG_SND_MTPAV is not set
723# CONFIG_SND_SERIAL_U16550 is not set
724# CONFIG_SND_MPU401 is not set
725
726#
727# ALSA ARM devices
728#
729CONFIG_SND_ARMAACI=m
730
731#
732# Open Sound System
733#
734# CONFIG_SOUND_PRIME is not set 733# CONFIG_SOUND_PRIME is not set
735 734CONFIG_AC97_BUS=y
736# 735# CONFIG_HID_SUPPORT is not set
737# USB support 736# CONFIG_USB_SUPPORT is not set
738#
739CONFIG_USB_ARCH_HAS_HCD=y
740# CONFIG_USB_ARCH_HAS_OHCI is not set
741# CONFIG_USB_ARCH_HAS_EHCI is not set
742# CONFIG_USB is not set
743
744#
745# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
746#
747
748#
749# USB Gadget Support
750#
751# CONFIG_USB_GADGET is not set
752
753#
754# MMC/SD Card support
755#
756CONFIG_MMC=y 737CONFIG_MMC=y
757# CONFIG_MMC_DEBUG is not set 738# CONFIG_MMC_DEBUG is not set
758CONFIG_MMC_BLOCK=y 739# CONFIG_MMC_UNSAFE_RESUME is not set
759CONFIG_MMC_ARMMMCI=y
760# CONFIG_MMC_TIFM_SD is not set
761 740
762# 741#
763# Real Time Clock 742# MMC/SD/SDIO Card Drivers
764# 743#
765CONFIG_RTC_LIB=y 744CONFIG_MMC_BLOCK=y
766CONFIG_RTC_CLASS=y 745CONFIG_MMC_BLOCK_BOUNCE=y
767CONFIG_RTC_HCTOSYS=y 746# CONFIG_SDIO_UART is not set
768CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 747# CONFIG_MMC_TEST is not set
769# CONFIG_RTC_DEBUG is not set
770 748
771# 749#
772# RTC interfaces 750# MMC/SD/SDIO Host Controller Drivers
773# 751#
774CONFIG_RTC_INTF_SYSFS=y 752CONFIG_MMC_ARMMMCI=y
775CONFIG_RTC_INTF_PROC=y 753# CONFIG_MMC_SDHCI is not set
776CONFIG_RTC_INTF_DEV=y 754# CONFIG_MEMSTICK is not set
777CONFIG_RTC_INTF_DEV_UIE_EMUL=y 755# CONFIG_ACCESSIBILITY is not set
756# CONFIG_NEW_LEDS is not set
757CONFIG_RTC_LIB=y
758# CONFIG_RTC_CLASS is not set
759# CONFIG_DMADEVICES is not set
778 760
779# 761#
780# RTC drivers 762# Voltage and Current regulators
781# 763#
782# CONFIG_RTC_DRV_DS1553 is not set 764# CONFIG_REGULATOR is not set
783# CONFIG_RTC_DRV_DS1742 is not set 765# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
784# CONFIG_RTC_DRV_M48T86 is not set 766# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
785CONFIG_RTC_DRV_PL031=y 767# CONFIG_REGULATOR_BQ24022 is not set
786# CONFIG_RTC_DRV_TEST is not set 768# CONFIG_UIO is not set
787# CONFIG_RTC_DRV_V3020 is not set
788 769
789# 770#
790# File systems 771# File systems
791# 772#
792CONFIG_EXT2_FS=y 773# CONFIG_EXT2_FS is not set
793# CONFIG_EXT2_FS_XATTR is not set
794# CONFIG_EXT2_FS_XIP is not set
795# CONFIG_EXT3_FS is not set 774# CONFIG_EXT3_FS is not set
796# CONFIG_EXT4DEV_FS is not set 775# CONFIG_EXT4_FS is not set
797# CONFIG_REISERFS_FS is not set 776# CONFIG_REISERFS_FS is not set
798# CONFIG_JFS_FS is not set 777# CONFIG_JFS_FS is not set
799# CONFIG_FS_POSIX_ACL is not set 778# CONFIG_FS_POSIX_ACL is not set
779CONFIG_FILE_LOCKING=y
800# CONFIG_XFS_FS is not set 780# CONFIG_XFS_FS is not set
801# CONFIG_GFS2_FS is not set
802# CONFIG_OCFS2_FS is not set 781# CONFIG_OCFS2_FS is not set
803# CONFIG_MINIX_FS is not set 782CONFIG_DNOTIFY=y
804# CONFIG_ROMFS_FS is not set
805CONFIG_INOTIFY=y 783CONFIG_INOTIFY=y
806# CONFIG_INOTIFY_USER is not set 784CONFIG_INOTIFY_USER=y
807# CONFIG_QUOTA is not set 785# CONFIG_QUOTA is not set
808CONFIG_DNOTIFY=y
809# CONFIG_AUTOFS_FS is not set 786# CONFIG_AUTOFS_FS is not set
810# CONFIG_AUTOFS4_FS is not set 787# CONFIG_AUTOFS4_FS is not set
811# CONFIG_FUSE_FS is not set 788# CONFIG_FUSE_FS is not set
@@ -831,11 +808,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
831# 808#
832CONFIG_PROC_FS=y 809CONFIG_PROC_FS=y
833CONFIG_PROC_SYSCTL=y 810CONFIG_PROC_SYSCTL=y
811CONFIG_PROC_PAGE_MONITOR=y
834CONFIG_SYSFS=y 812CONFIG_SYSFS=y
835CONFIG_TMPFS=y 813CONFIG_TMPFS=y
836# CONFIG_TMPFS_POSIX_ACL is not set 814# CONFIG_TMPFS_POSIX_ACL is not set
837# CONFIG_HUGETLB_PAGE is not set 815# CONFIG_HUGETLB_PAGE is not set
838CONFIG_RAMFS=y
839# CONFIG_CONFIGFS_FS is not set 816# CONFIG_CONFIGFS_FS is not set
840 817
841# 818#
@@ -848,29 +825,28 @@ CONFIG_RAMFS=y
848# CONFIG_BEFS_FS is not set 825# CONFIG_BEFS_FS is not set
849# CONFIG_BFS_FS is not set 826# CONFIG_BFS_FS is not set
850# CONFIG_EFS_FS is not set 827# CONFIG_EFS_FS is not set
851# CONFIG_JFFS_FS is not set
852# CONFIG_JFFS2_FS is not set 828# CONFIG_JFFS2_FS is not set
853CONFIG_CRAMFS=y 829CONFIG_CRAMFS=y
854# CONFIG_VXFS_FS is not set 830# CONFIG_VXFS_FS is not set
831# CONFIG_MINIX_FS is not set
832# CONFIG_OMFS_FS is not set
855# CONFIG_HPFS_FS is not set 833# CONFIG_HPFS_FS is not set
856# CONFIG_QNX4FS_FS is not set 834# CONFIG_QNX4FS_FS is not set
835# CONFIG_ROMFS_FS is not set
857# CONFIG_SYSV_FS is not set 836# CONFIG_SYSV_FS is not set
858# CONFIG_UFS_FS is not set 837# CONFIG_UFS_FS is not set
859 838CONFIG_NETWORK_FILESYSTEMS=y
860#
861# Network File Systems
862#
863CONFIG_NFS_FS=y 839CONFIG_NFS_FS=y
864CONFIG_NFS_V3=y 840CONFIG_NFS_V3=y
865# CONFIG_NFS_V3_ACL is not set 841# CONFIG_NFS_V3_ACL is not set
866# CONFIG_NFS_V4 is not set 842# CONFIG_NFS_V4 is not set
867# CONFIG_NFS_DIRECTIO is not set
868# CONFIG_NFSD is not set
869CONFIG_ROOT_NFS=y 843CONFIG_ROOT_NFS=y
844# CONFIG_NFSD is not set
870CONFIG_LOCKD=y 845CONFIG_LOCKD=y
871CONFIG_LOCKD_V4=y 846CONFIG_LOCKD_V4=y
872CONFIG_NFS_COMMON=y 847CONFIG_NFS_COMMON=y
873CONFIG_SUNRPC=y 848CONFIG_SUNRPC=y
849# CONFIG_SUNRPC_REGISTER_V4 is not set
874# CONFIG_RPCSEC_GSS_KRB5 is not set 850# CONFIG_RPCSEC_GSS_KRB5 is not set
875# CONFIG_RPCSEC_GSS_SPKM3 is not set 851# CONFIG_RPCSEC_GSS_SPKM3 is not set
876# CONFIG_SMB_FS is not set 852# CONFIG_SMB_FS is not set
@@ -878,17 +854,12 @@ CONFIG_SUNRPC=y
878# CONFIG_NCP_FS is not set 854# CONFIG_NCP_FS is not set
879# CONFIG_CODA_FS is not set 855# CONFIG_CODA_FS is not set
880# CONFIG_AFS_FS is not set 856# CONFIG_AFS_FS is not set
881# CONFIG_9P_FS is not set
882 857
883# 858#
884# Partition Types 859# Partition Types
885# 860#
886# CONFIG_PARTITION_ADVANCED is not set 861# CONFIG_PARTITION_ADVANCED is not set
887CONFIG_MSDOS_PARTITION=y 862CONFIG_MSDOS_PARTITION=y
888
889#
890# Native Language Support
891#
892CONFIG_NLS=y 863CONFIG_NLS=y
893CONFIG_NLS_DEFAULT="iso8859-1" 864CONFIG_NLS_DEFAULT="iso8859-1"
894CONFIG_NLS_CODEPAGE_437=y 865CONFIG_NLS_CODEPAGE_437=y
@@ -929,64 +900,177 @@ CONFIG_NLS_ISO8859_1=y
929# CONFIG_NLS_KOI8_R is not set 900# CONFIG_NLS_KOI8_R is not set
930# CONFIG_NLS_KOI8_U is not set 901# CONFIG_NLS_KOI8_U is not set
931# CONFIG_NLS_UTF8 is not set 902# CONFIG_NLS_UTF8 is not set
932 903# CONFIG_DLM is not set
933#
934# Profiling support
935#
936# CONFIG_PROFILING is not set
937 904
938# 905#
939# Kernel hacking 906# Kernel hacking
940# 907#
941# CONFIG_PRINTK_TIME is not set 908# CONFIG_PRINTK_TIME is not set
942# CONFIG_ENABLE_MUST_CHECK is not set 909CONFIG_ENABLE_WARN_DEPRECATED=y
910CONFIG_ENABLE_MUST_CHECK=y
911CONFIG_FRAME_WARN=1024
943CONFIG_MAGIC_SYSRQ=y 912CONFIG_MAGIC_SYSRQ=y
944# CONFIG_UNUSED_SYMBOLS is not set 913# CONFIG_UNUSED_SYMBOLS is not set
914# CONFIG_DEBUG_FS is not set
915# CONFIG_HEADERS_CHECK is not set
945CONFIG_DEBUG_KERNEL=y 916CONFIG_DEBUG_KERNEL=y
946CONFIG_LOG_BUF_SHIFT=14 917# CONFIG_DEBUG_SHIRQ is not set
947CONFIG_DETECT_SOFTLOCKUP=y 918CONFIG_DETECT_SOFTLOCKUP=y
919# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
920CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
921# CONFIG_SCHED_DEBUG is not set
948# CONFIG_SCHEDSTATS is not set 922# CONFIG_SCHEDSTATS is not set
923# CONFIG_TIMER_STATS is not set
924# CONFIG_DEBUG_OBJECTS is not set
949# CONFIG_DEBUG_SLAB is not set 925# CONFIG_DEBUG_SLAB is not set
950# CONFIG_DEBUG_RT_MUTEXES is not set 926# CONFIG_DEBUG_RT_MUTEXES is not set
951# CONFIG_RT_MUTEX_TESTER is not set 927# CONFIG_RT_MUTEX_TESTER is not set
952CONFIG_DEBUG_SPINLOCK=y 928# CONFIG_DEBUG_SPINLOCK is not set
953CONFIG_DEBUG_MUTEXES=y 929# CONFIG_DEBUG_MUTEXES is not set
954CONFIG_DEBUG_RWSEMS=y 930# CONFIG_DEBUG_LOCK_ALLOC is not set
931# CONFIG_PROVE_LOCKING is not set
932# CONFIG_LOCK_STAT is not set
955# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 933# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
956# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 934# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
957# CONFIG_DEBUG_KOBJECT is not set 935# CONFIG_DEBUG_KOBJECT is not set
958CONFIG_DEBUG_BUGVERBOSE=y 936CONFIG_DEBUG_BUGVERBOSE=y
959# CONFIG_DEBUG_INFO is not set 937# CONFIG_DEBUG_INFO is not set
960# CONFIG_DEBUG_FS is not set
961# CONFIG_DEBUG_VM is not set 938# CONFIG_DEBUG_VM is not set
939# CONFIG_DEBUG_WRITECOUNT is not set
940CONFIG_DEBUG_MEMORY_INIT=y
962# CONFIG_DEBUG_LIST is not set 941# CONFIG_DEBUG_LIST is not set
942# CONFIG_DEBUG_SG is not set
963CONFIG_FRAME_POINTER=y 943CONFIG_FRAME_POINTER=y
964# CONFIG_UNWIND_INFO is not set 944# CONFIG_BOOT_PRINTK_DELAY is not set
965CONFIG_FORCED_INLINING=y
966# CONFIG_HEADERS_CHECK is not set
967# CONFIG_RCU_TORTURE_TEST is not set 945# CONFIG_RCU_TORTURE_TEST is not set
946# CONFIG_RCU_CPU_STALL_DETECTOR is not set
947# CONFIG_BACKTRACE_SELF_TEST is not set
948# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
949# CONFIG_FAULT_INJECTION is not set
950# CONFIG_SYSCTL_SYSCALL_CHECK is not set
951CONFIG_NOP_TRACER=y
952CONFIG_HAVE_FTRACE=y
953CONFIG_HAVE_DYNAMIC_FTRACE=y
954# CONFIG_FTRACE is not set
955# CONFIG_IRQSOFF_TRACER is not set
956# CONFIG_SCHED_TRACER is not set
957# CONFIG_CONTEXT_SWITCH_TRACER is not set
958# CONFIG_BOOT_TRACER is not set
959# CONFIG_STACK_TRACER is not set
960# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
961# CONFIG_SAMPLES is not set
962CONFIG_HAVE_ARCH_KGDB=y
963# CONFIG_KGDB is not set
968CONFIG_DEBUG_USER=y 964CONFIG_DEBUG_USER=y
969CONFIG_DEBUG_ERRORS=y 965CONFIG_DEBUG_ERRORS=y
970CONFIG_DEBUG_LL=y 966# CONFIG_DEBUG_STACK_USAGE is not set
971# CONFIG_DEBUG_ICEDCC is not set 967# CONFIG_DEBUG_LL is not set
972 968
973# 969#
974# Security options 970# Security options
975# 971#
976# CONFIG_KEYS is not set 972# CONFIG_KEYS is not set
977# CONFIG_SECURITY is not set 973# CONFIG_SECURITY is not set
974# CONFIG_SECURITYFS is not set
975# CONFIG_SECURITY_FILE_CAPABILITIES is not set
976CONFIG_CRYPTO=y
977
978#
979# Crypto core or helper
980#
981# CONFIG_CRYPTO_FIPS is not set
982# CONFIG_CRYPTO_MANAGER is not set
983# CONFIG_CRYPTO_GF128MUL is not set
984# CONFIG_CRYPTO_NULL is not set
985# CONFIG_CRYPTO_CRYPTD is not set
986# CONFIG_CRYPTO_AUTHENC is not set
987# CONFIG_CRYPTO_TEST is not set
988
989#
990# Authenticated Encryption with Associated Data
991#
992# CONFIG_CRYPTO_CCM is not set
993# CONFIG_CRYPTO_GCM is not set
994# CONFIG_CRYPTO_SEQIV is not set
995
996#
997# Block modes
998#
999# CONFIG_CRYPTO_CBC is not set
1000# CONFIG_CRYPTO_CTR is not set
1001# CONFIG_CRYPTO_CTS is not set
1002# CONFIG_CRYPTO_ECB is not set
1003# CONFIG_CRYPTO_LRW is not set
1004# CONFIG_CRYPTO_PCBC is not set
1005# CONFIG_CRYPTO_XTS is not set
1006
1007#
1008# Hash modes
1009#
1010# CONFIG_CRYPTO_HMAC is not set
1011# CONFIG_CRYPTO_XCBC is not set
1012
1013#
1014# Digest
1015#
1016# CONFIG_CRYPTO_CRC32C is not set
1017# CONFIG_CRYPTO_MD4 is not set
1018# CONFIG_CRYPTO_MD5 is not set
1019# CONFIG_CRYPTO_MICHAEL_MIC is not set
1020# CONFIG_CRYPTO_RMD128 is not set
1021# CONFIG_CRYPTO_RMD160 is not set
1022# CONFIG_CRYPTO_RMD256 is not set
1023# CONFIG_CRYPTO_RMD320 is not set
1024# CONFIG_CRYPTO_SHA1 is not set
1025# CONFIG_CRYPTO_SHA256 is not set
1026# CONFIG_CRYPTO_SHA512 is not set
1027# CONFIG_CRYPTO_TGR192 is not set
1028# CONFIG_CRYPTO_WP512 is not set
1029
1030#
1031# Ciphers
1032#
1033# CONFIG_CRYPTO_AES is not set
1034# CONFIG_CRYPTO_ANUBIS is not set
1035# CONFIG_CRYPTO_ARC4 is not set
1036# CONFIG_CRYPTO_BLOWFISH is not set
1037# CONFIG_CRYPTO_CAMELLIA is not set
1038# CONFIG_CRYPTO_CAST5 is not set
1039# CONFIG_CRYPTO_CAST6 is not set
1040# CONFIG_CRYPTO_DES is not set
1041# CONFIG_CRYPTO_FCRYPT is not set
1042# CONFIG_CRYPTO_KHAZAD is not set
1043# CONFIG_CRYPTO_SALSA20 is not set
1044# CONFIG_CRYPTO_SEED is not set
1045# CONFIG_CRYPTO_SERPENT is not set
1046# CONFIG_CRYPTO_TEA is not set
1047# CONFIG_CRYPTO_TWOFISH is not set
1048
1049#
1050# Compression
1051#
1052# CONFIG_CRYPTO_DEFLATE is not set
1053# CONFIG_CRYPTO_LZO is not set
978 1054
979# 1055#
980# Cryptographic options 1056# Random Number Generation
981# 1057#
982# CONFIG_CRYPTO is not set 1058# CONFIG_CRYPTO_ANSI_CPRNG is not set
1059# CONFIG_CRYPTO_HW is not set
983 1060
984# 1061#
985# Library routines 1062# Library routines
986# 1063#
1064CONFIG_BITREVERSE=y
987# CONFIG_CRC_CCITT is not set 1065# CONFIG_CRC_CCITT is not set
988# CONFIG_CRC16 is not set 1066# CONFIG_CRC16 is not set
1067# CONFIG_CRC_T10DIF is not set
1068# CONFIG_CRC_ITU_T is not set
989CONFIG_CRC32=y 1069CONFIG_CRC32=y
1070# CONFIG_CRC7 is not set
990# CONFIG_LIBCRC32C is not set 1071# CONFIG_LIBCRC32C is not set
991CONFIG_ZLIB_INFLATE=y 1072CONFIG_ZLIB_INFLATE=y
992CONFIG_PLIST=y 1073CONFIG_PLIST=y
1074CONFIG_HAS_IOMEM=y
1075CONFIG_HAS_IOPORT=y
1076CONFIG_HAS_DMA=y
diff --git a/arch/arm/configs/realview_defconfig b/arch/arm/configs/realview_defconfig
index 907e54344dad..7e253f58ed18 100644
--- a/arch/arm/configs/realview_defconfig
+++ b/arch/arm/configs/realview_defconfig
@@ -1,105 +1,204 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.28-rc2
4# Thu Sep 29 14:50:10 2005 4# Mon Nov 10 14:39:48 2008
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_SYS_SUPPORTS_APM_EMULATION=y
8# CONFIG_GENERIC_GPIO is not set
9CONFIG_GENERIC_TIME=y
10CONFIG_GENERIC_CLOCKEVENTS=y
7CONFIG_MMU=y 11CONFIG_MMU=y
8CONFIG_UID16=y 12# CONFIG_NO_IOPORT is not set
13CONFIG_GENERIC_HARDIRQS=y
14CONFIG_STACKTRACE_SUPPORT=y
15CONFIG_HAVE_LATENCYTOP_SUPPORT=y
16CONFIG_LOCKDEP_SUPPORT=y
17CONFIG_TRACE_IRQFLAGS_SUPPORT=y
18CONFIG_HARDIRQS_SW_RESEND=y
19CONFIG_GENERIC_IRQ_PROBE=y
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 20CONFIG_RWSEM_GENERIC_SPINLOCK=y
21# CONFIG_ARCH_HAS_ILOG2_U32 is not set
22# CONFIG_ARCH_HAS_ILOG2_U64 is not set
23CONFIG_GENERIC_HWEIGHT=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y 24CONFIG_GENERIC_CALIBRATE_DELAY=y
25CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
26CONFIG_VECTORS_BASE=0xffff0000
27CONFIG_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 32CONFIG_EXPERIMENTAL=y
16CONFIG_CLEAN_COMPILE=y
17CONFIG_BROKEN_ON_SMP=y 33CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32 34CONFIG_INIT_ENV_ARG_LIMIT=32
19
20#
21# General setup
22#
23CONFIG_LOCALVERSION="" 35CONFIG_LOCALVERSION=""
24CONFIG_LOCALVERSION_AUTO=y 36CONFIG_LOCALVERSION_AUTO=y
25# CONFIG_SWAP is not set 37# CONFIG_SWAP is not set
26CONFIG_SYSVIPC=y 38CONFIG_SYSVIPC=y
39CONFIG_SYSVIPC_SYSCTL=y
40# CONFIG_POSIX_MQUEUE is not set
27# CONFIG_BSD_PROCESS_ACCT is not set 41# CONFIG_BSD_PROCESS_ACCT is not set
28CONFIG_SYSCTL=y 42# CONFIG_TASKSTATS is not set
29# CONFIG_AUDIT is not set 43# CONFIG_AUDIT is not set
30CONFIG_HOTPLUG=y
31CONFIG_KOBJECT_UEVENT=y
32# CONFIG_IKCONFIG is not set 44# CONFIG_IKCONFIG is not set
33CONFIG_INITRAMFS_SOURCE="" 45CONFIG_LOG_BUF_SHIFT=14
46# CONFIG_CGROUPS is not set
47# CONFIG_GROUP_SCHED is not set
48CONFIG_SYSFS_DEPRECATED=y
49CONFIG_SYSFS_DEPRECATED_V2=y
50# CONFIG_RELAY is not set
51CONFIG_NAMESPACES=y
52# CONFIG_UTS_NS is not set
53# CONFIG_IPC_NS is not set
54# CONFIG_USER_NS is not set
55# CONFIG_PID_NS is not set
56# CONFIG_BLK_DEV_INITRD is not set
57CONFIG_CC_OPTIMIZE_FOR_SIZE=y
58CONFIG_SYSCTL=y
34# CONFIG_EMBEDDED is not set 59# CONFIG_EMBEDDED is not set
60CONFIG_UID16=y
61CONFIG_SYSCTL_SYSCALL=y
35CONFIG_KALLSYMS=y 62CONFIG_KALLSYMS=y
36# CONFIG_KALLSYMS_ALL is not set 63# CONFIG_KALLSYMS_ALL is not set
37# CONFIG_KALLSYMS_EXTRA_PASS is not set 64# CONFIG_KALLSYMS_EXTRA_PASS is not set
65CONFIG_HOTPLUG=y
38CONFIG_PRINTK=y 66CONFIG_PRINTK=y
39CONFIG_BUG=y 67CONFIG_BUG=y
68CONFIG_ELF_CORE=y
69CONFIG_COMPAT_BRK=y
40CONFIG_BASE_FULL=y 70CONFIG_BASE_FULL=y
41CONFIG_FUTEX=y 71CONFIG_FUTEX=y
72CONFIG_ANON_INODES=y
42CONFIG_EPOLL=y 73CONFIG_EPOLL=y
43CONFIG_CC_OPTIMIZE_FOR_SIZE=y 74CONFIG_SIGNALFD=y
75CONFIG_TIMERFD=y
76CONFIG_EVENTFD=y
44CONFIG_SHMEM=y 77CONFIG_SHMEM=y
45CONFIG_CC_ALIGN_FUNCTIONS=0 78CONFIG_AIO=y
46CONFIG_CC_ALIGN_LABELS=0 79CONFIG_VM_EVENT_COUNTERS=y
47CONFIG_CC_ALIGN_LOOPS=0 80CONFIG_SLAB=y
48CONFIG_CC_ALIGN_JUMPS=0 81# CONFIG_SLUB is not set
82# CONFIG_SLOB is not set
83# CONFIG_PROFILING is not set
84# CONFIG_MARKERS is not set
85CONFIG_HAVE_OPROFILE=y
86# CONFIG_KPROBES is not set
87CONFIG_HAVE_KPROBES=y
88CONFIG_HAVE_KRETPROBES=y
89CONFIG_HAVE_CLK=y
90CONFIG_HAVE_GENERIC_DMA_COHERENT=y
91CONFIG_SLABINFO=y
92CONFIG_RT_MUTEXES=y
49# CONFIG_TINY_SHMEM is not set 93# CONFIG_TINY_SHMEM is not set
50CONFIG_BASE_SMALL=0 94CONFIG_BASE_SMALL=0
51
52#
53# Loadable module support
54#
55CONFIG_MODULES=y 95CONFIG_MODULES=y
96# CONFIG_MODULE_FORCE_LOAD is not set
56CONFIG_MODULE_UNLOAD=y 97CONFIG_MODULE_UNLOAD=y
57CONFIG_OBSOLETE_MODPARM=y 98# CONFIG_MODULE_FORCE_UNLOAD is not set
99# CONFIG_MODVERSIONS is not set
58# CONFIG_MODULE_SRCVERSION_ALL is not set 100# CONFIG_MODULE_SRCVERSION_ALL is not set
59# CONFIG_KMOD is not set 101CONFIG_KMOD=y
102CONFIG_BLOCK=y
103# CONFIG_LBD is not set
104# CONFIG_BLK_DEV_IO_TRACE is not set
105# CONFIG_LSF is not set
106# CONFIG_BLK_DEV_BSG is not set
107# CONFIG_BLK_DEV_INTEGRITY is not set
108
109#
110# IO Schedulers
111#
112CONFIG_IOSCHED_NOOP=y
113# CONFIG_IOSCHED_AS is not set
114CONFIG_IOSCHED_DEADLINE=y
115# CONFIG_IOSCHED_CFQ is not set
116# CONFIG_DEFAULT_AS is not set
117CONFIG_DEFAULT_DEADLINE=y
118# CONFIG_DEFAULT_CFQ is not set
119# CONFIG_DEFAULT_NOOP is not set
120CONFIG_DEFAULT_IOSCHED="deadline"
121CONFIG_CLASSIC_RCU=y
122# CONFIG_FREEZER is not set
60 123
61# 124#
62# System Type 125# System Type
63# 126#
127# CONFIG_ARCH_AAEC2000 is not set
128# CONFIG_ARCH_INTEGRATOR is not set
129CONFIG_ARCH_REALVIEW=y
130# CONFIG_ARCH_VERSATILE is not set
131# CONFIG_ARCH_AT91 is not set
64# CONFIG_ARCH_CLPS7500 is not set 132# CONFIG_ARCH_CLPS7500 is not set
65# CONFIG_ARCH_CLPS711X is not set 133# CONFIG_ARCH_CLPS711X is not set
66# CONFIG_ARCH_CO285 is not set
67# CONFIG_ARCH_EBSA110 is not set 134# CONFIG_ARCH_EBSA110 is not set
135# CONFIG_ARCH_EP93XX is not set
68# CONFIG_ARCH_FOOTBRIDGE is not set 136# CONFIG_ARCH_FOOTBRIDGE is not set
69# CONFIG_ARCH_INTEGRATOR is not set 137# CONFIG_ARCH_NETX is not set
70# CONFIG_ARCH_IOP3XX is not set 138# CONFIG_ARCH_H720X is not set
71# CONFIG_ARCH_IXP4XX is not set 139# CONFIG_ARCH_IMX is not set
140# CONFIG_ARCH_IOP13XX is not set
141# CONFIG_ARCH_IOP32X is not set
142# CONFIG_ARCH_IOP33X is not set
143# CONFIG_ARCH_IXP23XX is not set
72# CONFIG_ARCH_IXP2000 is not set 144# CONFIG_ARCH_IXP2000 is not set
145# CONFIG_ARCH_IXP4XX is not set
73# CONFIG_ARCH_L7200 is not set 146# CONFIG_ARCH_L7200 is not set
147# CONFIG_ARCH_KIRKWOOD is not set
148# CONFIG_ARCH_KS8695 is not set
149# CONFIG_ARCH_NS9XXX is not set
150# CONFIG_ARCH_LOKI is not set
151# CONFIG_ARCH_MV78XX0 is not set
152# CONFIG_ARCH_MXC is not set
153# CONFIG_ARCH_ORION5X is not set
154# CONFIG_ARCH_PNX4008 is not set
74# CONFIG_ARCH_PXA is not set 155# CONFIG_ARCH_PXA is not set
75# CONFIG_ARCH_RPC is not set 156# CONFIG_ARCH_RPC is not set
76# CONFIG_ARCH_SA1100 is not set 157# CONFIG_ARCH_SA1100 is not set
77# CONFIG_ARCH_S3C2410 is not set 158# CONFIG_ARCH_S3C2410 is not set
78# CONFIG_ARCH_SHARK is not set 159# CONFIG_ARCH_SHARK is not set
79# CONFIG_ARCH_LH7A40X is not set 160# CONFIG_ARCH_LH7A40X is not set
161# CONFIG_ARCH_DAVINCI is not set
80# CONFIG_ARCH_OMAP is not set 162# CONFIG_ARCH_OMAP is not set
81# CONFIG_ARCH_VERSATILE is not set 163# CONFIG_ARCH_MSM is not set
82CONFIG_ARCH_REALVIEW=y 164
83# CONFIG_ARCH_IMX is not set 165#
84# CONFIG_ARCH_H720X is not set 166# Boot options
85# CONFIG_ARCH_AAEC2000 is not set 167#
168
169#
170# Power management
171#
86 172
87# 173#
88# RealView platform type 174# RealView platform type
89# 175#
90CONFIG_MACH_REALVIEW_EB=y 176CONFIG_MACH_REALVIEW_EB=y
177# CONFIG_REALVIEW_EB_A9MP is not set
178CONFIG_REALVIEW_EB_ARM11MP=y
179# CONFIG_REALVIEW_EB_ARM11MP_REVB is not set
180CONFIG_MACH_REALVIEW_PB11MP=y
181CONFIG_MACH_REALVIEW_PB1176=y
182# CONFIG_MACH_REALVIEW_PBA8 is not set
91 183
92# 184#
93# Processor Type 185# Processor Type
94# 186#
95CONFIG_CPU_32=y 187CONFIG_CPU_32=y
96CONFIG_CPU_ARM926T=y 188# CONFIG_CPU_ARM926T is not set
97# CONFIG_CPU_V6 is not set 189CONFIG_CPU_V6=y
98CONFIG_CPU_32v5=y 190# CONFIG_CPU_32v6K is not set
99CONFIG_CPU_ABRT_EV5TJ=y 191# CONFIG_CPU_V7 is not set
100CONFIG_CPU_CACHE_VIVT=y 192CONFIG_CPU_32v6=y
101CONFIG_CPU_COPY_V4WB=y 193CONFIG_CPU_ABRT_EV6=y
102CONFIG_CPU_TLB_V4WBI=y 194CONFIG_CPU_PABRT_NOIFAR=y
195CONFIG_CPU_CACHE_V6=y
196CONFIG_CPU_CACHE_VIPT=y
197CONFIG_CPU_COPY_V6=y
198CONFIG_CPU_TLB_V6=y
199CONFIG_CPU_HAS_ASID=y
200CONFIG_CPU_CP15=y
201CONFIG_CPU_CP15_MMU=y
103 202
104# 203#
105# Processor Features 204# Processor Features
@@ -107,8 +206,9 @@ CONFIG_CPU_TLB_V4WBI=y
107CONFIG_ARM_THUMB=y 206CONFIG_ARM_THUMB=y
108# CONFIG_CPU_ICACHE_DISABLE is not set 207# CONFIG_CPU_ICACHE_DISABLE is not set
109# CONFIG_CPU_DCACHE_DISABLE is not set 208# CONFIG_CPU_DCACHE_DISABLE is not set
110# CONFIG_CPU_DCACHE_WRITETHROUGH is not set 209# CONFIG_CPU_BPREDICT_DISABLE is not set
111# CONFIG_CPU_CACHE_ROUND_ROBIN is not set 210CONFIG_OUTER_CACHE=y
211CONFIG_CACHE_L2X0=y
112CONFIG_ARM_GIC=y 212CONFIG_ARM_GIC=y
113CONFIG_ICST307=y 213CONFIG_ICST307=y
114 214
@@ -116,20 +216,41 @@ CONFIG_ICST307=y
116# Bus support 216# Bus support
117# 217#
118CONFIG_ARM_AMBA=y 218CONFIG_ARM_AMBA=y
119CONFIG_ISA_DMA_API=y 219# CONFIG_PCI_SYSCALL is not set
120 220# CONFIG_ARCH_SUPPORTS_MSI is not set
121#
122# PCCARD (PCMCIA/CardBus) support
123#
124# CONFIG_PCCARD is not set 221# CONFIG_PCCARD is not set
125 222
126# 223#
127# Kernel Features 224# Kernel Features
128# 225#
129# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set 226# CONFIG_NO_HZ is not set
227# CONFIG_HIGH_RES_TIMERS is not set
228CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
229# CONFIG_SMP is not set
230CONFIG_VMSPLIT_3G=y
231# CONFIG_VMSPLIT_2G is not set
232# CONFIG_VMSPLIT_1G is not set
233CONFIG_PAGE_OFFSET=0xC0000000
234# CONFIG_PREEMPT is not set
235CONFIG_HZ=100
236CONFIG_AEABI=y
237CONFIG_OABI_COMPAT=y
238CONFIG_ARCH_FLATMEM_HAS_HOLES=y
239# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
240# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
241CONFIG_SELECT_MEMORY_MODEL=y
242CONFIG_FLATMEM_MANUAL=y
243# CONFIG_DISCONTIGMEM_MANUAL is not set
244# CONFIG_SPARSEMEM_MANUAL is not set
130CONFIG_FLATMEM=y 245CONFIG_FLATMEM=y
131CONFIG_FLAT_NODE_MEM_MAP=y 246CONFIG_FLAT_NODE_MEM_MAP=y
132# CONFIG_SPARSEMEM_STATIC is not set 247CONFIG_PAGEFLAGS_EXTENDED=y
248CONFIG_SPLIT_PTLOCK_CPUS=4
249# CONFIG_RESOURCES_64BIT is not set
250# CONFIG_PHYS_ADDR_T_64BIT is not set
251CONFIG_ZONE_DMA_FLAG=0
252CONFIG_VIRT_TO_BUS=y
253CONFIG_UNEVICTABLE_LRU=y
133CONFIG_ALIGNMENT_TRAP=y 254CONFIG_ALIGNMENT_TRAP=y
134 255
135# 256#
@@ -139,6 +260,12 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
139CONFIG_ZBOOT_ROM_BSS=0x0 260CONFIG_ZBOOT_ROM_BSS=0x0
140CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M" 261CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=ttyAMA0 mem=128M"
141# CONFIG_XIP_KERNEL is not set 262# CONFIG_XIP_KERNEL is not set
263# CONFIG_KEXEC is not set
264
265#
266# CPU Power Management
267#
268# CONFIG_CPU_IDLE is not set
142 269
143# 270#
144# Floating point emulation 271# Floating point emulation
@@ -147,26 +274,24 @@ CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=tt
147# 274#
148# At least one emulation must be selected 275# At least one emulation must be selected
149# 276#
150CONFIG_FPE_NWFPE=y 277# CONFIG_FPE_NWFPE is not set
151# CONFIG_FPE_NWFPE_XP is not set 278# CONFIG_FPE_FASTFPE is not set
152# CONFIG_VFP is not set 279CONFIG_VFP=y
153 280
154# 281#
155# Userspace binary formats 282# Userspace binary formats
156# 283#
157CONFIG_BINFMT_ELF=y 284CONFIG_BINFMT_ELF=y
285# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
286CONFIG_HAVE_AOUT=y
158# CONFIG_BINFMT_AOUT is not set 287# CONFIG_BINFMT_AOUT is not set
159# CONFIG_BINFMT_MISC is not set 288# CONFIG_BINFMT_MISC is not set
160# CONFIG_ARTHUR is not set
161 289
162# 290#
163# Power management options 291# Power management options
164# 292#
165# CONFIG_PM is not set 293# CONFIG_PM is not set
166 294CONFIG_ARCH_SUSPEND_POSSIBLE=y
167#
168# Networking
169#
170CONFIG_NET=y 295CONFIG_NET=y
171 296
172# 297#
@@ -175,6 +300,11 @@ CONFIG_NET=y
175CONFIG_PACKET=y 300CONFIG_PACKET=y
176# CONFIG_PACKET_MMAP is not set 301# CONFIG_PACKET_MMAP is not set
177CONFIG_UNIX=y 302CONFIG_UNIX=y
303CONFIG_XFRM=y
304# CONFIG_XFRM_USER is not set
305# CONFIG_XFRM_SUB_POLICY is not set
306# CONFIG_XFRM_MIGRATE is not set
307# CONFIG_XFRM_STATISTICS is not set
178# CONFIG_NET_KEY is not set 308# CONFIG_NET_KEY is not set
179CONFIG_INET=y 309CONFIG_INET=y
180# CONFIG_IP_MULTICAST is not set 310# CONFIG_IP_MULTICAST is not set
@@ -186,34 +316,56 @@ CONFIG_IP_PNP_BOOTP=y
186# CONFIG_IP_PNP_RARP is not set 316# CONFIG_IP_PNP_RARP is not set
187# CONFIG_NET_IPIP is not set 317# CONFIG_NET_IPIP is not set
188# CONFIG_NET_IPGRE is not set 318# CONFIG_NET_IPGRE is not set
319# CONFIG_ARPD is not set
189# CONFIG_SYN_COOKIES is not set 320# CONFIG_SYN_COOKIES is not set
190# CONFIG_INET_AH is not set 321# CONFIG_INET_AH is not set
191# CONFIG_INET_ESP is not set 322# CONFIG_INET_ESP is not set
192# CONFIG_INET_IPCOMP is not set 323# CONFIG_INET_IPCOMP is not set
324# CONFIG_INET_XFRM_TUNNEL is not set
193# CONFIG_INET_TUNNEL is not set 325# CONFIG_INET_TUNNEL is not set
326CONFIG_INET_XFRM_MODE_TRANSPORT=y
327CONFIG_INET_XFRM_MODE_TUNNEL=y
328CONFIG_INET_XFRM_MODE_BEET=y
329# CONFIG_INET_LRO is not set
194CONFIG_INET_DIAG=y 330CONFIG_INET_DIAG=y
195CONFIG_INET_TCP_DIAG=y 331CONFIG_INET_TCP_DIAG=y
196# CONFIG_TCP_CONG_ADVANCED is not set 332# CONFIG_TCP_CONG_ADVANCED is not set
197CONFIG_TCP_CONG_BIC=y 333CONFIG_TCP_CONG_CUBIC=y
334CONFIG_DEFAULT_TCP_CONG="cubic"
335# CONFIG_TCP_MD5SIG is not set
198# CONFIG_IPV6 is not set 336# CONFIG_IPV6 is not set
337# CONFIG_NETWORK_SECMARK is not set
199# CONFIG_NETFILTER is not set 338# CONFIG_NETFILTER is not set
339# CONFIG_IP_DCCP is not set
340# CONFIG_IP_SCTP is not set
341# CONFIG_TIPC is not set
342# CONFIG_ATM is not set
200# CONFIG_BRIDGE is not set 343# CONFIG_BRIDGE is not set
344# CONFIG_NET_DSA is not set
201# CONFIG_VLAN_8021Q is not set 345# CONFIG_VLAN_8021Q is not set
202# CONFIG_DECNET is not set 346# CONFIG_DECNET is not set
203# CONFIG_LLC2 is not set 347# CONFIG_LLC2 is not set
204# CONFIG_IPX is not set 348# CONFIG_IPX is not set
205# CONFIG_ATALK is not set 349# CONFIG_ATALK is not set
350# CONFIG_X25 is not set
351# CONFIG_LAPB is not set
352# CONFIG_ECONET is not set
353# CONFIG_WAN_ROUTER is not set
206# CONFIG_NET_SCHED is not set 354# CONFIG_NET_SCHED is not set
207# CONFIG_NET_CLS_ROUTE is not set
208 355
209# 356#
210# Network testing 357# Network testing
211# 358#
212# CONFIG_NET_PKTGEN is not set 359# CONFIG_NET_PKTGEN is not set
213# CONFIG_HAMRADIO is not set 360# CONFIG_HAMRADIO is not set
361# CONFIG_CAN is not set
214# CONFIG_IRDA is not set 362# CONFIG_IRDA is not set
215# CONFIG_BT is not set 363# CONFIG_BT is not set
216# CONFIG_IEEE80211 is not set 364# CONFIG_AF_RXRPC is not set
365# CONFIG_PHONET is not set
366# CONFIG_WIRELESS is not set
367# CONFIG_RFKILL is not set
368# CONFIG_NET_9P is not set
217 369
218# 370#
219# Device Drivers 371# Device Drivers
@@ -222,30 +374,37 @@ CONFIG_TCP_CONG_BIC=y
222# 374#
223# Generic Driver Options 375# Generic Driver Options
224# 376#
377CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
225CONFIG_STANDALONE=y 378CONFIG_STANDALONE=y
226CONFIG_PREVENT_FIRMWARE_BUILD=y 379CONFIG_PREVENT_FIRMWARE_BUILD=y
227# CONFIG_FW_LOADER is not set 380CONFIG_FW_LOADER=y
381CONFIG_FIRMWARE_IN_KERNEL=y
382CONFIG_EXTRA_FIRMWARE=""
228# CONFIG_DEBUG_DRIVER is not set 383# CONFIG_DEBUG_DRIVER is not set
229 384# CONFIG_DEBUG_DEVRES is not set
230# 385# CONFIG_SYS_HYPERVISOR is not set
231# Memory Technology Devices (MTD) 386# CONFIG_CONNECTOR is not set
232#
233CONFIG_MTD=y 387CONFIG_MTD=y
234# CONFIG_MTD_DEBUG is not set 388# CONFIG_MTD_DEBUG is not set
235# CONFIG_MTD_CONCAT is not set 389CONFIG_MTD_CONCAT=y
236CONFIG_MTD_PARTITIONS=y 390CONFIG_MTD_PARTITIONS=y
237# CONFIG_MTD_REDBOOT_PARTS is not set 391# CONFIG_MTD_REDBOOT_PARTS is not set
238CONFIG_MTD_CMDLINE_PARTS=y 392CONFIG_MTD_CMDLINE_PARTS=y
239# CONFIG_MTD_AFS_PARTS is not set 393# CONFIG_MTD_AFS_PARTS is not set
394# CONFIG_MTD_AR7_PARTS is not set
240 395
241# 396#
242# User Modules And Translation Layers 397# User Modules And Translation Layers
243# 398#
244CONFIG_MTD_CHAR=y 399CONFIG_MTD_CHAR=y
400CONFIG_MTD_BLKDEVS=y
245CONFIG_MTD_BLOCK=y 401CONFIG_MTD_BLOCK=y
246# CONFIG_FTL is not set 402# CONFIG_FTL is not set
247# CONFIG_NFTL is not set 403# CONFIG_NFTL is not set
248# CONFIG_INFTL is not set 404# CONFIG_INFTL is not set
405# CONFIG_RFD_FTL is not set
406# CONFIG_SSFDC is not set
407# CONFIG_MTD_OOPS is not set
249 408
250# 409#
251# RAM/ROM/Flash chip drivers 410# RAM/ROM/Flash chip drivers
@@ -266,7 +425,6 @@ CONFIG_MTD_CFI_I2=y
266# CONFIG_MTD_CFI_I8 is not set 425# CONFIG_MTD_CFI_I8 is not set
267CONFIG_MTD_CFI_INTELEXT=y 426CONFIG_MTD_CFI_INTELEXT=y
268CONFIG_MTD_CFI_AMDSTD=y 427CONFIG_MTD_CFI_AMDSTD=y
269CONFIG_MTD_CFI_AMDSTD_RETRY=0
270# CONFIG_MTD_CFI_STAA is not set 428# CONFIG_MTD_CFI_STAA is not set
271CONFIG_MTD_CFI_UTIL=y 429CONFIG_MTD_CFI_UTIL=y
272# CONFIG_MTD_RAM is not set 430# CONFIG_MTD_RAM is not set
@@ -279,7 +437,6 @@ CONFIG_MTD_CFI_UTIL=y
279# CONFIG_MTD_COMPLEX_MAPPINGS is not set 437# CONFIG_MTD_COMPLEX_MAPPINGS is not set
280# CONFIG_MTD_PHYSMAP is not set 438# CONFIG_MTD_PHYSMAP is not set
281CONFIG_MTD_ARM_INTEGRATOR=y 439CONFIG_MTD_ARM_INTEGRATOR=y
282# CONFIG_MTD_EDB7312 is not set
283# CONFIG_MTD_PLATRAM is not set 440# CONFIG_MTD_PLATRAM is not set
284 441
285# 442#
@@ -288,7 +445,7 @@ CONFIG_MTD_ARM_INTEGRATOR=y
288# CONFIG_MTD_SLRAM is not set 445# CONFIG_MTD_SLRAM is not set
289# CONFIG_MTD_PHRAM is not set 446# CONFIG_MTD_PHRAM is not set
290# CONFIG_MTD_MTDRAM is not set 447# CONFIG_MTD_MTDRAM is not set
291# CONFIG_MTD_BLKMTD is not set 448# CONFIG_MTD_BLOCK2MTD is not set
292 449
293# 450#
294# Disk-On-Chip Device Drivers 451# Disk-On-Chip Device Drivers
@@ -296,121 +453,81 @@ CONFIG_MTD_ARM_INTEGRATOR=y
296# CONFIG_MTD_DOC2000 is not set 453# CONFIG_MTD_DOC2000 is not set
297# CONFIG_MTD_DOC2001 is not set 454# CONFIG_MTD_DOC2001 is not set
298# CONFIG_MTD_DOC2001PLUS is not set 455# CONFIG_MTD_DOC2001PLUS is not set
299
300#
301# NAND Flash Device Drivers
302#
303# CONFIG_MTD_NAND is not set 456# CONFIG_MTD_NAND is not set
457# CONFIG_MTD_ONENAND is not set
304 458
305# 459#
306# Parallel port support 460# UBI - Unsorted block images
307# 461#
462# CONFIG_MTD_UBI is not set
308# CONFIG_PARPORT is not set 463# CONFIG_PARPORT is not set
309 464CONFIG_BLK_DEV=y
310#
311# Plug and Play support
312#
313
314#
315# Block devices
316#
317# CONFIG_BLK_DEV_COW_COMMON is not set 465# CONFIG_BLK_DEV_COW_COMMON is not set
318# CONFIG_BLK_DEV_LOOP is not set 466# CONFIG_BLK_DEV_LOOP is not set
319# CONFIG_BLK_DEV_NBD is not set 467# CONFIG_BLK_DEV_NBD is not set
320# CONFIG_BLK_DEV_RAM is not set 468# CONFIG_BLK_DEV_RAM is not set
321CONFIG_BLK_DEV_RAM_COUNT=16
322# CONFIG_CDROM_PKTCDVD is not set 469# CONFIG_CDROM_PKTCDVD is not set
323
324#
325# IO Schedulers
326#
327CONFIG_IOSCHED_NOOP=y
328# CONFIG_IOSCHED_AS is not set
329CONFIG_IOSCHED_DEADLINE=y
330# CONFIG_IOSCHED_CFQ is not set
331# CONFIG_ATA_OVER_ETH is not set 470# CONFIG_ATA_OVER_ETH is not set
471CONFIG_MISC_DEVICES=y
472# CONFIG_EEPROM_93CX6 is not set
473# CONFIG_ENCLOSURE_SERVICES is not set
474CONFIG_HAVE_IDE=y
475# CONFIG_IDE is not set
332 476
333# 477#
334# SCSI device support 478# SCSI device support
335# 479#
336# CONFIG_RAID_ATTRS is not set 480# CONFIG_RAID_ATTRS is not set
337# CONFIG_SCSI is not set 481# CONFIG_SCSI is not set
338 482# CONFIG_SCSI_DMA is not set
339# 483# CONFIG_SCSI_NETLINK is not set
340# Multi-device support (RAID and LVM) 484# CONFIG_ATA is not set
341#
342# CONFIG_MD is not set 485# CONFIG_MD is not set
343
344#
345# Fusion MPT device support
346#
347# CONFIG_FUSION is not set
348
349#
350# IEEE 1394 (FireWire) support
351#
352
353#
354# I2O device support
355#
356
357#
358# Network device support
359#
360CONFIG_NETDEVICES=y 486CONFIG_NETDEVICES=y
361# CONFIG_DUMMY is not set 487# CONFIG_DUMMY is not set
362# CONFIG_BONDING is not set 488# CONFIG_BONDING is not set
489# CONFIG_MACVLAN is not set
363# CONFIG_EQUALIZER is not set 490# CONFIG_EQUALIZER is not set
364# CONFIG_TUN is not set 491# CONFIG_TUN is not set
365 492# CONFIG_VETH is not set
366#
367# PHY device support
368#
369# CONFIG_PHYLIB is not set 493# CONFIG_PHYLIB is not set
370
371#
372# Ethernet (10 or 100Mbit)
373#
374CONFIG_NET_ETHERNET=y 494CONFIG_NET_ETHERNET=y
375CONFIG_MII=y 495CONFIG_MII=y
496# CONFIG_AX88796 is not set
376CONFIG_SMC91X=y 497CONFIG_SMC91X=y
377# CONFIG_DM9000 is not set 498# CONFIG_DM9000 is not set
378 499CONFIG_SMC911X=y
379# 500# CONFIG_IBM_NEW_EMAC_ZMII is not set
380# Ethernet (1000 Mbit) 501# CONFIG_IBM_NEW_EMAC_RGMII is not set
381# 502# CONFIG_IBM_NEW_EMAC_TAH is not set
382 503# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
383# 504# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
384# Ethernet (10000 Mbit) 505# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
385# 506# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
386 507# CONFIG_B44 is not set
387# 508# CONFIG_NETDEV_1000 is not set
388# Token Ring devices 509# CONFIG_NETDEV_10000 is not set
389# 510
390 511#
391# 512# Wireless LAN
392# Wireless LAN (non-hamradio) 513#
393# 514# CONFIG_WLAN_PRE80211 is not set
394# CONFIG_NET_RADIO is not set 515# CONFIG_WLAN_80211 is not set
395 516# CONFIG_IWLWIFI_LEDS is not set
396#
397# Wan interfaces
398#
399# CONFIG_WAN is not set 517# CONFIG_WAN is not set
400# CONFIG_PPP is not set 518# CONFIG_PPP is not set
401# CONFIG_SLIP is not set 519# CONFIG_SLIP is not set
520# CONFIG_NETCONSOLE is not set
402# CONFIG_NETPOLL is not set 521# CONFIG_NETPOLL is not set
403# CONFIG_NET_POLL_CONTROLLER is not set 522# CONFIG_NET_POLL_CONTROLLER is not set
404
405#
406# ISDN subsystem
407#
408# CONFIG_ISDN is not set 523# CONFIG_ISDN is not set
409 524
410# 525#
411# Input device support 526# Input device support
412# 527#
413CONFIG_INPUT=y 528CONFIG_INPUT=y
529# CONFIG_INPUT_FF_MEMLESS is not set
530# CONFIG_INPUT_POLLDEV is not set
414 531
415# 532#
416# Userland interfaces 533# Userland interfaces
@@ -420,7 +537,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
420CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 537CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
421CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 538CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
422# CONFIG_INPUT_JOYDEV is not set 539# CONFIG_INPUT_JOYDEV is not set
423# CONFIG_INPUT_TSDEV is not set
424# CONFIG_INPUT_EVDEV is not set 540# CONFIG_INPUT_EVDEV is not set
425# CONFIG_INPUT_EVBUG is not set 541# CONFIG_INPUT_EVBUG is not set
426 542
@@ -433,11 +549,19 @@ CONFIG_KEYBOARD_ATKBD=y
433# CONFIG_KEYBOARD_LKKBD is not set 549# CONFIG_KEYBOARD_LKKBD is not set
434# CONFIG_KEYBOARD_XTKBD is not set 550# CONFIG_KEYBOARD_XTKBD is not set
435# CONFIG_KEYBOARD_NEWTON is not set 551# CONFIG_KEYBOARD_NEWTON is not set
552# CONFIG_KEYBOARD_STOWAWAY is not set
436CONFIG_INPUT_MOUSE=y 553CONFIG_INPUT_MOUSE=y
437CONFIG_MOUSE_PS2=y 554CONFIG_MOUSE_PS2=y
555CONFIG_MOUSE_PS2_ALPS=y
556CONFIG_MOUSE_PS2_LOGIPS2PP=y
557CONFIG_MOUSE_PS2_SYNAPTICS=y
558CONFIG_MOUSE_PS2_LIFEBOOK=y
559CONFIG_MOUSE_PS2_TRACKPOINT=y
560# CONFIG_MOUSE_PS2_TOUCHKIT is not set
438# CONFIG_MOUSE_SERIAL is not set 561# CONFIG_MOUSE_SERIAL is not set
439# CONFIG_MOUSE_VSXXXAA is not set 562# CONFIG_MOUSE_VSXXXAA is not set
440# CONFIG_INPUT_JOYSTICK is not set 563# CONFIG_INPUT_JOYSTICK is not set
564# CONFIG_INPUT_TABLET is not set
441# CONFIG_INPUT_TOUCHSCREEN is not set 565# CONFIG_INPUT_TOUCHSCREEN is not set
442# CONFIG_INPUT_MISC is not set 566# CONFIG_INPUT_MISC is not set
443 567
@@ -455,8 +579,11 @@ CONFIG_SERIO_LIBPS2=y
455# Character devices 579# Character devices
456# 580#
457CONFIG_VT=y 581CONFIG_VT=y
582CONFIG_CONSOLE_TRANSLATIONS=y
458CONFIG_VT_CONSOLE=y 583CONFIG_VT_CONSOLE=y
459CONFIG_HW_CONSOLE=y 584CONFIG_HW_CONSOLE=y
585# CONFIG_VT_HW_CONSOLE_BINDING is not set
586CONFIG_DEVKMEM=y
460# CONFIG_SERIAL_NONSTANDARD is not set 587# CONFIG_SERIAL_NONSTANDARD is not set
461 588
462# 589#
@@ -475,73 +602,91 @@ CONFIG_SERIAL_CORE_CONSOLE=y
475CONFIG_UNIX98_PTYS=y 602CONFIG_UNIX98_PTYS=y
476CONFIG_LEGACY_PTYS=y 603CONFIG_LEGACY_PTYS=y
477CONFIG_LEGACY_PTY_COUNT=16 604CONFIG_LEGACY_PTY_COUNT=16
478
479#
480# IPMI
481#
482# CONFIG_IPMI_HANDLER is not set 605# CONFIG_IPMI_HANDLER is not set
483 606# CONFIG_HW_RANDOM is not set
484#
485# Watchdog Cards
486#
487# CONFIG_WATCHDOG is not set
488# CONFIG_NVRAM is not set 607# CONFIG_NVRAM is not set
489# CONFIG_RTC is not set
490# CONFIG_DTLK is not set
491# CONFIG_R3964 is not set 608# CONFIG_R3964 is not set
492
493#
494# Ftape, the floppy tape device driver
495#
496# CONFIG_RAW_DRIVER is not set 609# CONFIG_RAW_DRIVER is not set
497 610# CONFIG_TCG_TPM is not set
498#
499# TPM devices
500#
501
502#
503# I2C support
504#
505# CONFIG_I2C is not set 611# CONFIG_I2C is not set
612# CONFIG_SPI is not set
613# CONFIG_W1 is not set
614# CONFIG_POWER_SUPPLY is not set
615# CONFIG_HWMON is not set
616# CONFIG_THERMAL is not set
617# CONFIG_THERMAL_HWMON is not set
618# CONFIG_WATCHDOG is not set
506 619
507# 620#
508# Hardware Monitoring support 621# Sonics Silicon Backplane
509# 622#
510# CONFIG_HWMON is not set 623CONFIG_SSB_POSSIBLE=y
511# CONFIG_HWMON_VID is not set 624# CONFIG_SSB is not set
512 625
513# 626#
514# Misc devices 627# Multifunction device drivers
515# 628#
629# CONFIG_MFD_CORE is not set
630# CONFIG_MFD_SM501 is not set
631# CONFIG_HTC_PASIC3 is not set
632# CONFIG_MFD_TMIO is not set
633# CONFIG_MFD_T7L66XB is not set
634# CONFIG_MFD_TC6387XB is not set
635# CONFIG_MFD_WM8400 is not set
516 636
517# 637#
518# Multimedia Capabilities Port drivers 638# Multimedia devices
519# 639#
520 640
521# 641#
522# Multimedia devices 642# Multimedia core support
523# 643#
524# CONFIG_VIDEO_DEV is not set 644# CONFIG_VIDEO_DEV is not set
645# CONFIG_DVB_CORE is not set
646# CONFIG_VIDEO_MEDIA is not set
525 647
526# 648#
527# Digital Video Broadcasting Devices 649# Multimedia drivers
528# 650#
529# CONFIG_DVB is not set 651# CONFIG_DAB is not set
530 652
531# 653#
532# Graphics support 654# Graphics support
533# 655#
656# CONFIG_VGASTATE is not set
657# CONFIG_VIDEO_OUTPUT_CONTROL is not set
534CONFIG_FB=y 658CONFIG_FB=y
659# CONFIG_FIRMWARE_EDID is not set
660# CONFIG_FB_DDC is not set
661# CONFIG_FB_BOOT_VESA_SUPPORT is not set
535CONFIG_FB_CFB_FILLRECT=y 662CONFIG_FB_CFB_FILLRECT=y
536CONFIG_FB_CFB_COPYAREA=y 663CONFIG_FB_CFB_COPYAREA=y
537CONFIG_FB_CFB_IMAGEBLIT=y 664CONFIG_FB_CFB_IMAGEBLIT=y
538CONFIG_FB_SOFT_CURSOR=y 665# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
666# CONFIG_FB_SYS_FILLRECT is not set
667# CONFIG_FB_SYS_COPYAREA is not set
668# CONFIG_FB_SYS_IMAGEBLIT is not set
669# CONFIG_FB_FOREIGN_ENDIAN is not set
670# CONFIG_FB_SYS_FOPS is not set
671# CONFIG_FB_SVGALIB is not set
539# CONFIG_FB_MACMODES is not set 672# CONFIG_FB_MACMODES is not set
673# CONFIG_FB_BACKLIGHT is not set
540# CONFIG_FB_MODE_HELPERS is not set 674# CONFIG_FB_MODE_HELPERS is not set
541# CONFIG_FB_TILEBLITTING is not set 675# CONFIG_FB_TILEBLITTING is not set
676
677#
678# Frame buffer hardware drivers
679#
542CONFIG_FB_ARMCLCD=y 680CONFIG_FB_ARMCLCD=y
543# CONFIG_FB_S1D13XXX is not set 681# CONFIG_FB_S1D13XXX is not set
544# CONFIG_FB_VIRTUAL is not set 682# CONFIG_FB_VIRTUAL is not set
683# CONFIG_FB_METRONOME is not set
684# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
685
686#
687# Display device support
688#
689# CONFIG_DISPLAY_SUPPORT is not set
545 690
546# 691#
547# Console display driver support 692# Console display driver support
@@ -549,27 +694,17 @@ CONFIG_FB_ARMCLCD=y
549# CONFIG_VGA_CONSOLE is not set 694# CONFIG_VGA_CONSOLE is not set
550CONFIG_DUMMY_CONSOLE=y 695CONFIG_DUMMY_CONSOLE=y
551CONFIG_FRAMEBUFFER_CONSOLE=y 696CONFIG_FRAMEBUFFER_CONSOLE=y
697# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
698# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
552# CONFIG_FONTS is not set 699# CONFIG_FONTS is not set
553CONFIG_FONT_8x8=y 700CONFIG_FONT_8x8=y
554CONFIG_FONT_8x16=y 701CONFIG_FONT_8x16=y
555
556#
557# Logo configuration
558#
559CONFIG_LOGO=y 702CONFIG_LOGO=y
560# CONFIG_LOGO_LINUX_MONO is not set 703# CONFIG_LOGO_LINUX_MONO is not set
561# CONFIG_LOGO_LINUX_VGA16 is not set 704# CONFIG_LOGO_LINUX_VGA16 is not set
562CONFIG_LOGO_LINUX_CLUT224=y 705CONFIG_LOGO_LINUX_CLUT224=y
563# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
564
565#
566# Sound
567#
568CONFIG_SOUND=y 706CONFIG_SOUND=y
569 707CONFIG_SOUND_OSS_CORE=y
570#
571# Advanced Linux Sound Architecture
572#
573CONFIG_SND=y 708CONFIG_SND=y
574CONFIG_SND_TIMER=y 709CONFIG_SND_TIMER=y
575CONFIG_SND_PCM=y 710CONFIG_SND_PCM=y
@@ -577,59 +712,71 @@ CONFIG_SND_PCM=y
577CONFIG_SND_OSSEMUL=y 712CONFIG_SND_OSSEMUL=y
578CONFIG_SND_MIXER_OSS=y 713CONFIG_SND_MIXER_OSS=y
579CONFIG_SND_PCM_OSS=y 714CONFIG_SND_PCM_OSS=y
715CONFIG_SND_PCM_OSS_PLUGINS=y
716# CONFIG_SND_DYNAMIC_MINORS is not set
717CONFIG_SND_SUPPORT_OLD_API=y
718CONFIG_SND_VERBOSE_PROCFS=y
580# CONFIG_SND_VERBOSE_PRINTK is not set 719# CONFIG_SND_VERBOSE_PRINTK is not set
581# CONFIG_SND_DEBUG is not set 720# CONFIG_SND_DEBUG is not set
582 721CONFIG_SND_VMASTER=y
583# 722CONFIG_SND_AC97_CODEC=y
584# Generic devices 723# CONFIG_SND_DRIVERS is not set
585# 724CONFIG_SND_ARM=y
586# CONFIG_SND_DUMMY is not set 725CONFIG_SND_ARMAACI=y
587# CONFIG_SND_MTPAV is not set 726# CONFIG_SND_SOC is not set
588# CONFIG_SND_SERIAL_U16550 is not set
589# CONFIG_SND_MPU401 is not set
590
591#
592# ALSA ARM devices
593#
594# CONFIG_SND_ARMAACI is not set
595
596#
597# Open Sound System
598#
599# CONFIG_SOUND_PRIME is not set 727# CONFIG_SOUND_PRIME is not set
728CONFIG_AC97_BUS=y
729# CONFIG_HID_SUPPORT is not set
730# CONFIG_USB_SUPPORT is not set
731CONFIG_MMC=y
732# CONFIG_MMC_DEBUG is not set
733# CONFIG_MMC_UNSAFE_RESUME is not set
600 734
601# 735#
602# USB support 736# MMC/SD/SDIO Card Drivers
603# 737#
604CONFIG_USB_ARCH_HAS_HCD=y 738CONFIG_MMC_BLOCK=y
605# CONFIG_USB_ARCH_HAS_OHCI is not set 739CONFIG_MMC_BLOCK_BOUNCE=y
606# CONFIG_USB is not set 740# CONFIG_SDIO_UART is not set
741# CONFIG_MMC_TEST is not set
607 742
608# 743#
609# USB Gadget Support 744# MMC/SD/SDIO Host Controller Drivers
610# 745#
611# CONFIG_USB_GADGET is not set 746CONFIG_MMC_ARMMMCI=y
747# CONFIG_MMC_SDHCI is not set
748# CONFIG_MEMSTICK is not set
749# CONFIG_ACCESSIBILITY is not set
750# CONFIG_NEW_LEDS is not set
751CONFIG_RTC_LIB=y
752# CONFIG_RTC_CLASS is not set
753# CONFIG_DMADEVICES is not set
612 754
613# 755#
614# MMC/SD Card support 756# Voltage and Current regulators
615# 757#
616# CONFIG_MMC is not set 758# CONFIG_REGULATOR is not set
759# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
760# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
761# CONFIG_REGULATOR_BQ24022 is not set
762# CONFIG_UIO is not set
617 763
618# 764#
619# File systems 765# File systems
620# 766#
621# CONFIG_EXT2_FS is not set 767# CONFIG_EXT2_FS is not set
622# CONFIG_EXT3_FS is not set 768# CONFIG_EXT3_FS is not set
623# CONFIG_JBD is not set 769# CONFIG_EXT4_FS is not set
624# CONFIG_REISERFS_FS is not set 770# CONFIG_REISERFS_FS is not set
625# CONFIG_JFS_FS is not set 771# CONFIG_JFS_FS is not set
626# CONFIG_FS_POSIX_ACL is not set 772# CONFIG_FS_POSIX_ACL is not set
773CONFIG_FILE_LOCKING=y
627# CONFIG_XFS_FS is not set 774# CONFIG_XFS_FS is not set
628# CONFIG_MINIX_FS is not set 775# CONFIG_OCFS2_FS is not set
629# CONFIG_ROMFS_FS is not set 776CONFIG_DNOTIFY=y
630CONFIG_INOTIFY=y 777CONFIG_INOTIFY=y
778CONFIG_INOTIFY_USER=y
631# CONFIG_QUOTA is not set 779# CONFIG_QUOTA is not set
632CONFIG_DNOTIFY=y
633# CONFIG_AUTOFS_FS is not set 780# CONFIG_AUTOFS_FS is not set
634# CONFIG_AUTOFS4_FS is not set 781# CONFIG_AUTOFS4_FS is not set
635# CONFIG_FUSE_FS is not set 782# CONFIG_FUSE_FS is not set
@@ -654,51 +801,59 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
654# Pseudo filesystems 801# Pseudo filesystems
655# 802#
656CONFIG_PROC_FS=y 803CONFIG_PROC_FS=y
804CONFIG_PROC_SYSCTL=y
805CONFIG_PROC_PAGE_MONITOR=y
657CONFIG_SYSFS=y 806CONFIG_SYSFS=y
658CONFIG_TMPFS=y 807CONFIG_TMPFS=y
808# CONFIG_TMPFS_POSIX_ACL is not set
659# CONFIG_HUGETLB_PAGE is not set 809# CONFIG_HUGETLB_PAGE is not set
660CONFIG_RAMFS=y 810# CONFIG_CONFIGFS_FS is not set
661# CONFIG_RELAYFS_FS is not set
662 811
663# 812#
664# Miscellaneous filesystems 813# Miscellaneous filesystems
665# 814#
815# CONFIG_ADFS_FS is not set
816# CONFIG_AFFS_FS is not set
817# CONFIG_HFS_FS is not set
666# CONFIG_HFSPLUS_FS is not set 818# CONFIG_HFSPLUS_FS is not set
667# CONFIG_JFFS_FS is not set 819# CONFIG_BEFS_FS is not set
820# CONFIG_BFS_FS is not set
821# CONFIG_EFS_FS is not set
668# CONFIG_JFFS2_FS is not set 822# CONFIG_JFFS2_FS is not set
669CONFIG_CRAMFS=y 823CONFIG_CRAMFS=y
670# CONFIG_VXFS_FS is not set 824# CONFIG_VXFS_FS is not set
825# CONFIG_MINIX_FS is not set
826# CONFIG_OMFS_FS is not set
671# CONFIG_HPFS_FS is not set 827# CONFIG_HPFS_FS is not set
672# CONFIG_QNX4FS_FS is not set 828# CONFIG_QNX4FS_FS is not set
829# CONFIG_ROMFS_FS is not set
673# CONFIG_SYSV_FS is not set 830# CONFIG_SYSV_FS is not set
674# CONFIG_UFS_FS is not set 831# CONFIG_UFS_FS is not set
675 832CONFIG_NETWORK_FILESYSTEMS=y
676#
677# Network File Systems
678#
679CONFIG_NFS_FS=y 833CONFIG_NFS_FS=y
680CONFIG_NFS_V3=y 834CONFIG_NFS_V3=y
681# CONFIG_NFS_V3_ACL is not set 835# CONFIG_NFS_V3_ACL is not set
682# CONFIG_NFSD is not set 836# CONFIG_NFS_V4 is not set
683CONFIG_ROOT_NFS=y 837CONFIG_ROOT_NFS=y
838# CONFIG_NFSD is not set
684CONFIG_LOCKD=y 839CONFIG_LOCKD=y
685CONFIG_LOCKD_V4=y 840CONFIG_LOCKD_V4=y
686CONFIG_NFS_COMMON=y 841CONFIG_NFS_COMMON=y
687CONFIG_SUNRPC=y 842CONFIG_SUNRPC=y
843# CONFIG_SUNRPC_REGISTER_V4 is not set
844# CONFIG_RPCSEC_GSS_KRB5 is not set
845# CONFIG_RPCSEC_GSS_SPKM3 is not set
688# CONFIG_SMB_FS is not set 846# CONFIG_SMB_FS is not set
689# CONFIG_CIFS is not set 847# CONFIG_CIFS is not set
690# CONFIG_NCP_FS is not set 848# CONFIG_NCP_FS is not set
691# CONFIG_CODA_FS is not set 849# CONFIG_CODA_FS is not set
850# CONFIG_AFS_FS is not set
692 851
693# 852#
694# Partition Types 853# Partition Types
695# 854#
696# CONFIG_PARTITION_ADVANCED is not set 855# CONFIG_PARTITION_ADVANCED is not set
697CONFIG_MSDOS_PARTITION=y 856CONFIG_MSDOS_PARTITION=y
698
699#
700# Native Language Support
701#
702CONFIG_NLS=y 857CONFIG_NLS=y
703CONFIG_NLS_DEFAULT="iso8859-1" 858CONFIG_NLS_DEFAULT="iso8859-1"
704CONFIG_NLS_CODEPAGE_437=y 859CONFIG_NLS_CODEPAGE_437=y
@@ -739,26 +894,71 @@ CONFIG_NLS_ISO8859_1=y
739# CONFIG_NLS_KOI8_R is not set 894# CONFIG_NLS_KOI8_R is not set
740# CONFIG_NLS_KOI8_U is not set 895# CONFIG_NLS_KOI8_U is not set
741# CONFIG_NLS_UTF8 is not set 896# CONFIG_NLS_UTF8 is not set
897# CONFIG_DLM is not set
742 898
743# 899#
744# Kernel hacking 900# Kernel hacking
745# 901#
746# CONFIG_PRINTK_TIME is not set 902# CONFIG_PRINTK_TIME is not set
747CONFIG_DEBUG_KERNEL=y 903CONFIG_ENABLE_WARN_DEPRECATED=y
904CONFIG_ENABLE_MUST_CHECK=y
905CONFIG_FRAME_WARN=1024
748CONFIG_MAGIC_SYSRQ=y 906CONFIG_MAGIC_SYSRQ=y
749CONFIG_LOG_BUF_SHIFT=14 907# CONFIG_UNUSED_SYMBOLS is not set
908# CONFIG_DEBUG_FS is not set
909# CONFIG_HEADERS_CHECK is not set
910CONFIG_DEBUG_KERNEL=y
911# CONFIG_DEBUG_SHIRQ is not set
750CONFIG_DETECT_SOFTLOCKUP=y 912CONFIG_DETECT_SOFTLOCKUP=y
913# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
914CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
915# CONFIG_SCHED_DEBUG is not set
751# CONFIG_SCHEDSTATS is not set 916# CONFIG_SCHEDSTATS is not set
917# CONFIG_TIMER_STATS is not set
918# CONFIG_DEBUG_OBJECTS is not set
752# CONFIG_DEBUG_SLAB is not set 919# CONFIG_DEBUG_SLAB is not set
920# CONFIG_DEBUG_RT_MUTEXES is not set
921# CONFIG_RT_MUTEX_TESTER is not set
753# CONFIG_DEBUG_SPINLOCK is not set 922# CONFIG_DEBUG_SPINLOCK is not set
923# CONFIG_DEBUG_MUTEXES is not set
924# CONFIG_DEBUG_LOCK_ALLOC is not set
925# CONFIG_PROVE_LOCKING is not set
926# CONFIG_LOCK_STAT is not set
754# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 927# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
928# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
755# CONFIG_DEBUG_KOBJECT is not set 929# CONFIG_DEBUG_KOBJECT is not set
756CONFIG_DEBUG_BUGVERBOSE=y 930CONFIG_DEBUG_BUGVERBOSE=y
757# CONFIG_DEBUG_INFO is not set 931# CONFIG_DEBUG_INFO is not set
758# CONFIG_DEBUG_FS is not set 932# CONFIG_DEBUG_VM is not set
933# CONFIG_DEBUG_WRITECOUNT is not set
934CONFIG_DEBUG_MEMORY_INIT=y
935# CONFIG_DEBUG_LIST is not set
936# CONFIG_DEBUG_SG is not set
759CONFIG_FRAME_POINTER=y 937CONFIG_FRAME_POINTER=y
938# CONFIG_BOOT_PRINTK_DELAY is not set
939# CONFIG_RCU_TORTURE_TEST is not set
940# CONFIG_RCU_CPU_STALL_DETECTOR is not set
941# CONFIG_BACKTRACE_SELF_TEST is not set
942# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
943# CONFIG_FAULT_INJECTION is not set
944# CONFIG_LATENCYTOP is not set
945# CONFIG_SYSCTL_SYSCALL_CHECK is not set
946CONFIG_NOP_TRACER=y
947CONFIG_HAVE_FTRACE=y
948CONFIG_HAVE_DYNAMIC_FTRACE=y
949# CONFIG_FTRACE is not set
950# CONFIG_IRQSOFF_TRACER is not set
951# CONFIG_SCHED_TRACER is not set
952# CONFIG_CONTEXT_SWITCH_TRACER is not set
953# CONFIG_BOOT_TRACER is not set
954# CONFIG_STACK_TRACER is not set
955# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
956# CONFIG_SAMPLES is not set
957CONFIG_HAVE_ARCH_KGDB=y
958# CONFIG_KGDB is not set
760CONFIG_DEBUG_USER=y 959CONFIG_DEBUG_USER=y
761CONFIG_DEBUG_ERRORS=y 960CONFIG_DEBUG_ERRORS=y
961# CONFIG_DEBUG_STACK_USAGE is not set
762# CONFIG_DEBUG_LL is not set 962# CONFIG_DEBUG_LL is not set
763 963
764# 964#
@@ -766,21 +966,106 @@ CONFIG_DEBUG_ERRORS=y
766# 966#
767# CONFIG_KEYS is not set 967# CONFIG_KEYS is not set
768# CONFIG_SECURITY is not set 968# CONFIG_SECURITY is not set
969# CONFIG_SECURITYFS is not set
970# CONFIG_SECURITY_FILE_CAPABILITIES is not set
971CONFIG_CRYPTO=y
972
973#
974# Crypto core or helper
975#
976# CONFIG_CRYPTO_FIPS is not set
977# CONFIG_CRYPTO_MANAGER is not set
978# CONFIG_CRYPTO_GF128MUL is not set
979# CONFIG_CRYPTO_NULL is not set
980# CONFIG_CRYPTO_CRYPTD is not set
981# CONFIG_CRYPTO_AUTHENC is not set
982# CONFIG_CRYPTO_TEST is not set
983
984#
985# Authenticated Encryption with Associated Data
986#
987# CONFIG_CRYPTO_CCM is not set
988# CONFIG_CRYPTO_GCM is not set
989# CONFIG_CRYPTO_SEQIV is not set
990
991#
992# Block modes
993#
994# CONFIG_CRYPTO_CBC is not set
995# CONFIG_CRYPTO_CTR is not set
996# CONFIG_CRYPTO_CTS is not set
997# CONFIG_CRYPTO_ECB is not set
998# CONFIG_CRYPTO_LRW is not set
999# CONFIG_CRYPTO_PCBC is not set
1000# CONFIG_CRYPTO_XTS is not set
1001
1002#
1003# Hash modes
1004#
1005# CONFIG_CRYPTO_HMAC is not set
1006# CONFIG_CRYPTO_XCBC is not set
1007
1008#
1009# Digest
1010#
1011# CONFIG_CRYPTO_CRC32C is not set
1012# CONFIG_CRYPTO_MD4 is not set
1013# CONFIG_CRYPTO_MD5 is not set
1014# CONFIG_CRYPTO_MICHAEL_MIC is not set
1015# CONFIG_CRYPTO_RMD128 is not set
1016# CONFIG_CRYPTO_RMD160 is not set
1017# CONFIG_CRYPTO_RMD256 is not set
1018# CONFIG_CRYPTO_RMD320 is not set
1019# CONFIG_CRYPTO_SHA1 is not set
1020# CONFIG_CRYPTO_SHA256 is not set
1021# CONFIG_CRYPTO_SHA512 is not set
1022# CONFIG_CRYPTO_TGR192 is not set
1023# CONFIG_CRYPTO_WP512 is not set
1024
1025#
1026# Ciphers
1027#
1028# CONFIG_CRYPTO_AES is not set
1029# CONFIG_CRYPTO_ANUBIS is not set
1030# CONFIG_CRYPTO_ARC4 is not set
1031# CONFIG_CRYPTO_BLOWFISH is not set
1032# CONFIG_CRYPTO_CAMELLIA is not set
1033# CONFIG_CRYPTO_CAST5 is not set
1034# CONFIG_CRYPTO_CAST6 is not set
1035# CONFIG_CRYPTO_DES is not set
1036# CONFIG_CRYPTO_FCRYPT is not set
1037# CONFIG_CRYPTO_KHAZAD is not set
1038# CONFIG_CRYPTO_SALSA20 is not set
1039# CONFIG_CRYPTO_SEED is not set
1040# CONFIG_CRYPTO_SERPENT is not set
1041# CONFIG_CRYPTO_TEA is not set
1042# CONFIG_CRYPTO_TWOFISH is not set
769 1043
770# 1044#
771# Cryptographic options 1045# Compression
772# 1046#
773# CONFIG_CRYPTO is not set 1047# CONFIG_CRYPTO_DEFLATE is not set
1048# CONFIG_CRYPTO_LZO is not set
774 1049
775# 1050#
776# Hardware crypto devices 1051# Random Number Generation
777# 1052#
1053# CONFIG_CRYPTO_ANSI_CPRNG is not set
1054# CONFIG_CRYPTO_HW is not set
778 1055
779# 1056#
780# Library routines 1057# Library routines
781# 1058#
1059CONFIG_BITREVERSE=y
782# CONFIG_CRC_CCITT is not set 1060# CONFIG_CRC_CCITT is not set
783# CONFIG_CRC16 is not set 1061# CONFIG_CRC16 is not set
1062# CONFIG_CRC_T10DIF is not set
1063# CONFIG_CRC_ITU_T is not set
784CONFIG_CRC32=y 1064CONFIG_CRC32=y
1065# CONFIG_CRC7 is not set
785# CONFIG_LIBCRC32C is not set 1066# CONFIG_LIBCRC32C is not set
786CONFIG_ZLIB_INFLATE=y 1067CONFIG_ZLIB_INFLATE=y
1068CONFIG_PLIST=y
1069CONFIG_HAS_IOMEM=y
1070CONFIG_HAS_IOPORT=y
1071CONFIG_HAS_DMA=y
diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
index 727b5c042e52..fad70da5911d 100644
--- a/arch/arm/include/asm/smp.h
+++ b/arch/arm/include/asm/smp.h
@@ -114,7 +114,7 @@ extern void local_timer_interrupt(void);
114/* 114/*
115 * Stop a local timer interrupt. 115 * Stop a local timer interrupt.
116 */ 116 */
117extern void local_timer_stop(unsigned int cpu); 117extern void local_timer_stop(void);
118 118
119/* 119/*
120 * Platform provides this to acknowledge a local timer IRQ 120 * Platform provides this to acknowledge a local timer IRQ
@@ -123,7 +123,7 @@ extern int local_timer_ack(void);
123 123
124#else 124#else
125 125
126static inline void local_timer_stop(unsigned int cpu) 126static inline void local_timer_stop(void)
127{ 127{
128} 128}
129 129
@@ -132,7 +132,7 @@ static inline void local_timer_stop(unsigned int cpu)
132/* 132/*
133 * Setup a local timer interrupt for a CPU. 133 * Setup a local timer interrupt for a CPU.
134 */ 134 */
135extern void local_timer_setup(unsigned int cpu); 135extern void local_timer_setup(void);
136 136
137/* 137/*
138 * show local interrupt info 138 * show local interrupt info
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index e42a749a56dd..019237d21622 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -181,7 +181,7 @@ int __cpuexit __cpu_disable(void)
181 /* 181 /*
182 * Stop the local timer for this CPU. 182 * Stop the local timer for this CPU.
183 */ 183 */
184 local_timer_stop(cpu); 184 local_timer_stop();
185 185
186 /* 186 /*
187 * Flush user cache and TLB mappings, and then remove this CPU 187 * Flush user cache and TLB mappings, and then remove this CPU
@@ -284,7 +284,7 @@ asmlinkage void __cpuinit secondary_start_kernel(void)
284 /* 284 /*
285 * Setup local timer for this CPU. 285 * Setup local timer for this CPU.
286 */ 286 */
287 local_timer_setup(cpu); 287 local_timer_setup();
288 288
289 calibrate_delay(); 289 calibrate_delay();
290 290
diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig
index 603d1db9baf0..ad911854eb4c 100644
--- a/arch/arm/mach-realview/Kconfig
+++ b/arch/arm/mach-realview/Kconfig
@@ -7,6 +7,13 @@ config MACH_REALVIEW_EB
7 help 7 help
8 Include support for the ARM(R) RealView Emulation Baseboard platform. 8 Include support for the ARM(R) RealView Emulation Baseboard platform.
9 9
10config REALVIEW_EB_A9MP
11 bool "Support Multicore Cortex-A9"
12 depends on MACH_REALVIEW_EB
13 select CPU_V7
14 help
15 Enable support for the Cortex-A9MPCore tile on the Realview platform.
16
10config REALVIEW_EB_ARM11MP 17config REALVIEW_EB_ARM11MP
11 bool "Support ARM11MPCore tile" 18 bool "Support ARM11MPCore tile"
12 depends on MACH_REALVIEW_EB 19 depends on MACH_REALVIEW_EB
@@ -26,6 +33,7 @@ config REALVIEW_EB_ARM11MP_REVB
26 33
27config MACH_REALVIEW_PB11MP 34config MACH_REALVIEW_PB11MP
28 bool "Support RealView/PB11MPCore platform" 35 bool "Support RealView/PB11MPCore platform"
36 select CPU_V6
29 select ARM_GIC 37 select ARM_GIC
30 help 38 help
31 Include support for the ARM(R) RealView MPCore Platform Baseboard. 39 Include support for the ARM(R) RealView MPCore Platform Baseboard.
@@ -39,4 +47,24 @@ config MACH_REALVIEW_PB1176
39 help 47 help
40 Include support for the ARM(R) RealView ARM1176 Platform Baseboard. 48 Include support for the ARM(R) RealView ARM1176 Platform Baseboard.
41 49
50config MACH_REALVIEW_PBA8
51 bool "Support RealView/PB-A8 platform"
52 select CPU_V7
53 select ARM_GIC
54 help
55 Include support for the ARM(R) RealView Cortex-A8 Platform Baseboard.
56 PB-A8 is a platform with an on-board Cortex-A8 and has support for
57 PCI-E and Compact Flash.
58
59config REALVIEW_HIGH_PHYS_OFFSET
60 bool "High physical base address for the RealView platform"
61 depends on !MACH_REALVIEW_PB1176
62 default y
63 help
64 RealView boards other than PB1176 have the RAM available at
65 0x70000000, 256MB of which being mirrored at 0x00000000. If
66 the board supports 512MB of RAM, this option allows the
67 memory to be accessed contiguously at the high physical
68 offset.
69
42endmenu 70endmenu
diff --git a/arch/arm/mach-realview/Makefile b/arch/arm/mach-realview/Makefile
index d2ae077431dd..7bea8ffc4b59 100644
--- a/arch/arm/mach-realview/Makefile
+++ b/arch/arm/mach-realview/Makefile
@@ -6,5 +6,6 @@ obj-y := core.o clock.o
6obj-$(CONFIG_MACH_REALVIEW_EB) += realview_eb.o 6obj-$(CONFIG_MACH_REALVIEW_EB) += realview_eb.o
7obj-$(CONFIG_MACH_REALVIEW_PB11MP) += realview_pb11mp.o 7obj-$(CONFIG_MACH_REALVIEW_PB11MP) += realview_pb11mp.o
8obj-$(CONFIG_MACH_REALVIEW_PB1176) += realview_pb1176.o 8obj-$(CONFIG_MACH_REALVIEW_PB1176) += realview_pb1176.o
9obj-$(CONFIG_MACH_REALVIEW_PBA8) += realview_pba8.o
9obj-$(CONFIG_SMP) += platsmp.o headsmp.o localtimer.o 10obj-$(CONFIG_SMP) += platsmp.o headsmp.o localtimer.o
10obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o 11obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
diff --git a/arch/arm/mach-realview/Makefile.boot b/arch/arm/mach-realview/Makefile.boot
index c7e75acfe6c9..d97e003d3df4 100644
--- a/arch/arm/mach-realview/Makefile.boot
+++ b/arch/arm/mach-realview/Makefile.boot
@@ -1,4 +1,9 @@
1ifeq ($(CONFIG_REALVIEW_HIGH_PHYS_OFFSET),y)
2 zreladdr-y := 0x70008000
3params_phys-y := 0x70000100
4initrd_phys-y := 0x70800000
5else
1 zreladdr-y := 0x00008000 6 zreladdr-y := 0x00008000
2params_phys-y := 0x00000100 7params_phys-y := 0x00000100
3initrd_phys-y := 0x00800000 8initrd_phys-y := 0x00800000
4 9endif
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index 2491374818e9..5f1d55963ced 100644
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -28,12 +28,14 @@
28#include <linux/clocksource.h> 28#include <linux/clocksource.h>
29#include <linux/clockchips.h> 29#include <linux/clockchips.h>
30#include <linux/io.h> 30#include <linux/io.h>
31#include <linux/smc911x.h>
31 32
32#include <asm/clkdev.h> 33#include <asm/clkdev.h>
33#include <asm/system.h> 34#include <asm/system.h>
34#include <mach/hardware.h> 35#include <mach/hardware.h>
35#include <asm/irq.h> 36#include <asm/irq.h>
36#include <asm/leds.h> 37#include <asm/leds.h>
38#include <asm/mach-types.h>
37#include <asm/hardware/arm_timer.h> 39#include <asm/hardware/arm_timer.h>
38#include <asm/hardware/icst307.h> 40#include <asm/hardware/icst307.h>
39 41
@@ -50,7 +52,7 @@
50 52
51#define REALVIEW_REFCOUNTER (__io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_24MHz_OFFSET) 53#define REALVIEW_REFCOUNTER (__io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_24MHz_OFFSET)
52 54
53/* used by entry-macro.S */ 55/* used by entry-macro.S and platsmp.c */
54void __iomem *gic_cpu_base_addr; 56void __iomem *gic_cpu_base_addr;
55 57
56/* 58/*
@@ -125,6 +127,29 @@ int realview_flash_register(struct resource *res, u32 num)
125 return platform_device_register(&realview_flash_device); 127 return platform_device_register(&realview_flash_device);
126} 128}
127 129
130static struct smc911x_platdata realview_smc911x_platdata = {
131 .flags = SMC911X_USE_32BIT,
132 .irq_flags = IRQF_SHARED,
133 .irq_polarity = 1,
134};
135
136static struct platform_device realview_eth_device = {
137 .name = "smc911x",
138 .id = 0,
139 .num_resources = 2,
140};
141
142int realview_eth_register(const char *name, struct resource *res)
143{
144 if (name)
145 realview_eth_device.name = name;
146 realview_eth_device.resource = res;
147 if (strcmp(realview_eth_device.name, "smc911x") == 0)
148 realview_eth_device.dev.platform_data = &realview_smc911x_platdata;
149
150 return platform_device_register(&realview_eth_device);
151}
152
128static struct resource realview_i2c_resource = { 153static struct resource realview_i2c_resource = {
129 .start = REALVIEW_I2C_BASE, 154 .start = REALVIEW_I2C_BASE,
130 .end = REALVIEW_I2C_BASE + SZ_4K - 1, 155 .end = REALVIEW_I2C_BASE + SZ_4K - 1,
@@ -178,9 +203,14 @@ static const struct icst307_params realview_oscvco_params = {
178static void realview_oscvco_set(struct clk *clk, struct icst307_vco vco) 203static void realview_oscvco_set(struct clk *clk, struct icst307_vco vco)
179{ 204{
180 void __iomem *sys_lock = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_LOCK_OFFSET; 205 void __iomem *sys_lock = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_LOCK_OFFSET;
181 void __iomem *sys_osc = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_OSC4_OFFSET; 206 void __iomem *sys_osc;
182 u32 val; 207 u32 val;
183 208
209 if (machine_is_realview_pb1176())
210 sys_osc = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_OSC0_OFFSET;
211 else
212 sys_osc = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_OSC4_OFFSET;
213
184 val = readl(sys_osc) & ~0x7ffff; 214 val = readl(sys_osc) & ~0x7ffff;
185 val |= vco.v | (vco.r << 9) | (vco.s << 16); 215 val |= vco.v | (vco.r << 9) | (vco.s << 16);
186 216
@@ -274,7 +304,30 @@ static struct clcd_panel vga = {
274 .width = -1, 304 .width = -1,
275 .height = -1, 305 .height = -1,
276 .tim2 = TIM2_BCD | TIM2_IPC, 306 .tim2 = TIM2_BCD | TIM2_IPC,
277 .cntl = CNTL_LCDTFT | CNTL_LCDVCOMP(1), 307 .cntl = CNTL_LCDTFT | CNTL_BGR | CNTL_LCDVCOMP(1),
308 .bpp = 16,
309};
310
311static struct clcd_panel xvga = {
312 .mode = {
313 .name = "XVGA",
314 .refresh = 60,
315 .xres = 1024,
316 .yres = 768,
317 .pixclock = 15748,
318 .left_margin = 152,
319 .right_margin = 48,
320 .upper_margin = 23,
321 .lower_margin = 3,
322 .hsync_len = 104,
323 .vsync_len = 4,
324 .sync = 0,
325 .vmode = FB_VMODE_NONINTERLACED,
326 },
327 .width = -1,
328 .height = -1,
329 .tim2 = TIM2_BCD | TIM2_IPC,
330 .cntl = CNTL_LCDTFT | CNTL_BGR | CNTL_LCDVCOMP(1),
278 .bpp = 16, 331 .bpp = 16,
279}; 332};
280 333
@@ -297,7 +350,7 @@ static struct clcd_panel sanyo_3_8_in = {
297 .width = -1, 350 .width = -1,
298 .height = -1, 351 .height = -1,
299 .tim2 = TIM2_BCD, 352 .tim2 = TIM2_BCD,
300 .cntl = CNTL_LCDTFT | CNTL_LCDVCOMP(1), 353 .cntl = CNTL_LCDTFT | CNTL_BGR | CNTL_LCDVCOMP(1),
301 .bpp = 16, 354 .bpp = 16,
302}; 355};
303 356
@@ -320,7 +373,7 @@ static struct clcd_panel sanyo_2_5_in = {
320 .width = -1, 373 .width = -1,
321 .height = -1, 374 .height = -1,
322 .tim2 = TIM2_IVS | TIM2_IHS | TIM2_IPC, 375 .tim2 = TIM2_IVS | TIM2_IHS | TIM2_IPC,
323 .cntl = CNTL_LCDTFT | CNTL_LCDVCOMP(1), 376 .cntl = CNTL_LCDTFT | CNTL_BGR | CNTL_LCDVCOMP(1),
324 .bpp = 16, 377 .bpp = 16,
325}; 378};
326 379
@@ -343,7 +396,7 @@ static struct clcd_panel epson_2_2_in = {
343 .width = -1, 396 .width = -1,
344 .height = -1, 397 .height = -1,
345 .tim2 = TIM2_BCD | TIM2_IPC, 398 .tim2 = TIM2_BCD | TIM2_IPC,
346 .cntl = CNTL_LCDTFT | CNTL_LCDVCOMP(1), 399 .cntl = CNTL_LCDTFT | CNTL_BGR | CNTL_LCDVCOMP(1),
347 .bpp = 16, 400 .bpp = 16,
348}; 401};
349 402
@@ -356,9 +409,15 @@ static struct clcd_panel epson_2_2_in = {
356static struct clcd_panel *realview_clcd_panel(void) 409static struct clcd_panel *realview_clcd_panel(void)
357{ 410{
358 void __iomem *sys_clcd = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_CLCD_OFFSET; 411 void __iomem *sys_clcd = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_CLCD_OFFSET;
359 struct clcd_panel *panel = &vga; 412 struct clcd_panel *vga_panel;
413 struct clcd_panel *panel;
360 u32 val; 414 u32 val;
361 415
416 if (machine_is_realview_eb())
417 vga_panel = &vga;
418 else
419 vga_panel = &xvga;
420
362 val = readl(sys_clcd) & SYS_CLCD_ID_MASK; 421 val = readl(sys_clcd) & SYS_CLCD_ID_MASK;
363 if (val == SYS_CLCD_ID_SANYO_3_8) 422 if (val == SYS_CLCD_ID_SANYO_3_8)
364 panel = &sanyo_3_8_in; 423 panel = &sanyo_3_8_in;
@@ -367,11 +426,11 @@ static struct clcd_panel *realview_clcd_panel(void)
367 else if (val == SYS_CLCD_ID_EPSON_2_2) 426 else if (val == SYS_CLCD_ID_EPSON_2_2)
368 panel = &epson_2_2_in; 427 panel = &epson_2_2_in;
369 else if (val == SYS_CLCD_ID_VGA) 428 else if (val == SYS_CLCD_ID_VGA)
370 panel = &vga; 429 panel = vga_panel;
371 else { 430 else {
372 printk(KERN_ERR "CLCD: unknown LCD panel ID 0x%08x, using VGA\n", 431 printk(KERN_ERR "CLCD: unknown LCD panel ID 0x%08x, using VGA\n",
373 val); 432 val);
374 panel = &vga; 433 panel = vga_panel;
375 } 434 }
376 435
377 return panel; 436 return panel;
@@ -406,12 +465,18 @@ static void realview_clcd_enable(struct clcd_fb *fb)
406 writel(val, sys_clcd); 465 writel(val, sys_clcd);
407} 466}
408 467
409static unsigned long framesize = SZ_1M;
410
411static int realview_clcd_setup(struct clcd_fb *fb) 468static int realview_clcd_setup(struct clcd_fb *fb)
412{ 469{
470 unsigned long framesize;
413 dma_addr_t dma; 471 dma_addr_t dma;
414 472
473 if (machine_is_realview_eb())
474 /* VGA, 16bpp */
475 framesize = 640 * 480 * 2;
476 else
477 /* XVGA, 16bpp */
478 framesize = 1024 * 768 * 2;
479
415 fb->panel = realview_clcd_panel(); 480 fb->panel = realview_clcd_panel();
416 481
417 fb->fb.screen_base = dma_alloc_writecombine(&fb->dev->dev, framesize, 482 fb->fb.screen_base = dma_alloc_writecombine(&fb->dev->dev, framesize,
@@ -636,7 +701,7 @@ void __init realview_timer_init(unsigned int timer_irq)
636 * The dummy clock device has to be registered before the main device 701 * The dummy clock device has to be registered before the main device
637 * so that the latter will broadcast the clock events 702 * so that the latter will broadcast the clock events
638 */ 703 */
639 local_timer_setup(smp_processor_id()); 704 local_timer_setup();
640#endif 705#endif
641 706
642 /* 707 /*
diff --git a/arch/arm/mach-realview/core.h b/arch/arm/mach-realview/core.h
index 614e8cb31713..63be2abdc19c 100644
--- a/arch/arm/mach-realview/core.h
+++ b/arch/arm/mach-realview/core.h
@@ -51,8 +51,7 @@ extern struct mmc_platform_data realview_mmc1_plat_data;
51extern struct clcd_board clcd_plat_data; 51extern struct clcd_board clcd_plat_data;
52extern void __iomem *gic_cpu_base_addr; 52extern void __iomem *gic_cpu_base_addr;
53#ifdef CONFIG_LOCAL_TIMERS 53#ifdef CONFIG_LOCAL_TIMERS
54extern void __iomem *twd_base_addr; 54extern void __iomem *twd_base;
55extern unsigned int twd_size;
56#endif 55#endif
57extern void __iomem *timer0_va_base; 56extern void __iomem *timer0_va_base;
58extern void __iomem *timer1_va_base; 57extern void __iomem *timer1_va_base;
@@ -62,5 +61,6 @@ extern void __iomem *timer3_va_base;
62extern void realview_leds_event(led_event_t ledevt); 61extern void realview_leds_event(led_event_t ledevt);
63extern void realview_timer_init(unsigned int timer_irq); 62extern void realview_timer_init(unsigned int timer_irq);
64extern int realview_flash_register(struct resource *res, u32 num); 63extern int realview_flash_register(struct resource *res, u32 num);
64extern int realview_eth_register(const char *name, struct resource *res);
65 65
66#endif 66#endif
diff --git a/arch/arm/mach-realview/hotplug.c b/arch/arm/mach-realview/hotplug.c
index 09748cbcd10e..be048e3e8799 100644
--- a/arch/arm/mach-realview/hotplug.c
+++ b/arch/arm/mach-realview/hotplug.c
@@ -13,6 +13,8 @@
13#include <linux/smp.h> 13#include <linux/smp.h>
14#include <linux/completion.h> 14#include <linux/completion.h>
15 15
16#include <asm/cacheflush.h>
17
16extern volatile int pen_release; 18extern volatile int pen_release;
17 19
18static DECLARE_COMPLETION(cpu_killed); 20static DECLARE_COMPLETION(cpu_killed);
@@ -21,7 +23,8 @@ static inline void cpu_enter_lowpower(void)
21{ 23{
22 unsigned int v; 24 unsigned int v;
23 25
24 asm volatile( "mcr p15, 0, %1, c7, c14, 0\n" 26 flush_cache_all();
27 asm volatile(
25 " mcr p15, 0, %1, c7, c5, 0\n" 28 " mcr p15, 0, %1, c7, c5, 0\n"
26 " mcr p15, 0, %1, c7, c10, 4\n" 29 " mcr p15, 0, %1, c7, c10, 4\n"
27 /* 30 /*
diff --git a/arch/arm/mach-realview/include/mach/board-eb.h b/arch/arm/mach-realview/include/mach/board-eb.h
index 8d699fd324d0..268d7701fa9b 100644
--- a/arch/arm/mach-realview/include/mach/board-eb.h
+++ b/arch/arm/mach-realview/include/mach/board-eb.h
@@ -49,16 +49,14 @@
49#ifdef CONFIG_REALVIEW_EB_ARM11MP_REVB 49#ifdef CONFIG_REALVIEW_EB_ARM11MP_REVB
50#define REALVIEW_EB11MP_SCU_BASE 0x10100000 /* SCU registers */ 50#define REALVIEW_EB11MP_SCU_BASE 0x10100000 /* SCU registers */
51#define REALVIEW_EB11MP_GIC_CPU_BASE 0x10100100 /* Generic interrupt controller CPU interface */ 51#define REALVIEW_EB11MP_GIC_CPU_BASE 0x10100100 /* Generic interrupt controller CPU interface */
52#define REALVIEW_EB11MP_TWD_BASE 0x10100700 52#define REALVIEW_EB11MP_TWD_BASE 0x10100600
53#define REALVIEW_EB11MP_TWD_SIZE 0x00000100
54#define REALVIEW_EB11MP_GIC_DIST_BASE 0x10101000 /* Generic interrupt controller distributor */ 53#define REALVIEW_EB11MP_GIC_DIST_BASE 0x10101000 /* Generic interrupt controller distributor */
55#define REALVIEW_EB11MP_L220_BASE 0x10102000 /* L220 registers */ 54#define REALVIEW_EB11MP_L220_BASE 0x10102000 /* L220 registers */
56#define REALVIEW_EB11MP_SYS_PLD_CTRL1 0xD8 /* Register offset for MPCore sysctl */ 55#define REALVIEW_EB11MP_SYS_PLD_CTRL1 0xD8 /* Register offset for MPCore sysctl */
57#else 56#else
58#define REALVIEW_EB11MP_SCU_BASE 0x1F000000 /* SCU registers */ 57#define REALVIEW_EB11MP_SCU_BASE 0x1F000000 /* SCU registers */
59#define REALVIEW_EB11MP_GIC_CPU_BASE 0x1F000100 /* Generic interrupt controller CPU interface */ 58#define REALVIEW_EB11MP_GIC_CPU_BASE 0x1F000100 /* Generic interrupt controller CPU interface */
60#define REALVIEW_EB11MP_TWD_BASE 0x1F000700 59#define REALVIEW_EB11MP_TWD_BASE 0x1F000600
61#define REALVIEW_EB11MP_TWD_SIZE 0x00000100
62#define REALVIEW_EB11MP_GIC_DIST_BASE 0x1F001000 /* Generic interrupt controller distributor */ 60#define REALVIEW_EB11MP_GIC_DIST_BASE 0x1F001000 /* Generic interrupt controller distributor */
63#define REALVIEW_EB11MP_L220_BASE 0x1F002000 /* L220 registers */ 61#define REALVIEW_EB11MP_L220_BASE 0x1F002000 /* L220 registers */
64#define REALVIEW_EB11MP_SYS_PLD_CTRL1 0x74 /* Register offset for MPCore sysctl */ 62#define REALVIEW_EB11MP_SYS_PLD_CTRL1 0x74 /* Register offset for MPCore sysctl */
@@ -163,7 +161,7 @@
163#define NR_IRQS NR_IRQS_EB 161#define NR_IRQS NR_IRQS_EB
164#endif 162#endif
165 163
166#if defined(CONFIG_REALVIEW_EB_ARM11MP) \ 164#if defined(CONFIG_REALVIEW_EB_ARM11MP) || defined(CONFIG_REALVIEW_EB_A9MP) \
167 && (!defined(MAX_GIC_NR) || (MAX_GIC_NR < NR_GIC_EB11MP)) 165 && (!defined(MAX_GIC_NR) || (MAX_GIC_NR < NR_GIC_EB11MP))
168#undef MAX_GIC_NR 166#undef MAX_GIC_NR
169#define MAX_GIC_NR NR_GIC_EB11MP 167#define MAX_GIC_NR NR_GIC_EB11MP
@@ -177,6 +175,7 @@
177#define REALVIEW_EB_PROC_ARM9 0x02000000 175#define REALVIEW_EB_PROC_ARM9 0x02000000
178#define REALVIEW_EB_PROC_ARM11 0x04000000 176#define REALVIEW_EB_PROC_ARM11 0x04000000
179#define REALVIEW_EB_PROC_ARM11MP 0x06000000 177#define REALVIEW_EB_PROC_ARM11MP 0x06000000
178#define REALVIEW_EB_PROC_A9MP 0x0C000000
180 179
181#define check_eb_proc(proc_type) \ 180#define check_eb_proc(proc_type) \
182 ((readl(__io_address(REALVIEW_SYS_PROCID)) & REALVIEW_EB_PROC_MASK) \ 181 ((readl(__io_address(REALVIEW_SYS_PROCID)) & REALVIEW_EB_PROC_MASK) \
@@ -188,4 +187,13 @@
188#define core_tile_eb11mp() 0 187#define core_tile_eb11mp() 0
189#endif 188#endif
190 189
190#ifdef CONFIG_REALVIEW_EB_A9MP
191#define core_tile_a9mp() check_eb_proc(REALVIEW_EB_PROC_A9MP)
192#else
193#define core_tile_a9mp() 0
194#endif
195
196#define machine_is_realview_eb_mp() \
197 (machine_is_realview_eb() && (core_tile_eb11mp() || core_tile_a9mp()))
198
191#endif /* __ASM_ARCH_BOARD_EB_H */ 199#endif /* __ASM_ARCH_BOARD_EB_H */
diff --git a/arch/arm/mach-realview/include/mach/board-pb11mp.h b/arch/arm/mach-realview/include/mach/board-pb11mp.h
index ecd80e58631e..53ea0e7a1267 100644
--- a/arch/arm/mach-realview/include/mach/board-pb11mp.h
+++ b/arch/arm/mach-realview/include/mach/board-pb11mp.h
@@ -77,8 +77,7 @@
77 */ 77 */
78#define REALVIEW_TC11MP_SCU_BASE 0x1F000000 /* IRQ, Test chip */ 78#define REALVIEW_TC11MP_SCU_BASE 0x1F000000 /* IRQ, Test chip */
79#define REALVIEW_TC11MP_GIC_CPU_BASE 0x1F000100 /* Test chip interrupt controller CPU interface */ 79#define REALVIEW_TC11MP_GIC_CPU_BASE 0x1F000100 /* Test chip interrupt controller CPU interface */
80#define REALVIEW_TC11MP_TWD_BASE 0x1F000700 80#define REALVIEW_TC11MP_TWD_BASE 0x1F000600
81#define REALVIEW_TC11MP_TWD_SIZE 0x00000100
82#define REALVIEW_TC11MP_GIC_DIST_BASE 0x1F001000 /* Test chip interrupt controller distributor */ 81#define REALVIEW_TC11MP_GIC_DIST_BASE 0x1F001000 /* Test chip interrupt controller distributor */
83#define REALVIEW_TC11MP_L220_BASE 0x1F002000 /* L220 registers */ 82#define REALVIEW_TC11MP_L220_BASE 0x1F002000 /* L220 registers */
84 83
diff --git a/arch/arm/mach-realview/include/mach/board-pba8.h b/arch/arm/mach-realview/include/mach/board-pba8.h
new file mode 100644
index 000000000000..c8bed8f58bab
--- /dev/null
+++ b/arch/arm/mach-realview/include/mach/board-pba8.h
@@ -0,0 +1,152 @@
1/*
2 * include/asm-arm/arch-realview/board-pba8.h
3 *
4 * Copyright (C) 2008 ARM Limited
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation.
9 *
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program; if not, write to the Free Software
17 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
18 * MA 02110-1301, USA.
19 */
20
21#ifndef __ASM_ARCH_BOARD_PBA8_H
22#define __ASM_ARCH_BOARD_PBA8_H
23
24#include <mach/platform.h>
25
26/*
27 * Peripheral addresses
28 */
29#define REALVIEW_PBA8_UART0_BASE 0x10009000 /* UART 0 */
30#define REALVIEW_PBA8_UART1_BASE 0x1000A000 /* UART 1 */
31#define REALVIEW_PBA8_UART2_BASE 0x1000B000 /* UART 2 */
32#define REALVIEW_PBA8_UART3_BASE 0x1000C000 /* UART 3 */
33#define REALVIEW_PBA8_SSP_BASE 0x1000D000 /* Synchronous Serial Port */
34#define REALVIEW_PBA8_WATCHDOG0_BASE 0x1000F000 /* Watchdog 0 */
35#define REALVIEW_PBA8_WATCHDOG_BASE 0x10010000 /* watchdog interface */
36#define REALVIEW_PBA8_TIMER0_1_BASE 0x10011000 /* Timer 0 and 1 */
37#define REALVIEW_PBA8_TIMER2_3_BASE 0x10012000 /* Timer 2 and 3 */
38#define REALVIEW_PBA8_GPIO0_BASE 0x10013000 /* GPIO port 0 */
39#define REALVIEW_PBA8_RTC_BASE 0x10017000 /* Real Time Clock */
40#define REALVIEW_PBA8_TIMER4_5_BASE 0x10018000 /* Timer 4/5 */
41#define REALVIEW_PBA8_TIMER6_7_BASE 0x10019000 /* Timer 6/7 */
42#define REALVIEW_PBA8_SCTL_BASE 0x1001A000 /* System Controller */
43#define REALVIEW_PBA8_CLCD_BASE 0x10020000 /* CLCD */
44#define REALVIEW_PBA8_ONB_SRAM_BASE 0x10060000 /* On-board SRAM */
45#define REALVIEW_PBA8_DMC_BASE 0x100E0000 /* DMC configuration */
46#define REALVIEW_PBA8_SMC_BASE 0x100E1000 /* SMC configuration */
47#define REALVIEW_PBA8_CAN_BASE 0x100E2000 /* CAN bus */
48#define REALVIEW_PBA8_CF_BASE 0x18000000 /* Compact flash */
49#define REALVIEW_PBA8_CF_MEM_BASE 0x18003000 /* SMC for Compact flash */
50#define REALVIEW_PBA8_GIC_CPU_BASE 0x1E000000 /* Generic interrupt controller CPU interface */
51#define REALVIEW_PBA8_FLASH0_BASE 0x40000000
52#define REALVIEW_PBA8_FLASH0_SIZE SZ_64M
53#define REALVIEW_PBA8_FLASH1_BASE 0x44000000
54#define REALVIEW_PBA8_FLASH1_SIZE SZ_64M
55#define REALVIEW_PBA8_ETH_BASE 0x4E000000 /* Ethernet */
56#define REALVIEW_PBA8_USB_BASE 0x4F000000 /* USB */
57#define REALVIEW_PBA8_GIC_DIST_BASE 0x1E001000 /* Generic interrupt controller distributor */
58#define REALVIEW_PBA8_LT_BASE 0xC0000000 /* Logic Tile expansion */
59#define REALVIEW_PBA8_SDRAM6_BASE 0x70000000 /* SDRAM bank 6 256MB */
60#define REALVIEW_PBA8_SDRAM7_BASE 0x80000000 /* SDRAM bank 7 256MB */
61
62#define REALVIEW_PBA8_SYS_PLD_CTRL1 0x74
63
64/*
65 * PBA8 PCI regions
66 */
67#define REALVIEW_PBA8_PCI_BASE 0x90040000 /* PCI-X Unit base */
68#define REALVIEW_PBA8_PCI_IO_BASE 0x90050000 /* IO Region on AHB */
69#define REALVIEW_PBA8_PCI_MEM_BASE 0xA0000000 /* MEM Region on AHB */
70
71#define REALVIEW_PBA8_PCI_BASE_SIZE 0x10000 /* 16 Kb */
72#define REALVIEW_PBA8_PCI_IO_SIZE 0x1000 /* 4 Kb */
73#define REALVIEW_PBA8_PCI_MEM_SIZE 0x20000000 /* 512 MB */
74
75/*
76 * Irqs
77 */
78#define IRQ_PBA8_GIC_START 32
79
80/* L220
81#define IRQ_PBA8_L220_EVENT (IRQ_PBA8_GIC_START + 29)
82#define IRQ_PBA8_L220_SLAVE (IRQ_PBA8_GIC_START + 30)
83#define IRQ_PBA8_L220_DECODE (IRQ_PBA8_GIC_START + 31)
84*/
85
86/*
87 * PB-A8 on-board gic irq sources
88 */
89#define IRQ_PBA8_WATCHDOG (IRQ_PBA8_GIC_START + 0) /* Watchdog timer */
90#define IRQ_PBA8_SOFT (IRQ_PBA8_GIC_START + 1) /* Software interrupt */
91#define IRQ_PBA8_COMMRx (IRQ_PBA8_GIC_START + 2) /* Debug Comm Rx interrupt */
92#define IRQ_PBA8_COMMTx (IRQ_PBA8_GIC_START + 3) /* Debug Comm Tx interrupt */
93#define IRQ_PBA8_TIMER0_1 (IRQ_PBA8_GIC_START + 4) /* Timer 0/1 (default timer) */
94#define IRQ_PBA8_TIMER2_3 (IRQ_PBA8_GIC_START + 5) /* Timer 2/3 */
95#define IRQ_PBA8_GPIO0 (IRQ_PBA8_GIC_START + 6) /* GPIO 0 */
96#define IRQ_PBA8_GPIO1 (IRQ_PBA8_GIC_START + 7) /* GPIO 1 */
97#define IRQ_PBA8_GPIO2 (IRQ_PBA8_GIC_START + 8) /* GPIO 2 */
98 /* 9 reserved */
99#define IRQ_PBA8_RTC (IRQ_PBA8_GIC_START + 10) /* Real Time Clock */
100#define IRQ_PBA8_SSP (IRQ_PBA8_GIC_START + 11) /* Synchronous Serial Port */
101#define IRQ_PBA8_UART0 (IRQ_PBA8_GIC_START + 12) /* UART 0 on development chip */
102#define IRQ_PBA8_UART1 (IRQ_PBA8_GIC_START + 13) /* UART 1 on development chip */
103#define IRQ_PBA8_UART2 (IRQ_PBA8_GIC_START + 14) /* UART 2 on development chip */
104#define IRQ_PBA8_UART3 (IRQ_PBA8_GIC_START + 15) /* UART 3 on development chip */
105#define IRQ_PBA8_SCI (IRQ_PBA8_GIC_START + 16) /* Smart Card Interface */
106#define IRQ_PBA8_MMCI0A (IRQ_PBA8_GIC_START + 17) /* Multimedia Card 0A */
107#define IRQ_PBA8_MMCI0B (IRQ_PBA8_GIC_START + 18) /* Multimedia Card 0B */
108#define IRQ_PBA8_AACI (IRQ_PBA8_GIC_START + 19) /* Audio Codec */
109#define IRQ_PBA8_KMI0 (IRQ_PBA8_GIC_START + 20) /* Keyboard/Mouse port 0 */
110#define IRQ_PBA8_KMI1 (IRQ_PBA8_GIC_START + 21) /* Keyboard/Mouse port 1 */
111#define IRQ_PBA8_CHARLCD (IRQ_PBA8_GIC_START + 22) /* Character LCD */
112#define IRQ_PBA8_CLCD (IRQ_PBA8_GIC_START + 23) /* CLCD controller */
113#define IRQ_PBA8_DMAC (IRQ_PBA8_GIC_START + 24) /* DMA controller */
114#define IRQ_PBA8_PWRFAIL (IRQ_PBA8_GIC_START + 25) /* Power failure */
115#define IRQ_PBA8_PISMO (IRQ_PBA8_GIC_START + 26) /* PISMO interface */
116#define IRQ_PBA8_DoC (IRQ_PBA8_GIC_START + 27) /* Disk on Chip memory controller */
117#define IRQ_PBA8_ETH (IRQ_PBA8_GIC_START + 28) /* Ethernet controller */
118#define IRQ_PBA8_USB (IRQ_PBA8_GIC_START + 29) /* USB controller */
119#define IRQ_PBA8_TSPEN (IRQ_PBA8_GIC_START + 30) /* Touchscreen pen */
120#define IRQ_PBA8_TSKPAD (IRQ_PBA8_GIC_START + 31) /* Touchscreen keypad */
121
122/* ... */
123#define IRQ_PBA8_PCI0 (IRQ_PBA8_GIC_START + 50)
124#define IRQ_PBA8_PCI1 (IRQ_PBA8_GIC_START + 51)
125#define IRQ_PBA8_PCI2 (IRQ_PBA8_GIC_START + 52)
126#define IRQ_PBA8_PCI3 (IRQ_PBA8_GIC_START + 53)
127
128#define IRQ_PBA8_SMC -1
129#define IRQ_PBA8_SCTL -1
130
131#define NR_GIC_PBA8 1
132
133/*
134 * Only define NR_IRQS if less than NR_IRQS_PBA8
135 */
136#define NR_IRQS_PBA8 (IRQ_PBA8_GIC_START + 64)
137
138#if defined(CONFIG_MACH_REALVIEW_PBA8)
139
140#if !defined(NR_IRQS) || (NR_IRQS < NR_IRQS_PBA8)
141#undef NR_IRQS
142#define NR_IRQS NR_IRQS_PBA8
143#endif
144
145#if !defined(MAX_GIC_NR) || (MAX_GIC_NR < NR_GIC_PBA8)
146#undef MAX_GIC_NR
147#define MAX_GIC_NR NR_GIC_PBA8
148#endif
149
150#endif /* CONFIG_MACH_REALVIEW_PBA8 */
151
152#endif /* __ASM_ARCH_BOARD_PBA8_H */
diff --git a/arch/arm/mach-realview/include/mach/debug-macro.S b/arch/arm/mach-realview/include/mach/debug-macro.S
index 7196bcadff0c..92dbcb9e1792 100644
--- a/arch/arm/mach-realview/include/mach/debug-macro.S
+++ b/arch/arm/mach-realview/include/mach/debug-macro.S
@@ -8,15 +8,36 @@
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License version 2 as 9 * it under the terms of the GNU General Public License version 2 as
10 * published by the Free Software Foundation. 10 * published by the Free Software Foundation.
11 * 11 */
12*/ 12
13#if defined(CONFIG_MACH_REALVIEW_EB) || \
14 defined(CONFIG_MACH_REALVIEW_PB11MP) || \
15 defined(CONFIG_MACH_REALVIEW_PBA8)
16#ifndef DEBUG_LL_UART_OFFSET
17#define DEBUG_LL_UART_OFFSET 0x00009000
18#elif DEBUG_LL_UART_OFFSET != 0x00009000
19#warning "DEBUG_LL_UART_OFFSET already defined to a different value"
20#endif
21#endif
22
23#ifdef CONFIG_MACH_REALVIEW_PB1176
24#ifndef DEBUG_LL_UART_OFFSET
25#define DEBUG_LL_UART_OFFSET 0x0010c000
26#elif DEBUG_LL_UART_OFFSET != 0x0010c000
27#warning "DEBUG_LL_UART_OFFSET already defined to a different value"
28#endif
29#endif
30
31#ifndef DEBUG_LL_UART_OFFSET
32#error "Unknown RealView platform"
33#endif
13 34
14 .macro addruart,rx 35 .macro addruart,rx
15 mrc p15, 0, \rx, c1, c0 36 mrc p15, 0, \rx, c1, c0
16 tst \rx, #1 @ MMU enabled? 37 tst \rx, #1 @ MMU enabled?
17 moveq \rx, #0x10000000 38 moveq \rx, #0x10000000
18 movne \rx, #0xf0000000 @ virtual base 39 movne \rx, #0xfb000000 @ virtual base
19 orr \rx, \rx, #0x00009000 40 orr \rx, \rx, #DEBUG_LL_UART_OFFSET
20 .endm 41 .endm
21 42
22#include <asm/hardware/debug-pl01x.S> 43#include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/mach-realview/include/mach/hardware.h b/arch/arm/mach-realview/include/mach/hardware.h
index 79a93b3dfca9..b42c14f89acb 100644
--- a/arch/arm/mach-realview/include/mach/hardware.h
+++ b/arch/arm/mach-realview/include/mach/hardware.h
@@ -25,7 +25,14 @@
25#include <asm/sizes.h> 25#include <asm/sizes.h>
26 26
27/* macro to get at IO space when running virtually */ 27/* macro to get at IO space when running virtually */
28#define IO_ADDRESS(x) (((x) & 0x0fffffff) + 0xf0000000) 28/*
29 * Statically mapped addresses:
30 *
31 * 10xx xxxx -> fbxx xxxx
32 * 1exx xxxx -> fdxx xxxx
33 * 1fxx xxxx -> fexx xxxx
34 */
35#define IO_ADDRESS(x) (((x) & 0x03ffffff) + 0xfb000000)
29#define __io_address(n) __io(IO_ADDRESS(n)) 36#define __io_address(n) __io(IO_ADDRESS(n))
30 37
31#endif 38#endif
diff --git a/arch/arm/mach-realview/include/mach/irqs.h b/arch/arm/mach-realview/include/mach/irqs.h
index 02a918529db3..fe5cb987aa21 100644
--- a/arch/arm/mach-realview/include/mach/irqs.h
+++ b/arch/arm/mach-realview/include/mach/irqs.h
@@ -25,6 +25,7 @@
25#include <mach/board-eb.h> 25#include <mach/board-eb.h>
26#include <mach/board-pb11mp.h> 26#include <mach/board-pb11mp.h>
27#include <mach/board-pb1176.h> 27#include <mach/board-pb1176.h>
28#include <mach/board-pba8.h>
28 29
29#define IRQ_LOCALTIMER 29 30#define IRQ_LOCALTIMER 29
30#define IRQ_LOCALWDOG 30 31#define IRQ_LOCALWDOG 30
diff --git a/arch/arm/mach-realview/include/mach/memory.h b/arch/arm/mach-realview/include/mach/memory.h
index 65a0742094f7..293c30025e7e 100644
--- a/arch/arm/mach-realview/include/mach/memory.h
+++ b/arch/arm/mach-realview/include/mach/memory.h
@@ -23,6 +23,10 @@
23/* 23/*
24 * Physical DRAM offset. 24 * Physical DRAM offset.
25 */ 25 */
26#ifdef CONFIG_REALVIEW_HIGH_PHYS_OFFSET
27#define PHYS_OFFSET UL(0x70000000)
28#else
26#define PHYS_OFFSET UL(0x00000000) 29#define PHYS_OFFSET UL(0x00000000)
30#endif
27 31
28#endif 32#endif
diff --git a/arch/arm/mach-realview/include/mach/uncompress.h b/arch/arm/mach-realview/include/mach/uncompress.h
index 79f50f218e77..415d634d52ab 100644
--- a/arch/arm/mach-realview/include/mach/uncompress.h
+++ b/arch/arm/mach-realview/include/mach/uncompress.h
@@ -23,6 +23,7 @@
23#include <mach/board-eb.h> 23#include <mach/board-eb.h>
24#include <mach/board-pb11mp.h> 24#include <mach/board-pb11mp.h>
25#include <mach/board-pb1176.h> 25#include <mach/board-pb1176.h>
26#include <mach/board-pba8.h>
26 27
27#define AMBA_UART_DR(base) (*(volatile unsigned char *)((base) + 0x00)) 28#define AMBA_UART_DR(base) (*(volatile unsigned char *)((base) + 0x00))
28#define AMBA_UART_LCRH(base) (*(volatile unsigned char *)((base) + 0x2c)) 29#define AMBA_UART_LCRH(base) (*(volatile unsigned char *)((base) + 0x2c))
@@ -40,6 +41,8 @@ static inline unsigned long get_uart_base(void)
40 return REALVIEW_PB11MP_UART0_BASE; 41 return REALVIEW_PB11MP_UART0_BASE;
41 else if (machine_is_realview_pb1176()) 42 else if (machine_is_realview_pb1176())
42 return REALVIEW_PB1176_UART0_BASE; 43 return REALVIEW_PB1176_UART0_BASE;
44 else if (machine_is_realview_pba8())
45 return REALVIEW_PBA8_UART0_BASE;
43 else 46 else
44 return 0; 47 return 0;
45} 48}
diff --git a/arch/arm/mach-realview/include/mach/vmalloc.h b/arch/arm/mach-realview/include/mach/vmalloc.h
index 48cbcc873db2..fe0de1b507ac 100644
--- a/arch/arm/mach-realview/include/mach/vmalloc.h
+++ b/arch/arm/mach-realview/include/mach/vmalloc.h
@@ -18,4 +18,4 @@
18 * along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20 */ 20 */
21#define VMALLOC_END (PAGE_OFFSET + 0x18000000) 21#define VMALLOC_END 0xf8000000
diff --git a/arch/arm/mach-realview/localtimer.c b/arch/arm/mach-realview/localtimer.c
index 44d178cd5733..9019ef2e5611 100644
--- a/arch/arm/mach-realview/localtimer.c
+++ b/arch/arm/mach-realview/localtimer.c
@@ -38,18 +38,14 @@ void local_timer_interrupt(void)
38 38
39#ifdef CONFIG_LOCAL_TIMERS 39#ifdef CONFIG_LOCAL_TIMERS
40 40
41#define TWD_BASE(cpu) (twd_base_addr + (cpu) * twd_size)
42
43/* set up by the platform code */ 41/* set up by the platform code */
44void __iomem *twd_base_addr; 42void __iomem *twd_base;
45unsigned int twd_size;
46 43
47static unsigned long mpcore_timer_rate; 44static unsigned long mpcore_timer_rate;
48 45
49static void local_timer_set_mode(enum clock_event_mode mode, 46static void local_timer_set_mode(enum clock_event_mode mode,
50 struct clock_event_device *clk) 47 struct clock_event_device *clk)
51{ 48{
52 void __iomem *base = TWD_BASE(smp_processor_id());
53 unsigned long ctrl; 49 unsigned long ctrl;
54 50
55 switch(mode) { 51 switch(mode) {
@@ -68,17 +64,16 @@ static void local_timer_set_mode(enum clock_event_mode mode,
68 ctrl = 0; 64 ctrl = 0;
69 } 65 }
70 66
71 __raw_writel(ctrl, base + TWD_TIMER_CONTROL); 67 __raw_writel(ctrl, twd_base + TWD_TIMER_CONTROL);
72} 68}
73 69
74static int local_timer_set_next_event(unsigned long evt, 70static int local_timer_set_next_event(unsigned long evt,
75 struct clock_event_device *unused) 71 struct clock_event_device *unused)
76{ 72{
77 void __iomem *base = TWD_BASE(smp_processor_id()); 73 unsigned long ctrl = __raw_readl(twd_base + TWD_TIMER_CONTROL);
78 unsigned long ctrl = __raw_readl(base + TWD_TIMER_CONTROL);
79 74
80 __raw_writel(evt, base + TWD_TIMER_COUNTER); 75 __raw_writel(evt, twd_base + TWD_TIMER_COUNTER);
81 __raw_writel(ctrl | TWD_TIMER_CONTROL_ENABLE, base + TWD_TIMER_CONTROL); 76 __raw_writel(ctrl | TWD_TIMER_CONTROL_ENABLE, twd_base + TWD_TIMER_CONTROL);
82 77
83 return 0; 78 return 0;
84} 79}
@@ -91,19 +86,16 @@ static int local_timer_set_next_event(unsigned long evt,
91 */ 86 */
92int local_timer_ack(void) 87int local_timer_ack(void)
93{ 88{
94 void __iomem *base = TWD_BASE(smp_processor_id()); 89 if (__raw_readl(twd_base + TWD_TIMER_INTSTAT)) {
95 90 __raw_writel(1, twd_base + TWD_TIMER_INTSTAT);
96 if (__raw_readl(base + TWD_TIMER_INTSTAT)) {
97 __raw_writel(1, base + TWD_TIMER_INTSTAT);
98 return 1; 91 return 1;
99 } 92 }
100 93
101 return 0; 94 return 0;
102} 95}
103 96
104static void __cpuinit twd_calibrate_rate(unsigned int cpu) 97static void __cpuinit twd_calibrate_rate(void)
105{ 98{
106 void __iomem *base = TWD_BASE(cpu);
107 unsigned long load, count; 99 unsigned long load, count;
108 u64 waitjiffies; 100 u64 waitjiffies;
109 101
@@ -124,15 +116,15 @@ static void __cpuinit twd_calibrate_rate(unsigned int cpu)
124 waitjiffies += 5; 116 waitjiffies += 5;
125 117
126 /* enable, no interrupt or reload */ 118 /* enable, no interrupt or reload */
127 __raw_writel(0x1, base + TWD_TIMER_CONTROL); 119 __raw_writel(0x1, twd_base + TWD_TIMER_CONTROL);
128 120
129 /* maximum value */ 121 /* maximum value */
130 __raw_writel(0xFFFFFFFFU, base + TWD_TIMER_COUNTER); 122 __raw_writel(0xFFFFFFFFU, twd_base + TWD_TIMER_COUNTER);
131 123
132 while (get_jiffies_64() < waitjiffies) 124 while (get_jiffies_64() < waitjiffies)
133 udelay(10); 125 udelay(10);
134 126
135 count = __raw_readl(base + TWD_TIMER_COUNTER); 127 count = __raw_readl(twd_base + TWD_TIMER_COUNTER);
136 128
137 mpcore_timer_rate = (0xFFFFFFFFU - count) * (HZ / 5); 129 mpcore_timer_rate = (0xFFFFFFFFU - count) * (HZ / 5);
138 130
@@ -142,18 +134,19 @@ static void __cpuinit twd_calibrate_rate(unsigned int cpu)
142 134
143 load = mpcore_timer_rate / HZ; 135 load = mpcore_timer_rate / HZ;
144 136
145 __raw_writel(load, base + TWD_TIMER_LOAD); 137 __raw_writel(load, twd_base + TWD_TIMER_LOAD);
146} 138}
147 139
148/* 140/*
149 * Setup the local clock events for a CPU. 141 * Setup the local clock events for a CPU.
150 */ 142 */
151void __cpuinit local_timer_setup(unsigned int cpu) 143void __cpuinit local_timer_setup(void)
152{ 144{
145 unsigned int cpu = smp_processor_id();
153 struct clock_event_device *clk = &per_cpu(local_clockevent, cpu); 146 struct clock_event_device *clk = &per_cpu(local_clockevent, cpu);
154 unsigned long flags; 147 unsigned long flags;
155 148
156 twd_calibrate_rate(cpu); 149 twd_calibrate_rate();
157 150
158 clk->name = "local_timer"; 151 clk->name = "local_timer";
159 clk->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT; 152 clk->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;
@@ -178,9 +171,9 @@ void __cpuinit local_timer_setup(unsigned int cpu)
178/* 171/*
179 * take a local timer down 172 * take a local timer down
180 */ 173 */
181void __cpuexit local_timer_stop(unsigned int cpu) 174void __cpuexit local_timer_stop(void)
182{ 175{
183 __raw_writel(0, TWD_BASE(cpu) + TWD_TIMER_CONTROL); 176 __raw_writel(0, twd_base + TWD_TIMER_CONTROL);
184} 177}
185 178
186#else /* CONFIG_LOCAL_TIMERS */ 179#else /* CONFIG_LOCAL_TIMERS */
@@ -190,8 +183,9 @@ static void dummy_timer_set_mode(enum clock_event_mode mode,
190{ 183{
191} 184}
192 185
193void __cpuinit local_timer_setup(unsigned int cpu) 186void __cpuinit local_timer_setup(void)
194{ 187{
188 unsigned int cpu = smp_processor_id();
195 struct clock_event_device *clk = &per_cpu(local_clockevent, cpu); 189 struct clock_event_device *clk = &per_cpu(local_clockevent, cpu);
196 190
197 clk->name = "dummy_timer"; 191 clk->name = "dummy_timer";
diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c
index e102aeb0f76e..8fce85f33033 100644
--- a/arch/arm/mach-realview/platsmp.c
+++ b/arch/arm/mach-realview/platsmp.c
@@ -23,6 +23,8 @@
23#include <mach/board-pb11mp.h> 23#include <mach/board-pb11mp.h>
24#include <mach/scu.h> 24#include <mach/scu.h>
25 25
26#include "core.h"
27
26extern void realview_secondary_startup(void); 28extern void realview_secondary_startup(void);
27 29
28/* 30/*
@@ -31,15 +33,20 @@ extern void realview_secondary_startup(void);
31 */ 33 */
32volatile int __cpuinitdata pen_release = -1; 34volatile int __cpuinitdata pen_release = -1;
33 35
36static void __iomem *scu_base_addr(void)
37{
38 if (machine_is_realview_eb_mp())
39 return __io_address(REALVIEW_EB11MP_SCU_BASE);
40 else if (machine_is_realview_pb11mp())
41 return __io_address(REALVIEW_TC11MP_SCU_BASE);
42 else
43 return (void __iomem *)0;
44}
45
34static unsigned int __init get_core_count(void) 46static unsigned int __init get_core_count(void)
35{ 47{
36 unsigned int ncores; 48 unsigned int ncores;
37 void __iomem *scu_base = 0; 49 void __iomem *scu_base = scu_base_addr();
38
39 if (machine_is_realview_eb() && core_tile_eb11mp())
40 scu_base = __io_address(REALVIEW_EB11MP_SCU_BASE);
41 else if (machine_is_realview_pb11mp())
42 scu_base = __io_address(REALVIEW_TC11MP_SCU_BASE);
43 50
44 if (scu_base) { 51 if (scu_base) {
45 ncores = __raw_readl(scu_base + SCU_CONFIG); 52 ncores = __raw_readl(scu_base + SCU_CONFIG);
@@ -56,14 +63,7 @@ static unsigned int __init get_core_count(void)
56static void scu_enable(void) 63static void scu_enable(void)
57{ 64{
58 u32 scu_ctrl; 65 u32 scu_ctrl;
59 void __iomem *scu_base; 66 void __iomem *scu_base = scu_base_addr();
60
61 if (machine_is_realview_eb() && core_tile_eb11mp())
62 scu_base = __io_address(REALVIEW_EB11MP_SCU_BASE);
63 else if (machine_is_realview_pb11mp())
64 scu_base = __io_address(REALVIEW_TC11MP_SCU_BASE);
65 else
66 BUG();
67 67
68 scu_ctrl = __raw_readl(scu_base + SCU_CTRL); 68 scu_ctrl = __raw_readl(scu_base + SCU_CTRL);
69 scu_ctrl |= 1; 69 scu_ctrl |= 1;
@@ -88,10 +88,7 @@ void __cpuinit platform_secondary_init(unsigned int cpu)
88 * core (e.g. timer irq), then they will not have been enabled 88 * core (e.g. timer irq), then they will not have been enabled
89 * for us: do so 89 * for us: do so
90 */ 90 */
91 if (machine_is_realview_eb() && core_tile_eb11mp()) 91 gic_cpu_init(0, gic_cpu_base_addr);
92 gic_cpu_init(0, __io_address(REALVIEW_EB11MP_GIC_CPU_BASE));
93 else if (machine_is_realview_pb11mp())
94 gic_cpu_init(0, __io_address(REALVIEW_TC11MP_GIC_CPU_BASE));
95 92
96 /* 93 /*
97 * let the primary processor know we're out of the 94 * let the primary processor know we're out of the
@@ -232,9 +229,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
232 * dummy (!CONFIG_LOCAL_TIMERS), it was already registers in 229 * dummy (!CONFIG_LOCAL_TIMERS), it was already registers in
233 * realview_timer_init 230 * realview_timer_init
234 */ 231 */
235 if ((machine_is_realview_eb() && core_tile_eb11mp()) || 232 local_timer_setup();
236 machine_is_realview_pb11mp())
237 local_timer_setup(cpu);
238#endif 233#endif
239 234
240 /* 235 /*
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index 3420e2e719e6..bed39ed97613 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -108,7 +108,7 @@ static struct map_desc realview_eb11mp_io_desc[] __initdata = {
108static void __init realview_eb_map_io(void) 108static void __init realview_eb_map_io(void)
109{ 109{
110 iotable_init(realview_eb_io_desc, ARRAY_SIZE(realview_eb_io_desc)); 110 iotable_init(realview_eb_io_desc, ARRAY_SIZE(realview_eb_io_desc));
111 if (core_tile_eb11mp()) 111 if (core_tile_eb11mp() || core_tile_a9mp())
112 iotable_init(realview_eb11mp_io_desc, ARRAY_SIZE(realview_eb11mp_io_desc)); 112 iotable_init(realview_eb11mp_io_desc, ARRAY_SIZE(realview_eb11mp_io_desc));
113} 113}
114 114
@@ -242,12 +242,6 @@ static struct resource realview_eb_eth_resources[] = {
242 }, 242 },
243}; 243};
244 244
245static struct platform_device realview_eb_eth_device = {
246 .id = 0,
247 .num_resources = ARRAY_SIZE(realview_eb_eth_resources),
248 .resource = realview_eb_eth_resources,
249};
250
251/* 245/*
252 * Detect and register the correct Ethernet device. RealView/EB rev D 246 * Detect and register the correct Ethernet device. RealView/EB rev D
253 * platforms use the newer SMSC LAN9118 Ethernet chip 247 * platforms use the newer SMSC LAN9118 Ethernet chip
@@ -255,26 +249,24 @@ static struct platform_device realview_eb_eth_device = {
255static int eth_device_register(void) 249static int eth_device_register(void)
256{ 250{
257 void __iomem *eth_addr = ioremap(REALVIEW_EB_ETH_BASE, SZ_4K); 251 void __iomem *eth_addr = ioremap(REALVIEW_EB_ETH_BASE, SZ_4K);
252 const char *name = NULL;
258 u32 idrev; 253 u32 idrev;
259 254
260 if (!eth_addr) 255 if (!eth_addr)
261 return -ENOMEM; 256 return -ENOMEM;
262 257
263 idrev = readl(eth_addr + 0x50); 258 idrev = readl(eth_addr + 0x50);
264 if ((idrev & 0xFFFF0000) == 0x01180000) 259 if ((idrev & 0xFFFF0000) != 0x01180000)
265 /* SMSC LAN9118 chip present */ 260 /* SMSC LAN9118 not present, use LAN91C111 instead */
266 realview_eb_eth_device.name = "smc911x"; 261 name = "smc91x";
267 else
268 /* SMSC 91C111 chip present */
269 realview_eb_eth_device.name = "smc91x";
270 262
271 iounmap(eth_addr); 263 iounmap(eth_addr);
272 return platform_device_register(&realview_eb_eth_device); 264 return realview_eth_register(name, realview_eb_eth_resources);
273} 265}
274 266
275static void __init gic_init_irq(void) 267static void __init gic_init_irq(void)
276{ 268{
277 if (core_tile_eb11mp()) { 269 if (core_tile_eb11mp() || core_tile_a9mp()) {
278 unsigned int pldctrl; 270 unsigned int pldctrl;
279 271
280 /* new irq mode */ 272 /* new irq mode */
@@ -342,10 +334,9 @@ static void __init realview_eb_timer_init(void)
342 timer2_va_base = __io_address(REALVIEW_EB_TIMER2_3_BASE); 334 timer2_va_base = __io_address(REALVIEW_EB_TIMER2_3_BASE);
343 timer3_va_base = __io_address(REALVIEW_EB_TIMER2_3_BASE) + 0x20; 335 timer3_va_base = __io_address(REALVIEW_EB_TIMER2_3_BASE) + 0x20;
344 336
345 if (core_tile_eb11mp()) { 337 if (core_tile_eb11mp() || core_tile_a9mp()) {
346#ifdef CONFIG_LOCAL_TIMERS 338#ifdef CONFIG_LOCAL_TIMERS
347 twd_base_addr = __io_address(REALVIEW_EB11MP_TWD_BASE); 339 twd_base = __io_address(REALVIEW_EB11MP_TWD_BASE);
348 twd_size = REALVIEW_EB11MP_TWD_SIZE;
349#endif 340#endif
350 timer_irq = IRQ_EB11MP_TIMER0_1; 341 timer_irq = IRQ_EB11MP_TIMER0_1;
351 } else 342 } else
@@ -362,7 +353,7 @@ static void __init realview_eb_init(void)
362{ 353{
363 int i; 354 int i;
364 355
365 if (core_tile_eb11mp()) { 356 if (core_tile_eb11mp() || core_tile_a9mp()) {
366 realview_eb11mp_fixup(); 357 realview_eb11mp_fixup();
367 358
368#ifdef CONFIG_CACHE_L2X0 359#ifdef CONFIG_CACHE_L2X0
@@ -390,7 +381,7 @@ MACHINE_START(REALVIEW_EB, "ARM-RealView EB")
390 /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ 381 /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
391 .phys_io = REALVIEW_EB_UART0_BASE, 382 .phys_io = REALVIEW_EB_UART0_BASE,
392 .io_pg_offst = (IO_ADDRESS(REALVIEW_EB_UART0_BASE) >> 18) & 0xfffc, 383 .io_pg_offst = (IO_ADDRESS(REALVIEW_EB_UART0_BASE) >> 18) & 0xfffc,
393 .boot_params = 0x00000100, 384 .boot_params = PHYS_OFFSET + 0x00000100,
394 .map_io = realview_eb_map_io, 385 .map_io = realview_eb_map_io,
395 .init_irq = gic_init_irq, 386 .init_irq = gic_init_irq,
396 .timer = &realview_eb_timer, 387 .timer = &realview_eb_timer,
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c
index 0481416d37c9..8f0683c22140 100644
--- a/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@ -222,13 +222,6 @@ static struct resource realview_pb1176_smsc911x_resources[] = {
222 }, 222 },
223}; 223};
224 224
225static struct platform_device realview_pb1176_smsc911x_device = {
226 .name = "smc911x",
227 .id = 0,
228 .num_resources = ARRAY_SIZE(realview_pb1176_smsc911x_resources),
229 .resource = realview_pb1176_smsc911x_resources,
230};
231
232static void __init gic_init_irq(void) 225static void __init gic_init_irq(void)
233{ 226{
234 /* ARM1176 DevChip GIC, primary */ 227 /* ARM1176 DevChip GIC, primary */
@@ -266,7 +259,7 @@ static void __init realview_pb1176_init(void)
266#endif 259#endif
267 260
268 realview_flash_register(&realview_pb1176_flash_resource, 1); 261 realview_flash_register(&realview_pb1176_flash_resource, 1);
269 platform_device_register(&realview_pb1176_smsc911x_device); 262 realview_eth_register(NULL, realview_pb1176_smsc911x_resources);
270 263
271 for (i = 0; i < ARRAY_SIZE(amba_devs); i++) { 264 for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
272 struct amba_device *d = amba_devs[i]; 265 struct amba_device *d = amba_devs[i];
@@ -282,7 +275,7 @@ MACHINE_START(REALVIEW_PB1176, "ARM-RealView PB1176")
282 /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ 275 /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
283 .phys_io = REALVIEW_PB1176_UART0_BASE, 276 .phys_io = REALVIEW_PB1176_UART0_BASE,
284 .io_pg_offst = (IO_ADDRESS(REALVIEW_PB1176_UART0_BASE) >> 18) & 0xfffc, 277 .io_pg_offst = (IO_ADDRESS(REALVIEW_PB1176_UART0_BASE) >> 18) & 0xfffc,
285 .boot_params = 0x00000100, 278 .boot_params = PHYS_OFFSET + 0x00000100,
286 .map_io = realview_pb1176_map_io, 279 .map_io = realview_pb1176_map_io,
287 .init_irq = gic_init_irq, 280 .init_irq = gic_init_irq,
288 .timer = &realview_pb1176_timer, 281 .timer = &realview_pb1176_timer,
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c
index 6197dd8e8edf..3ebdb2dadd6f 100644
--- a/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
@@ -230,13 +230,6 @@ static struct resource realview_pb11mp_smsc911x_resources[] = {
230 }, 230 },
231}; 231};
232 232
233static struct platform_device realview_pb11mp_smsc911x_device = {
234 .name = "smc911x",
235 .id = 0,
236 .num_resources = ARRAY_SIZE(realview_pb11mp_smsc911x_resources),
237 .resource = realview_pb11mp_smsc911x_resources,
238};
239
240struct resource realview_pb11mp_cf_resources[] = { 233struct resource realview_pb11mp_cf_resources[] = {
241 [0] = { 234 [0] = {
242 .start = REALVIEW_PB11MP_CF_BASE, 235 .start = REALVIEW_PB11MP_CF_BASE,
@@ -292,8 +285,7 @@ static void __init realview_pb11mp_timer_init(void)
292 timer3_va_base = __io_address(REALVIEW_PB11MP_TIMER2_3_BASE) + 0x20; 285 timer3_va_base = __io_address(REALVIEW_PB11MP_TIMER2_3_BASE) + 0x20;
293 286
294#ifdef CONFIG_LOCAL_TIMERS 287#ifdef CONFIG_LOCAL_TIMERS
295 twd_base_addr = __io_address(REALVIEW_TC11MP_TWD_BASE); 288 twd_base = __io_address(REALVIEW_TC11MP_TWD_BASE);
296 twd_size = REALVIEW_TC11MP_TWD_SIZE;
297#endif 289#endif
298 realview_timer_init(IRQ_TC11MP_TIMER0_1); 290 realview_timer_init(IRQ_TC11MP_TIMER0_1);
299} 291}
@@ -314,7 +306,7 @@ static void __init realview_pb11mp_init(void)
314 306
315 realview_flash_register(realview_pb11mp_flash_resource, 307 realview_flash_register(realview_pb11mp_flash_resource,
316 ARRAY_SIZE(realview_pb11mp_flash_resource)); 308 ARRAY_SIZE(realview_pb11mp_flash_resource));
317 platform_device_register(&realview_pb11mp_smsc911x_device); 309 realview_eth_register(NULL, realview_pb11mp_smsc911x_resources);
318 platform_device_register(&realview_i2c_device); 310 platform_device_register(&realview_i2c_device);
319 platform_device_register(&realview_pb11mp_cf_device); 311 platform_device_register(&realview_pb11mp_cf_device);
320 312
@@ -332,7 +324,7 @@ MACHINE_START(REALVIEW_PB11MP, "ARM-RealView PB11MPCore")
332 /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ 324 /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
333 .phys_io = REALVIEW_PB11MP_UART0_BASE, 325 .phys_io = REALVIEW_PB11MP_UART0_BASE,
334 .io_pg_offst = (IO_ADDRESS(REALVIEW_PB11MP_UART0_BASE) >> 18) & 0xfffc, 326 .io_pg_offst = (IO_ADDRESS(REALVIEW_PB11MP_UART0_BASE) >> 18) & 0xfffc,
335 .boot_params = 0x00000100, 327 .boot_params = PHYS_OFFSET + 0x00000100,
336 .map_io = realview_pb11mp_map_io, 328 .map_io = realview_pb11mp_map_io,
337 .init_irq = gic_init_irq, 329 .init_irq = gic_init_irq,
338 .timer = &realview_pb11mp_timer, 330 .timer = &realview_pb11mp_timer,
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c
new file mode 100644
index 000000000000..34c94435d2d8
--- /dev/null
+++ b/arch/arm/mach-realview/realview_pba8.c
@@ -0,0 +1,300 @@
1/*
2 * linux/arch/arm/mach-realview/realview_pba8.c
3 *
4 * Copyright (C) 2008 ARM Limited
5 * Copyright (C) 2000 Deep Blue Solutions Ltd
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or
10 * (at your option) any later version.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details.
16 *
17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20 */
21
22#include <linux/init.h>
23#include <linux/platform_device.h>
24#include <linux/sysdev.h>
25#include <linux/amba/bus.h>
26#include <linux/io.h>
27
28#include <asm/irq.h>
29#include <asm/leds.h>
30#include <asm/mach-types.h>
31#include <asm/hardware/gic.h>
32#include <asm/hardware/icst307.h>
33
34#include <asm/mach/arch.h>
35#include <asm/mach/map.h>
36#include <asm/mach/mmc.h>
37#include <asm/mach/time.h>
38
39#include <mach/hardware.h>
40#include <mach/board-pba8.h>
41#include <mach/irqs.h>
42
43#include "core.h"
44#include "clock.h"
45
46static struct map_desc realview_pba8_io_desc[] __initdata = {
47 {
48 .virtual = IO_ADDRESS(REALVIEW_SYS_BASE),
49 .pfn = __phys_to_pfn(REALVIEW_SYS_BASE),
50 .length = SZ_4K,
51 .type = MT_DEVICE,
52 }, {
53 .virtual = IO_ADDRESS(REALVIEW_PBA8_GIC_CPU_BASE),
54 .pfn = __phys_to_pfn(REALVIEW_PBA8_GIC_CPU_BASE),
55 .length = SZ_4K,
56 .type = MT_DEVICE,
57 }, {
58 .virtual = IO_ADDRESS(REALVIEW_PBA8_GIC_DIST_BASE),
59 .pfn = __phys_to_pfn(REALVIEW_PBA8_GIC_DIST_BASE),
60 .length = SZ_4K,
61 .type = MT_DEVICE,
62 }, {
63 .virtual = IO_ADDRESS(REALVIEW_SCTL_BASE),
64 .pfn = __phys_to_pfn(REALVIEW_SCTL_BASE),
65 .length = SZ_4K,
66 .type = MT_DEVICE,
67 }, {
68 .virtual = IO_ADDRESS(REALVIEW_PBA8_TIMER0_1_BASE),
69 .pfn = __phys_to_pfn(REALVIEW_PBA8_TIMER0_1_BASE),
70 .length = SZ_4K,
71 .type = MT_DEVICE,
72 }, {
73 .virtual = IO_ADDRESS(REALVIEW_PBA8_TIMER2_3_BASE),
74 .pfn = __phys_to_pfn(REALVIEW_PBA8_TIMER2_3_BASE),
75 .length = SZ_4K,
76 .type = MT_DEVICE,
77 },
78#ifdef CONFIG_PCI
79 {
80 .virtual = PCIX_UNIT_BASE,
81 .pfn = __phys_to_pfn(REALVIEW_PBA8_PCI_BASE),
82 .length = REALVIEW_PBA8_PCI_BASE_SIZE,
83 .type = MT_DEVICE
84 },
85#endif
86#ifdef CONFIG_DEBUG_LL
87 {
88 .virtual = IO_ADDRESS(REALVIEW_PBA8_UART0_BASE),
89 .pfn = __phys_to_pfn(REALVIEW_PBA8_UART0_BASE),
90 .length = SZ_4K,
91 .type = MT_DEVICE,
92 },
93#endif
94};
95
96static void __init realview_pba8_map_io(void)
97{
98 iotable_init(realview_pba8_io_desc, ARRAY_SIZE(realview_pba8_io_desc));
99}
100
101/*
102 * RealView PBA8Core AMBA devices
103 */
104
105#define GPIO2_IRQ { IRQ_PBA8_GPIO2, NO_IRQ }
106#define GPIO2_DMA { 0, 0 }
107#define GPIO3_IRQ { IRQ_PBA8_GPIO3, NO_IRQ }
108#define GPIO3_DMA { 0, 0 }
109#define AACI_IRQ { IRQ_PBA8_AACI, NO_IRQ }
110#define AACI_DMA { 0x80, 0x81 }
111#define MMCI0_IRQ { IRQ_PBA8_MMCI0A, IRQ_PBA8_MMCI0B }
112#define MMCI0_DMA { 0x84, 0 }
113#define KMI0_IRQ { IRQ_PBA8_KMI0, NO_IRQ }
114#define KMI0_DMA { 0, 0 }
115#define KMI1_IRQ { IRQ_PBA8_KMI1, NO_IRQ }
116#define KMI1_DMA { 0, 0 }
117#define PBA8_SMC_IRQ { NO_IRQ, NO_IRQ }
118#define PBA8_SMC_DMA { 0, 0 }
119#define MPMC_IRQ { NO_IRQ, NO_IRQ }
120#define MPMC_DMA { 0, 0 }
121#define PBA8_CLCD_IRQ { IRQ_PBA8_CLCD, NO_IRQ }
122#define PBA8_CLCD_DMA { 0, 0 }
123#define DMAC_IRQ { IRQ_PBA8_DMAC, NO_IRQ }
124#define DMAC_DMA { 0, 0 }
125#define SCTL_IRQ { NO_IRQ, NO_IRQ }
126#define SCTL_DMA { 0, 0 }
127#define PBA8_WATCHDOG_IRQ { IRQ_PBA8_WATCHDOG, NO_IRQ }
128#define PBA8_WATCHDOG_DMA { 0, 0 }
129#define PBA8_GPIO0_IRQ { IRQ_PBA8_GPIO0, NO_IRQ }
130#define PBA8_GPIO0_DMA { 0, 0 }
131#define GPIO1_IRQ { IRQ_PBA8_GPIO1, NO_IRQ }
132#define GPIO1_DMA { 0, 0 }
133#define PBA8_RTC_IRQ { IRQ_PBA8_RTC, NO_IRQ }
134#define PBA8_RTC_DMA { 0, 0 }
135#define SCI_IRQ { IRQ_PBA8_SCI, NO_IRQ }
136#define SCI_DMA { 7, 6 }
137#define PBA8_UART0_IRQ { IRQ_PBA8_UART0, NO_IRQ }
138#define PBA8_UART0_DMA { 15, 14 }
139#define PBA8_UART1_IRQ { IRQ_PBA8_UART1, NO_IRQ }
140#define PBA8_UART1_DMA { 13, 12 }
141#define PBA8_UART2_IRQ { IRQ_PBA8_UART2, NO_IRQ }
142#define PBA8_UART2_DMA { 11, 10 }
143#define PBA8_UART3_IRQ { IRQ_PBA8_UART3, NO_IRQ }
144#define PBA8_UART3_DMA { 0x86, 0x87 }
145#define PBA8_SSP_IRQ { IRQ_PBA8_SSP, NO_IRQ }
146#define PBA8_SSP_DMA { 9, 8 }
147
148/* FPGA Primecells */
149AMBA_DEVICE(aaci, "fpga:04", AACI, NULL);
150AMBA_DEVICE(mmc0, "fpga:05", MMCI0, &realview_mmc0_plat_data);
151AMBA_DEVICE(kmi0, "fpga:06", KMI0, NULL);
152AMBA_DEVICE(kmi1, "fpga:07", KMI1, NULL);
153AMBA_DEVICE(uart3, "fpga:09", PBA8_UART3, NULL);
154
155/* DevChip Primecells */
156AMBA_DEVICE(smc, "dev:00", PBA8_SMC, NULL);
157AMBA_DEVICE(sctl, "dev:e0", SCTL, NULL);
158AMBA_DEVICE(wdog, "dev:e1", PBA8_WATCHDOG, NULL);
159AMBA_DEVICE(gpio0, "dev:e4", PBA8_GPIO0, NULL);
160AMBA_DEVICE(gpio1, "dev:e5", GPIO1, NULL);
161AMBA_DEVICE(gpio2, "dev:e6", GPIO2, NULL);
162AMBA_DEVICE(rtc, "dev:e8", PBA8_RTC, NULL);
163AMBA_DEVICE(sci0, "dev:f0", SCI, NULL);
164AMBA_DEVICE(uart0, "dev:f1", PBA8_UART0, NULL);
165AMBA_DEVICE(uart1, "dev:f2", PBA8_UART1, NULL);
166AMBA_DEVICE(uart2, "dev:f3", PBA8_UART2, NULL);
167AMBA_DEVICE(ssp0, "dev:f4", PBA8_SSP, NULL);
168
169/* Primecells on the NEC ISSP chip */
170AMBA_DEVICE(clcd, "issp:20", PBA8_CLCD, &clcd_plat_data);
171AMBA_DEVICE(dmac, "issp:30", DMAC, NULL);
172
173static struct amba_device *amba_devs[] __initdata = {
174 &dmac_device,
175 &uart0_device,
176 &uart1_device,
177 &uart2_device,
178 &uart3_device,
179 &smc_device,
180 &clcd_device,
181 &sctl_device,
182 &wdog_device,
183 &gpio0_device,
184 &gpio1_device,
185 &gpio2_device,
186 &rtc_device,
187 &sci0_device,
188 &ssp0_device,
189 &aaci_device,
190 &mmc0_device,
191 &kmi0_device,
192 &kmi1_device,
193};
194
195/*
196 * RealView PB-A8 platform devices
197 */
198static struct resource realview_pba8_flash_resource[] = {
199 [0] = {
200 .start = REALVIEW_PBA8_FLASH0_BASE,
201 .end = REALVIEW_PBA8_FLASH0_BASE + REALVIEW_PBA8_FLASH0_SIZE - 1,
202 .flags = IORESOURCE_MEM,
203 },
204 [1] = {
205 .start = REALVIEW_PBA8_FLASH1_BASE,
206 .end = REALVIEW_PBA8_FLASH1_BASE + REALVIEW_PBA8_FLASH1_SIZE - 1,
207 .flags = IORESOURCE_MEM,
208 },
209};
210
211static struct resource realview_pba8_smsc911x_resources[] = {
212 [0] = {
213 .start = REALVIEW_PBA8_ETH_BASE,
214 .end = REALVIEW_PBA8_ETH_BASE + SZ_64K - 1,
215 .flags = IORESOURCE_MEM,
216 },
217 [1] = {
218 .start = IRQ_PBA8_ETH,
219 .end = IRQ_PBA8_ETH,
220 .flags = IORESOURCE_IRQ,
221 },
222};
223
224struct resource realview_pba8_cf_resources[] = {
225 [0] = {
226 .start = REALVIEW_PBA8_CF_BASE,
227 .end = REALVIEW_PBA8_CF_BASE + SZ_4K - 1,
228 .flags = IORESOURCE_MEM,
229 },
230 [1] = {
231 .start = REALVIEW_PBA8_CF_MEM_BASE,
232 .end = REALVIEW_PBA8_CF_MEM_BASE + SZ_4K - 1,
233 .flags = IORESOURCE_MEM,
234 },
235 [2] = {
236 .start = -1, /* FIXME: Find correct irq */
237 .end = -1,
238 .flags = IORESOURCE_IRQ,
239 },
240};
241
242struct platform_device realview_pba8_cf_device = {
243 .name = "compactflash",
244 .id = 0,
245 .num_resources = ARRAY_SIZE(realview_pba8_cf_resources),
246 .resource = realview_pba8_cf_resources,
247};
248
249static void __init gic_init_irq(void)
250{
251 /* ARM PB-A8 on-board GIC */
252 gic_cpu_base_addr = __io_address(REALVIEW_PBA8_GIC_CPU_BASE);
253 gic_dist_init(0, __io_address(REALVIEW_PBA8_GIC_DIST_BASE), IRQ_PBA8_GIC_START);
254 gic_cpu_init(0, __io_address(REALVIEW_PBA8_GIC_CPU_BASE));
255}
256
257static void __init realview_pba8_timer_init(void)
258{
259 timer0_va_base = __io_address(REALVIEW_PBA8_TIMER0_1_BASE);
260 timer1_va_base = __io_address(REALVIEW_PBA8_TIMER0_1_BASE) + 0x20;
261 timer2_va_base = __io_address(REALVIEW_PBA8_TIMER2_3_BASE);
262 timer3_va_base = __io_address(REALVIEW_PBA8_TIMER2_3_BASE) + 0x20;
263
264 realview_timer_init(IRQ_PBA8_TIMER0_1);
265}
266
267static struct sys_timer realview_pba8_timer = {
268 .init = realview_pba8_timer_init,
269};
270
271static void __init realview_pba8_init(void)
272{
273 int i;
274
275 realview_flash_register(realview_pba8_flash_resource,
276 ARRAY_SIZE(realview_pba8_flash_resource));
277 realview_eth_register(NULL, realview_pba8_smsc911x_resources);
278 platform_device_register(&realview_i2c_device);
279 platform_device_register(&realview_pba8_cf_device);
280
281 for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
282 struct amba_device *d = amba_devs[i];
283 amba_device_register(d, &iomem_resource);
284 }
285
286#ifdef CONFIG_LEDS
287 leds_event = realview_leds_event;
288#endif
289}
290
291MACHINE_START(REALVIEW_PBA8, "ARM-RealView PB-A8")
292 /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
293 .phys_io = REALVIEW_PBA8_UART0_BASE,
294 .io_pg_offst = (IO_ADDRESS(REALVIEW_PBA8_UART0_BASE) >> 18) & 0xfffc,
295 .boot_params = PHYS_OFFSET + 0x00000100,
296 .map_io = realview_pba8_map_io,
297 .init_irq = gic_init_irq,
298 .timer = &realview_pba8_timer,
299 .init_machine = realview_pba8_init,
300MACHINE_END
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index cf44de512830..d490f3773c01 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -704,7 +704,7 @@ config CACHE_FEROCEON_L2_WRITETHROUGH
704 704
705config CACHE_L2X0 705config CACHE_L2X0
706 bool "Enable the L2x0 outer cache controller" 706 bool "Enable the L2x0 outer cache controller"
707 depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 707 depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || REALVIEW_EB_A9MP
708 default y 708 default y
709 select OUTER_CACHE 709 select OUTER_CACHE
710 help 710 help
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-04 19:04:38 -0500