add preinit modularization work by Daniel Dickinson (cshore)
[openwrt.git] / target / linux / ppc40x / patches / 002-kilauea_halekala_ppc40x_simple.patch
1 --- a/arch/powerpc/configs/40x/kilauea_defconfig
2 +++ b/arch/powerpc/configs/40x/kilauea_defconfig
3 @@ -1,7 +1,7 @@
4 #
5 # Automatically generated make config: don't edit
6 -# Linux kernel version: 2.6.29-rc2
7 -# Tue Jan 20 08:17:52 2009
8 +# Linux kernel version: 2.6.30-rc7
9 +# Wed Jun 3 10:18:16 2009
10 #
11 # CONFIG_PPC64 is not set
12
13 @@ -27,6 +27,7 @@ CONFIG_GENERIC_TIME=y
14 CONFIG_GENERIC_TIME_VSYSCALL=y
15 CONFIG_GENERIC_CLOCKEVENTS=y
16 CONFIG_GENERIC_HARDIRQS=y
17 +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
18 # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
19 CONFIG_IRQ_PER_CPU=y
20 CONFIG_STACKTRACE_SUPPORT=y
21 @@ -49,10 +50,12 @@ CONFIG_PPC_UDBG_16550=y
22 # CONFIG_GENERIC_TBSYNC is not set
23 CONFIG_AUDIT_ARCH=y
24 CONFIG_GENERIC_BUG=y
25 +CONFIG_DTC=y
26 # CONFIG_DEFAULT_UIMAGE is not set
27 CONFIG_PPC_DCR_NATIVE=y
28 # CONFIG_PPC_DCR_MMIO is not set
29 CONFIG_PPC_DCR=y
30 +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
31 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
32
33 #
34 @@ -67,9 +70,19 @@ CONFIG_SWAP=y
35 CONFIG_SYSVIPC=y
36 CONFIG_SYSVIPC_SYSCTL=y
37 CONFIG_POSIX_MQUEUE=y
38 +CONFIG_POSIX_MQUEUE_SYSCTL=y
39 # CONFIG_BSD_PROCESS_ACCT is not set
40 # CONFIG_TASKSTATS is not set
41 # CONFIG_AUDIT is not set
42 +
43 +#
44 +# RCU Subsystem
45 +#
46 +CONFIG_CLASSIC_RCU=y
47 +# CONFIG_TREE_RCU is not set
48 +# CONFIG_PREEMPT_RCU is not set
49 +# CONFIG_TREE_RCU_TRACE is not set
50 +# CONFIG_PREEMPT_RCU_TRACE is not set
51 # CONFIG_IKCONFIG is not set
52 CONFIG_LOG_BUF_SHIFT=14
53 CONFIG_GROUP_SCHED=y
54 @@ -84,22 +97,24 @@ CONFIG_SYSFS_DEPRECATED_V2=y
55 # CONFIG_NAMESPACES is not set
56 CONFIG_BLK_DEV_INITRD=y
57 CONFIG_INITRAMFS_SOURCE=""
58 +CONFIG_RD_GZIP=y
59 +# CONFIG_RD_BZIP2 is not set
60 +# CONFIG_RD_LZMA is not set
61 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
62 CONFIG_SYSCTL=y
63 +CONFIG_ANON_INODES=y
64 CONFIG_EMBEDDED=y
65 CONFIG_SYSCTL_SYSCALL=y
66 CONFIG_KALLSYMS=y
67 CONFIG_KALLSYMS_ALL=y
68 -CONFIG_KALLSYMS_STRIP_GENERATED=y
69 CONFIG_KALLSYMS_EXTRA_PASS=y
70 +# CONFIG_STRIP_ASM_SYMS is not set
71 CONFIG_HOTPLUG=y
72 CONFIG_PRINTK=y
73 CONFIG_BUG=y
74 CONFIG_ELF_CORE=y
75 -CONFIG_COMPAT_BRK=y
76 CONFIG_BASE_FULL=y
77 CONFIG_FUTEX=y
78 -CONFIG_ANON_INODES=y
79 CONFIG_EPOLL=y
80 CONFIG_SIGNALFD=y
81 CONFIG_TIMERFD=y
82 @@ -109,10 +124,12 @@ CONFIG_AIO=y
83 CONFIG_VM_EVENT_COUNTERS=y
84 CONFIG_PCI_QUIRKS=y
85 CONFIG_SLUB_DEBUG=y
86 +CONFIG_COMPAT_BRK=y
87 # CONFIG_SLAB is not set
88 CONFIG_SLUB=y
89 # CONFIG_SLOB is not set
90 # CONFIG_PROFILING is not set
91 +# CONFIG_MARKERS is not set
92 CONFIG_HAVE_OPROFILE=y
93 # CONFIG_KPROBES is not set
94 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
95 @@ -120,6 +137,7 @@ CONFIG_HAVE_IOREMAP_PROT=y
96 CONFIG_HAVE_KPROBES=y
97 CONFIG_HAVE_KRETPROBES=y
98 CONFIG_HAVE_ARCH_TRACEHOOK=y
99 +# CONFIG_SLOW_WORK is not set
100 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
101 CONFIG_SLABINFO=y
102 CONFIG_RT_MUTEXES=y
103 @@ -132,7 +150,6 @@ CONFIG_MODULE_UNLOAD=y
104 # CONFIG_MODULE_SRCVERSION_ALL is not set
105 CONFIG_BLOCK=y
106 CONFIG_LBD=y
107 -# CONFIG_BLK_DEV_IO_TRACE is not set
108 # CONFIG_BLK_DEV_BSG is not set
109 # CONFIG_BLK_DEV_INTEGRITY is not set
110
111 @@ -148,11 +165,6 @@ CONFIG_DEFAULT_AS=y
112 # CONFIG_DEFAULT_CFQ is not set
113 # CONFIG_DEFAULT_NOOP is not set
114 CONFIG_DEFAULT_IOSCHED="anticipatory"
115 -CONFIG_CLASSIC_RCU=y
116 -# CONFIG_TREE_RCU is not set
117 -# CONFIG_PREEMPT_RCU is not set
118 -# CONFIG_TREE_RCU_TRACE is not set
119 -# CONFIG_PREEMPT_RCU_TRACE is not set
120 # CONFIG_FREEZER is not set
121 CONFIG_PPC4xx_PCI_EXPRESS=y
122
123 @@ -170,7 +182,7 @@ CONFIG_KILAUEA=y
124 # CONFIG_MAKALU is not set
125 # CONFIG_WALNUT is not set
126 # CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
127 -# CONFIG_PPC40x_SIMPLE is not set
128 +CONFIG_PPC40x_SIMPLE=y
129 CONFIG_405EX=y
130 # CONFIG_IPIC is not set
131 # CONFIG_MPIC is not set
132 @@ -228,9 +240,12 @@ CONFIG_ZONE_DMA_FLAG=1
133 CONFIG_BOUNCE=y
134 CONFIG_VIRT_TO_BUS=y
135 CONFIG_UNEVICTABLE_LRU=y
136 +CONFIG_HAVE_MLOCK=y
137 +CONFIG_HAVE_MLOCKED_PAGE_BIT=y
138 CONFIG_PPC_4K_PAGES=y
139 # CONFIG_PPC_16K_PAGES is not set
140 # CONFIG_PPC_64K_PAGES is not set
141 +# CONFIG_PPC_256K_PAGES is not set
142 CONFIG_FORCE_MAX_ZONEORDER=11
143 CONFIG_PROC_DEVICETREE=y
144 # CONFIG_CMDLINE_BOOL is not set
145 @@ -255,6 +270,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
146 CONFIG_PCI_LEGACY=y
147 # CONFIG_PCI_DEBUG is not set
148 # CONFIG_PCI_STUB is not set
149 +# CONFIG_PCI_IOV is not set
150 # CONFIG_PCCARD is not set
151 # CONFIG_HOTPLUG_PCI is not set
152 # CONFIG_HAS_RAPIDIO is not set
153 @@ -272,14 +288,12 @@ CONFIG_PAGE_OFFSET=0xc0000000
154 CONFIG_KERNEL_START=0xc0000000
155 CONFIG_PHYSICAL_START=0x00000000
156 CONFIG_TASK_SIZE=0xc0000000
157 -CONFIG_CONSISTENT_START=0xff100000
158 CONFIG_CONSISTENT_SIZE=0x00200000
159 CONFIG_NET=y
160
161 #
162 # Networking options
163 #
164 -CONFIG_COMPAT_NET_DEV_OPS=y
165 CONFIG_PACKET=y
166 # CONFIG_PACKET_MMAP is not set
167 CONFIG_UNIX=y
168 @@ -329,6 +343,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
169 # CONFIG_LAPB is not set
170 # CONFIG_ECONET is not set
171 # CONFIG_WAN_ROUTER is not set
172 +# CONFIG_PHONET is not set
173 # CONFIG_NET_SCHED is not set
174 # CONFIG_DCB is not set
175
176 @@ -341,7 +356,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
177 # CONFIG_IRDA is not set
178 # CONFIG_BT is not set
179 # CONFIG_AF_RXRPC is not set
180 -# CONFIG_PHONET is not set
181 # CONFIG_WIRELESS is not set
182 # CONFIG_WIMAX is not set
183 # CONFIG_RFKILL is not set
184 @@ -445,7 +459,6 @@ CONFIG_MTD_PHYSMAP_OF=y
185 # LPDDR flash memory drivers
186 #
187 # CONFIG_MTD_LPDDR is not set
188 -# CONFIG_MTD_QINFO_PROBE is not set
189
190 #
191 # UBI - Unsorted block images
192 @@ -498,6 +511,7 @@ CONFIG_HAVE_IDE=y
193 # CONFIG_I2O is not set
194 # CONFIG_MACINTOSH_DRIVERS is not set
195 CONFIG_NETDEVICES=y
196 +CONFIG_COMPAT_NET_DEV_OPS=y
197 # CONFIG_DUMMY is not set
198 # CONFIG_BONDING is not set
199 # CONFIG_MACVLAN is not set
200 @@ -512,6 +526,8 @@ CONFIG_NET_ETHERNET=y
201 # CONFIG_SUNGEM is not set
202 # CONFIG_CASSINI is not set
203 # CONFIG_NET_VENDOR_3COM is not set
204 +# CONFIG_ETHOC is not set
205 +# CONFIG_DNET is not set
206 # CONFIG_NET_TULIP is not set
207 # CONFIG_HP100 is not set
208 CONFIG_IBM_NEW_EMAC=y
209 @@ -540,7 +556,6 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y
210 #
211 # CONFIG_WLAN_PRE80211 is not set
212 # CONFIG_WLAN_80211 is not set
213 -# CONFIG_IWLWIFI_LEDS is not set
214
215 #
216 # Enable WiMAX (Networking options) to see the WiMAX drivers
217 @@ -678,6 +693,7 @@ CONFIG_SSB_POSSIBLE=y
218 # CONFIG_EDAC is not set
219 # CONFIG_RTC_CLASS is not set
220 # CONFIG_DMADEVICES is not set
221 +# CONFIG_AUXDISPLAY is not set
222 # CONFIG_UIO is not set
223 # CONFIG_STAGING is not set
224
225 @@ -706,6 +722,11 @@ CONFIG_INOTIFY_USER=y
226 # CONFIG_FUSE_FS is not set
227
228 #
229 +# Caches
230 +#
231 +# CONFIG_FSCACHE is not set
232 +
233 +#
234 # CD-ROM/DVD Filesystems
235 #
236 # CONFIG_ISO9660_FS is not set
237 @@ -749,6 +770,7 @@ CONFIG_CRAMFS=y
238 # CONFIG_ROMFS_FS is not set
239 # CONFIG_SYSV_FS is not set
240 # CONFIG_UFS_FS is not set
241 +# CONFIG_NILFS2_FS is not set
242 CONFIG_NETWORK_FILESYSTEMS=y
243 CONFIG_NFS_FS=y
244 CONFIG_NFS_V3=y
245 @@ -760,7 +782,6 @@ CONFIG_LOCKD=y
246 CONFIG_LOCKD_V4=y
247 CONFIG_NFS_COMMON=y
248 CONFIG_SUNRPC=y
249 -# CONFIG_SUNRPC_REGISTER_V4 is not set
250 # CONFIG_RPCSEC_GSS_KRB5 is not set
251 # CONFIG_RPCSEC_GSS_SPKM3 is not set
252 # CONFIG_SMB_FS is not set
253 @@ -776,6 +797,7 @@ CONFIG_SUNRPC=y
254 CONFIG_MSDOS_PARTITION=y
255 # CONFIG_NLS is not set
256 # CONFIG_DLM is not set
257 +# CONFIG_BINARY_PRINTF is not set
258
259 #
260 # Library routines
261 @@ -790,11 +812,12 @@ CONFIG_CRC32=y
262 # CONFIG_CRC7 is not set
263 # CONFIG_LIBCRC32C is not set
264 CONFIG_ZLIB_INFLATE=y
265 -CONFIG_PLIST=y
266 +CONFIG_DECOMPRESS_GZIP=y
267 CONFIG_HAS_IOMEM=y
268 CONFIG_HAS_IOPORT=y
269 CONFIG_HAS_DMA=y
270 CONFIG_HAVE_LMB=y
271 +CONFIG_NLATTR=y
272
273 #
274 # Kernel hacking
275 @@ -812,6 +835,9 @@ CONFIG_DEBUG_KERNEL=y
276 CONFIG_DETECT_SOFTLOCKUP=y
277 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
278 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
279 +CONFIG_DETECT_HUNG_TASK=y
280 +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
281 +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
282 CONFIG_SCHED_DEBUG=y
283 # CONFIG_SCHEDSTATS is not set
284 # CONFIG_TIMER_STATS is not set
285 @@ -841,9 +867,12 @@ CONFIG_DEBUG_BUGVERBOSE=y
286 # CONFIG_FAULT_INJECTION is not set
287 # CONFIG_LATENCYTOP is not set
288 CONFIG_SYSCTL_SYSCALL_CHECK=y
289 +# CONFIG_DEBUG_PAGEALLOC is not set
290 CONFIG_HAVE_FUNCTION_TRACER=y
291 +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
292 CONFIG_HAVE_DYNAMIC_FTRACE=y
293 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
294 +CONFIG_TRACING_SUPPORT=y
295
296 #
297 # Tracers
298 @@ -851,17 +880,21 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
299 # CONFIG_FUNCTION_TRACER is not set
300 # CONFIG_SCHED_TRACER is not set
301 # CONFIG_CONTEXT_SWITCH_TRACER is not set
302 +# CONFIG_EVENT_TRACER is not set
303 # CONFIG_BOOT_TRACER is not set
304 # CONFIG_TRACE_BRANCH_PROFILING is not set
305 # CONFIG_STACK_TRACER is not set
306 -# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
307 +# CONFIG_KMEMTRACE is not set
308 +# CONFIG_WORKQUEUE_TRACER is not set
309 +# CONFIG_BLK_DEV_IO_TRACE is not set
310 +# CONFIG_DYNAMIC_DEBUG is not set
311 # CONFIG_SAMPLES is not set
312 CONFIG_HAVE_ARCH_KGDB=y
313 # CONFIG_KGDB is not set
314 CONFIG_PRINT_STACK_DEPTH=64
315 # CONFIG_DEBUG_STACKOVERFLOW is not set
316 # CONFIG_DEBUG_STACK_USAGE is not set
317 -# CONFIG_DEBUG_PAGEALLOC is not set
318 +# CONFIG_PPC_EMULATED_STATS is not set
319 # CONFIG_CODE_PATCHING_SELFTEST is not set
320 # CONFIG_FTR_FIXUP_SELFTEST is not set
321 # CONFIG_MSI_BITMAP_SELFTEST is not set
322 @@ -892,10 +925,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y
323 CONFIG_CRYPTO_HASH=y
324 CONFIG_CRYPTO_HASH2=y
325 CONFIG_CRYPTO_RNG2=y
326 +CONFIG_CRYPTO_PCOMP=y
327 CONFIG_CRYPTO_MANAGER=y
328 CONFIG_CRYPTO_MANAGER2=y
329 # CONFIG_CRYPTO_GF128MUL is not set
330 # CONFIG_CRYPTO_NULL is not set
331 +CONFIG_CRYPTO_WORKQUEUE=y
332 # CONFIG_CRYPTO_CRYPTD is not set
333 # CONFIG_CRYPTO_AUTHENC is not set
334 # CONFIG_CRYPTO_TEST is not set
335 @@ -964,6 +999,7 @@ CONFIG_CRYPTO_DES=y
336 # Compression
337 #
338 # CONFIG_CRYPTO_DEFLATE is not set
339 +# CONFIG_CRYPTO_ZLIB is not set
340 # CONFIG_CRYPTO_LZO is not set
341
342 #
343 @@ -972,5 +1008,6 @@ CONFIG_CRYPTO_DES=y
344 # CONFIG_CRYPTO_ANSI_CPRNG is not set
345 CONFIG_CRYPTO_HW=y
346 # CONFIG_CRYPTO_DEV_HIFN_795X is not set
347 +# CONFIG_CRYPTO_DEV_PPC4XX is not set
348 # CONFIG_PPC_CLOCK is not set
349 # CONFIG_VIRTUALIZATION is not set
350 --- a/arch/powerpc/platforms/40x/Kconfig
351 +++ b/arch/powerpc/platforms/40x/Kconfig
352 @@ -45,6 +45,7 @@ config KILAUEA
353 depends on 40x
354 default n
355 select 405EX
356 + select PPC40x_SIMPLE
357 select PPC4xx_PCI_EXPRESS
358 help
359 This option enables support for the AMCC PPC405EX evaluation board.
360 --- a/arch/powerpc/platforms/40x/Makefile
361 +++ b/arch/powerpc/platforms/40x/Makefile
362 @@ -1,4 +1,3 @@
363 -obj-$(CONFIG_KILAUEA) += kilauea.o
364 obj-$(CONFIG_HCU4) += hcu4.o
365 obj-$(CONFIG_WALNUT) += walnut.o
366 obj-$(CONFIG_XILINX_VIRTEX_GENERIC_BOARD) += virtex.o
367 --- a/arch/powerpc/platforms/40x/kilauea.c
368 +++ /dev/null
369 @@ -1,60 +0,0 @@
370 -/*
371 - * Kilauea board specific routines
372 - *
373 - * Copyright 2007-2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
374 - *
375 - * Based on the Walnut code by
376 - * Josh Boyer <jwboyer@linux.vnet.ibm.com>
377 - * Copyright 2007 IBM Corporation
378 - *
379 - * This program is free software; you can redistribute it and/or modify it
380 - * under the terms of the GNU General Public License as published by the
381 - * Free Software Foundation; either version 2 of the License, or (at your
382 - * option) any later version.
383 - */
384 -#include <linux/init.h>
385 -#include <linux/of_platform.h>
386 -#include <asm/machdep.h>
387 -#include <asm/prom.h>
388 -#include <asm/udbg.h>
389 -#include <asm/time.h>
390 -#include <asm/uic.h>
391 -#include <asm/pci-bridge.h>
392 -#include <asm/ppc4xx.h>
393 -
394 -static __initdata struct of_device_id kilauea_of_bus[] = {
395 - { .compatible = "ibm,plb4", },
396 - { .compatible = "ibm,opb", },
397 - { .compatible = "ibm,ebc", },
398 - {},
399 -};
400 -
401 -static int __init kilauea_device_probe(void)
402 -{
403 - of_platform_bus_probe(NULL, kilauea_of_bus, NULL);
404 -
405 - return 0;
406 -}
407 -machine_device_initcall(kilauea, kilauea_device_probe);
408 -
409 -static int __init kilauea_probe(void)
410 -{
411 - unsigned long root = of_get_flat_dt_root();
412 -
413 - if (!of_flat_dt_is_compatible(root, "amcc,kilauea"))
414 - return 0;
415 -
416 - ppc_pci_set_flags(PPC_PCI_REASSIGN_ALL_RSRC);
417 -
418 - return 1;
419 -}
420 -
421 -define_machine(kilauea) {
422 - .name = "Kilauea",
423 - .probe = kilauea_probe,
424 - .progress = udbg_progress,
425 - .init_IRQ = uic_init_tree,
426 - .get_irq = uic_get_irq,
427 - .restart = ppc4xx_reset_system,
428 - .calibrate_decr = generic_calibrate_decr,
429 -};
430 --- a/arch/powerpc/platforms/40x/ppc40x_simple.c
431 +++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
432 @@ -52,6 +52,8 @@ machine_device_initcall(ppc40x_simple, p
433 */
434 static char *board[] __initdata = {
435 "amcc,acadia",
436 + "amcc,haleakala",
437 + "amcc,kilauea",
438 "amcc,makalu"
439 };
440
This page took 0.065811 seconds and 5 git commands to generate.