diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-28 01:03:19 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 01:03:19 -0500 |
commit | cf66c897d7fa07f57452b1a369aec37d97b11e31 (patch) | |
tree | eb74b71c2ff288f4d77423bb7e54c3c55ef08bf9 /arch | |
parent | facee873de8da5fe709c194f98eb0f2cc642a38c (diff) | |
parent | 78af90629ce98c8383ea16928e110eb97b889be6 (diff) |
Merge branch '85xx' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/Kconfig.debug | 5 | ||||
-rw-r--r-- | arch/powerpc/Makefile | 6 | ||||
-rw-r--r-- | arch/powerpc/configs/mpc8540_ads_defconfig | 43 | ||||
-rw-r--r-- | arch/powerpc/kernel/setup_32.c | 6 | ||||
-rw-r--r-- | arch/powerpc/math-emu/Makefile (renamed from arch/ppc/math-emu/Makefile) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/double.h (renamed from arch/ppc/math-emu/double.h) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fabs.c (renamed from arch/ppc/math-emu/fabs.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fadd.c (renamed from arch/ppc/math-emu/fadd.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fadds.c (renamed from arch/ppc/math-emu/fadds.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fcmpo.c (renamed from arch/ppc/math-emu/fcmpo.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fcmpu.c (renamed from arch/ppc/math-emu/fcmpu.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fctiw.c (renamed from arch/ppc/math-emu/fctiw.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fctiwz.c (renamed from arch/ppc/math-emu/fctiwz.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fdiv.c (renamed from arch/ppc/math-emu/fdiv.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fdivs.c (renamed from arch/ppc/math-emu/fdivs.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fmadd.c (renamed from arch/ppc/math-emu/fmadd.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fmadds.c (renamed from arch/ppc/math-emu/fmadds.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fmr.c (renamed from arch/ppc/math-emu/fmr.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fmsub.c (renamed from arch/ppc/math-emu/fmsub.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fmsubs.c (renamed from arch/ppc/math-emu/fmsubs.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fmul.c (renamed from arch/ppc/math-emu/fmul.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fmuls.c (renamed from arch/ppc/math-emu/fmuls.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fnabs.c (renamed from arch/ppc/math-emu/fnabs.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fneg.c (renamed from arch/ppc/math-emu/fneg.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fnmadd.c (renamed from arch/ppc/math-emu/fnmadd.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fnmadds.c (renamed from arch/ppc/math-emu/fnmadds.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fnmsub.c (renamed from arch/ppc/math-emu/fnmsub.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fnmsubs.c (renamed from arch/ppc/math-emu/fnmsubs.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fres.c (renamed from arch/ppc/math-emu/fres.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/frsp.c (renamed from arch/ppc/math-emu/frsp.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/frsqrte.c (renamed from arch/ppc/math-emu/frsqrte.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fsel.c (renamed from arch/ppc/math-emu/fsel.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fsqrt.c (renamed from arch/ppc/math-emu/fsqrt.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fsqrts.c (renamed from arch/ppc/math-emu/fsqrts.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fsub.c (renamed from arch/ppc/math-emu/fsub.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/fsubs.c (renamed from arch/ppc/math-emu/fsubs.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/lfd.c (renamed from arch/ppc/math-emu/lfd.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/lfs.c (renamed from arch/ppc/math-emu/lfs.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/math.c (renamed from arch/ppc/math-emu/math.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/mcrfs.c (renamed from arch/ppc/math-emu/mcrfs.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/mffs.c (renamed from arch/ppc/math-emu/mffs.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/mtfsb0.c (renamed from arch/ppc/math-emu/mtfsb0.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/mtfsb1.c (renamed from arch/ppc/math-emu/mtfsb1.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/mtfsf.c (renamed from arch/ppc/math-emu/mtfsf.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/mtfsfi.c (renamed from arch/ppc/math-emu/mtfsfi.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/op-1.h (renamed from arch/ppc/math-emu/op-1.h) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/op-2.h (renamed from arch/ppc/math-emu/op-2.h) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/op-4.h (renamed from arch/ppc/math-emu/op-4.h) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/op-common.h (renamed from arch/ppc/math-emu/op-common.h) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/sfp-machine.h (renamed from arch/ppc/math-emu/sfp-machine.h) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/single.h (renamed from arch/ppc/math-emu/single.h) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/soft-fp.h (renamed from arch/ppc/math-emu/soft-fp.h) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/stfd.c (renamed from arch/ppc/math-emu/stfd.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/stfiwx.c (renamed from arch/ppc/math-emu/stfiwx.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/stfs.c (renamed from arch/ppc/math-emu/stfs.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/types.c (renamed from arch/ppc/math-emu/types.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/math-emu/udivmodti4.c (renamed from arch/ppc/math-emu/udivmodti4.c) | 0 | ||||
-rw-r--r-- | arch/powerpc/platforms/85xx/Kconfig | 1 | ||||
-rw-r--r-- | arch/ppc/Makefile | 2 |
59 files changed, 28 insertions, 35 deletions
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug index 9254806f7032..8d48e9e7162a 100644 --- a/arch/powerpc/Kconfig.debug +++ b/arch/powerpc/Kconfig.debug | |||
@@ -110,11 +110,6 @@ config SERIAL_TEXT_DEBUG | |||
110 | depends on 4xx || LOPEC || MV64X60 || PPLUS || PRPMC800 || \ | 110 | depends on 4xx || LOPEC || MV64X60 || PPLUS || PRPMC800 || \ |
111 | PPC_GEN550 || PPC_MPC52xx | 111 | PPC_GEN550 || PPC_MPC52xx |
112 | 112 | ||
113 | config PPC_OCP | ||
114 | bool | ||
115 | depends on IBM_OCP || XILINX_OCP | ||
116 | default y | ||
117 | |||
118 | choice | 113 | choice |
119 | prompt "Early debugging (dangerous)" | 114 | prompt "Early debugging (dangerous)" |
120 | bool | 115 | bool |
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 9586899de68a..6ec84d37a337 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile | |||
@@ -129,12 +129,8 @@ core-y += arch/powerpc/kernel/ \ | |||
129 | arch/powerpc/lib/ \ | 129 | arch/powerpc/lib/ \ |
130 | arch/powerpc/sysdev/ \ | 130 | arch/powerpc/sysdev/ \ |
131 | arch/powerpc/platforms/ | 131 | arch/powerpc/platforms/ |
132 | core-$(CONFIG_MATH_EMULATION) += arch/ppc/math-emu/ | 132 | core-$(CONFIG_MATH_EMULATION) += arch/powerpc/math-emu/ |
133 | core-$(CONFIG_XMON) += arch/powerpc/xmon/ | 133 | core-$(CONFIG_XMON) += arch/powerpc/xmon/ |
134 | core-$(CONFIG_APUS) += arch/ppc/amiga/ | ||
135 | drivers-$(CONFIG_8xx) += arch/ppc/8xx_io/ | ||
136 | drivers-$(CONFIG_4xx) += arch/ppc/4xx_io/ | ||
137 | drivers-$(CONFIG_CPM2) += arch/ppc/8260_io/ | ||
138 | 134 | ||
139 | drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/ | 135 | drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/ |
140 | 136 | ||
diff --git a/arch/powerpc/configs/mpc8540_ads_defconfig b/arch/powerpc/configs/mpc8540_ads_defconfig index 2a8290ee15c6..7f0780f1aa39 100644 --- a/arch/powerpc/configs/mpc8540_ads_defconfig +++ b/arch/powerpc/configs/mpc8540_ads_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: | 3 | # Linux kernel version: 2.6.16 |
4 | # Sat Jan 14 15:57:54 2006 | 4 | # Mon Mar 27 23:37:36 2006 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | CONFIG_PPC32=y | 7 | CONFIG_PPC32=y |
@@ -9,6 +9,7 @@ CONFIG_PPC_MERGE=y | |||
9 | CONFIG_MMU=y | 9 | CONFIG_MMU=y |
10 | CONFIG_GENERIC_HARDIRQS=y | 10 | CONFIG_GENERIC_HARDIRQS=y |
11 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 11 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
12 | CONFIG_GENERIC_HWEIGHT=y | ||
12 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 13 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
13 | CONFIG_PPC=y | 14 | CONFIG_PPC=y |
14 | CONFIG_EARLY_PRINTK=y | 15 | CONFIG_EARLY_PRINTK=y |
@@ -18,6 +19,7 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y | |||
18 | CONFIG_PPC_OF=y | 19 | CONFIG_PPC_OF=y |
19 | CONFIG_PPC_UDBG_16550=y | 20 | CONFIG_PPC_UDBG_16550=y |
20 | # CONFIG_GENERIC_TBSYNC is not set | 21 | # CONFIG_GENERIC_TBSYNC is not set |
22 | CONFIG_DEFAULT_UIMAGE=y | ||
21 | 23 | ||
22 | # | 24 | # |
23 | # Processor support | 25 | # Processor support |
@@ -42,7 +44,6 @@ CONFIG_SPE=y | |||
42 | # Code maturity level options | 44 | # Code maturity level options |
43 | # | 45 | # |
44 | CONFIG_EXPERIMENTAL=y | 46 | CONFIG_EXPERIMENTAL=y |
45 | CONFIG_CLEAN_COMPILE=y | ||
46 | CONFIG_BROKEN_ON_SMP=y | 47 | CONFIG_BROKEN_ON_SMP=y |
47 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 48 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
48 | 49 | ||
@@ -58,6 +59,7 @@ CONFIG_SYSVIPC=y | |||
58 | CONFIG_SYSCTL=y | 59 | CONFIG_SYSCTL=y |
59 | # CONFIG_AUDIT is not set | 60 | # CONFIG_AUDIT is not set |
60 | # CONFIG_IKCONFIG is not set | 61 | # CONFIG_IKCONFIG is not set |
62 | # CONFIG_RELAY is not set | ||
61 | CONFIG_INITRAMFS_SOURCE="" | 63 | CONFIG_INITRAMFS_SOURCE="" |
62 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 64 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
63 | CONFIG_EMBEDDED=y | 65 | CONFIG_EMBEDDED=y |
@@ -72,10 +74,6 @@ CONFIG_BASE_FULL=y | |||
72 | CONFIG_FUTEX=y | 74 | CONFIG_FUTEX=y |
73 | CONFIG_EPOLL=y | 75 | CONFIG_EPOLL=y |
74 | CONFIG_SHMEM=y | 76 | CONFIG_SHMEM=y |
75 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
76 | CONFIG_CC_ALIGN_LABELS=0 | ||
77 | CONFIG_CC_ALIGN_LOOPS=0 | ||
78 | CONFIG_CC_ALIGN_JUMPS=0 | ||
79 | CONFIG_SLAB=y | 77 | CONFIG_SLAB=y |
80 | # CONFIG_TINY_SHMEM is not set | 78 | # CONFIG_TINY_SHMEM is not set |
81 | CONFIG_BASE_SMALL=0 | 79 | CONFIG_BASE_SMALL=0 |
@@ -90,6 +88,8 @@ CONFIG_BASE_SMALL=0 | |||
90 | # Block layer | 88 | # Block layer |
91 | # | 89 | # |
92 | # CONFIG_LBD is not set | 90 | # CONFIG_LBD is not set |
91 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
92 | # CONFIG_LSF is not set | ||
93 | 93 | ||
94 | # | 94 | # |
95 | # IO Schedulers | 95 | # IO Schedulers |
@@ -183,6 +183,7 @@ CONFIG_NET=y | |||
183 | # | 183 | # |
184 | # Networking options | 184 | # Networking options |
185 | # | 185 | # |
186 | # CONFIG_NETDEBUG is not set | ||
186 | CONFIG_PACKET=y | 187 | CONFIG_PACKET=y |
187 | # CONFIG_PACKET_MMAP is not set | 188 | # CONFIG_PACKET_MMAP is not set |
188 | CONFIG_UNIX=y | 189 | CONFIG_UNIX=y |
@@ -220,6 +221,11 @@ CONFIG_TCP_CONG_BIC=y | |||
220 | # SCTP Configuration (EXPERIMENTAL) | 221 | # SCTP Configuration (EXPERIMENTAL) |
221 | # | 222 | # |
222 | # CONFIG_IP_SCTP is not set | 223 | # CONFIG_IP_SCTP is not set |
224 | |||
225 | # | ||
226 | # TIPC Configuration (EXPERIMENTAL) | ||
227 | # | ||
228 | # CONFIG_TIPC is not set | ||
223 | # CONFIG_ATM is not set | 229 | # CONFIG_ATM is not set |
224 | # CONFIG_BRIDGE is not set | 230 | # CONFIG_BRIDGE is not set |
225 | # CONFIG_VLAN_8021Q is not set | 231 | # CONFIG_VLAN_8021Q is not set |
@@ -229,11 +235,6 @@ CONFIG_TCP_CONG_BIC=y | |||
229 | # CONFIG_ATALK is not set | 235 | # CONFIG_ATALK is not set |
230 | # CONFIG_X25 is not set | 236 | # CONFIG_X25 is not set |
231 | # CONFIG_LAPB is not set | 237 | # CONFIG_LAPB is not set |
232 | |||
233 | # | ||
234 | # TIPC Configuration (EXPERIMENTAL) | ||
235 | # | ||
236 | # CONFIG_TIPC is not set | ||
237 | # CONFIG_NET_DIVERT is not set | 238 | # CONFIG_NET_DIVERT is not set |
238 | # CONFIG_ECONET is not set | 239 | # CONFIG_ECONET is not set |
239 | # CONFIG_WAN_ROUTER is not set | 240 | # CONFIG_WAN_ROUTER is not set |
@@ -487,6 +488,12 @@ CONFIG_GEN_RTC=y | |||
487 | # CONFIG_I2C is not set | 488 | # CONFIG_I2C is not set |
488 | 489 | ||
489 | # | 490 | # |
491 | # SPI support | ||
492 | # | ||
493 | # CONFIG_SPI is not set | ||
494 | # CONFIG_SPI_MASTER is not set | ||
495 | |||
496 | # | ||
490 | # Dallas's 1-wire bus | 497 | # Dallas's 1-wire bus |
491 | # | 498 | # |
492 | # CONFIG_W1 is not set | 499 | # CONFIG_W1 is not set |
@@ -496,6 +503,7 @@ CONFIG_GEN_RTC=y | |||
496 | # | 503 | # |
497 | CONFIG_HWMON=y | 504 | CONFIG_HWMON=y |
498 | # CONFIG_HWMON_VID is not set | 505 | # CONFIG_HWMON_VID is not set |
506 | # CONFIG_SENSORS_F71805F is not set | ||
499 | # CONFIG_HWMON_DEBUG_CHIP is not set | 507 | # CONFIG_HWMON_DEBUG_CHIP is not set |
500 | 508 | ||
501 | # | 509 | # |
@@ -503,10 +511,6 @@ CONFIG_HWMON=y | |||
503 | # | 511 | # |
504 | 512 | ||
505 | # | 513 | # |
506 | # Multimedia Capabilities Port drivers | ||
507 | # | ||
508 | |||
509 | # | ||
510 | # Multimedia devices | 514 | # Multimedia devices |
511 | # | 515 | # |
512 | # CONFIG_VIDEO_DEV is not set | 516 | # CONFIG_VIDEO_DEV is not set |
@@ -531,6 +535,7 @@ CONFIG_HWMON=y | |||
531 | # | 535 | # |
532 | # CONFIG_USB_ARCH_HAS_HCD is not set | 536 | # CONFIG_USB_ARCH_HAS_HCD is not set |
533 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 537 | # CONFIG_USB_ARCH_HAS_OHCI is not set |
538 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
534 | 539 | ||
535 | # | 540 | # |
536 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 541 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -551,7 +556,7 @@ CONFIG_HWMON=y | |||
551 | # | 556 | # |
552 | 557 | ||
553 | # | 558 | # |
554 | # SN Devices | 559 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) |
555 | # | 560 | # |
556 | 561 | ||
557 | # | 562 | # |
@@ -603,7 +608,6 @@ CONFIG_SYSFS=y | |||
603 | CONFIG_TMPFS=y | 608 | CONFIG_TMPFS=y |
604 | # CONFIG_HUGETLB_PAGE is not set | 609 | # CONFIG_HUGETLB_PAGE is not set |
605 | CONFIG_RAMFS=y | 610 | CONFIG_RAMFS=y |
606 | # CONFIG_RELAYFS_FS is not set | ||
607 | # CONFIG_CONFIGFS_FS is not set | 611 | # CONFIG_CONFIGFS_FS is not set |
608 | 612 | ||
609 | # | 613 | # |
@@ -658,6 +662,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
658 | # CONFIG_SGI_PARTITION is not set | 662 | # CONFIG_SGI_PARTITION is not set |
659 | # CONFIG_ULTRIX_PARTITION is not set | 663 | # CONFIG_ULTRIX_PARTITION is not set |
660 | # CONFIG_SUN_PARTITION is not set | 664 | # CONFIG_SUN_PARTITION is not set |
665 | # CONFIG_KARMA_PARTITION is not set | ||
661 | # CONFIG_EFI_PARTITION is not set | 666 | # CONFIG_EFI_PARTITION is not set |
662 | 667 | ||
663 | # | 668 | # |
@@ -695,6 +700,8 @@ CONFIG_DEBUG_MUTEXES=y | |||
695 | # CONFIG_DEBUG_INFO is not set | 700 | # CONFIG_DEBUG_INFO is not set |
696 | # CONFIG_DEBUG_FS is not set | 701 | # CONFIG_DEBUG_FS is not set |
697 | # CONFIG_DEBUG_VM is not set | 702 | # CONFIG_DEBUG_VM is not set |
703 | # CONFIG_UNWIND_INFO is not set | ||
704 | CONFIG_FORCED_INLINING=y | ||
698 | # CONFIG_RCU_TORTURE_TEST is not set | 705 | # CONFIG_RCU_TORTURE_TEST is not set |
699 | # CONFIG_DEBUGGER is not set | 706 | # CONFIG_DEBUGGER is not set |
700 | # CONFIG_BDI_SWITCH is not set | 707 | # CONFIG_BDI_SWITCH is not set |
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index e39f830317a8..a2c89435abec 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c | |||
@@ -351,12 +351,6 @@ void __init setup_arch(char **cmdline_p) | |||
351 | do_init_bootmem(); | 351 | do_init_bootmem(); |
352 | if ( ppc_md.progress ) ppc_md.progress("setup_arch: bootmem", 0x3eab); | 352 | if ( ppc_md.progress ) ppc_md.progress("setup_arch: bootmem", 0x3eab); |
353 | 353 | ||
354 | #ifdef CONFIG_PPC_OCP | ||
355 | /* Initialize OCP device list */ | ||
356 | ocp_early_init(); | ||
357 | if ( ppc_md.progress ) ppc_md.progress("ocp: exit", 0x3eab); | ||
358 | #endif | ||
359 | |||
360 | #ifdef CONFIG_DUMMY_CONSOLE | 354 | #ifdef CONFIG_DUMMY_CONSOLE |
361 | conswitchp = &dummy_con; | 355 | conswitchp = &dummy_con; |
362 | #endif | 356 | #endif |
diff --git a/arch/ppc/math-emu/Makefile b/arch/powerpc/math-emu/Makefile index 754143e8936b..754143e8936b 100644 --- a/arch/ppc/math-emu/Makefile +++ b/arch/powerpc/math-emu/Makefile | |||
diff --git a/arch/ppc/math-emu/double.h b/arch/powerpc/math-emu/double.h index ffba8b67f059..ffba8b67f059 100644 --- a/arch/ppc/math-emu/double.h +++ b/arch/powerpc/math-emu/double.h | |||
diff --git a/arch/ppc/math-emu/fabs.c b/arch/powerpc/math-emu/fabs.c index 41f0617f3d3a..41f0617f3d3a 100644 --- a/arch/ppc/math-emu/fabs.c +++ b/arch/powerpc/math-emu/fabs.c | |||
diff --git a/arch/ppc/math-emu/fadd.c b/arch/powerpc/math-emu/fadd.c index fc8836488b64..fc8836488b64 100644 --- a/arch/ppc/math-emu/fadd.c +++ b/arch/powerpc/math-emu/fadd.c | |||
diff --git a/arch/ppc/math-emu/fadds.c b/arch/powerpc/math-emu/fadds.c index 93025b6c8f3c..93025b6c8f3c 100644 --- a/arch/ppc/math-emu/fadds.c +++ b/arch/powerpc/math-emu/fadds.c | |||
diff --git a/arch/ppc/math-emu/fcmpo.c b/arch/powerpc/math-emu/fcmpo.c index 4efac394b4cb..4efac394b4cb 100644 --- a/arch/ppc/math-emu/fcmpo.c +++ b/arch/powerpc/math-emu/fcmpo.c | |||
diff --git a/arch/ppc/math-emu/fcmpu.c b/arch/powerpc/math-emu/fcmpu.c index b7e33176e618..b7e33176e618 100644 --- a/arch/ppc/math-emu/fcmpu.c +++ b/arch/powerpc/math-emu/fcmpu.c | |||
diff --git a/arch/ppc/math-emu/fctiw.c b/arch/powerpc/math-emu/fctiw.c index 3b3c98b840cf..3b3c98b840cf 100644 --- a/arch/ppc/math-emu/fctiw.c +++ b/arch/powerpc/math-emu/fctiw.c | |||
diff --git a/arch/ppc/math-emu/fctiwz.c b/arch/powerpc/math-emu/fctiwz.c index 7717eb6fcfb6..7717eb6fcfb6 100644 --- a/arch/ppc/math-emu/fctiwz.c +++ b/arch/powerpc/math-emu/fctiwz.c | |||
diff --git a/arch/ppc/math-emu/fdiv.c b/arch/powerpc/math-emu/fdiv.c index f2fba825b2d0..f2fba825b2d0 100644 --- a/arch/ppc/math-emu/fdiv.c +++ b/arch/powerpc/math-emu/fdiv.c | |||
diff --git a/arch/ppc/math-emu/fdivs.c b/arch/powerpc/math-emu/fdivs.c index b971196e3175..b971196e3175 100644 --- a/arch/ppc/math-emu/fdivs.c +++ b/arch/powerpc/math-emu/fdivs.c | |||
diff --git a/arch/ppc/math-emu/fmadd.c b/arch/powerpc/math-emu/fmadd.c index 0a1dbce793e9..0a1dbce793e9 100644 --- a/arch/ppc/math-emu/fmadd.c +++ b/arch/powerpc/math-emu/fmadd.c | |||
diff --git a/arch/ppc/math-emu/fmadds.c b/arch/powerpc/math-emu/fmadds.c index 0f70bba9445e..0f70bba9445e 100644 --- a/arch/ppc/math-emu/fmadds.c +++ b/arch/powerpc/math-emu/fmadds.c | |||
diff --git a/arch/ppc/math-emu/fmr.c b/arch/powerpc/math-emu/fmr.c index 28df700c0c7e..28df700c0c7e 100644 --- a/arch/ppc/math-emu/fmr.c +++ b/arch/powerpc/math-emu/fmr.c | |||
diff --git a/arch/ppc/math-emu/fmsub.c b/arch/powerpc/math-emu/fmsub.c index 203fd48a6fec..203fd48a6fec 100644 --- a/arch/ppc/math-emu/fmsub.c +++ b/arch/powerpc/math-emu/fmsub.c | |||
diff --git a/arch/ppc/math-emu/fmsubs.c b/arch/powerpc/math-emu/fmsubs.c index 8ce68624c189..8ce68624c189 100644 --- a/arch/ppc/math-emu/fmsubs.c +++ b/arch/powerpc/math-emu/fmsubs.c | |||
diff --git a/arch/ppc/math-emu/fmul.c b/arch/powerpc/math-emu/fmul.c index 66c7e79aae2e..66c7e79aae2e 100644 --- a/arch/ppc/math-emu/fmul.c +++ b/arch/powerpc/math-emu/fmul.c | |||
diff --git a/arch/ppc/math-emu/fmuls.c b/arch/powerpc/math-emu/fmuls.c index 26bc4278271c..26bc4278271c 100644 --- a/arch/ppc/math-emu/fmuls.c +++ b/arch/powerpc/math-emu/fmuls.c | |||
diff --git a/arch/ppc/math-emu/fnabs.c b/arch/powerpc/math-emu/fnabs.c index c6b913d179e0..c6b913d179e0 100644 --- a/arch/ppc/math-emu/fnabs.c +++ b/arch/powerpc/math-emu/fnabs.c | |||
diff --git a/arch/ppc/math-emu/fneg.c b/arch/powerpc/math-emu/fneg.c index fe9a98deff69..fe9a98deff69 100644 --- a/arch/ppc/math-emu/fneg.c +++ b/arch/powerpc/math-emu/fneg.c | |||
diff --git a/arch/ppc/math-emu/fnmadd.c b/arch/powerpc/math-emu/fnmadd.c index 7f312276d920..7f312276d920 100644 --- a/arch/ppc/math-emu/fnmadd.c +++ b/arch/powerpc/math-emu/fnmadd.c | |||
diff --git a/arch/ppc/math-emu/fnmadds.c b/arch/powerpc/math-emu/fnmadds.c index 65454c9c70bc..65454c9c70bc 100644 --- a/arch/ppc/math-emu/fnmadds.c +++ b/arch/powerpc/math-emu/fnmadds.c | |||
diff --git a/arch/ppc/math-emu/fnmsub.c b/arch/powerpc/math-emu/fnmsub.c index f1ca7482b5f0..f1ca7482b5f0 100644 --- a/arch/ppc/math-emu/fnmsub.c +++ b/arch/powerpc/math-emu/fnmsub.c | |||
diff --git a/arch/ppc/math-emu/fnmsubs.c b/arch/powerpc/math-emu/fnmsubs.c index 5c9a09a87dc7..5c9a09a87dc7 100644 --- a/arch/ppc/math-emu/fnmsubs.c +++ b/arch/powerpc/math-emu/fnmsubs.c | |||
diff --git a/arch/ppc/math-emu/fres.c b/arch/powerpc/math-emu/fres.c index ec11e46d20af..ec11e46d20af 100644 --- a/arch/ppc/math-emu/fres.c +++ b/arch/powerpc/math-emu/fres.c | |||
diff --git a/arch/ppc/math-emu/frsp.c b/arch/powerpc/math-emu/frsp.c index d879b2a3d0c9..d879b2a3d0c9 100644 --- a/arch/ppc/math-emu/frsp.c +++ b/arch/powerpc/math-emu/frsp.c | |||
diff --git a/arch/ppc/math-emu/frsqrte.c b/arch/powerpc/math-emu/frsqrte.c index a11ae1829850..a11ae1829850 100644 --- a/arch/ppc/math-emu/frsqrte.c +++ b/arch/powerpc/math-emu/frsqrte.c | |||
diff --git a/arch/ppc/math-emu/fsel.c b/arch/powerpc/math-emu/fsel.c index e36e6e72819a..e36e6e72819a 100644 --- a/arch/ppc/math-emu/fsel.c +++ b/arch/powerpc/math-emu/fsel.c | |||
diff --git a/arch/ppc/math-emu/fsqrt.c b/arch/powerpc/math-emu/fsqrt.c index 6f8319f64a8a..6f8319f64a8a 100644 --- a/arch/ppc/math-emu/fsqrt.c +++ b/arch/powerpc/math-emu/fsqrt.c | |||
diff --git a/arch/ppc/math-emu/fsqrts.c b/arch/powerpc/math-emu/fsqrts.c index 3b2b1cf55c12..3b2b1cf55c12 100644 --- a/arch/ppc/math-emu/fsqrts.c +++ b/arch/powerpc/math-emu/fsqrts.c | |||
diff --git a/arch/ppc/math-emu/fsub.c b/arch/powerpc/math-emu/fsub.c index 956679042bb2..956679042bb2 100644 --- a/arch/ppc/math-emu/fsub.c +++ b/arch/powerpc/math-emu/fsub.c | |||
diff --git a/arch/ppc/math-emu/fsubs.c b/arch/powerpc/math-emu/fsubs.c index 3428117dfe8c..3428117dfe8c 100644 --- a/arch/ppc/math-emu/fsubs.c +++ b/arch/powerpc/math-emu/fsubs.c | |||
diff --git a/arch/ppc/math-emu/lfd.c b/arch/powerpc/math-emu/lfd.c index 7d38101c329b..7d38101c329b 100644 --- a/arch/ppc/math-emu/lfd.c +++ b/arch/powerpc/math-emu/lfd.c | |||
diff --git a/arch/ppc/math-emu/lfs.c b/arch/powerpc/math-emu/lfs.c index c86dee3d7655..c86dee3d7655 100644 --- a/arch/ppc/math-emu/lfs.c +++ b/arch/powerpc/math-emu/lfs.c | |||
diff --git a/arch/ppc/math-emu/math.c b/arch/powerpc/math-emu/math.c index 589153472761..589153472761 100644 --- a/arch/ppc/math-emu/math.c +++ b/arch/powerpc/math-emu/math.c | |||
diff --git a/arch/ppc/math-emu/mcrfs.c b/arch/powerpc/math-emu/mcrfs.c index 106dd912914b..106dd912914b 100644 --- a/arch/ppc/math-emu/mcrfs.c +++ b/arch/powerpc/math-emu/mcrfs.c | |||
diff --git a/arch/ppc/math-emu/mffs.c b/arch/powerpc/math-emu/mffs.c index f477c9170e75..f477c9170e75 100644 --- a/arch/ppc/math-emu/mffs.c +++ b/arch/powerpc/math-emu/mffs.c | |||
diff --git a/arch/ppc/math-emu/mtfsb0.c b/arch/powerpc/math-emu/mtfsb0.c index 99bfd80f4af3..99bfd80f4af3 100644 --- a/arch/ppc/math-emu/mtfsb0.c +++ b/arch/powerpc/math-emu/mtfsb0.c | |||
diff --git a/arch/ppc/math-emu/mtfsb1.c b/arch/powerpc/math-emu/mtfsb1.c index 3d9e7ed92d2b..3d9e7ed92d2b 100644 --- a/arch/ppc/math-emu/mtfsb1.c +++ b/arch/powerpc/math-emu/mtfsb1.c | |||
diff --git a/arch/ppc/math-emu/mtfsf.c b/arch/powerpc/math-emu/mtfsf.c index d70cf714994c..d70cf714994c 100644 --- a/arch/ppc/math-emu/mtfsf.c +++ b/arch/powerpc/math-emu/mtfsf.c | |||
diff --git a/arch/ppc/math-emu/mtfsfi.c b/arch/powerpc/math-emu/mtfsfi.c index 71df854baa7e..71df854baa7e 100644 --- a/arch/ppc/math-emu/mtfsfi.c +++ b/arch/powerpc/math-emu/mtfsfi.c | |||
diff --git a/arch/ppc/math-emu/op-1.h b/arch/powerpc/math-emu/op-1.h index c92fa95f562e..c92fa95f562e 100644 --- a/arch/ppc/math-emu/op-1.h +++ b/arch/powerpc/math-emu/op-1.h | |||
diff --git a/arch/ppc/math-emu/op-2.h b/arch/powerpc/math-emu/op-2.h index b9b06b4c6ea1..b9b06b4c6ea1 100644 --- a/arch/ppc/math-emu/op-2.h +++ b/arch/powerpc/math-emu/op-2.h | |||
diff --git a/arch/ppc/math-emu/op-4.h b/arch/powerpc/math-emu/op-4.h index fcdd6d064c54..fcdd6d064c54 100644 --- a/arch/ppc/math-emu/op-4.h +++ b/arch/powerpc/math-emu/op-4.h | |||
diff --git a/arch/ppc/math-emu/op-common.h b/arch/powerpc/math-emu/op-common.h index afb82b6498ce..afb82b6498ce 100644 --- a/arch/ppc/math-emu/op-common.h +++ b/arch/powerpc/math-emu/op-common.h | |||
diff --git a/arch/ppc/math-emu/sfp-machine.h b/arch/powerpc/math-emu/sfp-machine.h index 4b17d83cfcdd..4b17d83cfcdd 100644 --- a/arch/ppc/math-emu/sfp-machine.h +++ b/arch/powerpc/math-emu/sfp-machine.h | |||
diff --git a/arch/ppc/math-emu/single.h b/arch/powerpc/math-emu/single.h index f19d99451815..f19d99451815 100644 --- a/arch/ppc/math-emu/single.h +++ b/arch/powerpc/math-emu/single.h | |||
diff --git a/arch/ppc/math-emu/soft-fp.h b/arch/powerpc/math-emu/soft-fp.h index cca39598f873..cca39598f873 100644 --- a/arch/ppc/math-emu/soft-fp.h +++ b/arch/powerpc/math-emu/soft-fp.h | |||
diff --git a/arch/ppc/math-emu/stfd.c b/arch/powerpc/math-emu/stfd.c index 3f8c2558a9e8..3f8c2558a9e8 100644 --- a/arch/ppc/math-emu/stfd.c +++ b/arch/powerpc/math-emu/stfd.c | |||
diff --git a/arch/ppc/math-emu/stfiwx.c b/arch/powerpc/math-emu/stfiwx.c index 95caaeec6a08..95caaeec6a08 100644 --- a/arch/ppc/math-emu/stfiwx.c +++ b/arch/powerpc/math-emu/stfiwx.c | |||
diff --git a/arch/ppc/math-emu/stfs.c b/arch/powerpc/math-emu/stfs.c index e87ca23c6dc3..e87ca23c6dc3 100644 --- a/arch/ppc/math-emu/stfs.c +++ b/arch/powerpc/math-emu/stfs.c | |||
diff --git a/arch/ppc/math-emu/types.c b/arch/powerpc/math-emu/types.c index e1ed15d829db..e1ed15d829db 100644 --- a/arch/ppc/math-emu/types.c +++ b/arch/powerpc/math-emu/types.c | |||
diff --git a/arch/ppc/math-emu/udivmodti4.c b/arch/powerpc/math-emu/udivmodti4.c index 7e112dc1e2f2..7e112dc1e2f2 100644 --- a/arch/ppc/math-emu/udivmodti4.c +++ b/arch/powerpc/math-emu/udivmodti4.c | |||
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index d3d0ff745e84..06e371282f57 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig | |||
@@ -7,6 +7,7 @@ choice | |||
7 | 7 | ||
8 | config MPC8540_ADS | 8 | config MPC8540_ADS |
9 | bool "Freescale MPC8540 ADS" | 9 | bool "Freescale MPC8540 ADS" |
10 | select DEFAULT_UIMAGE | ||
10 | help | 11 | help |
11 | This option enables support for the MPC 8540 ADS board | 12 | This option enables support for the MPC 8540 ADS board |
12 | 13 | ||
diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile index e250f8333edf..0db66dcf0723 100644 --- a/arch/ppc/Makefile +++ b/arch/ppc/Makefile | |||
@@ -67,7 +67,7 @@ core-y += arch/ppc/kernel/ arch/powerpc/kernel/ \ | |||
67 | core-$(CONFIG_4xx) += arch/ppc/platforms/4xx/ | 67 | core-$(CONFIG_4xx) += arch/ppc/platforms/4xx/ |
68 | core-$(CONFIG_83xx) += arch/ppc/platforms/83xx/ | 68 | core-$(CONFIG_83xx) += arch/ppc/platforms/83xx/ |
69 | core-$(CONFIG_85xx) += arch/ppc/platforms/85xx/ | 69 | core-$(CONFIG_85xx) += arch/ppc/platforms/85xx/ |
70 | core-$(CONFIG_MATH_EMULATION) += arch/ppc/math-emu/ | 70 | core-$(CONFIG_MATH_EMULATION) += arch/powerpc/math-emu/ |
71 | core-$(CONFIG_XMON) += arch/ppc/xmon/ | 71 | core-$(CONFIG_XMON) += arch/ppc/xmon/ |
72 | core-$(CONFIG_APUS) += arch/ppc/amiga/ | 72 | core-$(CONFIG_APUS) += arch/ppc/amiga/ |
73 | drivers-$(CONFIG_8xx) += arch/ppc/8xx_io/ | 73 | drivers-$(CONFIG_8xx) += arch/ppc/8xx_io/ |